fix: ios navbar lifecycle

unoplatform · Feb 4, 2025 · 54bd5be · 54bd5be
1 parent 06822e9
commit 54bd5be
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 2 deletions.
diff --git a/...no.Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage1.xaml b/...no.Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage1.xaml
@@ -8,12 +8,20 @@
 	  xmlns:utu="using:Uno.Toolkit.UI"
 	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
 	  mc:Ignorable="d ios">
+	<Page.Resources>
+		<Style x:Key="SmallFlyoutPresenterStyle"
+			   TargetType="FlyoutPresenter">
+			<Setter Property="MinHeight" Value="300" />
+			<Setter Property="MinWidth" Value="300" />
+		</Style>
+	</Page.Resources>
 
 	<Grid>
 
 		<Grid.RowDefinitions>
 			<RowDefinition Height="Auto" />
 			<RowDefinition Height="*" />
+			<RowDefinition Height="*" />
 		</Grid.RowDefinitions>
 		<utu:NavigationBar Content="First Page"
 						   MainCommandMode="Action"
@@ -22,6 +30,7 @@
 			<utu:NavigationBar.MainCommand>
 				<AppBarButton Click="NavigateBack"
 							  Label="Close"
+							  AutomationProperties.AutomationId="FluentPage1NavBarMainCommand"
 							  Style="{StaticResource DefaultAppBarButtonStyle}">
 					<AppBarButton.Icon>
 						<BitmapIcon UriSource="ms-appx:///Assets/CloseIcon.png" />
@@ -72,5 +81,34 @@
 			<Button Click="NavigateToNextPage"
 					Content="Navigate To Second Page" />
 		</StackPanel>
+
+		<StackPanel Grid.Row="2"
+					VerticalAlignment="Stretch">
+			<Button AutomationProperties.AutomationId="OpenPage2FlyoutButton"
+					Content="Open Page2 in flyout"
+					Click="OpenPage2Flyout"
+					Grid.Row="2">
+				<Button.Flyout>
+					<Flyout FlyoutPresenterStyle="{StaticResource SmallFlyoutPresenterStyle}">
+						<Grid>
+							<Frame x:Name="Page2FlyoutFrame" />
+						</Grid>
+					</Flyout>
+				</Button.Flyout>
+			</Button>
+
+			<Button AutomationProperties.AutomationId="OpenPage3FlyoutButton"
+					Content="Open Page3 in flyout"
+					Click="OpenPage3Flyout"
+					Grid.Row="2">
+				<Button.Flyout>
+					<Flyout FlyoutPresenterStyle="{StaticResource SmallFlyoutPresenterStyle}">
+						<Grid>
+							<Frame x:Name="Page3FlyoutFrame" />
+						</Grid>
+					</Flyout>
+				</Button.Flyout>
+			</Button>
+		</StackPanel>
 	</Grid>
 </Page>
diff --git a/...Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage1.xaml.cs b/...Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage1.xaml.cs
@@ -31,4 +31,8 @@ public FluentNavigationBarSampleNestedPage()
 	private void NavigateToNextPage(object sender, RoutedEventArgs e) => Frame.Navigate(typeof(FluentNavigationBarSampleNestedPage2));
 
 	private void NavigateBack(object sender, RoutedEventArgs e) => Shell.GetForCurrentView().BackNavigateFromNestedSample();
+
+	private void OpenPage2Flyout(object sender, RoutedEventArgs e) => Page2FlyoutFrame.Navigate(typeof(FluentNavigationBarSampleNestedPage2));
+
+	private void OpenPage3Flyout(object sender, RoutedEventArgs e) => Page3FlyoutFrame.Navigate(typeof(FluentNavigationBarSampleNestedPage3));
 }
diff --git a/...no.Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage2.xaml b/...no.Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage2.xaml
@@ -16,6 +16,16 @@
 		<utu:NavigationBar Content="Second Page"
 						   AutomationProperties.AutomationId="FluentPage2NavBar"
 						   Style="{StaticResource DefaultNavigationBar}">
+			<utu:NavigationBar.MainCommand>
+				<AppBarButton Click="NavigateBack"
+							  Label="Close"
+							  AutomationProperties.AutomationId="FluentPage2NavBarMainCommand"
+							  Style="{StaticResource DefaultAppBarButtonStyle}">
+					<AppBarButton.Icon>
+						<BitmapIcon UriSource="ms-appx:///Assets/CloseIcon.png" />
+					</AppBarButton.Icon>
+				</AppBarButton>
+			</utu:NavigationBar.MainCommand>
 			<utu:NavigationBar.PrimaryCommands>
 				<AppBarButton Label="More"
 							  Style="{StaticResource DefaultAppBarButtonStyle}" />
@@ -40,6 +50,10 @@
 				to navigate back.
 			</TextBlock>
 
+			<Button AutomationProperties.AutomationId="NavigateToThirdButton"
+					Click="NavigateToThird"
+					Content="Navigate to Third" />
+
 			<Button Click="NavigateBack"
 					Content="Navigate Back" />
 		</StackPanel>

diff --git a/...Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage2.xaml.cs b/...Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage2.xaml.cs
@@ -24,4 +24,6 @@ public FluentNavigationBarSampleNestedPage2()
     }
 
 	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
+
+	private void NavigateToThird(object sender, RoutedEventArgs e) => Frame.Navigate(typeof(FluentNavigationBarSampleNestedPage3));
 }
