From 7ecfbffb13543c5ce83e44df8a9ab655ea512055 Mon Sep 17 00:00:00 2001
From: Xiaotian Gu <xiaoyao312@gmail.com>
Date: Fri, 9 Sep 2022 14:13:05 -0400
Subject: [PATCH] feat: TabBarItemExtensions (#293)

---
 doc/controls-styles.md                        |   1 +
 doc/helpers/TabBarItem-extensions.md          |  29 +++
 .../Uno.Toolkit.Samples.Droid.csproj          |  10 +-
 .../Uno.Toolkit.Samples.Shared/App.xaml       |   2 +-
 .../TabBarItemExtensionsSamplePage.xaml       | 154 ++++++++++++++++
 .../TabBarItemExtensionsSamplePage.xaml.cs    |  53 ++++++
 .../TabBarItemExtensions_NestedPage1.xaml     |  31 ++++
 .../TabBarItemExtensions_NestedPage1.xaml.cs  |  41 +++++
 .../TabBarItemExtensions_NestedPage2.xaml     |  13 ++
 .../TabBarItemExtensions_NestedPage2.xaml.cs  |  41 +++++
 .../Uno.Toolkit.Samples.Shared.projitems      |  21 +++
 .../Uno.Toolkit.Samples.Skia.Gtk.csproj       |  12 +-
 .../Uno.Toolkit.Samples.Skia.Tizen.csproj     |   4 +-
 .../Uno.Toolkit.Samples.Skia.Wpf.Host.csproj  |   4 +-
 .../Uno.Toolkit.Samples.Skia.Wpf.csproj       |   4 +-
 .../Uno.Toolkit.Samples.UWP.csproj            |   6 +-
 .../Uno.Toolkit.Samples.Wasm.csproj           |  12 +-
 .../Uno.Toolkit.Samples.iOS.csproj            |  20 +-
 .../Uno.Toolkit.Samples.macOS.csproj          |  10 +-
 .../Uno.Toolkit.WinUI.Samples.Droid.csproj    |   8 +-
 .../Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj |  10 +-
 .../Uno.Toolkit.WinUI.Samples.UWP.csproj      |   2 +-
 .../Uno.Toolkit.WinUI.Samples.Wasm.csproj     |  10 +-
 ...olkit.WinUI.Samples.Windows.Desktop.csproj |   2 +-
 .../Uno.Toolkit.WinUI.Samples.iOS.csproj      |   8 +-
 .../Uno.Toolkit.WinUI.Samples.macOS.csproj    |   8 +-
 .../Behaviors/TabBarItemExtensions.cs         | 174 ++++++++++++++++++
 .../Helpers/ScrollableHelper.cs               | 145 +++++++++++++++
 .../Helpers/VisualTreeHelperEx.cs             | 157 ++++++++++++++--
 src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj      |   2 +-
 src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj   |   2 +-
 .../Uno.Toolkit.UI.Cupertino.csproj           |   4 +-
 .../Uno.Toolkit.WinUI.Cupertino.csproj        |   4 +-
 .../Uno.Toolkit.UI.Material.csproj            |   4 +-
 .../Uno.Toolkit.WinUI.Material.csproj         |   4 +-
 35 files changed, 927 insertions(+), 85 deletions(-)
 create mode 100644 doc/helpers/TabBarItem-extensions.md
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml.cs
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml.cs
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml
 create mode 100644 samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml.cs
 create mode 100644 src/Uno.Toolkit.UI/Behaviors/TabBarItemExtensions.cs
 create mode 100644 src/Uno.Toolkit.UI/Helpers/ScrollableHelper.cs

diff --git a/doc/controls-styles.md b/doc/controls-styles.md
index 20c72d6c3..fe07f7918 100644
--- a/doc/controls-styles.md
+++ b/doc/controls-styles.md
@@ -16,6 +16,7 @@ The `Uno.Toolkit.UI` library adds the following helper classes:
 - [`ControlExtensions`](helpers\control-extensions.md): Provides various attached properties for common controls.
 - [`InputExtensions`](helpers\input-extensions.md): Provides various attached properties for _input controls_, such as `TextBox` and `PasswordBox`.
 - [`StatusBar`](helpers\StatusBar-extensions.md): Provides two attached properties on `Page` to controls the visual of the status bar on mobile platforms.
+- [`TabBarItemExtensions`](helpers\TabBarItem-extensions.md): Provides additional features for `TabBarItem`.
 
 ## Control Styles
 Control|Style Key|IsDefaultStyle*
diff --git a/doc/helpers/TabBarItem-extensions.md b/doc/helpers/TabBarItem-extensions.md
new file mode 100644
index 000000000..9a6c94bc9
--- /dev/null
+++ b/doc/helpers/TabBarItem-extensions.md
@@ -0,0 +1,29 @@
+# TabBarItemExtensions Attached Properties
+Provides additional features for `TabBarItem`.
+
+## Properties
+Property|Type|Description
+-|-|-
+OnClickBehaviors|TBIOnClickBehavior\*|Backing property for the `TabBarItem` on-click behaviors when already selected.
+OnClickBehaviorsTarget|UIElement|Optional. Backing property for the target of OnClickBehaviors.\*
+
+TBIOnClickBehavior\*: Specifies the on-click behaviors of `TabBarItem`:
+  - `BackNavigation`: Find the first `NavigationView` with back stack to back navigate.
+  - `ScrollToTop`: Find the first `ListView` or `ScrollViewer` to reset scroll position.
+  - `Auto`: All of above.
+
+OnClickBehaviorsTarget\*: The content host which the on-click behavior is applied is either the target itself or one of its descendent (via deep first search) suitable for the behavior. When omitted, the parent of `TabBar` will serve as the target.
+
+## Usage
+```xml
+xmlns:utu="using:Uno.Toolkit.UI"
+...
+
+<Grid>
+    <ListView Grid.Row="0" ... />
+    <ScrollViewer Grid.Row="0" ... />
+    <Frame Grid.Row="0" ... />
+
+    <TabBar Grid.Row="1">
+        <utu:TabBarItem ... utu:TabBarItemExtensions.OnClickBehaviors="Auto" />
+```
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
index 14dee7557..5d52c8000 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Droid/Uno.Toolkit.Samples.Droid.csproj
@@ -66,13 +66,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
@@ -88,7 +88,7 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
       <Version>2.3.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageReference Include="Xamarin.Jetbrains.Annotations">
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml
index 6957a41dc..7c95dc432 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/App.xaml
@@ -26,7 +26,7 @@
 				<MaterialToolkitResourcesV1 xmlns="using:Uno.Toolkit.UI.Material" />
 				<MaterialToolkitResourcesV2 xmlns="using:Uno.Toolkit.UI.Material" />
 				<CupertinoToolkitResources xmlns="using:Uno.Toolkit.UI.Cupertino" />
-input
+
 				<!-- Load application resources -->
 				<ResourceDictionary Source="Converters.xaml" />
 				<ResourceDictionary Source="ms-appx:///Styles/Application/Colors.xaml" />
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml
new file mode 100644
index 000000000..16268a867
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml
@@ -0,0 +1,154 @@
+<Page x:Class="Uno.Toolkit.Samples.Content.Controls.TabBarItemExtensionsSamplePage"
+	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	  xmlns:local="using:Uno.Toolkit.Samples.Content.Controls"
+	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  xmlns:utu="using:Uno.Toolkit.UI"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
+	  mc:Ignorable="d">
+
+	<!--
+		TabBarItemExtensionsSamplePage:
+			tab1: Frame { TabBarItemExtensions_NestedPage1 <-> TabBarItemExtensions_NestedPage2 }
+			tab2: ListView
+			tab3: ScrollViewer
+	-->
+	<!--
+		note: This sample must not be placed within a ScrollViewer.
+		Since ListView or ScrollViewer doesn't work properly when nested under another ScrollViewer.
+	-->
+
+	<Grid x:Name="RootPanel"
+		  Padding="48,0">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+			<RowDefinition Height="Auto" />
+		</Grid.RowDefinitions>
+
+		<StackPanel Grid.Row="0"
+					Margin="0,0,0,20"
+					Spacing="10">
+			<TextBlock Style="{StaticResource TitleTextBlockStyle}"
+					   Text="TabBarItemExtensions" />
+			<TextBlock Style="{StaticResource BodyTextBlockStyle}"
+					   Text="ResetPageOnClick property allows a selected TabBarItem to reset the page content when clicked" />
+		</StackPanel>
+
+		<Frame x:Name="NestedNestedFrame"
+			   Grid.Row="1"
+			   Visibility="{Binding ElementName=TabBarItem_Frame, Path=IsSelected}" />
+		<Grid Grid.Row="1"
+			  Visibility="{Binding ElementName=TabBarItem_ListView, Path=IsSelected}">
+			<!-- 20items * 200min-height ~= 4000 -->
+			<ListView x:Name="LV_SUT"
+					  Grid.Row="1"
+					  Grid.ColumnSpan="2"
+					  ItemsSource="ABCDEFGHIJKLMNOPQRST">
+				<ListView.ItemTemplate>
+					<DataTemplate>
+						<Border MinHeight="200"
+								Margin="4"
+								Padding="4"
+								Background="SkyBlue"
+								BorderBrush="Azure"
+								BorderThickness="1"
+								CornerRadius="8">
+							<TextBlock HorizontalAlignment="Center"
+									   VerticalAlignment="Center"
+									   Foreground="Black"
+									   Text="{Binding}" />
+						</Border>
+					</DataTemplate>
+				</ListView.ItemTemplate>
+				<ListView.ItemContainerStyle>
+					<Style TargetType="ListViewItem">
+						<Setter Property="HorizontalAlignment"
+								Value="Stretch" />
+						<Setter Property="HorizontalContentAlignment"
+								Value="Stretch" />
+					</Style>
+				</ListView.ItemContainerStyle>
+			</ListView>
+
+			<StackPanel Margin="16"
+						HorizontalAlignment="Right"
+						VerticalAlignment="Bottom"
+						Orientation="Vertical"
+						Spacing="4">
+				<Button Click="ScrollTop"
+						Style="{StaticResource IconButtonStyle}"
+						Tag="{Binding ElementName=LV_SUT}">
+					<Button.Content>
+						<PathIcon Data="M12,7L17,12H14V16H10V12H7L12,7M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L5,8.09V15.91L12,19.85L19,15.91V8.09L12,4.15Z"
+								  Foreground="LightGreen"
+								  Tag="arrow-up-bold-hexagon-outline" />
+					</Button.Content>
+				</Button>
+				<Button Click="ScrollBottom"
+						Style="{StaticResource IconButtonStyle}"
+						Tag="{Binding ElementName=LV_SUT}">
+					<Button.Content>
+						<PathIcon Data="M12,17L7,12H10V8H14V12H17L12,17M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L5,8.09V15.91L12,19.85L19,15.91V8.09L12,4.15Z"
+								  Foreground="LightGreen"
+								  Tag="arrow-down-bold-hexagon-outline" />
+					</Button.Content>
+				</Button>
+			</StackPanel>
+		</Grid>
+		<Grid Grid.Row="1"
+			  Visibility="{Binding ElementName=TabBarItem_ScrollViewer, Path=IsSelected}">
+			<ScrollViewer x:Name="SV_SUT">
+				<Rectangle Width="100"
+						   Height="4000">
+					<Rectangle.Fill>
+						<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+							<GradientStop Offset="0" Color="Red" />
+							<GradientStop Offset="0.1666" Color="Orange" />
+							<GradientStop Offset="0.3333" Color="Yellow" />
+							<GradientStop Offset="0.5" Color="Green" />
+							<GradientStop Offset="0.6666" Color="Blue" />
+							<GradientStop Offset="0.8333" Color="Indigo" />
+							<GradientStop Offset="1" Color="Violet" />
+						</LinearGradientBrush>
+					</Rectangle.Fill>
+				</Rectangle>
+			</ScrollViewer>
+
+			<StackPanel Margin="16"
+						HorizontalAlignment="Right"
+						VerticalAlignment="Bottom"
+						Orientation="Vertical"
+						Spacing="4">
+				<Button Click="ScrollTop"
+						Style="{StaticResource IconButtonStyle}"
+						Tag="{Binding ElementName=SV_SUT}">
+					<Button.Content>
+						<PathIcon Data="M12,7L17,12H14V16H10V12H7L12,7M21,16.5C21,16.88 20.79,17.21 20.47,17.38L12.57,21.82C12.41,21.94 12.21,22 12,22C11.79,22 11.59,21.94 11.43,21.82L3.53,17.38C3.21,17.21 3,16.88 3,16.5V7.5C3,7.12 3.21,6.79 3.53,6.62L11.43,2.18C11.59,2.06 11.79,2 12,2C12.21,2 12.41,2.06 12.57,2.18L20.47,6.62C20.79,6.79 21,7.12 21,7.5V16.5M12,4.15L5,8.09V15.91L12,19.85L19,15.91V8.09L12,4.15Z"
+								  Foreground="LightGreen"
+								  Tag="arrow-up-bold-hexagon-outline" />
+					</Button.Content>
+				</Button>
+			</StackPanel>
+		</Grid>
+
+		<utu:TabBar x:Name="BottomTabBar"
+					Grid.Row="2"
+					Style="{StaticResource BottomTabBarStyle}">
+			<utu:TabBarItem x:Name="TabBarItem_Frame"
+							utu:TabBarItemExtensions.OnClickBehaviors="Auto"
+							Content="Frame"
+							IsSelected="True"
+							Style="{StaticResource BottomTabBarItemStyle}" />
+			<utu:TabBarItem x:Name="TabBarItem_ListView"
+							utu:TabBarItemExtensions.OnClickBehaviors="Auto"
+							Content="ListView"
+							Style="{StaticResource BottomTabBarItemStyle}" />
+			<utu:TabBarItem x:Name="TabBarItem_ScrollViewer"
+							utu:TabBarItemExtensions.OnClickBehaviors="Auto"
+							Content="ScrollViewer"
+							Style="{StaticResource BottomTabBarItemStyle}" />
+		</utu:TabBar>
+	</Grid>
+</Page>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml.cs
new file mode 100644
index 000000000..898ee9b8c
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarItemExtensionsSamplePage.xaml.cs
@@ -0,0 +1,53 @@
+using System;
+using Uno.Toolkit.Samples.Content.NestedSamples;
+using Uno.Toolkit.Samples.Entities;
+using Uno.Toolkit.UI;
+
+#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.Controls
+{
+	[SamplePage(SampleCategory.Behaviors, nameof(TabBarItemExtensions))]
+	public sealed partial class TabBarItemExtensionsSamplePage : Page
+	{
+		public TabBarItemExtensionsSamplePage()
+		{
+			this.InitializeComponent();
+
+			NestedNestedFrame.Navigate(typeof(TabBarItemExtensions_NestedPage1));
+		}
+
+		private void ScrollTop(object sender, RoutedEventArgs e)
+		{
+			if (!(sender is Button button)) return;
+			if (!(button.Tag is UIElement contentHost)) return;
+
+			switch (contentHost)
+			{
+				case ListView lv: ScrollableHelper.SmoothScrollTop(lv); break;
+				case ScrollViewer sv: sv.ChangeView(0, 0, zoomFactor: default, disableAnimation: false); break;
+
+				default: throw new InvalidOperationException();
+			}
+		}
+
+		private void ScrollBottom(object sender, RoutedEventArgs e)
+		{
+			if (!(sender is Button button)) return;
+			if (!(button.Tag is UIElement contentHost)) return;
+
+			switch (contentHost)
+			{
+				case ListView lv: ScrollableHelper.SmoothScrollBottom(lv); break;
+
+				default: throw new InvalidOperationException();
+			}
+		}
+	}
+}
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml
new file mode 100644
index 000000000..2d65b1ee3
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml
@@ -0,0 +1,31 @@
+<Page x:Class="Uno.Toolkit.Samples.Content.NestedSamples.TabBarItemExtensions_NestedPage1"
+	  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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  mc:Ignorable="d"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<Grid>
+		<ScrollViewer>
+			<StackPanel Spacing="50">
+				<Button Content="Navigate to Page2" Click="GotoNestedPage2" />
+				
+				<Rectangle Height="4000" Width="100">
+					<Rectangle.Fill>
+						<LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+							<GradientStop Color="Red" Offset="0" />
+							<GradientStop Color="Orange" Offset="0.1666" />
+							<GradientStop Color="Yellow" Offset="0.3333" />
+							<GradientStop Color="Green" Offset="0.5" />
+							<GradientStop Color="Blue" Offset="0.6666" />
+							<GradientStop Color="Indigo" Offset="0.8333" />
+							<GradientStop Color="Violet" Offset="1" />
+						</LinearGradientBrush>
+					</Rectangle.Fill>
+				</Rectangle>
+			</StackPanel>
+		</ScrollViewer>
+	</Grid>
+</Page>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml.cs
new file mode 100644
index 000000000..b9642a12f
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage1.xaml.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+#endif
+
+namespace Uno.Toolkit.Samples.Content.NestedSamples
+{
+	public sealed partial class TabBarItemExtensions_NestedPage1 : Page
+	{
+		public TabBarItemExtensions_NestedPage1()
+		{
+			this.InitializeComponent();
+		}
+
+		private void GotoNestedPage2(object sender, RoutedEventArgs e)
+		{
+			Frame.Navigate(typeof(TabBarItemExtensions_NestedPage2));
+		}
+	}
+}
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml
new file mode 100644
index 000000000..ea5f69803
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml
@@ -0,0 +1,13 @@
+<Page x:Class="Uno.Toolkit.Samples.Content.NestedSamples.TabBarItemExtensions_NestedPage2"
+	  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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	  mc:Ignorable="d"
+	  Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+	<Grid>
+		<Button Content="Go Back" Click="GoBack" />
+	</Grid>
+</Page>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml.cs b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml.cs
new file mode 100644
index 000000000..d2fa7aac4
--- /dev/null
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/NestedSamples/TabBarItemExtensions_NestedPage2.xaml.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+#endif
+
+namespace Uno.Toolkit.Samples.Content.NestedSamples
+{
+	public sealed partial class TabBarItemExtensions_NestedPage2 : Page
+	{
+		public TabBarItemExtensions_NestedPage2()
+		{
+			this.InitializeComponent();
+		}
+
+		private void GoBack(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
index 1a8df76fa..ad93cedde 100644
--- 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
@@ -44,6 +44,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)Content\Controls\StatusBarSamplePage.xaml.cs">
       <DependentUpon>StatusBarSamplePage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Content\Controls\TabBarItemExtensionsSamplePage.xaml.cs">
+      <DependentUpon>TabBarItemExtensionsSamplePage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Content\Helpers\BindingExtensionsSamplePage.xaml.cs">
       <DependentUpon>BindingExtensionsSamplePage.xaml</DependentUpon>
     </Compile>
@@ -89,6 +92,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\StatusBarSample_NestedPage2.xaml.cs">
       <DependentUpon>StatusBarSample_NestedPage2.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\TabBarItemExtensions_NestedPage1.xaml.cs">
+      <DependentUpon>TabBarItemExtensions_NestedPage1.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)Content\NestedSamples\TabBarItemExtensions_NestedPage2.xaml.cs">
+      <DependentUpon>TabBarItemExtensions_NestedPage2.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ModalDialog.xaml.cs">
       <DependentUpon>ModalDialog.xaml</DependentUpon>
     </Compile>
@@ -207,6 +216,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Content\Controls\TabBarItemExtensionsSamplePage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Content\Helpers\BindingExtensionsSamplePage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -267,6 +280,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\TabBarItemExtensions_NestedPage1.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Content\NestedSamples\TabBarItemExtensions_NestedPage2.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Controls\ModalDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
index 82636ba63..c2c1057a2 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Gtk/Uno.Toolkit.Samples.Skia.Gtk.csproj
@@ -29,11 +29,13 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.6" />
-    <PackageReference Include="Uno.Material" Version="2.3.0-dev.6" />
-    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.1-preview.79" />
+    <PackageReference Include="SkiaSharp.Views.Uno" Version="2.88.1-preview.79" />
+    <PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.12" />
+    <PackageReference Include="Uno.Material" Version="2.3.0-dev.12" />
+    <PackageReference Include="Uno.UI.Skia.Gtk" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Tizen/Uno.Toolkit.Samples.Skia.Tizen.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Tizen/Uno.Toolkit.Samples.Skia.Tizen.csproj
index 3693b8149..2f0c19298 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Tizen/Uno.Toolkit.Samples.Skia.Tizen.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Tizen/Uno.Toolkit.Samples.Skia.Tizen.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="SkiaSharp.Views" Version="2.80.2" />
-    <PackageReference Include="Uno.UI.Skia.Tizen" Version="4.2.0-dev.622" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.2.0-dev.622" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Skia.Tizen" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
   </ItemGroup>
   <Import Project="..\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
 </Project>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf.Host/Uno.Toolkit.Samples.Skia.Wpf.Host.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf.Host/Uno.Toolkit.Samples.Skia.Wpf.Host.csproj
index 1c802a6af..9a6292703 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf.Host/Uno.Toolkit.Samples.Skia.Wpf.Host.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf.Host/Uno.Toolkit.Samples.Skia.Wpf.Host.csproj
@@ -7,8 +7,8 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.2.0-dev.622" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.2.0-dev.622" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Assets\Fonts\uno-fluentui-assets.ttf" />
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf/Uno.Toolkit.Samples.Skia.Wpf.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf/Uno.Toolkit.Samples.Skia.Wpf.csproj
index d19a52f64..8c33c9820 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf/Uno.Toolkit.Samples.Skia.Wpf.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Skia.Wpf/Uno.Toolkit.Samples.Skia.Wpf.csproj
@@ -6,8 +6,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.2.0-dev.622" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.2.0-dev.622" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI.Skia.Wpf" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
   </ItemGroup>
   <ItemGroup>
     <UpToDateCheckInput Include="..\Uno.Toolkit.Samples.Shared\**\*.xaml" />
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
index 5ed86fc15..1f914b58c 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.UWP/Uno.Toolkit.Samples.UWP.csproj
@@ -12,12 +12,12 @@
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.6.0-prerelease.210623001" />
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
index 8bdff687a..6f95e1876 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Wasm/Uno.Toolkit.Samples.Wasm.csproj
@@ -45,15 +45,15 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-		<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.6" />
-		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
-		<PackageReference Include="Uno.Material" Version="2.3.0-dev.6" />
-		<PackageReference Include="Uno.UI.WebAssembly" Version="4.5.0-dev.453" />
-		<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.12" />
+		<PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0-dev.4" />
+		<PackageReference Include="Uno.Material" Version="2.3.0-dev.12" />
+		<PackageReference Include="Uno.UI.WebAssembly" Version="4.5.0-dev.797" />
+		<PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
 		<PackageReference Include="Uno.Wasm.Bootstrap" Version="4.0.0-dev.174" />
 		<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="4.0.0-dev.174" />
 		<PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
index 350a183d1..94dc38f28 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.iOS/Uno.Toolkit.Samples.iOS.csproj
@@ -12,7 +12,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <ResourcesDirectory>..\Uno.Toolkit.Samples.Shared\Strings</ResourcesDirectory>
-    
+
     <ProvisioningType>manual</ProvisioningType>
   </PropertyGroup>
   <PropertyGroup>
@@ -32,6 +32,9 @@
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>true</MtouchDebug>
     <MtouchExtraArgs>--setenv=MONO_LOG_LEVEL=debug --setenv=MONO_LOG_MASK=gc --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
+
+    <!-- uno#9430: Building for the iOS Simulator requires the use of the static registrar. -->
+    <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
     <DebugType>none</DebugType>
@@ -43,6 +46,9 @@
     <MtouchArch>x86_64</MtouchArch>
     <ConsolePause>false</ConsolePause>
     <MtouchExtraArgs>--setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
+
+    <!-- uno#9430: Building for the iOS Simulator requires the use of the static registrar. -->
+    <MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|iPhone' ">
     <DebugSymbols>true</DebugSymbols>
@@ -182,16 +188,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
     <PackageReference Include="Xamarin.TestCloud.Agent">
@@ -215,4 +221,4 @@
   <ItemGroup />
   <Import Project="..\Uno.Toolkit.Samples.Shared\Uno.Toolkit.Samples.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
index 76e52fa2c..e968bd271 100644
--- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
+++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.macOS/Uno.Toolkit.Samples.macOS.csproj
@@ -75,16 +75,16 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Cupertino">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
     <PackageReference Include="Uno.Material">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
index 1376d7d4d..cb35b1485 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Droid/Uno.Toolkit.WinUI.Samples.Droid.csproj
@@ -71,10 +71,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Material.WinUI">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.35" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
@@ -84,7 +84,7 @@
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
       <Version>2.3.1.1</Version>
     </PackageReference>
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
index b85ec4008..a0311cce3 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Skia.Gtk/Uno.Toolkit.WinUI.Samples.Skia.Gtk.csproj
@@ -34,10 +34,12 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.6" />
-    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="SkiaSharp.Skottie" Version="2.88.1-preview.79" />
+    <PackageReference Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.1-preview.79" />
+    <PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.12" />
+    <PackageReference Include="Uno.WinUI.Skia.Gtk" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.UWP/Uno.Toolkit.WinUI.Samples.UWP.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.UWP/Uno.Toolkit.WinUI.Samples.UWP.csproj
index eb64200e0..6185c902f 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.UWP/Uno.Toolkit.WinUI.Samples.UWP.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.UWP/Uno.Toolkit.WinUI.Samples.UWP.csproj
@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="5.0.0" />
     <PackageReference Include="Uno.WinUI">
-      <Version>4.2.0-dev.622</Version>
+      <Version>4.5.0-dev.797</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
index 8ab969562..a9af1ee28 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Wasm/Uno.Toolkit.WinUI.Samples.Wasm.csproj
@@ -41,14 +41,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
-    <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.3.0-dev.1" />
-    <PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.6" />
-    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.4.0-dev.4" />
+    <PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.12" />
+    <PackageReference Include="Uno.WinUI.WebAssembly" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
 	  <PackageReference Include="Uno.Wasm.Bootstrap" Version="4.0.0-dev.174" />
 	  <PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="4.0.0-dev.174" />
 	  <PackageReference Include="Microsoft.Windows.Compatibility" Version="5.0.1" />
-		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 	</ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
index 4311b532a..23c4add4f 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.Windows.Desktop/Uno.Toolkit.WinUI.Samples.Windows.Desktop.csproj
@@ -18,7 +18,7 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 		<PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-		<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.6" />
+		<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.12" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
index 9525b545a..13edeb9ef 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.iOS/Uno.Toolkit.WinUI.Samples.iOS.csproj
@@ -124,13 +124,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Material.WinUI">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Uno.Extensions.Logging.OSLog " Version="1.3.0-dev.1" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
diff --git a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
index ab5043d50..331de0fd7 100644
--- a/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
+++ b/samples/Uno.Toolkit.WinUI.Samples/Uno.Toolkit.WinUI.Samples.macOS/Uno.Toolkit.WinUI.Samples.macOS.csproj
@@ -74,13 +74,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Uno.Material.WinUI">
-      <Version>2.3.0-dev.6</Version>
+      <Version>2.3.0-dev.12</Version>
     </PackageReference>
-    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
-    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.453" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.WinUI" Version="4.5.0-dev.797" />
+    <PackageReference Include="Uno.WinUI.RemoteControl" Version="4.5.0-dev.797" Condition="'$(Configuration)'=='Debug'" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.453" />
+    <PackageReference Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="4.5.0-dev.797" />
     <PackageReference Include="Uno.Core.Extensions.Compatibility" Version="4.0.1" />
     <PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
   </ItemGroup>
diff --git a/src/Uno.Toolkit.UI/Behaviors/TabBarItemExtensions.cs b/src/Uno.Toolkit.UI/Behaviors/TabBarItemExtensions.cs
new file mode 100644
index 000000000..a72993531
--- /dev/null
+++ b/src/Uno.Toolkit.UI/Behaviors/TabBarItemExtensions.cs
@@ -0,0 +1,174 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Logging;
+using Uno.Extensions;
+using Uno.Logging;
+
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+#endif
+
+namespace Uno.Toolkit.UI
+{
+	public static partial class TabBarItemExtensions
+	{
+		/// <summary>
+		/// Specifies the on-click behaviors of <see cref="TabBarItem"/>.
+		/// </summary>
+		[Flags]
+		public enum TBIOnClickBehaviors
+		{
+			None = 0,
+
+			/// <summary>
+			/// Find the first <see cref="NavigationView"/> with back stack to back navigate.
+			/// </summary>
+			BackNavigation = 1 << 0,
+
+			/// <summary>
+			/// Find the first <see cref="ListView"/> or <see cref="ScrollViewer"/> to reset scroll position.
+			/// </summary>
+			ScrollToTop = 1 << 1,
+
+			/// <summary>
+			/// All of above.
+			/// </summary>
+			Auto = BackNavigation | ScrollToTop,
+		}
+	}
+
+	public static partial class TabBarItemExtensions
+	{
+		private static readonly ILogger Logger = typeof(TabBarItemExtensions).Log();
+
+		#region DependencyProperty: OnClickBehaviors
+
+		/// <summary>
+		/// Backing property for the <see cref="TabBarItem"/> on-click behaviors when already selected.
+		/// </summary>
+		public static DependencyProperty OnClickBehaviorsProperty { get; } = DependencyProperty.RegisterAttached(
+			"OnClickBehaviors",
+			typeof(TBIOnClickBehaviors),
+			typeof(TabBarItemExtensions),
+			new PropertyMetadata(default(TBIOnClickBehaviors), OnOnClickBehaviorsChanged));
+
+		public static TBIOnClickBehaviors GetOnClickBehaviors(TabBarItem obj) => (TBIOnClickBehaviors)obj.GetValue(OnClickBehaviorsProperty);
+		public static void SetOnClickBehaviors(TabBarItem obj, TBIOnClickBehaviors value) => obj.SetValue(OnClickBehaviorsProperty, value);
+
+		#endregion
+		#region DependencyProperty: OnClickBehaviorsTarget
+
+		/// <summary>
+		/// Optional. Backing property for the target of <see cref="OnClickBehaviorsProperty"/>.
+		/// </summary>
+		/// <remarks>
+		/// The content host which the on-click behavior is applied is either
+		/// the target itself or one of its descendants (via deep first search) suitable for the behavior.
+		/// When omitted, the parent of <see cref="TabBar"/> will serve as the target.
+		/// </remarks>
+		public static DependencyProperty OnClickBehaviorsTargetProperty { get; } = DependencyProperty.RegisterAttached(
+			"OnClickBehaviorsTarget",
+			typeof(UIElement),
+			typeof(TabBarItemExtensions),
+			new PropertyMetadata(default(UIElement)));
+
+		public static UIElement GetOnClickBehaviorsTarget(TabBarItem obj) => (UIElement)obj.GetValue(OnClickBehaviorsTargetProperty);
+		public static void SetOnClickBehaviorsTarget(TabBarItem obj, UIElement value) => obj.SetValue(OnClickBehaviorsTargetProperty, value);
+
+		#endregion
+		#region DependencyProperty: OnClickBehaviorsSubscription [private]
+
+		private static DependencyProperty OnClickBehaviorsSubscriptionProperty { get; } = DependencyProperty.RegisterAttached(
+			"OnClickBehaviorsSubscription",
+			typeof(IDisposable),
+			typeof(TabBarItemExtensions),
+			new PropertyMetadata(default(IDisposable)));
+
+		private static IDisposable GetOnClickBehaviorsSubscription(TabBarItem obj) => (IDisposable)obj.GetValue(OnClickBehaviorsSubscriptionProperty);
+		private static void SetOnClickBehaviorsSubscription(TabBarItem obj, IDisposable value) => obj.SetValue(OnClickBehaviorsSubscriptionProperty, value);
+
+		#endregion
+
+		private static void OnOnClickBehaviorsChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+		{
+			if (sender is not TabBarItem tbi) return;
+
+			// We are indirectly hooking to TBI.Click when TBI.IsSelected changes to true,
+			// because TBI.IsSelected cannot be reliably used to confirm navigation had occurred.
+			// When clicking on an unselected TBI, the value is still false for uwp, but on uno that is already true.
+
+			GetOnClickBehaviorsSubscription(tbi)?.Dispose();
+			tbi.Click -= OnTabBarItemClick;
+
+			if (e.NewValue is TBIOnClickBehaviors and not TBIOnClickBehaviors.None)
+			{
+				OnTabBarItemIsSelectedChanged(tbi, TabBarItem.IsSelectableProperty);
+				SetOnClickBehaviorsSubscription(tbi, tbi.RegisterDisposablePropertyChangedCallback(TabBarItem.IsSelectedProperty, OnTabBarItemIsSelectedChanged));
+			}
+		}
+
+		private static void OnTabBarItemIsSelectedChanged(DependencyObject sender, DependencyProperty dp)
+		{
+			if (sender is not TabBarItem tbi) return;
+
+			if (tbi.IsSelected)
+			{
+				tbi.Click += OnTabBarItemClick;
+			}
+			else
+			{
+				tbi.Click -= OnTabBarItemClick;
+			}
+		}
+
+		private static void OnTabBarItemClick(object sender, RoutedEventArgs e)
+		{
+			if (sender is not TabBarItem tbi) return;
+
+			bool IsValidContentHost(object x) =>
+				x is ListView ||
+				x is ScrollViewer ||
+				x is Frame { CanGoBack: true };
+
+			// defaults to the parent of TabBar if not provided
+			var target = GetOnClickBehaviorsTarget(tbi);
+			var context = target ?? VisualTreeHelperEx.GetAncestors(tbi)
+				.OfType<UIElement>()
+				.SkipWhile(x => x is not TabBar).Skip(1)
+				.FirstOrDefault();
+			if (context is null) return;
+
+			var contentHost = IsValidContentHost(context) ? context
+#if __IOS__ || __ANDROID__
+				// native view may not be fully crawlable using VisualTreeHelper.GetChild
+				: VisualTreeHelperEx.Native.GetFirstDescendant<DependencyObject>(
+#else
+				: VisualTreeHelperEx.GetFirstDescendant<DependencyObject>(
+#endif
+					context,
+					hierarchyPredicate: x => (x as UIElement)?.Visibility != Visibility.Collapsed,
+					predicate: IsValidContentHost
+				);
+
+			switch (contentHost)
+			{
+				case ListView lv: ScrollableHelper.SmoothScrollTop(lv); break;
+				case ScrollViewer sv: sv.ChangeView(0, 0, zoomFactor: default, disableAnimation: false); break;
+				case Frame f: if (f.CanGoBack) f.GoBack(); break;
+
+				default:
+					Logger.WarnIfEnabled(() => "No suitable content host found in the visual tree.");
+					break;
+			}
+		}
+	}
+}
diff --git a/src/Uno.Toolkit.UI/Helpers/ScrollableHelper.cs b/src/Uno.Toolkit.UI/Helpers/ScrollableHelper.cs
new file mode 100644
index 000000000..ad9e39213
--- /dev/null
+++ b/src/Uno.Toolkit.UI/Helpers/ScrollableHelper.cs
@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+#if IS_WINUI
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+#else
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+#endif
+
+#if __IOS__ || __ANDROID__
+using Uno.UI.Helpers;
+#endif
+
+#if __IOS__
+using Foundation;
+using UIKit;
+#endif
+
+namespace Uno.Toolkit.UI
+{
+	public partial class ScrollableHelper
+	{
+		public static void SmoothScrollTop(ListView lv) => SmoothScrollTopImpl(lv);
+
+		public static void SmoothScrollBottom(ListView lv) => SmoothScrollBottomImpl(lv);
+
+		static partial void SmoothScrollTopImpl(ListView lv);
+
+		static partial void SmoothScrollBottomImpl(ListView lv);
+	}
+
+#if !HAS_UNO
+	static partial class ScrollableHelper // uwp
+	{
+		static partial void SmoothScrollTopImpl(ListView lv) => lv.ScrollToIndex(0);
+
+		static partial void SmoothScrollBottomImpl(ListView lv) => lv.ScrollToIndex(lv.Items.Count - 1);
+
+		private static Task ScrollToIndex(this ListViewBase lvb, int index) =>
+			lvb.ScrollTo(lvb.Items[index], () => lvb.ContainerFromIndex(index));
+
+		private static Task ScrollToItem(this ListViewBase lvb, object item) =>
+			lvb.ScrollTo(item, () => lvb.ContainerFromItem(item));
+
+		// credit: JustinXL https://stackoverflow.com/a/32559623
+
+		private static async Task ScrollTo(this ListViewBase lvb, object item, Func<DependencyObject> getContainer)
+		{
+			bool isVirtualizing = default(bool);
+			double previousHorizontalOffset = default(double), previousVerticalOffset = default(double);
+
+			var scrollViewer = lvb.GetFirstDescendant<ScrollViewer>();
+			var selectorItem = getContainer() as SelectorItem;
+
+			// when it's null, means virtualization is on and the item hasn't been realized yet
+			if (selectorItem == null)
+			{
+				isVirtualizing = true;
+
+				previousHorizontalOffset = scrollViewer.HorizontalOffset;
+				previousVerticalOffset = scrollViewer.VerticalOffset;
+
+				// call task-based ScrollIntoViewAsync to realize the item
+				await lvb.ScrollIntoViewAsync(item);
+
+				// this time the item shouldn't be null again
+				selectorItem = (SelectorItem)getContainer();
+			}
+
+			// calculate the position object in order to know how much to scroll to
+			var transform = selectorItem.TransformToVisual((UIElement)scrollViewer.Content);
+			var position = transform.TransformPoint(default);
+
+			// when virtualized, scroll back to previous position without animation
+			if (isVirtualizing)
+			{
+				await scrollViewer.ChangeViewAsync(previousHorizontalOffset, previousVerticalOffset, true);
+			}
+
+			// scroll to desired position with animation!
+			scrollViewer.ChangeView(position.X, position.Y, null);
+		}
+
+		private static async Task ScrollIntoViewAsync(this ListViewBase listViewBase, object item)
+		{
+			var tcs = new TaskCompletionSource<object>();
+			var scrollViewer = listViewBase.GetFirstDescendant<ScrollViewer>();
+
+			EventHandler<ScrollViewerViewChangedEventArgs> viewChanged = (s, e) => tcs.TrySetResult(default!);
+
+			try
+			{
+				scrollViewer.ViewChanged += viewChanged;
+				listViewBase.ScrollIntoView(item, ScrollIntoViewAlignment.Leading);
+
+				await tcs.Task;
+			}
+			finally
+			{
+				scrollViewer.ViewChanged -= viewChanged;
+			}
+		}
+
+		private static async Task ChangeViewAsync(this ScrollViewer scrollViewer, double? horizontalOffset, double? verticalOffset, bool disableAnimation)
+		{
+			var tcs = new TaskCompletionSource<object>();
+
+			EventHandler<ScrollViewerViewChangedEventArgs> viewChanged = (s, e) => tcs.TrySetResult(default!);
+			try
+			{
+				scrollViewer.ViewChanged += viewChanged;
+				scrollViewer.ChangeView(horizontalOffset, verticalOffset, null, disableAnimation);
+
+				await tcs.Task;
+			}
+			finally
+			{
+				scrollViewer.ViewChanged -= viewChanged;
+			}
+		}
+	}
+#elif __IOS__ || __ANDROID__
+	static partial class ScrollableHelper // ios and droid
+	{
+		static partial void SmoothScrollTopImpl(ListView lv) => lv.SmoothScrollToIndex(0);
+
+		static partial void SmoothScrollBottomImpl(ListView lv) => lv.SmoothScrollToIndex(lv.Items.Count - 1);
+	}
+#else
+	static partial class ScrollableHelper
+	{
+		static partial void SmoothScrollTopImpl(ListView lv) => throw new NotImplementedException("Not yet implemented for this platform.");
+
+		static partial void SmoothScrollBottomImpl(ListView lv) => throw new NotImplementedException("Not yet implemented for this platform.");
+	}
+#endif
+}
diff --git a/src/Uno.Toolkit.UI/Helpers/VisualTreeHelperEx.cs b/src/Uno.Toolkit.UI/Helpers/VisualTreeHelperEx.cs
index 0bccfc583..5303f0ca5 100644
--- a/src/Uno.Toolkit.UI/Helpers/VisualTreeHelperEx.cs
+++ b/src/Uno.Toolkit.UI/Helpers/VisualTreeHelperEx.cs
@@ -12,12 +12,35 @@
 using Windows.UI.Xaml.Media;
 #endif
 
+#if __IOS__
+using _View = UIKit.UIView;
+#elif __ANDROID__
+using _View = Android.Views.View;
+#endif
+
 namespace Uno.Toolkit.UI
 {
-	internal static class VisualTreeHelperEx
+	/// <summary>
+	/// Utility class to traverse the visual tree.
+	/// </summary>
+	/// <remarks>
+	/// This class is implemented with <see cref="VisualTreeHelper.GetChild(DependencyObject, int)"/> which doesn't cross uwp/native barrier.
+	/// Use the <see cref="Native"/> counterpart if the uwp/native barrier needs to be crossed.
+	/// </remarks>
+	internal static partial class VisualTreeHelperEx
 	{
+		/// <summary>
+		/// Produces a text representation of the visual tree.
+		/// </summary>
+		/// <param name="reference">Any node of the visual tree</param>
 		public static string TreeGraph(this DependencyObject reference) => TreeGraph(reference, DebugVTNode);
-
+		
+		/// <summary>
+		/// Produces a text representation of the visual tree, using the provided method of description.
+		/// </summary>
+		/// <param name="reference">Any node of the visual tree</param>
+		/// <param name="describe">A function to describe a visual tree node in a single line.</param>
+		/// <returns></returns>
 		public static string TreeGraph(this DependencyObject reference, Func<DependencyObject, string> describe)
 		{
 			var buffer = new StringBuilder();
@@ -27,7 +50,7 @@ public static string TreeGraph(this DependencyObject reference, Func<DependencyO
 			void Walk(DependencyObject o, int depth = 0)
 			{
 				Print(o, depth);
-				foreach (var child in GetChildren(o))
+				foreach (var child in o.GetChildren())
 				{
 					Walk(child, depth + 1);
 				}
@@ -43,28 +66,78 @@ void Print(DependencyObject o, int depth)
 
 		private static string DebugVTNode(DependencyObject x)
 		{
-			var fe = x as FrameworkElement;
+			IEnumerable<string> GetDetails()
+			{
+				if (x is FrameworkElement fe)
+				{
+					yield return $"Actual={fe.ActualWidth}x{fe.ActualHeight}";
+					// yield return $"Constraints=[{fe.MinWidth},{fe.Width},{fe.MaxWidth}]x[{fe.MinHeight},{fe.Height},{fe.MaxHeight}]";
+					yield return $"HV={fe.HorizontalAlignment}/{fe.VerticalAlignment}";
+				}
+				if (x is UIElement uie)
+				{
+					yield return uie.Visibility.ToString();
+				}
+			}
 
 			return new StringBuilder()
 				.Append(x.GetType().Name)
-				.Append(!string.IsNullOrEmpty(fe?.Name) ? $"#{fe?.Name}" : string.Empty)
+				.Append((x as FrameworkElement)?.Name is string { Length: >0 } xname ? $"#{xname}" : string.Empty)
+				.Append($" // {string.Join(", ", GetDetails())}")
 				.ToString();
 		}
 
-
+		/// <summary>
+		/// Returns the first ancestor of a specified type.
+		/// </summary>
+		/// <typeparam name="T">The type of ancestor to find.</typeparam>
+		/// <param name="reference">Any node of the visual tree</param>
+		/// <remarks>First Counting from the <paramref name="reference"/> and not from the root of tree.</remarks>
 		public static T GetFirstAncestor<T>(this DependencyObject reference) => GetAncestors(reference)
 			.OfType<T>()
 			.FirstOrDefault();
 
+		/// <summary>
+		/// Returns the first ancestor of a specified type that satisfies the <paramref name="predicate"/>.
+		/// </summary>
+		/// <typeparam name="T">The type of ancestor to find.</typeparam>
+		/// <param name="reference">Any node of the visual tree</param>
+		/// <param name="predicate">A function to test each node for a condition.</param>
+		/// <remarks>First Counting from the <paramref name="reference"/> and not from the root of tree.</remarks>
 		public static T GetFirstAncestor<T>(this DependencyObject reference, Func<T, bool> predicate) => GetAncestors(reference)
 			.OfType<T>()
 			.FirstOrDefault(predicate);
-
-		public static T GetFirstDescendant<T>(DependencyObject reference) => GetDescendants(reference)
+		
+		/// <summary>
+		/// Returns the first descendant of a specified type.
+		/// </summary>
+		/// <typeparam name="T">The type of descendant to find.</typeparam>
+		/// <param name="reference">Any node of the visual tree</param>
+		/// <remarks>The crawling is done depth first.</remarks>
+		public static T GetFirstDescendant<T>(this DependencyObject reference) => GetDescendants(reference)
 			.OfType<T>()
 			.FirstOrDefault();
-
-		public static T GetFirstDescendant<T>(DependencyObject reference, Func<T, bool> predicate) => GetDescendants(reference)
+		
+		/// <summary>
+		/// Returns the first descendant of a specified type that satisfies the <paramref name="predicate"/>.
+		/// </summary>
+		/// <typeparam name="T">The type of descendant to find.</typeparam>
+		/// <param name="reference">Any node of the visual tree</param>
+		/// <param name="predicate">A function to test each node for a condition.</param>
+		/// <remarks>The crawling is done depth first.</remarks>
+		public static T GetFirstDescendant<T>(this DependencyObject reference, Func<T, bool> predicate) => GetDescendants(reference)
+			.OfType<T>()
+			.FirstOrDefault(predicate);
+		
+		/// <summary>
+		/// Returns the first descendant of a specified type that satisfies the <paramref name="predicate"/> whose ancestors (up to <paramref name="reference"/>) satisfy the <paramref name="hierarchyPredicate"/>.
+		/// </summary>
+		/// <typeparam name="T">The type of descendant to find.</typeparam>
+		/// <param name="reference">Any node of the visual tree</param>
+		/// <param name="hierarchyPredicate">A function to test each ancestor for a condition.</param>
+		/// <param name="predicate">A function to test each descendant for a condition.</param>
+		/// <remarks>The crawling is done depth first.</remarks>
+		public static T GetFirstDescendant<T>(this DependencyObject reference, Func<DependencyObject, bool> hierarchyPredicate, Func<T, bool> predicate) => GetDescendants(reference, hierarchyPredicate)
 			.OfType<T>()
 			.FirstOrDefault(predicate);
 
@@ -77,23 +150,79 @@ public static IEnumerable<DependencyObject> GetAncestors(this DependencyObject o
 			}
 		}
 
-		public static IEnumerable<DependencyObject> GetDescendants(DependencyObject reference)
+		public static IEnumerable<DependencyObject> GetDescendants(this DependencyObject reference) => GetDescendants(reference, x => true);
+
+		public static IEnumerable<DependencyObject> GetDescendants(this DependencyObject reference, Func<DependencyObject, bool> hierarchyPredicate)
 		{
-			foreach (var child in GetChildren(reference))
+			foreach (var child in reference.GetChildren().Where(hierarchyPredicate))
 			{
 				yield return child;
-				foreach (var grandchild in GetDescendants(child))
+				foreach (var grandchild in child.GetDescendants(hierarchyPredicate))
 				{
 					yield return grandchild;
 				}
 			}
 		}
 
-		public static IEnumerable<DependencyObject> GetChildren(DependencyObject reference)
+		public static IEnumerable<DependencyObject> GetChildren(this DependencyObject reference)
 		{
 			return Enumerable
 				.Range(0, VisualTreeHelper.GetChildrenCount(reference))
 				.Select(x => VisualTreeHelper.GetChild(reference, x));
 		}
 	}
+
+	internal static partial class VisualTreeHelperEx // Native view impl
+	{
+#if __IOS__ || __ANDROID__
+		internal static class Native
+		{
+			public static T GetFirstDescendant<T>(_View reference) => GetDescendants(reference)
+				.OfType<T>()
+				.FirstOrDefault();
+
+			public static T GetFirstDescendant<T>(_View reference, Func<T, bool> predicate) => GetDescendants(reference)
+				.OfType<T>()
+				.FirstOrDefault(predicate);
+
+			public static T GetFirstDescendant<T>(_View reference, Func<_View, bool> hierarchyPredicate, Func<T, bool> predicate) => GetDescendants(reference, hierarchyPredicate)
+				.OfType<T>()
+				.FirstOrDefault(predicate);
+
+			public static IEnumerable<_View> GetDescendants(_View reference) => GetDescendants(reference, x => true);
+
+			public static IEnumerable<_View> GetDescendants(_View reference, Func<_View, bool> hierarchyPredicate)
+			{
+				foreach (var child in GetChildren(reference).Where(hierarchyPredicate))
+				{
+					yield return child;
+					
+					foreach (var grandchild in GetDescendants(child, hierarchyPredicate))
+					{
+						yield return grandchild;
+					}
+				}
+			}
+
+#if __IOS__
+			private static IEnumerable<_View> GetChildren(_View reference)
+			{
+				return reference.Subviews;
+			}
+#elif __ANDROID__
+			private static IEnumerable<_View> GetChildren(_View reference)
+			{
+				if (reference is Android.Views.ViewGroup vg)
+				{
+					return Enumerable
+						.Range(0, vg.ChildCount)
+						.Select(vg.GetChildAt);
+				}
+
+				return Enumerable.Empty<_View>();
+			}
+#endif
+		}
+#endif
+	}
 }
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
index 21a99975f..3ba17293e 100644
--- a/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
+++ b/src/Uno.Toolkit.UI/Uno.Toolkit.UI.csproj
@@ -15,7 +15,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
 		<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
diff --git a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
index 14fbf9d45..fc0a69c6d 100644
--- a/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
+++ b/src/Uno.Toolkit.UI/Uno.Toolkit.WinUI.csproj
@@ -15,7 +15,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.797" />
 		<PackageReference Include="Uno.Core.Extensions.Collections" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
 		<PackageReference Include="Uno.Core.Extensions.Logging" Version="4.0.1" />
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
index 5d0869573..81dd99cee 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.UI.Cupertino.csproj
@@ -15,8 +15,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.6" />
-		<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.Cupertino" Version="2.3.0-dev.12" />
+		<PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
 	</ItemGroup>
 
 	<PropertyGroup>
diff --git a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
index 518712874..fe42abb87 100644
--- a/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
+++ b/src/library/Uno.Toolkit.Cupertino/Uno.Toolkit.WinUI.Cupertino.csproj
@@ -17,8 +17,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Cupertino.WinUI" Version="2.3.0-dev.6" />
-		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.Cupertino.WinUI" Version="2.3.0-dev.12" />
+		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.797" />
 	</ItemGroup>
 
 	<Choose>
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
index 2a389a145..98e69bef8 100644
--- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
+++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.UI.Material.csproj
@@ -39,8 +39,8 @@
 	</Choose>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Material" Version="2.3.0-dev.6" />
-		<PackageReference Include="Uno.UI" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.Material" Version="2.3.0-dev.12" />
+		<PackageReference Include="Uno.UI" Version="4.5.0-dev.797" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='uap10.0.18362'">
diff --git a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
index d103f4d7d..46680feab 100644
--- a/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
+++ b/src/library/Uno.Toolkit.Material/Uno.Toolkit.WinUI.Material.csproj
@@ -17,8 +17,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.6" />
-		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.453" />
+		<PackageReference Include="Uno.Material.WinUI" Version="2.3.0-dev.12" />
+		<PackageReference Include="Uno.WinUI" Version="4.5.0-dev.797" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" Condition="'$(TargetFramework)'=='net5.0-windows10.0.18362'" />
 	</ItemGroup>