Fix Expander in CollectionView on Apple

azure-pipelines.yml

@@ -19,7 +19,7 @@ variables:
   PathToCommunityToolkitAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.Analyzers.CodeFixes/CommunityToolkit.Maui.Analyzers.CodeFixes.csproj'
   PathToCommunityToolkitMediaElementAnalyzersCodeFixCsproj: 'src/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes/CommunityToolkit.Maui.MediaElement.Analyzers.CodeFixes.csproj'
   PathToCommunityToolkitAnalyzersUnitTestCsproj: 'src/CommunityToolkit.Maui.Analyzers.UnitTests/CommunityToolkit.Maui.Analyzers.UnitTests.csproj'
-  DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.49.json'
+  DotNetMauiRollbackFile: 'https://maui.blob.core.windows.net/metadata/rollbacks/7.0.59.json'
   CommunityToolkitSampleApp_Xcode_Version: '14.2.0'
   CommunityToolkitLibrary_Xcode_Version: '14.0.1'
 

samples/CommunityToolkit.Maui.Sample/Pages/Views/Expander/ExpanderPage.xaml

@@ -7,6 +7,7 @@
                 xmlns:viewModels="clr-namespace:CommunityToolkit.Maui.Sample.ViewModels.Views"
                 x:TypeArguments="viewModels:ExpanderViewModel"
                 x:DataType="viewModels:ExpanderViewModel"
+                Padding="12,0"
                 Title="Expander">
 
     <ScrollView>
@@ -21,7 +22,7 @@
                 </mct:Expander.Header>
 
                 <mct:Expander.Content>
-                    <VerticalStackLayout BackgroundColor="LightGray">
+                    <VerticalStackLayout>
                         <Label Text="Item 1"/>
                         <Label Text="Item 2"/>
                     </VerticalStackLayout>
@@ -45,6 +46,55 @@
                     </mct:Expander>
                 </mct:Expander.Content>
             </mct:Expander>
+
+            <Label Text="Expander in ListView" FontSize="24" FontAttributes="Bold"/>
+
+            <ListView ItemsSource="{Binding ContentCreators}"
+                      HasUnevenRows="True">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <mct:Expander x:DataType="viewModels:ContentCreator"
+                                          ExpandedChanged="Expander_ExpandedChanged">
+                                <mct:Expander.Header>
+                                    <Label Text="{Binding Name}"/>
+                                </mct:Expander.Header>
+                                <mct:Expander.Content>
+                                    <VerticalStackLayout>
+                                        <Label Text="{Binding Resource}"/>
+                                        <Image Source="{Binding Image}"
+                                               WidthRequest="100"
+                                               HeightRequest="100"/>
+                                    </VerticalStackLayout>
+                                </mct:Expander.Content>
+                            </mct:Expander>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+
+            <Label Text="Expander in CollectionView" FontSize="24" FontAttributes="Bold"/>
+
+            <CollectionView ItemsSource="{Binding ContentCreators}">
+                <CollectionView.ItemTemplate>
+                    <DataTemplate>
+                        <mct:Expander x:DataType="viewModels:ContentCreator"
+                                      ExpandedChanged="Expander_ExpandedChanged">
+                            <mct:Expander.Header>
+                                <Label Text="{Binding Name}"/>
+                            </mct:Expander.Header>
+                            <mct:Expander.Content>
+                                <VerticalStackLayout>
+                                    <Label Text="{Binding Resource}" HorizontalOptions="Center"/>
+                                    <Image Source="{Binding Image}"
+                                               WidthRequest="100"
+                                               HeightRequest="100"/>
+                                </VerticalStackLayout>
+                            </mct:Expander.Content>
+                        </mct:Expander>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>
         </VerticalStackLayout>
     </ScrollView>
 </pages:BasePage>

samples/CommunityToolkit.Maui.Sample/Pages/Views/Expander/ExpanderPageCS.cs

@@ -19,7 +19,7 @@ public ExpanderPageCS()
 				new Label()
 					.Text("Expander C# Sample")
 					.Font(bold: true, size: 24)
-					.CenterHorizontal(),
+					.CenterHorizontal().TextCenter(),
 
 				new Picker() { ItemsSource = Enum.GetValues<ExpandDirection>(), Title = "Direction" }
 					.CenterHorizontal().TextCenter()

