WIP

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

Hide file tree

Showing 3 changed files with 36 additions and 8 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,11 @@ ItemsPresenter GetItemsPresenter(ListView listView)
 
 				if (ReadLocalValue(SelectedItemProperty) != DependencyProperty.UnsetValue)
 				{
-#if __IOS__
-					UpdateSelectedIndexFromSelectedItem();
-#else
+//#if __IOS__
+					//UpdateSelectedIndexFromSelectedItem();
+//#else
 					UpdateSelectedItem();
-#endif
+//#endif
 				}
 				else
 				{

diff --git a/src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.iOS.cs b/src/Uno.UI/UI/Xaml/Controls/ListViewBase/NativeListViewBase.iOS.cs
@@ -477,6 +477,17 @@ public override void LayoutSubviews()
 					}
 				}
 			}
+
+			if (XamlParent?.PendingScrollIntoViewContainer is { } container)
+			{
+				var index = XamlParent.IndexFromContainer(container);
+				if (index != -1)
+				{
+					var vtree = Uno.UI.Extensions.ViewExtensions.TreeGraph(XamlParent);
+					Uno.UI.Helpers.ListViewHelper.InstantScrollToIndex(XamlParent, index);
+				}
+				XamlParent.PendingScrollIntoViewContainer = null;
+			}
 		}
 
 		private IEnumerable<(NSIndexPath Path, UICollectionViewCell Cell)> VisibleCellsAndPaths

diff --git a/src/Uno.UI/UI/Xaml/Controls/Primitives/Selector.cs b/src/Uno.UI/UI/Xaml/Controls/Primitives/Selector.cs
@@ -200,16 +200,32 @@ internal virtual void OnSelectedItemChanged(object oldSelectedItem, object selec
 #if !IS_UNIT_TESTS
 			if (newIndex != -1 && IsInLiveTree)
 			{
-				if (this is ListViewBase lvb)
+				var container = ContainerFromIndex(newIndex) as FrameworkElement;
+
+				if (container is not null && container.IsLoaded == false)
+				{
+					container.Loaded += (o,s) => {
+
+					};
+
+					PendingScrollIntoViewContainer = container;
+				}
+				else
 				{
+					PendingScrollIntoViewContainer = null;
+
+					if (this is ListViewBase lvb)
+					{
 #if __IOS__ || __ANDROID__
-					lvb.InstantScrollToIndex(newIndex);
+						lvb.InstantScrollToIndex(newIndex);
 #elif __MACOS__
-					// not implemented
+						// not implemented
 #else
-					lvb.ScrollIntoView(selectedItem);
+						lvb.ScrollIntoView(selectedItem);
 #endif
+					}					
 				}
+
 			}
 #endif
 
@@ -225,6 +241,7 @@ internal virtual void OnSelectedItemChanged(object oldSelectedItem, object selec
 			}
 		}
 
+		internal DependencyObject PendingScrollIntoViewContainer { get; set; }
 		internal void TryUpdateSelectorItemIsSelected(object item, bool isSelected)
 		{
 			if (item is SelectorItem si)