diff --git a/...no.Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage3.xaml b/...no.Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage3.xaml
@@ -0,0 +1,31 @@
+<Page x:Class="Uno.Toolkit.Samples.Content.NestedSamples.FluentNavigationBarSampleNestedPage3"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:local="using:Uno.Toolkit.Samples.Content.NestedSamples"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:utu="using:Uno.Toolkit.UI"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  mc:Ignorable="d"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+		</Grid.RowDefinitions>
+		<utu:NavigationBar Content="Third Page"
+						   AutomationProperties.AutomationId="FluentPage3NavBar"
+						   Style="{StaticResource DefaultNavigationBar}">
+			<utu:NavigationBar.MainCommand>
+				<AppBarButton Click="NavigateBack"
+							  Label="Back"
+							  AutomationProperties.AutomationId="FluentPage3NavBarMainCommand"
+							  Style="{StaticResource DefaultAppBarButtonStyle}">
+					<AppBarButton.Icon>
+						<BitmapIcon UriSource="ms-appx:///Assets/CloseIcon.png" />
+					</AppBarButton.Icon>
+				</AppBarButton>
+			</utu:NavigationBar.MainCommand>
+		</utu:NavigationBar>
+	</Grid>
+</Page>
diff --git a/...Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage3.xaml.cs b/...Toolkit.Samples.Shared/Content/NestedSamples/FluentNavigationBarSampleNestedPage3.xaml.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Uno.Toolkit.UI;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+#endif
+
+namespace Uno.Toolkit.Samples.Content.NestedSamples;
+
+public sealed partial class FluentNavigationBarSampleNestedPage3 : Page
+{
+    public FluentNavigationBarSampleNestedPage3()
+    {
+        this.InitializeComponent();
+    }
+
+	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
+}
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Uno.Toolkit.Samples.Shared.projitems
@@ -85,6 +85,9 @@
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\FluentNavigationBarSampleNestedPage1.xaml.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\FluentNavigationBarSampleNestedPage2.xaml.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\FluentNavigationBarSampleNestedPage3.xaml.cs">
+      <DependentUpon>FluentNavigationBarSampleNestedPage3.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialBottomBarSampleNestedPage.xaml.cs">
       <DependentUpon>M3MaterialBottomBarSampleNestedPage.xaml</DependentUpon>
     </Compile>
@@ -344,6 +347,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\FluentNavigationBarSampleNestedPage3.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\M3MaterialBottomBarSampleNestedPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeNavigationBarPresenter.Android.cs b/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeNavigationBarPresenter.Android.cs
@@ -32,9 +32,15 @@ public partial class NativeNavigationBarPresenter
 
 		public NativeNavigationBarPresenter()
 		{
+			Loaded += OnLoaded;
 			Unloaded += OnUnloaded;
 		}
 
+		private void OnLoaded(object sender, RoutedEventArgs e)
+		{
+			OnOwnerChanged();
+		}
+
 		private void OnUnloaded(object sender, RoutedEventArgs e)
 		{
 			_mainCommandClickHandler.Disposable = null;

diff --git a/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeNavigationBarPresenter.iOS.cs b/src/Uno.Toolkit.UI/Controls/NavigationBar/NativeNavigationBarPresenter.iOS.cs
@@ -41,9 +41,15 @@ public partial class NativeNavigationBarPresenter
 
 		public NativeNavigationBarPresenter()
 		{
+			Loaded += OnLoaded;
 			Unloaded += OnUnloaded;
 		}
 
+		private void OnLoaded(object sender, RoutedEventArgs e)
+		{
+			OnOwnerChanged();
+		}
+
 		private void OnUnloaded(object sender, RoutedEventArgs e)
 		{
 			_statusBarSubscription.Disposable = null;
@@ -141,8 +147,6 @@ protected override Size MeasureOverride(Size size)
 
 			return measuredSize;
 		}
-
-
 	}
 }
 #endif
diff --git a/src/Uno.Toolkit.UITest/Controls/NavigationBar/Given_NavigationBar.cs b/src/Uno.Toolkit.UITest/Controls/NavigationBar/Given_NavigationBar.cs
@@ -121,5 +121,30 @@ public void NavBar_AppBarButton_With_Icon_Click()
 
 			App.WaitForElement("FluentPage2NavBar", "Timed out waiting for Page 2 Nav Bar");
 		}
+
+		[Test]
+		[AutoRetry]
+		public void NavBar_Can_Close_Flyout_With_MainCommand()
+		{
+			NavigateToNestedSample("FluentNavigationBarSampleNestedPage");
+			App.Tap("OpenPage2FlyoutButton");
+			App.WaitForElement("FluentPage2NavBar", "Timed out waiting for Page 2 Nav Bar");
+			App.Tap("NavigateToThirdButton");
+			App.WaitForElement("FluentPage3NavBar", "Timed out waiting for Page 3 Nav Bar");
+
+			PlatformHelpers.On(
+				iOS: () => App.Tap("FluentPage3NavBarMainCommand"),
+				Android: () => App.Tap(q => q.Marked("FluentPage3NavBar").Descendant("AppCompatImageButton"))
+			);
+
+			App.WaitForElement("FluentPage2NavBar", "Timed out waiting for Page 2 Nav Bar");
+
+			PlatformHelpers.On(
+				iOS: () => App.Tap("FluentPage2NavBarMainCommand"),
+				Android: () => App.Tap(q => q.Marked("FluentPage2NavBar").Descendant("AppCompatImageButton"))
+			);
+
+			App.WaitForElement("FluentPage1NavBar", "Timed out waiting for Page 1 Nav Bar");
+		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,6 @@ public FluentNavigationBarSampleNestedPage2() @@
         }
     	private void NavigateBack(object sender, RoutedEventArgs e) => Frame.GoBack();
+    	private void NavigateToThird(object sender, RoutedEventArgs e) => Frame.Navigate(typeof(FluentNavigationBarSampleNestedPage3));
     }