@soroush.tech/design-system 2.0.0-rc.3 → 2.0.0-rc.5

package/dist/{MenuItem-DUn4IZKK.mjs → MenuItem-vXHGPK8g.mjs}

@@ -1,13 +1,14 @@
-import { a as src_exports, o as styled, t as createShouldForwardProp } from "./src-DLGYOJMh.mjs";
-import { t as themeDefault } from "./themeDefault-Z3KmyIbm.mjs";
-import { n as useDefaultProps, r as useTheme } from "./theme-Z9_QludW.mjs";
-import { t as Icon } from "./Icon-BihOAP4u.mjs";
-import { t as isRtl } from "./isRtl-BJDtm86G.mjs";
-import { a as useMenuListContext, n as getNextRow, r as getOwnRows, t as MenuList } from "./MenuList-B7msJ1IG.mjs";
-import { t as computePopoverPosition } from "./computePopoverPosition-BIprs_xo.mjs";
-import { Children, createContext, useCallback, useContext, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { a as src_exports, o as styled, t as createShouldForwardProp } from "./src-B-rNjHIL.mjs";
+import { n as useDefaultProps, r as useTheme } from "./theme-DyyZQFzQ.mjs";
+import { t as themeDefault } from "./themeDefault-BeZJzqJj.mjs";
+import { t as getSurfaceRadius } from "./getSurfaceRadius-B1QE_VLa.mjs";
+import { t as Icon } from "./Icon-XpXU-SuF.mjs";
+import { t as isRtl } from "./isRtl-DN-EdUlg.mjs";
+import { t as useAnchoredPlacement } from "./useAnchoredPlacement-COrXZxhm.mjs";
+import { a as useMenuListContext, n as getNextRow, r as getOwnRows, t as MenuList } from "./MenuList-CGZgfBno.mjs";
+import { Children, createContext, useCallback, useContext, useEffect, useId, useMemo, useRef, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
-//#region src/Menu/MenuPaper.ts
+// src/Menu/MenuPaper.ts
 const elevationSystem = (0, src_exports.system)({ elevation: {
 	property: "boxShadow",
 	scale: "shadows"
@@ -19,9 +20,10 @@ const MenuPaper = styled("div", {
 	shouldForwardProp: (prop) => ![
 		"elevation",
 		"layer",
-		"margin"
+		"margin",
+		"borderRadius"
 	].includes(prop)
-})(({ theme, layer, margin }) => ({
+})(({ theme, layer, margin, borderRadius }) => ({
 	position: "fixed",
 	top: 0,
 	left: 0,
@@ -30,11 +32,10 @@ const MenuPaper = styled("div", {
 	maxHeight: `calc(100vh - ${2 * margin}px)`,
 	overflowY: "auto",
 	backgroundColor: (0, src_exports.get)(theme, `background.${themeDefault(theme, "surfaceBg", "paper")}`),
-	borderRadius: theme.radii.sm,
+	borderRadius: getSurfaceRadius(theme, borderRadius),
 	visibility: "hidden"
 }), elevationSystem);
-//#endregion
-//#region src/Menu/MenuContext.ts
+// src/Menu/MenuContext.ts
 /** Set by a `Menu`. */
 const MenuContext = createContext(null);
 /** The surrounding menu's settings - or, for a `MenuList` on its own, `Menu`'s defaults. */
@@ -47,8 +48,7 @@ function useMenuContext() {
 		layer: "modal"
 	};
 }
-//#endregion
-//#region src/Menu/utils/getMenuOrigins.ts
+// src/Menu/utils/getMenuOrigins.ts
 /**
 * The anchor and transform origins `computePopoverPosition` places a list with. `align`
 * is logical - in a right-to-left page `start` is the right edge. Below its trigger, the
@@ -80,8 +80,7 @@ function getMenuOrigins(placement, align, isRtl) {
 		}
 	};
 }
-//#endregion
-//#region src/Menu/utils/hasRoomBeside.ts
+// src/Menu/utils/hasRoomBeside.ts
 /**
 * Whether a list `width` wide fits on either side of its row and still keeps `margin` from
 * the window's edges - so a submenu can open beside the row at all.
@@ -91,88 +90,44 @@ function hasRoomBeside(anchorRect, width, viewportWidth, margin) {
 	const roomAfter = viewportWidth - margin - (anchorRect.left + anchorRect.width);
 	return width <= Math.max(roomBefore, roomAfter);
 }
-//#endregion
-//#region src/Menu/hooks/useMenuPlacement.ts
+// src/Menu/hooks/useMenuPlacement.ts
 /**
-* Places a menu's `position: fixed` surface in the window, next to its anchor - so a
-* scrolling panel's overflow never clips it, while it stays in the menu's own box in the
-* DOM. Placed before paint on every render while open, and again on resize and on any
-* scroll. The surface starts `visibility: hidden` and is shown here, as it is placed - in
-* the same layout pass, so it is visible by the time anything inside it takes focus.
-* Returns whether a list beside its row opened on the other side for want of room.
+* Places a menu's `position: fixed` surface in the window, next to its anchor, with the shared
+* `useAnchoredPlacement`. A submenu with room on neither side of its row opens under it (or over
+* it) instead, so it never covers the row it came from. Returns whether a list beside its row
+* opened on the other side for want of room.
 */
 function useMenuPlacement({ isOpen, anchorRef, surfaceRef, placement, align, margin, anchorPosition = null }) {
 	const [isFlipped, setIsFlipped] = useState(false);
-	const pointTop = anchorPosition?.top;
-	const pointLeft = anchorPosition?.left ?? 0;
-	const place = useCallback(() => {
-		const anchor = anchorRef.current;
-		const surface = surfaceRef.current;
-		if (!anchor || !surface) return;
-		const isPoint = pointTop !== void 0;
-		const anchorRect = anchor.getBoundingClientRect();
-		const paperRect = {
-			width: surface.offsetWidth,
-			height: surface.offsetHeight
-		};
-		const viewport = {
-			width: window.innerWidth,
-			height: window.innerHeight
-		};
-		const isCramped = placement === "beside" && !hasRoomBeside(anchorRect, paperRect.width, viewport.width, margin);
-		const { top, left } = computePopoverPosition({
-			anchorReference: isPoint ? "anchorPosition" : "anchorEl",
-			anchorPosition: isPoint ? {
-				top: pointTop,
-				left: pointLeft
-			} : void 0,
-			anchorRect,
-			paperRect,
-			...getMenuOrigins(isCramped ? "below" : placement, align, isRtl(anchor)),
-			viewport,
-			marginThreshold: margin
-		});
-		surface.style.top = `${top}px`;
-		surface.style.left = `${left}px`;
-		const landed = surface.getBoundingClientRect();
-		const isOwnBox = paperRect.width > 0 && Math.round(landed.width) === paperRect.width;
-		const shiftTop = Math.round(landed.top - top);
-		const shiftLeft = Math.round(landed.left - left);
-		if (isOwnBox && (shiftTop !== 0 || shiftLeft !== 0)) {
-			surface.style.top = `${top - shiftTop}px`;
-			surface.style.left = `${left - shiftLeft}px`;
-		}
-		surface.style.visibility = "visible";
-		if (placement === "beside") {
-			const isOpeningRight = left + paperRect.width / 2 > anchorRect.left + anchorRect.width / 2;
-			const isRightPreferred = align === "start" !== isRtl(anchor);
-			setIsFlipped(!isCramped && isOpeningRight !== isRightPreferred);
-		}
+	const isCramped = useCallback(({ anchorRect, surfaceSize, viewport }) => placement === "beside" && !hasRoomBeside(anchorRect, surfaceSize.width, viewport.width, margin), [placement, margin]);
+	const getOrigins = useCallback((context) => getMenuOrigins(isCramped(context) ? "below" : placement, align, context.isRtl), [
+		isCramped,
+		placement,
+		align
+	]);
+	const onPlaced = useCallback((placed) => {
+		if (placement !== "beside") return;
+		const { anchorRect, surfaceSize, left, isRtl } = placed;
+		const isOpeningRight = left + surfaceSize.width / 2 > anchorRect.left + anchorRect.width / 2;
+		const isRightPreferred = align === "start" !== isRtl;
+		setIsFlipped(!isCramped(placed) && isOpeningRight !== isRightPreferred);
 	}, [
-		anchorRef,
-		surfaceRef,
 		placement,
 		align,
-		margin,
-		pointTop,
-		pointLeft
+		isCramped
 	]);
-	useLayoutEffect(() => {
-		if (isOpen) place();
+	useAnchoredPlacement({
+		isOpen,
+		anchorRef,
+		surfaceRef,
+		anchorPosition,
+		getOrigins,
+		margin,
+		onPlaced
 	});
-	useEffect(() => {
-		if (!isOpen) return void 0;
-		window.addEventListener("resize", place);
-		window.addEventListener("scroll", place, true);
-		return () => {
-			window.removeEventListener("resize", place);
-			window.removeEventListener("scroll", place, true);
-		};
-	}, [isOpen, place]);
 	return isFlipped;
 }
-//#endregion
-//#region src/MenuItem/Submenu.tsx
+// src/MenuItem/Submenu.tsx
 /**
 * A row's submenu: a `MenuList` on its own surface, placed beside the row the way its menu
 * places its list (`align`, the window margin), and drawn on the menu's layer.
@@ -215,8 +170,7 @@ function Submenu({ anchorRef, listId, labelledBy, children }) {
 		})
 	});
 }
-//#endregion
-//#region src/MenuItem/useSubmenu.ts
+// src/MenuItem/useSubmenu.ts
 /**
 * A row's submenu, opened while the row or anything in its submenu has focus. The pointer
 * moves focus as it goes, so hovering a row opens its submenu and hovering a sibling closes
@@ -280,8 +234,7 @@ function useSubmenu(rowRef, isEnabled) {
 		handleEntryBlur
 	};
 }
-//#endregion
-//#region src/MenuItem/MenuItem.tsx
+// src/MenuItem/MenuItem.tsx
 const shouldForwardProp = createShouldForwardProp([
 	"color",
 	"textColor",
@@ -459,7 +412,7 @@ const getRowAria = (state) => ({
 	"aria-expanded": state.hasSubmenu ? state.isSubmenuOpen : void 0,
 	"aria-controls": state.isSubmenuOpen ? state.submenuId : void 0,
 	"aria-checked": state.role === "menuitem" ? void 0 : state.selected,
-	"aria-keyshortcuts": typeof state.shortcut === "string" ? state.shortcut : void 0,
+	"aria-keyshortcuts": state.keyShortcuts ?? (typeof state.shortcut === "string" ? state.shortcut : void 0),
 	"aria-describedby": state.note ? state.noteId : void 0
 });
 const joinClassNames = (...names) => names.filter(Boolean).join(" ") || void 0;
@@ -470,7 +423,7 @@ const joinClassNames = (...names) => names.filter(Boolean).join(" ") || void 0;
 * `<li role="option">` (override via `as`), whose selection, highlight and density props
 * `Select` injects; used on its own it renders a static, styled row.
 */
-function MenuItem({ value, children, as, disabled = false, selected = false, highlighted = false, multiple = false, color: colorProp, textColor: textColorProp, size: sizeProp, dense: denseProp, disableGutters = false, divider = false, autoFocus = false, focusVisibleClassName, onSelect, role = "menuitem", startIcon, shortcut, note, onClick, submenu, emptyLabel, secondaryAction, id, className, "data-testid": dataTestid }) {
+function MenuItem({ value, children, as, disabled = false, selected = false, highlighted = false, multiple = false, color: colorProp, textColor: textColorProp, size: sizeProp, dense: denseProp, disableGutters = false, divider = false, autoFocus = false, focusVisibleClassName, onSelect, role = "menuitem", startIcon, shortcut, "aria-keyshortcuts": keyShortcuts, note, onClick, submenu, emptyLabel, secondaryAction, shouldAnnounceSecondaryAction = false, id, className, "data-testid": dataTestid }) {
 	const menu = useMenuListContext();
 	const isMenu = menu !== null;
 	const { color, size, textColor, dense } = useRowLook({
@@ -576,6 +529,7 @@ function MenuItem({ value, children, as, disabled = false, selected = false, hig
 			isSubmenuOpen,
 			submenuId,
 			shortcut,
+			keyShortcuts,
 			note,
 			noteId
 		}),
@@ -616,7 +570,7 @@ function MenuItem({ value, children, as, disabled = false, selected = false, hig
 		role: "none",
 		hasSecondaryAction: true,
 		children: [row, /* @__PURE__ */ jsx(SecondaryActionSlot, {
-			"aria-hidden": true,
+			"aria-hidden": shouldAnnounceSecondaryAction ? void 0 : true,
 			children: secondaryAction
 		})]
 	});
@@ -630,7 +584,7 @@ function MenuItem({ value, children, as, disabled = false, selected = false, hig
 		children: [
 			row,
 			hasSecondaryAction && /* @__PURE__ */ jsx(SecondaryActionSlot, {
-				"aria-hidden": true,
+				"aria-hidden": shouldAnnounceSecondaryAction ? void 0 : true,
 				children: secondaryAction
 			}),
 			isSubmenuOpen && /* @__PURE__ */ jsx(Submenu, {
@@ -645,5 +599,4 @@ function MenuItem({ value, children, as, disabled = false, selected = false, hig
 		]
 	});
 }
-//#endregion
 export { MenuPaper as i, useMenuPlacement as n, MenuContext as r, MenuItem as t };

package/dist/MenuItem.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_MenuItem = require("./MenuItem-BTP7Ijwi.cjs");
+const require_MenuItem = require("./MenuItem-DXRw3Yca.cjs");
 exports.MenuItem = require_MenuItem.MenuItem;

package/dist/MenuItem.d.cts

@@ -1,2 +1,2 @@
-import { a as MenuItemSize, i as MenuItemRole, n as MenuItemColor, o as MenuItemTextColor, r as MenuItemProps, t as MenuItem } from "./index-B4TeaB7b.cjs";
+import { a as MenuItemSize, i as MenuItemRole, n as MenuItemColor, o as MenuItemTextColor, r as MenuItemProps, t as MenuItem } from "./index-Byk1_ms9.cjs";
 export { MenuItem, MenuItemColor, MenuItemProps, MenuItemRole, MenuItemSize, MenuItemTextColor };

package/dist/MenuItem.d.mts

@@ -1,2 +1,2 @@
-import { a as MenuItemSize, i as MenuItemRole, n as MenuItemColor, o as MenuItemTextColor, r as MenuItemProps, t as MenuItem } from "./index-B1RFybA_.mjs";
+import { a as MenuItemSize, i as MenuItemRole, n as MenuItemColor, o as MenuItemTextColor, r as MenuItemProps, t as MenuItem } from "./index-Dt274Ngt.mjs";
 export { MenuItem, MenuItemColor, MenuItemProps, MenuItemRole, MenuItemSize, MenuItemTextColor };

package/dist/MenuItem.mjs

@@ -1,2 +1 @@
-import { t as MenuItem } from "./MenuItem-DUn4IZKK.mjs";
-export { MenuItem };
+export { t as MenuItem } from "./MenuItem-vXHGPK8g.mjs";

package/dist/{MenuList-B7msJ1IG.mjs → MenuList-CGZgfBno.mjs}

@@ -1,25 +1,23 @@
-import { a as src_exports, i as props, o as styled, t as createShouldForwardProp } from "./src-DLGYOJMh.mjs";
-import { t as themeDefault } from "./themeDefault-Z3KmyIbm.mjs";
-import { n as useDefaultProps } from "./theme-Z9_QludW.mjs";
+import { a as src_exports, i as props, o as styled, t as createShouldForwardProp } from "./src-B-rNjHIL.mjs";
+import { n as useDefaultProps } from "./theme-DyyZQFzQ.mjs";
+import { t as themeDefault } from "./themeDefault-BeZJzqJj.mjs";
 import { createContext, useContext, useEffect, useMemo, useRef } from "react";
 import { jsx } from "react/jsx-runtime";
-//#region src/Menu/MenuActivationContext.ts
+// src/Menu/MenuActivationContext.ts
 /**
 * Set by a `Menu` around its lists: told when any row anywhere in the menu is chosen, with
 * or without a `value`, so the whole menu can close. Internal - not exported from the
 * subpath.
 */
 const MenuActivationContext = createContext(null);
-//#endregion
-//#region src/Menu/MenuListContext.ts
+// src/Menu/MenuListContext.ts
 /**
 * Present inside a `MenuList`. A `MenuItem` that finds it renders as a menu row
 * (`menuitem`); without it, the row is `Select`'s `option`.
 */
 const MenuListContext = createContext(null);
 const useMenuListContext = () => useContext(MenuListContext);
-//#endregion
-//#region src/Menu/MenuList/utils/getOwnRows.ts
+// src/Menu/MenuList/utils/getOwnRows.ts
 const ROW_SELECTOR = "[role=\"menuitem\"], [role=\"menuitemradio\"], [role=\"menuitemcheckbox\"]";
 /**
 * The rows that belong to `list` itself, in document order. A nested submenu is a
@@ -33,8 +31,7 @@ function getOwnRows(list) {
 function isRowEnabled(row) {
 	return row.getAttribute("aria-disabled") !== "true";
 }
-//#endregion
-//#region src/Menu/MenuList/utils/getNextRow.ts
+// src/Menu/MenuList/utils/getNextRow.ts
 /**
 * The enabled row a key moves to from `current` (which may be absent from `rows`, as when
 * focus is still on the list itself). Disabled rows are skipped; `shouldWrap` carries
@@ -51,8 +48,7 @@ function getNextRow(rows, current, step, shouldWrap) {
 	if (!shouldWrap) return void 0;
 	return target < 0 ? enabled.at(-1) : enabled[0];
 }
-//#endregion
-//#region src/Menu/MenuList/utils/findRowByText.ts
+// src/Menu/MenuList/utils/findRowByText.ts
 /** A row's label text, without its icon, shortcut or note. */
 function getRowText(row) {
 	return (row.querySelector("[data-menu-label]") ?? row).textContent.trim().toLowerCase();
@@ -72,8 +68,7 @@ function findRowByText(rows, current, typed) {
 	const prefix = isRepeating ? query[0] : query;
 	return ordered.find((row) => getRowText(row).startsWith(prefix));
 }
-//#endregion
-//#region src/Menu/MenuList/MenuList.tsx
+// src/Menu/MenuList/MenuList.tsx
 const STEP_BY_KEY = {
 	ArrowDown: "next",
 	ArrowUp: "previous",
@@ -183,5 +178,4 @@ function MenuList({ children, onSelect, shouldWrap: shouldWrapProp, shouldAutoFo
 		})
 	});
 }
-//#endregion
 export { useMenuListContext as a, MenuListContext as i, getNextRow as n, MenuActivationContext as o, getOwnRows as r, MenuList as t };

package/dist/{MenuList-D4imLXAa.cjs → MenuList-DsJmxNPu.cjs}

@@ -1,26 +1,24 @@
-const require_src = require("./src-DU81aGy9.cjs");
-const require_themeDefault = require("./themeDefault-Cebi08Cv.cjs");
-const require_theme = require("./theme-BxXuXRgQ.cjs");
+const require_src = require("./src-yC1f5WR2.cjs");
+const require_theme = require("./theme-XJvMdOnY.cjs");
+const require_themeDefault = require("./themeDefault-DbPHBbNO.cjs");
 let react = require("react");
 let react_jsx_runtime = require("react/jsx-runtime");
 let _soroush_tech_styled_system_should_forward_prop = require("@soroush.tech/styled-system/should-forward-prop");
-//#region src/Menu/MenuActivationContext.ts
+// src/Menu/MenuActivationContext.ts
 /**
 * Set by a `Menu` around its lists: told when any row anywhere in the menu is chosen, with
 * or without a `value`, so the whole menu can close. Internal - not exported from the
 * subpath.
 */
 const MenuActivationContext = (0, react.createContext)(null);
-//#endregion
-//#region src/Menu/MenuListContext.ts
+// src/Menu/MenuListContext.ts
 /**
 * Present inside a `MenuList`. A `MenuItem` that finds it renders as a menu row
 * (`menuitem`); without it, the row is `Select`'s `option`.
 */
 const MenuListContext = (0, react.createContext)(null);
 const useMenuListContext = () => (0, react.useContext)(MenuListContext);
-//#endregion
-//#region src/Menu/MenuList/utils/getOwnRows.ts
+// src/Menu/MenuList/utils/getOwnRows.ts
 const ROW_SELECTOR = "[role=\"menuitem\"], [role=\"menuitemradio\"], [role=\"menuitemcheckbox\"]";
 /**
 * The rows that belong to `list` itself, in document order. A nested submenu is a
@@ -34,8 +32,7 @@ function getOwnRows(list) {
 function isRowEnabled(row) {
 	return row.getAttribute("aria-disabled") !== "true";
 }
-//#endregion
-//#region src/Menu/MenuList/utils/getNextRow.ts
+// src/Menu/MenuList/utils/getNextRow.ts
 /**
 * The enabled row a key moves to from `current` (which may be absent from `rows`, as when
 * focus is still on the list itself). Disabled rows are skipped; `shouldWrap` carries
@@ -52,8 +49,7 @@ function getNextRow(rows, current, step, shouldWrap) {
 	if (!shouldWrap) return void 0;
 	return target < 0 ? enabled.at(-1) : enabled[0];
 }
-//#endregion
-//#region src/Menu/MenuList/utils/findRowByText.ts
+// src/Menu/MenuList/utils/findRowByText.ts
 /** A row's label text, without its icon, shortcut or note. */
 function getRowText(row) {
 	return (row.querySelector("[data-menu-label]") ?? row).textContent.trim().toLowerCase();
@@ -73,8 +69,7 @@ function findRowByText(rows, current, typed) {
 	const prefix = isRepeating ? query[0] : query;
 	return ordered.find((row) => getRowText(row).startsWith(prefix));
 }
-//#endregion
-//#region src/Menu/MenuList/MenuList.tsx
+// src/Menu/MenuList/MenuList.tsx
 const STEP_BY_KEY = {
 	ArrowDown: "next",
 	ArrowUp: "previous",
@@ -184,7 +179,6 @@ function MenuList({ children, onSelect, shouldWrap: shouldWrapProp, shouldAutoFo
 		})
 	});
 }
-//#endregion
 Object.defineProperty(exports, "MenuActivationContext", {
 	enumerable: true,
 	get: function() {

package/dist/{MenuListContext-DKUOhNyw.d.cts → MenuListContext-BwgQHUu9.d.cts}

@@ -1,7 +1,6 @@
-import { W as Theme } from "./index-DJ0f69wh.cjs";
-import "./index-DchHf5cF.cjs";
+import { nt as Theme } from "./index-Lsm4v8fB.cjs";
+import "./index-CfB7OceY.cjs";
 import { SyntheticEvent } from "react";
-//#region src/Menu/MenuListContext.d.ts
 type MenuItemValue = string | number;
 interface MenuListContextValue {
   /** Fired when a row is chosen, with its `value` when it has one. */
@@ -17,5 +16,4 @@ interface MenuListContextValue {
  */
 declare const MenuListContext: import("react").Context<MenuListContextValue | null>;
 declare const useMenuListContext: () => MenuListContextValue | null;
-//#endregion
 export { useMenuListContext as i, MenuListContext as n, MenuListContextValue as r, MenuItemValue as t };

package/dist/{MenuListContext-x-7lH4CH.d.mts → MenuListContext-DbnAoUdJ.d.mts}

@@ -1,7 +1,6 @@
-import { W as Theme } from "./index-CJhK7JND.mjs";
-import "./index-h4dYtVrp.mjs";
+import { nt as Theme } from "./index-CR8qkP8U.mjs";
+import "./index-CF_pl72E.mjs";
 import { SyntheticEvent } from "react";
-//#region src/Menu/MenuListContext.d.ts
 type MenuItemValue = string | number;
 interface MenuListContextValue {
   /** Fired when a row is chosen, with its `value` when it has one. */
@@ -17,5 +16,4 @@ interface MenuListContextValue {
  */
 declare const MenuListContext: import("react").Context<MenuListContextValue | null>;
 declare const useMenuListContext: () => MenuListContextValue | null;
-//#endregion
 export { useMenuListContext as i, MenuListContext as n, MenuListContextValue as r, MenuItemValue as t };

package/dist/{Modal-BcsyrrpH.mjs → Modal-DR4TRQSH.mjs}

@@ -1,11 +1,12 @@
-import { o as styled, t as createShouldForwardProp } from "./src-DLGYOJMh.mjs";
+import { o as styled, t as createShouldForwardProp } from "./src-B-rNjHIL.mjs";
 import { View } from "./View.mjs";
+import { Portal } from "./Portal.mjs";
 import { Backdrop } from "./Backdrop.mjs";
 import { FocusTrap } from "./FocusTrap.mjs";
-import { Portal } from "./Portal.mjs";
-import { useCallback, useEffect, useMemo, useRef } from "react";
+import { t as useMergedRefs } from "./useMergedRefs-CdfwtmUd.mjs";
+import { useCallback, useEffect, useRef } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
-//#region src/utils/ownerDocument.ts
+// src/utils/ownerDocument.ts
 /**
 * Returns the `Document` that owns the given node, falling back to the global
 * `document`. Lets the modal logic work across iframes / portaled containers.
@@ -13,8 +14,7 @@ import { jsx, jsxs } from "react/jsx-runtime";
 function ownerDocument(node) {
 	return node?.ownerDocument ?? document;
 }
-//#endregion
-//#region src/Modal/utils/ownerWindow.ts
+// src/Modal/utils/ownerWindow.ts
 /**
 * Returns the `Window` that owns the given node, falling back to the global
 * `window`. Used to read viewport metrics for scroll-lock calculations.
@@ -22,8 +22,7 @@ function ownerDocument(node) {
 function ownerWindow(node) {
 	return ownerDocument(node).defaultView ?? window;
 }
-//#endregion
-//#region src/Modal/utils/getScrollbarSize.ts
+// src/Modal/utils/getScrollbarSize.ts
 /**
 * Width of the vertical scrollbar for the given window, in pixels. Equal to the
 * gap between the inner window width and the document's client width. Used to
@@ -33,8 +32,7 @@ function getScrollbarSize(win) {
 	const documentWidth = win.document.documentElement.clientWidth;
 	return Math.abs(win.innerWidth - documentWidth);
 }
-//#endregion
-//#region src/Modal/ModalManager.ts
+// src/Modal/ModalManager.ts
 const ARIA_HIDDEN_FORBIDDEN_TAGS = /* @__PURE__ */ new Set([
 	"TEMPLATE",
 	"SCRIPT",
@@ -163,8 +161,7 @@ var ModalManager = class {
 		return this.modals.at(-1) === modal;
 	}
 };
-//#endregion
-//#region src/Modal/hooks/useEventCallback.ts
+// src/Modal/hooks/useEventCallback.ts
 /**
 * Returns a stable function identity that always calls the latest `fn`. Lets
 * effects depend on the callback without re-running when the handler changes.
@@ -179,28 +176,7 @@ function useEventCallback(fn) {
 	});
 	return useCallback((...args) => ref.current(...args), []);
 }
-//#endregion
-//#region src/Modal/hooks/useMergedRefs.ts
-function assignRef(ref, value) {
-	if (typeof ref === "function") ref(value);
-	else if (ref) ref.current = value;
-}
-/**
-* Merges two refs into a single stable ref callback so one DOM node can be
-* tracked by both an internal ref and a forwarded `ref`. Returns `null` when
-* both refs are absent, so React skips attaching a callback ref entirely.
-*/
-function useMergedRefs(refA, refB) {
-	return useMemo(() => {
-		if (refA == null && refB == null) return null;
-		return (value) => {
-			assignRef(refA, value);
-			assignRef(refB, value);
-		};
-	}, [refA, refB]);
-}
-//#endregion
-//#region src/Modal/useModal.ts
+// src/Modal/useModal.ts
 const modalManager = new ModalManager();
 function getContainer(container) {
 	return typeof container === "function" ? container() : container ?? null;
@@ -274,8 +250,7 @@ function useModal(parameters) {
 		isTopModal
 	};
 }
-//#endregion
-//#region src/Modal/Modal.tsx
+// src/Modal/Modal.tsx
 const shouldForwardProp = createShouldForwardProp(["scroll", "layer"]);
 const ModalRoot = styled(View, {
 	name: "Modal",
@@ -328,5 +303,4 @@ function Modal({ isOpen, children, onClose, hasBackdrop = true, shouldKeepMounte
 		children: content
 	}) : content;
 }
-//#endregion
 export { hideFromAria as a, exposeToAria as i, useModal as n, ModalManager as r, Modal as t };

package/dist/{Modal-CM3osOqj.cjs → Modal-gQcAJAKH.cjs}

@@ -1,12 +1,13 @@
-const require_src = require("./src-DU81aGy9.cjs");
+const require_src = require("./src-yC1f5WR2.cjs");
 const require_View = require("./View.cjs");
+const require_Portal = require("./Portal.cjs");
 const require_Backdrop = require("./Backdrop.cjs");
 const require_FocusTrap = require("./FocusTrap.cjs");
-const require_Portal = require("./Portal.cjs");
+const require_useMergedRefs = require("./useMergedRefs-BtctsnmX.cjs");
 let react = require("react");
 let react_jsx_runtime = require("react/jsx-runtime");
 let _soroush_tech_styled_system_should_forward_prop = require("@soroush.tech/styled-system/should-forward-prop");
-//#region src/utils/ownerDocument.ts
+// src/utils/ownerDocument.ts
 /**
 * Returns the `Document` that owns the given node, falling back to the global
 * `document`. Lets the modal logic work across iframes / portaled containers.
@@ -14,8 +15,7 @@ let _soroush_tech_styled_system_should_forward_prop = require("@soroush.tech/sty
 function ownerDocument(node) {
 	return node?.ownerDocument ?? document;
 }
-//#endregion
-//#region src/Modal/utils/ownerWindow.ts
+// src/Modal/utils/ownerWindow.ts
 /**
 * Returns the `Window` that owns the given node, falling back to the global
 * `window`. Used to read viewport metrics for scroll-lock calculations.
@@ -23,8 +23,7 @@ function ownerDocument(node) {
 function ownerWindow(node) {
 	return ownerDocument(node).defaultView ?? window;
 }
-//#endregion
-//#region src/Modal/utils/getScrollbarSize.ts
+// src/Modal/utils/getScrollbarSize.ts
 /**
 * Width of the vertical scrollbar for the given window, in pixels. Equal to the
 * gap between the inner window width and the document's client width. Used to
@@ -34,8 +33,7 @@ function getScrollbarSize(win) {
 	const documentWidth = win.document.documentElement.clientWidth;
 	return Math.abs(win.innerWidth - documentWidth);
 }
-//#endregion
-//#region src/Modal/ModalManager.ts
+// src/Modal/ModalManager.ts
 const ARIA_HIDDEN_FORBIDDEN_TAGS = /* @__PURE__ */ new Set([
 	"TEMPLATE",
 	"SCRIPT",
@@ -164,8 +162,7 @@ var ModalManager = class {
 		return this.modals.at(-1) === modal;
 	}
 };
-//#endregion
-//#region src/Modal/hooks/useEventCallback.ts
+// src/Modal/hooks/useEventCallback.ts
 /**
 * Returns a stable function identity that always calls the latest `fn`. Lets
 * effects depend on the callback without re-running when the handler changes.
@@ -180,28 +177,7 @@ function useEventCallback(fn) {
 	});
 	return (0, react.useCallback)((...args) => ref.current(...args), []);
 }
-//#endregion
-//#region src/Modal/hooks/useMergedRefs.ts
-function assignRef(ref, value) {
-	if (typeof ref === "function") ref(value);
-	else if (ref) ref.current = value;
-}
-/**
-* Merges two refs into a single stable ref callback so one DOM node can be
-* tracked by both an internal ref and a forwarded `ref`. Returns `null` when
-* both refs are absent, so React skips attaching a callback ref entirely.
-*/
-function useMergedRefs(refA, refB) {
-	return (0, react.useMemo)(() => {
-		if (refA == null && refB == null) return null;
-		return (value) => {
-			assignRef(refA, value);
-			assignRef(refB, value);
-		};
-	}, [refA, refB]);
-}
-//#endregion
-//#region src/Modal/useModal.ts
+// src/Modal/useModal.ts
 const modalManager = new ModalManager();
 function getContainer(container) {
 	return typeof container === "function" ? container() : container ?? null;
@@ -211,7 +187,7 @@ function useModal(parameters) {
 	const modal = (0, react.useRef)({});
 	const mountNodeRef = (0, react.useRef)(null);
 	const modalRef = (0, react.useRef)(null);
-	const handleRef = useMergedRefs(modalRef, rootRef);
+	const handleRef = require_useMergedRefs.useMergedRefs(modalRef, rootRef);
 	const getModal = () => {
 		modal.current.modalRef = modalRef.current;
 		modal.current.mount = mountNodeRef.current;
@@ -275,8 +251,7 @@ function useModal(parameters) {
 		isTopModal
 	};
 }
-//#endregion
-//#region src/Modal/Modal.tsx
+// src/Modal/Modal.tsx
 const shouldForwardProp = (0, _soroush_tech_styled_system_should_forward_prop.createShouldForwardProp)(["scroll", "layer"]);
 const ModalRoot = require_src.styled(require_View.View, {
 	name: "Modal",
@@ -329,7 +304,6 @@ function Modal({ isOpen, children, onClose, hasBackdrop = true, shouldKeepMounte
 		children: content
 	}) : content;
 }
-//#endregion
 Object.defineProperty(exports, "Modal", {
 	enumerable: true,
 	get: function() {