octane 0.1.26 → 0.1.27

package/dist/runtime.js

@@ -1184,12 +1184,18 @@ function drainQueue() {
     }
     const crossRenderUpdate = block.crossRenderUpdate;
     block.crossRenderUpdate = false;
+    const hiddenOwner = findHiddenRenderOwner(block, true);
+    let hiddenActivity = null;
+    let hiddenTry = null;
+    if (hiddenOwner !== null) {
+      if (hiddenOwner.__kind === "trySlotSlot") hiddenTry = hiddenOwner;
+      else hiddenActivity = hiddenOwner;
+    }
     try {
       if (block.nestedUpdateError) {
         block.nestedUpdateError = false;
         throw maximumUpdateDepthError();
       }
-      const hiddenTry = findSuspenseHiddenTry(block);
       if (hiddenTry !== null) {
         attemptHiddenReveal(hiddenTry, block.pendingMode ?? "urgent");
         continue;
@@ -1221,6 +1227,8 @@ function drainQueue() {
         while (root.parentBlock !== null) root = root.parentBlock;
         if (root.kind === "root" && !root.disposed) unmountBlock(root);
       }
+    } finally {
+      if (hiddenActivity !== null) rehideActivityAfterDescendantRender(hiddenActivity);
     }
   }
   QUEUE.length = 0;
