octane 0.3.3 → 0.3.5

package/dist/cjs/dom-focused-move.cjs

@@ -42,6 +42,10 @@ function moveNativeNodeBefore(parent, node, anchor, focused, contentEditable) {
     moveBefore.call(parent, node, anchor);
     return;
   }
+  if (node.parentNode !== parent || anchor !== null && anchor.parentNode !== parent) {
+    parent.insertBefore(node, anchor);
+    return;
+  }
   if (node === anchor || node.nextSibling === anchor) return;
   if (anchor === null || (node.compareDocumentPosition(anchor) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0) {
     let cursor = node.nextSibling;

package/dist/cjs/runtime.cjs

@@ -6739,7 +6739,13 @@ function renderBlockInner(block) {
     block.__thenableDone = false;
   }
   if (block.$$ctxReads !== null) block.$$ctxReads.clear();
-  if (block.$$ctxDirect !== null) block.$$ctxDirect.clear();
+  if (block.$$ctxDirect !== null) {
+    const state = block.slots[0];
+    if (state?.__kind === "hydrateBlockSlot" && state.parentBlock === block && !state.independent && !state.hydrated) {
+      state.contextChanged = block.$$ctxDepsEpoch !== (0, import_context_epoch.contextEpochNow)() && ctxDirectChanged(block);
+    }
+    block.$$ctxDirect.clear();
+  }
   block.$$ctxDepsEpoch = (0, import_context_epoch.contextEpochNow)();
   block.currentRenderMode = urgentTransitionRender !== null ? "urgent" : block.pendingMode ?? prevBlock?.currentRenderMode ?? "urgent";
   block.currentRenderDeferred = urgentTransitionRender !== null ? false : block.pendingMode !== null ? block.pendingDeferred : prevBlock?.currentRenderDeferred ?? false;
@@ -6764,7 +6770,9 @@ function renderBlockInner(block) {
       renderRetry = true;
       return true;
     }
-    if (out !== void 0 && block.outputHandler !== null) block.outputHandler(block, out);
+    if (block.outputHandler !== null && (out !== void 0 || block.slots[0]?.returnedOutput === true)) {
+      block.outputHandler(block, out ?? null);
+    }
     finishEffectRender(block);
     if (!block.mounted) block.mounted = true;
     if (block.renderStatus === RENDER_RETRYING) block.renderStatus = RENDER_VALID;
@@ -6823,6 +6831,14 @@ function renderBlockInner(block) {
     }
   }
 }
