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

package/dist/lib/client/form-Bqq8wSLY.js

@@ -0,0 +1,109 @@
+import { t as e } from "./useRender-CxZ8PI-g.js";
+import { w as t } from "./reasons-Co5CzjKq.js";
+import { n, t as r } from "./resolveStyle-XcgAuaKR.js";
+import { createGenericEventDetails as i } from "./internals/createBaseUIEventDetails.js";
+import { composeEventHandlers as a, liveEventHandler as o } from "./internals/composeEventHandlers.js";
+import { t as s } from "./FormContext-CwLBtm_d.js";
+import { t as c } from "./form-types-DFBxc1LF.js";
+import { claimElement as l, createComponent as u, getNextElement as d, mergeProps as f, runHydrationEvents as p, spread as m, template as h } from "@solidjs/web";
+import { createEffect as g, createMemo as _, createSignal as v, omit as y, untrack as b } from "solid-js";
+//#region src/form/Form.tsx
+var x = /* @__PURE__ */ h("<form>"), S = Object.freeze({}), C = {};
+function w(h) {
+	let w = null, E = !1, D = !1, O = 0, k = /* @__PURE__ */ new Map(), A = h, j = b(() => A.errors), M = h, N = y(h, "actionsRef", "render", "class", "errors", "onFormSubmit", "onSubmit", "ref", "style", "validationMode"), [P, F] = v(b(() => A.errors) ?? S), I = _(() => A.validationMode ?? "onSubmit"), L = _(() => n(h.class, C)), R = e(h, () => C, (e) => (() => {
+		var t = d(x);
+		return l(t), m(t, e, !1), p(), t;
+	})()), z = _(() => r(h.style, C));
+	function B(e) {
+		return k.set(e.token, e), () => {
+			k.get(e.token) === e && k.delete(e.token);
+		};
+	}
+	function V() {
+		let e = {};
+		for (let t of k.values()) {
+			let n = t.name();
+			n && (e[n] = t.getValue());
+		}
+		return e;
+	}
+	function H(e = b(P)) {
+		let t = !1, n = null;
+		for (let r of k.values()) {
+			if (!r.isInvalid() && !c(e, r.name())) continue;
+			t = !0;
+			let i = r.getControl();
+			i && (!n || T(i, n)) && (n = i);
+		}
+		return n ? (n.focus(), n.tagName === "INPUT" && n.select(), !0) : t;
+	}
+	function U(e) {
+		e && F((t) => {
+			if (!Object.hasOwn(t, e)) return t;
+			let n = { ...t };
+			return delete n[e], n;
+		});
+	}
+	let W = { validate(e) {
+		if (e) {
+			for (let t of k.values()) if (t.name() === e) {
+				t.validate();
+				break;
+			}
+			return;
+		}
+		for (let e of k.values()) e.validate();
+	} }, G = a(o(() => M.onSubmit));
+	function K(e) {
+		D = !0, O += 1;
+		for (let e of k.values()) e.validate();
+		if (H()) {
+			e.preventDefault();
+			return;
+		}
+		E = !0, G.call(e.currentTarget, e);
+		let n = A.onFormSubmit;
+		n && (e.preventDefault(), n(V(), i(t, e)));
+	}
+	let q = {
+		errors: P,
+		validationMode: I,
+		submitAttempted: () => D,
+		submitCount: () => O,
+		formElement: () => w,
+		clearError: U,
+		registerField: B,
+		getFormValues: V
+	};
+	return g(() => A.errors, (e) => {
+		if (e === j) return;
+		j = e;
+		let t = e ?? S;
+		F(t), E && (E = !1, b(() => H(t)));
+	}), g(() => A.actionsRef, (e) => {
+		e?.(W);
+	}), u(s, {
+		value: q,
+		get children() {
+			return u(R, f({
+				ref: [((e) => {
+					w = e.tagName === "FORM" ? e : null;
+				}), M.ref],
+				get class() {
+					return L();
+				},
+				get style() {
+					return z();
+				},
+				novalidate: !0,
+				onSubmit: K
+			}, N));
+		}
+	});
+}
+function T(e, t) {
+	let n = e.compareDocumentPosition(t);
+	return (n & Node.DOCUMENT_POSITION_DISCONNECTED) === 0 && (n & Node.DOCUMENT_POSITION_FOLLOWING) !== 0;
+}
+//#endregion
+export { w as t };

