@epoch32/visage 1.1.1 → 1.1.2

package/dist/charts/index.js

@@ -1498,11 +1498,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1528,23 +1528,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/devtools/index.js

@@ -1947,11 +1947,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1977,23 +1977,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/dom/index.js

@@ -1385,11 +1385,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1415,23 +1415,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/index.js

@@ -4220,11 +4220,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -4250,23 +4250,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/jsx-runtime/index.js

@@ -1385,11 +1385,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1415,23 +1415,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/router/index.js

@@ -1385,11 +1385,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1415,23 +1415,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/style/index.js

@@ -1818,11 +1818,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1848,23 +1848,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/ui/index.js

@@ -1142,11 +1142,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1172,23 +1172,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/dist/virtual/index.js

@@ -1142,11 +1142,11 @@ function Show(props) {
     }
     return props.fallback ?? null;
   }
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
   let currentScope = null;
   let currentContent = [];
-  let isMounted = false;
   effect(() => {
     const condition = resolveValue(props.when);
     if (currentScope) {
@@ -1172,23 +1172,29 @@ function Show(props) {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes = typeof props.fallback === "function" ? props.fallback() : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
     currentContent = Array.from(frag.childNodes);
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
-  isMounted = true;
-  initialFrag.appendChild(marker);
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
   return initialFrag;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epoch32/visage",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Lightning-fast, zero-VDOM, fine-grained reactive UI library with full TypeScript support",
   "type": "module",
   "main": "./dist/index.js",

package/src/dom/control-flow.ts

@@ -33,11 +33,12 @@ export function Show<T>(props: ShowProps<T>): any {
     return props.fallback ?? null;
   }
 
-  const marker = document.createTextNode("");
+  const marker = document.createComment("visage-show");
   const initialFrag = document.createDocumentFragment();
+  initialFrag.appendChild(marker);
+
   let currentScope: Scope | null = null;
   let currentContent: Node[] = [];
-  let isMounted = false;
 
   effect(() => {
     const condition = resolveValue(props.when);
@@ -75,27 +76,35 @@ export function Show<T>(props: ShowProps<T>): any {
       currentScope = new Scope(getActiveScope());
       untrack(() => {
         runInScope(currentScope, () => {
-          insertChild(frag, props.fallback);
+          const fallbackRes =
+            typeof props.fallback === "function"
+              ? (props.fallback as () => Child)()
+              : props.fallback;
+          insertChild(frag, fallbackRes);
         });
       });
     }
 
     currentContent = Array.from(frag.childNodes);
 
-    if (marker.parentNode) {
-      marker.parentNode.insertBefore(frag, marker);
-    } else if (!isMounted) {
-      initialFrag.appendChild(frag);
+    const parent = marker.parentNode;
+    if (parent) {
+      parent.insertBefore(frag, marker);
     }
   });
 
-  isMounted = true;
-  initialFrag.appendChild(marker);
-
   onCleanup(() => {
     if (currentScope) {
       currentScope.dispose();
     }
+    for (const node of currentContent) {
+      if (node.parentNode) {
+        node.parentNode.removeChild(node);
+      }
+    }
+    if (marker.parentNode) {
+      marker.parentNode.removeChild(marker);
+    }
   });
 
   return initialFrag;