Merge pull request #1212 from openkraken/fix/dispose_scrollable

fix: fix scroller not disposed when element disposed.
openkraken · Mar 12, 2022 · 051dacd · 051dacd
2 parents a40ab6d + 5127e02
commit 051dacd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/kraken/lib/src/css/overflow.dart b/kraken/lib/src/css/overflow.dart
@@ -118,6 +118,8 @@ mixin ElementOverflowMixin on ElementBase {
   KrakenScrollable? _scrollableY;
 
   void disposeScrollable() {
+    _scrollableX?.position?.dispose();
+    _scrollableY?.position?.dispose();
     _scrollableX = null;
     _scrollableY = null;
   }

diff --git a/kraken/lib/src/dom/element.dart b/kraken/lib/src/dom/element.dart
@@ -646,6 +646,9 @@ class Element extends Node
       disposeRenderObject();
     }
 
+    // Should make sure Scrollable.position are disposed earlier than RenderBoxModel.
+    disposeScrollable();
+
     RenderBoxModel? _renderBoxModel = renderBoxModel;
     Element? _parentElement = parentElement;
 
@@ -661,7 +664,6 @@ class Element extends Node
     renderStyle.detach();
     style.dispose();
     properties.clear();
-    disposeScrollable();
 
     super.dispose();
   }