package/dist/lib/client/index.js

@@ -1,45 +1,45 @@
 import { t as e } from "./useRender-CxZ8PI-g.js";
-import { t } from "./accordion-BFeZFpJZ.js";
-import { t as n } from "./tooltip-D-PkGco9.js";
-import { t as r } from "./preview-card-FTN_aafM.js";
-import { t as i } from "./alert-dialog-BxGUF8_Q.js";
+import { t } from "./accordion-CA2DfX67.js";
+import { t as n } from "./tooltip-h2r2_Xuo.js";
+import { t as r } from "./preview-card-Dtu8AnBN.js";
+import { t as i } from "./alert-dialog-Bup88Dpx.js";
 import { n as a } from "./DirectionContext-BwMabICS.js";
-import { t as o } from "./autocomplete-C9QA98XD.js";
-import { t as s } from "./avatar-BQoEzzav.js";
-import { t as c } from "./button-akYS6FyY.js";
-import { t as l } from "./checkbox-DOXtzBhA.js";
-import { t as u } from "./checkbox-group-CwMDoSTK.js";
-import { t as d } from "./collapsible-t8YReaIp.js";
-import { n as f, t as p } from "./combobox-6DhOdzit.js";
-import { t as m } from "./context-menu-CplDpqmi.js";
+import { t as o } from "./autocomplete-oyy_uRpU.js";
+import { t as s } from "./avatar-DNZ4fnBd.js";
+import { t as c } from "./button-BJZYmCVv.js";
+import { t as l } from "./checkbox-sQHYTbpB.js";
+import { t as u } from "./checkbox-group-DGyrciZJ.js";
+import { t as d } from "./collapsible-BENbFFCc.js";
+import { n as f, t as p } from "./combobox-BGH8QLXH.js";
+import { t as m } from "./context-menu-xQ1sBCET.js";
 import { t as h } from "./Separator-D5oJzlA3.js";
 import { t as g } from "./csp-provider-C7nRHDKK.js";
 import { t as _ } from "./direction-provider-DYhRN-8f.js";
-import { t as v } from "./dialog-B9tR9X48.js";
-import { t as y } from "./drawer-dyr3_sKQ.js";
-import { t as b } from "./field-CjUAjp1m.js";
+import { t as v } from "./dialog-C0EF0a5u.js";
+import { t as y } from "./drawer-uKoNBwDU.js";
+import { t as b } from "./field-DIMrgpBW.js";
 import { t as x } from "./fieldset-Byqk3noT.js";
-import { t as S } from "./form-6Ne_bWQX.js";
-import { t as C } from "./input-_QHvSSqM.js";
+import { t as S } from "./form-Bqq8wSLY.js";
+import { t as C } from "./input-YthuKwIE.js";
 import { t as w } from "./meter-BvWdppcx.js";
-import { t as T } from "./menu-DLqUBmMK.js";
-import { t as E } from "./menubar-DhPRUQZ6.js";
-import { t as D } from "./navigation-menu-mVHV41Ky.js";
-import { t as O } from "./number-field-DusLw_0X.js";
-import { t as k } from "./otp-field-D-B9tZzF.js";
-import { t as A } from "./popover-Cv7xn0nW.js";
+import { t as T } from "./menu-4rNLN6aX.js";
+import { t as E } from "./menubar-nFQGtNmY.js";
+import { t as D } from "./navigation-menu-BbRyun3a.js";
+import { t as O } from "./number-field-hT_H0hVu.js";
+import { t as k } from "./otp-field-lsy2iGID.js";
+import { t as A } from "./popover-Cmvmuf1L.js";
 import { t as j } from "./progress-AVKxvgpc.js";
-import { t as M } from "./radio-DA_oZhQT.js";
-import { t as N } from "./radio-group-CWtQxWDl.js";
-import { t as P } from "./scroll-area-NCr49LkD.js";
-import { t as F } from "./select-DSPJt7Rk.js";
+import { t as M } from "./radio-CeCU-Qqi.js";
+import { t as N } from "./radio-group-NbuJvjQe.js";
+import { t as P } from "./scroll-area-DqbvoAd7.js";
+import { t as F } from "./select-Dad51Xbn.js";
 import "./separator/index.js";