+let RETURNED_OUTPUT_SCOPE = null;
+function setReturnedOutputOwner(state, returned) {
+  if (state.returnedOutput === returned) return;
+  if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+    TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "returnedOutput", state.returnedOutput);
+  }
+  state.returnedOutput = returned;
+}
 function returnSlotTail(block, state) {
   const candidates = [
     state?.end,
@@ -6839,59 +6855,82 @@ function returnSlotTail(block, state) {
   }
   return null;
 }
-function renderReturnedValue(block, out) {
-  const isComponentDescriptor = out !== null && out.$$kind === import_runtime_tags.ELEMENT_TAG && out.key == null && typeof out.type === "function";
-  const existingRet = block.slots[0];
-  let replacedStart = null;
-  let replacedEnd = null;
-  const useSingleRoot = isComponentDescriptor && (out.type.$$singleRoot === true || activeHydration()?.passthroughRanges === true || // STICKY regime: a return slot mounted through the componentSlot route
-  // (most importantly by the passthrough-hydration branch above, whose
-  // condition is false again once hydration ends) keeps that route while
-  // the returned component identity is unchanged. Falling through to the
-  // childSlot route would dispose the slot for a mere kind flip — tearing
-  // down the very subtree hydration just adopted on its FIRST update. An
-  // identity change still disposes below (matching remount semantics).
-  existingRet !== void 0 && existingRet.__kind === "componentSlotSlot" && existingRet.currentComp === out.type);
-  if (existingRet !== void 0 && existingRet.__kind !== (useSingleRoot ? "componentSlotSlot" : "childSlot")) {
-    const swapDriver = TRANSITION_SWAP_DRIVER;
-    const transitionMode = block.currentRenderMode === "transition";
-    const committedSuspense = swapDriver !== null && activeHydration() === null && preservesCommittedSuspense(block);
-    const transitionSwap = ROOT_RENDER_TRANSACTION === null || committedSuspense ? swapDriver : null;
-    const suspenseSwap = transitionSwap !== null && !transitionMode && activeHydration() === null && committedSuspense;
-    if (transitionSwap !== null && activeHydration() === null && (transitionMode || suspenseSwap)) {
-      const tail = returnSlotTail(block, existingRet);
-      if (tail !== null) {
-        const probe = transitionSwap.render(
-          block,
-          block.parentNode,
-          tail,
-          ROOT_RENDERABLE_BODY,
-          out,
-          renderReturnedValue
-        );
-        transitionSwap.dispose(probe.wip);
-        if (probe.failed) throw probe.error;
-        if (probe.suspended) throw new SuspenseException(probe.suspended);
-      }
+function renderReturnedValue(block, out, reset) {
+  const previous = RETURNED_OUTPUT_SCOPE;
+  RETURNED_OUTPUT_SCOPE = block;
+  try {
+    if (reset === true) {
+      const state2 = block.slots[0];
+      if (state2 !== void 0) disposeReturnSlot(block, state2);
+      return;
     }
-    if (ROOT_RENDER_TRANSACTION !== null && !existingRet.inherited && !existingRet.borrowed && existingRet.ownerHost == null) {
-      const first = existingRet.start ?? existingRet.hostNode ?? existingRet.text ?? existingRet.block?.startMarker ?? existingRet.end ?? null;
-      const last = existingRet.end ?? existingRet.block?.endMarker ?? first;
-      if (sharesBlockBoundary(block, first, last)) {
-        replacedStart = first;
-        replacedEnd = last;
+    const isComponentDescriptor = out !== null && out.$$kind === import_runtime_tags.ELEMENT_TAG && out.key == null && typeof out.type === "function";
+    const existingRet = block.slots[0];
+    let replacedStart = null;
+    let replacedEnd = null;
+    const useSingleRoot = isComponentDescriptor && (out.type.$$singleRoot === true || activeHydration()?.passthroughRanges === true || // STICKY regime: a return slot mounted through the componentSlot route
+    // (most importantly by the passthrough-hydration branch above, whose
+    // condition is false again once hydration ends) keeps that route while
+    // the returned component identity is unchanged. Falling through to the
+    // childSlot route would dispose the slot for a mere kind flip — tearing
+    // down the very subtree hydration just adopted on its FIRST update. An
+    // identity change still disposes below (matching remount semantics).
+    existingRet !== void 0 && existingRet.__kind === "componentSlotSlot" && existingRet.currentComp === out.type);
+    if (existingRet !== void 0 && existingRet.__kind !== (useSingleRoot ? "componentSlotSlot" : "childSlot")) {
+      const swapDriver = TRANSITION_SWAP_DRIVER;
+      const transitionMode = block.currentRenderMode === "transition";
+      const committedSuspense = swapDriver !== null && activeHydration() === null && preservesCommittedSuspense(block);
+      const transitionSwap = ROOT_RENDER_TRANSACTION === null || committedSuspense ? swapDriver : null;
+      const suspenseSwap = transitionSwap !== null && !transitionMode && activeHydration() === null && committedSuspense;
+      if (transitionSwap !== null && activeHydration() === null && (transitionMode || suspenseSwap)) {
+        const tail = returnSlotTail(block, existingRet);
+        if (tail !== null) {
+          const probe = transitionSwap.render(
+            block,
+            block.parentNode,
+            tail,
+            ROOT_RENDERABLE_BODY,
+            out,
+            renderReturnedValue
+          );
+          transitionSwap.dispose(probe.wip);
+          if (probe.failed) throw probe.error;
+          if (probe.suspended) throw new SuspenseException(probe.suspended);
+        }
+      }
+      if (ROOT_RENDER_TRANSACTION !== null && !existingRet.inherited && !existingRet.borrowed && existingRet.ownerHost == null) {
+        const first = existingRet.start ?? existingRet.hostNode ?? existingRet.text ?? existingRet.block?.startMarker ?? existingRet.end ?? null;
+        const last = existingRet.end ?? existingRet.block?.endMarker ?? first;
+        if (sharesBlockBoundary(block, first, last)) {
+          replacedStart = first;
+          replacedEnd = last;
+        }
       }
+      disposeReturnSlot(block, existingRet);
+      if (block.disposed) return;
     }
-    disposeReturnSlot(block, existingRet);
-    if (block.disposed) return;
-  }
-  if (useSingleRoot) {
-    const d = out;
-    if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !(0, import_profiling.__profileHasComponentMetadata)(d.type)) {
-      withProfileComponentOverride(
-        d.type,
-        null,
-        () => componentSlot(
+    if (useSingleRoot) {
+      const d = out;
+      if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !(0, import_profiling.__profileHasComponentMetadata)(d.type)) {
+        withProfileComponentOverride(
+          d.type,
+          null,
+          () => componentSlot(
+            block,
+            0,
+            block.parentNode,
+            d.type,
+            d.props,
+            block.endMarker,
+            d.key ?? void 0,
+            true,
+            void 0,
+            activeHydration() !== null && elementKeyWasProvided(d),
+            d.__octaneInvocationSite
+          )
+        );
+      } else {
+        componentSlot(
           block,
           0,
           block.parentNode,
@@ -6903,66 +6942,63 @@ function renderReturnedValue(block, out) {
           void 0,
           activeHydration() !== null && elementKeyWasProvided(d),
           d.__octaneInvocationSite
-        )
-      );
+        );
+      }
     } else {
-      componentSlot(
-        block,
-        0,
-        block.parentNode,
-        d.type,
-        d.props,
-        block.endMarker,
-        d.key ?? void 0,
-        true,
-        void 0,
-        activeHydration() !== null && elementKeyWasProvided(d),
-        d.__octaneInvocationSite
-      );
+      const returnHydration = activeHydration();
+      if (returnHydration !== null && block.slots[0] === void 0 && block.startMarker !== null && block.endMarker !== null && block.startMarker !== block.endMarker && block.startMarker.nodeType === 8 && block.endMarker.nodeType === 8 && (getNextSibling(block.startMarker) === block.endMarker || returnHydration.isUnframedRootRange(block.startMarker, block.endMarker))) {
+        const borrowed = {
+          __kind: "childSlot",
+          start: block.startMarker,
+          end: block.endMarker,
+          ownerHost: null,
+          borrowed: true,
+          compactable: false,
+          block: null,
+          text: null,
+          currentComp: null,
+          currentIsBodyFn: false,
+          forSlot: null,
+          hostNode: null,
+          portal: null
+        };
+        block.slots[0] = borrowed;
+        registerSlot(block, borrowed);
+      }
+      childSlot(block, 0, block.parentNode, out, block.endMarker);
     }
-  } else {
-    const returnHydration = activeHydration();
-    if (returnHydration !== null && block.slots[0] === void 0 && block.startMarker !== null && block.endMarker !== null && block.startMarker !== block.endMarker && block.startMarker.nodeType === 8 && block.endMarker.nodeType === 8 && (getNextSibling(block.startMarker) === block.endMarker || returnHydration.isUnframedRootRange(block.startMarker, block.endMarker))) {
-      const borrowed = {
-        __kind: "childSlot",
-        start: block.startMarker,
-        end: block.endMarker,
-        ownerHost: null,
-        borrowed: true,
-        compactable: false,
-        block: null,
-        text: null,
-        currentComp: null,
-        currentIsBodyFn: false,
-        forSlot: null,
-        hostNode: null,
-        portal: null
-      };
-      block.slots[0] = borrowed;
-      registerSlot(block, borrowed);
+    if (replacedStart !== null) {
+      const incoming = block.slots[0];
+      const first = incoming.start ?? incoming.hostNode ?? incoming.text ?? incoming.block?.startMarker ?? incoming.end ?? null;
+      const last = incoming.end ?? incoming.block?.endMarker ?? first;
+      replaceSharedBlockBoundary(block, replacedStart, replacedEnd, first, last);
     }
-    childSlot(block, 0, block.parentNode, out, block.endMarker);
-  }
-  if (replacedStart !== null) {
-    const incoming = block.slots[0];
-    const first = incoming.start ?? incoming.hostNode ?? incoming.text ?? incoming.block?.startMarker ?? incoming.end ?? null;
-    const last = incoming.end ?? incoming.block?.endMarker ?? first;
-    replaceSharedBlockBoundary(block, replacedStart, replacedEnd, first, last);
+    const state = block.slots[0];
+    if (!block.disposed && state !== void 0 && state.returnedOutput !== true) {
+      if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+        TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "returnedOutput", state.returnedOutput);
+      }
+      state.returnedOutput = true;
+    }
+  } finally {
+    RETURNED_OUTPUT_SCOPE = previous;
   }
 }
 function disposeReturnSlot(block, state) {
+  const kind = state.__kind;
+  const end = (kind === "ifBlockSlot" || kind === "switchBlockSlot") && state.start === null && state.block?.endMarker != null ? state.block.endMarker : state.end;
   const transaction = ROOT_RENDER_TRANSACTION;
   if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK) {
     const parent = state.ownerHost ?? block.parentNode;
     const borrowed = state.inherited === true || state.borrowed === true;
-    let first = state.ownerHost != null || borrowed && state.start === null ? getFirstChild(parent) : borrowed ? getNextSibling(state.start) : state.start ?? state.hostNode ?? state.text ?? state.block?.startMarker ?? state.end ?? null;
-    if (borrowed && first === state.end) first = null;
-    const last = first === null ? null : state.ownerHost != null || borrowed && state.end === null ? (STAGED_DOM?.view(parent) ?? parent).lastChild : borrowed ? domNode(state.end).previousSibling : state.end ?? state.block?.endMarker ?? first;
+    let first = state.ownerHost != null || borrowed && state.start === null ? getFirstChild(parent) : borrowed ? getNextSibling(state.start) : state.start ?? state.hostNode ?? state.text ?? state.block?.startMarker ?? end ?? null;
+    if (borrowed && first === end) first = null;
+    const last = first === null ? null : state.ownerHost != null || borrowed && end === null ? (STAGED_DOM?.view(parent) ?? parent).lastChild : borrowed ? domNode(end).previousSibling : end ?? state.block?.endMarker ?? first;
     journalRootSlot(
       state,
       parent,
       borrowed ? state.start : first !== null ? (STAGED_DOM?.view(first) ?? first).previousSibling : (STAGED_DOM?.view(parent) ?? parent).lastChild,
-      borrowed ? state.end : (STAGED_DOM?.view(last) ?? last)?.nextSibling ?? null
+      borrowed ? end : (STAGED_DOM?.view(last) ?? last)?.nextSibling ?? null
     );
     const retiredBlock = state.block ?? state.portal?.block;
     if (retiredBlock != null) retireRootBlock(retiredBlock);
@@ -6985,7 +7021,7 @@ function disposeReturnSlot(block, state) {
     block.slots[0] = void 0;
     return;
   }
-  if (state.__kind === "childSlot") {
+  if (kind === "childSlot") {
     if (state.portal) {
       teardownPortalState(state.portal);
       state.portal = null;
@@ -6999,13 +7035,17 @@ function disposeReturnSlot(block, state) {
     clearChildContent(state);
     if (!state.borrowed) {
       domNode(state.start)?.remove();
-      domNode(state.end)?.remove();
+      domNode(end)?.remove();
     }
   } else {
-    if (state.block) unmountBlock(state.block, true);
-    if (!state.inherited) {
+    if (kind === "componentSlotSlot") {
+      if (state.block) unmountBlock(state.block, true);
+    } else {
+      unmountSlot(state, true);
+    }
+    if (!state.inherited && !state.borrowed) {
       domNode(state.start)?.remove?.();
-      domNode(state.end)?.remove?.();
+      domNode(end)?.remove?.();
     }
   }
   const reg = block._slots;
@@ -8505,6 +8545,10 @@ function renderSharedBody(body, props, scope, extra) {
   }
 }
 function invalidateSharedBodyOutput(scope) {
+  const state = scope.slots[0];
+  if (scope === scope.block && scope.block.outputHandler !== null && (state?.__kind === "childSlot" || state?.__kind === "componentSlotSlot" || state?.__kind === "ifBlockSlot" || state?.__kind === "switchBlockSlot" || state?.__kind === "activityBlockSlot")) {
+    setReturnedOutputOwner(state, true);
+  }
   const first = scope.compilerMemo;
   if (first === null) return;
   invalidateSharedBodyMemoRegion(first);
@@ -9579,6 +9623,7 @@ function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
     end,
     parentBlock,
     props,
+    contextChanged: false,
     boundaryId: (STAGED_DOM?.view(wrapper) ?? wrapper).getAttribute(import_constants.HYDRATE_ID_ATTR) ?? boundaryId,
     intentBoundary,
     delegatedDynamicIntent: (0, import_event_capture.takeDelegatedDynamicHydrationIntent)(wrapper),
@@ -9898,6 +9943,7 @@ function initializeHydrateComponent(boundaryBody) {
         if (state.independent !== (props.__independent !== void 0)) {
           throw new Error((0, import_error_codes_client_generated.formatClientError)(66));
         }
+        const surroundingUpdate = state.props !== props || state.contextChanged;
         state.props = props;
         if (!state.independent && !state.hydrated) {
           const strategy = resolveHydrateStrategy(state);
@@ -9905,7 +9951,8 @@ function initializeHydrateComponent(boundaryBody) {
             cleanupHydrateStrategy(state);
             invalidateHydrateActivation(state);
           } else if (!state.activationRequested) {
-            requestHydrateBoundary(state);
+            const shouldDefer = surroundingUpdate ? false : strategy._d ? strategy._d() : strategy._t !== "load";
+            if (!shouldDefer) requestHydrateBoundary(state);
           }
         }
       }
@@ -18429,6 +18476,18 @@ function componentSlotVoid(parentScope, slotKey, domParent, comp, props, anchor,
 }
 function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body, identity, props, renderProps, anchor, key, singleRoot, inherit, hasKey, invocationSite) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "componentSlotSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
   if (hydration !== null && (anchor != null && hydration.isFresh(anchor) || hydration.isFresh(domParent))) {
@@ -20670,6 +20729,18 @@ function bindingChildSlot(parentScope, slotKey, domParent, value, marker, anchor
 }
 function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsHost, compactable, includeKeyedSingle = true, compiledMapBody, compiledMapKey, compiledMapFlags, compiledMapDeps, mappedFallback, bindingMarker) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "childSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   if (IMPLICIT_SIGNAL_CHILD_DEPTH === 0) {
     const existing = parentScope.slots[slotKey];
     const previous = existing?.implicitSignal;
@@ -21298,6 +21369,9 @@ function textSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, compac
     childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, void 0, compactable);
     return;
   }
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state.returnedOutput === true) {
+    setReturnedOutputOwner(state, false);
+  }
   const str = vt === "string" ? value : vt === "boolean" || value == null ? "" : String(value);
   if (state.text !== null) {
     updateTextValue(state.text, str);
@@ -24806,6 +24880,17 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
 }
 function ifBlock(parentScope, slotKey, domParent, cond, thenBody, elseBody, anchor, env) {
   let state = parentScope.slots[slotKey];
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
+    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+    if (state.__kind === "ifBlockSlot") {
+      setReturnedOutputOwner(state, false);
+    } else {
+      const block = parentScope.block;
+      block.outputHandler(block, null, true);
+      if (block.disposed) return;
+      state = void 0;
+    }
+  }
   if (state === void 0) {
     const hydration = activeHydration();
     let start = null;
@@ -25153,6 +25238,18 @@ function queueActivityDeactivation(state, block, commitVersion) {
 }
 function activityBlock(parentScope, slotKey, domParent, mode, body, anchor, env) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "activityBlockSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   if (mode === "hidden") ensureScheduledVisibilityDriver();
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
@@ -25409,6 +25506,17 @@ function deactivateScope(scope, disconnectPassive = true) {
 }
 function switchBlock(parentScope, slotKey, domParent, discriminant, cases, defaultBody, anchor, env) {
   let state = parentScope.slots[slotKey];
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
+    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+    if (state.__kind === "switchBlockSlot") {
+      setReturnedOutputOwner(state, false);
+    } else {
+      const block = parentScope.block;
+      block.outputHandler(block, null, true);
+      if (block.disposed) return;
+      state = void 0;
+    }
+  }
   if (state === void 0) {
     const hydration = activeHydration();
     let start = null;
@@ -25798,7 +25906,8 @@ function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, nativ
     callback = native;
     native = mapSlot(items, method);
   }
-  const state = scopeOrItems.slots[slotOrMethod]?.forSlot;
+  const slot = scopeOrItems.slots[slotOrMethod];
+  const state = slot?.forSlot;
   const parent = native === true ? fastHostListParent(state, items, flags) : null;
   if (parent === null) {
     return mapSlot(
@@ -25817,6 +25926,9 @@ function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, nativ
       ownEnd
     );
   }
+  if (slotOrMethod === 0 && scopeOrItems !== RETURNED_OUTPUT_SCOPE && slot.returnedOutput === true) {
+    setReturnedOutputOwner(slot, false);
+  }
   mountFastHostItems(
     scopeOrItems,
     state,
@@ -26734,6 +26846,10 @@ function moveFocusedNodeBefore(parent, node, anchor, snapshots) {
     moveBefore.call(parent, node, anchor);
     return;
   }
+  if (STAGED_DOM.view(node).parentNode !== parent || anchor !== null && STAGED_DOM.view(anchor).parentNode !== parent) {
+    STAGED_DOM.view(parent).insertBefore(node, anchor);
+    return;
+  }
   if (node === anchor || getNextSibling(node) === anchor) return;
   if (anchor === null || ((STAGED_DOM?.view(node) ?? node).compareDocumentPosition(anchor) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0) {
     let cursor = getNextSibling(node);

package/dist/cjs/version.cjs

@@ -21,7 +21,7 @@ __export(version_exports, {
   version: () => version
 });
 module.exports = __toCommonJS(version_exports);
-const version = "0.3.3";
+const version = "0.3.5";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   version

package/dist/dom-focused-move.d.ts

@@ -1,5 +1,5 @@
 /**
- * Move native presentation without detaching the node that owns active editing.
+ * Move native presentation without detaching active editing when possible.
  * Both the general renderer and renderer-free keyed views use this leaf; callers
  * retain their own focus/selection capture and commit lifetime.
  */

package/dist/dom-focused-move.js

@@ -19,6 +19,10 @@ function moveNativeNodeBefore(parent, node, anchor, focused, contentEditable) {
     moveBefore.call(parent, node, anchor);
     return;
   }
+  if (node.parentNode !== parent || anchor !== null && anchor.parentNode !== parent) {
+    parent.insertBefore(node, anchor);
+    return;
+  }
   if (node === anchor || node.nextSibling === anchor) return;
   if (anchor === null || (node.compareDocumentPosition(anchor) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0) {
     let cursor = node.nextSibling;

package/dist/hydration/stream-result-receiver.d.ts

@@ -29,6 +29,7 @@ interface ResultState {
     values: number;
     terminal: boolean;
     frames: StreamedSignalResultFrame[];
+    frameSizes: number[];
     bytes: number;
     consumer?: StreamedResultConsumer;
     timer?: ReturnType<typeof setTimeout>;

package/dist/hydration/stream-result-receiver.js

@@ -14,6 +14,7 @@ class StreamedReceiverError extends Error {
 function retainCompletedResult(result) {
   if (result.frames.at(-1)?.kind === "complete" && result.consumer?.retainCompleted?.(result.frames) === true) {
     result.frames = [];
+    result.frameSizes.length = 0;
     result.bytes = 0;
   }
 }
@@ -54,6 +55,7 @@ function createStreamedResultReceiverState(options, commitPlacement) {
         } catch {
         }
         state.result.frames.length = 0;
+        state.result.frameSizes.length = 0;
         state.result.bytes = 0;
       }
       if (state.result.timer !== void 0) clearTimeout(state.result.timer);
@@ -96,7 +98,15 @@ function createStreamedResultReceiverState(options, commitPlacement) {
     }
     const state = {
       identity,
-      result: { sequence: 0, opened: false, values: 0, terminal: false, frames: [], bytes: 0 },
+      result: {
+        sequence: 0,
+        opened: false,
+        values: 0,
+        terminal: false,
+        frames: [],
+        frameSizes: [],
+        bytes: 0
+      },
       placementSequence: 0,
       contentRevision
     };
@@ -128,10 +138,11 @@ function createStreamedResultReceiverState(options, commitPlacement) {
       if (accepted === state.result.frames.length) state.result.bytes = 0;
       else {
         for (let index = 0; index < accepted; index++) {
-          state.result.bytes -= frameBytes(state.result.frames[index]);
+          state.result.bytes -= state.result.frameSizes[index];
         }
       }
       state.result.frames.splice(0, accepted);
+      state.result.frameSizes.splice(0, accepted);
     }
     retainCompletedResult(state.result);
     return () => {
@@ -174,6 +185,7 @@ function createStreamedResultReceiverState(options, commitPlacement) {
         throw new StreamedReceiverError("overflow", "Streamed result mailbox exceeded its bound.");
       }
       result.frames.push(frame);
+      result.frameSizes.push(bytes);
       result.bytes += bytes;
     }
     if (frame.kind === "complete" || frame.kind === "error") {

package/dist/runtime.d.ts

@@ -210,7 +210,7 @@ export declare function finishNativeReadWitness(token: number, completed: boolea
 export declare function replayNativeReadWitness(witness: NativeReadWitness | null | undefined): void;
 export declare function hookSlots(count: number): number;
 type BlockKind = 'root' | 'control-flow' | 'dynamic' | 'portal';
-type OutputHandler = (block: Block, value: unknown) => void;
+type OutputHandler = (block: Block, value: unknown, reset?: true) => void;
 interface RootIdState {
     prefix: string;
     next: number;

package/dist/runtime.js

@@ -6592,7 +6592,13 @@ function renderBlockInner(block) {
     block.__thenableDone = false;
   }
   if (block.$$ctxReads !== null) block.$$ctxReads.clear();
-  if (block.$$ctxDirect !== null) block.$$ctxDirect.clear();
+  if (block.$$ctxDirect !== null) {
+    const state = block.slots[0];
+    if (state?.__kind === "hydrateBlockSlot" && state.parentBlock === block && !state.independent && !state.hydrated) {
+      state.contextChanged = block.$$ctxDepsEpoch !== contextEpochNow() && ctxDirectChanged(block);
+    }
+    block.$$ctxDirect.clear();
+  }
   block.$$ctxDepsEpoch = contextEpochNow();
   block.currentRenderMode = urgentTransitionRender !== null ? "urgent" : block.pendingMode ?? prevBlock?.currentRenderMode ?? "urgent";
   block.currentRenderDeferred = urgentTransitionRender !== null ? false : block.pendingMode !== null ? block.pendingDeferred : prevBlock?.currentRenderDeferred ?? false;
@@ -6617,7 +6623,9 @@ function renderBlockInner(block) {
       renderRetry = true;
       return true;
     }
-    if (out !== void 0 && block.outputHandler !== null) block.outputHandler(block, out);
+    if (block.outputHandler !== null && (out !== void 0 || block.slots[0]?.returnedOutput === true)) {
+      block.outputHandler(block, out ?? null);
+    }
     finishEffectRender(block);
     if (!block.mounted) block.mounted = true;
     if (block.renderStatus === RENDER_RETRYING) block.renderStatus = RENDER_VALID;
@@ -6676,6 +6684,14 @@ function renderBlockInner(block) {
     }
   }
 }
+let RETURNED_OUTPUT_SCOPE = null;
+function setReturnedOutputOwner(state, returned) {
+  if (state.returnedOutput === returned) return;
+  if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+    TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "returnedOutput", state.returnedOutput);
+  }
+  state.returnedOutput = returned;
+}
 function returnSlotTail(block, state) {
   const candidates = [
     state?.end,
@@ -6692,59 +6708,82 @@ function returnSlotTail(block, state) {
   }
   return null;
 }
-function renderReturnedValue(block, out) {
-  const isComponentDescriptor = out !== null && out.$$kind === ELEMENT_TAG && out.key == null && typeof out.type === "function";
-  const existingRet = block.slots[0];
-  let replacedStart = null;
-  let replacedEnd = null;
-  const useSingleRoot = isComponentDescriptor && (out.type.$$singleRoot === true || activeHydration()?.passthroughRanges === true || // STICKY regime: a return slot mounted through the componentSlot route
-  // (most importantly by the passthrough-hydration branch above, whose
-  // condition is false again once hydration ends) keeps that route while
-  // the returned component identity is unchanged. Falling through to the
-  // childSlot route would dispose the slot for a mere kind flip — tearing
-  // down the very subtree hydration just adopted on its FIRST update. An
-  // identity change still disposes below (matching remount semantics).
-  existingRet !== void 0 && existingRet.__kind === "componentSlotSlot" && existingRet.currentComp === out.type);
-  if (existingRet !== void 0 && existingRet.__kind !== (useSingleRoot ? "componentSlotSlot" : "childSlot")) {
-    const swapDriver = TRANSITION_SWAP_DRIVER;
-    const transitionMode = block.currentRenderMode === "transition";
-    const committedSuspense = swapDriver !== null && activeHydration() === null && preservesCommittedSuspense(block);
-    const transitionSwap = ROOT_RENDER_TRANSACTION === null || committedSuspense ? swapDriver : null;
-    const suspenseSwap = transitionSwap !== null && !transitionMode && activeHydration() === null && committedSuspense;
-    if (transitionSwap !== null && activeHydration() === null && (transitionMode || suspenseSwap)) {
-      const tail = returnSlotTail(block, existingRet);
-      if (tail !== null) {
-        const probe = transitionSwap.render(
-          block,
-          block.parentNode,
-          tail,
-          ROOT_RENDERABLE_BODY,
-          out,
-          renderReturnedValue
-        );
-        transitionSwap.dispose(probe.wip);
-        if (probe.failed) throw probe.error;
-        if (probe.suspended) throw new SuspenseException(probe.suspended);
-      }
+function renderReturnedValue(block, out, reset) {
+  const previous = RETURNED_OUTPUT_SCOPE;
+  RETURNED_OUTPUT_SCOPE = block;
+  try {
+    if (reset === true) {
+      const state2 = block.slots[0];
+      if (state2 !== void 0) disposeReturnSlot(block, state2);
+      return;
     }
-    if (ROOT_RENDER_TRANSACTION !== null && !existingRet.inherited && !existingRet.borrowed && existingRet.ownerHost == null) {
-      const first = existingRet.start ?? existingRet.hostNode ?? existingRet.text ?? existingRet.block?.startMarker ?? existingRet.end ?? null;
-      const last = existingRet.end ?? existingRet.block?.endMarker ?? first;
-      if (sharesBlockBoundary(block, first, last)) {
-        replacedStart = first;
-        replacedEnd = last;
+    const isComponentDescriptor = out !== null && out.$$kind === ELEMENT_TAG && out.key == null && typeof out.type === "function";
+    const existingRet = block.slots[0];
+    let replacedStart = null;
+    let replacedEnd = null;
+    const useSingleRoot = isComponentDescriptor && (out.type.$$singleRoot === true || activeHydration()?.passthroughRanges === true || // STICKY regime: a return slot mounted through the componentSlot route
+    // (most importantly by the passthrough-hydration branch above, whose
+    // condition is false again once hydration ends) keeps that route while
+    // the returned component identity is unchanged. Falling through to the
+    // childSlot route would dispose the slot for a mere kind flip — tearing
+    // down the very subtree hydration just adopted on its FIRST update. An
+    // identity change still disposes below (matching remount semantics).
+    existingRet !== void 0 && existingRet.__kind === "componentSlotSlot" && existingRet.currentComp === out.type);
+    if (existingRet !== void 0 && existingRet.__kind !== (useSingleRoot ? "componentSlotSlot" : "childSlot")) {
+      const swapDriver = TRANSITION_SWAP_DRIVER;
+      const transitionMode = block.currentRenderMode === "transition";
+      const committedSuspense = swapDriver !== null && activeHydration() === null && preservesCommittedSuspense(block);
+      const transitionSwap = ROOT_RENDER_TRANSACTION === null || committedSuspense ? swapDriver : null;
+      const suspenseSwap = transitionSwap !== null && !transitionMode && activeHydration() === null && committedSuspense;
+      if (transitionSwap !== null && activeHydration() === null && (transitionMode || suspenseSwap)) {
+        const tail = returnSlotTail(block, existingRet);
+        if (tail !== null) {
+          const probe = transitionSwap.render(
+            block,
+            block.parentNode,
+            tail,
+            ROOT_RENDERABLE_BODY,
+            out,
+            renderReturnedValue
+          );
+          transitionSwap.dispose(probe.wip);
+          if (probe.failed) throw probe.error;
+          if (probe.suspended) throw new SuspenseException(probe.suspended);
+        }
+      }
+      if (ROOT_RENDER_TRANSACTION !== null && !existingRet.inherited && !existingRet.borrowed && existingRet.ownerHost == null) {
+        const first = existingRet.start ?? existingRet.hostNode ?? existingRet.text ?? existingRet.block?.startMarker ?? existingRet.end ?? null;
+        const last = existingRet.end ?? existingRet.block?.endMarker ?? first;
+        if (sharesBlockBoundary(block, first, last)) {
+          replacedStart = first;
+          replacedEnd = last;
+        }
       }
+      disposeReturnSlot(block, existingRet);
+      if (block.disposed) return;
     }
-    disposeReturnSlot(block, existingRet);
-    if (block.disposed) return;
-  }
-  if (useSingleRoot) {
-    const d = out;
-    if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !__profileHasComponentMetadata(d.type)) {
-      withProfileComponentOverride(
-        d.type,
-        null,
-        () => componentSlot(
+    if (useSingleRoot) {
+      const d = out;
+      if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && !__profileHasComponentMetadata(d.type)) {
+        withProfileComponentOverride(
+          d.type,
+          null,
+          () => componentSlot(
+            block,
+            0,
+            block.parentNode,
+            d.type,
+            d.props,
+            block.endMarker,
+            d.key ?? void 0,
+            true,
+            void 0,
+            activeHydration() !== null && elementKeyWasProvided(d),
+            d.__octaneInvocationSite
+          )
+        );
+      } else {
+        componentSlot(
           block,
           0,
           block.parentNode,
@@ -6756,66 +6795,63 @@ function renderReturnedValue(block, out) {
           void 0,
           activeHydration() !== null && elementKeyWasProvided(d),
           d.__octaneInvocationSite
-        )
-      );
+        );
+      }
     } else {
-      componentSlot(
-        block,
-        0,
-        block.parentNode,
-        d.type,
-        d.props,
-        block.endMarker,
-        d.key ?? void 0,
-        true,
-        void 0,
-        activeHydration() !== null && elementKeyWasProvided(d),
-        d.__octaneInvocationSite
-      );
+      const returnHydration = activeHydration();
+      if (returnHydration !== null && block.slots[0] === void 0 && block.startMarker !== null && block.endMarker !== null && block.startMarker !== block.endMarker && block.startMarker.nodeType === 8 && block.endMarker.nodeType === 8 && (getNextSibling(block.startMarker) === block.endMarker || returnHydration.isUnframedRootRange(block.startMarker, block.endMarker))) {
+        const borrowed = {
+          __kind: "childSlot",
+          start: block.startMarker,
+          end: block.endMarker,
+          ownerHost: null,
+          borrowed: true,
+          compactable: false,
+          block: null,
+          text: null,
+          currentComp: null,
+          currentIsBodyFn: false,
+          forSlot: null,
+          hostNode: null,
+          portal: null
+        };
+        block.slots[0] = borrowed;
+        registerSlot(block, borrowed);
+      }
+      childSlot(block, 0, block.parentNode, out, block.endMarker);
     }
-  } else {
-    const returnHydration = activeHydration();
-    if (returnHydration !== null && block.slots[0] === void 0 && block.startMarker !== null && block.endMarker !== null && block.startMarker !== block.endMarker && block.startMarker.nodeType === 8 && block.endMarker.nodeType === 8 && (getNextSibling(block.startMarker) === block.endMarker || returnHydration.isUnframedRootRange(block.startMarker, block.endMarker))) {
-      const borrowed = {
-        __kind: "childSlot",
-        start: block.startMarker,
-        end: block.endMarker,
-        ownerHost: null,
-        borrowed: true,
-        compactable: false,
-        block: null,
-        text: null,
-        currentComp: null,
-        currentIsBodyFn: false,
-        forSlot: null,
-        hostNode: null,
-        portal: null
-      };
-      block.slots[0] = borrowed;
-      registerSlot(block, borrowed);
+    if (replacedStart !== null) {
+      const incoming = block.slots[0];
+      const first = incoming.start ?? incoming.hostNode ?? incoming.text ?? incoming.block?.startMarker ?? incoming.end ?? null;
+      const last = incoming.end ?? incoming.block?.endMarker ?? first;
+      replaceSharedBlockBoundary(block, replacedStart, replacedEnd, first, last);
     }
-    childSlot(block, 0, block.parentNode, out, block.endMarker);
-  }
-  if (replacedStart !== null) {
-    const incoming = block.slots[0];
-    const first = incoming.start ?? incoming.hostNode ?? incoming.text ?? incoming.block?.startMarker ?? incoming.end ?? null;
-    const last = incoming.end ?? incoming.block?.endMarker ?? first;
-    replaceSharedBlockBoundary(block, replacedStart, replacedEnd, first, last);
+    const state = block.slots[0];
+    if (!block.disposed && state !== void 0 && state.returnedOutput !== true) {
+      if (TRANSITION_JOURNAL !== null && !ROOT_RENDER_ROLLBACK) {
+        TRANSITION_JOURNAL.push(JOURNAL_PROP, state, "returnedOutput", state.returnedOutput);
+      }
+      state.returnedOutput = true;
+    }
+  } finally {
+    RETURNED_OUTPUT_SCOPE = previous;
   }
 }
 function disposeReturnSlot(block, state) {
+  const kind = state.__kind;
+  const end = (kind === "ifBlockSlot" || kind === "switchBlockSlot") && state.start === null && state.block?.endMarker != null ? state.block.endMarker : state.end;
   const transaction = ROOT_RENDER_TRANSACTION;
   if (transaction !== null && !transaction.aborted && !ROOT_RENDER_ROLLBACK) {
     const parent = state.ownerHost ?? block.parentNode;
     const borrowed = state.inherited === true || state.borrowed === true;
-    let first = state.ownerHost != null || borrowed && state.start === null ? getFirstChild(parent) : borrowed ? getNextSibling(state.start) : state.start ?? state.hostNode ?? state.text ?? state.block?.startMarker ?? state.end ?? null;
-    if (borrowed && first === state.end) first = null;
-    const last = first === null ? null : state.ownerHost != null || borrowed && state.end === null ? (STAGED_DOM?.view(parent) ?? parent).lastChild : borrowed ? domNode(state.end).previousSibling : state.end ?? state.block?.endMarker ?? first;
+    let first = state.ownerHost != null || borrowed && state.start === null ? getFirstChild(parent) : borrowed ? getNextSibling(state.start) : state.start ?? state.hostNode ?? state.text ?? state.block?.startMarker ?? end ?? null;
+    if (borrowed && first === end) first = null;
+    const last = first === null ? null : state.ownerHost != null || borrowed && end === null ? (STAGED_DOM?.view(parent) ?? parent).lastChild : borrowed ? domNode(end).previousSibling : end ?? state.block?.endMarker ?? first;
     journalRootSlot(
       state,
       parent,
       borrowed ? state.start : first !== null ? (STAGED_DOM?.view(first) ?? first).previousSibling : (STAGED_DOM?.view(parent) ?? parent).lastChild,
-      borrowed ? state.end : (STAGED_DOM?.view(last) ?? last)?.nextSibling ?? null
+      borrowed ? end : (STAGED_DOM?.view(last) ?? last)?.nextSibling ?? null
     );
     const retiredBlock = state.block ?? state.portal?.block;
     if (retiredBlock != null) retireRootBlock(retiredBlock);
@@ -6838,7 +6874,7 @@ function disposeReturnSlot(block, state) {
     block.slots[0] = void 0;
     return;
   }
-  if (state.__kind === "childSlot") {
+  if (kind === "childSlot") {
     if (state.portal) {
       teardownPortalState(state.portal);
       state.portal = null;
@@ -6852,13 +6888,17 @@ function disposeReturnSlot(block, state) {
     clearChildContent(state);
     if (!state.borrowed) {
       domNode(state.start)?.remove();
-      domNode(state.end)?.remove();
+      domNode(end)?.remove();
     }
   } else {
-    if (state.block) unmountBlock(state.block, true);
-    if (!state.inherited) {
+    if (kind === "componentSlotSlot") {
+      if (state.block) unmountBlock(state.block, true);
+    } else {
+      unmountSlot(state, true);
+    }
+    if (!state.inherited && !state.borrowed) {
       domNode(state.start)?.remove?.();
-      domNode(state.end)?.remove?.();
+      domNode(end)?.remove?.();
     }
   }
   const reg = block._slots;
@@ -8358,6 +8398,10 @@ function renderSharedBody(body, props, scope, extra) {
   }
 }
 function invalidateSharedBodyOutput(scope) {
+  const state = scope.slots[0];
+  if (scope === scope.block && scope.block.outputHandler !== null && (state?.__kind === "childSlot" || state?.__kind === "componentSlotSlot" || state?.__kind === "ifBlockSlot" || state?.__kind === "switchBlockSlot" || state?.__kind === "activityBlockSlot")) {
+    setReturnedOutputOwner(state, true);
+  }
   const first = scope.compilerMemo;
   if (first === null) return;
   invalidateSharedBodyMemoRegion(first);
@@ -9432,6 +9476,7 @@ function createHydrateSlot(props, scope, boundaryId, boundaryBody) {
     end,
     parentBlock,
     props,
+    contextChanged: false,
     boundaryId: (STAGED_DOM?.view(wrapper) ?? wrapper).getAttribute(HYDRATE_ID_ATTR) ?? boundaryId,
     intentBoundary,
     delegatedDynamicIntent: takeDelegatedDynamicHydrationIntent(wrapper),
@@ -9751,6 +9796,7 @@ function initializeHydrateComponent(boundaryBody) {
         if (state.independent !== (props.__independent !== void 0)) {
           throw new Error(formatClientError(66));
         }
+        const surroundingUpdate = state.props !== props || state.contextChanged;
         state.props = props;
         if (!state.independent && !state.hydrated) {
           const strategy = resolveHydrateStrategy(state);
@@ -9758,7 +9804,8 @@ function initializeHydrateComponent(boundaryBody) {
             cleanupHydrateStrategy(state);
             invalidateHydrateActivation(state);
           } else if (!state.activationRequested) {
-            requestHydrateBoundary(state);
+            const shouldDefer = surroundingUpdate ? false : strategy._d ? strategy._d() : strategy._t !== "load";
+            if (!shouldDefer) requestHydrateBoundary(state);
           }
         }
       }
@@ -18291,6 +18338,18 @@ function componentSlotVoid(parentScope, slotKey, domParent, comp, props, anchor,
 }
 function componentSlotImpl(outputHandler, parentScope, slotKey, domParent, body, identity, props, renderProps, anchor, key, singleRoot, inherit, hasKey, invocationSite) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "componentSlotSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
   if (hydration !== null && (anchor != null && hydration.isFresh(anchor) || hydration.isFresh(domParent))) {
@@ -20532,6 +20591,18 @@ function bindingChildSlot(parentScope, slotKey, domParent, value, marker, anchor
 }
 function childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, ownsHost, compactable, includeKeyedSingle = true, compiledMapBody, compiledMapKey, compiledMapFlags, compiledMapDeps, mappedFallback, bindingMarker) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "childSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   if (IMPLICIT_SIGNAL_CHILD_DEPTH === 0) {
     const existing = parentScope.slots[slotKey];
     const previous = existing?.implicitSignal;
@@ -21160,6 +21231,9 @@ function textSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, compac
     childSlot(parentScope, slotKey, domParent, value, anchor, ownEnd, void 0, compactable);
     return;
   }
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state.returnedOutput === true) {
+    setReturnedOutputOwner(state, false);
+  }
   const str = vt === "string" ? value : vt === "boolean" || value == null ? "" : String(value);
   if (state.text !== null) {
     updateTextValue(state.text, str);
@@ -24668,6 +24742,17 @@ function renderBranchSlot(parentScope, slotKey, state, domParent, next, body, ma
 }
 function ifBlock(parentScope, slotKey, domParent, cond, thenBody, elseBody, anchor, env) {
   let state = parentScope.slots[slotKey];
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
+    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+    if (state.__kind === "ifBlockSlot") {
+      setReturnedOutputOwner(state, false);
+    } else {
+      const block = parentScope.block;
+      block.outputHandler(block, null, true);
+      if (block.disposed) return;
+      state = void 0;
+    }
+  }
   if (state === void 0) {
     const hydration = activeHydration();
     let start = null;
@@ -25015,6 +25100,18 @@ function queueActivityDeactivation(state, block, commitVersion) {
 }
 function activityBlock(parentScope, slotKey, domParent, mode, body, anchor, env) {
   if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE) {
+    const state2 = parentScope.slots[0];
+    if (state2?.returnedOutput === true) {
+      if (state2.__kind === "activityBlockSlot") {
+        setReturnedOutputOwner(state2, false);
+      } else {
+        const block = parentScope.block;
+        block.outputHandler(block, null, true);
+        if (block.disposed) return;
+      }
+    }
+  }
   if (mode === "hidden") ensureScheduledVisibilityDriver();
   const parentBlock = parentScope.block;
   const hydration = activeHydration();
@@ -25271,6 +25368,17 @@ function deactivateScope(scope, disconnectPassive = true) {
 }
 function switchBlock(parentScope, slotKey, domParent, discriminant, cases, defaultBody, anchor, env) {
   let state = parentScope.slots[slotKey];
+  if (slotKey === 0 && parentScope !== RETURNED_OUTPUT_SCOPE && state?.returnedOutput === true) {
+    if (CURRENT_BLOCK?.pending && !CURRENT_BLOCK.crossRenderUpdate) return;
+    if (state.__kind === "switchBlockSlot") {
+      setReturnedOutputOwner(state, false);
+    } else {
+      const block = parentScope.block;
+      block.outputHandler(block, null, true);
+      if (block.disposed) return;
+      state = void 0;
+    }
+  }
   if (state === void 0) {
     const hydration = activeHydration();
     let start = null;
@@ -25660,7 +25768,8 @@ function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, nativ
     callback = native;
     native = mapSlot(items, method);
   }
-  const state = scopeOrItems.slots[slotOrMethod]?.forSlot;
+  const slot = scopeOrItems.slots[slotOrMethod];
+  const state = slot?.forSlot;
   const parent = native === true ? fastHostListParent(state, items, flags) : null;
   if (parent === null) {
     return mapSlot(
@@ -25679,6 +25788,9 @@ function fastMapSlot(scopeOrItems, slotOrMethod, domParent, items, method, nativ
       ownEnd
     );
   }
+  if (slotOrMethod === 0 && scopeOrItems !== RETURNED_OUTPUT_SCOPE && slot.returnedOutput === true) {
+    setReturnedOutputOwner(slot, false);
+  }
   mountFastHostItems(
     scopeOrItems,
     state,
@@ -26596,6 +26708,10 @@ function moveFocusedNodeBefore(parent, node, anchor, snapshots) {
     moveBefore.call(parent, node, anchor);
     return;
   }
+  if (STAGED_DOM.view(node).parentNode !== parent || anchor !== null && STAGED_DOM.view(anchor).parentNode !== parent) {
+    STAGED_DOM.view(parent).insertBefore(node, anchor);
+    return;
+  }
   if (node === anchor || getNextSibling(node) === anchor) return;
   if (anchor === null || ((STAGED_DOM?.view(node) ?? node).compareDocumentPosition(anchor) & Node.DOCUMENT_POSITION_FOLLOWING) !== 0) {
     let cursor = getNextSibling(node);

package/dist/version.js

@@ -1,4 +1,4 @@
-const version = "0.3.3";
+const version = "0.3.5";
 export {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "octane",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "license": "MIT",
   "type": "module",
   "sideEffects": [