ilha 0.15.1 → 0.15.2

package/dist/define.js

@@ -1,4 +1,4 @@
-import { t as mount } from "./mount-DCu8b0hE.js";
+import { t as mount } from "./mount-DKY_jSsG.js";
 
 //#region src/define.ts
 const define = (name, component) => {

package/dist/index.js

@@ -1,6 +1,6 @@
 import { _ as isString, f as errorView, i as Fragment, m as isFunction, t as h } from "./vnode-BHUY61Rm.js";
-import { C as makeFiber, S as getFiber, _ as structuralEqual, b as clearFiberView, d as interpret, f as atom, g as isAtomHandle, h as instr, m as handleOwner, n as unsafe, p as batch, u as runSetup, v as untrack, x as closeFiber, y as wrapHandle } from "./paint-core-D9VO-oUM.js";
-import { n as renderToString, t as mount } from "./mount-DCu8b0hE.js";
+import { C as getFiber, S as closeFiber, _ as isAtomHandle, b as wrapHandle, d as runSetup, f as interpret, g as instr, h as handleOwner, m as batch, n as unsafe, p as atom, v as structuralEqual, w as makeFiber, x as clearFiberView, y as untrack } from "./paint-core-B7jENZwS.js";
+import { n as renderToString, t as mount } from "./mount-DKY_jSsG.js";
 import * as Atom from "effect/reactivity/Atom";
 import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";

package/dist/{mount-DCu8b0hE.js → mount-DKY_jSsG.js}

@@ -1,5 +1,5 @@
 import { _ as isString, c as KEEP, d as defer, g as isObject, m as isFunction, r as isVNode, u as SLOT_ATTR, y as unwrap } from "./vnode-BHUY61Rm.js";
-import { T as makeRuntime, a as morphInner, c as bindEvents, i as insertRendered, l as eventTypeFromProp, o as placeChildren, r as committedElement, s as standInFor, t as createPainter, u as runSetup, w as makeRootFiber, x as closeFiber } from "./paint-core-D9VO-oUM.js";
+import { E as makeRuntime, S as closeFiber, T as makeRootFiber, a as markControlled, c as standInFor, d as runSetup, i as insertRendered, l as bindEvents, o as morphInner, r as committedElement, s as placeChildren, t as createPainter, u as eventTypeFromProp } from "./paint-core-B7jENZwS.js";
 
 //#region src/paint.ts
 const noopDisconnect = () => {};
@@ -30,13 +30,19 @@ const core$1 = createPainter({
 	reuseNode: (host) => host instanceof Element && host.isConnected ? standInFor(host) : host,
 	setFormControl: (el, key, v) => {
 		const node = el;
+		if (v !== null && v !== void 0) markControlled(el, key);
 		if (key === "value") {
-			if (v === null || v === void 0) {
+			const text = v === null || v === void 0 ? "" : String(v);
+			if (el.localName === "textarea") {
+				node.defaultValue = text;
+				node.value = text;
+			} else if (el.localName === "select") node.value = text;
+			else if (v === null || v === void 0) {
 				el.removeAttribute("value");
 				node.value = "";
 			} else {
-				el.setAttribute("value", String(v));
-				node.value = String(v);
+				el.setAttribute("value", text);
+				node.value = text;
 			}
 		} else if (key === "checked") {
 			node.checked = Boolean(v);
@@ -344,6 +350,26 @@ const bindSsrEvents = (el, props, fiber) => {
 		el.dataset.ilhaOn = existing ? `${existing},${id}` : id;
 	}
 };
+const WHITESPACE_RUN = /\s+/gu;
+/**
+* Mark the first option whose value is `value` selected and clear the rest,
+* as setting a live select's `.value` does. Returns whether one matched.
+*/
+const selectOption = (parent, value, found) => {
+	let matched = found;
+	for (const child of parent.children) {
+		if (child.kind !== "element") continue;
+		if (child.localName === "optgroup") matched = selectOption(child, value, matched);
+		else if (child.localName === "option") {
+			const optionValue = child.getAttribute("value") ?? child.textContent.trim().replaceAll(WHITESPACE_RUN, " ");
+			if (!matched && optionValue === value) {
+				child.setAttribute("selected", "");
+				matched = true;
+			} else child.removeAttribute("selected");
+		}
+	}
+	return matched;
+};
 const core = createPainter({
 	appendRoot: (root, node) => ssrAs(root).append(node),
 	asElement: (el) => ssrAs(el),
@@ -370,8 +396,13 @@ const core = createPainter({
 	},
 	reuseNode: (host) => ssrAs(host),
 	setFormControl: (el, key, v) => {
-		if (key === "value") el.setAttribute("value", String(v ?? ""));
-		else if (v) el.setAttribute(key, "");
+		if (key === "value") {
+			const text = String(v ?? "");
+			if (el.localName === "textarea") el.textContent = text;
+			else if (el.localName === "select") {
+				if (v !== null && v !== void 0) selectOption(el, text, false);
+			} else el.setAttribute("value", text);
+		} else if (v) el.setAttribute(key, "");
 		else el.removeAttribute(key);
 	},
 	setStyle: (el, css) => el.setAttribute("style", css)

package/dist/{paint-core-D9VO-oUM.js → paint-core-B7jENZwS.js}

@@ -836,6 +836,20 @@ const collectKeys = (parent) => {
 	}
 	return keys;
 };
+/** Rendered elements that carried a non-null form-control prop, per key.
+* `checked={false}`, `selected={false}` and `<select value>` leave no
+* attribute, so presence alone can't tell a controlled render from an
+* uncontrolled one. */
+const controlledBy = {
+	checked: /* @__PURE__ */ new WeakSet(),
+	selected: /* @__PURE__ */ new WeakSet(),
+	value: /* @__PURE__ */ new WeakSet()
+};
+/** Mark a rendered element controlled for `key`: the morph syncs it either way. */
+const markControlled = (el, key) => {
+	controlledBy[key].add(el);
+};
+const isControlled = (el, key) => controlledBy[key].has(el);
 const morphInput = (fromEl, toEl) => {
 	syncAttributes(fromEl, toEl);
 	const from = fromEl;
@@ -845,7 +859,7 @@ const morphInput = (fromEl, toEl) => {
 		if (toChecked) fromEl.setAttribute("checked", "");
 		else fromEl.removeAttribute("checked");
 	}
-	if (toChecked && from.checked !== to.checked) from.checked = to.checked;
+	if ((toChecked || isControlled(toEl, "checked")) && from.checked !== to.checked) from.checked = to.checked;
 	const toValue = toEl.getAttribute("value");
 	if (toValue !== fromEl.getAttribute("value")) {
 		if (toValue === null) fromEl.removeAttribute("value");
@@ -857,14 +871,32 @@ const morphTextarea = (fromEl, toEl) => {
 	syncAttributes(fromEl, toEl);
 	const from = fromEl;
 	const to = toEl;
-	if (to.textContent !== "" || from.textContent !== to.textContent) {
+	if (isControlled(toEl, "value") || to.textContent !== "" || from.textContent !== to.textContent) {
 		if (from.value !== to.value) from.value = to.value;
 		if (from.textContent !== to.textContent) from.textContent = to.textContent;
 	}
 };
+const isControlledSelect = (select) => {
+	if (isControlled(select, "value")) return true;
+	for (const o of select.options) if (isControlled(o, "selected")) return true;
+	return false;
+};
 const morphSelect = (fromEl, toEl, api) => {
-	const before = /* @__PURE__ */ new Map();
 	const fromSelect = fromEl;
+	const toSelect = toEl;
+	if (isControlledSelect(toSelect)) {
+		syncAttributes(fromEl, toEl);
+		api.morphChildren(fromEl, toEl);
+		const want = toSelect.options;
+		let i = 0;
+		for (const o of fromSelect.options) {
+			const selected = want[i]?.selected ?? false;
+			if (o.selected !== selected) o.selected = selected;
+			i += 1;
+		}
+		return;
+	}
+	const before = /* @__PURE__ */ new Map();
 	for (const o of fromSelect.options) before.set(o, {
 		attr: o.hasAttribute("selected"),
 		live: o.selected
@@ -1592,7 +1624,8 @@ const createPainter = (ops) => {
 		const ns = elementNs(lower, parentNsOf(fiber.root));
 		const el = ops.createElement(tag, ns);
 		if (view.key !== null && view.key !== void 0) el.setAttribute(KEY_ATTR, String(view.key));
-		api.applyProps(el, view.props, fiber);
+		const propsAfterChildren = lower === "select";
+		if (!propsAfterChildren) api.applyProps(el, view.props, fiber);
 		const childFiber = {
 			...fiber,
 			holes: fiber.holes,
@@ -1600,6 +1633,7 @@ const createPainter = (ops) => {
 			root: ops.asRoot(el)
 		};
 		for (const c of view.children) for (const n of api.materialize(c, childFiber)) el.append(n);
+		if (propsAfterChildren) api.applyProps(el, view.props, fiber);
 		return [el];
 	};
 	const materializeVNode = (view, fiber) => {
@@ -1656,4 +1690,4 @@ const createPainter = (ops) => {
 };
 
 //#endregion
-export { makeFiber as C, getFiber as S, makeRuntime as T, structuralEqual as _, morphInner as a, clearFiberView as b, bindEvents as c, interpret as d, atom as f, isAtomHandle as g, instr as h, insertRendered as i, eventTypeFromProp as l, handleOwner as m, unsafe as n, placeChildren as o, batch as p, committedElement as r, standInFor as s, createPainter as t, runSetup as u, untrack as v, makeRootFiber as w, closeFiber as x, wrapHandle as y };
+export { getFiber as C, makeRuntime as E, closeFiber as S, makeRootFiber as T, isAtomHandle as _, markControlled as a, wrapHandle as b, standInFor as c, runSetup as d, interpret as f, instr as g, handleOwner as h, insertRendered as i, bindEvents as l, batch as m, unsafe as n, morphInner as o, atom as p, committedElement as r, placeChildren as s, createPainter as t, eventTypeFromProp as u, structuralEqual as v, makeFiber as w, clearFiberView as x, untrack as y };

package/dist/renderer.js

@@ -1,5 +1,5 @@
 import { d as defer } from "./vnode-BHUY61Rm.js";
-import { S as getFiber, T as makeRuntime, c as bindEvents, t as createPainter, u as runSetup, w as makeRootFiber, x as closeFiber } from "./paint-core-D9VO-oUM.js";
+import { C as getFiber, E as makeRuntime, S as closeFiber, T as makeRootFiber, d as runSetup, l as bindEvents, t as createPainter } from "./paint-core-B7jENZwS.js";
 
 //#region src/renderer.ts
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ilha",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "Generator-first island UI on Effect",
   "keywords": [
     "effect",