@b9g/crank 0.7.3 → 0.7.4

package/crank.cjs

@@ -401,6 +401,7 @@ function getRootRetainer(renderer, bridge, { children, root, hydrate, }) {
             tagName: getTagName(Portal),
             props: stripSpecialProps(ret.el.props),
             scope: undefined,
+            root,
         });
         // remember that typeof null === "object"
         if (typeof root === "object" && root !== null && children != null) {
@@ -423,32 +424,32 @@ function renderRoot(adapter, root, ret, children) {
     const schedulePromises = [];
     if (_utils.isPromiseLike(diff)) {
         return diff.then(() => {
-            commit(adapter, ret, ret, ret.ctx, ret.scope, 0, schedulePromises, undefined);
+            commit(adapter, ret, ret, ret.ctx, ret.scope, root, 0, schedulePromises, undefined);
             if (schedulePromises.length > 0) {
                 return Promise.all(schedulePromises).then(() => {
                     if (typeof root !== "object" || root === null) {
-                        unmount(adapter, ret, ret.ctx, ret, false);
+                        unmount(adapter, ret, ret.ctx, root, ret, false);
                     }
                     return adapter.read(_utils.unwrap(getChildValues(ret)));
                 });
             }
             if (typeof root !== "object" || root === null) {
-                unmount(adapter, ret, ret.ctx, ret, false);
+                unmount(adapter, ret, ret.ctx, root, ret, false);
             }
             return adapter.read(_utils.unwrap(getChildValues(ret)));
         });
     }
-    commit(adapter, ret, ret, ret.ctx, ret.scope, 0, schedulePromises, undefined);
+    commit(adapter, ret, ret, ret.ctx, ret.scope, root, 0, schedulePromises, undefined);
     if (schedulePromises.length > 0) {
         return Promise.all(schedulePromises).then(() => {
             if (typeof root !== "object" || root === null) {
-                unmount(adapter, ret, ret.ctx, ret, false);
+                unmount(adapter, ret, ret.ctx, root, ret, false);
             }
             return adapter.read(_utils.unwrap(getChildValues(ret)));
         });
     }
     if (typeof root !== "object" || root === null) {
-        unmount(adapter, ret, ret.ctx, ret, false);
+        unmount(adapter, ret, ret.ctx, root, ret, false);
     }
     return adapter.read(_utils.unwrap(getChildValues(ret)));
 }
@@ -698,11 +699,12 @@ function diffHost(adapter, root, ctx, scope, ret) {
             tagName: getTagName(tag),
             props: el.props,
             scope,
+            root,
         });
     }
     return diffChildren(adapter, root, ret, ctx, scope, ret, ret.el.props.children);
 }
-function commit(adapter, host, ret, ctx, scope, index, schedulePromises, hydrationNodes) {
+function commit(adapter, host, ret, ctx, scope, root, index, schedulePromises, hydrationNodes) {
     if (getFlag(ret, IsCopied) && getFlag(ret, DidCommit)) {
         return getValue(ret);
     }
@@ -735,19 +737,19 @@ function commit(adapter, host, ret, ctx, scope, index, schedulePromises, hydrati
     }
     else {
         if (tag === Fragment) {
-            value = commitChildren(adapter, host, ctx, scope, ret, index, schedulePromises, hydrationNodes);
+            value = commitChildren(adapter, host, ctx, scope, root, ret, index, schedulePromises, hydrationNodes);
         }
         else if (tag === Text) {
-            value = commitText(adapter, ret, el, scope, hydrationNodes);
+            value = commitText(adapter, ret, el, scope, hydrationNodes, root);
         }
         else if (tag === Raw) {
-            value = commitRaw(adapter, host, ret, scope, hydrationNodes);
+            value = commitRaw(adapter, host, ret, scope, hydrationNodes, root);
         }
         else {
-            value = commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes);
+            value = commitHost(adapter, ret, ctx, root, schedulePromises, hydrationNodes);
         }
         if (ret.fallback) {
-            unmount(adapter, host, ctx, ret.fallback, false);
+            unmount(adapter, host, ctx, root, ret.fallback, false);
             ret.fallback = undefined;
         }
     }
@@ -765,7 +767,7 @@ function commit(adapter, host, ret, ctx, scope, index, schedulePromises, hydrati
     }
     return value;
 }
-function commitChildren(adapter, host, ctx, scope, parent, index, schedulePromises, hydrationNodes) {
+function commitChildren(adapter, host, ctx, scope, root, parent, index, schedulePromises, hydrationNodes) {
     let values = [];
     for (let i = 0, children = _utils.wrap(parent.children); i < children.length; i++) {
         let child = children[i];
@@ -788,6 +790,7 @@ function commitChildren(adapter, host, ctx, scope, parent, index, schedulePromis
                         node,
                         parentNode: host.value,
                         isNested: false,
+                        root,
                     });
                 }
             }
