[iOS] Fix deselecting an item

dotnet · Dec 3, 2024 · a065db2 · a065db2
1 parent 6f9464b
commit a065db2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs b/src/Controls/src/Core/Handlers/Items/iOS/SelectableItemsViewController.cs
@@ -55,7 +55,10 @@ internal void ClearSelection()
 
 			foreach (var index in selectedItemIndexes)
 			{
-				CollectionView.DeselectItem(index, true);
+				CollectionView.PerformBatchUpdates(null, _ =>
+				{
+					CollectionView.DeselectItem(index, true);
+				});
 			}
 		}
 
@@ -158,7 +161,10 @@ void SynchronizePlatformSelectionWithSelectedItems()
 				var itemAtPath = GetItemAtIndex(path);
 				if (!selectedItems.Contains(itemAtPath))
 				{
-					CollectionView.DeselectItem(path, true);
+					CollectionView.PerformBatchUpdates(null, _ =>
+					{
+						CollectionView.DeselectItem(path, true);
+					});
 				}
 				else
 				{

diff --git a/src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs b/src/Controls/src/Core/Handlers/Items2/iOS/SelectableItemsViewController2.cs
@@ -40,7 +40,7 @@ internal void SelectItem(object selectedItem)
 
 			if (index.Section > -1 && index.Item > -1)
 			{
-                // Ensure the selected index is updated after the collection view's items generation is completed
+				// Ensure the selected index is updated after the collection view's items generation is completed
 				CollectionView.PerformBatchUpdates(null, _ =>
 				{
 					CollectionView.SelectItem(index, true, UICollectionViewScrollPosition.None);
@@ -55,7 +55,10 @@ internal void ClearSelection()
 
 			foreach (var index in selectedItemIndexes)
 			{
-				CollectionView.DeselectItem(index, true);
+				CollectionView.PerformBatchUpdates(null, _ =>
+				{
+					CollectionView.DeselectItem(index, true);
+				});
 			}
 		}
 
@@ -158,7 +161,10 @@ void SynchronizePlatformSelectionWithSelectedItems()
 				var itemAtPath = GetItemAtIndex(path);
 				if (!selectedItems.Contains(itemAtPath))
 				{
-					CollectionView.DeselectItem(path, true);
+					CollectionView.PerformBatchUpdates(null, _ =>
+					{
+						CollectionView.DeselectItem(path, true);
+					});
 				}
 				else
 				{