Fix iOS cell recycle

muak · Apr 3, 2023 · 32f70ab · 32f70ab
1 parent 297523a
commit 32f70ab
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/SettingsView/Handlers/CellBase/CellBaseHandler.iOS.cs b/SettingsView/Handlers/CellBase/CellBaseHandler.iOS.cs
@@ -60,8 +60,6 @@ protected override TnativeCell CreatePlatformElement()
         {
             var reusableCell = VirtualView.ReusableCell;
             var tv = VirtualView.TableView;
-            VirtualView.ReusableCell = null;
-            VirtualView.TableView = null;
 
             return GetCell(VirtualView, reusableCell, tv);
         }

diff --git a/SettingsView/Handlers/SettingsViewHandler.iOS.cs b/SettingsView/Handlers/SettingsViewHandler.iOS.cs
@@ -84,6 +84,7 @@ protected override void DisconnectHandler(AiTableView platformView)
         _insetTracker?.Dispose();
         _insetTracker = null;
 
+        _tableview?.Dispose();
         _tableview = null;
 
         base.DisconnectHandler(platformView);

diff --git a/SettingsView/Platforms/iOS/Cells/CellBaseView.cs b/SettingsView/Platforms/iOS/Cells/CellBaseView.cs
@@ -577,6 +577,7 @@ protected override void Dispose(bool disposing)
 
             if(_cell != null)
             {
+                CellParent.PropertyChanged -= ParentPropertyChanged;
                 _cell.PropertyChanged -= CellPropertyChanged;
                 if (_cell.Section != null)
                 {
@@ -588,11 +589,6 @@ protected override void Dispose(bool disposing)
                 //CellRenderer.SetRealCell(_cell, null);
                 _cell = null;
             }
-
-            CellParent.PropertyChanged -= ParentPropertyChanged;
-
-
-
 
             SelectedBackgroundView?.Dispose();
             SelectedBackgroundView = null;

diff --git a/SettingsView/Platforms/iOS/SettingsTableSource.cs b/SettingsView/Platforms/iOS/SettingsTableSource.cs
@@ -385,6 +385,16 @@ public override void RowSelected(UITableView tableView, NSIndexPath indexPath)
     protected override void Dispose(bool disposing)
     {
         if (!_disposed){
+
+            foreach(var section in _settingsView.Root)
+            {
+                foreach(var cell in section)
+                {
+                    cell.ReusableCell = null;
+                    cell.TableView = null;
+                }
+            }
+
             foreach(var handler in _cellHandlers)
             {
                 handler.DisconnectHandler();