@@ -847,7 +850,7 @@ function commitChildren(adapter, host, ctx, scope, parent, index, schedulePromis
             schedulePromises.push(_utils.safeRace(schedulePromises1));
         }
         if (child) {
-            const value = commit(adapter, host, child, ctx, scope, index, schedulePromises, hydrationNodes);
+            const value = commit(adapter, host, child, ctx, scope, root, index, schedulePromises, hydrationNodes);
             if (Array.isArray(value)) {
                 for (let j = 0; j < value.length; j++) {
                     values.push(value[j]);
@@ -863,7 +866,7 @@ function commitChildren(adapter, host, ctx, scope, parent, index, schedulePromis
     if (parent.graveyard) {
         for (let i = 0; i < parent.graveyard.length; i++) {
             const child = parent.graveyard[i];
-            unmount(adapter, host, ctx, child, false);
+            unmount(adapter, host, ctx, root, child, false);
         }
         parent.graveyard = undefined;
     }
@@ -874,17 +877,18 @@ function commitChildren(adapter, host, ctx, scope, parent, index, schedulePromis
     }
     return values;
 }
-function commitText(adapter, ret, el, scope, hydrationNodes) {
+function commitText(adapter, ret, el, scope, hydrationNodes, root) {
     const value = adapter.text({
         value: el.props.value,
         scope,
         oldNode: ret.value,
         hydrationNodes,
+        root,
     });
     ret.value = value;
     return value;
 }
-function commitRaw(adapter, host, ret, scope, hydrationNodes) {
+function commitRaw(adapter, host, ret, scope, hydrationNodes, root) {
     if (!ret.oldProps || ret.oldProps.value !== ret.el.props.value) {
         const oldNodes = _utils.wrap(ret.value);
         for (let i = 0; i < oldNodes.length; i++) {
@@ -893,18 +897,20 @@ function commitRaw(adapter, host, ret, scope, hydrationNodes) {
                 node: oldNode,
                 parentNode: host.value,
                 isNested: false,
+                root,
             });
         }
         ret.value = adapter.raw({
             value: ret.el.props.value,
             scope,
             hydrationNodes,
+            root,
         });
     }
     ret.oldProps = stripSpecialProps(ret.el.props);
     return ret.value;
 }
-function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
+function commitHost(adapter, ret, ctx, root, schedulePromises, hydrationNodes) {
     if (getFlag(ret, IsCopied) && getFlag(ret, DidCommit)) {
         return getValue(ret);
     }
@@ -957,6 +963,7 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
                     node,
                     props,
                     scope,
+                    root,
                 });
                 if (childHydrationNodes) {
                     for (let i = 0; i < childHydrationNodes.length; i++) {
@@ -964,6 +971,7 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
                             node: childHydrationNodes[i],
                             parentNode: node,
                             isNested: false,
+                            root,
                         });
                     }
                 }
@@ -992,6 +1000,7 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
                     node: nextChild,
                     props,
                     scope,
+                    root,
                 });
                 if (childHydrationNodes) {
                     node = nextChild;
@@ -1000,6 +1009,7 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
                             node: childHydrationNodes[i],
                             parentNode: node,
                             isNested: false,
+                            root,
                         });
                     }
                 }
@@ -1014,6 +1024,7 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
                     tagName: getTagName(tag),
                     props,
                     scope,
+                    root,
                 });
             }
             ret.value = node;
@@ -1027,13 +1038,14 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
             props,
             oldProps,
             scope,
+            root,
             copyProps,
             isHydrating: !!childHydrationNodes,
             quietProps,
         });
     }
     if (!copyChildren) {
-        const children = commitChildren(adapter, ret, ctx, scope, ret, 0, schedulePromises, hydrationMetaProp && !hydrationMetaProp.includes("children")
+        const children = commitChildren(adapter, ret, ctx, scope, tag === Portal ? node : root, ret, 0, schedulePromises, hydrationMetaProp && !hydrationMetaProp.includes("children")
             ? undefined
             : childHydrationNodes);
         adapter.arrange({
@@ -1043,6 +1055,7 @@ function commitHost(adapter, ret, ctx, schedulePromises, hydrationNodes) {
             props,
             children,
             oldProps,
+            root,
         });
     }
     ret.oldProps = props;
@@ -1143,10 +1156,10 @@ function flush(adapter, root, initiator) {
         }
     }
 }
