@octane-xplat/ui 0.7.2 → 0.9.0

package/dist/web/Sheet.web.tsrx.js

@@ -1,20 +1,22 @@
 import { cx } from "./cx.js";
 import { useThemeScheme } from "./theme/theme-scheme.js";
+import { isolateModalFocus } from "./modal-focus.web.js";
 import { normalizeDetents } from "./sheet-snap.js";
 import { attachSheetDetents } from "./sheet-detents.web.js";
 import { bag4, child, clone, createElement, createPortal, createScopedElement, createScopedValue, drainFrag, hookSlots, ifBlock, positionalChildren, template, useEffect, useRef, withSlot } from "octane";
 import { compilerMemoRegion, hookMemoCreate, hookMemoEqual, hookMemoPublish1, textHoleUpdate } from "octane/internal/client";
 //#region src/Sheet.web.tsrx
 var _t$0 = /* @__PURE__ */ template("<!>", 0, 1);
-var _hs$ = /* @__PURE__ */ hookSlots(4);
+var _hs$ = /* @__PURE__ */ hookSlots(6);
 var _h$0 = /* @__PURE__ */ Symbol(_hs$);
 function __then$0(__props, __s, __extra) {
 	const __block = __s.block;
 	const dark = __extra[0];
 	const detents = __extra[1];
-	const maxDetent = __extra[2];
-	const panel = __extra[3];
-	const props = __extra[4];
+	const layer = __extra[2];
+	const maxDetent = __extra[3];
+	const panel = __extra[4];
+	const props = __extra[5];
 	let _b = __s.slots[0];
 	if (_b === void 0) {
 		let _m0, _m1;
@@ -25,7 +27,10 @@ function __then$0(__props, __s, __extra) {
 		_b = bag4(__s, null, _m0, _m1, null, void 0);
 	}
 	{
-		const _v = /* @__PURE__ */ createPortal(createScopedValue(() => createScopedElement("div", { className: cx("vx-sheet-layer", dark && "dark") }, () => positionalChildren([(props.shadeCover ?? true) && createScopedValue(() => createElement("div", {
+		const _v = /* @__PURE__ */ createPortal(createScopedValue(() => createScopedElement("div", {
+			ref: layer,
+			className: cx("vx-sheet-layer", dark && "dark")
+		}, () => positionalChildren([(props.shadeCover ?? true) && createScopedValue(() => createElement("div", {
 			className: "vx-sheet-backdrop",
 			onClick: props.onDismiss
 		})), createScopedValue(() => createScopedElement("div", {
@@ -33,6 +38,8 @@ function __then$0(__props, __s, __extra) {
 				panel.current = el;
 			},
 			className: cx("vx-sheet", detents.length && "vx-sheet-detents", props.className),
+			role: props.shadeCover === false ? void 0 : "dialog",
+			"aria-modal": props.shadeCover === false ? void 0 : true,
 			style: {
 				...props.style,
 				...detents.length ? {
@@ -54,8 +61,13 @@ var Sheet = function Sheet(props, __s, __extra) {
 	let __hkd0;
 	const dark = withSlot(_h$0, useThemeScheme) === "dark";
 	const panel = useRef(null, _hs$ + 1);
-	const dismiss = useRef(props.onDismiss, _hs$ + 2);
+	const layer = useRef(null, _hs$ + 2);
+	const dismiss = useRef(props.onDismiss, _hs$ + 3);
 	dismiss.current = props.onDismiss;
+	useEffect(() => {
+		if (!props.open || props.shadeCover === false || !layer.current || !panel.current) return;
+		return isolateModalFocus(layer.current, panel.current, () => dismiss.current?.());
+	}, [props.open, props.shadeCover], _hs$ + 4);
 	const detents = (__hkd0 = props, __hk[0] !== true || !hookMemoEqual(__hk[1], __hkd0) ? hookMemoPublish1(__hk, 0, normalizeDetents(props.detents), __hkd0) : __hk[2]);
 	const maxDetent = detents.length ? detents[detents.length - 1] : 0;
 	const detentsKey = detents.join(",");
@@ -64,13 +76,14 @@ var Sheet = function Sheet(props, __s, __extra) {
 		if (!props.open || !el || !detents.length) return;
 		const ctl = attachSheetDetents(el, detents, () => dismiss.current?.());
 		return () => ctl.detach();
-	}, [props.open, detentsKey], _hs$ + 3);
+	}, [props.open, detentsKey], _hs$ + 5);
 	if (__s.block.pending && !__s.block.crossRenderUpdate) return;
 	{
 		const __ifCondition = props.open;
 		ifBlock(__s, 0, __block.parentNode, __ifCondition, __then$0, null, __block.endMarker, __ifCondition ? [
 			dark,
 			detents,
+			layer,
 			maxDetent,
 			panel,
 			props

package/dist/web/TextArea.web.tsrx.js

@@ -1,6 +1,6 @@
 import { applyEscapeProps } from "./escape-props.web.js";
 import { normStyle } from "./layout-child.web.js";
-import { __s, bag11, clone, delegateEvents, hookSlots, queueRefAttach, queueRefDetach, setAttribute, setEventHandler, setStyle, template, useLayoutEffect, useRef } from "octane";
+import { __s, bag12, clone, delegateEvents, evt2e, evt2u, hookSlots, queueRefAttach, queueRefDetach, setAttribute, setEventHandler, setStyle, template, useLayoutEffect, useRef } from "octane";
 import { bindSignalAttribute, bindSignalValue, enableSignalBindings, replaceRef, setBooleanAttributeIfChanged, setPlainAttribute, updateFreshClassName } from "octane/internal/client";
 //#region src/TextArea.web.tsrx
 enableSignalBindings(1, true);
@@ -10,8 +10,12 @@ delegateEvents([
 	"input",
 	"keydown"
 ]);
-var _t$0 = /* @__PURE__ */ template("<textarea data-octane-input=\"i:bf482a0b\"></textarea>");
+var _t$0 = /* @__PURE__ */ template("<textarea data-octane-input=\"i:d137a29c\"></textarea>");
 var _hs$ = /* @__PURE__ */ hookSlots(2);
+var __event = (e, fit, props) => {
+	fit();
+	props.onChange?.(e.target.value);
+};
 var _rm$0 = [
 	"r",
 	"b",
@@ -19,7 +23,7 @@ var _rm$0 = [
 ];
 var TextArea = /* @__PURE__ */ __s(function TextArea(props, __s, __extra) {
 	const el = useRef(null, _hs$ + 0);
-	useLayoutEffect(() => {
+	const fit = () => {
 		const t = el.current;
 		if (!t) return;
 		const cs = getComputedStyle(t);
@@ -35,7 +39,8 @@ var TextArea = /* @__PURE__ */ __s(function TextArea(props, __s, __extra) {
 			t.style.height = Math.min(need, cap) + "px";
 			t.style.overflowY = need > cap ? "auto" : "hidden";
 		}
-	}, [
+	};
+	useLayoutEffect(fit, [
 		props.value,
 		props.rows,
 		props.autoGrow,
@@ -45,7 +50,7 @@ var TextArea = /* @__PURE__ */ __s(function TextArea(props, __s, __extra) {
 	], _hs$ + 1);
 	let _b = __s.slots[0];
 	if (_b === void 0) {
-		let _m0, _m1, _m5;
+		let _m0, _m1, _m5, _m11;
 		const _root = clone(_t$0);
 		queueRefAttach(__s, _m1 = (node) => {
 			el.current = node;
@@ -58,14 +63,14 @@ var TextArea = /* @__PURE__ */ __s(function TextArea(props, __s, __extra) {
 			});
 		}, _m0 = _root);
 		(__s.cleanups ??= []).push(() => _b && queueRefDetach(_b.b, _b.a));
-		_m5 = bindSignalValue(__s, void 0, _root, props.value, "i:bf482a0b");
-		setEventHandler(_root, "$$input", (e) => props.onChange?.(e.target.value));
+		_m5 = bindSignalValue(__s, void 0, _root, props.value, "i:d137a29c");
+		_m11 = evt2e(_root, "$$input", __event, fit, props);
 		setEventHandler(_root, "$$keydown", (e) => {
-			if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) props.onSubmit?.();
+			if (e.key === "Enter" && (e.ctrlKey || e.metaKey) && !e.isComposing && e.keyCode !== 229) props.onSubmit?.();
 		});
 		setEventHandler(_root, "$$focusin", props.onFocus);
 		setEventHandler(_root, "$$focusout", props.onBlur);
-		_b = bag11(__s, _root, _m0, _m1, void 0, void 0, void 0, _m5, void 0, void 0, void 0, void 0, void 0);
+		_b = bag12(__s, _root, _m0, _m1, void 0, void 0, void 0, _m5, void 0, void 0, void 0, void 0, void 0, _m11);
 		__s.refFields = _rm$0;
 	} else {
 		{
@@ -81,15 +86,15 @@ var TextArea = /* @__PURE__ */ __s(function TextArea(props, __s, __extra) {
 			};
 			if (_r !== _b.b) _b.b = replaceRef(__s, _b.b, _r, _b.a);
 		}
-		_b.f = bindSignalValue(__s, _b.f, _b.a, props.value, "i:bf482a0b");
-		setEventHandler(_b.a, "$$input", (e) => props.onChange?.(e.target.value));
+		_b.f = bindSignalValue(__s, _b.f, _b.a, props.value, "i:d137a29c");
+		evt2u(_b.l, __event, fit, props);
 		setEventHandler(_b.a, "$$keydown", (e) => {
-			if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) props.onSubmit?.();
+			if (e.key === "Enter" && (e.ctrlKey || e.metaKey) && !e.isComposing && e.keyCode !== 229) props.onSubmit?.();
 		});
 		setEventHandler(_b.a, "$$focusin", props.onFocus);
 		setEventHandler(_b.a, "$$focusout", props.onBlur);
 	}
-	_b.c = bindSignalAttribute(__s, _b.c, _b.a, "id", props.id, "b:601d47ca", setPlainAttribute);
+	_b.c = bindSignalAttribute(__s, _b.c, _b.a, "id", props.id, "b:3b357831", setPlainAttribute);
 	_b.d = updateFreshClassName(["vx-textarea", props.className], _b.d, _b.a);
 	{
 		const _v = {
@@ -101,11 +106,11 @@ var TextArea = /* @__PURE__ */ __s(function TextArea(props, __s, __extra) {
 			_b.e = _v;
 		}
 	}
-	_b.g = bindSignalAttribute(__s, _b.g, _b.a, "inputMode", props.keyboardType === "number" ? "numeric" : props.keyboardType === "phone" ? "tel" : props.keyboardType === "default" ? "text" : props.keyboardType, "b:ef3d0153", setPlainAttribute);
-	_b.h = bindSignalAttribute(__s, _b.h, _b.a, "enterKeyHint", props.returnKeyType, "b:c58c3b7f", setPlainAttribute);
+	_b.g = bindSignalAttribute(__s, _b.g, _b.a, "inputMode", props.keyboardType === "number" ? "numeric" : props.keyboardType === "phone" ? "tel" : props.keyboardType === "default" ? "text" : props.keyboardType, "b:d8754b83", setPlainAttribute);
+	_b.h = bindSignalAttribute(__s, _b.h, _b.a, "enterKeyHint", props.returnKeyType, "b:dd45ab85", setPlainAttribute);
 	_b.i = setBooleanAttributeIfChanged(props.editable === false, _b.i, _b.a, "readonly");
-	_b.j = bindSignalAttribute(__s, _b.j, _b.a, "placeholder", props.placeholder, "b:49264ef3", setPlainAttribute);
-	_b.k = bindSignalAttribute(__s, _b.k, _b.a, "rows", props.rows ?? (props.autoGrow ? 1 : 3), "b:5d7a03c8", setAttribute);
+	_b.j = bindSignalAttribute(__s, _b.j, _b.a, "placeholder", props.placeholder, "b:b273298e", setPlainAttribute);
+	_b.k = bindSignalAttribute(__s, _b.k, _b.a, "rows", props.rows ?? (props.autoGrow ? 1 : 3), "b:f589cea6", setAttribute);
 });
 //#endregion
 export { TextArea };

package/dist/web/TextInput.web.tsrx.js

@@ -36,7 +36,7 @@ var TextInput = /* @__PURE__ */ __s(function TextInput(props, __s, __extra) {
 		_m5 = bindSignalValue(__s, void 0, _root, props.value, "i:cd4865f9");
 		setEventHandler(_root, "$$input", (e) => props.onChange?.(e.target.value));
 		setEventHandler(_root, "$$keydown", (e) => {
-			if (e.key === "Enter" && !e.shiftKey) props.onSubmit?.();
+			if (e.key === "Enter" && !e.shiftKey && !e.isComposing && e.keyCode !== 229) props.onSubmit?.();
 		});
 		setEventHandler(_root, "$$focusin", props.onFocus);
 		setEventHandler(_root, "$$focusout", props.onBlur);
@@ -58,7 +58,7 @@ var TextInput = /* @__PURE__ */ __s(function TextInput(props, __s, __extra) {
 		_b.f = bindSignalValue(__s, _b.f, _b.a, props.value, "i:cd4865f9");
 		setEventHandler(_b.a, "$$input", (e) => props.onChange?.(e.target.value));
 		setEventHandler(_b.a, "$$keydown", (e) => {
-			if (e.key === "Enter" && !e.shiftKey) props.onSubmit?.();
+			if (e.key === "Enter" && !e.shiftKey && !e.isComposing && e.keyCode !== 229) props.onSubmit?.();
 		});
 		setEventHandler(_b.a, "$$focusin", props.onFocus);
 		setEventHandler(_b.a, "$$focusout", props.onBlur);