solid-baseui 0.1.0-alpha.1 → 0.1.0-alpha.2

package/dist/lib/client/DialogPopup-CfEb3F54.js

@@ -0,0 +1,138 @@
+import { t as e } from "./useRender-CxZ8PI-g.js";
+import { getStateAttributesProps as t } from "./internals/getStateAttributesProps.js";
+import { n, t as r } from "./resolveStyle-XcgAuaKR.js";
+import { composeEventHandlers as i, liveEventHandler as a } from "./internals/composeEventHandlers.js";
+import { t as o } from "./FocusManager-q7z7PMV1.js";
+import { d as s, f as c, h as l, s as u, u as d } from "./DialogHandle-DluOK_7u.js";
+import { createComponent as f, getNextElement as p, mergeProps as m, runHydrationEvents as h, spread as g, template as _ } from "@solidjs/web";
+import { Show as v, createEffect as y, createMemo as b, omit as x, onCleanup as S } from "solid-js";
+//#region src/dialog/backdrop/DialogBackdrop.tsx
+var C = /* @__PURE__ */ _("<div>");
+function w(i) {
+	let a = l(), o = i, u = x(i, "render", "class", "forceRender", "ref", "style"), d = b(() => ({
+		open: a.store.open(),
+		transitionStatus: a.store.track().transitionStatus
+	})), _ = e(i, () => d(), (e) => (() => {
+		var t = p(C);
+		return g(t, e, !1), h(), t;
+	})()), y = b(() => n(i.class, d())), w = b(() => c({
+		"user-select": "none",
+		"-webkit-user-select": "none"
+	}, r(i.style, d()))), T = b(() => t(d(), s)), E = b(() => !!o.forceRender || !a.nested);
+	function D() {
+		let e = null;
+		return S(() => {
+			a.backdropElement() === e && a.setBackdropElement(null);
+		}), f(_, m({
+			ref: [((t) => {
+				e = t, a.setBackdropElement(t);
+			}), o.ref],
+			role: "presentation",
+			get hidden() {
+				return !a.presence.mounted();
+			},
+			get class() {
+				return y();
+			},
+			get style() {
+				return w();
+			}
+		}, T, u));
+	}
+	return f(v, {
+		get when() {
+			return E();
+		},
+		get children() {
+			return f(D, {});
+		}
+	});
+}
+//#endregion
+//#region src/dialog/popup/DialogPopup.tsx
+var T = /* @__PURE__ */ _("<div>"), E = /* @__PURE__ */ new Set([
+	"ArrowUp",
+	"ArrowDown",
+	"ArrowLeft",
+	"ArrowRight",
+	"Home",
+	"End"
+]);
+function D(s) {
+	u();
+	let _ = l(), v = s, C = x(s, "render", "class", "finalFocus", "id", "initialFocus", "onKeyDown", "ref", "style"), w = b(() => ({
+		open: _.store.open(),
+		transitionStatus: _.store.track().transitionStatus,
+		nested: _.nested,
+		nestedDialogOpen: _.nestedOpenDialogCount() > 0
+	})), D = e(s, () => w(), (e) => (() => {
+		var t = p(T);
+		return g(t, e, !1), h(), t;
+	})()), O = b(() => n(s.class, w())), k = b(() => c({ "--nested-dialogs": _.nestedOpenDialogCount() }, r(s.style, w()))), A = b(() => t(w(), d)), j = b(() => v.id ?? _.store.context.floatingId), M = b(() => v.initialFocus ?? ((e) => e !== "touch" || _.store.state.popupElement)), N = i(a(() => v.onKeyDown), (e) => {
+		E.has(e.key) && e.stopPropagation();
+	}), P = null;
+	y(() => j(), (e) => {
+		_.store.setPopupId(e);
+	}), S(() => {
+		_.store.state.popupElement === P && _.store.setPopupElement(null);
+	});
+	let F = f(D, m({
+		ref: [((e) => {
+			P = e, _.store.setPopupElement(e);
+		}), v.ref],
+		get id() {
+			return j();
+		},
+		get role() {
+			return _.role;
+		},
+		tabIndex: -1,
+		"data-base-ui-focusable": "",
+		get hidden() {
+			return !_.presence.mounted();
+		},
+		get "aria-labelledby"() {
+			return _.titleId();
+		},
+		get "aria-describedby"() {
+			return _.descriptionId();
+		},
+		get class() {
+			return O();
+		},
+		get style() {
+			return k();
+		},
+		onKeyDown: N
+	}, A, C));
+	return f(o, {
+		get context() {
+			return _.store.context.floatingRoot;
+		},
+		get tree() {
+			return _.tree;
+		},
+		get disabled() {
+			return !_.presence.mounted();
+		},
+		get closeOnFocusOut() {
+			return !_.disablePointerDismissal();
+		},
+		get initialFocus() {
+			return M();
+		},
+		get returnFocus() {
+			return v.finalFocus;
+		},
+		get modal() {
+			return _.modal() !== !1;
+		},
+		restoreFocus: "popup",
+		get openInteractionType() {
+			return _.store.openMethod();
+		},
+		children: F
+	});
+}
+//#endregion
+export { w as n, D as t };

