octane 0.1.41 → 0.1.42

package/README.md

@@ -36,6 +36,9 @@ For the full story, see the
 
 ## Browser compatibility
 
+See the [browser support guide](https://octanejs.dev/docs/browser-support) for
+recommended targets, required browser APIs, and optional fallbacks.
+
 Configure your application's build target for the browser engines you support.
 The Rsbuild integration's `modules` target includes Chromium 87 and Samsung
 Internet 14; Samsung Internet can also be selected directly with targets such as

package/dist/cjs/runtime.cjs

@@ -475,18 +475,19 @@ function stagedTransitionValue(slot) {
 function stageTransitionValue(slot, block, operation, value, forceRender = false) {
   const batch = transitionActionBatchForUpdate();
   if (batch === null) return false;
+  const replay = typeof operation === "function" ? operation : () => operation;
   const current = batch.updates.get(slot);
   if (current === void 0) {
     batch.updates.set(slot, {
       slot,
       block,
-      operations: [operation],
+      operations: [replay],
       baseValue: slot.value,
       value,
       forceRender
     });
   } else {
-    current.operations.push(operation);
+    current.operations.push(replay);
     current.value = value;
     current.forceRender ||= forceRender;
   }
@@ -1457,12 +1458,21 @@ function flush() {
     }
     return;
   }
+  if (!hasPendingWork() && refDetachQueue.length === 0 && refAttachQueue.length === 0 && activeFragments.size === 0 && FLUSHED_TRANSITION_UPDATES.length === 0 && VIEW_TRANSITION_DRIVER === null) {
+    if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
+      (0, import_devtools_hook.__devtoolsNotifyFlush)();
+    return;
+  }
   if (VIEW_TRANSITION_DRIVER?.routeFlush() === true) return;
   flushWork();
 }
 function activeElementForDocument(doc) {
   try {
     let focused = doc.activeElement;
+    if (focused === doc.body) {
+      focused = focused?.shadowRoot?.activeElement ?? null;
+      if (focused === null) return null;
+    }
     while (focused !== null) {
       if (focused.localName === "iframe") {
         let nested;
@@ -3118,10 +3128,9 @@ function useState(initial, slot) {
       value: initVal,
       setter: (next) => {
         const previous = stagedTransitionValue(s);
-        const operation = typeof next === "function" ? next : () => next;
-        const computed = operation(previous);
+        const computed = typeof next === "function" ? next(previous) : next;
         if (Object.is(computed, previous)) return;
-        if (stageTransitionValue(s, block, operation, computed)) {
+        if (stageTransitionValue(s, block, next, computed)) {
           if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
             const update = s.pendingActionBatch?.updates.get(s);
             if (update !== void 0) {
@@ -4638,6 +4647,10 @@ function activateHydrateBoundary(state) {
     renderBlock(block);
     drainHydrationRenderPhaseUpdates(block);
     if (state.hydrated) {
+      const adoptedSlot = block.slots[0];
+      if (adoptedSlot?.__kind === "trySlotSlot") {
+        hydration.claimRootRemainder(adoptedSlot.end.nextSibling);
+      }
       hydration.flushClassWrites();
       hydration.flushTextWarnings();
       hydration.finishRoot();
@@ -14982,7 +14995,7 @@ function forBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flag
     hydration.node = state.end.nextSibling;
   }
 }
-function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd) {
+function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody) {
   const state = parentScope.slots[slotKey];
   if (TRANSITION_JOURNAL !== null) {
     if (state !== void 0) {
@@ -14990,7 +15003,15 @@ function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
       state.selectionItems = void 0;
     }
     flags &= ~4;
-  } else if (state !== void 0 && activeHydration() === null && state.cachedDeps !== null && tryUpdateKeyedSelection(state, items, itemBody, state.cachedDeps, deps, flags >>> 6)) {
+  } else if (state !== void 0 && activeHydration() === null && state.cachedDeps !== null && tryUpdateKeyedSelection(
+    state,
+    items,
+    itemBody,
+    state.cachedDeps,
+    deps,
+    flags >>> 6,
+    selectionBody
+  )) {
     return;
   }
   forBlock(
@@ -15114,7 +15135,7 @@ function fastForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
   }
   mountFastHostItems(parentScope, state, parent, items, getKey, itemBody, flags, deps, false);
 }
-function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd) {
+function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody) {
   const state = parentScope.slots[slotKey];
   const parent = fastHostListParent(state, items, flags);
   if (parent === null) {
@@ -15129,7 +15150,8 @@ function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemB
       deps,
       emptyBody,
       anchor,
-      ownEnd
+      ownEnd,
+      selectionBody
     );
     return;
   }
@@ -15201,7 +15223,7 @@ function depsEqual(a, b) {
   }
   return true;
 }
-function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, selectionIndex) {
+function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, selectionIndex, selectionBody) {
   if (state.selectionItems !== items || state.size !== items.length || state.items.size !== state.size || previousDeps.length !== deps.length || selectionIndex >= deps.length) {
     return false;
   }
@@ -15224,12 +15246,20 @@ function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, sel
   if (first !== void 0) {
     first.body = itemBody;
     first.extra = deps;
-    itemBody(first.props, first, deps);
+    if (selectionBody !== void 0 && first._slots === null) {
+      selectionBody(first.props, first, deps);
+    } else {
+      itemBody(first.props, first, deps);
+    }
   }
   if (second !== void 0) {
     second.body = itemBody;
     second.extra = deps;
-    itemBody(second.props, second, deps);
+    if (selectionBody !== void 0 && second._slots === null) {
+      selectionBody(second.props, second, deps);
+    } else {
+      itemBody(second.props, second, deps);
+    }
   }
   return true;
 }

package/dist/cjs/version.cjs

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

package/dist/compiler/compile.js

@@ -8188,6 +8188,7 @@ function compileInternal(
 		!hmrEnabled &&
 		!devEnabled &&
 		!profileEnabled &&
+		options?.__universal == null &&
 		!((source.includes('eval') || source.includes('\\u')) && hasInlineMemoDirectEval(ast));
 	// Same production-only gate as the tiers above, and for the same reason: a
 	// lifted callback has left the component, which dev tooling, HMR boundaries,
@@ -13480,7 +13481,16 @@ function compileFunctionBody(node, ctx, name, parentNs = 'html', cssHash = null,
 			cssHash,
 		);
 	} else {
-		plan = planJsx(jsxNodes, ctx, name, inlinedSubs, parentNs, cssHash, mountCallbackSinks);
+		plan = planJsx(
+			jsxNodes,
+			ctx,
+			name,
+			inlinedSubs,
+			parentNs,
+			cssHash,
+			mountCallbackSinks,
+			options?.keyedSelection ?? null,
+		);
 	}
 	ctx.currentInvariantLocals = prevInvariantLocals;
 	ctx.currentEventInvariantLocals = prevEventInvariantLocals;
@@ -17421,6 +17431,11 @@ function extractFragment(node, ctx, holeProps, parentNs = 'html') {
 				const bodyHole = `h${holeProps.length}`;
 				holeProps.push(objectProp(bodyHole, b.id(rec.bodyHelper)));
 				rec.bodyHelper = `props.${bodyHole}`;
+				if (rec.selectionHelper != null) {
+					const selectionHole = `h${holeProps.length}`;
+					holeProps.push(objectProp(selectionHole, b.id(rec.selectionHelper)));
+					rec.selectionHelper = `props.${selectionHole}`;
+				}
 			}
 			if (mapCall) {
 				const methodHole = `h${holeProps.length}`;
@@ -20439,6 +20454,7 @@ function planJsx(
 	parentNs = 'html',
 	cssHash = null,
 	mountCallbackSinks = null,
+	keyedSelection = null,
 ) {
 	// DEV ONLY: per-element source-location map for THIS body (path-key → [line, col]),
 	// populated at the top of emitElementHtml and read in the binding mount loop to emit
@@ -20712,6 +20728,15 @@ function planJsx(
 				resolvedFrag = tplNs !== 'opaque';
 			}
 		}
+		// Binding planning precedes the final template namespace. An inherited
+		// opaque namespace can now use the same concrete namespace as clone(),
+		// including HTML's faster className property. Preserve explicit foreign
+		// content and leave genuinely opaque/mixed templates destination-aware.
+		if (tplNs !== 'opaque') {
+			for (const binding of elementBindings) {
+				if (binding.ns === 'opaque') binding.ns = tplNs;
+			}
+		}
 		const flag = nsFlag(tplNs);
 		const fragArg = !single && (flag !== 0 || resolvedFrag) ? 1 : 0;
 		let template = rootTemplate;
@@ -21234,6 +21259,24 @@ function planJsx(
 		if (b.deferred) everyRenderLines.push(updateEmit);
 		else updateLines.push(updateEmit);
 	}
+	if (keyedSelection !== null && single && !noTemplate) {
+		// Reuse the ordinary root-class write and its exact bag fields. Updating
+		// only the DOM would leave the normal row diff's previous value stale.
+		const classes = elementBindings.filter(
+			(binding) => binding.kind === 'class' && binding.path.length === 0,
+		);
+		if (
+			classes.length === 1 &&
+			!classes[0].fresh &&
+			!classes[0].mountOnly &&
+			collectFreeIdentifiers(classes[0].expr, [
+				keyedSelection.itemName,
+				keyedSelection.selectedName,
+			]).size === 0
+		) {
+			keyedSelection.update = emitBindingUpdate(classes[0], bag);
+		}
+	}
 
 	// After (forBlock + ifBlock calls run on every render — they reconcile).
 	//
@@ -21342,6 +21385,7 @@ function planJsx(
 			rtAlias(forHelper),
 			fc.keyHelper,
 			fc.bodyHelper,
+			fc.selectionHelper,
 			fc.emptyHelper,
 		]);
 		registerClauseOrigin(ctx, fc.emptyKeyword, [fc.emptyHelper]);
@@ -21366,7 +21410,8 @@ function planJsx(
 			(fc.requiresScope ? 32 : 0) |
 			(fc.keyedSelectionIndex >= 0 ? fc.keyedSelectionIndex << 6 : 0);
 		// Arg layout: forBlock(__s, slot, host, items, keyFn, body, flags?, deps?,
-		// emptyBody?, anchor?, ownEnd?).
+		// emptyBody?, anchor?, ownEnd?, selectionBody?). The final argument is
+		// emitted only for a certified keyed-selection call.
 		// Optional args backfill positionally: `flags`/`deps` placeholders
 		// (`0`/`undefined`) when only `emptyHelper` (`null` when no `@empty`
 		// branch) or the anchor is present, and a `null` empty-body placeholder
@@ -21418,6 +21463,12 @@ function planJsx(
 		// list's trailing boundary. Let forBlock reuse it as its end marker instead
 		// of retaining it beside a newly-created `/for` comment.
 		if (fc.anchorVar) tailArgs.push(b.literal(true));
+		if (fc.selectionHelper != null) {
+			// tailArgs starts at argument 5; preserve the optional positions through
+			// ownEnd before supplying the selection updater as argument 12.
+			while (tailArgs.length < 7) tailArgs.push(undefinedNode());
+			tailArgs.push(helperRefNode(fc.selectionHelper));
+		}
 		if (isMappedList) {
 			const nativeName = allocCompilerName(ctx, '__mapNative');
 			if (fc.autoMemoDeps !== null) {
@@ -24999,6 +25050,7 @@ function hoistBodyHelper(
 	cssHash,
 	envNames,
 	idOrigin = null,
+	keyedSelection = null,
 ) {
 	const helperName = `${prefix}$${ctx.nextHelperId++}`;
 	const ownEnvNames = envNames === null ? null : helperCaptures(ctx, stmts, params);
@@ -25066,7 +25118,14 @@ function hoistBodyHelper(
 	);
 	let helperFn;
 	try {
-		helperFn = compileFunctionBody(fake, ctx, helperName, parentNs, cssHash);
+		helperFn = compileFunctionBody(
+			fake,
+			ctx,
+			helperName,
+			parentNs,
+			cssHash,
+			keyedSelection === null ? null : { keyedSelection },
+		);
 	} finally {
 		ctx.currentComponentLocals = prevLocals;
 		ctx.currentInvariantLocals = prevInvariantLocals;
@@ -25075,6 +25134,35 @@ function hoistBodyHelper(
 	// Module-scope placement: the compiled helper joins the module AST as a
 	// hoisted statement node (M2 AST emit).
 	ctx.hoistedHelpers.push(helperFn);
+	if (keyedSelection?.update != null) {
+		const selectionName = allocCompilerName(ctx, `__select$${ctx.nextHelperId++}`);
+		const origin = keyedSelection.update;
+		const selectionBody = [
+			inheritOriginLoc(
+				b.const(
+					keyedSelection.selectedName,
+					b.member(b.id('__extra'), b.literal(keyedSelection.selectedIndex), true),
+				),
+				origin,
+			),
+			inheritOriginLoc(
+				b.const('_b', b.member(b.member(b.id('__s'), 'slots'), b.literal(0), true)),
+				origin,
+			),
+			keyedSelection.update,
+		];
+		ctx.hoistedHelpers.push(
+			inheritOriginLoc(
+				b.function_declaration(
+					b.id(selectionName, idOrigin ?? fakeOrigin ?? undefined),
+					[...params, b.id('__s'), b.id('__extra')],
+					b.block(selectionBody),
+				),
+				fakeOrigin,
+			),
+		);
+		keyedSelection.helper = selectionName;
+	}
 	return helperName;
 }
 
@@ -25984,14 +26072,17 @@ function makeSwitchCall(node, ctx, inlinedSubs, parentNs = 'html', cssHash = nul
  * snapshot remain unchanged.
  *
  * This recognizes `selected === item.id` (or its reverse) under `key item.id`,
- * and the same proof for any other explicit, noncomputed item property.
+ * optionally through one preceding `const id = item.id`, and the same proof
+ * for any other explicit, noncomputed item property. The authored declaration
+ * stays in the full item body, preserving its read position and event captures.
  * Dynamic ternary arms, extra references to
  * `selected` anywhere in the row (including deferred event callbacks), spreads,
  * and anything other than one direct host root all fail closed.
  */
 function keyedSelectionDepIndex(itemName, keyBody, subStmts, runtimeDepNames, ctx) {
-	if (subStmts.length !== 1 || !isPlainHostRoot(subStmts[0])) return -1;
-	const root = subStmts[0];
+	if (subStmts.length !== 1 && subStmts.length !== 2) return -1;
+	const root = subStmts[subStmts.length - 1];
+	if (!isPlainHostRoot(root)) return -1;
 	const attrs = root.attributes || root.openingElement?.attributes || [];
 	if (attrs.some((attr) => attr.type !== 'Attribute' && attr.type !== 'JSXAttribute')) {
 		return -1;
@@ -26043,12 +26134,33 @@ function keyedSelectionDepIndex(itemName, keyBody, subStmts, runtimeDepNames, ct
 			member.property.name === keyProperty
 		);
 	};
+	let keyAlias = null;
+	if (subStmts.length === 2) {
+		const declaration = subStmts[0];
+		const binding = declaration.declarations?.[0];
+		if (
+			declaration.type !== 'VariableDeclaration' ||
+			declaration.kind !== 'const' ||
+			declaration.declare === true ||
+			declaration.declarations?.length !== 1 ||
+			binding?.id?.type !== 'Identifier' ||
+			binding.id.name === itemName ||
+			!isItemKey(binding.init)
+		) {
+			return -1;
+		}
+		keyAlias = binding.id.name;
+	}
+	const isComparedKey = (expression) =>
+		isItemKey(expression) ||
+		(keyAlias !== null && expression?.type === 'Identifier' && expression.name === keyAlias);
 	const left = unwrapTsExpr(test.left);
 	const right = unwrapTsExpr(test.right);
-	const selected = isItemKey(left) ? right : isItemKey(right) ? left : null;
+	const selected = isComparedKey(left) ? right : isComparedKey(right) ? left : null;
 	if (
 		selected?.type !== 'Identifier' ||
 		selected.name === itemName ||
+		selected.name === keyAlias ||
 		!ctx.currentComponentLocals?.has(selected.name)
 	) {
 		return -1;
@@ -26493,18 +26605,6 @@ function makeForCall(node, ctx, inlinedSubs, parentNs = 'html', cssHash = null)
 			node.emptyKeyword ?? null,
 		);
 	}
-	const itemHelperName = hoistBodyHelper(
-		ctx,
-		inlinedSubs,
-		'__item',
-		itemAllStmts,
-		itemParams,
-		parentNs,
-		cssHash,
-		envNames,
-		directiveKeywordOrigin(ctx, node),
-	);
-
 	// Single-root detection: when the body emits exactly one Element root and
 	// no other JSX siblings (no Fragment, no Component, no top-level if/for/try),
 	// the runtime can skip per-item Comment markers and use the row element
@@ -26576,6 +26676,31 @@ function makeForCall(node, ctx, inlinedSubs, parentNs = 'html', cssHash = null)
 		!containsRenderCall(subStmts) &&
 		!containsAutoMemoUnsafeStructure(subStmts) &&
 		isHostMountSafeTree(subStmts[0]);
+	// Class-only updates need the stricter host-lifecycle proof as well as the
+	// existing equality proof. The item planner fills this compiler-owned result
+	// only when the root class survives as one ordinary cached binding.
+	const keyedSelection =
+		hostMountSafe && keyedSelectionIndex >= 0 && envNames !== null
+			? {
+					itemName,
+					selectedName: runtimeDepNames[keyedSelectionIndex],
+					selectedIndex: keyedSelectionIndex,
+					update: null,
+					helper: null,
+				}
+			: null;
+	const itemHelperName = hoistBodyHelper(
+		ctx,
+		inlinedSubs,
+		'__item',
+		itemAllStmts,
+		itemParams,
+		parentNs,
+		cssHash,
+		envNames,
+		directiveKeywordOrigin(ctx, node),
+		keyedSelection,
+	);
 
 	const mapCall = node.nativeArrayMap || null;
 	return {
@@ -26606,6 +26731,7 @@ function makeForCall(node, ctx, inlinedSubs, parentNs = 'html', cssHash = null)
 		keyHelper,
 		inlineKey: inlineKey ? keyFn : null,
 		bodyHelper: itemHelperName,
+		selectionHelper: keyedSelection?.helper ?? null,
 		hasPerItemEventClosure,
 		pure,
 		singleRoot,

package/dist/runtime.d.ts

@@ -1480,11 +1480,11 @@ export declare function forBlock<T>(parentScope: Scope, slotKey: number, domPare
  * forBlock lets applications without a proven selection tree-shake its cost.
  * This entry point identifies the proof; bits 6+ hold its dependency index.
  */
-export declare function keyedForBlock<T>(parentScope: Scope, slotKey: number, domParent: Node, items: ArrayLike<T>, getKey: (item: T, index: number) => any, itemBody: (item: T, scope: Scope) => void, flags: number, deps: any[], emptyBody?: ComponentBody | null, anchor?: Node | null, ownEnd?: boolean): void;
+export declare function keyedForBlock<T>(parentScope: Scope, slotKey: number, domParent: Node, items: ArrayLike<T>, getKey: (item: T, index: number) => any, itemBody: (item: T, scope: Scope) => void, flags: number, deps: any[], emptyBody?: ComponentBody | null, anchor?: Node | null, ownEnd?: boolean, selectionBody?: ComponentBody<T, any[]>): void;
 /** Compiler-only direct host-row entry; ordinary list bundles do not retain it. */
 export declare function fastForBlock<T>(parentScope: Scope, slotKey: number, domParent: Node, items: ArrayLike<T>, getKey: (item: T, index: number) => any, itemBody: (item: T, scope: Scope) => void, flags?: number, deps?: any[], emptyBody?: ComponentBody | null, anchor?: Node | null, ownEnd?: boolean): void;
 /** Direct host-row mounts composed with the independent keyed-selection proof. */
-export declare function fastKeyedForBlock<T>(parentScope: Scope, slotKey: number, domParent: Node, items: ArrayLike<T>, getKey: (item: T, index: number) => any, itemBody: (item: T, scope: Scope) => void, flags: number, deps: any[], emptyBody?: ComponentBody | null, anchor?: Node | null, ownEnd?: boolean): void;
+export declare function fastKeyedForBlock<T>(parentScope: Scope, slotKey: number, domParent: Node, items: ArrayLike<T>, getKey: (item: T, index: number) => any, itemBody: (item: T, scope: Scope) => void, flags: number, deps: any[], emptyBody?: ComponentBody | null, anchor?: Node | null, ownEnd?: boolean, selectionBody?: ComponentBody<T, any[]>): void;
 /** Direct host-row mounts for compiler-proven, guarded native JSX map rows. */
 export declare function fastMapSlot(scopeOrItems: any, slotOrMethod: any, domParent?: Node, items?: any, method?: any, native?: boolean | ((...args: any[]) => any), callback?: (...args: any[]) => any, getKey?: (item: any, index: number) => any, itemBody?: (item: any, scope: Scope) => void, flags?: number, deps?: any[], anchor?: Node | null, ownEnd?: boolean | 1): boolean | void;
 export interface Root {

package/dist/runtime.js

@@ -325,18 +325,19 @@ function stagedTransitionValue(slot) {
 function stageTransitionValue(slot, block, operation, value, forceRender = false) {
   const batch = transitionActionBatchForUpdate();
   if (batch === null) return false;
+  const replay = typeof operation === "function" ? operation : () => operation;
   const current = batch.updates.get(slot);
   if (current === void 0) {
     batch.updates.set(slot, {
       slot,
       block,
-      operations: [operation],
+      operations: [replay],
       baseValue: slot.value,
       value,
       forceRender
     });
   } else {
-    current.operations.push(operation);
+    current.operations.push(replay);
     current.value = value;
     current.forceRender ||= forceRender;
   }
@@ -1307,12 +1308,21 @@ function flush() {
     }
     return;
   }
+  if (!hasPendingWork() && refDetachQueue.length === 0 && refAttachQueue.length === 0 && activeFragments.size === 0 && FLUSHED_TRANSITION_UPDATES.length === 0 && VIEW_TRANSITION_DRIVER === null) {
+    if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__)
+      __devtoolsNotifyFlush();
+    return;
+  }
   if (VIEW_TRANSITION_DRIVER?.routeFlush() === true) return;
   flushWork();
 }
 function activeElementForDocument(doc) {
   try {
     let focused = doc.activeElement;
+    if (focused === doc.body) {
+      focused = focused?.shadowRoot?.activeElement ?? null;
+      if (focused === null) return null;
+    }
     while (focused !== null) {
       if (focused.localName === "iframe") {
         let nested;
@@ -2968,10 +2978,9 @@ function useState(initial, slot) {
       value: initVal,
       setter: (next) => {
         const previous = stagedTransitionValue(s);
-        const operation = typeof next === "function" ? next : () => next;
-        const computed = operation(previous);
+        const computed = typeof next === "function" ? next(previous) : next;
         if (Object.is(computed, previous)) return;
-        if (stageTransitionValue(s, block, operation, computed)) {
+        if (stageTransitionValue(s, block, next, computed)) {
           if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
             const update = s.pendingActionBatch?.updates.get(s);
             if (update !== void 0) {
@@ -4488,6 +4497,10 @@ function activateHydrateBoundary(state) {
     renderBlock(block);
     drainHydrationRenderPhaseUpdates(block);
     if (state.hydrated) {
+      const adoptedSlot = block.slots[0];
+      if (adoptedSlot?.__kind === "trySlotSlot") {
+        hydration.claimRootRemainder(adoptedSlot.end.nextSibling);
+      }
       hydration.flushClassWrites();
       hydration.flushTextWarnings();
       hydration.finishRoot();
@@ -14833,7 +14846,7 @@ function forBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flag
     hydration.node = state.end.nextSibling;
   }
 }
-function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd) {
+function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody) {
   const state = parentScope.slots[slotKey];
   if (TRANSITION_JOURNAL !== null) {
     if (state !== void 0) {
@@ -14841,7 +14854,15 @@ function keyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
       state.selectionItems = void 0;
     }
     flags &= ~4;
-  } else if (state !== void 0 && activeHydration() === null && state.cachedDeps !== null && tryUpdateKeyedSelection(state, items, itemBody, state.cachedDeps, deps, flags >>> 6)) {
+  } else if (state !== void 0 && activeHydration() === null && state.cachedDeps !== null && tryUpdateKeyedSelection(
+    state,
+    items,
+    itemBody,
+    state.cachedDeps,
+    deps,
+    flags >>> 6,
+    selectionBody
+  )) {
     return;
   }
   forBlock(
@@ -14965,7 +14986,7 @@ function fastForBlock(parentScope, slotKey, domParent, items, getKey, itemBody,
   }
   mountFastHostItems(parentScope, state, parent, items, getKey, itemBody, flags, deps, false);
 }
-function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd) {
+function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemBody, flags, deps, emptyBody, anchor, ownEnd, selectionBody) {
   const state = parentScope.slots[slotKey];
   const parent = fastHostListParent(state, items, flags);
   if (parent === null) {
@@ -14980,7 +15001,8 @@ function fastKeyedForBlock(parentScope, slotKey, domParent, items, getKey, itemB
       deps,
       emptyBody,
       anchor,
-      ownEnd
+      ownEnd,
+      selectionBody
     );
     return;
   }
@@ -15052,7 +15074,7 @@ function depsEqual(a, b) {
   }
   return true;
 }
-function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, selectionIndex) {
+function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, selectionIndex, selectionBody) {
   if (state.selectionItems !== items || state.size !== items.length || state.items.size !== state.size || previousDeps.length !== deps.length || selectionIndex >= deps.length) {
     return false;
   }
@@ -15075,12 +15097,20 @@ function tryUpdateKeyedSelection(state, items, itemBody, previousDeps, deps, sel
   if (first !== void 0) {
     first.body = itemBody;
     first.extra = deps;
-    itemBody(first.props, first, deps);
+    if (selectionBody !== void 0 && first._slots === null) {
+      selectionBody(first.props, first, deps);
+    } else {
+      itemBody(first.props, first, deps);
+    }
   }
   if (second !== void 0) {
     second.body = itemBody;
     second.extra = deps;
-    itemBody(second.props, second, deps);
+    if (selectionBody !== void 0 && second._slots === null) {
+      selectionBody(second.props, second, deps);
+    } else {
+      itemBody(second.props, second, deps);
+    }
   }
   return true;
 }

package/dist/version.js

@@ -1,4 +1,4 @@
-const version = "0.1.41";
+const version = "0.1.42";
 export {
   version
 };

package/package.json

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