-import { t as I } from "./slider-CWq9hxFf.js";
-import { t as L } from "./switch-CPl7QHKI.js";
-import { t as R } from "./tabs-Bn4rZDyZ.js";
-import { n as z, r as B, t as V } from "./toast-7LdqZWOs.js";
-import { t as H } from "./toolbar-DcCi3HNp.js";
-import { t as U } from "./toggle-CsC37e3e.js";
-import { t as W } from "./toggle-group-DSWb9HxN.js";
+import { t as I } from "./slider-CLSKFq_M.js";
+import { t as L } from "./switch-Bzuu5EIg.js";
+import { t as R } from "./tabs-DWiBDv8D.js";
+import { n as z, r as B, t as V } from "./toast-DmtPJW2k.js";
+import { t as H } from "./toolbar-BXT_g-oX.js";
+import { t as U } from "./toggle-CAe-Z8Xn.js";
+import { t as W } from "./toggle-group-BbQg5s-m.js";
 import "./use-render/index.js";
 export { t as Accordion, i as AlertDialog, o as Autocomplete, s as Avatar, c as Button, g as CSPProvider, l as Checkbox, u as CheckboxGroup, d as Collapsible, p as Combobox, m as ContextMenu, v as Dialog, _ as DirectionProvider, y as Drawer, b as Field, x as Fieldset, S as Form, C as Input, T as Menu, E as Menubar, w as Meter, D as NavigationMenu, O as NumberField, k as OTPField, A as Popover, r as PreviewCard, j as Progress, M as Radio, N as RadioGroup, P as ScrollArea, F as Select, h as Separator, I as Slider, L as Switch, R as Tabs, B as Toast, U as Toggle, W as ToggleGroup, H as Toolbar, n as Tooltip, f as createComboboxItems, V as createToastManager, a as useDirection, e as useRender, z as useToastManager };

package/dist/lib/client/input/index.js

@@ -1,2 +1,2 @@
-import { t as e } from "../input-_QHvSSqM.js";
+import { t as e } from "../input-YthuKwIE.js";
 export { e as Input };

package/dist/lib/client/{input-_QHvSSqM.js → input-YthuKwIE.js}