package/dist/lib/client/FieldControl-eDe-Jnp9.js

@@ -0,0 +1,142 @@
+import { t as e } from "./useRender-CxZ8PI-g.js";
+import { getStateAttributesProps as t } from "./internals/getStateAttributesProps.js";
+import { w as n } from "./reasons-Co5CzjKq.js";
+import { n as r, t as i } from "./resolveStyle-XcgAuaKR.js";
+import { createChangeEventDetails as a } from "./internals/createBaseUIEventDetails.js";
+import { composeEventHandlers as o, liveEventHandler as s } from "./internals/composeEventHandlers.js";
+import { fieldStateAttributesMapping as c } from "./internals/field-constants.js";
+import { r as l } from "./FieldRootContext-D3fuVjs3.js";
+import { n as u } from "./FormContext-CwLBtm_d.js";
+import { r as d } from "./LabelableContext-CmQF-TX2.js";
+import { t as f } from "./createLabelableId-DxJRwMUJ.js";
+import { createComponent as p, getNextElement as ee, mergeProps as m, runHydrationEvents as h, spread as g, template as _ } from "@solidjs/web";
+import { createEffect as v, createMemo as y, createSignal as b, createUniqueId as te, omit as x, onCleanup as ne, onSettled as S, untrack as C } from "solid-js";
+//#region src/field/control/FieldControl.tsx
+var w = /* @__PURE__ */ _("<input>");
+function T(_) {
+	let T = l(!0), O = u(), k = d(), A = _, j = _, M = Symbol("FieldControl"), N = !1, P = C(() => A.value !== void 0), F = () => A.value == null ? void 0 : String(A.value), I = C(F), L, R = !1, z = k.defaultControlId, B = typeof z == "string" ? z : `base-ui-${te()}`, [V, H] = b(), U = x(j, "aria-describedby", "aria-labelledby", "render", "autofocus", "class", "defaultValue", "disabled", "id", "name", "onBlur", "onFocus", "onInput", "onKeyDown", "onValueChange", "ref", "style", "value"), W = f(() => A.id, B), G = y(() => T.disabled() || (A.disabled ?? !1)), K = y(() => T.name() ?? A.name), q = y(() => ({
+		...T.state(),
+		disabled: G()
+	})), J = y(() => r(_.class, q())), Y = e(_, () => q(), (e) => (() => {
+		var t = ee(w);
+		return g(t, e, !1), h(), t;
+	})()), X = y(() => i(_.style, q())), Z = y(() => t(q(), c)), Q = () => {
+		if (A.value !== void 0) return F();
+		let e = V();
+		return E(e) ? e.value : A.defaultValue;
+	}, $ = {
+		id: B,
+		name: void 0,
+		value: Q,
+		getValue: () => {
+			let e = V();
+			return E(e) ? e.value : Q();
+		},
+		getControl: () => V() ?? null
+	}, re = o(s(() => A.onInput)), ie = o(s(() => A.onFocus)), ae = o(s(() => A.onBlur)), oe = o(s(() => A.onKeyDown));
+	function se(e) {
+		if (H(e), N || !E(e)) return;
+		N = !0;
+		let t = C(() => A.defaultValue);
+		if (C(() => A.value) === void 0 && t !== void 0 && !Array.isArray(t)) {
+			let n = String(t);
+			"defaultValue" in e && (e.defaultValue = n), e.value = n;
+		}
+	}
+	function ce(e) {
+		if (re.call(e.currentTarget, e), e.baseUIHandlerPrevented) return;
+		let t = D(e.currentTarget), r = a(n, e);
+		if (A.onValueChange?.(t, r), P) {
+			let t = e.currentTarget;
+			queueMicrotask(() => {
+				!R && E(t) && (t.value = F() ?? "");
+			});
+			return;
+		}
+		T.setDirty(t !== (T.validityData().initialValue ?? "")), T.setFilled(t !== ""), !e.defaultPrevented && !r.isCanceled && (O.clearError(K()), T.validation.change(t));
+	}
+	function le(e) {
+		ie.call(e.currentTarget, e), !e.baseUIHandlerPrevented && T.setFocused(!0);
+	}
+	function ue(e) {
+		if (ae.call(e.currentTarget, e), !e.baseUIHandlerPrevented && (T.setTouched(!0), T.setFocused(!1), T.validationMode() === "onBlur")) {
+			let t = D(e.currentTarget);
+			T.validation.commit(t), P && queueMicrotask(() => {
+				if (R) return;
+				let e = F();
+				e !== void 0 && e !== t && e !== (T.validityData().initialValue ?? "") && T.validation.commit(e);
+			});
+		}
+	}
+	function de(e) {
+		if (oe.call(e.currentTarget, e), !e.baseUIHandlerPrevented && e.currentTarget.tagName === "INPUT" && e.key === "Enter") {
+			T.setTouched(!0);
+			let t = e.currentTarget;
+			if (t.form && t.form === O.formElement() && !e.defaultPrevented) {
+				let e = O.submitCount();
+				clearTimeout(L), L = setTimeout(() => {
+					O.submitCount() === e && T.validation.commit(t.value);
+				}, 0);
+			} else T.validation.commit(t.value);
+		}
+	}
+	return v(() => ({
+		id: W(),
+		name: A.name,
+		disabled: G(),
+		element: V()
+	}), (e) => {
+		$.id = e.id, $.name = e.name, T.registerFieldControl(M, e.disabled || !e.element ? void 0 : $);
+	}), v(() => V(), (e) => {
+		if (E(e)) return T.validation.registerInput(M, e, () => C(() => V() ?? null));
+	}), v(F, (e) => C(() => {
+		e !== void 0 && (T.setFilled(e !== ""), e !== I && (I = e, O.clearError(K()), T.setDirty(e !== (T.validityData().initialValue ?? "")), T.validation.change(e)));
+	})), S(() => {
+		let e = V();
+		E(e) && T.setFilled(e.value !== ""), A.autofocus && e?.ownerDocument.activeElement === e && T.setFocused(!0);
+	}), ne(() => {
+		R = !0, clearTimeout(L), T.registerFieldControl(M, void 0);
+	}), p(Y, m({
+		ref: [se, A.ref],
+		get id() {
+			return W();
+		},
+		get class() {
+			return J();
+		},
+		get style() {
+			return X();
+		},
+		get name() {
+			return K();
+		},
+		get disabled() {
+			return G();
+		}
+	}, () => A.value === void 0 ? { defaultValue: A.defaultValue } : { value: A.value }, {
+		get autofocus() {
+			return A.autofocus;
+		},
+		get "aria-labelledby"() {
+			return A["aria-labelledby"] ?? k.labelId();
+		},
+		get "aria-describedby"() {
+			return k.getAriaDescribedBy(A["aria-describedby"]);
+		},
+		get "aria-invalid"() {
+			return q().valid === !1 && !G() ? "true" : void 0;
+		},
+		onInput: ce,
+		onFocus: le,
+		onBlur: ue,
+		onKeyDown: de
+	}, Z, U));
+}
+function E(e) {
+	return !!(e && (e.tagName === "INPUT" || e.tagName === "SELECT" || e.tagName === "TEXTAREA"));
+}
+function D(e) {
+	return "value" in e ? String(e.value) : "";
+}
+//#endregion
+export { T as t };

