Skip to content

Commit da0ce37

Browse files
Ahamed-AliHarishKumarSF4517jfversluisAnandhan RajagopalCopilot
committed
[iOS] Fixed the TargetInvocationException Occurs When Selecting Header/Footer After Changing ItemsLayout in CV2 (#28890)
* [Testing] Fix for flaky UITests in CI that occasionally fail - 7 (#28764) * improve stability to flaky tests * Updated changes * Update CarouselViewUITests.LoopNoFreeze.cs * Update EntryClearButtonColorShouldMatchTextColor.png * Update CommunityToolkit.Maui reference in sample content template (#28510) * Update CommunityToolkit.Maui & Mvvm reference in template * Fix MAUI Toolkit breaking changes * Debump MVVM Toolkit * Update MauiApp.1.csproj * Update package version in MauiApp.1.csproj * Add framework-specific validation flags and update package version * Swap TextValidationBehavior Flags for frameworks * [Testing] Fix for flaky UITests in CI that occasionally fail - 6 (#28747) * Fixed flaky tests related to entry control * Update src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue25473.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fixed 19500 test * reverted the common changes * Fix typo in Issue19500.cs comments --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> * Update dependencies from https://github.com/dotnet/xharness build 20250403.2 (#28819) Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Common , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 9.0.0-prerelease.25167.9 -> To Version 9.0.0-prerelease.25203.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> * Update Issue19509.cs (#28807) * Resave mac tabbedpage images (#28803) * Fixed ListView leak caused by not disposed ContextActionsCell (#28702) * Fixed something that looks like copy/paste error * Fixed memory leak caused by not disposed ContextActionsCell * [Testing] Fix for flaky UITests in CI that occasionally fail - 8 (#28828) * improve stability to flaky test * Update Issue7678.cs * Fixed the TargetInvocationException Occurs When Selecting Header/Footer After Changing ItemsLayout in CV2 * Included the test case and sample for the fix * Added the test case for footer --------- Co-authored-by: HarishKumarSF4517 <harish.kumar@syncfusion.com> Co-authored-by: Gerald Versluis <gerald.versluis@microsoft.com> Co-authored-by: Anandhan Rajagopal <97146406+anandhan-rajagopal@users.noreply.github.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Shane Neuville <shneuvil@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Vitaly Knyazev <VitalyKnyazev@users.noreply.github.com>
1 parent 43d48d2 commit da0ce37

File tree

4 files changed

+93
-28
lines changed

4 files changed

+93
-28
lines changed

‎src/Controls/src/Core/Handlers/Items2/iOS/GroupableItemsViewController2.cs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,14 @@ protected override void RegisterViewTypes()
6161
private protected override void RegisterSupplementaryViews(UICollectionElementKindSection kind)
6262
{
6363
base.RegisterSupplementaryViews(kind);
64-
if (IsHorizontal)
65-
{
66-
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalSupplementaryView2),
67-
kind, HorizontalSupplementalView2ReuseId);
68-
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalDefaultSupplementalView2),
69-
kind, HorizontalDefaultSupplementalView2ReuseId);
70-
}
71-
else
72-
{
73-
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalSupplementaryView2),
74-
kind, VerticalSupplementaryView2ReuseId);
75-
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalDefaultSupplementalView2),
76-
kind, VerticalDefaultSupplementalView2ReuseId);
77-
}
64+
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalSupplementaryView2),
65+
kind, HorizontalSupplementalView2ReuseId);
66+
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalDefaultSupplementalView2),
67+
kind, HorizontalDefaultSupplementalView2ReuseId);
68+
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalSupplementaryView2),
69+
kind, VerticalSupplementaryView2ReuseId);
70+
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalDefaultSupplementalView2),
71+
kind, VerticalDefaultSupplementalView2ReuseId);
7872
}
7973

8074
string DetermineViewReuseId(NSString elementKind)

