chore: expose base navigation and fab tabbaritem styles (#1040)

(cherry picked from commit 35c5d17)
unoplatform · Feb 13, 2024 · 2fc59b8 · 2fc59b8
1 parent d8a0c3a
commit 2fc59b8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/doc/controls-styles.md b/doc/controls-styles.md
@@ -79,6 +79,8 @@ Exposes visual states as attachable properties that lets you bind a string on a
 | `utu:TabBar`             | `TopTabBarStyle`                   |                 |
 | `utu:TabBar`             | `ColoredTopTabBarStyle`            |                 |
 | `utu:TabBar`             | `VerticalTabBarStyle`              |                 |
+| `utu:TabBarItem`         | `FabTabBarItemStyle`               |                 |
+| `utu:TabBarItem`         | `NavigationTabBarItemStyle`        |                 |
 | `utu:TabBarItem`         | `BottomFabTabBarItemStyle`         |                 |
 | `utu:TabBarItem`         | `BottomTabBarItemStyle`            |                 |
 | `utu:TabBarItem`         | `VerticalTabBarItemStyle`          |                 |

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/TabBar.xaml
@@ -834,14 +834,19 @@
         </Setter>
     </Style>
 
-    <Style
+	<Style
+     x:Key="MaterialNavigationTabBarItemStyle"
+     BasedOn="{StaticResource MaterialBaseNavigationTabBarItemStyle}"
+     TargetType="utu:TabBarItem" />
+
+	<Style
         x:Key="MaterialVerticalTabBarItemStyle"
-        BasedOn="{StaticResource MaterialBaseNavigationTabBarItemStyle}"
+        BasedOn="{StaticResource MaterialNavigationTabBarItemStyle}"
         TargetType="utu:TabBarItem" />
 
     <Style
         x:Key="MaterialBottomTabBarItemStyle"
-        BasedOn="{StaticResource MaterialBaseNavigationTabBarItemStyle}"
+        BasedOn="{StaticResource MaterialNavigationTabBarItemStyle}"
         TargetType="utu:TabBarItem" />
 
     <Style x:Key="MaterialTopTabBarItemStyle" TargetType="utu:TabBarItem">
@@ -1277,14 +1282,18 @@
         </Setter>
     </Style>
 
-    <Style
+	<Style x:Key="MaterialFabTabBarItemStyle"
+		   BasedOn="{StaticResource MaterialBaseFabTabBarItemStyle}"
+		   TargetType="utu:TabBarItem" />
+
+	<Style
         x:Key="MaterialVerticalFabTabBarItemStyle"
-        BasedOn="{StaticResource MaterialBaseFabTabBarItemStyle}"
+        BasedOn="{StaticResource MaterialFabTabBarItemStyle}"
         TargetType="utu:TabBarItem" />
 
     <Style
         x:Key="MaterialBottomFabTabBarItemStyle"
-        BasedOn="{StaticResource MaterialBaseFabTabBarItemStyle}"
+        BasedOn="{StaticResource MaterialFabTabBarItemStyle}"
         TargetType="utu:TabBarItem">
         <!--  KNOWN ISSUE: The part of the FAB that is translated outside of the TabBar bounds is not clickable  -->
         <!--  https://github.com/unoplatform/uno/issues/7393  -->

diff --git a/src/library/Uno.Toolkit.Material/Styles/Controls/v2/_Common.xaml b/src/library/Uno.Toolkit.Material/Styles/Controls/v2/_Common.xaml
@@ -59,4 +59,6 @@
 	<StaticResource x:Key="ElevatedCardContentControlStyle" ResourceKey="MaterialElevatedCardContentControlStyle" />
 	<StaticResource x:Key="VerticalTabBarStyle" ResourceKey="MaterialVerticalTabBarStyle" />
 	<StaticResource x:Key="VerticalTabBarItemStyle" ResourceKey="MaterialVerticalTabBarItemStyle" />
+	<StaticResource x:Key="FabTabBarItemStyle" ResourceKey="MaterialFabTabBarItemStyle" />
+	<StaticResource x:Key="NavigationTabBarItemStyle" ResourceKey="MaterialNavigationTabBarItemStyle" />
 </ResourceDictionary>
diff --git a/src/library/Uno.Toolkit.WinUI.Markup/Theme/TabBarItem.cs b/src/library/Uno.Toolkit.WinUI.Markup/Theme/TabBarItem.cs
@@ -554,11 +554,17 @@ public static partial class Styles
 			[ResourceKeyDefinition(typeof(Style), "ColoredTopTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
 			public static StaticResourceKey<Style> ColoredTop => new("ColoredTopTabBarItemStyle");
 
+			[ResourceKeyDefinition(typeof(Style), "FabTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
+			public static StaticResourceKey<Style> Fab => new("FabTabBarItemStyle");
+
 			[ResourceKeyDefinition(typeof(Style), "VerticalFabTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
 			public static StaticResourceKey<Style> VerticalFab => new("VerticalFabTabBarItemStyle");
 
 			[ResourceKeyDefinition(typeof(Style), "BottomFabTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
 			public static StaticResourceKey<Style> BottomFab => new("BottomFabTabBarItemStyle");
+
+			[ResourceKeyDefinition(typeof(Style), "NavigationTabBarItemStyle", TargetType = typeof(global::Uno.Toolkit.UI.TabBarItem))]
+			public static StaticResourceKey<Style> Navigation => new("NavigationTabBarItemStyle");
 		}
 	}
 }