@mirohq/design-system-dropdown-menu 4.4.8 → 4.4.10-dropdown-on-pointerup.0

package/dist/module.js

@@ -1,5 +1,5 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import React, { createContext, useState, useRef, useCallback, useContext, useMemo, useEffect } from 'react';
+import React, { createContext, useState, useRef, useCallback, useContext, useEffect } from 'react';
 import * as RadixDropdownMenu from '@radix-ui/react-dropdown-menu';
 import { Portal as Portal$1 } from '@radix-ui/react-dropdown-menu';
 import { BaseTooltipProvider, useBaseTooltipContext } from '@mirohq/design-system-base-tooltip';
@@ -11,9 +11,11 @@ import { styled, theme } from '@mirohq/design-system-stitches';
 import { focus, animations } from '@mirohq/design-system-styles';
 import { Hotkey as Hotkey$1 } from '@mirohq/design-system-base-hotkey';
 import { useLayoutEffect } from '@mirohq/design-system-use-layout-effect';
+import { useAriaDisabled as useAriaDisabled$1 } from '@mirohq/design-system-use-aria-disabled';
 import { ScrollArea } from '@mirohq/design-system-scroll-area';
 import { styles, Thumb } from '@mirohq/design-system-base-switch';
-import { isVirtualClick } from '@react-aria/utils';
+import { mergeProps, isVirtualClick } from '@react-aria/utils';
+import { usePress } from '@mirohq/design-system-use-press';
 import { styles as styles$1, isIconComponent } from '@mirohq/design-system-base-icon';
 
 const ItemDescription = styled(Primitive.div, {
@@ -247,29 +249,24 @@ const RightSlot = (props) => {
   return /* @__PURE__ */ jsx(StyledRightSlot, { ref, ...props });
 };
 
-const useAriaDisabled = ({
-  "aria-disabled": ariaDisabled,
-  onKeyDown,
-  onSelect,
-  onPointerMove,
-  onClick
-}, closeOnCheck = true) => useMemo(
-  () => ({
-    "aria-disabled": booleanify(ariaDisabled) ? ariaDisabled : void 0,
-    onKeyDown: (e) => {
-      if (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 = useAriaDisabled$1(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 (booleanify(ariaDisabled)) {
         e.preventDefault();
         return;
       }
-      if (!closeOnCheck) {
+      if (!closeOnSelect) {
         e.preventDefault();
       }
       onSelect == null ? void 0 : onSelect(e);
@@ -288,9 +285,8 @@ const useAriaDisabled = ({
       }
       onClick == null ? void 0 : onClick(e);
     }
-  }),
-  [ariaDisabled, onKeyDown, onSelect, onPointerMove, onClick, closeOnCheck]
-);
+  };
+};
 
 const Context = createContext({
   leftSlotMount: () => {
@@ -334,16 +330,15 @@ const CheckboxItem = React.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 = booleanify(ariaDisabled != null ? ariaDisabled : false);
     const disabledUnchecked = (disabled === true || isAriaDisabled) && checked === false;
     return /* @__PURE__ */ jsx(ItemProvider, { children: /* @__PURE__ */ jsxs(
       StyledCheckboxItem,
       {
-        ...restProps,
-        ...ariaDisabledProps,
+        ...elementProps,
         ref: forwardRef,
         checked,
         disabled,
@@ -460,16 +455,25 @@ const ScrollableContent = ({
 const DropdownContext = createContext({});
 const DropdownProvider = ({
   children,
+  open: rootOpen,
   ...restProps
-}) => /* @__PURE__ */ jsx(
-  DropdownContext.Provider,
-  {
-    value: {
-      ...restProps
-    },
-    children
-  }
-);
+}) => {
+  const [open, setOpen] = useState(rootOpen);
+  const triggerRef = useRef(null);
+  return /* @__PURE__ */ jsx(
+    DropdownContext.Provider,
+    {
+      value: {
+        ...restProps,
+        rootOpen,
+        open,
+        setOpen,
+        triggerRef
+      },
+      children
+    }
+  );
+};
 const useDropdownContext = () => useContext(DropdownContext);
 
 const Content = React.forwardRef(
@@ -486,10 +490,11 @@ const Content = React.forwardRef(
     containerSpacing = "medium",
     overflow = "visible",
     maxHeight,
+    onInteractOutside,
     children,
     ...restProps
   }, forwardRef) => {
-    const { direction } = useDropdownContext();
+    const { direction, triggerRef } = useDropdownContext();
     return /* @__PURE__ */ jsx(ContentProvider, { containerSpacing, children: /* @__PURE__ */ jsx(
       StyledContent,
       {
@@ -504,6 +509,12 @@ const Content = React.forwardRef(
         collisionPadding,
         sticky,
         hideWhenDetached,
+        onInteractOutside: (e) => {
+          if (e.target === triggerRef.current) {
+            e.preventDefault();
+          }
+          onInteractOutside == null ? void 0 : onInteractOutside(e);
+        },
         children: /* @__PURE__ */ jsx(
           ScrollableContent,
           {
@@ -549,12 +560,11 @@ const StyledItem = styled(RadixDropdownMenu.Item, {
 
 const Item = React.forwardRef(
   ({ disabled = false, variant = "subtle", ...restProps }, forwardRef) => {
-    const ariaDisabledProps = useAriaDisabled(restProps);
+    const elementProps = useAriaDisabled(restProps);
     return /* @__PURE__ */ jsx(ItemProvider, { children: /* @__PURE__ */ jsx(
       StyledItem,
       {
-        ...restProps,
-        ...ariaDisabledProps,
+        ...elementProps,
         variant,
         disabled,
         ref: forwardRef
@@ -563,10 +573,7 @@ const Item = React.forwardRef(
   }
 );
 
-const LinkItem = React.forwardRef(({ children, href, ...restProps }, forwardRef) => {
-  const ariaDisabledProps = useAriaDisabled(restProps);
-  return /* @__PURE__ */ jsx(Item, { asChild: true, ref: forwardRef, ...restProps, ...ariaDisabledProps, children: /* @__PURE__ */ jsx("a", { href, children }) });
-});
+const LinkItem = React.forwardRef(({ children, href, ...restProps }, forwardRef) => /* @__PURE__ */ jsx(Item, { asChild: true, ref: forwardRef, ...restProps, children: /* @__PURE__ */ jsx("a", { href, children }) }));
 
 const StyledRadioGroup = styled(RadixDropdownMenu.RadioGroup, {
   display: "grid",
@@ -636,23 +643,16 @@ const StyledRadioItem = styled(RadixDropdownMenu.RadioItem, {
 });
 
 const RadioItem = React.forwardRef(({ disabled, children, closeOnSelect = false, ...restProps }, forwardRef) => {
-  const ariaDisabledProps = useAriaDisabled(restProps, closeOnSelect);
-  return /* @__PURE__ */ jsx(ItemProvider, { children: /* @__PURE__ */ jsxs(
-    StyledRadioItem,
-    {
-      ...restProps,
-      ...ariaDisabledProps,
-      disabled,
-      ref: forwardRef,
-      children: [
-        children,
-        /* @__PURE__ */ jsx(RightSlot, { children: /* @__PURE__ */ jsxs(StyledRadioContainer, { children: [
-          /* @__PURE__ */ jsx(StyledPill, {}),
-          /* @__PURE__ */ jsx(StyledProhibited, { weight: "thin" })
-        ] }) })
-      ]
-    }
-  ) });
+  const elementProps = useAriaDisabled(restProps, {
+    closeOnSelect
+  });
+  return /* @__PURE__ */ jsx(ItemProvider, { children: /* @__PURE__ */ jsxs(StyledRadioItem, { ...elementProps, disabled, ref: forwardRef, children: [
+    children,
+    /* @__PURE__ */ jsx(RightSlot, { children: /* @__PURE__ */ jsxs(StyledRadioContainer, { children: [
+      /* @__PURE__ */ jsx(StyledPill, {}),
+      /* @__PURE__ */ jsx(StyledProhibited, { weight: "thin" })
+    ] }) })
+  ] }) });
 });
 
 const StyledSeparator = styled(RadixDropdownMenu.Separator, {
@@ -679,16 +679,15 @@ const SwitchItem = React.forwardRef(
     disabled,
     checked,
     onChange,
-    children,
     closeOnSelect = false,
+    children,
     ...restProps
   }, forwardRef) => {
-    const ariaDisabledProps = useAriaDisabled(restProps, closeOnSelect);
+    const elementProps = useAriaDisabled(restProps, { closeOnSelect });
     return /* @__PURE__ */ jsx(ItemProvider, { children: /* @__PURE__ */ jsxs(
       StyledSwitchItem,
       {
-        ...restProps,
-        ...ariaDisabledProps,
+        ...elementProps,
         disabled,
         checked,
         onCheckedChange: onChange,
@@ -721,8 +720,9 @@ const StyledTrigger = styled(RadixDropdownMenu.Trigger, {
   }
 });
 
-const Trigger = React.forwardRef(({ asChild = false, onClick, ...restProps }, forwardRef) => {
+const Trigger = React.forwardRef(({ asChild = false, ...restProps }, forwardRef) => {
   const ref = useRef(null);
+  const { setOpen, rootOpen, triggerRef } = useDropdownContext();
   const handleVirtualClick = (e) => {
     var _a;
     if ((e == null ? void 0 : e.nativeEvent) === void 0) {
@@ -743,15 +743,40 @@ const Trigger = React.forwardRef(({ asChild = false, onClick, ...restProps }, fo
       (_a = ref.current) == null ? void 0 : _a.dispatchEvent(pointerDownEvent);
     }
   };
+  const { pressProps } = usePress({
+    onPress: () => {
+      if (rootOpen === void 0) {
+        setOpen((open) => !booleanify(open));
+      }
+    }
+  });
+  const elementProps = mergeProps(restProps, pressProps);
   return /* @__PURE__ */ jsx(
     StyledTrigger,
     {
-      ...restProps,
+      ...elementProps,
       onClick: (e) => {
+        var _a, _b;
         handleVirtualClick(e);
-        onClick == null ? void 0 : onClick(e);
+        if (e instanceof MouseEvent) {
+          e.preventDefault();
+          (_a = elementProps.onClick) == null ? void 0 : _a.call(elementProps, e);
+        } else {
+          (_b = restProps.onClick) == null ? void 0 : _b.call(restProps, e);
+        }
       },
-      ref: mergeRefs([ref, forwardRef]),
+      onKeyDown: (e) => {
+        var _a, _b;
+        if ((e == null ? void 0 : e.nativeEvent) instanceof KeyboardEvent) {
+          if (!/^(Arrow|Tab|Escape)/.test(e.key)) {
+            e.preventDefault();
+          }
+          (_a = elementProps.onKeyDown) == null ? void 0 : _a.call(elementProps, e);
+        } else {
+          (_b = restProps.onKeyDown) == null ? void 0 : _b.call(restProps, e);
+        }
+      },
+      ref: mergeRefs([ref, triggerRef, forwardRef]),
       unstyled: !asChild,
       asChild
     }
@@ -772,29 +797,18 @@ const StyledSubTrigger = styled(RadixDropdownMenu.SubTrigger, {
 });
 
 const SubTrigger = React.forwardRef(({ children, disabled = false, ...restProps }, forwardRef) => {
-  const { onSelect, ...ariaDisabledProps } = useAriaDisabled({
-    onKeyDown: restProps.onKeyDown,
-    "aria-disabled": restProps["aria-disabled"]
-  });
-  return /* @__PURE__ */ jsxs(
-    StyledSubTrigger,
-    {
-      ...restProps,
-      ...ariaDisabledProps,
-      disabled,
-      ref: forwardRef,
-      children: [
-        children,
-        /* @__PURE__ */ jsx(RightSlot, { children: /* @__PURE__ */ jsx(
-          StyledIconContainer,
-          {
-            "data-testid": process.env.NODE_ENV === "test" ? "submenu-arrow-icon" : void 0,
-            children: /* @__PURE__ */ jsx(IconChevronRight, { size: "small", weight: "thin" })
-          }
-        ) })
-      ]
-    }
-  );
+  let { onSelect, ...elementProps } = restProps;
+  elementProps = useAriaDisabled(elementProps);
+  return /* @__PURE__ */ jsxs(StyledSubTrigger, { ...elementProps, disabled, ref: forwardRef, children: [
+    children,
+    /* @__PURE__ */ jsx(RightSlot, { children: /* @__PURE__ */ jsx(
+      StyledIconContainer,
+      {
+        "data-testid": process.env.NODE_ENV === "test" ? "submenu-arrow-icon" : void 0,
+        children: /* @__PURE__ */ jsx(IconChevronRight, { size: "small", weight: "thin" })
+      }
+    ) })
+  ] });
 });
 
 const StyledSubContent = styled(
@@ -913,39 +927,52 @@ const Root = ({
   defaultOpen = false,
   direction,
   interactOutside = false,
-  open,
   onOpen,
   onClose,
   ...restProps
 }) => {
   const { ignoreNextTooltip } = useBaseTooltipContext();
+  const { rootOpen, open, setOpen } = useDropdownContext();
   const prevOpen = usePrevious(open);
   useEffect(() => {
-    if (prevOpen === true && open === false) {
-      ignoreNextTooltip();
+    if (prevOpen !== open) {
+      if (open === true) {
+        onOpen == null ? void 0 : onOpen();
+      } else {
+        if (prevOpen === true) {
+          ignoreNextTooltip();
+        }
+        onClose == null ? void 0 : onClose();
+      }
     }
-  }, [ignoreNextTooltip, open, prevOpen]);
+  }, [open, prevOpen, onOpen, onClose, ignoreNextTooltip]);
   return /* @__PURE__ */ jsx(
     RadixDropdownMenu.Root,
     {
       ...restProps,
       dir: direction,
       modal: interactOutside,
-      open,
+      open: (
+        // use the root open state if it is defined
+        rootOpen != null ? rootOpen : defaultOpen && (prevOpen === void 0 || prevOpen === open) ? (
+          // only use defaultOpen in the first render then use the context open state
+          // if the open state is the same as the previous one, it is most likely a re-render and we should still use the defaultOpen
+          void 0
+        ) : (
+          // otherwise, use the user open state
+          open
+        )
+      ),
       defaultOpen,
-      onOpenChange: (newOpen) => {
-        if (!newOpen && open === void 0) {
-          ignoreNextTooltip();
-        }
-        newOpen ? onOpen == null ? void 0 : onOpen() : onClose == null ? void 0 : onClose();
-      }
+      onOpenChange: setOpen
     }
   );
 };
 const DropdownMenu = ({
   direction = "ltr",
+  open,
   ...restProps
-}) => /* @__PURE__ */ jsx(DropdownProvider, { direction, children: /* @__PURE__ */ jsx(BaseTooltipProvider, { children: /* @__PURE__ */ jsx(Root, { direction, ...restProps }) }) });
+}) => /* @__PURE__ */ jsx(DropdownProvider, { direction, open, children: /* @__PURE__ */ jsx(BaseTooltipProvider, { children: /* @__PURE__ */ jsx(Root, { direction, ...restProps }) }) });
 DropdownMenu.CheckboxItem = CheckboxItem;
 DropdownMenu.Content = Content;
 DropdownMenu.Hotkey = Hotkey;