‎src/Controls/src/Core/Handlers/Items2/iOS/StructuredItemsViewController2.cs‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,14 @@ public override UICollectionReusableView GetViewForSupplementaryElement(UICollec
7575

7676
private protected virtual void RegisterSupplementaryViews(UICollectionElementKindSection kind)
7777
{
78-
if (IsHorizontal)
79-
{
80-
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalSupplementaryView2),
81-
kind, HorizontalSupplementaryView2.ReuseId);
82-
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalDefaultSupplementalView2),
83-
kind, HorizontalDefaultSupplementalView2.ReuseId);
84-
}
85-
else
86-
{
87-
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalSupplementaryView2),
88-
kind, VerticalSupplementaryView2.ReuseId);
89-
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalDefaultSupplementalView2),
90-
kind, VerticalDefaultSupplementalView2.ReuseId);
91-
}
78+
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalSupplementaryView2),
79+
kind, HorizontalSupplementaryView2.ReuseId);
80+
CollectionView.RegisterClassForSupplementaryView(typeof(HorizontalDefaultSupplementalView2),
81+
kind, HorizontalDefaultSupplementalView2.ReuseId);
82+
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalSupplementaryView2),
83+
kind, VerticalSupplementaryView2.ReuseId);
84+
CollectionView.RegisterClassForSupplementaryView(typeof(VerticalDefaultSupplementalView2),
85+
kind, VerticalDefaultSupplementalView2.ReuseId);
9286
}
9387

9488
string DetermineViewReuseId(NSString elementKind)

‎src/Controls/tests/TestCases.HostApp/Issues/Issue28678.cs‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
namespace Maui.Controls.Sample.Issues;
2+
3+
[Issue(IssueTracker.Github, 28678, "TargetInvocationException Occurs When Selecting Header/Footer After Changing ItemsLayout in CV2", PlatformAffected.iOS)]
4+
public class Issue28678 : ContentPage
5+
{
6+
public Issue28678()
7+
{
8+
// Create the CollectionView
9+
var collectionView = new CollectionView2
10+
{
11+
HeightRequest = 100,
12+
};
13+
14+
var button = new Button
15+
{
16+
Text = "Change ItemsLayout",
17+
AutomationId = "Button"
18+
};
19+
button.Clicked += (s, e) =>
20+
{
21+
collectionView.ItemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Horizontal);
22+
};
23+
24+
var button1 = new Button
25+
{
26+
Text = "Add Header",
27+
AutomationId = "HeaderButton"
28+
};
29+
button1.Clicked += (s, e) =>
30+
{
31+
collectionView.Header = "Header";
32+
};
33+
34+
var button2 = new Button
35+
{
36+
Text = "Add Footer",
37+
AutomationId = "FooterButton"
38+
};
39+
button2.Clicked += (s, e) =>
40+
{
41+
collectionView.Footer = "Footer";
42+
};
43+
44+
Content = new VerticalStackLayout
45+
{
46+
Children =
47+
{
48+
collectionView,
49+
button,
50+
button1,
51+
button2
52+
}
53+
};
54+
}
55+
}

‎src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue28678.cs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
using NUnit.Framework;
2+
using UITest.Appium;
3+
using UITest.Core;
4+
5+
namespace Microsoft.Maui.TestCases.Tests.Issues;
6+
public class Issue28678 : _IssuesUITest
7+
{
8+
public Issue28678(TestDevice device) : base(device) { }
9+
10+
public override string Issue => "TargetInvocationException Occurs When Selecting Header/Footer After Changing ItemsLayout in CV2";
11+
12+
[Test]
13+
[Category(UITestCategories.CollectionView)]
14+
public void HeaderFooterSelectionAfterItemsLayoutChangeShouldNotCrash()
15+
{
16+
App.WaitForElement("Button");
17+
App.Tap("Button");
18+
App.Tap("HeaderButton");
19+
App.Tap("FooterButton");
20+
App.WaitForElement("Button");
21+
}
22+
}

0 commit comments

Comments
 (0)