samples/CommunityToolkit.Maui.Sample/ViewModels/Views/ExpanderViewModel.cs

@@ -11,6 +11,7 @@ public ExpanderViewModel()
 	{
 		ContentCreators.Add(new ContentCreator("Brandon Minnick", "https://codetraveler.io/", "https://avatars.githubusercontent.com/u/13558917"));
 		ContentCreators.Add(new ContentCreator("Gerald Versluis", "https://blog.verslu.is/", "https://avatars.githubusercontent.com/u/939291"));
+		ContentCreators.Add(new ContentCreator("Jay Cho", "https://github.com/JoonghyunCho", "https://avatars.githubusercontent.com/u/14328614"));
 		ContentCreators.Add(new ContentCreator("Kym Phillpotts", "https://kymphillpotts.com", "https://avatars.githubusercontent.com/u/1327346"));
 		ContentCreators.Add(new ContentCreator("Pedro Jesus", "https://github.com/pictos", "https://avatars.githubusercontent.com/u/20712372"));
 		ContentCreators.Add(new ContentCreator("Shaun Lawrence", "https://github.com/bijington", "https://avatars.githubusercontent.com/u/17139988"));

src/CommunityToolkit.Maui.UnitTests/ImageSources/GravatarImageSource/GravatarImageSourceTests.cs

@@ -1,8 +1,8 @@
-namespace CommunityToolkit.Maui.UnitTests.ImageSources.GravatarImageSource;
-
-using CommunityToolkit.Maui.ImageSources;
+using CommunityToolkit.Maui.ImageSources;
 using Xunit;
 
+namespace CommunityToolkit.Maui.UnitTests.ImageSources;
+
 public class GravatarImageSourceTests : BaseHandlerTest
 {
 	readonly TimeSpan cacheValidity = new(1, 0, 0);

src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewImageTests.cs

@@ -3,7 +3,7 @@
 using Microsoft.Maui.Controls.Shapes;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.AvatarView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class AvatarViewImageTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewInterfaceTests.cs

@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.AvatarView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class AvatarViewInterfaceTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/AvatarView/AvatarViewTests.cs

@@ -5,7 +5,7 @@
 using Microsoft.Maui.Controls.Shapes;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.AvatarView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class AvatarViewTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineAdapterTests.cs

@@ -4,7 +4,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class DrawingLineAdapterTests : BaseTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineCompletedEventArgsTests.cs

@@ -4,7 +4,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class DrawingLineCompletedEventArgsTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingLineTests.cs

@@ -4,7 +4,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class DrawingLineTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/DrawingViewTests.cs

@@ -7,7 +7,7 @@
 using Xunit;
 using Xunit.Abstractions;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class DrawingViewTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingLineCompletedEventArgsTests.cs

@@ -4,7 +4,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class MauiDrawingLineCompletedEventArgsTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingLineTests.cs

@@ -3,7 +3,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class MauiDrawingLineTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingViewExtensionsTests.cs

@@ -2,7 +2,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class MauiDrawingViewExtensionsTests : BaseTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/DrawingView/MauiDrawingViewTests.cs

@@ -2,7 +2,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.DrawingView;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class MauiDrawingViewTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/Expander/ExpandedChangedEventArgsTests.cs

@@ -4,7 +4,7 @@
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.Expander;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class ExpandedChangedEventArgsTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui.UnitTests/Views/Expander/ExpanderTests.cs

@@ -1,10 +1,9 @@
 using System.ComponentModel;
 using CommunityToolkit.Maui.Core;
-using CommunityToolkit.Maui.UnitTests.Mocks;
 using FluentAssertions;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.Expander;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class ExpanderTests : BaseHandlerTest
 {
@@ -13,7 +12,7 @@ public class ExpanderTests : BaseHandlerTest
 	[Fact]
 	public void ExpanderShouldBeAssignedToIExpander()
 	{
-		new Maui.Views.Expander().Should().BeAssignableTo<IExpander>();
+		expander.Should().BeAssignableTo<IExpander>();
 	}
 
 	[Fact]
@@ -62,4 +61,53 @@ public void ExpanderDirectionThrowsInvalidEnumArgumentException(ExpandDirection
 	{
 		Assert.Throws<InvalidEnumArgumentException>(() => expander.Direction = direction);
 	}
+
+	[Fact]
+	public void EnsureExpandedChanged()
+	{
+		var isExpanded_Initial = expander.IsExpanded;
+
+		var header = new View();
+		expander.Header = header;
+
+		expander.HeaderTapGestureRecognizer.SendTapped(header);
+		var isExpanded_Final = expander.IsExpanded;
+
+		Assert.True(isExpanded_Final);
+		Assert.False(isExpanded_Initial);
+		Assert.NotEqual(isExpanded_Initial, isExpanded_Final);
+
+		expander.HeaderTapGestureRecognizer.SendTapped(header);
+
+		Assert.False(expander.IsExpanded);
+	}
+
+	[Fact]
+	public void EnsureHandleHeaderTappedExecutesWhenHeaderTapped()
+	{
+		int handleHeaderTappedCount = 0;
+		bool didHandleHeaderTappedExecute = false;
+
+		var header = new View();
+		expander.Header = new View();
+		expander.HandleHeaderTapped = HandleHeaderTapped;
+
+		expander.HeaderTapGestureRecognizer.SendTapped(header);
+
+		Assert.True(didHandleHeaderTappedExecute);
+		Assert.Equal(1, handleHeaderTappedCount);
+
+		expander.HandleHeaderTapped = null;
+
+		expander.HeaderTapGestureRecognizer.SendTapped(header);
+
+		Assert.True(didHandleHeaderTappedExecute);
+		Assert.Equal(1, handleHeaderTappedCount);
+
+		void HandleHeaderTapped(TappedEventArgs tappedEventArgs)
+		{
+			handleHeaderTappedCount++;
+			didHandleHeaderTappedExecute = true;
+		}
+	}
 }

src/CommunityToolkit.Maui.UnitTests/Views/Popup/PopupTests.cs

@@ -4,7 +4,7 @@
 using CommunityToolkit.Maui.Views;
 using Xunit;
 
-namespace CommunityToolkit.Maui.UnitTests.Views.Popup;
+namespace CommunityToolkit.Maui.UnitTests.Views;
 
 public class PopupTests : BaseHandlerTest
 {

src/CommunityToolkit.Maui/Views/Expander/Expander.macios.cs

@@ -0,0 +1,55 @@
+using System.Reflection;
+using CoreGraphics;
+using UIKit;
+
+namespace CommunityToolkit.Maui.Views;
+
+public partial class Expander
+{
+	static void ForceUpdateCellSize(CollectionView collectionView, Size size, Point? tapLocation)
+	{
+		if (tapLocation is null)
+		{
+			return;
+		}
+
+		var controller = GetController(collectionView);
+
+		if (controller?.CollectionView.CollectionViewLayout is UICollectionViewFlowLayout layout)
+		{
+			var cells = layout.CollectionView.VisibleCells.OrderBy(x => x.Frame.Y).ToArray();
+			var clickedCell = GetCellByPoint(cells, new CGPoint(tapLocation.Value.X, tapLocation.Value.Y));
+			if (clickedCell is null)
+			{
+				return;
+			}
+
+			for (int i = 0; i < cells.Length; i++)
+			{
+				var cell = cells[i];
+
+				if (i > 0)
+				{
+					var prevCellFrame = cells[i - 1].Frame;
+					cell.Frame = new CGRect(cell.Frame.X, prevCellFrame.Y + prevCellFrame.Height, cell.Frame.Width, cell.Frame.Height);
+				}
+
+				if (cell.Equals(clickedCell))
+				{
+					cell.Frame = new CGRect(cell.Frame.X, cell.Frame.Y, cell.Frame.Width, size.Height);
+				}
+			}
+		}
+	}
+
+	static UICollectionViewController? GetController(CollectionView collectionView)
+	{
+		var handler = collectionView.Handler as Microsoft.Maui.Controls.Handlers.Items.CollectionViewHandler;
+		return handler?.Controller;
+	}
+
+	static UICollectionViewCell? GetCellByPoint(UICollectionViewCell[] cells, CGPoint point)
+	{
+		return cells.FirstOrDefault(cell => cell.Frame.Contains(point));
+	}
+}