Clean up needs view logic

Redth · Nov 28, 2023 · d08495e · d08495e
1 parent 2c8fe23
commit d08495e
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/VirtualListView/Apple/CvCell.ios.maccatalyst.cs b/VirtualListView/Apple/CvCell.ios.maccatalyst.cs
@@ -92,7 +92,10 @@ public override UICollectionViewLayoutAttributes PreferredLayoutAttributesFittin
 	}
 
 	public bool NeedsView
-		=> NativeView == null || !NativeView.TryGetTarget(out var _);
+		=> NativeView == null 
+			|| VirtualView is null
+			|| !NativeView.TryGetTarget(out var _) 
+			|| !VirtualView.TryGetTarget(out var _);
 
 	public WeakReference<IView> VirtualView { get; set; }
 
@@ -113,19 +116,20 @@ public override void PrepareForReuse()
 	public void SetupView(IView view)
 	{
         // Create a new platform native view if we don't have one yet
-        if (!(NativeView?.TryGetTarget(out var nativeView) ?? false))
+        if (!(NativeView?.TryGetTarget(out var _) ?? false))
         {
-            nativeView = view.ToPlatform(this.Handler.MauiContext);
+			var nativeView = view.ToPlatform(this.Handler.MauiContext);
             nativeView.Frame = this.ContentView.Frame;
             nativeView.AutoresizingMask = UIViewAutoresizing.FlexibleHeight | UIViewAutoresizing.FlexibleWidth;
-            this.ContentView.AddSubview(nativeView);
-            NativeView = new WeakReference<UIView>(nativeView);
+
+			this.ContentView.AddSubview(nativeView);
+
+			NativeView = new WeakReference<UIView>(nativeView);
         }
 
         if (!(VirtualView?.TryGetTarget(out var virtualView) ?? false) || (virtualView?.Handler is null))
         {
-            virtualView = view;
-            VirtualView = new WeakReference<IView>(virtualView);
+            VirtualView = new WeakReference<IView>(view);
         }
     }