fix: add tint support back to tabbar, refactor tabbar styles (#527) (#…

…528) (cherry picked from commit 2225147) Co-authored-by: Steve Bilogan <steve.bilogan@gmail.com>
unoplatform · Mar 30, 2023 · 70a3c29 · 70a3c29
1 parent 00f01d3
commit 70a3c29
Show file tree

Hide file tree

Showing 4 changed files with 287 additions and 512 deletions.
diff --git a/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs b/src/Uno.Toolkit.UI/Controls/TabBar/TabBar.cs
@@ -239,10 +239,10 @@ private void OnSelectedIndexChanged(DependencyPropertyChangedEventArgs? args)
 			TabBarItem? oldItem = null;
 			if (args?.OldValue is int oldIndex)
 			{
-				oldItem = this.ContainerFromIndex(oldIndex) as TabBarItem;
+				oldItem = this.ContainerFromIndexSafe<TabBarItem>(oldIndex);
 			}
 
-			var newItem = this.ContainerFromIndex(SelectedIndex) as TabBarItem;
+			var newItem = this.ContainerFromIndexSafe<TabBarItem>(SelectedIndex);
 
 			if (TryUpdateTabBarItemSelectedState(oldItem, newItem))
 			{