Fix usage of weakref for cell tap callback

Redth · Dec 5, 2023 · ebfd614 · ebfd614
1 parent 6ec23c3
commit ebfd614
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/VirtualListView/Apple/CvCell.ios.maccatalyst.cs b/VirtualListView/Apple/CvCell.ios.maccatalyst.cs
@@ -23,7 +23,12 @@ public CvCell(CGRect frame) : base(frame)
 		this.ContentView.AddGestureRecognizer(new UITapGestureRecognizer(() => InvokeTap()));
 	}
 
-	public WeakReference<Action<CvCell>> TapHandler { get; set; }
+	private TapHandlerCallback TapHandler;
+
+	public void SetTapHandlerCallback(Action<CvCell> callback)
+	{
+		TapHandler = new TapHandlerCallback(callback);
+	}
 
 	WeakReference<UIKeyCommand[]> keyCommands;
 
@@ -57,8 +62,7 @@ void InvokeTap()
 	{
 		if (PositionInfo.Kind == PositionKind.Item)
 		{
-			if (TapHandler?.TryGetTarget(out var handler) ?? false)
-				handler?.Invoke(this);
+			TapHandler.Invoke(this);
 		}
 	}
 
@@ -142,4 +146,17 @@ public void UpdatePosition(PositionInfo positionInfo)
                 viewPositionInfo.Update(positionInfo);
         }
     }
+
+	class TapHandlerCallback
+	{
+		public TapHandlerCallback(Action<CvCell> callback)
+		{
+			Callback = callback;
+		}
+
+		public readonly Action<CvCell> Callback;
+
+		public void Invoke(CvCell cell)
+			=> Callback?.Invoke(cell);
+	}
 }
diff --git a/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs b/VirtualListView/Apple/CvDataSource.ios.maccatalyst.cs
@@ -39,8 +39,8 @@ public override UICollectionViewCell GetCell(UICollectionView collectionView, NS
 			_ => "UNKNOWN",
 		};
 
-		var cell = collectionView.DequeueReusableCell(nativeReuseId, indexPath) as CvCell;
-		cell.TapHandler = new WeakReference<Action<CvCell>>(TapCellHandler);
+		var cell = (collectionView.DequeueReusableCell(nativeReuseId, indexPath) as CvCell)!;
+		cell.SetTapHandlerCallback(TapCellHandler);
 		cell.Handler = Handler;
 		cell.IndexPath = new WeakReference<NSIndexPath>(indexPath);