ilha 0.9.1 → 0.9.2

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 ?? "";

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.2",
   "description": "A tiny, framework-free island architecture library",
   "keywords": [
     "framework-free",