diff --git a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarSamplePage.xaml b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarSamplePage.xaml index 8e48b436f..059b2bdba 100644 --- a/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarSamplePage.xaml +++ b/samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Controls/TabBarSamplePage.xaml @@ -27,7 +27,7 @@ - + @@ -106,7 +106,7 @@ Text="{Binding Data.Tab3Count}" /> - + @@ -182,7 +182,7 @@ - + @@ -265,20 +265,9 @@ - - - - - - - - - + - - + + @@ -450,9 +468,9 @@ AutomationProperties.AutomationId="M3_Colored_Tab3_Count" Text="{Binding Data.Tab3Count}" /> - --> + - @@ -603,9 +621,38 @@ - --> - + + @@ -689,6 +736,7 @@ + @@ -758,9 +806,36 @@ - --> - + + + + + + + + + + + + + + + + + + + + + + + @@ -769,7 +844,7 @@ - + diff --git a/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs b/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs index 5362a21aa..b901fb697 100644 --- a/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs +++ b/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs @@ -93,11 +93,9 @@ void SetupTabBarItem(TabBarItem item) if (templateRoot is TabBarItem tabBarItem) { outerContainer.ContentTemplate = null; - SetupTabBarItem(tabBarItem); - tabBarItem.DataContext = item; - + tabBarItem.Style ??= ItemContainerStyle; outerContainer.Content = tabBarItem; } }