@yamada-ui/menu 1.5.2-dev-20241213204523 → 1.5.2-dev-20241213213653

package/dist/context-menu.js

@@ -81,8 +81,8 @@ var Menu = (props) => {
   } = (0, import_core.omitThemeProps)(mergedProps);
   const { relatedRef, onDownstreamCloseMapRef, onUpstreamClose } = (_b = useUpstreamMenu()) != null ? _b : {};
   const { hasDownstreamRef, setDownstreamOpen } = (_c = useUpstreamMenuItem()) != null ? _c : {};
-  const isNested = !!relatedRef;
-  if (isNested) {
+  const nested = !!relatedRef;
+  if (nested) {
     placement != null ? placement : placement = "right-start";
     offset != null ? offset : offset = [-8, 8];
     closeOnBlur != null ? closeOnBlur : closeOnBlur = false;
@@ -122,8 +122,8 @@ var Menu = (props) => {
   }, [descendants, initialFocusRef]);
   const onOpenInternal = (0, import_react.useCallback)(() => {
     onOpenProp == null ? void 0 : onOpenProp();
-    if (!isNested) onFocusMenu();
-  }, [onOpenProp, isNested, onFocusMenu]);
+    if (!nested) onFocusMenu();
+  }, [onOpenProp, nested, onFocusMenu]);
   const onCloseInternal = (0, import_react.useCallback)(() => {
     onCloseProp == null ? void 0 : onCloseProp();
     for (const onClose2 of onCloseMapRef.current.values()) {
@@ -131,7 +131,7 @@ var Menu = (props) => {
     }
   }, [onCloseProp]);
   const id = (0, import_react.useId)();
-  const { isOpen, onClose, onOpen } = (0, import_use_disclosure.useDisclosure)({
+  const { open, onClose, onOpen } = (0, import_use_disclosure.useDisclosure)({
     ...props,
     onClose: onCloseInternal,
     onOpen: onOpenInternal
@@ -144,8 +144,8 @@ var Menu = (props) => {
     };
   }, [id, onClose, onDownstreamCloseMapRef]);
   (0, import_react.useEffect)(() => {
-    if (setDownstreamOpen) setDownstreamOpen(isOpen);
-  }, [setDownstreamOpen, isOpen]);
+    if (setDownstreamOpen) setDownstreamOpen(open);
+  }, [setDownstreamOpen, open]);
   (0, import_react.useEffect)(() => {
     if (hasDownstreamRef) hasDownstreamRef.current = true;
     return () => {
@@ -153,8 +153,8 @@ var Menu = (props) => {
     };
   });
   (0, import_utils2.useUpdateEffect)(() => {
-    if (!isOpen) setFocusedIndex(-1);
-  }, [isOpen]);
+    if (!open) setFocusedIndex(-1);
+  }, [open]);
   (0, import_utils2.useUnmountEffect)(() => {
     timeoutIds.current.forEach((id2) => clearTimeout(id2));
     timeoutIds.current.clear();
@@ -174,9 +174,9 @@ var Menu = (props) => {
             buttonRef,
             closeOnSelect,
             focusedIndex,
-            isNested,
-            isOpen,
             menuRef,
+            nested,
+            open,
             requestAnimationFrameId,
             setFocusedIndex,
             styles,
@@ -190,14 +190,14 @@ var Menu = (props) => {
             import_popover.Popover,
             {
               ...{
-                trigger: isNested ? "hover" : "click",
+                trigger: nested ? "hover" : "click",
                 ...rest,
                 closeOnBlur,
                 closeOnButton: false,
                 duration,
                 initialFocusRef,
-                isOpen,
                 offset,
+                open,
                 placement,
                 relatedRef,
                 onClose,

package/dist/context-menu.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/context-menu.tsx","../src/menu.tsx","../src/menu-context.ts"],"sourcesContent":["import type { FC, ThemeProps } from \"@yamada-ui/core\"\nimport type { MenuProps } from \"./menu\"\nimport { omitThemeProps, useComponentMultiStyle } from \"@yamada-ui/core\"\nimport { Menu } from \"./menu\"\nimport { ContextMenuProvider } from \"./menu-context\"\n\nexport interface ContextMenuProps\n  extends Omit<MenuProps, \"trigger\">,\n    ThemeProps<\"ContextMenu\"> {}\n\n/**\n * `ContextMenu` is triggered by a right click and displays a menu at the pointer's position.\n *\n * @see Docs https://yamada-ui.com/components/overlay/context-menu\n */\nexport const ContextMenu: FC<ContextMenuProps> = (props) => {\n  const [styles, mergedProps] = useComponentMultiStyle(\"ContextMenu\", props)\n  const { ...rest } = omitThemeProps(mergedProps)\n\n  return (\n    <ContextMenuProvider value={{ styles }}>\n      <Menu trigger=\"contextmenu\" {...rest} />\n    </ContextMenuProvider>\n  )\n}\n\nContextMenu.__ui__ = \"ContextMenu\"\n","import type { FC, ThemeProps } from \"@yamada-ui/core\"\nimport type { PopoverProps } from \"@yamada-ui/popover\"\nimport { omitThemeProps, useComponentMultiStyle } from \"@yamada-ui/core\"\nimport { Popover } from \"@yamada-ui/popover\"\nimport { useDisclosure } from \"@yamada-ui/use-disclosure\"\nimport { funcAll, useUnmountEffect, useUpdateEffect } from \"@yamada-ui/utils\"\nimport { useCallback, useEffect, useId, useRef, useState } from \"react\"\nimport {\n  DescendantsContextProvider,\n  MenuProvider,\n  UpstreamMenuProvider,\n  useContextMenu,\n  useDescendants,\n  useUpstreamMenu,\n  useUpstreamMenuItem,\n} from \"./menu-context\"\n\nexport interface MenuOptions {\n  /**\n   * If `true`, the list element will be closed when value is selected.\n   *\n   * @default true\n   */\n  closeOnSelect?: boolean\n}\n\nexport interface MenuProps\n  extends ThemeProps<\"Menu\">,\n    Omit<PopoverProps, \"closeOnButton\" | \"relatedRef\">,\n    MenuOptions {}\n\n/**\n * `Menu` is a component that displays a common dropdown menu.\n *\n * @see Docs https://yamada-ui.com/components/overlay/menu\n */\nexport const Menu: FC<MenuProps> = (props) => {\n  const { styles: contextMenuStyles } = useContextMenu() ?? {}\n  const [styles, mergedProps] = useComponentMultiStyle(\"Menu\", props, {\n    isProcessSkip: !!contextMenuStyles,\n    styles: contextMenuStyles,\n  })\n  let {\n    closeOnBlur,\n    closeOnSelect = true,\n    duration = 0.2,\n    initialFocusRef,\n    offset,\n    placement,\n    onClose: onCloseProp,\n    onOpen: onOpenProp,\n    ...rest\n  } = omitThemeProps(mergedProps)\n  const { relatedRef, onDownstreamCloseMapRef, onUpstreamClose } =\n    useUpstreamMenu() ?? {}\n  const { hasDownstreamRef, setDownstreamOpen } = useUpstreamMenuItem() ?? {}\n  const isNested = !!relatedRef\n\n  if (isNested) {\n    placement ??= \"right-start\"\n    offset ??= [-8, 8]\n    closeOnBlur ??= false\n  } else {\n    placement ??= \"bottom-start\"\n  }\n\n  const descendants = useDescendants()\n\n  const [focusedIndex, setFocusedIndex] = useState<number>(-1)\n\n  const menuRef = useRef<HTMLDivElement>(null)\n  const buttonRef = useRef<HTMLButtonElement>(null)\n  const timeoutIds = useRef<Set<any>>(new Set([]))\n  const requestAnimationFrameId = useRef<null | number>(null)\n  const onCloseMapRef = useRef<Map<string, () => void>>(new Map())\n\n  const onFocusMenu = useCallback(() => {\n    requestAnimationFrame(() =>\n      menuRef.current?.focus({ preventScroll: false }),\n    )\n  }, [])\n\n  const onFocusFirstItem = useCallback(() => {\n    const id = setTimeout(() => {\n      if (initialFocusRef) return\n\n      const first = descendants.enabledFirstValue()\n\n      if (first) setFocusedIndex(first.index)\n    })\n\n    timeoutIds.current.add(id)\n  }, [descendants, initialFocusRef])\n\n  const onFocusLastItem = useCallback(() => {\n    const id = setTimeout(() => {\n      if (initialFocusRef) return\n\n      const last = descendants.enabledLastValue()\n\n      if (last) setFocusedIndex(last.index)\n    })\n\n    timeoutIds.current.add(id)\n  }, [descendants, initialFocusRef])\n\n  const onOpenInternal = useCallback(() => {\n    onOpenProp?.()\n\n    if (!isNested) onFocusMenu()\n  }, [onOpenProp, isNested, onFocusMenu])\n\n  const onCloseInternal = useCallback(() => {\n    onCloseProp?.()\n\n    for (const onClose of onCloseMapRef.current.values()) {\n      onClose()\n    }\n  }, [onCloseProp])\n\n  const id = useId()\n  const { isOpen, onClose, onOpen } = useDisclosure({\n    ...props,\n    onClose: onCloseInternal,\n    onOpen: onOpenInternal,\n  })\n\n  useEffect(() => {\n    const onCloseMap = onDownstreamCloseMapRef?.current\n\n    onCloseMap?.set(id, onClose)\n\n    return () => {\n      onCloseMap?.delete(id)\n    }\n  }, [id, onClose, onDownstreamCloseMapRef])\n\n  useEffect(() => {\n    if (setDownstreamOpen) setDownstreamOpen(isOpen)\n  }, [setDownstreamOpen, isOpen])\n\n  useEffect(() => {\n    if (hasDownstreamRef) hasDownstreamRef.current = true\n\n    return () => {\n      if (hasDownstreamRef) hasDownstreamRef.current = false\n    }\n  })\n\n  useUpdateEffect(() => {\n    if (!isOpen) setFocusedIndex(-1)\n  }, [isOpen])\n\n  useUnmountEffect(() => {\n    timeoutIds.current.forEach((id) => clearTimeout(id))\n    timeoutIds.current.clear()\n  })\n\n  return (\n    <DescendantsContextProvider value={descendants}>\n      <UpstreamMenuProvider\n        value={{\n          relatedRef: menuRef,\n          onDownstreamCloseMapRef: onCloseMapRef,\n          onUpstreamClose: funcAll(onUpstreamClose, onClose),\n        }}\n      >\n        <MenuProvider\n          value={{\n            buttonRef,\n            closeOnSelect,\n            focusedIndex,\n            isNested,\n            isOpen,\n            menuRef,\n            requestAnimationFrameId,\n            setFocusedIndex,\n            styles,\n            onClose,\n            onFocusFirstItem,\n            onFocusLastItem,\n            onOpen,\n            onUpstreamClose,\n          }}\n        >\n          <Popover\n            {...{\n              trigger: isNested ? \"hover\" : \"click\",\n              ...rest,\n              closeOnBlur,\n              closeOnButton: false,\n              duration,\n              initialFocusRef,\n              isOpen,\n              offset,\n              placement,\n              relatedRef,\n              onClose,\n              onOpen,\n            }}\n          />\n        </MenuProvider>\n      </UpstreamMenuProvider>\n    </DescendantsContextProvider>\n  )\n}\n\nMenu.__ui__ = \"Menu\"\n","import type { CSSUIObject } from \"@yamada-ui/core\"\nimport type {\n  Dispatch,\n  KeyboardEventHandler,\n  MutableRefObject,\n  RefObject,\n  SetStateAction,\n} from \"react\"\nimport type { MenuOptions } from \"./menu\"\nimport { createDescendant } from \"@yamada-ui/use-descendant\"\nimport { createContext } from \"@yamada-ui/utils\"\n\nexport const {\n  DescendantsContextProvider,\n  useDescendant: useMenuDescendant,\n  useDescendants,\n  useDescendantsContext: useMenuDescendantsContext,\n} = createDescendant()\n\ninterface MenuContext extends MenuOptions {\n  buttonRef: RefObject<HTMLButtonElement>\n  focusedIndex: number\n  isNested: boolean\n  isOpen: boolean\n  menuRef: RefObject<HTMLDivElement>\n  requestAnimationFrameId: MutableRefObject<null | number>\n  setFocusedIndex: Dispatch<SetStateAction<number>>\n  styles: { [key: string]: CSSUIObject | undefined }\n  onClose: () => void\n  onFocusFirstItem: () => void\n  onFocusLastItem: () => void\n  onOpen: () => void\n  onUpstreamClose?: () => void\n}\n\nexport const [MenuProvider, useMenu] = createContext<MenuContext>({\n  name: \"MenuContext\",\n  errorMessage: `useMenu returned is 'undefined'. Seems you forgot to wrap the components in \"<Menu />\"`,\n})\n\ninterface ContextMenuContext {\n  styles: { [key: string]: CSSUIObject | undefined }\n}\n\nexport const [ContextMenuProvider, useContextMenu] =\n  createContext<ContextMenuContext>({\n    name: \"ContextMenuContext\",\n    strict: false,\n  })\n\ninterface UpstreamMenuContext {\n  relatedRef: RefObject<HTMLElement>\n  onDownstreamCloseMapRef: MutableRefObject<Map<string, () => void>>\n  onUpstreamClose: () => void\n}\n\nexport const [UpstreamMenuProvider, useUpstreamMenu] =\n  createContext<UpstreamMenuContext>({\n    name: \"UpstreamMenuContext\",\n    strict: false,\n  })\n\ninterface UpstreamMenuItemContext {\n  hasDownstreamRef: MutableRefObject<boolean>\n  setDownstreamOpen: Dispatch<SetStateAction<boolean>>\n  onKeyDownRef: RefObject<KeyboardEventHandler<HTMLDivElement>>\n  onUpstreamRestoreFocus: () => void\n}\n\nexport const [UpstreamMenuItemProvider, useUpstreamMenuItem] =\n  createContext<UpstreamMenuItemContext>({\n    name: \"UpstreamMenuItemContext\",\n    strict: false,\n  })\n"],"mappings":"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","names":["import_core","import_utils","_a","id","onClose","import_jsx_runtime"]}
+{"version":3,"sources":["../src/context-menu.tsx","../src/menu.tsx","../src/menu-context.ts"],"sourcesContent":["import type { FC, ThemeProps } from \"@yamada-ui/core\"\nimport type { MenuProps } from \"./menu\"\nimport { omitThemeProps, useComponentMultiStyle } from \"@yamada-ui/core\"\nimport { Menu } from \"./menu\"\nimport { ContextMenuProvider } from \"./menu-context\"\n\nexport interface ContextMenuProps\n  extends Omit<MenuProps, \"trigger\">,\n    ThemeProps<\"ContextMenu\"> {}\n\n/**\n * `ContextMenu` is triggered by a right click and displays a menu at the pointer's position.\n *\n * @see Docs https://yamada-ui.com/components/overlay/context-menu\n */\nexport const ContextMenu: FC<ContextMenuProps> = (props) => {\n  const [styles, mergedProps] = useComponentMultiStyle(\"ContextMenu\", props)\n  const { ...rest } = omitThemeProps(mergedProps)\n\n  return (\n    <ContextMenuProvider value={{ styles }}>\n      <Menu trigger=\"contextmenu\" {...rest} />\n    </ContextMenuProvider>\n  )\n}\n\nContextMenu.__ui__ = \"ContextMenu\"\n","import type { FC, ThemeProps } from \"@yamada-ui/core\"\nimport type { PopoverProps } from \"@yamada-ui/popover\"\nimport { omitThemeProps, useComponentMultiStyle } from \"@yamada-ui/core\"\nimport { Popover } from \"@yamada-ui/popover\"\nimport { useDisclosure } from \"@yamada-ui/use-disclosure\"\nimport { funcAll, useUnmountEffect, useUpdateEffect } from \"@yamada-ui/utils\"\nimport { useCallback, useEffect, useId, useRef, useState } from \"react\"\nimport {\n  DescendantsContextProvider,\n  MenuProvider,\n  UpstreamMenuProvider,\n  useContextMenu,\n  useDescendants,\n  useUpstreamMenu,\n  useUpstreamMenuItem,\n} from \"./menu-context\"\n\nexport interface MenuOptions {\n  /**\n   * If `true`, the list element will be closed when value is selected.\n   *\n   * @default true\n   */\n  closeOnSelect?: boolean\n}\n\nexport interface MenuProps\n  extends ThemeProps<\"Menu\">,\n    Omit<PopoverProps, \"closeOnButton\" | \"relatedRef\">,\n    MenuOptions {}\n\n/**\n * `Menu` is a component that displays a common dropdown menu.\n *\n * @see Docs https://yamada-ui.com/components/overlay/menu\n */\nexport const Menu: FC<MenuProps> = (props) => {\n  const { styles: contextMenuStyles } = useContextMenu() ?? {}\n  const [styles, mergedProps] = useComponentMultiStyle(\"Menu\", props, {\n    isProcessSkip: !!contextMenuStyles,\n    styles: contextMenuStyles,\n  })\n  let {\n    closeOnBlur,\n    closeOnSelect = true,\n    duration = 0.2,\n    initialFocusRef,\n    offset,\n    placement,\n    onClose: onCloseProp,\n    onOpen: onOpenProp,\n    ...rest\n  } = omitThemeProps(mergedProps)\n  const { relatedRef, onDownstreamCloseMapRef, onUpstreamClose } =\n    useUpstreamMenu() ?? {}\n  const { hasDownstreamRef, setDownstreamOpen } = useUpstreamMenuItem() ?? {}\n  const nested = !!relatedRef\n\n  if (nested) {\n    placement ??= \"right-start\"\n    offset ??= [-8, 8]\n    closeOnBlur ??= false\n  } else {\n    placement ??= \"bottom-start\"\n  }\n\n  const descendants = useDescendants()\n\n  const [focusedIndex, setFocusedIndex] = useState<number>(-1)\n\n  const menuRef = useRef<HTMLDivElement>(null)\n  const buttonRef = useRef<HTMLButtonElement>(null)\n  const timeoutIds = useRef<Set<any>>(new Set([]))\n  const requestAnimationFrameId = useRef<null | number>(null)\n  const onCloseMapRef = useRef<Map<string, () => void>>(new Map())\n\n  const onFocusMenu = useCallback(() => {\n    requestAnimationFrame(() =>\n      menuRef.current?.focus({ preventScroll: false }),\n    )\n  }, [])\n\n  const onFocusFirstItem = useCallback(() => {\n    const id = setTimeout(() => {\n      if (initialFocusRef) return\n\n      const first = descendants.enabledFirstValue()\n\n      if (first) setFocusedIndex(first.index)\n    })\n\n    timeoutIds.current.add(id)\n  }, [descendants, initialFocusRef])\n\n  const onFocusLastItem = useCallback(() => {\n    const id = setTimeout(() => {\n      if (initialFocusRef) return\n\n      const last = descendants.enabledLastValue()\n\n      if (last) setFocusedIndex(last.index)\n    })\n\n    timeoutIds.current.add(id)\n  }, [descendants, initialFocusRef])\n\n  const onOpenInternal = useCallback(() => {\n    onOpenProp?.()\n\n    if (!nested) onFocusMenu()\n  }, [onOpenProp, nested, onFocusMenu])\n\n  const onCloseInternal = useCallback(() => {\n    onCloseProp?.()\n\n    for (const onClose of onCloseMapRef.current.values()) {\n      onClose()\n    }\n  }, [onCloseProp])\n\n  const id = useId()\n  const { open, onClose, onOpen } = useDisclosure({\n    ...props,\n    onClose: onCloseInternal,\n    onOpen: onOpenInternal,\n  })\n\n  useEffect(() => {\n    const onCloseMap = onDownstreamCloseMapRef?.current\n\n    onCloseMap?.set(id, onClose)\n\n    return () => {\n      onCloseMap?.delete(id)\n    }\n  }, [id, onClose, onDownstreamCloseMapRef])\n\n  useEffect(() => {\n    if (setDownstreamOpen) setDownstreamOpen(open)\n  }, [setDownstreamOpen, open])\n\n  useEffect(() => {\n    if (hasDownstreamRef) hasDownstreamRef.current = true\n\n    return () => {\n      if (hasDownstreamRef) hasDownstreamRef.current = false\n    }\n  })\n\n  useUpdateEffect(() => {\n    if (!open) setFocusedIndex(-1)\n  }, [open])\n\n  useUnmountEffect(() => {\n    timeoutIds.current.forEach((id) => clearTimeout(id))\n    timeoutIds.current.clear()\n  })\n\n  return (\n    <DescendantsContextProvider value={descendants}>\n      <UpstreamMenuProvider\n        value={{\n          relatedRef: menuRef,\n          onDownstreamCloseMapRef: onCloseMapRef,\n          onUpstreamClose: funcAll(onUpstreamClose, onClose),\n        }}\n      >\n        <MenuProvider\n          value={{\n            buttonRef,\n            closeOnSelect,\n            focusedIndex,\n            menuRef,\n            nested,\n            open,\n            requestAnimationFrameId,\n            setFocusedIndex,\n            styles,\n            onClose,\n            onFocusFirstItem,\n            onFocusLastItem,\n            onOpen,\n            onUpstreamClose,\n          }}\n        >\n          <Popover\n            {...{\n              trigger: nested ? \"hover\" : \"click\",\n              ...rest,\n              closeOnBlur,\n              closeOnButton: false,\n              duration,\n              initialFocusRef,\n              offset,\n              open,\n              placement,\n              relatedRef,\n              onClose,\n              onOpen,\n            }}\n          />\n        </MenuProvider>\n      </UpstreamMenuProvider>\n    </DescendantsContextProvider>\n  )\n}\n\nMenu.__ui__ = \"Menu\"\n","import type { CSSUIObject } from \"@yamada-ui/core\"\nimport type {\n  Dispatch,\n  KeyboardEventHandler,\n  MutableRefObject,\n  RefObject,\n  SetStateAction,\n} from \"react\"\nimport type { MenuOptions } from \"./menu\"\nimport { createDescendant } from \"@yamada-ui/use-descendant\"\nimport { createContext } from \"@yamada-ui/utils\"\n\nexport const {\n  DescendantsContextProvider,\n  useDescendant: useMenuDescendant,\n  useDescendants,\n  useDescendantsContext: useMenuDescendantsContext,\n} = createDescendant()\n\ninterface MenuContext extends MenuOptions {\n  buttonRef: RefObject<HTMLButtonElement>\n  focusedIndex: number\n  menuRef: RefObject<HTMLDivElement>\n  nested: boolean\n  open: boolean\n  requestAnimationFrameId: MutableRefObject<null | number>\n  setFocusedIndex: Dispatch<SetStateAction<number>>\n  styles: { [key: string]: CSSUIObject | undefined }\n  onClose: () => void\n  onFocusFirstItem: () => void\n  onFocusLastItem: () => void\n  onOpen: () => void\n  onUpstreamClose?: () => void\n}\n\nexport const [MenuProvider, useMenu] = createContext<MenuContext>({\n  name: \"MenuContext\",\n  errorMessage: `useMenu returned is 'undefined'. Seems you forgot to wrap the components in \"<Menu />\"`,\n})\n\ninterface ContextMenuContext {\n  styles: { [key: string]: CSSUIObject | undefined }\n}\n\nexport const [ContextMenuProvider, useContextMenu] =\n  createContext<ContextMenuContext>({\n    name: \"ContextMenuContext\",\n    strict: false,\n  })\n\ninterface UpstreamMenuContext {\n  relatedRef: RefObject<HTMLElement>\n  onDownstreamCloseMapRef: MutableRefObject<Map<string, () => void>>\n  onUpstreamClose: () => void\n}\n\nexport const [UpstreamMenuProvider, useUpstreamMenu] =\n  createContext<UpstreamMenuContext>({\n    name: \"UpstreamMenuContext\",\n    strict: false,\n  })\n\ninterface UpstreamMenuItemContext {\n  hasDownstreamRef: MutableRefObject<boolean>\n  setDownstreamOpen: Dispatch<SetStateAction<boolean>>\n  onKeyDownRef: RefObject<KeyboardEventHandler<HTMLDivElement>>\n  onUpstreamRestoreFocus: () => void\n}\n\nexport const [UpstreamMenuItemProvider, useUpstreamMenuItem] =\n  createContext<UpstreamMenuItemContext>({\n    name: \"UpstreamMenuItemContext\",\n    strict: false,\n  })\n"],"mappings":"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","names":["import_core","import_utils","_a","id","onClose","import_jsx_runtime"]}

package/dist/context-menu.mjs

@@ -1,9 +1,9 @@
 "use client"
 import {
   ContextMenu
-} from "./chunk-KGWPKJI2.mjs";
-import "./chunk-OP45KQJ6.mjs";
-import "./chunk-HAW3H5KJ.mjs";
+} from "./chunk-H662AKOV.mjs";
+import "./chunk-JTGSHZXB.mjs";
+import "./chunk-IWH3B4PS.mjs";
 export {
   ContextMenu
 };

package/dist/index.js

@@ -96,8 +96,8 @@ var Menu = (props) => {
   } = (0, import_core.omitThemeProps)(mergedProps);
   const { relatedRef, onDownstreamCloseMapRef, onUpstreamClose } = (_b = useUpstreamMenu()) != null ? _b : {};
   const { hasDownstreamRef, setDownstreamOpen } = (_c = useUpstreamMenuItem()) != null ? _c : {};
-  const isNested = !!relatedRef;
-  if (isNested) {
+  const nested = !!relatedRef;
+  if (nested) {
     placement != null ? placement : placement = "right-start";
     offset != null ? offset : offset = [-8, 8];
     closeOnBlur != null ? closeOnBlur : closeOnBlur = false;
@@ -137,8 +137,8 @@ var Menu = (props) => {
   }, [descendants, initialFocusRef]);
   const onOpenInternal = (0, import_react.useCallback)(() => {
     onOpenProp == null ? void 0 : onOpenProp();
-    if (!isNested) onFocusMenu();
-  }, [onOpenProp, isNested, onFocusMenu]);
+    if (!nested) onFocusMenu();
+  }, [onOpenProp, nested, onFocusMenu]);
   const onCloseInternal = (0, import_react.useCallback)(() => {
     onCloseProp == null ? void 0 : onCloseProp();
     for (const onClose2 of onCloseMapRef.current.values()) {
@@ -146,7 +146,7 @@ var Menu = (props) => {
     }
   }, [onCloseProp]);
   const id = (0, import_react.useId)();
-  const { isOpen, onClose, onOpen } = (0, import_use_disclosure.useDisclosure)({
+  const { open, onClose, onOpen } = (0, import_use_disclosure.useDisclosure)({
     ...props,
     onClose: onCloseInternal,
     onOpen: onOpenInternal
@@ -159,8 +159,8 @@ var Menu = (props) => {
     };
   }, [id, onClose, onDownstreamCloseMapRef]);
   (0, import_react.useEffect)(() => {
-    if (setDownstreamOpen) setDownstreamOpen(isOpen);
-  }, [setDownstreamOpen, isOpen]);
+    if (setDownstreamOpen) setDownstreamOpen(open);
+  }, [setDownstreamOpen, open]);
   (0, import_react.useEffect)(() => {
     if (hasDownstreamRef) hasDownstreamRef.current = true;
     return () => {
@@ -168,8 +168,8 @@ var Menu = (props) => {
     };
   });
   (0, import_utils2.useUpdateEffect)(() => {
-    if (!isOpen) setFocusedIndex(-1);
-  }, [isOpen]);
+    if (!open) setFocusedIndex(-1);
+  }, [open]);
   (0, import_utils2.useUnmountEffect)(() => {
     timeoutIds.current.forEach((id2) => clearTimeout(id2));
     timeoutIds.current.clear();
@@ -189,9 +189,9 @@ var Menu = (props) => {
             buttonRef,
             closeOnSelect,
             focusedIndex,
-            isNested,
-            isOpen,
             menuRef,
+            nested,
+            open,
             requestAnimationFrameId,
             setFocusedIndex,
             styles,
@@ -205,14 +205,14 @@ var Menu = (props) => {
             import_popover.Popover,
             {
               ...{
-                trigger: isNested ? "hover" : "click",
+                trigger: nested ? "hover" : "click",
                 ...rest,
                 closeOnBlur,
                 closeOnButton: false,
                 duration,
                 initialFocusRef,
-                isOpen,
                 offset,
+                open,
                 placement,
                 relatedRef,
                 onClose,
@@ -302,18 +302,22 @@ var MenuItem = (0, import_core4.forwardRef)(
     children,
     closeOnSelect: customCloseOnSelect,
     command,
+    disabled,
+    focusable,
     icon,
     isDisabled,
     isFocusable,
     ...props
   }, ref) => {
     var _a, _b;
+    disabled != null ? disabled : disabled = isDisabled;
+    focusable != null ? focusable : focusable = isFocusable;
     const {
       closeOnSelect,
       focusedIndex,
-      isNested,
-      isOpen,
       menuRef,
+      nested,
+      open,
       requestAnimationFrameId,
       setFocusedIndex,
       styles,
@@ -321,7 +325,7 @@ var MenuItem = (0, import_core4.forwardRef)(
       onUpstreamClose
     } = useMenu();
     const { onUpstreamRestoreFocus } = (_a = useUpstreamMenuItem()) != null ? _a : {};
-    const [isDownstreamOpen, setDownstreamOpen] = (0, import_react3.useState)(false);
+    const [downstreamOpen, setDownstreamOpen] = (0, import_react3.useState)(false);
     const uuid = (0, import_react3.useId)();
     const itemRef = (0, import_react3.useRef)(null);
     const hasDownstreamRef = (0, import_react3.useRef)(false);
@@ -329,19 +333,19 @@ var MenuItem = (0, import_core4.forwardRef)(
       () => void 0
     );
     id != null ? id : id = uuid;
-    const trulyDisabled = isDisabled && !isFocusable;
+    const trulyDisabled = disabled && !focusable;
     const type = (_b = itemRef.current) == null ? void 0 : _b.getAttribute("type");
     const role = !!type ? type === "checkbox" ? "menuitemcheckbox" : "menuitemradio" : "menuitem";
     const { index, register } = useMenuDescendant({ disabled: trulyDisabled });
-    const isFocused = index === focusedIndex;
+    const focused = index === focusedIndex;
     const onMouseOver = (0, import_react3.useCallback)(() => {
-      if (isDisabled) return;
+      if (disabled) return;
       setFocusedIndex(index);
-    }, [index, isDisabled, setFocusedIndex]);
+    }, [index, disabled, setFocusedIndex]);
     const onMouseLeave = (0, import_react3.useCallback)(() => {
-      if (isDisabled) return;
+      if (disabled) return;
       setFocusedIndex(-1);
-    }, [setFocusedIndex, isDisabled]);
+    }, [setFocusedIndex, disabled]);
     const onClick = (0, import_react3.useCallback)(
       (ev) => {
         if (!isTargetMenuItem(ev.currentTarget)) return;
@@ -365,7 +369,7 @@ var MenuItem = (0, import_core4.forwardRef)(
       (ev) => {
         if (ev.key === " ") ev.key = ev.code;
         const actions = {
-          ArrowLeft: isNested ? (0, import_utils4.funcAll)(onUpstreamRestoreFocus, onClose) : void 0,
+          ArrowLeft: nested ? (0, import_utils4.funcAll)(onUpstreamRestoreFocus, onClose) : void 0,
           Space: !hasDownstreamRef.current ? (0, import_utils4.funcAll)(onUpstreamClose, onClose) : void 0
         };
         const action = actions[ev.key];
@@ -374,15 +378,15 @@ var MenuItem = (0, import_core4.forwardRef)(
         ev.stopPropagation();
         action();
       },
-      [isNested, onUpstreamRestoreFocus, onClose, onUpstreamClose]
+      [nested, onUpstreamRestoreFocus, onClose, onUpstreamClose]
     );
     const rest = (0, import_use_clickable.useClickable)({
       clickOnSpace: false,
       focusOnClick: false,
       ...props,
       ref: (0, import_utils4.mergeRefs)(register, itemRef, ref),
-      isDisabled,
-      isFocusable,
+      disabled,
+      focusable,
       onClick: (0, import_utils4.handlerAll)(props.onClick, onClick),
       onFocus: (0, import_utils4.handlerAll)(props.onFocus, onFocus),
       onKeyDown: (0, import_utils4.handlerAll)(props.onKeyDown, onKeyDown, onKeyDownRef.current),
@@ -390,9 +394,9 @@ var MenuItem = (0, import_core4.forwardRef)(
       onMouseOver: (0, import_utils4.handlerAll)(props.onMouseOver, onMouseOver)
     });
     (0, import_utils4.useUpdateEffect)(() => {
-      if (!isOpen) return;
+      if (!open) return;
       const id2 = requestAnimationFrameId.current;
-      if (isFocused && !trulyDisabled && itemRef.current) {
+      if (focused && !trulyDisabled && itemRef.current) {
         if (id2) cancelAnimationFrame(id2);
         requestAnimationFrameId.current = requestAnimationFrame(() => {
           var _a2;
@@ -405,7 +409,7 @@ var MenuItem = (0, import_core4.forwardRef)(
       return () => {
         if (id2) cancelAnimationFrame(id2);
       };
-    }, [isFocused, trulyDisabled, menuRef, isOpen]);
+    }, [focused, trulyDisabled, menuRef, open]);
     children = icon || command ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_core4.ui.span, { style: { flex: 1 }, children }) : children;
     const css = {
       alignItems: "center",
@@ -434,11 +438,11 @@ var MenuItem = (0, import_core4.forwardRef)(
           {
             id,
             className: (0, import_utils4.cx)("ui-menu__item", className),
-            "data-focus": (0, import_utils4.dataAttr)(isDownstreamOpen),
+            "data-focus": (0, import_utils4.dataAttr)(downstreamOpen),
             __css: css,
             ...rest,
             role,
-            tabIndex: !isDownstreamOpen && isFocused ? 0 : -1,
+            tabIndex: !downstreamOpen && focused ? 0 : -1,
             children: [
               icon ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(MenuIcon, { children: icon }) : null,
               children,
@@ -453,17 +457,26 @@ var MenuItem = (0, import_core4.forwardRef)(
 MenuItem.displayName = "MenuItem";
 MenuItem.__ui__ = "MenuItem";
 var MenuOptionItem = (0, import_core4.forwardRef)(
-  ({ className, children, closeOnSelect = false, icon, isChecked, ...rest }, ref) => {
+  ({
+    className,
+    checked,
+    children,
+    closeOnSelect = false,
+    icon,
+    isChecked,
+    ...rest
+  }, ref) => {
+    checked != null ? checked : checked = isChecked;
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(
       MenuItem,
       {
         ref,
         className: (0, import_utils4.cx)("ui-menu__item--option", className),
-        "aria-checked": isChecked,
+        "aria-checked": checked,
         closeOnSelect,
         ...rest,
         children: [
-          icon !== null ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(MenuIcon, { opacity: isChecked ? 1 : 0, children: icon || /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CheckIcon, {}) }) : null,
+          icon !== null ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(MenuIcon, { opacity: checked ? 1 : 0, children: icon || /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(CheckIcon, {}) }) : null,
           children
         ]
       }
@@ -530,7 +543,7 @@ var MenuButton = (0, import_core5.forwardRef)(
     const { onKeyDownRef, onUpstreamRestoreFocus } = (_a = useUpstreamMenuItem()) != null ? _a : {};
     const {
       buttonRef,
-      isOpen,
+      open,
       onClose,
       onFocusFirstItem,
       onFocusLastItem,
@@ -558,17 +571,17 @@ var MenuButton = (0, import_core5.forwardRef)(
       (ev) => {
         if (ev.key === " ") ev.key = ev.code;
         const actions = {
-          ArrowLeft: isOpen ? (0, import_utils5.funcAll)(onUpstreamRestoreFocus, onClose) : void 0,
-          ArrowRight: !isOpen ? (0, import_utils5.funcAll)(onOpen, onFocusFirstItem) : void 0,
-          Enter: !isOpen ? (0, import_utils5.funcAll)(onOpen, onFocusFirstItem) : void 0,
-          Space: !isOpen ? (0, import_utils5.funcAll)(onOpen, onFocusFirstItem) : void 0
+          ArrowLeft: open ? (0, import_utils5.funcAll)(onUpstreamRestoreFocus, onClose) : void 0,
+          ArrowRight: !open ? (0, import_utils5.funcAll)(onOpen, onFocusFirstItem) : void 0,
+          Enter: !open ? (0, import_utils5.funcAll)(onOpen, onFocusFirstItem) : void 0,
+          Space: !open ? (0, import_utils5.funcAll)(onOpen, onFocusFirstItem) : void 0
         };
         const action = actions[ev.key];
         if (!action) return;
         ev.preventDefault();
         action();
       },
-      [isOpen, onOpen, onFocusFirstItem, onUpstreamRestoreFocus, onClose]
+      [open, onOpen, onFocusFirstItem, onUpstreamRestoreFocus, onClose]
     );
     (0, import_utils5.assignRef)(onKeyDownRef, onItemKeyDown);
     const Component = (0, import_react4.useMemo)(() => as ? (0, import_core5.ui)(as) : Button, [as]);
@@ -580,7 +593,7 @@ var MenuButton = (0, import_core5.forwardRef)(
         className: (0, import_utils5.cx)("ui-menu", className),
         "aria-haspopup": "menu",
         ...rest,
-        "data-active": (0, import_utils5.dataAttr)(isOpen),
+        "data-active": (0, import_utils5.dataAttr)(open),
         onKeyDown: (0, import_utils5.handlerAll)(rest.onKeyDown, onKeyDown),
         children
       }
@@ -780,8 +793,8 @@ var MenuOptionGroup = (0, import_react7.forwardRef)(
     onChange: onChangeProp,
     ...rest
   }, ref) => {
-    const isRadio = type === "radio";
-    defaultValue != null ? defaultValue : defaultValue = isRadio ? "" : [];
+    const radio = type === "radio";
+    defaultValue != null ? defaultValue : defaultValue = radio ? "" : [];
     const [value, setValue] = (0, import_use_controllable_state.useControllableState)({
       defaultValue,
       value: valueProp,
@@ -789,13 +802,13 @@ var MenuOptionGroup = (0, import_react7.forwardRef)(
     });
     const onChange = (0, import_react7.useCallback)(
       (selectedValue) => {
-        if (isRadio && typeof value === "string") setValue(selectedValue);
-        if (!isRadio && (0, import_utils9.isArray)(value)) {
+        if (radio && (0, import_utils9.isString)(value)) setValue(selectedValue);
+        if (!radio && (0, import_utils9.isArray)(value)) {
           const nextValue = value.includes(selectedValue) ? value.filter((item) => item !== selectedValue) : value.concat(selectedValue);
           setValue(nextValue);
         }
       },
-      [isRadio, value, setValue]
+      [radio, value, setValue]
     );
     const validChildren = (0, import_utils9.getValidChildren)(children);
     const cloneChildren = validChildren.map((child) => {
@@ -805,8 +818,8 @@ var MenuOptionGroup = (0, import_react7.forwardRef)(
         onChange(child.props.value);
         (_b = (_a = child.props).onClick) == null ? void 0 : _b.call(_a, ev);
       };
-      const isChecked = !isRadio && (0, import_utils9.isArray)(value) ? value.includes(child.props.value) : child.props.value === value;
-      return (0, import_react7.cloneElement)(child, { type, isChecked, onClick });
+      const checked = !radio && (0, import_utils9.isArray)(value) ? value.includes(child.props.value) : child.props.value === value;
+      return (0, import_react7.cloneElement)(child, { type, checked, onClick });
     });
     return /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(
       MenuGroup,