From 534b265994a4a389f7416bb9cd2ffc85902020a6 Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Fri, 10 Jan 2025 18:36:51 +0530 Subject: [PATCH 1/4] Fixed-Shell-TemplateView-Initial-Margin --- .../Shell/Windows/ShellFlyoutItemView.cs | 4 +- ...rifyTemplateViewMarginOnInitialDisplay.png | Bin 0 -> 13911 bytes .../TestCases.HostApp/Issues/Issue18423.cs | 40 ++++++++++++++++++ .../Tests/Issues/Issue18423.cs | 25 +++++++++++ ...rifyTemplateViewMarginOnInitialDisplay.png | Bin 0 -> 13611 bytes 5 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs create mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.png diff --git a/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs b/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs index 5718cef5b539..4400e9fa1c0f 100644 --- a/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs +++ b/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs @@ -128,7 +128,9 @@ void ShellElementPropertyChanged(object sender, PropertyChangedEventArgs e) protected override global::Windows.Foundation.Size ArrangeOverride(global::Windows.Foundation.Size finalSize) { - if (this.ActualWidth > 0 && _content is IView view) + // Replaced ActualWidth with finalSize.Width since ActualWidth updates only after ArrangeOverride completes, + // ensuring accurate layout during the initial arrangement phase. + if (finalSize.Width > 0 && _content is IView view) { view.Arrange(new Rect(0, 0, finalSize.Width, finalSize.Height)); return finalSize; diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png new file mode 100644 index 0000000000000000000000000000000000000000..27c540446f02dc76c2a436a604fd2632fb4d207e GIT binary patch literal 13911 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 L-P@|S9?tz2>ne6- literal 0 HcmV?d00001 diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs new file mode 100644 index 000000000000..5c2ffdff6e40 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs @@ -0,0 +1,40 @@ +namespace Maui.Controls.Sample.Issues +{ + + [Issue(IssueTracker.Github, 18423, "[Windows] Shell flyout template items do not have a margin applied on first show", PlatformAffected.UWP)] + public partial class Issue18423Shell : Shell + { + public Issue18423Shell() + { + FlyoutBehavior = FlyoutBehavior.Flyout; + + ItemTemplate = new DataTemplate(() => + { + return new Label + { + AutomationId = "LabelWithMargin", + Margin = new Thickness(20), + Text = "Title" + }; + }); + + ShellContent shellContent = new ShellContent + { + Title = "Home", + ContentTemplate = new DataTemplate(typeof(Issue18423Page)), + Route = "MainPage" + }; + + Items.Add(shellContent); + } + } + + public partial class Issue18423Page : ContentPage + { + public Issue18423Page() + { + BackgroundColor = Colors.HotPink; + this.AutomationId = "MainPage"; + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs new file mode 100644 index 000000000000..534d723c4164 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs @@ -0,0 +1,25 @@ +using NUnit.Framework; +using UITest.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests.Issues +{ + public class Issue18423 : _IssuesUITest + { + public Issue18423(TestDevice testDevice) : base(testDevice) + { + } + + public override string Issue => "[Windows] Shell flyout template items do not have a margin applied on first show"; + + [Test] + [Category(UITestCategories.Shell)] + public void VerifyTemplateViewMarginOnInitialDisplay() + { + App.WaitForElement("MainPage"); + App.TapShellFlyoutIcon(); + App.WaitForElement("LabelWithMargin"); + VerifyScreenshot(); + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.png new file mode 100644 index 0000000000000000000000000000000000000000..c3665cffd10e0b4fc7113aefe4cf6deed31579d0 GIT binary patch literal 13611 zcmeI(`%_cd9RTnX2ohe^bjq*@3Ang`g{2{ggg{_{u#wsFth<0DgvEr1Ee}aBAs|SV z4J|bpTp3nzqOPb#EOcBJ0<`kT3K1|&2P|4a9+6}T1PBlkgpgkCuH8;&|A0=vDu-$J90C0#oN=*U)%>n?kjIl%_r3VTqNaKFuXi_Wy0#5+W zo(JF+5<2@W0L26VG#LPpzW~6g@M>3LC;+I&gkK(uHX~cxv$eIgiHV7e7cV+EI3Ohy z3T0zswwzjrYQ&VnkZfG<*KR;h25{-?GNhFf~ z{{HIfY7U2EG#XEyJeii3mXwqf6%`d385tH9cKrD9qM{ZQ(4pkyy@J)*1IbLy%#8^; z=keG2l-Z#~+RTt>M20Vq5tAfz9?2D7(o~8s4&`$xpGb?wvC{h<9MkMYJV!Nh!i`r} zwsUJ4>nuHrs~p>ZIUt_oDls;eO7t&X@};wf)Ze9iLWs!}eR_PzZRLU?Jygl(Dg&++ zZ(bV}Z0eS z>9b>Q%+>#8gRQ@QBZ)RM{-J7KDD#QKGfVoq<66njq~65V^2fhk2^LH(PA7=>?=MET zd#n!(UJWlBYgkN;`cl-}Bpyl2@0|bB;8$q{!Gh(Bwv47xfmhTFl1T!ig=Huv3#}7A0T0qruqIRKFU0 zcxQBaRi&KI)|`^fC(|-W#A_74FkT1l6Atew*R-p=(G50c(SG_$L^puewI(Q%ct@-nT|D4;OqZ)$@?HBL|7 zB&ENEP%FEW%gtCsst;iNpZzO9uOmap&*|#NjEHf1HCk+a1g;^A`Y>fEVjr&qn zOS&at$8>377%`kwQo68Qk#GJsS11!#e0O=f+D_A*LD@CRs;Z$Nw6klb8DCybPdCgh zibstPv+-qg^L@z?v<8EmYlLCYJ?3{%Oe}+fX?hi8CY2kt=HdAB*kZKjyPPKlE6T;7 za6|Wcg?4*8JjdSf(VMtRT=8msMI0~PW}VSh`0&@55~KJVI&UIY|Hm81yl$hadb&5Q zIv7P}4XM4WWimL#QFt5NZfDgc?E(p@vXH zs3Fu4Y6vxi8bS@BhEPMOA=D6R_k|eSS*<~3r^IB%#)6+CeGITb z{S>@j#)Cq3Aj}2mH+=w*bv(#saoytk2%2@>^83CGvcd;|S*h(V(!9rwPT{gX<+8~q zir7d4hy-Hb`vm{@{RzkXiR8m1GJ)VjARxyW`@d%XM?qczD>tj;#|ub_RxgkO@3&Xr z=H{_E+)wigf4ruEdJy?0;AgLE*!;AV*+%S@Nd7Dqj<+Fd2 zLPgG;&&e&w2mb!V!@lnRZTzqPdsynfhY=449PxFJN;kcS3 Date: Fri, 10 Jan 2025 18:36:51 +0530 Subject: [PATCH 2/4] Fixed-Shell-TemplateView-Initial-Margin --- .../Shell/Windows/ShellFlyoutItemView.cs | 4 +- ...rifyTemplateViewMarginOnInitialDisplay.png | Bin 0 -> 13911 bytes .../TestCases.HostApp/Issues/Issue18423.cs | 40 ++++++++++++++++++ .../Tests/Issues/Issue18423.cs | 25 +++++++++++ ...rifyTemplateViewMarginOnInitialDisplay.png | Bin 0 -> 13611 bytes 5 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs create mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.png diff --git a/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs b/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs index 5718cef5b539..4400e9fa1c0f 100644 --- a/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs +++ b/src/Controls/src/Core/Handlers/Shell/Windows/ShellFlyoutItemView.cs @@ -128,7 +128,9 @@ void ShellElementPropertyChanged(object sender, PropertyChangedEventArgs e) protected override global::Windows.Foundation.Size ArrangeOverride(global::Windows.Foundation.Size finalSize) { - if (this.ActualWidth > 0 && _content is IView view) + // Replaced ActualWidth with finalSize.Width since ActualWidth updates only after ArrangeOverride completes, + // ensuring accurate layout during the initial arrangement phase. + if (finalSize.Width > 0 && _content is IView view) { view.Arrange(new Rect(0, 0, finalSize.Width, finalSize.Height)); return finalSize; diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyTemplateViewMarginOnInitialDisplay.png new file mode 100644 index 0000000000000000000000000000000000000000..27c540446f02dc76c2a436a604fd2632fb4d207e GIT binary patch literal 13911 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 L-P@|S9?tz2>ne6- literal 0 HcmV?d00001 diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs new file mode 100644 index 000000000000..5c2ffdff6e40 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs @@ -0,0 +1,40 @@ +namespace Maui.Controls.Sample.Issues +{ + + [Issue(IssueTracker.Github, 18423, "[Windows] Shell flyout template items do not have a margin applied on first show", PlatformAffected.UWP)] + public partial class Issue18423Shell : Shell + { + public Issue18423Shell() + { + FlyoutBehavior = FlyoutBehavior.Flyout; + + ItemTemplate = new DataTemplate(() => + { + return new Label + { + AutomationId = "LabelWithMargin", + Margin = new Thickness(20), + Text = "Title" + }; + }); + + ShellContent shellContent = new ShellContent + { + Title = "Home", + ContentTemplate = new DataTemplate(typeof(Issue18423Page)), + Route = "MainPage" + }; + + Items.Add(shellContent); + } + } + + public partial class Issue18423Page : ContentPage + { + public Issue18423Page() + { + BackgroundColor = Colors.HotPink; + this.AutomationId = "MainPage"; + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs new file mode 100644 index 000000000000..534d723c4164 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs @@ -0,0 +1,25 @@ +using NUnit.Framework; +using UITest.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests.Issues +{ + public class Issue18423 : _IssuesUITest + { + public Issue18423(TestDevice testDevice) : base(testDevice) + { + } + + public override string Issue => "[Windows] Shell flyout template items do not have a margin applied on first show"; + + [Test] + [Category(UITestCategories.Shell)] + public void VerifyTemplateViewMarginOnInitialDisplay() + { + App.WaitForElement("MainPage"); + App.TapShellFlyoutIcon(); + App.WaitForElement("LabelWithMargin"); + VerifyScreenshot(); + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyTemplateViewMarginOnInitialDisplay.png new file mode 100644 index 0000000000000000000000000000000000000000..c3665cffd10e0b4fc7113aefe4cf6deed31579d0 GIT binary patch literal 13611 zcmeI(`%_cd9RTnX2ohe^bjq*@3Ang`g{2{ggg{_{u#wsFth<0DgvEr1Ee}aBAs|SV z4J|bpTp3nzqOPb#EOcBJ0<`kT3K1|&2P|4a9+6}T1PBlkgpgkCuH8;&|A0=vDu-$J90C0#oN=*U)%>n?kjIl%_r3VTqNaKFuXi_Wy0#5+W zo(JF+5<2@W0L26VG#LPpzW~6g@M>3LC;+I&gkK(uHX~cxv$eIgiHV7e7cV+EI3Ohy z3T0zswwzjrYQ&VnkZfG<*KR;h25{-?GNhFf~ z{{HIfY7U2EG#XEyJeii3mXwqf6%`d385tH9cKrD9qM{ZQ(4pkyy@J)*1IbLy%#8^; z=keG2l-Z#~+RTt>M20Vq5tAfz9?2D7(o~8s4&`$xpGb?wvC{h<9MkMYJV!Nh!i`r} zwsUJ4>nuHrs~p>ZIUt_oDls;eO7t&X@};wf)Ze9iLWs!}eR_PzZRLU?Jygl(Dg&++ zZ(bV}Z0eS z>9b>Q%+>#8gRQ@QBZ)RM{-J7KDD#QKGfVoq<66njq~65V^2fhk2^LH(PA7=>?=MET zd#n!(UJWlBYgkN;`cl-}Bpyl2@0|bB;8$q{!Gh(Bwv47xfmhTFl1T!ig=Huv3#}7A0T0qruqIRKFU0 zcxQBaRi&KI)|`^fC(|-W#A_74FkT1l6Atew*R-p=(G50c(SG_$L^puewI(Q%ct@-nT|D4;OqZ)$@?HBL|7 zB&ENEP%FEW%gtCsst;iNpZzO9uOmap&*|#NjEHf1HCk+a1g;^A`Y>fEVjr&qn zOS&at$8>377%`kwQo68Qk#GJsS11!#e0O=f+D_A*LD@CRs;Z$Nw6klb8DCybPdCgh zibstPv+-qg^L@z?v<8EmYlLCYJ?3{%Oe}+fX?hi8CY2kt=HdAB*kZKjyPPKlE6T;7 za6|Wcg?4*8JjdSf(VMtRT=8msMI0~PW}VSh`0&@55~KJVI&UIY|Hm81yl$hadb&5Q zIv7P}4XM4WWimL#QFt5NZfDgc?E(p@vXH zs3Fu4Y6vxi8bS@BhEPMOA=D6R_k|eSS*<~3r^IB%#)6+CeGITb z{S>@j#)Cq3Aj}2mH+=w*bv(#saoytk2%2@>^83CGvcd;|S*h(V(!9rwPT{gX<+8~q zir7d4hy-Hb`vm{@{RzkXiR8m1GJ)VjARxyW`@d%XM?qczD>tj;#|ub_RxgkO@3&Xr z=H{_E+)wigf4ruEdJy?0;AgLE*!;AV*+%S@Nd7Dqj<+Fd2 zLPgG;&&e&w2mb!V!@lnRZTzqPdsynfhY=449PxFJN;kcS3 Date: Mon, 13 Jan 2025 21:23:36 +0530 Subject: [PATCH 3/4] Added-Snapshot-Modified-Testcase --- .../TestCases.HostApp/Issues/Issue18423.cs | 2 +- ...VerifyTemplateViewMarginOnInitialDisplay.png | Bin 0 -> 50310 bytes .../Tests/Issues/Issue18423.cs | 3 +-- 3 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTemplateViewMarginOnInitialDisplay.png diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs index 5c2ffdff6e40..04b0fcd7b185 100644 --- a/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue18423.cs @@ -34,7 +34,7 @@ public partial class Issue18423Page : ContentPage public Issue18423Page() { BackgroundColor = Colors.HotPink; - this.AutomationId = "MainPage"; + this.Content = new Label() { AutomationId = "MainPageLabel", Text = "Content" }; } } } \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.Mac.Tests/snapshots/mac/VerifyTemplateViewMarginOnInitialDisplay.png new file mode 100644 index 0000000000000000000000000000000000000000..9543ba18bbcadff46855508eeb5e01e399a9cf51 GIT binary patch literal 50310 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 YvwuvSs<%5JfB^_RUHx3vIVCg!07`yBO#lD@ literal 0 HcmV?d00001 diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs index 534d723c4164..c1d01d3a3953 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue18423.cs @@ -16,9 +16,8 @@ public Issue18423(TestDevice testDevice) : base(testDevice) [Category(UITestCategories.Shell)] public void VerifyTemplateViewMarginOnInitialDisplay() { - App.WaitForElement("MainPage"); + App.WaitForElement("MainPageLabel"); App.TapShellFlyoutIcon(); - App.WaitForElement("LabelWithMargin"); VerifyScreenshot(); } } From d481b684a62d0ec6d4b688bc8174fe0a78fa68a0 Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:44:44 +0530 Subject: [PATCH 4/4] Updated-Pending-Snapshot --- .../VerifyTemplateViewMarginOnInitialDisplay.png | Bin 0 -> 5741 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTemplateViewMarginOnInitialDisplay.png diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTemplateViewMarginOnInitialDisplay.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyTemplateViewMarginOnInitialDisplay.png new file mode 100644 index 0000000000000000000000000000000000000000..8a35c1caf2161b83516cfd5130e0762bddc89194 GIT binary patch literal 5741 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