Merge pull request #2124 from Shopify/fix-memory-leak2

Fix regression
Shopify · Jan 7, 2024 · e5c324a · e5c324a
2 parents 8f80968 + 3865a34
commit e5c324a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/package/src/renderer/Canvas.tsx b/package/src/renderer/Canvas.tsx
@@ -84,6 +84,12 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
       root.render(children);
     }, [children, root, redraw]);
 
+    useEffect(() => {
+      return () => {
+        root.unmount();
+      };
+    }, [root]);
+
     if (NATIVE_DOM) {
       return (
         <SkiaDomView

diff --git a/package/src/renderer/HostConfig.ts b/package/src/renderer/HostConfig.ts
@@ -82,7 +82,7 @@ export const skHostConfig: SkiaHostConfig = {
   noTimeout: -1,
 
   appendChildToContainer(container, child) {
-    debug("appendChildToContainer", container, child);
+    debug("appendChildToContainer");
     appendNode(container.root, child);
   },
 

diff --git a/package/src/renderer/Reconciler.tsx b/package/src/renderer/Reconciler.tsx
@@ -44,6 +44,10 @@ export class SkiaRoot {
     });
   }
 
+  unmount() {
+    skiaReconciler.updateContainer(null, this.root, null, () => {});
+  }
+
   get dom() {
     return this.container.root;
   }