Merge pull request #599 from preactjs/clear-during-unmount

Properly clear unmounted vnodes

Author: JoviDeCroock

.changeset/clear-lines-sing.md

@@ -0,0 +1,5 @@
+---
+'@prefresh/core': patch
+---
+
+Cleanup unmounted vnodes

packages/core/src/runtime/vnode.js

@@ -1,5 +1,9 @@
 import { options } from 'preact';
-import { vnodesForComponent, mappedVNodes, lastSeen } from './vnodesForComponent';
+import {
+  vnodesForComponent,
+  mappedVNodes,
+  lastSeen,
+} from './vnodesForComponent';
 import { VNODE_COMPONENT } from '../constants';
 
 const getMappedVnode = type => {
@@ -13,40 +17,40 @@ const getMappedVnode = type => {
 const BUILT_IN_COMPONENTS = ['Fragment', 'Suspense', 'SuspenseList'];
 
 const isBuiltIn = type => {
-  return BUILT_IN_COMPONENTS.includes(type.name)
-}
+  return BUILT_IN_COMPONENTS.includes(type.name);
+};
 
 const oldVnode = options.vnode;
 options.vnode = vnode => {
   if (vnode && typeof vnode.type === 'function' && !isBuiltIn(vnode.type)) {
-    const vnodes = vnodesForComponent.get(vnode.type);
-    if (!vnodes) {
-      vnodesForComponent.set(vnode.type, [vnode]);
-    } else {
-      vnodes.push(vnode);
-    }
-
     const foundType = getMappedVnode(vnode.type);
     if (foundType !== vnode.type) {
-      const vnodes = vnodesForComponent.get(foundType);
-      if (!vnodes) {
-        vnodesForComponent.set(foundType, [vnode]);
-      } else {
-        vnodes.push(vnode);
+      vnode.type = foundType;
+      if (
+        vnode[VNODE_COMPONENT] &&
+        'prototype' in vnode.type &&
+        vnode.type.prototype.render
+      ) {
+        vnode[VNODE_COMPONENT].constructor = vnode.type;
       }
     }
+  }
 
-    vnode.type = foundType;
-    if (
-      vnode[VNODE_COMPONENT] &&
-      'prototype' in vnode.type &&
-      vnode.type.prototype.render
-    ) {
-      vnode[VNODE_COMPONENT].constructor = vnode.type;
+  if (oldVnode) oldVnode(vnode);
+};
+
+const oldDiff = options.__b;
+options.__b = vnode => {
+  if (vnode && typeof vnode.type === 'function' && !isBuiltIn(vnode.type)) {
+    const vnodes = vnodesForComponent.get(vnode.type);
+    if (!vnodes) {
+      vnodesForComponent.set(vnode.type, [vnode]);
+    } else {
+      vnodes.push(vnode);
     }
   }
 
-  if (oldVnode) oldVnode(vnode);
+  if (oldDiff) oldDiff(vnode);
 };
 
 const oldDiffed = options.diffed;