package/dist/lib/client/{FieldRootContext-izCEh80D.js → FieldRootContext-D3fuVjs3.js}

@@ -29,4 +29,4 @@ function s(e = !1) {
 	throw Error("Base UI: FieldRootContext is missing. Field parts must be placed within <Field.Root>.");
 }
 //#endregion
-export { s as n, o as t };
+export { o as n, s as r, a as t };

package/dist/lib/client/{FocusManager-NP1uPXTi.js → FocusManager-q7z7PMV1.js}

@@ -1,9 +1,9 @@
 import { u as e } from "./reasons-Co5CzjKq.js";
 import { createChangeEventDetails as t } from "./internals/createBaseUIEventDetails.js";
-import { c as n, d as r, f as i, i as a, n as o, o as s, p as c, r as l, t as u, u as d } from "./dom-BEAeQ9Eb.js";
-import { a as f, o as p } from "./FloatingTree-23B7KKPD.js";
-import { c as m, g as h, h as g, l as _, m as v, p as y, s as b, u as x } from "./popupStateMapping-C6jQ_LKo.js";
-import { applyRef as ee, createComponent as S, memo as C } from "@solidjs/web";
+import { a as n, d as r, f as i, i as a, l as o, m as s, n as c, p as l, r as u, s as d, t as f } from "./dom-lDdayFF_.js";
+import { a as p, o as m } from "./FloatingTree-23B7KKPD.js";
+import { c as h, g, h as _, l as v, m as y, p as b, s as x, u as S } from "./popupStateMapping-nhukB8NK.js";
+import { applyRef as ee, createComponent as C, memo as te } from "@solidjs/web";
 import { Show as w, createEffect as T, createMemo as E, untrack as D } from "solid-js";
 //#region src/internals/overlay/markOthers.ts
 var O = {
@@ -14,7 +14,7 @@ var O = {
 	"aria-hidden": /* @__PURE__ */ new WeakSet()
 }, A = /* @__PURE__ */ new WeakMap(), j = 0;
 function M(e) {
-	return e ? d(e) ? e.host : M(e.parentNode) : null;
+	return e ? r(e) ? e.host : M(e.parentNode) : null;
 }
 function N(e, t) {
 	return t.map((t) => {
@@ -39,7 +39,7 @@ function F(e, t, n) {
 	return i(e), r;
 }
 function I(e, t = {}) {
-	let { ariaHidden: n = !1, inert: r = !1, mark: i = !0 } = t, a = c(e[0]).body, o = N(a, e), s = i ? F(a, P(o), new Set(o)) : [], l = [], u = [], d = r ? "inert" : n ? "aria-hidden" : null;
+	let { ariaHidden: n = !1, inert: r = !1, mark: i = !0 } = t, a = s(e[0]).body, o = N(a, e), c = i ? F(a, P(o), new Set(o)) : [], l = [], u = [], d = r ? "inert" : n ? "aria-hidden" : null;
 	if (d) {
 		let e = N(a, Array.from(a.querySelectorAll("[aria-live]"))), t = o.concat(e);
 		F(a, P(t), new Set(t)).forEach((e) => {
@@ -47,7 +47,7 @@ function I(e, t = {}) {
 			O[d].set(e, r), u.push(e), r === 1 && n && k[d].add(e), n || e.setAttribute(d, d === "inert" ? "" : "true");
 		});
 	}
-	s.forEach((e) => {
+	c.forEach((e) => {
 		let t = (A.get(e) ?? 0) + 1;
 		A.set(e, t), l.push(e), t === 1 && e.setAttribute("data-base-ui-inert", "");
 	}), j += 1;
@@ -83,24 +83,24 @@ function H() {
 function U(e) {
 	return typeof e == "function" ? e() : e ?? null;
 }
-function te(e) {
-	return e ? v(e) ? e : g(e)[0] ?? e : null;
+function ne(e) {
+	return e ? y(e) ? e : _(e)[0] ?? e : null;
 }
 function W(e) {
 	if (e.hasAttribute("tabindex") && !e.hasAttribute("data-tabindex") || !e.getAttribute("role")?.includes("dialog")) return;
-	let t = m(e).some((e) => {
+	let t = h(e).some((e) => {
 		let t = e.getAttribute("data-tabindex") || "";
-		return v(e) || e.hasAttribute("data-tabindex") && !t.startsWith("-");
+		return y(e) || e.hasAttribute("data-tabindex") && !t.startsWith("-");
 	}) ? "-1" : "0";
 	(e.getAttribute("tabindex") !== t || e.getAttribute("data-tabindex") !== t) && (e.setAttribute("tabindex", t), e.setAttribute("data-tabindex", t));
 }
-function ne(e, t) {
+function re(e, t) {
 	return e.type === "keydown" || e.type === "keyup" ? "keyboard" : e.type === "focus" || e.type === "focusin" || e.type === "focusout" || e.type === "blur" ? t || "keyboard" : "pointerType" in e ? e.pointerType || "keyboard" : "touches" in e ? "touch" : e.type.includes("mouse") || e.type === "click" ? t || (e.detail === 0 ? "keyboard" : "mouse") : "";
 }
-function re(e) {
+function ie(e) {
 	return e.detail === 0 && !e.pointerType;
 }
-function ie(e) {
+function ae(e) {
 	return e.width === 0 && e.height === 0;
 }
 function G(e, t = {}) {
@@ -112,16 +112,16 @@ function G(e, t = {}) {
 		z === n && (cancelAnimationFrame(n), z = 0);
 	};
 }
-function K(d) {
-	let m = b(), O = !1, k = !1, A = null, j = "", M = "", N, P = 0, F = () => d.context.track().open, L = () => d.referenceElement?.() ?? d.context.track().domReferenceElement, R = () => d.context.track().floatingElement, z = E(() => a(R())), B = () => d.disabled ?? !1, K = () => d.modal ?? !0, J = () => d.closeOnFocusOut ?? !0, Y = () => d.getInsideElements?.().filter((e) => e != null) ?? [], X = () => r(L()) && d.initialFocus === !1, Z = (e = z()) => e ? g(e) : [], Q = () => d.context.context.nodeId;
+function K(r) {
+	let h = x(), O = !1, k = !1, A = null, j = "", M = "", N, P = 0, F = () => r.context.track().open, L = () => r.referenceElement?.() ?? r.context.track().domReferenceElement, R = () => r.context.track().floatingElement, z = E(() => n(R())), B = () => r.disabled ?? !1, K = () => r.modal ?? !0, J = () => r.closeOnFocusOut ?? !0, Y = () => r.getInsideElements?.().filter((e) => e != null) ?? [], X = () => i(L()) && r.initialFocus === !1, Z = (e = z()) => e ? _(e) : [], Q = () => r.context.context.nodeId;
 	T(() => ({
 		disabled: B(),
 		modal: K(),
 		focusElement: z()
 	}), (e) => {
 		if (e.disabled || !e.modal || !e.focusElement) return;
-		let t = c(e.focusElement), n = (n) => {
-			n.key === "Tab" && o(e.focusElement, u(t)) && Z().length === 0 && !X() && (n.preventDefault(), n.stopPropagation());
+		let t = s(e.focusElement), n = (n) => {
+			n.key === "Tab" && c(e.focusElement, f(t)) && Z().length === 0 && !X() && (n.preventDefault(), n.stopPropagation());
 		};
 		return t.addEventListener("keydown", n), () => t.removeEventListener("keydown", n);
 	}), T(() => ({
@@ -130,8 +130,8 @@ function K(d) {
 		focusElement: z()
 	}), (e) => {
 		if (e.disabled || !e.open || !e.focusElement) return;
-		let t = c(e.focusElement), n = (e) => {
-			let t = l(e);
+		let t = s(e.focusElement), n = (e) => {
+			let t = a(e);
 			M = e.pointerType || "keyboard", t?.closest("[data-base-ui-click-trigger]") && (k = !0, clearTimeout(N), N = setTimeout(() => {
 				k = !1;
 			}));
@@ -148,29 +148,29 @@ function K(d) {
 		floating: R(),
 		focusElement: z(),
 		modal: K(),
-		restoreFocus: d.restoreFocus,
-		tree: d.tree
+		restoreFocus: r.restoreFocus,
+		tree: r.tree
 	}), (n) => {
 		if (n.disabled || !n.closeOnFocusOut || !n.reference && !n.floating) return;
-		let r = c(n.focusElement), i = () => {
+		let i = s(n.focusElement), o = () => {
 			k = !0, clearTimeout(N), N = setTimeout(() => {
 				k = !1;
 			});
-		}, a = (e) => {
-			let t = l(e);
-			v(t) && (A = t);
-		}, h = (i) => {
-			let a = i.relatedTarget, c = l(i);
-			n.modal && !a && c && o(n.floating, c) && V(c), queueMicrotask(() => {
-				let l = !!(a?.hasAttribute("data-base-ui-focus-guard") && [
-					m?.beforeInside(),
-					m?.afterInside(),
-					m?.beforeOutside(),
-					m?.afterOutside(),
-					U(d.previousFocusableElement),
-					U(d.nextFocusableElement)
-				].includes(a)), h = d.context.context.triggerElements, g = !(o(n.reference, a) || o(n.floating, a) || o(a, n.floating) || o(m?.portalNode(), a) || Y().some((e) => e === a || o(e, a)) || h.hasMatchingElement((e) => o(e, a)) || l || n.tree && (p(n.tree.nodes, Q()).some((e) => o(e.context?.state.floatingElement, a) || o(e.context?.state.domReferenceElement, a)) || f(n.tree.nodes, Q()).some((e) => e.context?.state.floatingElement === a || e.context?.state.domReferenceElement === a)));
-				if (i.currentTarget === n.reference && n.focusElement && W(n.focusElement), n.restoreFocus && i.currentTarget !== n.reference && !s(c) && u(r) === r.body && n.focusElement) {
+		}, l = (e) => {
+			let t = a(e);
+			y(t) && (A = t);
+		}, g = (o) => {
+			let s = o.relatedTarget, l = a(o);
+			n.modal && !s && l && c(n.floating, l) && V(l), queueMicrotask(() => {
+				let a = !!(s?.hasAttribute("data-base-ui-focus-guard") && [
+					h?.beforeInside(),
+					h?.afterInside(),
+					h?.beforeOutside(),
+					h?.afterOutside(),
+					U(r.previousFocusableElement),
+					U(r.nextFocusableElement)
+				].includes(s)), g = r.context.context.triggerElements, _ = !(u(n.reference, s) || u(n.floating, s) || c(s, n.floating) || c(h?.portalNode(), s) || Y().some((e) => e === s || c(e, s)) || g.hasMatchingElement((e) => c(e, s)) || a || n.tree && (m(n.tree.nodes, Q()).some((e) => u(e.context?.state.floatingElement, s) || u(e.context?.state.domReferenceElement, s)) || p(n.tree.nodes, Q()).some((e) => e.context?.state.floatingElement === s || e.context?.state.domReferenceElement === s)));
+				if (o.currentTarget === n.reference && n.focusElement && W(n.focusElement), n.restoreFocus && o.currentTarget !== n.reference && !d(l) && f(i) === i.body && n.focusElement) {
 					if (n.focusElement.focus(), n.restoreFocus === "popup") {
 						cancelAnimationFrame(P), P = requestAnimationFrame(() => n.focusElement?.focus());
 						return;
@@ -178,11 +178,14 @@ function K(d) {
 					let e = Z();
 					((A && e.includes(A) ? A : null) ?? e[e.length - 1] ?? n.focusElement).focus();
 				}
-				(X() || !n.modal) && a && g && !k && (X() || a !== H()) && (O = !0, d.context.setOpen(!1, t(e, i)));
+				(X() || !n.modal) && s && _ && !k && (X() || s !== H()) && (O = !0, r.context.setOpen(!1, t(e, o)));
 			});
+		}, _ = (e) => {
+			let t = a(e);
+			!c(n.floating, t) && !c(n.reference, t) && (u(n.floating, t) || u(n.reference, t)) && g(e);
 		};
-		return n.reference && (n.reference.addEventListener("focusout", h), n.reference.addEventListener("pointerdown", i)), n.floating?.addEventListener("focusin", a), n.floating?.addEventListener("focusout", h), () => {
-			n.reference && (n.reference.removeEventListener("focusout", h), n.reference.removeEventListener("pointerdown", i)), n.floating?.removeEventListener("focusin", a), n.floating?.removeEventListener("focusout", h);
+		return i.addEventListener("focusout", _), n.reference && (n.reference.addEventListener("focusout", g), n.reference.addEventListener("pointerdown", o)), n.floating?.addEventListener("focusin", l), n.floating?.addEventListener("focusout", g), () => {
+			i.removeEventListener("focusout", _), n.reference && (n.reference.removeEventListener("focusout", g), n.reference.removeEventListener("pointerdown", o)), n.floating?.removeEventListener("focusin", l), n.floating?.removeEventListener("focusout", g);
 		};
 	}), T(() => ({
 		disabled: B(),
@@ -190,20 +193,20 @@ function K(d) {
 		floating: R(),
 		modal: K(),
 		untrapped: X(),
-		tree: d.tree,
+		tree: r.tree,
 		nodeId: Q(),
-		portalNode: m?.portalNode(),
-		beforeInside: m?.beforeInside(),
-		afterInside: m?.afterInside(),
-		beforeOutside: m?.beforeOutside(),
-		afterOutside: m?.afterOutside(),
+		portalNode: h?.portalNode(),
+		beforeInside: h?.beforeInside(),
+		afterInside: h?.afterInside(),
+		beforeOutside: h?.beforeOutside(),
+		afterOutside: h?.afterOutside(),
 		insideElements: Y(),
 		domReference: L(),
-		previous: U(d.previousFocusableElement),
-		next: U(d.nextFocusableElement)
+		previous: U(r.previousFocusableElement),
+		next: U(r.nextFocusableElement)
 	}), (e) => {
 		if (e.disabled || !e.open || !e.floating) return;
-		let t = Array.from(e.portalNode?.querySelectorAll("[data-base-ui-portal]") ?? []), n = (e.tree ? f(e.tree.nodes, e.nodeId) : []).find((e) => r(e.context?.state.domReferenceElement ?? null))?.context?.state.domReferenceElement, i = I([
+		let t = Array.from(e.portalNode?.querySelectorAll("[data-base-ui-portal]") ?? []), n = (e.tree ? p(e.tree.nodes, e.nodeId) : []).find((e) => i(e.context?.state.domReferenceElement ?? null))?.context?.state.domReferenceElement, r = I([
 			...[
 				e.portalNode,
 				e.floating,
@@ -227,43 +230,43 @@ function K(d) {
 			...t
 		].filter((e) => e != null));
 		return () => {
-			a(), i();
+			a(), r();
 		};
 	}), T(() => ({
 		open: F(),
 		disabled: B(),
 		focusElement: z(),
-		initialFocus: d.initialFocus ?? !0,
-		interactionType: d.openInteractionType ?? ""
+		initialFocus: r.initialFocus ?? !0,
+		interactionType: r.openInteractionType ?? ""
 	}), (e) => {
 		if (!e.open || e.disabled || !e.focusElement) return;
 		j = "", M = "";
-		let t = c(e.focusElement), n = u(t), r = () => {};
+		let t = s(e.focusElement), n = f(t), i = () => {};
 		return queueMicrotask(() => {
-			let i = e.initialFocus, a = typeof i == "function" ? i(e.interactionType) : i, s = q(a) ? a.current : a;
-			if (s === void 0 || s === !1 || o(e.focusElement, n)) return;
-			let c = () => Z(e.focusElement)[0] ?? e.focusElement, l = (s === !0 || s === null ? c() : s) ?? c(), f = o(e.focusElement, u(t));
-			r = G(l, {
-				preventScroll: l === e.focusElement,
+			let a = e.initialFocus, o = typeof a == "function" ? a(e.interactionType) : a, s = q(o) ? o.current : o;
+			if (s === void 0 || s === !1 || c(e.focusElement, n)) return;
+			let l = () => Z(e.focusElement)[0] ?? e.focusElement, u = (s === !0 || s === null ? l() : s) ?? l(), d = c(e.focusElement, f(t));
+			i = G(u, {
+				preventScroll: u === e.focusElement,
 				shouldFocus: () => {
-					if (!d.context.state.open) return !1;
-					if (f) return !0;
-					let n = u(t);
-					return n === l || !o(e.focusElement, n);
+					if (!r.context.state.open) return !1;
+					if (d) return !0;
+					let n = f(t);
+					return n === u || !c(e.focusElement, n);
 				}
 			});
-		}), () => r();
+		}), () => i();
 	}), T(() => ({
 		disabled: B(),
 		focusElement: z(),
-		interactionType: d.openInteractionType
+		interactionType: r.openInteractionType
 	}), (e) => {
 		if (e.disabled || !e.focusElement) return;
-		let t = c(e.focusElement), r = u(t), i = e.interactionType === null;
-		V(r);
-		let a = d.context.context.events.on("openchange", (e) => {
-			if (e.open || (j = ne(e.nativeEvent, M)), e.reason === "trigger-hover" && e.nativeEvent.type === "mouseleave" && (O = !0), e.reason === "outside-press") {
-				if (e.nested || e.nativeEvent.type === "click" && re(e.nativeEvent) || "pointerType" in e.nativeEvent && ie(e.nativeEvent)) O = !1;
+		let t = s(e.focusElement), n = f(t), i = e.interactionType === null;
+		V(n);
+		let a = r.context.context.events.on("openchange", (e) => {
+			if (e.open || (j = re(e.nativeEvent, M)), e.reason === "trigger-hover" && e.nativeEvent.type === "mouseleave" && (O = !0), e.reason === "outside-press") {
+				if (e.nested || e.nativeEvent.type === "click" && ie(e.nativeEvent) || "pointerType" in e.nativeEvent && ae(e.nativeEvent)) O = !1;
 				else {
 					let e = !1;
 					t.createElement("div").focus({ get preventScroll() {
@@ -274,11 +277,11 @@ function K(d) {
 		});
 		return () => {
 			a();
-			let e = u(t), s = d.context.state.floatingElement, c = D(Y), l = D(() => d.tree), f = o(s, e) || c.some((t) => t === e || o(t, e)) || !!(l && p(l.nodes, d.context.context.nodeId, !1).some((t) => o(t.context?.state.floatingElement, e))), m = D(() => d.returnFocus) ?? !0, h = typeof m == "function" ? m(j) : m, g = q(h) ? h.current : h;
+			let e = f(t), s = r.context.state.floatingElement, l = D(Y), u = D(() => r.tree), d = c(s, e) || l.some((t) => t === e || c(t, e)) || !!(u && m(u.nodes, r.context.context.nodeId, !1).some((t) => c(t.context?.state.floatingElement, e))), p = D(() => r.returnFocus) ?? !0, h = typeof p == "function" ? p(j) : p, g = q(h) ? h.current : h;
 			if (g === void 0 || g === !1) return;
-			let _ = d.context.state.domReferenceElement, v = _?.isConnected ? _ : null, y = r?.isConnected && r.localName !== "body" ? r : null, b = (i ? y ?? v : v ?? y) ?? H() ?? null, x = te(g === !0 || g === null ? b : g);
+			let _ = r.context.state.domReferenceElement, v = _?.isConnected ? _ : null, y = n?.isConnected && n.localName !== "body" ? n : null, b = (i ? y ?? v : v ?? y) ?? H() ?? null, x = ne(g === !0 || g === null ? b : g);
 			queueMicrotask(() => {
-				if (!O && n(x) && (x === e || e === t.body || f || typeof m != "boolean")) {
+				if (!O && o(x) && (x === e || e === t.body || d || typeof p != "boolean")) {
 					let e = { preventScroll: !0 };
 					j === "keyboard" && (e.focusVisible = !0), x.focus(e);
 				}
@@ -291,11 +294,11 @@ function K(d) {
 		floating: R()
 	}), (e) => {
 		if (e.disabled || e.open || !e.floating) return;
-		let t = u(c(e.floating));
-		i(t) && o(e.floating, t) && t.blur();
+		let t = f(s(e.floating));
+		l(t) && c(e.floating, t) && t.blur();
 	}), T(() => ({
 		disabled: B(),
-		portal: m,
+		portal: h,
 		modal: K(),
 		open: F(),
 		closeOnFocusOut: J(),
@@ -306,7 +309,7 @@ function K(d) {
 			open: e.open,
 			closeOnFocusOut: e.closeOnFocusOut,
 			domReference: e.reference,
-			onOpenChange: (e, t) => d.context.setOpen(e, t)
+			onOpenChange: (e, t) => r.context.setOpen(e, t)
 		}), () => e.portal?.setFocusManagerState(null);
 	}), T(() => ({
 		disabled: B(),
@@ -314,39 +317,39 @@ function K(d) {
 	}), (e) => {
 		!e.disabled && e.focusElement && W(e.focusElement);
 	});
-	let $ = E(() => !B() && (!K() || !X()) && !!(m || K()));
+	let $ = E(() => !B() && (!K() || !X()) && !!(h || K()));
 	return [
-		S(w, {
+		C(w, {
 			get when() {
 				return $();
 			},
 			get children() {
-				return S(h, {
+				return C(g, {
 					"data-type": "inside",
-					ref: [m?.setBeforeInside, d.beforeContentGuardRef],
+					ref: [h?.setBeforeInside, r.beforeContentGuardRef],
 					onFocus: (e) => {
 						if (K()) {
 							let e = Z();
 							G(e[e.length - 1]);
-						} else m?.portalNode() && (O = !1, y(e, m.portalNode()) ? _(L())?.focus() : (U(d.previousFocusableElement) ?? m.beforeOutside())?.focus());
+						} else h?.portalNode() && (O = !1, b(e, h.portalNode()) ? v(L())?.focus() : (U(r.previousFocusableElement) ?? h.beforeOutside())?.focus());
 					}
 				});
 			}
 		}),
-		C(() => d.children),
-		S(w, {
+		te(() => r.children),
+		C(w, {
 			get when() {
 				return $();
 			},
 			get children() {
-				return S(h, {
+				return C(g, {
 					"data-type": "inside",
 					ref(e) {
-						var t = m?.setAfterInside;
-						typeof t == "function" || Array.isArray(t) ? ee(t, e) : m && (m.setAfterInside = e);
+						var t = h?.setAfterInside;
+						typeof t == "function" || Array.isArray(t) ? ee(t, e) : h && (h.setAfterInside = e);
 					},
 					onFocus: (e) => {
-						K() ? G(Z()[0]) : m?.portalNode() && (J() && (O = !0), y(e, m.portalNode()) ? x(L())?.focus() : (U(d.nextFocusableElement) ?? m.afterOutside())?.focus());
+						K() ? G(Z()[0]) : h?.portalNode() && (J() && (O = !0), b(e, h.portalNode()) ? S(L())?.focus() : (U(r.nextFocusableElement) ?? h.afterOutside())?.focus());
 					}
 				});
 			}
@@ -354,7 +357,7 @@ function K(d) {
 	];
 }
 function q(e) {
-	return !!(e && typeof e == "object" && !n(e) && "current" in e);
+	return !!(e && typeof e == "object" && !o(e) && "current" in e);
 }
 //#endregion
 export { K as t };

package/dist/lib/client/{InternalBackdrop-cSK13gaM.js → InternalBackdrop-B8_lfUvf.js}

@@ -1,4 +1,4 @@
-import { m as e, p as t } from "./dom-BEAeQ9Eb.js";
+import { h as e, m as t } from "./dom-lDdayFF_.js";
 import { getNextElement as n, mergeProps as r, ref as i, runHydrationEvents as a, spread as o, template as s } from "@solidjs/web";
 import { createEffect as c, createSignal as l, omit as u } from "solid-js";
 //#region src/internals/overlay/scrollLock.ts