fix(TabView): Skia and wasm tabview index selection

unoplatform · Oct 21, 2024 · 7f90448 · 7f90448
1 parent b113bd2
commit 7f90448
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabView.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabView.cs
@@ -551,7 +551,11 @@ private void OnListViewLoaded(object sender, RoutedEventArgs args)
 					TabItems = lvItems;
 				}
 
-				if (ReadLocalValue(SelectedItemProperty) != DependencyProperty.UnsetValue)
+				if (ReadLocalValue(SelectedItemProperty) != DependencyProperty.UnsetValue
+#if __SKIA__ || __WASM__
+					&& SelectedItem is not null
+#endif
+					)
 				{
 					UpdateSelectedItem();
 				}