@mirohq/design-system-dropdown-menu 4.4.7 → 4.4.9

package/dist/main.js

@@ -14,6 +14,7 @@ var designSystemStitches = require('@mirohq/design-system-stitches');
 var designSystemStyles = require('@mirohq/design-system-styles');
 var designSystemBaseHotkey = require('@mirohq/design-system-base-hotkey');
 var designSystemUseLayoutEffect = require('@mirohq/design-system-use-layout-effect');
+var designSystemUseAriaDisabled = require('@mirohq/design-system-use-aria-disabled');
 var designSystemScrollArea = require('@mirohq/design-system-scroll-area');
 var designSystemBaseSwitch = require('@mirohq/design-system-base-switch');
 var utils = require('@react-aria/utils');
@@ -273,29 +274,24 @@ const RightSlot = (props) => {
   return /* @__PURE__ */ jsxRuntime.jsx(StyledRightSlot, { ref, ...props });
 };
 
-const useAriaDisabled = ({
-  "aria-disabled": ariaDisabled,
-  onKeyDown,
-  onSelect,
-  onPointerMove,
-  onClick
-}, closeOnCheck = true) => React.useMemo(
-  () => ({
-    "aria-disabled": designSystemUtils.booleanify(ariaDisabled) ? ariaDisabled : void 0,
-    onKeyDown: (e) => {
-      if (designSystemUtils.booleanify(ariaDisabled) && e.code !== "ArrowUp" && e.code !== "ArrowDown" && e.code !== "Escape") {
-        e.preventDefault();
-        e.stopPropagation();
-        return;
-      }
-      onKeyDown == null ? void 0 : onKeyDown(e);
-    },
+const useAriaDisabled = ({ onSelect, ...restProps }, { exceptions, closeOnSelect = true } = {}) => {
+  const elementProps = designSystemUseAriaDisabled.useAriaDisabled(restProps, {
+    ...exceptions,
+    allowArrows: true
+  });
+  const { "aria-disabled": ariaDisabled, onPointerMove, onClick } = elementProps;
+  return {
+    ...elementProps,
+    // these events need to be manually included
+    // bacause useAriaDisabled only removes the events from the props.
+    // Radix uses these events to handle the dropdown menu so we need to prevent
+    // it from being called when the item is aria-disabled.
     onSelect: (e) => {
       if (designSystemUtils.booleanify(ariaDisabled)) {
         e.preventDefault();
         return;
       }
-      if (!closeOnCheck) {
+      if (!closeOnSelect) {
         e.preventDefault();
       }
       onSelect == null ? void 0 : onSelect(e);
@@ -314,9 +310,8 @@ const useAriaDisabled = ({
       }
       onClick == null ? void 0 : onClick(e);
     }
-  }),
-  [ariaDisabled, onKeyDown, onSelect, onPointerMove, onClick, closeOnCheck]
-);
+  };
+};
 
 const Context = React.createContext({
   leftSlotMount: () => {
@@ -360,16 +355,15 @@ const CheckboxItem = React__default["default"].forwardRef(
     variant = "ghost",
     ...restProps
   }, forwardRef) => {
-    const ariaDisabledProps = useAriaDisabled(restProps, closeOnSelect);
-    const { "aria-disabled": ariaDisabled } = ariaDisabledProps;
+    const elementProps = useAriaDisabled(restProps, { closeOnSelect });
+    const { "aria-disabled": ariaDisabled } = restProps;
     const iconCss = { square: "100%", display: "block" };
     const isAriaDisabled = designSystemUtils.booleanify(ariaDisabled != null ? ariaDisabled : false);
     const disabledUnchecked = (disabled === true || isAriaDisabled) && checked === false;
     return /* @__PURE__ */ jsxRuntime.jsx(ItemProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(
       StyledCheckboxItem,
       {
-        ...restProps,
-        ...ariaDisabledProps,
+        ...elementProps,
         ref: forwardRef,
         checked,
         disabled,
@@ -575,12 +569,11 @@ const StyledItem = designSystemStitches.styled(RadixDropdownMenu__namespace.Item
 
 const Item = React__default["default"].forwardRef(
   ({ disabled = false, variant = "subtle", ...restProps }, forwardRef) => {
-    const ariaDisabledProps = useAriaDisabled(restProps);
+    const elementProps = useAriaDisabled(restProps);
     return /* @__PURE__ */ jsxRuntime.jsx(ItemProvider, { children: /* @__PURE__ */ jsxRuntime.jsx(
       StyledItem,
       {
-        ...restProps,
-        ...ariaDisabledProps,
+        ...elementProps,
         variant,
         disabled,
         ref: forwardRef
@@ -589,10 +582,7 @@ const Item = React__default["default"].forwardRef(
   }
 );
 
-const LinkItem = React__default["default"].forwardRef(({ children, href, ...restProps }, forwardRef) => {
-  const ariaDisabledProps = useAriaDisabled(restProps);
-  return /* @__PURE__ */ jsxRuntime.jsx(Item, { asChild: true, ref: forwardRef, ...restProps, ...ariaDisabledProps, children: /* @__PURE__ */ jsxRuntime.jsx("a", { href, children }) });
-});
+const LinkItem = React__default["default"].forwardRef(({ children, href, ...restProps }, forwardRef) => /* @__PURE__ */ jsxRuntime.jsx(Item, { asChild: true, ref: forwardRef, ...restProps, children: /* @__PURE__ */ jsxRuntime.jsx("a", { href, children }) }));
 
 const StyledRadioGroup = designSystemStitches.styled(RadixDropdownMenu__namespace.RadioGroup, {
   display: "grid",
@@ -662,23 +652,16 @@ const StyledRadioItem = designSystemStitches.styled(RadixDropdownMenu__namespace
 });
 
 const RadioItem = React__default["default"].forwardRef(({ disabled, children, closeOnSelect = false, ...restProps }, forwardRef) => {
-  const ariaDisabledProps = useAriaDisabled(restProps, closeOnSelect);
-  return /* @__PURE__ */ jsxRuntime.jsx(ItemProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(
-    StyledRadioItem,
-    {
-      ...restProps,
-      ...ariaDisabledProps,
-      disabled,
-      ref: forwardRef,
-      children: [
-        children,
-        /* @__PURE__ */ jsxRuntime.jsx(RightSlot, { children: /* @__PURE__ */ jsxRuntime.jsxs(StyledRadioContainer, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(StyledPill, {}),
-          /* @__PURE__ */ jsxRuntime.jsx(StyledProhibited, { weight: "thin" })
-        ] }) })
-      ]
-    }
-  ) });
+  const elementProps = useAriaDisabled(restProps, {
+    closeOnSelect
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(ItemProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(StyledRadioItem, { ...elementProps, disabled, ref: forwardRef, children: [
+    children,
+    /* @__PURE__ */ jsxRuntime.jsx(RightSlot, { children: /* @__PURE__ */ jsxRuntime.jsxs(StyledRadioContainer, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(StyledPill, {}),
+      /* @__PURE__ */ jsxRuntime.jsx(StyledProhibited, { weight: "thin" })
+    ] }) })
+  ] }) });
 });
 
 const StyledSeparator = designSystemStitches.styled(RadixDropdownMenu__namespace.Separator, {
@@ -705,16 +688,15 @@ const SwitchItem = React__default["default"].forwardRef(
     disabled,
     checked,
     onChange,
-    children,
     closeOnSelect = false,
+    children,
     ...restProps
   }, forwardRef) => {
-    const ariaDisabledProps = useAriaDisabled(restProps, closeOnSelect);
+    const elementProps = useAriaDisabled(restProps, { closeOnSelect });
     return /* @__PURE__ */ jsxRuntime.jsx(ItemProvider, { children: /* @__PURE__ */ jsxRuntime.jsxs(
       StyledSwitchItem,
       {
-        ...restProps,
-        ...ariaDisabledProps,
+        ...elementProps,
         disabled,
         checked,
         onCheckedChange: onChange,
@@ -798,29 +780,18 @@ const StyledSubTrigger = designSystemStitches.styled(RadixDropdownMenu__namespac
 });
 
 const SubTrigger = React__default["default"].forwardRef(({ children, disabled = false, ...restProps }, forwardRef) => {
-  const { onSelect, ...ariaDisabledProps } = useAriaDisabled({
-    onKeyDown: restProps.onKeyDown,
-    "aria-disabled": restProps["aria-disabled"]
-  });
-  return /* @__PURE__ */ jsxRuntime.jsxs(
-    StyledSubTrigger,
-    {
-      ...restProps,
-      ...ariaDisabledProps,
-      disabled,
-      ref: forwardRef,
-      children: [
-        children,
-        /* @__PURE__ */ jsxRuntime.jsx(RightSlot, { children: /* @__PURE__ */ jsxRuntime.jsx(
-          StyledIconContainer,
-          {
-            "data-testid": process.env.NODE_ENV === "test" ? "submenu-arrow-icon" : void 0,
-            children: /* @__PURE__ */ jsxRuntime.jsx(designSystemIcons.IconChevronRight, { size: "small", weight: "thin" })
-          }
-        ) })
-      ]
-    }
-  );
+  let { onSelect, ...elementProps } = restProps;
+  elementProps = useAriaDisabled(elementProps);
+  return /* @__PURE__ */ jsxRuntime.jsxs(StyledSubTrigger, { ...elementProps, disabled, ref: forwardRef, children: [
+    children,
+    /* @__PURE__ */ jsxRuntime.jsx(RightSlot, { children: /* @__PURE__ */ jsxRuntime.jsx(
+      StyledIconContainer,
+      {
+        "data-testid": process.env.NODE_ENV === "test" ? "submenu-arrow-icon" : void 0,
+        children: /* @__PURE__ */ jsxRuntime.jsx(designSystemIcons.IconChevronRight, { size: "small", weight: "thin" })
+      }
+    ) })
+  ] });
 });
 
 const StyledSubContent = designSystemStitches.styled(