solid-js 1.8.18 → 1.8.20

package/web/dist/web.js

@@ -1,8 +1,8 @@
 import {
   createRoot,
-  sharedConfig,
   createRenderEffect,
   untrack,
+  sharedConfig,
   enableHydration,
   getOwner,
   createEffect,
@@ -595,21 +595,21 @@ function clearDelegatedEvents(document = window.document) {
   }
 }
 function setProperty(node, name, value) {
-  if (!!sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   node[name] = value;
 }
 function setAttribute(node, name, value) {
-  if (!!sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   if (value == null) node.removeAttribute(name);
   else node.setAttribute(name, value);
 }
 function setAttributeNS(node, namespace, name, value) {
-  if (!!sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   if (value == null) node.removeAttributeNS(namespace, name);
   else node.setAttributeNS(namespace, name, value);
 }
 function className(node, value) {
-  if (!!sharedConfig.context && node.isConnected) return;
+  if (isHydrating(node)) return;
   if (value == null) node.removeAttribute("class");
   else node.className = value;
 }
@@ -671,9 +671,7 @@ function spread(node, props = {}, isSVG, skipChildren) {
       () => (prevProps.children = insertExpression(node, props.children, prevProps.children))
     );
   }
-  createRenderEffect(() =>
-    typeof props.ref === "function" ? use(props.ref, node) : (props.ref = node)
-  );
+  createRenderEffect(() => typeof props.ref === "function" && use(props.ref, node));
   createRenderEffect(() => assign(node, props, isSVG, true, prevProps, true));
   return prevProps;
 }
@@ -717,20 +715,25 @@ function hydrate$1(code, element, options = {}) {
   sharedConfig.events = globalThis._$HY.events;
   sharedConfig.load = id => globalThis._$HY.r[id];
   sharedConfig.has = id => id in globalThis._$HY.r;
+  sharedConfig.done = globalThis._$HY.done;
   sharedConfig.gather = root => gatherHydratable(element, root);
   sharedConfig.registry = new Map();
   sharedConfig.context = {
     id: options.renderId || "",
     count: 0
   };
-  gatherHydratable(element, options.renderId);
-  const dispose = render(code, element, [...element.childNodes], options);
-  sharedConfig.context = null;
-  return dispose;
+  try {
+    gatherHydratable(element, options.renderId);
+    return render(code, element, [...element.childNodes], options);
+  } finally {
+    sharedConfig.context = null;
+  }
 }
 function getNextElement(template) {
-  let node, key;
-  if (!sharedConfig.context || !(node = sharedConfig.registry.get((key = getHydrationKey())))) {
+  let node,
+    key,
+    hydrating = isHydrating();
+  if (!hydrating || !(node = sharedConfig.registry.get((key = getHydrationKey())))) {
     return template();
   }
   if (sharedConfig.completed) sharedConfig.completed.add(node);
@@ -745,7 +748,7 @@ function getNextMarker(start) {
   let end = start,
     count = 0,
     current = [];
-  if (sharedConfig.context) {
+  if (isHydrating(start)) {
     while (end) {
       if (end.nodeType === 8) {
         const v = end.nodeValue;
@@ -769,13 +772,20 @@ function runHydrationEvents() {
       while (events.length) {
         const [el, e] = events[0];
         if (!completed.has(el)) return;
-        eventHandler(e);
         events.shift();
+        eventHandler(e);
+      }
+      if (sharedConfig.done) {
+        sharedConfig.events = _$HY.events = null;
+        sharedConfig.completed = _$HY.completed = null;
       }
     });
     sharedConfig.events.queued = true;
   }
 }
+function isHydrating(node) {
+  return !!sharedConfig.context && !sharedConfig.done && (!node || node.isConnected);
+}
 function toPropertyName(name) {
   return name.toLowerCase().replace(/-([a-z])/g, (_, w) => w.toUpperCase());
 }
@@ -822,7 +832,7 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
     if (forceProp) {
       prop = prop.slice(5);
       isProp = true;
-    } else if (!!sharedConfig.context && node.isConnected) return value;
+    } else if (isHydrating(node)) return value;
     if (prop === "class" || prop === "className") className(node, value);
     else if (isCE && !isProp && !isChildProp) node[toPropertyName(prop)] = value;
     else node[propAlias || prop] = value;
@@ -834,6 +844,9 @@ function assignProp(node, prop, value, prev, isSVG, skipRef) {
   return value;
 }
 function eventHandler(e) {
+  if (sharedConfig.registry && sharedConfig.events) {
+    if (sharedConfig.events.find(([el, ev]) => ev === e)) return;
+  }
   const key = `$$${e.type}`;
   let node = (e.composedPath && e.composedPath()[0]) || e.target;
   if (e.target !== node) {
@@ -860,7 +873,7 @@ function eventHandler(e) {
   }
 }
 function insertExpression(parent, value, current, marker, unwrapArray) {
-  const hydrating = !!sharedConfig.context && parent.isConnected;
+  const hydrating = isHydrating(parent);
   if (hydrating) {
     !current && (current = [...parent.childNodes]);
     let cleaned = [];
@@ -912,9 +925,10 @@ function insertExpression(parent, value, current, marker, unwrapArray) {
     }
     if (hydrating) {
       if (!array.length) return current;
-      if (marker === undefined) return [...parent.childNodes];
+      if (marker === undefined) return (current = [...parent.childNodes]);
       let node = array[0];
-      let nodes = [node];
+      if (node.parentNode !== parent) return current;
+      const nodes = [node];
       while ((node = node.nextSibling) !== marker) nodes.push(node);
       return (current = nodes);
     }
@@ -1004,8 +1018,7 @@ function gatherHydratable(element, root) {
   }
 }
 function getHydrationKey() {
-  const hydrate = sharedConfig.context;
-  return `${hydrate.id}${hydrate.count++}`;
+  return sharedConfig.getNextContextId();
 }
 function NoHydration(props) {
   return sharedConfig.context ? undefined : props.children;