@mirohq/design-system-dropdown-menu 3.3.0-dropdown.1 → 3.3.0-dropdown.11

package/dist/module.js

@@ -1,11 +1,14 @@
-import React, { useState } from 'react';
+import React, { createContext, useState, useRef, useCallback, useContext, useEffect, useMemo } from 'react';
 import * as RadixDropdownMenu from '@radix-ui/react-dropdown-menu';
 import { Portal as Portal$1 } from '@radix-ui/react-dropdown-menu';
-import { IconProhibit, IconCheckMark } from '@mirohq/design-system-icons';
+import { IconProhibit, IconCheckMark, IconChevronRight } from '@mirohq/design-system-icons';
+import { addPropsToChildren, booleanify } from '@mirohq/design-system-utils';
 import { Primitive } from '@mirohq/design-system-primitive';
 import { styled, theme } from '@mirohq/design-system-stitches';
 import { focus, animations } from '@mirohq/design-system-styles';
-import { Switch } from '@mirohq/design-system-switch';
+import { ScrollArea } from '@mirohq/design-system-scroll-area';
+import { styles, Thumb } from '@mirohq/design-system-base-switch';
+import { styles as styles$1, isIconComponent } from '@mirohq/design-system-base-icon';
 
 const ItemDescription = styled(Primitive.div, {
   display: "-webkit-box",
@@ -15,6 +18,113 @@ const ItemDescription = styled(Primitive.div, {
   overflow: "hidden",
   gridArea: "item-description",
   fontSize: "$150",
+  lineHeight: 1.5,
+  color: "$text-neutrals-subtle"
+});
+
+const LeftSlot = styled(Primitive.div, {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  marginRight: "$100",
+  gridArea: "left-slot"
+});
+
+const StyledIllustrationSlot = styled(LeftSlot, {
+  width: "$13"
+});
+
+const Context$1 = createContext({
+  rightSlotMount: () => 0,
+  rightSlotDestroy: () => {
+  },
+  containerSpacing: "medium"
+});
+const ContentProvider = ({
+  children,
+  containerSpacing = "medium"
+}) => {
+  const [maxWidth, setMaxWidth] = useState(0);
+  const maxRef = useRef(0);
+  const indexRef = useRef(0);
+  const widthMapRef = useRef(/* @__PURE__ */ new Map());
+  const updateMaxWith = useCallback((value) => {
+    maxRef.current = value;
+    setMaxWidth(value);
+  }, []);
+  const rightSlotMount = useCallback(
+    (width) => {
+      indexRef.current++;
+      widthMapRef.current.set(indexRef.current, width);
+      if (width > maxRef.current) {
+        updateMaxWith(width);
+      }
+      return indexRef.current;
+    },
+    [updateMaxWith]
+  );
+  const rightSlotDestroy = useCallback(
+    (index) => {
+      widthMapRef.current.delete(index);
+      if (widthMapRef.current.size === 0) {
+        updateMaxWith(0);
+      } else {
+        const maximum = Math.max(...Array.from(widthMapRef.current.values()));
+        updateMaxWith(maximum);
+      }
+    },
+    [updateMaxWith]
+  );
+  const formattedChildren = addPropsToChildren(children, () => true, {
+    UNSAFE_style: {
+      "--right-slot-max-width": `${Math.ceil(maxWidth)}px`
+    }
+  });
+  return /* @__PURE__ */ React.createElement(Context$1.Provider, {
+    value: {
+      rightSlotMount,
+      rightSlotDestroy,
+      containerSpacing
+    }
+  }, formattedChildren);
+};
+const useContent = () => useContext(Context$1);
+
+const StyledRightSlot = styled(Primitive.div, {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+  marginLeft: "auto",
+  paddingLeft: "$200",
+  gridArea: "right-slot",
+  height: "$5",
+  width: "$7",
+  minWidth: "max-content",
+  textAlign: "right",
+  "&:empty": {
+    paddingLeft: "$none"
+  }
+});
+
+const RightSlot = (props) => {
+  const { rightSlotMount, rightSlotDestroy } = useContent();
+  const ref = useRef(null);
+  useEffect(() => {
+    if (ref.current !== null) {
+      const width = ref.current.getBoundingClientRect().width;
+      const index = rightSlotMount(width);
+      return () => rightSlotDestroy(index);
+    }
+    return () => {
+    };
+  }, [rightSlotMount, rightSlotDestroy, ref]);
+  return /* @__PURE__ */ React.createElement(StyledRightSlot, {
+    ref,
+    ...props
+  });
+};
+
+const HotkeySlot = styled(RightSlot, {
   color: "$text-neutrals-subtle"
 });
 
@@ -26,115 +136,184 @@ const itemDefaults = {
   color: "$text-neutrals",
   borderRadius: "$50",
   display: "grid",
-  gridTemplateColumns: "auto 1fr auto",
-  gridTemplateRows: "1fr auto",
-  gridTemplateAreas: `
-    'left-slot item-text right-slot'
-    'left-slot item-description right-slot'
-  `,
-  alignItems: "center",
-  minHeight: "$11",
-  padding: "$100 $150",
+  gridTemplateColumns: "auto 1fr minmax(auto, var(--right-slot-max-width))",
+  gridTemplateRows: "auto 1fr",
+  gridTemplateAreas: `'left-slot item-text right-slot'
+    'left-slot item-description right-slot'`,
+  alignItems: "start",
+  padding: "10px $100",
   position: "relative",
   userSelect: "none",
   cursor: "pointer",
-  "&[data-disabled]": {
-    color: "rgba(9, 9, 9, 0.4)",
-    pointerEvents: "none"
+  "&[data-no-left-slot]": {
+    gridTemplateColumns: "1fr minmax(auto, var(--right-slot-max-width))",
+    gridTemplateAreas: `'item-text right-slot'
+    'item-description right-slot'`
+  },
+  "&:not(:last-child)": {
+    marginBottom: "$50"
+  },
+  "&:not(:first-child)": {
+    marginTop: "$50"
   },
   ...focus.defaults,
-  "&:hover": {
-    background: "rgba(232, 236, 255, 1)",
-    boxShadow: "none",
-    [`&, & ${ItemDescription}`]: {
-      color: "$text-primary-hover"
+  '&:disabled, &[aria-disabled="true"], &[data-disabled]': {
+    cursor: "default",
+    [`&, & ${ItemDescription}, & ${HotkeySlot}`]: {
+      color: "$text-neutrals-disabled"
+    },
+    [`& ${StyledIllustrationSlot}`]: {
+      filter: "grayscale(1)"
+    }
+  },
+  "&:disabled, &[data-disabled]": {
+    pointerEvents: "none"
+  },
+  '&:hover:not([aria-disabled="true"])': {
+    background: "$background-primary-subtle-hover",
+    color: "$text-primary-hover",
+    '&:not([aria-disabled="true"])': {
+      boxShadow: "none"
     }
   },
+  '&:active:not([aria-disabled="true"])': {
+    background: "$background-primary-subtle-active",
+    boxShadow: "none",
+    color: "$text-primary-active"
+  },
   '&[tabindex="0"]': {
     zIndex: "1"
   }
 };
 
-const StyledIndicator = styled(Primitive.span, {});
-const checkboxItemStyles = {
+const StyledIndicator = styled(Primitive.span, {
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center"
+});
+const StyledCheckboxItem = styled(RadixDropdownMenu.CheckboxItem, {
   ...itemDefaults,
   [`&[data-state="checked"] ${StyledIndicator}`]: {
     color: "$icon-primary"
   },
-  [`&[data-state="checked"]:hover ${StyledIndicator}`]: {
+  [`&[data-state="checked"]:hover:not([aria-disabled="true"]) ${StyledIndicator}`]: {
     color: "$icon-primary-hover"
   },
-  [`&[data-disabled] ${StyledIndicator}`]: {
+  [`
+    &[aria-disabled="true"] ${StyledIndicator},
+    &[data-disabled] ${StyledIndicator}
+  `]: {
     color: "$icon-neutrals-disabled"
   }
-};
-const StyledCheckboxItem = styled(
-  RadixDropdownMenu.CheckboxItem,
-  checkboxItemStyles
-);
-
-const LeftSlot = styled(Primitive.div, {
-  display: "flex",
-  placeContent: "center",
-  marginRight: "$100",
-  gridArea: "left-slot"
-});
-const IconSlot = styled(LeftSlot, {
-  width: "$6"
-});
-const IllustrationSlot = styled(LeftSlot, {
-  width: "$13"
-});
-const RightSlot = styled(Primitive.div, {
-  display: "flex",
-  alignItems: "center",
-  marginLeft: "auto",
-  paddingLeft: "$200",
-  gridArea: "right-slot"
 });
 
-const CheckboxItemRoot = ({
-  disabled = false,
-  onChange,
+const useAriaDisabled = ({
+  "aria-disabled": ariaDisabled,
+  onKeyDown,
   onSelect,
-  ref,
-  ...restProps
-}) => /* @__PURE__ */ React.createElement(StyledCheckboxItem, {
-  ...restProps,
-  ref,
-  disabled,
-  onCheckedChange: onChange,
-  onSelect: (event) => {
-    event.preventDefault();
-    onSelect == null ? void 0 : onSelect(event);
+  onPointerMove,
+  onClick
+}, preventDefault = false) => useMemo(
+  () => ({
+    "aria-disabled": booleanify(ariaDisabled) ? ariaDisabled : void 0,
+    onKeyDown: (e) => {
+      if (booleanify(ariaDisabled) && e.code !== "ArrowUp" && e.code !== "ArrowDown") {
+        e.preventDefault();
+        e.stopPropagation();
+        return;
+      }
+      onKeyDown == null ? void 0 : onKeyDown(e);
+    },
+    onSelect: (e) => {
+      if (preventDefault) {
+        e.preventDefault();
+      }
+      if (booleanify(ariaDisabled)) {
+        e.preventDefault();
+        return;
+      }
+      onSelect == null ? void 0 : onSelect(e);
+    },
+    onPointerMove: (e) => {
+      if (booleanify(ariaDisabled)) {
+        e.preventDefault();
+        return;
+      }
+      onPointerMove == null ? void 0 : onPointerMove(e);
+    },
+    onClick: (e) => {
+      if (booleanify(ariaDisabled)) {
+        e.preventDefault();
+        return;
+      }
+      onClick == null ? void 0 : onClick(e);
+    }
+  }),
+  [ariaDisabled, onKeyDown, onSelect, onPointerMove, onClick, preventDefault]
+);
+
+const Context = createContext({
+  leftSlotMount: () => {
+  },
+  leftSlotDestroy: () => {
   }
 });
-const CheckboxItem = React.forwardRef(({ children, checked, disabled, ...restProps }, forwardRef) => /* @__PURE__ */ React.createElement(CheckboxItemRoot, {
-  ...restProps,
-  checked,
-  disabled,
-  ref: forwardRef
-}, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(StyledIndicator, null, disabled === true && !checked && /* @__PURE__ */ React.createElement(IconProhibit, {
-  size: "small"
-}), checked && /* @__PURE__ */ React.createElement(IconCheckMark, {
-  size: "small"
-})))));
-
-const GUTTER_TOKEN = 150;
-const CONTENT_GUTTER = parseInt(theme.space[GUTTER_TOKEN]);
+const ItemProvider = ({
+  children
+}) => {
+  const [hasSlot, setHasSlot] = useState(false);
+  const leftSlotMount = useCallback(() => {
+    setHasSlot(true);
+  }, []);
+  const leftSlotDestroy = useCallback(() => {
+    setHasSlot(false);
+  }, []);
+  const formattedChildren = hasSlot ? children : addPropsToChildren(children, () => true, {
+    "data-no-left-slot": ""
+  });
+  return /* @__PURE__ */ React.createElement(Context.Provider, {
+    value: {
+      leftSlotMount,
+      leftSlotDestroy
+    }
+  }, formattedChildren);
+};
+const useItem = () => useContext(Context);
+
+const CheckboxItem = React.forwardRef(({ children, checked, onChange, disabled, ...restProps }, forwardRef) => {
+  const ariaDisabledProps = useAriaDisabled(restProps, true);
+  const { "aria-disabled": ariaDisabled } = ariaDisabledProps;
+  return /* @__PURE__ */ React.createElement(ItemProvider, null, /* @__PURE__ */ React.createElement(StyledCheckboxItem, {
+    ...restProps,
+    ...ariaDisabledProps,
+    ref: forwardRef,
+    checked,
+    disabled,
+    onCheckedChange: onChange
+  }, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(StyledIndicator, null, (disabled === true || booleanify(ariaDisabled)) && !checked && /* @__PURE__ */ React.createElement(IconProhibit, {
+    weight: "thin",
+    css: { square: "$3", display: "block" }
+  }), checked && /* @__PURE__ */ React.createElement(IconCheckMark, {
+    css: { square: "$3", display: "block" }
+  })))));
+});
+
+const CONTENT_GUTTER = parseInt(theme.space[150]);
 const CONTENT_OFFSET = parseInt(theme.space[50]);
-const ITEM_WITHOUT_RIGHT_SLOT = `[role="menuitem"]:not(:has(${RightSlot}))`;
+const CONTENT_BORDER_FOCUS_ITEM = "2px";
+const CONTENT_PADDING = {
+  small: "$50 $150",
+  medium: "$150",
+  large: "$150 $300"
+};
 const contentDefaults = {
   maxWidth: "$125",
-  backgroundColor: "$white",
+  backgroundColor: "$background-neutrals-container",
   borderRadius: "$50",
-  padding: `$${GUTTER_TOKEN}`,
   boxShadow: "$50",
-  [`&:has(${RightSlot}) > ${ITEM_WITHOUT_RIGHT_SLOT}`]: {
-    paddingRight: "44px"
-  },
-  [`&:has([role="switch"]) > ${ITEM_WITHOUT_RIGHT_SLOT}`]: {
-    paddingRight: "56px"
+  "& [data-radix-scroll-area-viewport]": {
+    padding: `${CONTENT_BORDER_FOCUS_ITEM} $50 ${CONTENT_BORDER_FOCUS_ITEM} ${CONTENT_BORDER_FOCUS_ITEM}`,
+    boxSizing: "border-box"
   },
   "@media (prefers-reduced-motion: no-preference)": {
     animationDuration: "150ms",
@@ -167,7 +346,56 @@ const contentDefaults = {
   zIndex: "$dropdownMenu"
 };
 
-const StyledContent = styled(RadixDropdownMenu.Content, contentDefaults);
+const StyledContent = styled(RadixDropdownMenu.Content, {
+  ...contentDefaults,
+  variants: {
+    containerSpacing: {
+      small: {
+        '&, [role="menu"]': {
+          padding: CONTENT_PADDING.small
+        }
+      },
+      medium: {
+        '&, [role="menu"]': {
+          padding: CONTENT_PADDING.medium
+        }
+      },
+      large: {
+        '&, [role="menu"]': {
+          padding: CONTENT_PADDING.large
+        }
+      }
+    }
+  }
+});
+
+const ScrollableContent = ({
+  children,
+  maxHeight,
+  overflow,
+  containerSpacing
+}) => {
+  const getOverflowMaxHeight = useCallback(() => {
+    const [top, , bottom] = CONTENT_PADDING[containerSpacing].split(" ").map((value) => value.replace("$", ""));
+    const topBottom = top !== void 0 && bottom !== void 0 ? `var(--space-${top}) + var(--space-${bottom})` : `var(--space-${top}) + var(--space-${top})`;
+    const overflowMaxHeigh = overflow === "auto" ? `calc(var(--radix-dropdown-menu-content-available-height) - (${topBottom}))` : "auto";
+    const newMaxHeight = `calc(${maxHeight} - (${topBottom}))`;
+    return {
+      maxHeight: maxHeight === void 0 ? overflowMaxHeigh : newMaxHeight
+    };
+  }, [maxHeight, overflow, containerSpacing]);
+  if (overflow === "auto") {
+    return /* @__PURE__ */ React.createElement(ScrollArea, {
+      css: { margin: `-${CONTENT_BORDER_FOCUS_ITEM}` },
+      type: "always"
+    }, /* @__PURE__ */ React.createElement(ScrollArea.Viewport, {
+      css: { ...getOverflowMaxHeight() }
+    }, children), /* @__PURE__ */ React.createElement(ScrollArea.Scrollbar, {
+      orientation: "vertical"
+    }, /* @__PURE__ */ React.createElement(ScrollArea.Thumb, null)));
+  }
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, children);
+};
 
 const Content = React.forwardRef(
   ({
@@ -180,8 +408,14 @@ const Content = React.forwardRef(
     avoidCollisions = true,
     sticky = "partial",
     hideWhenDetached = false,
+    containerSpacing = "medium",
+    overflow = "visible",
+    maxHeight,
+    children,
     ...restProps
-  }, forwardRef) => /* @__PURE__ */ React.createElement(StyledContent, {
+  }, forwardRef) => /* @__PURE__ */ React.createElement(ContentProvider, {
+    containerSpacing
+  }, /* @__PURE__ */ React.createElement(StyledContent, {
     ...restProps,
     ref: forwardRef,
     loop,
@@ -192,29 +426,51 @@ const Content = React.forwardRef(
     avoidCollisions,
     collisionPadding,
     sticky,
-    hideWhenDetached
-  })
+    hideWhenDetached,
+    containerSpacing
+  }, /* @__PURE__ */ React.createElement(ScrollableContent, {
+    ...{ containerSpacing, maxHeight, overflow }
+  }, children)))
 );
 
-const StyledItem = styled(RadixDropdownMenu.Item, itemDefaults);
+const StyledItem = styled(RadixDropdownMenu.Item, {
+  ...itemDefaults,
+  variants: {
+    hasRightSlot: {
+      true: {
+        paddingRight: "$600"
+      }
+    }
+  }
+});
 
 const Item = React.forwardRef(
-  ({ disabled = false, ...restProps }, forwardRef) => /* @__PURE__ */ React.createElement(StyledItem, {
-    ...restProps,
-    ref: forwardRef,
-    disabled
-  })
+  ({ disabled = false, ...restProps }, forwardRef) => {
+    const ariaDisabledProps = useAriaDisabled(restProps);
+    return /* @__PURE__ */ React.createElement(ItemProvider, null, /* @__PURE__ */ React.createElement(StyledItem, {
+      ...restProps,
+      ...ariaDisabledProps,
+      disabled,
+      ref: forwardRef
+    }));
+  }
 );
 
-const LinkItem = React.forwardRef(({ children, href, ...restProps }, forwardRef) => /* @__PURE__ */ React.createElement(Item, {
-  asChild: true,
-  ref: forwardRef,
-  ...restProps
-}, /* @__PURE__ */ React.createElement("a", {
-  href
-}, children)));
+const LinkItem = React.forwardRef(({ children, href, ...restProps }, forwardRef) => {
+  const ariaDisabledProps = useAriaDisabled(restProps);
+  return /* @__PURE__ */ React.createElement(Item, {
+    asChild: true,
+    ref: forwardRef,
+    ...restProps,
+    ...ariaDisabledProps
+  }, /* @__PURE__ */ React.createElement("a", {
+    href
+  }, children));
+});
 
-const StyledRadioGroup = styled(RadixDropdownMenu.RadioGroup);
+const StyledRadioGroup = styled(RadixDropdownMenu.RadioGroup, {
+  marginY: "$50"
+});
 
 const RadioGroup = React.forwardRef((props, forwardRef) => {
   const { onChange, ...restProps } = props;
@@ -225,7 +481,7 @@ const RadioGroup = React.forwardRef((props, forwardRef) => {
   });
 });
 
-const StyledRadioContainer = styled(Primitive.span, {
+const StyledRadioContainer = styled(Primitive.div, {
   display: "flex",
   alignItems: "center",
   justifyContent: "center",
@@ -235,7 +491,7 @@ const StyledRadioContainer = styled(Primitive.span, {
   border: "1px solid $border-neutrals",
   borderRadius: "$half"
 });
-const StyledPill = styled(Primitive.span, {
+const StyledPill = styled(Primitive.div, {
   display: "none",
   width: "$2",
   height: "$2",
@@ -243,7 +499,7 @@ const StyledPill = styled(Primitive.span, {
 });
 const StyledProhibited = styled(IconProhibit, {
   display: "none",
-  width: "$3"
+  width: "$3 !important"
 });
 const StyledRadioItem = styled(RadixDropdownMenu.RadioItem, {
   ...itemDefaults,
@@ -255,37 +511,46 @@ const StyledRadioItem = styled(RadixDropdownMenu.RadioItem, {
       backgroundColor: "$background-primary-prominent-selected"
     }
   },
-  [`&:hover ${StyledRadioContainer}`]: {
+  [`&:hover:not([aria-disabled="true"]) ${StyledRadioContainer}`]: {
     borderColor: "$border-primary-hover",
     [`& ${StyledPill}`]: {
       backgroundColor: "$background-primary-prominent-hover"
     }
   },
-  [`&[data-disabled] ${StyledRadioContainer}`]: {
+  [`
+    &[aria-disabled="true"] ${StyledRadioContainer},
+    &[data-disabled] ${StyledRadioContainer}
+  `]: {
     color: "$icon-neutrals-disabled",
     borderColor: "$border-neutrals-disabled",
     [`& ${StyledPill}`]: {
       backgroundColor: "$icon-neutrals-disabled"
     }
   },
-  [`&[data-state="unchecked"][data-disabled] ${StyledProhibited}`]: {
-    display: "block"
+  '&[data-state="unchecked"]': {
+    [`
+      &[aria-disabled="true"] ${StyledProhibited},
+      &[data-disabled] ${StyledProhibited}
+    `]: {
+      display: "flex"
+    }
   }
 });
 
-const RadioItem = React.forwardRef(({ disabled = false, onSelect, children, ...restProps }, forwardRef) => /* @__PURE__ */ React.createElement(StyledRadioItem, {
-  ...restProps,
-  ref: forwardRef,
-  disabled,
-  onSelect: (event) => {
-    event.preventDefault();
-    onSelect == null ? void 0 : onSelect(event);
-  }
-}, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(StyledRadioContainer, null, /* @__PURE__ */ React.createElement(StyledPill, null), /* @__PURE__ */ React.createElement(StyledProhibited, null)))));
+const RadioItem = React.forwardRef(({ disabled = false, children, ...restProps }, forwardRef) => {
+  const ariaDisabledProps = useAriaDisabled(restProps, true);
+  return /* @__PURE__ */ React.createElement(ItemProvider, null, /* @__PURE__ */ React.createElement(StyledRadioItem, {
+    ...restProps,
+    ...ariaDisabledProps,
+    disabled,
+    ref: forwardRef
+  }, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(StyledRadioContainer, null, /* @__PURE__ */ React.createElement(StyledPill, null), /* @__PURE__ */ React.createElement(StyledProhibited, {
+    weight: "thin"
+  })))));
+});
 
 const StyledSeparator = styled(RadixDropdownMenu.Separator, {
-  borderTop: "1px solid rgba(235, 235, 239, 1)",
-  marginY: "$100"
+  borderTop: "1px solid $border-neutrals-subtle"
 });
 
 const Separator = React.forwardRef((props, forwardRef) => /* @__PURE__ */ React.createElement(StyledSeparator, {
@@ -293,33 +558,48 @@ const Separator = React.forwardRef((props, forwardRef) => /* @__PURE__ */ React.
   ref: forwardRef
 }));
 
+const StyledSwitch = styled(Primitive.span, {
+  ...styles.default,
+  width: "$7",
+  height: "$4"
+});
+const StyledSwitchItem = styled(RadixDropdownMenu.CheckboxItem, {
+  ...itemDefaults,
+  [`&[data-state="checked"] ${StyledSwitch}`]: styles.checked,
+  [`&[data-state="checked"]:hover:not([aria-disabled="true"]) ${StyledSwitch}`]: styles.checkedHovered,
+  [`&:hover:not([aria-disabled="true"]) ${StyledSwitch}`]: styles.hovered,
+  [`
+    &[aria-disabled="true"] ${StyledSwitch},
+    &[data-disabled] ${StyledSwitch}
+  `]: styles.disabled
+});
+
 const SwitchItem = React.forwardRef(
-  ({ disabled = false, checked, onSelect, children, ...restProps }, forwardRef) => /* @__PURE__ */ React.createElement(CheckboxItemRoot, {
-    ...restProps,
-    ref: forwardRef,
-    disabled,
-    checked
-  }, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(Switch, {
-    checked,
-    disabled,
-    onChange: (x) => x,
-    value: ""
-  })))
+  ({ disabled = false, checked, onChange, children, ...restProps }, forwardRef) => {
+    const ariaDisabledProps = useAriaDisabled(restProps, true);
+    return /* @__PURE__ */ React.createElement(ItemProvider, null, /* @__PURE__ */ React.createElement(StyledSwitchItem, {
+      ...restProps,
+      ...ariaDisabledProps,
+      disabled,
+      checked,
+      onCheckedChange: onChange,
+      ref: forwardRef
+    }, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(StyledSwitch, null, /* @__PURE__ */ React.createElement(Thumb, null)))));
+  }
 );
 
-const defaultStyles = {
-  boxSizing: "border-box",
-  cursor: "pointer",
-  ...focus.defaults
-};
 const StyledTrigger = styled(RadixDropdownMenu.Trigger, {
   variants: {
     unstyled: {
       true: {
         all: "unset",
-        ...defaultStyles
+        boxSizing: "border-box",
+        cursor: "pointer",
+        ...focus.defaults
       },
-      false: defaultStyles
+      false: {
+        cursor: "pointer"
+      }
     }
   }
 });
@@ -332,26 +612,36 @@ const Trigger = React.forwardRef(({ asChild = false, onPress, onClick, ...restPr
   asChild
 }));
 
+const StyledIconContainer = styled(Primitive.span, {
+  color: "$icon-neutrals-with-text",
+  display: "flex",
+  alignItems: "center"
+});
 const StyledSubTrigger = styled(RadixDropdownMenu.SubTrigger, {
   ...itemDefaults,
-  '&[data-state="open"]': itemDefaults["&:hover"]
-});
-
-const ArrowIcon = () => /* @__PURE__ */ React.createElement("svg", {
-  width: "16",
-  height: "16",
-  viewBox: "0 0 16 16",
-  fill: "currentColor",
-  xmlns: "http://www.w3.org/2000/svg",
-  "data-testid": "submenu-arrow-icon"
-}, /* @__PURE__ */ React.createElement("path", {
-  d: "M5.29289 3.29289C5.68342 2.90237 6.31658 2.90237 6.70711 3.29289L11.4142 8L6.70711 12.7071C6.31658 13.0976 5.68342 13.0976 5.29289 12.7071C4.90237 12.3166 4.90237 11.6834 5.29289 11.2929L8.58579 8L5.29289 4.70711C4.90237 4.31658 4.90237 3.68342 5.29289 3.29289Z"
-}));
-const SubTrigger = React.forwardRef(({ children, disabled = false, ...restProps }, forwardRef) => /* @__PURE__ */ React.createElement(StyledSubTrigger, {
-  ...restProps,
-  ref: forwardRef,
-  disabled
-}, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(ArrowIcon, null))));
+  '&[data-state="open"]': itemDefaults['&:hover:not([aria-disabled="true"])'],
+  [`&[data-state="open"] ${StyledIconContainer}, &:hover:not([aria-disabled="true"]) ${StyledIconContainer}`]: {
+    color: "$icon-primary-hover"
+  }
+});
+
+const SubTrigger = React.forwardRef(({ children, disabled = false, ...restProps }, forwardRef) => {
+  const { onSelect, ...ariaDisabledProps } = useAriaDisabled({
+    onKeyDown: restProps.onKeyDown,
+    "aria-disabled": restProps["aria-disabled"]
+  });
+  return /* @__PURE__ */ React.createElement(StyledSubTrigger, {
+    ...restProps,
+    ...ariaDisabledProps,
+    disabled,
+    ref: forwardRef
+  }, children, /* @__PURE__ */ React.createElement(RightSlot, null, /* @__PURE__ */ React.createElement(StyledIconContainer, {
+    "data-testid": process.env.NODE_ENV === "test" ? "submenu-arrow-icon" : void 0
+  }, /* @__PURE__ */ React.createElement(IconChevronRight, {
+    size: "small",
+    weight: "thin"
+  }))));
+});
 
 const StyledSubContent = styled(
   RadixDropdownMenu.SubContent,
@@ -365,19 +655,29 @@ const SubContent = React.forwardRef(
     alignOffset = -CONTENT_GUTTER,
     collisionPadding = 0,
     loop = false,
-    hideWhenDetached = false,
+    hideWhenDetached = true,
     sticky = "partial",
+    overflow = "visible",
+    maxHeight,
+    children,
     ...restProps
-  }, forwardRef) => /* @__PURE__ */ React.createElement(StyledSubContent, {
-    ...restProps,
-    ref: forwardRef,
-    sideOffset,
-    alignOffset,
-    collisionPadding,
-    loop,
-    hideWhenDetached,
-    sticky
-  })
+  }, forwardRef) => {
+    const { containerSpacing } = useContent();
+    return /* @__PURE__ */ React.createElement(ContentProvider, {
+      containerSpacing
+    }, /* @__PURE__ */ React.createElement(StyledSubContent, {
+      ...restProps,
+      ref: forwardRef,
+      sideOffset,
+      alignOffset,
+      collisionPadding,
+      loop,
+      hideWhenDetached,
+      sticky
+    }, /* @__PURE__ */ React.createElement(ScrollableContent, {
+      ...{ containerSpacing, maxHeight, overflow }
+    }, children)));
+  }
 );
 
 const StyledSub = styled(RadixDropdownMenu.Sub, {});
@@ -403,6 +703,47 @@ const Portal = (props) => /* @__PURE__ */ React.createElement(Portal$1, {
   ...props
 });
 
+const StyledIconSlot = styled(LeftSlot, {
+  square: "$5",
+  "& svg:not([data-icon-component]), & img:not([data-icon-component])": {
+    ...styles$1.size.small,
+    ...styles$1.weight.thin
+  }
+});
+
+const IconSlot = React.forwardRef(({ children, ...restProps }, forwardRef) => {
+  const { leftSlotMount, leftSlotDestroy } = useItem();
+  const formattedChildren = addPropsToChildren(
+    children,
+    isIconComponent,
+    {
+      "data-icon-component": "",
+      size: "small",
+      weight: "thin"
+    }
+  );
+  useEffect(() => {
+    leftSlotMount();
+    return () => leftSlotDestroy();
+  }, [leftSlotMount, leftSlotDestroy]);
+  return /* @__PURE__ */ React.createElement(StyledIconSlot, {
+    ref: forwardRef,
+    ...restProps
+  }, formattedChildren);
+});
+
+const IllustrationSlot = React.forwardRef((props, forwardRef) => {
+  const { leftSlotMount, leftSlotDestroy } = useItem();
+  useEffect(() => {
+    leftSlotMount();
+    return () => leftSlotDestroy();
+  }, [leftSlotMount, leftSlotDestroy]);
+  return /* @__PURE__ */ React.createElement(StyledIllustrationSlot, {
+    ref: forwardRef,
+    ...props
+  });
+});
+
 const DropdownMenu = ({
   defaultOpen = false,
   direction = "ltr",
@@ -428,6 +769,7 @@ const DropdownMenu = ({
 };
 DropdownMenu.CheckboxItem = CheckboxItem;
 DropdownMenu.Content = Content;
+DropdownMenu.HotkeySlot = HotkeySlot;
 DropdownMenu.IconSlot = IconSlot;
 DropdownMenu.IllustrationSlot = IllustrationSlot;
 DropdownMenu.Item = Item;