-function unmount(adapter, host, ctx, ret, isNested) {
+function unmount(adapter, host, ctx, root, ret, isNested) {
     // TODO: set the IsUnmounted flag consistently for all retainers
     if (ret.fallback) {
-        unmount(adapter, host, ctx, ret.fallback, isNested);
+        unmount(adapter, host, ctx, root, ret.fallback, isNested);
         ret.fallback = undefined;
     }
     if (getFlag(ret, IsResurrecting)) {
@@ -1157,7 +1170,7 @@ function unmount(adapter, host, ctx, ret, isNested) {
             const lingerers = ret.lingerers[i];
             if (lingerers) {
                 for (const lingerer of lingerers) {
-                    unmount(adapter, host, ctx, lingerer, isNested);
+                    unmount(adapter, host, ctx, root, lingerer, isNested);
                 }
             }
         }
@@ -1167,16 +1180,16 @@ function unmount(adapter, host, ctx, ret, isNested) {
         unmountComponent(ret.ctx, isNested);
     }
     else if (ret.el.tag === Fragment) {
-        unmountChildren(adapter, host, ctx, ret, isNested);
+        unmountChildren(adapter, host, ctx, root, ret, isNested);
     }
     else if (ret.el.tag === Portal) {
-        unmountChildren(adapter, ret, ctx, ret, false);
+        unmountChildren(adapter, ret, ctx, ret.value, ret, false);
         if (ret.value != null) {
             adapter.finalize(ret.value);
         }
     }
     else {
-        unmountChildren(adapter, ret, ctx, ret, true);
+        unmountChildren(adapter, ret, ctx, root, ret, true);
         if (getFlag(ret, DidCommit)) {
             if (ctx) {
                 // Remove the value from every context which shares the same host.
@@ -1186,22 +1199,23 @@ function unmount(adapter, host, ctx, ret, isNested) {
                 node: ret.value,
                 parentNode: host.value,
                 isNested,
+                root,
             });
         }
     }
 }
-function unmountChildren(adapter, host, ctx, ret, isNested) {
+function unmountChildren(adapter, host, ctx, root, ret, isNested) {
     if (ret.graveyard) {
         for (let i = 0; i < ret.graveyard.length; i++) {
             const child = ret.graveyard[i];
-            unmount(adapter, host, ctx, child, isNested);
+            unmount(adapter, host, ctx, root, child, isNested);
         }
         ret.graveyard = undefined;
     }
     for (let i = 0, children = _utils.wrap(ret.children); i < children.length; i++) {
         const child = children[i];
         if (typeof child === "object") {
-            unmount(adapter, host, ctx, child, isNested);
+            unmount(adapter, host, ctx, root, child, isNested);
         }
     }
 }
@@ -1995,7 +2009,7 @@ function commitComponent(ctx, schedulePromises, hydrationNodes) {
         });
         return getValue(ctx.ret);
     }
-    const values = commitChildren(ctx.adapter, ctx.host, ctx, ctx.scope, ctx.ret, ctx.index, schedulePromises, hydrationNodes);
+    const values = commitChildren(ctx.adapter, ctx.host, ctx, ctx.scope, ctx.root, ctx.ret, ctx.index, schedulePromises, hydrationNodes);
     if (getFlag(ctx.ret, IsUnmounted)) {
         return;
     }
@@ -2019,7 +2033,7 @@ function commitComponent(ctx, schedulePromises, hydrationNodes) {
                 setFlag(ctx.ret, IsScheduling, wasScheduling);
                 propagateComponent(ctx);
                 if (ctx.ret.fallback) {
-                    unmount(ctx.adapter, ctx.host, ctx.parent, ctx.ret.fallback, false);
+                    unmount(ctx.adapter, ctx.host, ctx.parent, ctx.root, ctx.ret.fallback, false);
                 }
                 ctx.ret.fallback = undefined;
             });
@@ -2045,7 +2059,7 @@ function commitComponent(ctx, schedulePromises, hydrationNodes) {
             propagateComponent(ctx);
         }
         if (ctx.ret.fallback) {
-            unmount(ctx.adapter, ctx.host, ctx.parent, ctx.ret.fallback, false);
+            unmount(ctx.adapter, ctx.host, ctx.parent, ctx.root, ctx.ret.fallback, false);
         }
         ctx.ret.fallback = undefined;
         setFlag(ctx.ret, IsUpdating, false);
@@ -2111,6 +2125,7 @@ function propagateComponent(ctx) {
         props,
         oldProps: props,
         children: hostChildren,
+        root: ctx.root,
     });
     flush(ctx.adapter, ctx.root, ctx);
 }
@@ -2165,7 +2180,7 @@ async function unmountComponent(ctx, isNested) {
         ctx.schedule = undefined;
     }
     eventTarget.clearEventListeners(ctx.ctx);
-    unmountChildren(ctx.adapter, ctx.host, ctx, ctx.ret, isNested);
+    unmountChildren(ctx.adapter, ctx.host, ctx, ctx.root, ctx.ret, isNested);
     if (didLinger) {
         // If we lingered, we call finalize to ensure rendering is finalized
         if (ctx.root != null) {