@@ -1,4 +1,4 @@
-import { t as e } from "./FieldControl-C0PATyKV.js";
+import { t as e } from "./FieldControl-eDe-Jnp9.js";
 //#region src/input/Input.tsx
 function t(t) {
 	return e(t);

package/dist/lib/client/internals/composeEventHandlers.js

@@ -1,15 +1,21 @@
 //#region src/internals/composeEventHandlers.ts
 function e(...e) {
-	return function(n) {
-		let i = r(n);
-		for (let n of e) if (t(n(), this, i), i.baseUIHandlerPrevented) break;
+	return function(t) {
+		let i = r(t);
+		for (let t of e) {
+			if (t && typeof t == "object" && "getHandler" in t) {
+				let e = t.getHandler;
+				t = e();
+			}
+			if (n(t, this, i), i.baseUIHandlerPrevented) break;
+		}
 	};
 }
-function t(e, t, r) {
-	typeof e == "function" ? Reflect.apply(e, t, [r]) : n(e) && Reflect.apply(e[0], t, [e[1], r]);
+function t(e) {
+	return { getHandler: e };
 }
-function n(e) {
-	return Array.isArray(e) && e.length === 2 && typeof e[0] == "function";
+function n(e, t, n) {
+	typeof e == "function" ? Reflect.apply(e, t, [n]) : Array.isArray(e) && e.length === 2 && typeof e[0] == "function" && Reflect.apply(e[0], t, [e[1], n]);
 }
 function r(e) {
 	let t = e;
@@ -47,4 +53,4 @@ function a(e) {
 	});
 }
 //#endregion
-export { e as composeEventHandlers, r as makeEventPreventable };
+export { e as composeEventHandlers, t as liveEventHandler, r as makeEventPreventable };

package/dist/lib/client/internals/field-root-context/index.js

@@ -1,2 +1,2 @@
-import { n as e, t } from "../../FieldRootContext-izCEh80D.js";
-export { t as FieldRootContext, e as useFieldRootContext };
+import { n as e, r as t } from "../../FieldRootContext-D3fuVjs3.js";
+export { e as FieldRootContext, t as useFieldRootContext };

package/dist/lib/client/{mergeStyleValue-DhTA9Nwe.js → isSolidAccessor-BH_FevwH.js}

@@ -32,15 +32,4 @@ function c(t) {
 	return typeof t == "function" && t.name === "bound read" && Object.prototype.hasOwnProperty.call(t, e);
 }
 //#endregion
-//#region src/internals/mergeStyleValue.ts
-function l(e, t) {
-	return typeof t == "string" ? `${u(e)}${t}` : t ? {
-		...e,
-		...t
-	} : e;
-}
-function u(e) {
-	return Object.entries(e).filter((e) => e[1] != null).map(([e, t]) => `${e}:${t};`).join("");
-}
-//#endregion
-export { t as a, o as c, n as i, r as l, c as n, i as o, s as r, a as s, l as t };
+export { i as a, r as c, t as i, s as n, a as o, n as r, o as s, c as t };

package/dist/lib/client/menu/index.js

@@ -1,2 +1,2 @@
-import { t as e } from "../menu-DLqUBmMK.js";
+import { t as e } from "../menu-4rNLN6aX.js";
 export { e as Menu };

package/dist/lib/client/{menu-DLqUBmMK.js → menu-4rNLN6aX.js}

@@ -4,58 +4,58 @@ import { getStateAttributesProps as n } from "./internals/getStateAttributesProp
 import { M as r, P as i, t as ee, u as a } from "./reasons-Co5CzjKq.js";
 import { n as te, t as ne } from "./resolveStyle-XcgAuaKR.js";
 import { createChangeEventDetails as o } from "./internals/createBaseUIEventDetails.js";
-import { composeEventHandlers as s } from "./internals/composeEventHandlers.js";
-import { n as re } from "./dom-BEAeQ9Eb.js";
-import { t as c } from "./PopupViewport-IS4XU03s.js";
-import { n as l } from "./PopupStore-Du0O57fL.js";
-import { r as ie, t as ae } from "./safePolygon-DJG0VIVo.js";
-import { i as oe } from "./popupStateMapping-C6jQ_LKo.js";
-import { i as se, n as u, t as d } from "./PopupHandle-CQI6Om1Z.js";
-import { t as ce } from "./TriggerFocusGuards-Cs8LVBj5.js";
-import { a as le, i as ue, n as de, r as f, t as fe } from "./buttonSemantics-paljfpOX.js";
-import { n as p } from "./DirectionContext-BwMabICS.js";
-import { C as m, _ as h, a as g, c as _, d as v, f as pe, g as y, h as b, i as me, l as he, m as x, n as S, o as C, p as w, r as T, s as E, t as D, u as ge, v as O, w as k, x as A, y as j } from "./MenuSubmenuTrigger-yfncqM-D.js";
-import { n as _e } from "./MenubarContext-BYt3fkt-.js";
+import { composeEventHandlers as s, liveEventHandler as c } from "./internals/composeEventHandlers.js";
+import { n as l } from "./dom-lDdayFF_.js";
+import { t as u } from "./PopupViewport-BanYHrD-.js";
+import { n as re } from "./PopupStore-BjRwcvbG.js";
+import { r as ie, t as ae } from "./safePolygon-DVAR5dQD.js";
+import { i as oe } from "./popupStateMapping-nhukB8NK.js";
+import { i as se, n as d, t as f } from "./PopupHandle-DyX5gY1e.js";
+import { t as ce } from "./TriggerFocusGuards-Fzspp3Y1.js";
+import { a as le, i as ue, n as de, r as p, t as fe } from "./buttonSemantics-paljfpOX.js";
+import { n as m } from "./DirectionContext-BwMabICS.js";
+import { C as h, _ as pe, a as g, c as _, d as v, f as me, g as y, h as b, i as he, l as ge, m as x, n as S, o as C, p as w, r as T, s as E, t as D, u as _e, v as O, w as k, x as A, y as j } from "./MenuSubmenuTrigger-DMb5CwTF.js";
+import { n as ve } from "./MenubarContext-BYt3fkt-.js";
 import { t as M } from "./Separator-D5oJzlA3.js";
-import { createComponent as N, getNextElement as P, memo as ve, mergeProps as F, runHydrationEvents as I, spread as L, template as R } from "@solidjs/web";
-import { Show as z, createEffect as B, createMemo as V, createSignal as ye, createUniqueId as be, omit as xe, onCleanup as Se, untrack as H } from "solid-js";
+import { createComponent as N, getNextElement as P, memo as ye, mergeProps as F, runHydrationEvents as I, spread as L, template as R } from "@solidjs/web";
+import { Show as z, createEffect as B, createMemo as V, createSignal as be, createUniqueId as xe, omit as Se, onCleanup as Ce, untrack as H } from "solid-js";
 //#region src/menu/trigger/MenuTrigger.tsx
-var Ce = /* @__PURE__ */ R("<button>");
+var we = /* @__PURE__ */ R("<button>");
 function U(e) {
-	let c = m(!0), u = _e(!0), d = e;
-	if (!c && !H(() => d.handle)) throw Error("Base UI: <Menu.Trigger> must be either used within a <Menu.Root> component or provided with a handle.");
-	let p = e, h = u ? H(() => u.createTriggerId()) : `base-ui-${be()}`, g = V(() => d.id || h), _ = V(() => d.nativeButton ?? !0), v = V(() => d.openOnHover ?? !!u?.hasSubmenuOpen()), pe = V(() => d.delay ?? 100), y = V(() => d.closeDelay ?? 0), [b, me] = ye(null, { ownedWrite: !0 }), he = se(() => d.handle), x = V(() => he() ?? c?.store), S = V(() => {
+	let u = h(!0), d = ve(!0), f = e;
+	if (!u && !H(() => f.handle)) throw Error("Base UI: <Menu.Trigger> must be either used within a <Menu.Root> component or provided with a handle.");
+	let m = e, pe = d ? H(() => d.createTriggerId()) : `base-ui-${xe()}`, g = V(() => f.id || pe), _ = V(() => f.nativeButton ?? !0), v = V(() => f.openOnHover ?? !!d?.hasSubmenuOpen()), me = V(() => f.delay ?? 100), y = V(() => f.closeDelay ?? 0), [b, he] = be(null, { ownedWrite: !0 }), ge = se(() => f.handle), x = V(() => ge() ?? u?.store), S = V(() => {
 		let e = x();
 		return e instanceof k ? e : void 0;
 	}), C = () => {
-		let e = d.handle?.store;
+		let e = f.handle?.store;
 		return e instanceof k ? e : S();
-	}, w = V(() => !!(d.disabled || S()?.disabled() || u?.disabled())), T = V(() => {
+	}, w = V(() => !!(f.disabled || S()?.disabled() || d?.disabled())), T = V(() => {
 		let e = x();
 		return !!(e?.open() && e.activeTriggerId() === g());
 	}), E = V(() => ({
 		disabled: w(),
 		open: T()
-	})), D = V(() => te(e.class, E())), O = V(() => ne(e.style, E())), A = V(() => n(E(), oe)), j = xe(p, "render", "class", "closeDelay", "delay", "disabled", "handle", "id", "nativeButton", "onClick", "onBlur", "onFocus", "onKeyDown", "onKeyUp", "onMouseDown", "onMouseMove", "onPointerDown", "openOnHover", "payload", "ref", "style"), M = "", R, U, W = !1, G = !1, K, q = !1, J = !1, Y, X = u ? {
+	})), D = V(() => te(e.class, E())), O = V(() => ne(e.style, E())), A = V(() => n(E(), oe)), j = Se(m, "render", "class", "closeDelay", "delay", "disabled", "handle", "id", "nativeButton", "onClick", "onBlur", "onFocus", "onKeyDown", "onKeyUp", "onMouseDown", "onMouseMove", "onPointerDown", "openOnHover", "payload", "ref", "style"), M = "", R, U, W = !1, G = !1, K, q = !1, J = !1, Y, X = d ? {
 		token: Symbol("MenubarTrigger"),
 		order: 0,
 		element: b,
 		disabled: w
 	} : void 0;
 	if (X) {
-		let e = u.registerTrigger(X);
+		let e = d.registerTrigger(X);
 		B(() => ({
 			disabled: w(),
 			element: b()
-		}), () => u.notifyItemChange()), Se(e);
+		}), () => d.notifyItemChange()), Ce(e);
 	}
-	l(x, g, b, () => ({
-		payload: d.payload,
+	re(x, g, b, () => ({
+		payload: f.payload,
 		closeDelay: y()
 	})), B(() => ({
 		store: S(),
 		id: g(),
-		menubar: u
+		menubar: d
 	}), (e) => {
 		if (!e.store) return;
 		let t = H(() => e.store.registerMenubarTrigger(e.id, e.menubar));
@@ -68,7 +68,7 @@ function U(e) {
 			W = !1;
 		}, 500));
 	});
-	function we(e, t) {
+	function Te(e, t) {
 		clearTimeout(R), e.allowMouseUpTrigger = !1, R = setTimeout(() => {
 			e.allowMouseUpTrigger = !0;
 		}, 200), Y?.();
@@ -83,26 +83,26 @@ function U(e) {
 	}
 	function Z(e, t) {
 		e.context.triggerElements.add(g(), t), e.forwardTriggerData(g(), t, {
-			payload: d.payload,
+			payload: f.payload,
 			closeDelay: y()
-		}), e.forwardMenubarTrigger(g(), u), e.activateMenubarTrigger(g());
+		}), e.forwardMenubarTrigger(g(), d), e.activateMenubarTrigger(g());
 	}
-	function Te(e) {
+	function Ee(e) {
 		let t = C(), n = b();
 		if (!t || !n || e.button !== 0) return;
 		G = !0;
 		let r = T();
-		if (Z(t, n), u && r) {
+		if (Z(t, n), d && r) {
 			G = !1;
 			return;
 		}
-		if (r || we(t, n), t.setOpenMethod(M || "mouse"), r && W) {
+		if (r || Te(t, n), t.setOpenMethod(M || "mouse"), r && W) {
 			t.setOpen(!0, o(i, e, n));
 			return;
 		}
 		t.setOpen(!r, o(i, e, n));
 	}
-	function Ee(e) {
+	function De(e) {
 		if (q && e !== K && e.detail === 0) {
 			q = !1;
 			return;
@@ -116,34 +116,34 @@ function U(e) {
 		let t = C(), n = b();
 		!t || !n || (Z(t, n), t.setOpenMethod("keyboard"), t.setPendingFocus("first"), t.setOpen(!T(), o(i, e, n)));
 	}
-	function De(e) {
-		!_() || e.key !== "Enter" || e.target !== e.currentTarget || (e.preventDefault(), e.preventBaseUIHandler(), q = !0, J = !0, ge(e.currentTarget, e, 0, (e) => {
+	function Oe(e) {
+		!_() || e.key !== "Enter" || e.target !== e.currentTarget || (e.preventDefault(), e.preventBaseUIHandler(), q = !0, J = !0, _e(e.currentTarget, e, 0, (e) => {
 			K = e;
-		}), J = !1, K.baseUIHandlerPrevented || Ee(K), setTimeout(() => {
+		}), J = !1, K.baseUIHandlerPrevented || De(K), setTimeout(() => {
 			q = !1, K = void 0;
 		}));
 	}
-	function Oe(e) {
+	function ke(e) {
 		let t = C();
 		if (!t) return;
 		let n = t.state[t.activeTriggerId() === g() ? "activeTriggerProps" : "inactiveTriggerProps"].onKeyDown;
 		typeof n == "function" && n(e);
 	}
-	function ke(e) {
+	function Ae(e) {
 		C()?.handleTriggerKeyDown(e, e.currentTarget), e.defaultPrevented && e.key.startsWith("Arrow") && e.preventBaseUIHandler();
 	}
-	function Ae(e) {
-		X && u.setActiveTrigger(X);
+	function je(e) {
+		X && d.setActiveTrigger(X);
 		let t = C(), n = b(), i = e.relatedTarget;
-		if (t?.open() && i?.hasAttribute("data-base-ui-focus-guard") && re(t.state.positionerElement, i)) {
+		if (t?.open() && i?.hasAttribute("data-base-ui-focus-guard") && l(t.state.positionerElement, i)) {
 			t.setOpen(!1, o(a, e));
 			return;
 		}
-		!u || !t || !n || w() || T() || !u.hasSubmenuOpen() || (Z(t, n), t.setOpenMethod("keyboard"), t.setPendingFocus("first"), t.setOpen(!0, o(r, e, n)));
+		!d || !t || !n || w() || T() || !d.hasSubmenuOpen() || (Z(t, n), t.setOpenMethod("keyboard"), t.setPendingFocus("first"), t.setOpen(!0, o(r, e, n)));
 	}
-	let je = s(() => H(() => w() ? f : void 0), () => d.onClick, () => Ee), Me = s(() => d.onFocus, () => Ae), Ne = s(() => d.onBlur), Pe = s(() => H(() => w() ? le : void 0), () => d.onMouseDown, () => Te), Fe = s(() => d.onMouseMove, () => () => S()?.setAllowMouseEnter(!0)), Ie = s(() => H(() => w() ? f : void 0), () => d.onPointerDown, () => (e) => {
+	let Me = s(c(() => H(() => w() ? p : void 0)), c(() => f.onClick), De), Ne = s(c(() => f.onFocus), je), Pe = s(c(() => f.onBlur)), Fe = s(c(() => H(() => w() ? le : void 0)), c(() => f.onMouseDown), Ee), Ie = s(c(() => f.onMouseMove), () => S()?.setAllowMouseEnter(!0)), Le = s(c(() => H(() => w() ? p : void 0)), c(() => f.onPointerDown), (e) => {
 		M = e.pointerType || "";
-	}), Le = s(() => H(() => w() ? ue : void 0), () => d.onKeyDown, () => Oe, () => ke, () => De, () => H(() => _() ? void 0 : fe)), Re = s(() => H(() => w() ? le : void 0), () => d.onKeyUp, () => H(() => _() ? void 0 : de));
+	}), Re = s(c(() => H(() => w() ? ue : void 0)), c(() => f.onKeyDown), ke, Ae, Oe, c(() => H(() => _() ? void 0 : fe))), ze = s(c(() => H(() => w() ? le : void 0)), c(() => f.onKeyUp), c(() => H(() => _() ? void 0 : de)));
 	function Q(e) {
 		let t = H(() => e.store);
 		return ie({
@@ -152,20 +152,20 @@ function U(e) {
 			floating: () => t.track().positionerElement,
 			tree: () => t.tree(),
 			enabled: () => !w() && v() && t.hoverEnabled(),
-			floatingEnabled: () => !u && !w() && v() && t.hoverEnabled(),
+			floatingEnabled: () => !d && !w() && v() && t.hoverEnabled(),
 			delay: () => ({ close: y() }),
-			restMs: () => u ? 0 : pe(),
-			restOnly: () => !u,
-			handleClose: () => ae({ blockPointerEvents: !u }),
+			restMs: () => d ? 0 : me(),
+			restOnly: () => !d,
+			handleClose: () => ae({ blockPointerEvents: !d }),
 			mouseOnly: () => !0,
-			shouldOpen: () => !u || u.hasSubmenuOpen() && !T()
+			shouldOpen: () => !d || d.hasSubmenuOpen() && !T()
 		}), null;
 	}
-	let ze = t(e, () => E(), (e) => (() => {
-		var t = P(Ce);
+	let Be = t(e, () => E(), (e) => (() => {
+		var t = P(we);
 		return L(t, e, !1), I(), t;
-	})()), $ = N(ze, F({
-		ref: [((e) => me(e)), d.ref],
+	})()), $ = N(Be, F({
+		ref: [((e) => he(e)), f.ref],
 		get id() {
 			return g();
 		},
@@ -173,13 +173,13 @@ function U(e) {
 			return _() ? "button" : void 0;
 		},
 		get role() {
-			return u ? "menuitem" : _() ? void 0 : "button";
+			return d ? "menuitem" : _() ? void 0 : "button";
 		},
 		get tabIndex() {
-			return X ? u.isTabStop(X) ? 0 : -1 : !_() && w() ? -1 : 0;
+			return X ? d.isTabStop(X) ? 0 : -1 : !_() && w() ? -1 : 0;
 		},
 		get disabled() {
-			return (ve(() => !!_())() ? w() : _()) || void 0;
+			return (ye(() => !!_())() ? w() : _()) || void 0;
 		},
 		get "aria-disabled"() {
 			return !_() && w() ? "true" : void 0;
@@ -201,18 +201,18 @@ function U(e) {
 		get style() {
 			return O();
 		},
-		onClick: je,
-		onBlur: Ne,
-		onFocus: Me,
-		onKeyDown: Le,
-		onKeyUp: Re,
-		onMouseDown: Pe,
-		onMouseMove: Fe,
-		onPointerDown: Ie
+		onClick: Me,
+		onBlur: Pe,
+		onFocus: Ne,
+		onKeyDown: Re,
+		onKeyUp: ze,
+		onMouseDown: Fe,
+		onMouseMove: Ie,
+		onPointerDown: Le
 	}, A, j));
-	return Se(() => {
+	return Ce(() => {
 		clearTimeout(R), clearTimeout(U), Y?.();
-	}), u ? [N(z, {
+	}), d ? [N(z, {
 		keyed: !0,
 		get when() {
 			return S();
@@ -249,26 +249,26 @@ function U(e) {
 //#region src/menu/viewport/MenuViewport.tsx
 var W = /* @__PURE__ */ R("<div>");
 function G(e) {
-	let r = m(), i = y(), ee = p(), a = e, o = e, [s, re] = ye({
+	let r = h(), i = y(), ee = m(), a = e, o = e, [s, c] = be({
 		activationDirection: void 0,
 		transitioning: !1
 	}, { ownedWrite: !0 }), l = V(() => ({
 		...s(),
 		instant: r.store.instantType()
-	})), ie = V(() => te(e.class, l())), ae = V(() => ne(e.style, l())), oe = V(() => n(l(), h)), se = xe(o, "render", "children", "class", "ref", "style"), u = t(e, () => l(), (e) => (() => {
+	})), re = V(() => te(e.class, l())), ie = V(() => ne(e.style, l())), ae = V(() => n(l(), pe)), oe = Se(o, "render", "children", "class", "ref", "style"), se = t(e, () => l(), (e) => (() => {
 		var t = P(W);
 		return L(t, e, !1), I(), t;
 	})());
-	return N(u, F({
+	return N(se, F({
 		ref: [a.ref],
 		get class() {
-			return ie();
+			return re();
 		},
 		get style() {
-			return ae();
+			return ie();
 		}
-	}, oe, se, { get children() {
-		return N(c, {
+	}, ae, oe, { get children() {
+		return N(u, {
 			get store() {
 				return r.store;
 			},
@@ -278,7 +278,7 @@ function G(e) {
 			get direction() {
 				return ee();
 			},
-			onStateChange: re,
+			onStateChange: c,
 			get children() {
 				return e.children;
 			}
@@ -287,9 +287,9 @@ function G(e) {
 }
 //#endregion
 //#region src/menu/store/MenuHandle.ts
-var K = class extends d {
+var K = class extends f {
 	constructor() {
-		super("Menu", !0, new u());
+		super("Menu", !0, new d());
 	}
 	open(e) {
 		this.openByTrigger(e);
@@ -311,16 +311,16 @@ var J = /* @__PURE__ */ e({
 	Backdrop: () => j,
 	CheckboxItem: () => _,
 	CheckboxItemIndicator: () => E,
-	Group: () => pe,
+	Group: () => me,
 	GroupLabel: () => v,
 	Handle: () => K,
-	Item: () => he,
+	Item: () => ge,
 	LinkItem: () => C,
 	Popup: () => x,
 	Portal: () => O,
 	Positioner: () => b,
 	RadioGroup: () => g,
-	RadioItem: () => me,
+	RadioItem: () => he,
 	RadioItemIndicator: () => T,
 	Root: () => A,
 	Separator: () => M,

package/dist/lib/client/menubar/index.js

@@ -1,2 +1,2 @@
-import { t as e } from "../menubar-DhPRUQZ6.js";
+import { t as e } from "../menubar-nFQGtNmY.js";
 export { e as Menubar };