chore: wip

unoplatform · Oct 16, 2024 · c4ff756 · c4ff756
1 parent 475fef4
commit c4ff756
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabView.cs b/src/Uno.UI/Microsoft/UI/Xaml/Controls/TabView/TabView.cs
@@ -598,11 +598,7 @@ ItemsPresenter GetItemsPresenter(ListView listView)
 
 				if (ReadLocalValue(SelectedItemProperty) != DependencyProperty.UnsetValue)
 				{
-#if __IOS__
-					UpdateSelectedIndexFromSelectedItem();
-#else
 					UpdateSelectedItem();
-#endif
 				}
 				else
 				{

diff --git a/src/Uno.UI/UI/Xaml/Controls/Primitives/Selector.cs b/src/Uno.UI/UI/Xaml/Controls/Primitives/Selector.cs
@@ -200,7 +200,13 @@ internal virtual void OnSelectedItemChanged(object oldSelectedItem, object selec
 #if !IS_UNIT_TESTS
 			if (newIndex != -1 && IsInLiveTree)
 			{
-				if (this is ListViewBase lvb)
+				if (this is ListViewBase lvb
+#if __IOS__ // TODO@andres: verify if this is also needed for android
+					// workaround to prevent scrolling when it is not ready
+					// without this, the ios TabView could render blank if the selection happens too early.
+					&& ContainerFromIndex(newIndex) is FrameworkElement { IsLoaded: true }
+#endif
+				)
 				{
 #if __IOS__ || __ANDROID__
 					lvb.InstantScrollToIndex(newIndex);