@getforma/core 1.2.0 → 1.3.0

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkE3FV2VSU_cjs = require('./chunk-E3FV2VSU.cjs');
+var chunkFBM7V4NE_cjs = require('./chunk-FBM7V4NE.cjs');
 var chunkKUXNZ5MG_cjs = require('./chunk-KUXNZ5MG.cjs');
 var chunkH7MDUHS5_cjs = require('./chunk-H7MDUHS5.cjs');
 
@@ -26,7 +26,7 @@ function mount(component, container) {
   if (target.hasAttribute("data-forma-ssr")) {
     chunkKUXNZ5MG_cjs.createUnownedRoot((dispose) => {
       disposeRoot = dispose;
-      chunkE3FV2VSU_cjs.hydrateIsland(component, target);
+      chunkFBM7V4NE_cjs.hydrateIsland(component, target);
     });
   } else {
     const dom = chunkKUXNZ5MG_cjs.createUnownedRoot((dispose) => {
@@ -215,8 +215,14 @@ function createSuspense(fallback, children2) {
     const isPending = pending() > 0;
     const newNode = isPending ? fallbackNode ??= fallback() : resolvedNode;
     if (newNode === currentNode) return;
-    if (currentNode && currentNode.parentNode === parent2) {
-      parent2.removeChild(currentNode);
+    if (currentNode) {
+      if (currentNode.parentNode === parent2) {
+        parent2.removeChild(currentNode);
+      } else if (currentNode.nodeType === 11) {
+        while (startMarker.nextSibling && startMarker.nextSibling !== endMarker) {
+          currentNode.appendChild(startMarker.nextSibling);
+        }
+      }
     }
     if (newNode) {
       parent2.insertBefore(newNode, endMarker);
@@ -272,6 +278,10 @@ function activateIslands(registry) {
   const sharedProps = scriptBlock ? JSON.parse(scriptBlock.textContent) : null;
   const islands = document.querySelectorAll("[data-forma-island]");
   for (const root of islands) {
+    const status = root.getAttribute("data-forma-status");
+    if (status === "active" || status === "hydrating" || status === "disposed" || status === "error") continue;
+    if (root.__formaScheduled) continue;
+    delete root.__formaDisposed;
     const id = parseInt(root.getAttribute("data-forma-island"), 10);
     const componentName = root.getAttribute("data-forma-component");
     const hydrateFn = registry[componentName];
@@ -282,30 +292,39 @@ function activateIslands(registry) {
     }
     const trigger2 = root.getAttribute("data-forma-hydrate") || "load";
     if (trigger2 === "visible") {
+      root.__formaScheduled = true;
       const observer = new IntersectionObserver(
         (entries) => {
           for (const entry of entries) {
             if (!entry.isIntersecting) continue;
             observer.disconnect();
+            delete root.__formaObserver;
             hydrateIslandRoot(root, id, componentName, hydrateFn, sharedProps);
           }
         },
         { rootMargin: "200px" }
       );
+      root.__formaObserver = observer;
       observer.observe(root);
     } else if (trigger2 === "idle") {
+      root.__formaScheduled = true;
       const hydrate = () => hydrateIslandRoot(root, id, componentName, hydrateFn, sharedProps);
       if (typeof requestIdleCallback === "function") {
-        requestIdleCallback(hydrate);
+        const handle = requestIdleCallback(hydrate);
+        root.__formaIdleCancel = () => cancelIdleCallback(handle);
       } else {
-        setTimeout(hydrate, 200);
+        const handle = setTimeout(hydrate, 200);
+        root.__formaIdleCancel = () => clearTimeout(handle);
       }
     } else if (trigger2 === "interaction") {
+      root.__formaScheduled = true;
       const hydrate = () => {
         root.removeEventListener("pointerdown", hydrate, true);
         root.removeEventListener("focusin", hydrate, true);
+        delete root.__formaInteractionHandler;
         hydrateIslandRoot(root, id, componentName, hydrateFn, sharedProps);
       };
+      root.__formaInteractionHandler = hydrate;
       root.addEventListener("pointerdown", hydrate, { capture: true, once: true });
       root.addEventListener("focusin", hydrate, { capture: true, once: true });
     } else {
@@ -314,6 +333,24 @@ function activateIslands(registry) {
   }
 }
 function deactivateIsland(el) {
+  const observer = el.__formaObserver;
+  if (observer) {
+    observer.disconnect();
+    delete el.__formaObserver;
+  }
+  const interactionHandler = el.__formaInteractionHandler;
+  if (interactionHandler) {
+    el.removeEventListener("pointerdown", interactionHandler, true);
+    el.removeEventListener("focusin", interactionHandler, true);
+    delete el.__formaInteractionHandler;
+  }
+  const idleCancel = el.__formaIdleCancel;
+  if (idleCancel) {
+    idleCancel();
+    delete el.__formaIdleCancel;
+  }
+  delete el.__formaScheduled;
+  el.__formaDisposed = true;
   const dispose = el.__formaDispose;
   if (typeof dispose === "function") {
     dispose();
@@ -322,18 +359,20 @@ function deactivateIsland(el) {
   }
 }
 function deactivateAllIslands(root = document) {
-  const islands = root.querySelectorAll('[data-forma-status="active"]');
+  const islands = root.querySelectorAll("[data-forma-island]");
   for (const island of islands) {
     deactivateIsland(island);
   }
 }
 function hydrateIslandRoot(root, id, componentName, hydrateFn, sharedProps) {
+  if (root.__formaDisposed) return;
   try {
+    delete root.__formaScheduled;
     const props = loadIslandProps(root, id, sharedProps);
     root.setAttribute("data-forma-status", "hydrating");
     let activeRoot = root;
     chunkKUXNZ5MG_cjs.createUnownedRoot((dispose) => {
-      activeRoot = chunkE3FV2VSU_cjs.hydrateIsland(() => hydrateFn(root, props), root);
+      activeRoot = chunkFBM7V4NE_cjs.hydrateIsland(() => hydrateFn(root, props), root);
       activeRoot.__formaDispose = dispose;
     });
     activeRoot.setAttribute("data-forma-status", "active");
@@ -1144,35 +1183,39 @@ function onMutation(el, handler, options) {
 
 Object.defineProperty(exports, "Fragment", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.Fragment; }
+  get: function () { return chunkFBM7V4NE_cjs.Fragment; }
 });
 Object.defineProperty(exports, "cleanup", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.cleanup; }
+  get: function () { return chunkFBM7V4NE_cjs.cleanup; }
 });
 Object.defineProperty(exports, "createList", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.createList; }
+  get: function () { return chunkFBM7V4NE_cjs.createList; }
 });
 Object.defineProperty(exports, "createShow", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.createShow; }
+  get: function () { return chunkFBM7V4NE_cjs.createShow; }
 });
 Object.defineProperty(exports, "fragment", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.fragment; }
+  get: function () { return chunkFBM7V4NE_cjs.fragment; }
 });
 Object.defineProperty(exports, "h", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.h; }
+  get: function () { return chunkFBM7V4NE_cjs.h; }
 });
 Object.defineProperty(exports, "hydrateIsland", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.hydrateIsland; }
+  get: function () { return chunkFBM7V4NE_cjs.hydrateIsland; }
 });
 Object.defineProperty(exports, "reconcileList", {
   enumerable: true,
-  get: function () { return chunkE3FV2VSU_cjs.reconcileList; }
+  get: function () { return chunkFBM7V4NE_cjs.reconcileList; }
+});
+Object.defineProperty(exports, "svg", {
+  enumerable: true,
+  get: function () { return chunkFBM7V4NE_cjs.svg; }
 });
 Object.defineProperty(exports, "batch", {
   enumerable: true,