From 42c5ef36318f2ac35f73a6fc02673e6ea05e81aa Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Thu, 14 Nov 2024 15:57:20 +0530 Subject: [PATCH 1/5] Fixed-ToolBarVisible-Issue --- .../Windows/Extensions/ToolbarExtensions.cs | 4 + .../VerifyInitialToolbarButtonHidden.png | Bin 0 -> 8422 bytes ...erifyToolbarButtonHiddenOnNavigateBack.png | Bin 0 -> 8422 bytes .../TestCases.HostApp/Issues/Issue24547.cs | 109 ++++++++++++++++++ .../Tests/Issues/Issue24547.cs | 31 +++++ .../ios/VerifyInitialToolbarButtonHidden.png | Bin 0 -> 16835 bytes ...erifyToolbarButtonHiddenOnNavigateBack.png | Bin 0 -> 16835 bytes 7 files changed, 144 insertions(+) create mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyInitialToolbarButtonHidden.png create mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyToolbarButtonHiddenOnNavigateBack.png create mode 100644 src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs create mode 100644 src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs create mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyInitialToolbarButtonHidden.png create mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarButtonHiddenOnNavigateBack.png diff --git a/src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs b/src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs index 0fb31579521c..1a037424ca29 100644 --- a/src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs +++ b/src/Controls/src/Core/Platform/Windows/Extensions/ToolbarExtensions.cs @@ -35,6 +35,10 @@ public static void UpdateBackButton(this MauiToolbar platformToolbar, Toolbar to platformToolbar.IsBackEnabled = toolbar.BackButtonEnabled && toolbar.BackButtonVisible; + // Adjusts WinUI TogglePaneButton visibility based on DrawerToggleVisible setting. + if (platformToolbar.TogglePaneButton is not null) + platformToolbar.TogglePaneButton.Visibility = toolbar.DrawerToggleVisible ? UI.Xaml.Visibility.Visible : UI.Xaml.Visibility.Collapsed; + platformToolbar .IsBackButtonVisible = (toolbar.BackButtonVisible) ? NavigationViewBackButtonVisible.Visible : NavigationViewBackButtonVisible.Collapsed; diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyInitialToolbarButtonHidden.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyInitialToolbarButtonHidden.png new file mode 100644 index 0000000000000000000000000000000000000000..db98dbb8d1327bfe6e856603fbaf311c91cd81be GIT binary patch literal 8422 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 SHRT2kaOi;7{<5zFF8>qx%gQbQ literal 0 HcmV?d00001 diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyToolbarButtonHiddenOnNavigateBack.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyToolbarButtonHiddenOnNavigateBack.png new file mode 100644 index 0000000000000000000000000000000000000000..7172fe525cad67e006db8481469a926b0a0c4bd1 GIT binary patch literal 8422 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 SY`4J&IC9AIVCgshSN{nx7Rapt literal 0 HcmV?d00001 diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs new file mode 100644 index 000000000000..e6920bfe6597 --- /dev/null +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs @@ -0,0 +1,109 @@ +namespace Maui.Controls.Sample.Issues +{ + [Issue(IssueTracker.Github, 24547, "[Windows] FlyoutPage ShouldShowToolbarButton when overridden to return false, still shows button in title bar", PlatformAffected.UWP)] + public class Issue24547 : NavigationPage + { + + public Issue24547() : base(new Issue24547PopoverPage()) + { + + } + public partial class Issue24547PopoverPage : FlyoutPage + { + public Issue24547PopoverPage() + { + FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover; + + Flyout = new ContentPage + { + Title = "Flyout", + BackgroundColor = Colors.Red, + Content = new StackLayout + { + Children = { + new Label { Text = "Flyout" } + } + } + }; + + ContentPage contentPage = new ContentPage + { + BackgroundColor = Colors.Green, + Title = "Detail", + Content = new StackLayout + { + Children = + { + CreateDetailButton() + } + } + }; + + Detail = new NavigationPage(contentPage); + Button button = new Button() { Text = "Menu", AutomationId = "MenuButton" }; + button.Clicked += (s, e) => IsPresented = true; + NavigationPage.SetTitleView(contentPage, button); + } + + private Button CreateDetailButton() + { + Button button = new Button + { + Text = "Detail", + AutomationId = "DetailButton" + }; + + button.Clicked += OnDetailButtonClicked; + return button; + } + + private async void OnDetailButtonClicked(object sender, EventArgs e) + { + await this.Window.Page.Navigation.PushAsync(new NavigationPage(new Issue24547Page1())); + } + + public override bool ShouldShowToolbarButton() + { + return false; + } + } + + public partial class Issue24547Page1 : ContentPage + { + public Issue24547Page1() + { + Title = "Content Page"; + VerticalStackLayout layout = new VerticalStackLayout + { + Children = + { + CreatePopButton() + } + }; + Content = layout; + + ToolbarItems.Add(new ToolbarItem + { + Text = "Item One", + }); + } + + private Button CreatePopButton() + { + Button button = new Button + { + Text = "Pop Button", + AutomationId = "PopButton", + }; + + button.Clicked += OnPopButtonClicked; + return button; + } + + private async void OnPopButtonClicked(object sender, EventArgs e) + { + await this.Window.Page.Navigation.PopAsync(); + } + } + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs new file mode 100644 index 000000000000..8eeb51a449d7 --- /dev/null +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs @@ -0,0 +1,31 @@ +using NUnit.Framework; +using UITest.Appium; +using UITest.Core; + +namespace Microsoft.Maui.TestCases.Tests.Issues; +public class Issue24547: _IssuesUITest +{ + public Issue24547(TestDevice device) : base(device) { } + + public override string Issue => "[Windows] FlyoutPage ShouldShowToolbarButton when overridden to return false, still shows button in title bar"; + + [Test] + [Category(UITestCategories.FlyoutPage)] + public void VerifyInitialToolbarButtonHidden() + { + App.WaitForElement("DetailButton"); + VerifyScreenshot(); + } + + [Test] + [Category(UITestCategories.FlyoutPage)] + public void VerifyToolbarButtonHiddenOnNavigateBack() + { + App.WaitForElement("DetailButton"); + App.Tap("DetailButton"); + App.WaitForElement("PopButton"); + App.Tap("PopButton"); + App.WaitForElement("DetailButton"); + VerifyScreenshot(); + } +} \ No newline at end of file diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyInitialToolbarButtonHidden.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyInitialToolbarButtonHidden.png new file mode 100644 index 0000000000000000000000000000000000000000..15e5fdc47f30ee9603a177b6b8fc8911970bbc07 GIT binary patch literal 16835 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 B9E<<} literal 0 HcmV?d00001 diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarButtonHiddenOnNavigateBack.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarButtonHiddenOnNavigateBack.png new file mode 100644 index 0000000000000000000000000000000000000000..c5339eab03a00704a272a7d35acd5eef14550112 GIT binary patch literal 16835 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 AyZ`_I literal 0 HcmV?d00001 From 4c64e38d969273d623cf088e056eb607694f8304 Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:01:38 +0530 Subject: [PATCH 2/5] Added-Platform-Condition --- .../tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs index 8eeb51a449d7..f9dc8fcee3e8 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs @@ -1,4 +1,5 @@ -using NUnit.Framework; +#if !MACCATALYST +using NUnit.Framework; using UITest.Appium; using UITest.Core; @@ -28,4 +29,5 @@ public void VerifyToolbarButtonHiddenOnNavigateBack() App.WaitForElement("DetailButton"); VerifyScreenshot(); } -} \ No newline at end of file +} +#endif \ No newline at end of file From 96248f13510c5f18f072979d90c8d65c0101d95f Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Thu, 14 Nov 2024 18:07:55 +0530 Subject: [PATCH 3/5] Removed --- src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs index e6920bfe6597..38d869173da2 100644 --- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs @@ -8,7 +8,7 @@ public Issue24547() : base(new Issue24547PopoverPage()) { } - public partial class Issue24547PopoverPage : FlyoutPage + public class Issue24547PopoverPage : FlyoutPage { public Issue24547PopoverPage() { @@ -68,7 +68,7 @@ public override bool ShouldShowToolbarButton() } } - public partial class Issue24547Page1 : ContentPage + public class Issue24547Page1 : ContentPage { public Issue24547Page1() { From f3925604afd52ac9c5d21a8809bccadf347d48c1 Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:25:23 +0530 Subject: [PATCH 4/5] Modified-TestCases-Added-SnapShot --- ...erifyToolbarButtonHiddenOnNavigateBack.png | Bin 8422 -> 0 bytes .../TestCases.HostApp/Issues/Issue24547.cs | 120 +++++------------- .../Tests/Issues/Issue24547.cs | 12 -- .../ios/VerifyInitialToolbarButtonHidden.png | Bin 16835 -> 16822 bytes ...erifyToolbarButtonHiddenOnNavigateBack.png | Bin 16835 -> 0 bytes 5 files changed, 34 insertions(+), 98 deletions(-) delete mode 100644 src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyToolbarButtonHiddenOnNavigateBack.png delete mode 100644 src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarButtonHiddenOnNavigateBack.png diff --git a/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyToolbarButtonHiddenOnNavigateBack.png b/src/Controls/tests/TestCases.Android.Tests/snapshots/android/VerifyToolbarButtonHiddenOnNavigateBack.png deleted file mode 100644 index 7172fe525cad67e006db8481469a926b0a0c4bd1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8422 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 SY`4J&IC9AIVCgshSN{nx7Rapt diff --git a/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs b/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs index 38d869173da2..73c372b067b3 100644 --- a/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs +++ b/src/Controls/tests/TestCases.HostApp/Issues/Issue24547.cs @@ -1,109 +1,57 @@ namespace Maui.Controls.Sample.Issues { [Issue(IssueTracker.Github, 24547, "[Windows] FlyoutPage ShouldShowToolbarButton when overridden to return false, still shows button in title bar", PlatformAffected.UWP)] - public class Issue24547 : NavigationPage + public class Issue24547PopoverPage : FlyoutPage { - - public Issue24547() : base(new Issue24547PopoverPage()) + public Issue24547PopoverPage() { + FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover; - } - public class Issue24547PopoverPage : FlyoutPage - { - public Issue24547PopoverPage() + Flyout = new ContentPage { - FlyoutLayoutBehavior = FlyoutLayoutBehavior.Popover; - - Flyout = new ContentPage + Title = "Flyout", + BackgroundColor = Colors.Red, + Content = new StackLayout { - Title = "Flyout", - BackgroundColor = Colors.Red, - Content = new StackLayout - { - Children = { - new Label { Text = "Flyout" } - } + Children = { + new Label { Text = "Flyout" } } - }; + } + }; - ContentPage contentPage = new ContentPage + ContentPage contentPage = new ContentPage + { + BackgroundColor = Colors.Green, + Title = "Detail", + Content = new StackLayout { - BackgroundColor = Colors.Green, - Title = "Detail", - Content = new StackLayout + Children = { - Children = - { - CreateDetailButton() - } + CreateDetailButton() } - }; - - Detail = new NavigationPage(contentPage); - Button button = new Button() { Text = "Menu", AutomationId = "MenuButton" }; - button.Clicked += (s, e) => IsPresented = true; - NavigationPage.SetTitleView(contentPage, button); - } - - private Button CreateDetailButton() - { - Button button = new Button - { - Text = "Detail", - AutomationId = "DetailButton" - }; - - button.Clicked += OnDetailButtonClicked; - return button; - } - - private async void OnDetailButtonClicked(object sender, EventArgs e) - { - await this.Window.Page.Navigation.PushAsync(new NavigationPage(new Issue24547Page1())); - } + } + }; - public override bool ShouldShowToolbarButton() - { - return false; - } + Detail = new NavigationPage(contentPage); + Button button = new Button() { Text = "Menu", AutomationId = "MenuButton" }; + button.Clicked += (s, e) => IsPresented = true; + NavigationPage.SetTitleView(contentPage, button); } - public class Issue24547Page1 : ContentPage + private Button CreateDetailButton() { - public Issue24547Page1() - { - Title = "Content Page"; - VerticalStackLayout layout = new VerticalStackLayout - { - Children = - { - CreatePopButton() - } - }; - Content = layout; - - ToolbarItems.Add(new ToolbarItem - { - Text = "Item One", - }); - } - - private Button CreatePopButton() + Button button = new Button { - Button button = new Button - { - Text = "Pop Button", - AutomationId = "PopButton", - }; + Text = "Detail", + AutomationId = "DetailButton" + }; - button.Clicked += OnPopButtonClicked; - return button; - } + return button; + } - private async void OnPopButtonClicked(object sender, EventArgs e) - { - await this.Window.Page.Navigation.PopAsync(); - } + public override bool ShouldShowToolbarButton() + { + return false; } } } \ No newline at end of file diff --git a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs index f9dc8fcee3e8..98aa1187a784 100644 --- a/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs +++ b/src/Controls/tests/TestCases.Shared.Tests/Tests/Issues/Issue24547.cs @@ -17,17 +17,5 @@ public void VerifyInitialToolbarButtonHidden() App.WaitForElement("DetailButton"); VerifyScreenshot(); } - - [Test] - [Category(UITestCategories.FlyoutPage)] - public void VerifyToolbarButtonHiddenOnNavigateBack() - { - App.WaitForElement("DetailButton"); - App.Tap("DetailButton"); - App.WaitForElement("PopButton"); - App.Tap("PopButton"); - App.WaitForElement("DetailButton"); - VerifyScreenshot(); - } } #endif \ No newline at end of file diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyInitialToolbarButtonHidden.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyInitialToolbarButtonHidden.png index 15e5fdc47f30ee9603a177b6b8fc8911970bbc07..f240a5030146f4e211037bc9d8f9d38aa23e905b 100644 GIT binary patch literal 16822 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 diff --git a/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarButtonHiddenOnNavigateBack.png b/src/Controls/tests/TestCases.iOS.Tests/snapshots/ios/VerifyToolbarButtonHiddenOnNavigateBack.png deleted file mode 100644 index c5339eab03a00704a272a7d35acd5eef14550112..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16835 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 AyZ`_I From 87afa4a21b54707f79824786d51fc41d3134f0e5 Mon Sep 17 00:00:00 2001 From: prakashKannanSf3972 <127308739+prakashKannanSf3972@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:05:24 +0530 Subject: [PATCH 5/5] Added-Windows-SnapShot --- .../windows/VerifyInitialToolbarButtonHidden.png | Bin 0 -> 6473 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyInitialToolbarButtonHidden.png diff --git a/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyInitialToolbarButtonHidden.png b/src/Controls/tests/TestCases.WinUI.Tests/snapshots/windows/VerifyInitialToolbarButtonHidden.png new file mode 100644 index 0000000000000000000000000000000000000000..50ea184c4a0bd112e8ca0044970c7dc05adecb9e GIT binary patch literal 6473 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