@@ -10700,8 +10708,63 @@ function setTransitionFallbackTimeout(ms) {
 function getTransitionFallbackTimeout() {
   return TRANSITION_FALLBACK_TIMEOUT_MS;
 }
-const SUSPENSE_HIDDEN_DISPLAYS = /* @__PURE__ */ new WeakMap();
-const SUSPENSE_HIDDEN_TEXTS = /* @__PURE__ */ new WeakMap();
+const HIDDEN_DISPLAYS = /* @__PURE__ */ new WeakMap();
+const HIDDEN_TEXTS = /* @__PURE__ */ new WeakMap();
+function enforceHiddenDisplay(el) {
+  const hidden = HIDDEN_DISPLAYS.get(el);
+  el.style.setProperty(
+    "display",
+    "none",
+    hidden !== void 0 && hidden.importantOwners > 0 ? "important" : ""
+  );
+}
+function retainHiddenDisplay(el, important) {
+  const existing = HIDDEN_DISPLAYS.get(el);
+  if (existing === void 0) {
+    HIDDEN_DISPLAYS.set(el, {
+      owners: 1,
+      importantOwners: important ? 1 : 0,
+      value: el.style.getPropertyValue("display"),
+      priority: el.style.getPropertyPriority("display"),
+      hadStyle: el.hasAttribute("style")
+    });
+  } else {
+    existing.owners++;
+    if (important) existing.importantOwners++;
+  }
+  enforceHiddenDisplay(el);
+}
+function releaseHiddenDisplay(el, important) {
+  const display = HIDDEN_DISPLAYS.get(el);
+  if (display === void 0) return;
+  if (important) display.importantOwners--;
+  if (--display.owners === 0) {
+    HIDDEN_DISPLAYS.delete(el);
+    if (display.value === "") el.style.removeProperty("display");
+    else el.style.setProperty("display", display.value, display.priority);
+    if (!display.hadStyle && el.getAttribute("style") === "") el.removeAttribute("style");
+  } else {
+    enforceHiddenDisplay(el);
+  }
+}
+function enforceHiddenText(text) {
+  if (text.data !== "") text.data = "";
+}
+function retainHiddenText(text) {
+  const existing = HIDDEN_TEXTS.get(text);
+  if (existing === void 0) HIDDEN_TEXTS.set(text, { owners: 1, data: text.data });
+  else existing.owners++;
+}
+function releaseHiddenText(text) {
+  const saved = HIDDEN_TEXTS.get(text);
+  if (saved === void 0) return;
+  if (--saved.owners === 0) {
+    HIDDEN_TEXTS.delete(text);
+    text.data = saved.data;
+  } else {
+    enforceHiddenText(text);
+  }
+}
 function setTryBranch(slot, next) {
   slot.branch = next;
   if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
@@ -11063,31 +11126,17 @@ function hideBlockHostRange(block, hidden) {
       const el = node;
       if (!hidden.displays.has(el)) {
         hidden.displays.add(el);
-        const existing = SUSPENSE_HIDDEN_DISPLAYS.get(el);
-        if (existing === void 0) {
-          SUSPENSE_HIDDEN_DISPLAYS.set(el, {
-            owners: 1,
-            value: el.style.getPropertyValue("display"),
-            priority: el.style.getPropertyPriority("display"),
-            hadStyle: el.hasAttribute("style")
-          });
-        } else {
-          existing.owners++;
-        }
+        retainHiddenDisplay(el, true);
+      } else {
+        enforceHiddenDisplay(el);
       }
-      el.style.setProperty("display", "none", "important");
     } else if (node.nodeType === 3) {
       const text = node;
       if (!hidden.texts.has(text)) {
         hidden.texts.add(text);
-        const existing = SUSPENSE_HIDDEN_TEXTS.get(text);
-        if (existing === void 0) {
-          SUSPENSE_HIDDEN_TEXTS.set(text, { owners: 1, data: text.data });
-        } else {
-          existing.owners++;
-        }
+        retainHiddenText(text);
       }
-      if (text.data !== "") text.data = "";
+      enforceHiddenText(text);
     }
     node = node.nextSibling;
   }
@@ -11115,26 +11164,10 @@ function showTryBlock(state) {
   if (hidden === null) return;
   state.hiddenDom = null;
   for (const el of hidden.displays) {
-    const display = SUSPENSE_HIDDEN_DISPLAYS.get(el);
-    if (display === void 0) continue;
-    if (--display.owners === 0) {
-      SUSPENSE_HIDDEN_DISPLAYS.delete(el);
-      if (display.value === "") el.style.removeProperty("display");
-      else el.style.setProperty("display", display.value, display.priority);
-      if (!display.hadStyle && el.getAttribute("style") === "") el.removeAttribute("style");
-    } else {
-      el.style.setProperty("display", "none", "important");
-    }
+    releaseHiddenDisplay(el, true);
   }
   for (const text of hidden.texts) {
-    const saved = SUSPENSE_HIDDEN_TEXTS.get(text);
-    if (saved === void 0) continue;
-    if (--saved.owners === 0) {
-      SUSPENSE_HIDDEN_TEXTS.delete(text);
-      text.data = saved.data;
-    } else if (text.data !== "") {
-      text.data = "";
-    }
+    releaseHiddenText(text);
   }
 }
 function releaseHeldTransition(state) {
@@ -11286,6 +11319,7 @@ function commitResume(state) {
 }
 function commitResumeInner(state) {
   if (state.parentBlock.disposed) return;
+  const hiddenActivity = findHiddenActivity(state.parentBlock);
   const wasHeld = state.transitionHeld;
   if (wasHeld) state.transitionHeld = false;
   HELD_TRANSITIONS.delete(state);
@@ -11377,14 +11411,33 @@ function commitResumeInner(state) {
     }
     if (!deferringStagedRevealEffects) commitEffects();
   } finally {
+    if (hiddenActivity !== null) rehideActivityAfterDescendantRender(hiddenActivity);
     if (wasHeld) tickTransitionCount(-1);
   }
 }
-function findSuspenseHiddenTry(block) {
+function findHiddenRenderOwner(block, includeActivity) {
+  let activity = null;
   for (let p = block; p !== null; p = p.parentBlock) {
+    if (includeActivity && activity === null && p.inactive) {
+      const candidate = p.__activitySlot;
+      if (candidate !== void 0 && candidate.block === p && candidate.hidden) {
+        activity = candidate;
+      }
+    }
     const slot = p.__trySlot;
     if (slot !== void 0 && slot.tryBlock === p && slot.hiddenDom !== null) return slot;
   }
+  return activity;
+}
+function findSuspenseHiddenTry(block) {
+  return findHiddenRenderOwner(block, false);
+}
+function findHiddenActivity(block) {
+  for (let p = block; p !== null; p = p.parentBlock) {
+    if (!p.inactive) continue;
+    const candidate = p.__activitySlot;
+    if (candidate !== void 0 && candidate.block === p && candidate.hidden) return candidate;
+  }
   return null;
 }
 function snapshotSubtreeEffectDeps(scope) {
@@ -11500,11 +11553,19 @@ function queueCurrentHiddenRefs(state) {
   }
 }
 function attemptHiddenReveal(state, scheduledMode) {
+  const hiddenActivity = findHiddenActivity(state.tryBlock);
+  try {
+    attemptHiddenRevealInner(state, scheduledMode);
+  } finally {
+    if (hiddenActivity !== null) rehideActivityAfterDescendantRender(hiddenActivity);
+  }
+}
+function attemptHiddenRevealInner(state, scheduledMode) {
   const tryBlock2 = state.tryBlock;
   if (tryBlock2 === null || tryBlock2.disposed || state.hiddenDom === null) return;
   const hiddenAncestor = findSuspenseHiddenTry(tryBlock2.parentBlock);
   if (hiddenAncestor !== null) {
-    attemptHiddenReveal(hiddenAncestor, scheduledMode);
+    attemptHiddenRevealInner(hiddenAncestor, scheduledMode);
     return;
   }
   STAGED_REVEALS.delete(state);
@@ -12492,25 +12553,49 @@ function ifBlock(parentScope, slotKey, domParent, cond, thenBody, elseBody, anch
 function hideActivityRange(state) {
   const b = state.block;
   if (!b) return;
+  for (const el of state.hiddenDisplays) {
+    if (el.parentNode !== b.parentNode) {
+      state.hiddenDisplays.delete(el);
+      releaseHiddenDisplay(el, false);
+    }
+  }
+  for (const text of state.hiddenTexts) {
+    if (text.parentNode !== b.parentNode) {
+      state.hiddenTexts.delete(text);
+      releaseHiddenText(text);
+    }
+  }
   let node = b.startMarker.nextSibling;
   while (node && node !== b.endMarker) {
     if (node.nodeType === 1) {
       const el = node;
-      if (!state.savedDisplay.has(el)) state.savedDisplay.set(el, el.style.display);
-      el.style.display = "none";
+      if (!state.hiddenDisplays.has(el)) {
+        state.hiddenDisplays.add(el);
+        retainHiddenDisplay(el, false);
+      } else {
+        enforceHiddenDisplay(el);
+      }
     } else if (node.nodeType === 3) {
       const t = node;
-      if (!state.savedText.has(t)) state.savedText.set(t, t.nodeValue ?? "");
-      if (t.nodeValue !== "") t.nodeValue = "";
+      if (!state.hiddenTexts.has(t)) {
+        state.hiddenTexts.add(t);
+        retainHiddenText(t);
+      }
+      enforceHiddenText(t);
     }
     node = node.nextSibling;
   }
 }
+function rehideActivityAfterDescendantRender(state) {
+  const b = state.block;
+  if (b === null || !state.hidden || state.deactivationPending || blockSubtreeDisposed(b)) return;
+  hideActivityRange(state);
+}
 function showActivityRange(state) {
-  for (const [el, display] of state.savedDisplay) el.style.display = display;
-  state.savedDisplay.clear();
-  for (const [t, data] of state.savedText) t.nodeValue = data;
-  state.savedText.clear();
+  for (const el of state.hiddenDisplays) releaseHiddenDisplay(el, false);
+  state.hiddenDisplays.clear();
+  for (const text of state.hiddenTexts) releaseHiddenText(text);
+  state.hiddenTexts.clear();
 }
 function queueActivityDeactivation(state, block, commitVersion) {
   enqueueEffectEventCommitAction(() => {
@@ -12560,9 +12645,10 @@ function activityBlock(parentScope, slotKey, domParent, mode, body, anchor, env)
       hidden: false,
       commitVersion: 0,
       deactivationPending: false,
-      savedDisplay: /* @__PURE__ */ new Map(),
-      savedText: /* @__PURE__ */ new Map()
+      hiddenDisplays: /* @__PURE__ */ new Set(),
+      hiddenTexts: /* @__PURE__ */ new Set()
     };
+    b2.__activitySlot = state;
     parentScope.slots[slotKey] = state;
     registerSlot(parentScope, state);
     const adopted = open !== null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octane",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,