ilha 0.9.1 → 0.9.3

package/dist/{index-C0SWn9oq.d.ts → index-Dx_q_SGo.d.ts}

@@ -38,6 +38,14 @@ declare const ISLAND_CALL: unique symbol;
  * retain a handle to push updated props into it on subsequent parent
  * re-renders. Not part of the public surface. */
 declare const ISLAND_MOUNT_INTERNAL: unique symbol;
+/** @internal Live mount handles keyed by host element. Lets @ilha/router adopt
+ * islands hydrated by `ilha.mount()` (whose handles it never saw) and push new
+ * loader props into them in place instead of remounting. Entries are removed
+ * on unmount. Not part of the public surface. */
+declare const ISLAND_MOUNT_HANDLES: WeakMap<Element, {
+  unmount: () => void | Promise<void>;
+  updateProps: (props?: Record<string, unknown>) => void;
+}>;
 interface RawHtml {
   [RAW]: true;
   value: string;
@@ -350,4 +358,4 @@ declare const context: typeof ilhaContextFn & {
   clear(): void;
 };
 //#endregion
-export { mount as A, css as C, ilhaComputed as D, ilha as E, raw as M, untrack as N, ilhaEffect as O, context as S, html as T, OnMountContext as _, ErrorSource as a, __ilhaJsxSlot as b, HandlerContextFor as c, Island as d, IslandDerived as f, MountResult as g, MountOptions as h, ErrorContext as i, onUncaughtError as j, ilhaSignal as k, HydratableOptions as l, KeyedIsland as m, DerivedValue as n, ExternalSignal as o, IslandState as p, EffectContext as r, HandlerContext as s, DerivedAccessor as t, ISLAND_MOUNT_INTERNAL as u, RawHtml as v, from as w, batch as x, SignalAccessor as y };
+export { ilhaSignal as A, context as C, ilha as D, html as E, onUncaughtError as M, raw as N, ilhaComputed as O, untrack as P, batch as S, from as T, MountResult as _, ErrorSource as a, SignalAccessor as b, HandlerContextFor as c, ISLAND_MOUNT_INTERNAL as d, Island as f, MountOptions as g, KeyedIsland as h, ErrorContext as i, mount as j, ilhaEffect as k, HydratableOptions as l, IslandState as m, DerivedValue as n, ExternalSignal as o, IslandDerived as p, EffectContext as r, HandlerContext as s, DerivedAccessor as t, ISLAND_MOUNT_HANDLES as u, OnMountContext as v, css as w, __ilhaJsxSlot as x, RawHtml as y };

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-import { A as mount, C as css, D as ilhaComputed, E as ilha, M as raw, N as untrack, O as ilhaEffect, S as context, T as html, _ as OnMountContext, a as ErrorSource, b as __ilhaJsxSlot, c as HandlerContextFor, d as Island, f as IslandDerived, g as MountResult, h as MountOptions, i as ErrorContext, j as onUncaughtError, k as ilhaSignal, l as HydratableOptions, m as KeyedIsland, n as DerivedValue, o as ExternalSignal, p as IslandState, r as EffectContext, s as HandlerContext, t as DerivedAccessor, u as ISLAND_MOUNT_INTERNAL, v as RawHtml, w as from, x as batch, y as SignalAccessor } from "./index-C0SWn9oq.js";
-export { DerivedAccessor, DerivedValue, EffectContext, ErrorContext, ErrorSource, ExternalSignal, HandlerContext, HandlerContextFor, HydratableOptions, ISLAND_MOUNT_INTERNAL, Island, IslandDerived, IslandState, KeyedIsland, MountOptions, MountResult, OnMountContext, RawHtml, SignalAccessor, __ilhaJsxSlot, batch, ilhaComputed as computed, context, css, ilha as default, ilhaEffect as effect, from, html, ilhaSignal, ilhaSignal as signal, mount, onUncaughtError, raw, untrack };
+import { A as ilhaSignal, C as context, D as ilha, E as html, M as onUncaughtError, N as raw, O as ilhaComputed, P as untrack, S as batch, T as from, _ as MountResult, a as ErrorSource, b as SignalAccessor, c as HandlerContextFor, d as ISLAND_MOUNT_INTERNAL, f as Island, g as MountOptions, h as KeyedIsland, i as ErrorContext, j as mount, k as ilhaEffect, l as HydratableOptions, m as IslandState, n as DerivedValue, o as ExternalSignal, p as IslandDerived, r as EffectContext, s as HandlerContext, t as DerivedAccessor, u as ISLAND_MOUNT_HANDLES, v as OnMountContext, w as css, x as __ilhaJsxSlot, y as RawHtml } from "./index-Dx_q_SGo.js";
+export { DerivedAccessor, DerivedValue, EffectContext, ErrorContext, ErrorSource, ExternalSignal, HandlerContext, HandlerContextFor, HydratableOptions, ISLAND_MOUNT_HANDLES, ISLAND_MOUNT_INTERNAL, Island, IslandDerived, IslandState, KeyedIsland, MountOptions, MountResult, OnMountContext, RawHtml, SignalAccessor, __ilhaJsxSlot, batch, ilhaComputed as computed, context, css, ilha as default, ilhaEffect as effect, from, html, ilhaSignal, ilhaSignal as signal, mount, onUncaughtError, raw, untrack };

package/dist/index.js

@@ -169,21 +169,23 @@ function morphChildren(fromParent, toParent) {
 	for (let i = 0; i < toNodes.length; i++) {
 		const toNode = toNodes[i];
 		let fromNode = fromParent.childNodes[i];
-		if (fromKeyed !== null && toNode.nodeType === 1) {
-			const key = toNode.getAttribute("data-key");
-			if (key !== null) {
-				const match = fromKeyed.get(key);
+		if (fromKeyed !== null) {
+			const toKey = toNode.nodeType === 1 ? toNode.getAttribute("data-key") : null;
+			if (toKey !== null) {
+				const match = fromKeyed.get(toKey);
 				if (match) {
+					fromKeyed.delete(toKey);
 					if (match !== fromNode) {
 						fromParent.insertBefore(match, fromNode ?? null);
 						fromNode = match;
 					}
-				} else if (fromNode instanceof Element) {
-					const fromKey = fromNode.getAttribute("data-key");
-					if (fromKey !== null && toKeys.has(fromKey)) {
-						fromParent.insertBefore(toNode.cloneNode(true), fromNode);
-						continue;
-					}
+				}
+			}
+			if (fromNode instanceof Element) {
+				const fromKey = fromNode.getAttribute("data-key");
+				if (fromKey !== null && fromKey !== toKey && toKeys.has(fromKey)) {
+					fromParent.insertBefore(toNode.cloneNode(true), fromNode);
+					continue;
 				}
 			}
 		}
@@ -210,6 +212,16 @@ function morphChildren(fromParent, toParent) {
 				fromParent.replaceChild(toEl.cloneNode(true), fromEl);
 				continue;
 			}
+			if (fromEl.localName === "input") {
+				const hadChecked = fromEl.hasAttribute("checked");
+				const hadValue = fromEl.getAttribute("value");
+				syncAttributes(fromEl, toEl);
+				const hasChecked = toEl.hasAttribute("checked");
+				if (hasChecked !== hadChecked) fromEl.checked = hasChecked;
+				const newValue = toEl.getAttribute("value");
+				if (newValue !== hadValue) fromEl.value = newValue ?? "";
+				continue;
+			}
 			syncAttributes(fromEl, toEl);
 			if (fromEl.localName === "textarea") {
 				const newText = toEl.textContent ?? "";
@@ -265,6 +277,11 @@ const ISLAND_CALL = Symbol.for("ilha.islandCall");
 * re-renders. Not part of the public surface. */
 const ISLAND_MOUNT_INTERNAL = Symbol.for("ilha.islandMountInternal");
 const ISLAND_SLOT_TAG = Symbol.for("ilha.islandSlotTag");
+/** @internal Live mount handles keyed by host element. Lets @ilha/router adopt
+* islands hydrated by `ilha.mount()` (whose handles it never saw) and push new
+* loader props into them in place instead of remounting. Entries are removed
+* on unmount. Not part of the public surface. */
+const ISLAND_MOUNT_HANDLES = /* @__PURE__ */ new WeakMap();
 const SLOT_ATTR = "data-ilha-slot";
 const PROPS_ATTR = "data-ilha-props";
 const STATE_ATTR = "data-ilha-state";
@@ -1811,6 +1828,7 @@ var IlhaBuilder = class IlhaBuilder {
 			const unmount = () => {
 				if (tornDown) return;
 				tornDown = true;
+				ISLAND_MOUNT_HANDLES.delete(host);
 				stopRender();
 				detachListeners();
 				const pending = [];
@@ -1839,10 +1857,12 @@ var IlhaBuilder = class IlhaBuilder {
 				if (shallowEqualInput(inputSignal(), next)) return;
 				inputSignal(next);
 			};
-			return {
+			const handle = {
 				unmount,
 				updateProps
 			};
+			ISLAND_MOUNT_HANDLES.set(host, handle);
+			return handle;
 		}
 		/**
 		* Dual-mode island invocation:
@@ -2118,4 +2138,4 @@ const from = ilhaFrom;
 const context = ilhaContext;
 
 //#endregion
-export { ISLAND_MOUNT_INTERNAL, __ilhaJsxSlot, batch, ilhaComputed as computed, context, css, ilha as default, ilhaEffect as effect, from, html, ilhaSignal, ilhaSignal as signal, mount, onUncaughtError, raw, untrack };
+export { ISLAND_MOUNT_HANDLES, ISLAND_MOUNT_INTERNAL, __ilhaJsxSlot, batch, ilhaComputed as computed, context, css, ilha as default, ilhaEffect as effect, from, html, ilhaSignal, ilhaSignal as signal, mount, onUncaughtError, raw, untrack };

package/dist/jsx-dev-runtime.d.ts

@@ -1,2 +1,2 @@
-import { a as JSX, r as jsxDEV, t as Fragment } from "./jsx-runtime-DBCAZ9YL.js";
+import { a as JSX, r as jsxDEV, t as Fragment } from "./jsx-runtime-DysRyz9R.js";
 export { Fragment, type JSX, jsxDEV };

package/dist/{jsx-runtime-DBCAZ9YL.d.ts → jsx-runtime-DysRyz9R.d.ts}

@@ -1,4 +1,4 @@
-import { v as RawHtml } from "./index-C0SWn9oq.js";
+import { y as RawHtml } from "./index-Dx_q_SGo.js";
 
 //#region src/jsx-types.d.ts
 declare namespace JSX {

package/dist/jsx-runtime.d.ts

@@ -1,2 +1,2 @@
-import { a as JSX, i as jsxs, n as jsx, r as jsxDEV, t as Fragment } from "./jsx-runtime-DBCAZ9YL.js";
+import { a as JSX, i as jsxs, n as jsx, r as jsxDEV, t as Fragment } from "./jsx-runtime-DysRyz9R.js";
 export { Fragment, type JSX, jsx, jsxDEV, jsxs };

package/dist/jsx-runtime.js

@@ -111,10 +111,23 @@ function pushJsxAttr(chunks, values, name, value) {
 	values.push(value);
 	chunks.push("\"");
 }
-function renderJsxElement(type, props, children) {
+function escapeAttrValue(value) {
+	return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
+}
+function injectDataKey(out, key) {
+	const m = /^\s*<([a-zA-Z][a-zA-Z0-9:._-]*)/.exec(out.value);
+	if (!m) return out;
+	const openEnd = out.value.indexOf(">", m.index);
+	const openTag = out.value.slice(m.index, openEnd === -1 ? void 0 : openEnd);
+	if (/\sdata-key\s*=/.test(openTag)) return out;
+	const insertAt = m.index + m[0].length;
+	return raw(`${out.value.slice(0, insertAt)} data-key="${escapeAttrValue(key)}"${out.value.slice(insertAt)}`);
+}
+function renderJsxElement(type, props, children, slotKey) {
 	const chunks = [`<${type}`];
 	const values = [];
 	if (props) for (const [name, value] of Object.entries(props)) pushJsxAttr(chunks, values, name, value);
+	if (slotKey !== void 0 && props?.["data-key"] == null) pushJsxAttr(chunks, values, "data-key", slotKey);
 	chunks[chunks.length - 1] += ">";
 	if (!VOID_ELEMENTS.has(type)) {
 		for (const child of children) {
@@ -129,8 +142,8 @@ function jsx(type, props, maybeKey, ...restChildren) {
 	const hasKeyArg = typeof maybeKey === "string" || typeof maybeKey === "number";
 	const keyFromArg = hasKeyArg ? maybeKey : void 0;
 	const normalizedChildren = normalizeJsxChildren(props, hasKeyArg || maybeKey === void 0 ? restChildren : [maybeKey, ...restChildren]);
+	const slotKey = extractJsxSlotKey(props, typeof keyFromArg === "string" || typeof keyFromArg === "number" ? keyFromArg : void 0);
 	if (typeof type === "function") {
-		const slotKey = extractJsxSlotKey(props, typeof keyFromArg === "string" || typeof keyFromArg === "number" ? keyFromArg : void 0);
 		const componentProps = {
 			...props,
 			...normalizedChildren.length > 0 ? { children: normalizedChildren } : {}
@@ -141,13 +154,13 @@ function jsx(type, props, maybeKey, ...restChildren) {
 			if (slotKey !== void 0) out.key = slotKey;
 			return html`${out}`;
 		}
-		if (isRawHtml(out)) return out;
+		if (isRawHtml(out)) return slotKey !== void 0 ? injectDataKey(out, slotKey) : out;
 		if (typeof out === "string" && isIsland(type)) return __ilhaJsxSlot(type, componentProps, slotKey);
 		if (typeof out === "string") return html`${out}`;
 		if (typeof out === "object" && out !== null && Object.getPrototypeOf(out) === Object.prototype && out[RENDER_PART] === true && typeof out.toString === "function") return raw(String(out));
 		return html`${out}`;
 	}
-	return renderJsxElement(type, props, normalizedChildren);
+	return renderJsxElement(type, props, normalizedChildren, slotKey);
 }
 const jsxs = jsx;
 function Fragment(props, ...children) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilha",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "A tiny, framework-free island architecture library",
   "keywords": [
     "framework-free",