Merge pull request #37 from Redth/fix-ios-refreshenabled

Fix iOS ignoring IsRefreshEnabled
Redth · Apr 19, 2024 · f23a080 · f23a080
2 parents 9e51234 + 29fc07e
commit f23a080
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml
@@ -10,6 +10,8 @@
 		<vlv:VirtualListView
 			Grid.Row="0"
 			Grid.Column="0" Grid.ColumnSpan="3"
+			IsRefreshEnabled="False"
+			OnRefresh="Vlv_OnOnRefresh"
 			x:Name="vlv"
 			OnSelectedItemsChanged="vlv_SelectedItemsChanged"
 			SelectionMode="Single">

diff --git a/Sample/VirtualListViewSample/SectionedAdapterPage.xaml.cs b/Sample/VirtualListViewSample/SectionedAdapterPage.xaml.cs
@@ -47,4 +47,10 @@ private void vlv_SelectedItemsChanged(object sender, SelectedItemsChangedEventAr
 		}
 
 	}
+
+	private async void Vlv_OnOnRefresh(object sender, RefreshEventArgs e)
+	{
+		await Task.Delay(3000);
+		e.Complete();
+	}
 }
diff --git a/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs b/VirtualListView/Apple/VirtualListViewHandler.ios.maccatalyst.cs
@@ -36,13 +36,21 @@ protected override UICollectionView CreatePlatformView()
 
 
 		refreshControl = new UIRefreshControl();
+		refreshControl.Enabled = VirtualView?.IsRefreshEnabled ?? false;
 		refreshControl.AddTarget(new EventHandler((s, a) =>
 		{
 			refreshControl.BeginRefreshing();
-			VirtualView?.Refresh(() => refreshControl.EndRefreshing());
+			try
+			{
+				VirtualView?.Refresh(() => refreshControl.EndRefreshing());
+			}
+			catch
+			{
+				refreshControl.EndRefreshing();
+			}
 		}), UIControlEvent.ValueChanged);
 
-		collectionView.AddSubview(refreshControl);
+		//collectionView.AddSubview(refreshControl);
 
 		collectionView.AlwaysBounceVertical = true;
 
@@ -175,8 +183,20 @@ public static void MapRefreshAccentColor(VirtualListViewHandler handler, IVirtua
 
 	public static void MapIsRefreshEnabled(VirtualListViewHandler handler, IVirtualListView virtualListView)
 	{
+		var isRefreshEnabled = virtualListView?.IsRefreshEnabled ?? false;
 		if (handler.refreshControl is not null)
-			handler.refreshControl.Enabled = virtualListView.IsRefreshEnabled;
+		{
+			if (isRefreshEnabled)
+			{
+				handler.PlatformView.AddSubview(handler.refreshControl);
+				handler.refreshControl.Enabled = true;
+			}
+			else
+			{
+				handler.refreshControl.Enabled = false;
+				handler.refreshControl.RemoveFromSuperview();
+			}
+		}
 	}