@mirohq/design-system-combobox 0.1.0-combobox.6 → 0.1.0-combobox.8

package/dist/module.js

@@ -1,21 +1,25 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
-import React, { createContext, useRef, useState, useContext, useCallback, useEffect, useMemo } from 'react';
-import { Combobox as Combobox$1, ComboboxItem, ComboboxItemCheck, Group as Group$1, GroupLabel as GroupLabel$1, ComboboxProvider as ComboboxProvider$1 } from '@ariakit/react';
+import React, { createContext, useContext, useRef, useState, useCallback, useEffect, useMemo } from 'react';
+import { Combobox as Combobox$1, ComboboxItem, ComboboxItemCheck, ComboboxList, Group as Group$1, GroupLabel as GroupLabel$1, ComboboxProvider as ComboboxProvider$1 } from '@ariakit/react';
 import { useFormFieldContext, FloatingLabel } from '@mirohq/design-system-base-form';
-import { stringAttrValue, booleanishAttrValue, mergeRefs, booleanify } from '@mirohq/design-system-utils';
 import * as RadixPopover from '@radix-ui/react-popover';
-import { Portal as Portal$1 } from '@radix-ui/react-popover';
+import { Anchor, Trigger as Trigger$1, Portal as Portal$1 } from '@radix-ui/react-popover';
+import { booleanishAttrValue, mergeRefs, booleanify } from '@mirohq/design-system-utils';
 import { styled, theme } from '@mirohq/design-system-stitches';
 import { Input } from '@mirohq/design-system-input';
 import { useControllableState } from '@radix-ui/react-use-controllable-state';
 import { IconChevronDown, IconCross, IconCheckMark } from '@mirohq/design-system-icons';
 import { ScrollArea } from '@mirohq/design-system-scroll-area';
+import { Primitive } from '@mirohq/design-system-primitive';
 import { mergeProps } from '@react-aria/utils';
 import { useAriaDisabled } from '@mirohq/design-system-use-aria-disabled';
 import { focus } from '@mirohq/design-system-styles';
-import { Primitive } from '@mirohq/design-system-primitive';
 import { BaseButton } from '@mirohq/design-system-base-button';
 
+const StyledAnchor = styled(Anchor, {
+  position: "relative",
+  width: "100%"
+});
 const StyledInput = styled(Input, {
   flexWrap: "wrap",
   flexGrow: 1,
@@ -137,25 +141,48 @@ const StyledActionButton = styled(Input.ActionButton, {
 
 const TriggerActionButton = ({
   openActionLabel,
+  closeActionLabel,
   clearActionLabel,
   size
 }) => {
-  const { setOpenState, value = [], setValue } = useComboboxContext();
+  const { openState, setOpenState, value = [], setValue } = useComboboxContext();
   const isEmpty = value.length === 0;
-  const ActionButtonIcon = isEmpty ? IconChevronDown : IconCross;
-  const label = isEmpty ? openActionLabel : clearActionLabel;
-  const onActionButtonClick = useCallback(
+  const onToggleClick = useCallback(
     (event) => {
-      if (!isEmpty) {
-        setValue([]);
-      } else {
-        setOpenState((prevOpen = false) => !prevOpen);
+      if (openState) {
+        setOpenState(false);
       }
       event.stopPropagation();
     },
-    [isEmpty, setValue, setOpenState]
+    [setOpenState, openState]
+  );
+  const onClearClick = useCallback(
+    (event) => {
+      setValue([]);
+      event.stopPropagation();
+    },
+    [setValue]
+  );
+  if (isEmpty) {
+    return /* @__PURE__ */ jsx(Trigger$1, { asChild: true, "aria-haspopup": "listbox", children: /* @__PURE__ */ jsx(
+      StyledActionButton,
+      {
+        label: openState ? closeActionLabel : openActionLabel,
+        size,
+        onClick: onToggleClick,
+        children: /* @__PURE__ */ jsx(IconChevronDown, { size: "small", weight: "thin" })
+      }
+    ) });
+  }
+  return /* @__PURE__ */ jsx(
+    StyledActionButton,
+    {
+      label: clearActionLabel,
+      size,
+      onClick: onClearClick,
+      children: /* @__PURE__ */ jsx(IconCross, { size: "small", weight: "thin" })
+    }
   );
-  return /* @__PURE__ */ jsx(StyledActionButton, { label, size, onClick: onActionButtonClick, children: /* @__PURE__ */ jsx(ActionButtonIcon, { size: "small", weight: "thin" }) });
 };
 
 const Trigger = React.forwardRef(
@@ -167,8 +194,10 @@ const Trigger = React.forwardRef(
     "aria-invalid": ariaInvalid,
     placeholder,
     openActionLabel,
+    closeActionLabel,
     clearActionLabel,
     onChange,
+    css,
     ...restProps
   }, forwardRef) => {
     const {
@@ -176,15 +205,16 @@ const Trigger = React.forwardRef(
       valid: comboboxValid,
       disabled,
       value = [],
+      readOnly,
       triggerRef,
       inputRef,
       onSearchValueChange,
       searchValue,
-      setSearchValue
+      setSearchValue,
+      setOpenState
     } = useComboboxContext();
     const {
       formElementId,
-      ariaDescribedBy: formFieldContextDescribedBy,
       ariaInvalid: formFieldAriaInvalid,
       valid: formFieldValid,
       label,
@@ -196,18 +226,17 @@ const Trigger = React.forwardRef(
       ...restProps,
       "aria-disabled": ariaDisabled,
       "aria-invalid": ariaInvalid != null ? ariaInvalid : formFieldAriaInvalid,
-      "aria-describedby": stringAttrValue(
-        ariaDescribedBy,
-        formFieldContextDescribedBy
-      ),
+      // todo MDS-1011: use formFieldContextDescribedBy after removing form context from BaseInput
+      "aria-describedby": ariaDescribedBy,
       valid,
       disabled,
+      readOnly,
       invalid: booleanishAttrValue(valid),
       id: id != null ? id : formElementId,
       placeholder: value.length === 0 ? placeholder : void 0
     };
     const shouldUseFloatingLabel = label !== null && isFloatingLabel;
-    const isFloating = placeholder !== void 0 || value.length !== 0 || focused;
+    const isFloating = placeholder !== void 0 || value.length !== 0 || focused || searchValue !== "";
     const scrollIntoView = (event) => {
       var _a;
       const trigger = triggerRef == null ? void 0 : triggerRef.current;
@@ -227,73 +256,85 @@ const Trigger = React.forwardRef(
       onSearchValueChange == null ? void 0 : onSearchValueChange(e.target.value);
       onChange == null ? void 0 : onChange(e);
     };
-    return /* @__PURE__ */ jsxs(RadixPopover.Anchor, { ref: mergeRefs([triggerRef, forwardRef]), children: [
-      shouldUseFloatingLabel && /* @__PURE__ */ jsx(FloatingLabel, { floating: isFloating, size, children: label }),
-      /* @__PURE__ */ jsx(
-        Combobox$1,
-        {
-          render: /* @__PURE__ */ jsxs(
-            StyledInput,
+    return /* @__PURE__ */ jsxs(
+      StyledAnchor,
+      {
+        ref: mergeRefs([triggerRef, forwardRef]),
+        css,
+        onClick: () => {
+          if (!booleanify(disabled) && !booleanify(ariaDisabled) && !booleanify(readOnly)) {
+            setOpenState(true);
+          }
+        },
+        children: [
+          shouldUseFloatingLabel && /* @__PURE__ */ jsx(FloatingLabel, { floating: isFloating, size, children: label }),
+          /* @__PURE__ */ jsx(
+            Combobox$1,
             {
-              ...inputProps,
-              value: searchValue,
-              size,
-              ref: inputRef,
-              onChange: onInputChange,
-              onFocus: scrollIntoView,
-              children: [
-                children,
-                /* @__PURE__ */ jsx(
-                  TriggerActionButton,
-                  {
-                    openActionLabel,
-                    clearActionLabel,
-                    size
-                  }
-                )
-              ]
+              render: /* @__PURE__ */ jsxs(
+                StyledInput,
+                {
+                  ...inputProps,
+                  value: searchValue,
+                  size,
+                  ref: inputRef,
+                  onChange: onInputChange,
+                  onFocus: scrollIntoView,
+                  children: [
+                    children,
+                    /* @__PURE__ */ jsx(
+                      TriggerActionButton,
+                      {
+                        openActionLabel,
+                        closeActionLabel,
+                        clearActionLabel,
+                        size
+                      }
+                    )
+                  ]
+                }
+              )
             }
           )
-        }
-      )
-    ] });
+        ]
+      }
+    );
   }
 );
 
+const NoResultPlaceholder = styled(Primitive.div, {
+  padding: "$100"
+});
 const StyledContent = styled(RadixPopover.Content, {
   backgroundColor: "$background-neutrals-container",
   borderRadius: "$50",
   boxShadow: "$50",
   fontSize: "$175",
   fontWeight: "normal",
-  lineHeight: "1.5",
+  lineHeight: "20px",
   width: "var(--radix-popover-trigger-width)",
   zIndex: "$select",
   overflowY: "auto",
-  padding: "$150",
+  padding: "$50",
   boxSizing: "border-box",
   outline: "1px solid transparent"
 });
 
 const StyledItemCheck = styled(Primitive.span, {
-  color: "$icon-primary",
-  paddingX: "$100"
+  color: "$icon-primary"
 });
 const StyledItem = styled(ComboboxItem, {
-  display: "flex",
-  alignItems: "center",
-  justifyContent: "space-between",
-  gap: "$200",
+  display: "grid",
+  gridTemplateColumns: "20px 1fr",
   borderRadius: "$50",
   boxSizing: "border-box",
   color: "$text-neutrals",
   cursor: "pointer",
   fontSize: "$175",
-  lineHeight: 1.5,
+  lineHeight: "20px",
   position: "relative",
   userSelect: "none",
-  paddingX: "$100",
-  paddingY: "10px",
+  padding: "6px $100 6px $150",
   ...focus.css({
     boxShadow: "$focus-small"
   }),
@@ -308,7 +349,13 @@ const StyledItem = styled(ComboboxItem, {
   },
   "&:disabled, &[aria-disabled=true], &[data-disabled]": {
     cursor: "default",
-    color: "$text-neutrals-disabled"
+    color: "$text-neutrals-disabled",
+    ["".concat(StyledItemCheck)]: {
+      color: "$icon-neutrals-disabled"
+    }
+  },
+  '&[aria-selected="true"]:not(:disabled,[aria-disabled=true],[data-disabled])': {
+    color: "$text-primary-selected"
   }
 });
 
@@ -335,13 +382,13 @@ const Item = React.forwardRef(
       {
         ...mergeProps(restProps, restAriaDisabledProps),
         focusable: true,
-        accessibleWhenDisabled: ariaDisabled === true,
-        disabled: ariaDisabled === true || disabled,
+        hideOnClick: false,
+        accessibleWhenDisabled: booleanify(ariaDisabled),
+        disabled: booleanify(ariaDisabled) || disabled,
         ref: forwardRef,
         value,
         onClick: scrollIntoView,
         children: [
-          children,
           /* @__PURE__ */ jsx(
             ComboboxItemCheck,
             {
@@ -357,7 +404,8 @@ const Item = React.forwardRef(
                 }
               )
             }
-          )
+          ),
+          children
         ]
       }
     );
@@ -392,7 +440,13 @@ const isInsideRef = (element, ref) => {
   return (_b = element != null && ((_a = ref.current) == null ? void 0 : _a.contains(element))) != null ? _b : false;
 };
 const Content = React.forwardRef(
-  ({ sideOffset = CONTENT_OFFSET, maxHeight, children, ...restProps }, forwardRef) => {
+  ({
+    sideOffset = CONTENT_OFFSET,
+    maxHeight,
+    overflow,
+    children,
+    ...restProps
+  }, forwardRef) => {
     const {
       triggerRef,
       contentRef,
@@ -413,11 +467,13 @@ const Content = React.forwardRef(
         )
       );
     }, [children, autoFilter, setFilteredItems, searchValue]);
-    const content = filteredItems.size === 0 ? noResultsText : children;
+    const content = filteredItems.size === 0 ? /* @__PURE__ */ jsx(NoResultPlaceholder, { children: noResultsText }) : children;
     return /* @__PURE__ */ jsx(
       StyledContent,
       {
+        asChild: true,
         ...restProps,
+        dir: direction,
         sideOffset,
         ref: mergeRefs([forwardRef, contentRef]),
         onOpenAutoFocus: (event) => event.preventDefault(),
@@ -429,18 +485,18 @@ const Content = React.forwardRef(
             event.preventDefault();
           }
         },
-        children: /* @__PURE__ */ jsxs(ScrollArea, { type: "always", dir: direction, children: [
+        children: /* @__PURE__ */ jsx(ComboboxList, { role: "listbox", children: overflow === "auto" ? /* @__PURE__ */ jsxs(ScrollArea, { type: "always", dir: direction, children: [
           /* @__PURE__ */ jsx(
             ScrollArea.Viewport,
             {
               availableHeight: "var(--radix-popover-content-available-height)",
-              verticalGap: "calc(var(--space-150) * 2)",
+              verticalGap: "var(--space-50) * 2",
               maxHeight,
               children: content
             }
           ),
           /* @__PURE__ */ jsx(ScrollArea.Scrollbar, { orientation: "vertical", children: /* @__PURE__ */ jsx(ScrollArea.Thumb, {}) })
-        ] })
+        ] }) : content })
       }
     );
   }
@@ -448,6 +504,8 @@ const Content = React.forwardRef(
 
 const Portal = (props) => /* @__PURE__ */ jsx(Portal$1, { ...props });
 
+const StyledGroup = styled(Group$1);
+
 const Group = React.forwardRef(({ children, ...rest }, forwardRef) => {
   const { autoFilter, filteredItems } = useComboboxContext();
   const childValues = useMemo(
@@ -465,15 +523,12 @@ const Group = React.forwardRef(({ children, ...rest }, forwardRef) => {
   if (!hasVisibleChildren) {
     return null;
   }
-  return /* @__PURE__ */ jsx(Group$1, { ...rest, ref: forwardRef, children });
+  return /* @__PURE__ */ jsx(StyledGroup, { ...rest, ref: forwardRef, children });
 });
 
 const StyledGroupLabel = styled(GroupLabel$1, {
-  padding: "$100",
-  color: "$text-neutrals-subtle",
-  fontSize: "$150",
-  textTransform: "uppercase",
-  fontWeight: 650
+  padding: "6px $100",
+  color: "$text-neutrals-subtle"
 });
 
 const GroupLabel = React.forwardRef((props, forwardRef) => /* @__PURE__ */ jsx(StyledGroupLabel, { ...props, ref: forwardRef }));
@@ -487,13 +542,13 @@ const StyledChip = styled(Primitive.div, {
   gap: "$50",
   whiteSpace: "nowrap",
   maxWidth: "$35",
-  background: "$gray-100",
-  color: "$gray-900"
+  backgroundColor: "$background-neutrals-subtle",
+  color: "$text-neutrals"
 });
 const StyledChipButton = styled(BaseButton, {
+  color: "$icon-neutrals-inactive",
   ...focus.css({
-    boxShadow: "$focus-small-outline",
-    borderColor: "$blue-400 !important"
+    boxShadow: "$focus-small-outline"
   })
 });
 const StyledChipContent = styled(Primitive.div, {
@@ -511,9 +566,9 @@ const StyledLeftSlot = styled(Primitive.span, {
 const LeftSlot = StyledLeftSlot;
 
 const Chip = React.forwardRef(
-  ({ children, disabled = false, onRemove, removeChipAriaLabel, ...restProps }, forwardRef) => /* @__PURE__ */ jsxs(StyledChip, { ...restProps, ref: forwardRef, children: [
+  ({ children, disabled = false, onRemove, removeAriaLabel, ...restProps }, forwardRef) => /* @__PURE__ */ jsxs(StyledChip, { ...restProps, ref: forwardRef, children: [
     /* @__PURE__ */ jsx(StyledChipContent, { children }),
-    !booleanify(disabled) && /* @__PURE__ */ jsx(StyledChipButton, { onClick: onRemove, "aria-label": removeChipAriaLabel, children: /* @__PURE__ */ jsx(IconCross, { size: "small", weight: "thin", color: "gray-500" }) })
+    !booleanify(disabled) && /* @__PURE__ */ jsx(StyledChipButton, { onClick: onRemove, "aria-label": removeAriaLabel, children: /* @__PURE__ */ jsx(IconCross, { size: "small", weight: "thin", "aria-hidden": true }) })
   ] })
 );
 Chip.LeftSlot = LeftSlot;
@@ -522,7 +577,7 @@ const StyledValue = styled(Chip, {
   marginTop: "$50"
 });
 
-const Value = ({ removeChipAriaLabel }) => {
+const Value = ({ unselectAriaLabel }) => {
   const {
     value = [],
     setValue,
@@ -541,7 +596,7 @@ const Value = ({ removeChipAriaLabel }) => {
     {
       onRemove: () => onItemRemove(item),
       disabled: isDisabled,
-      removeChipAriaLabel,
+      removeAriaLabel: "".concat(unselectAriaLabel, " ").concat(item),
       "data-testid": process.env.NODE_ENV === "test" ? "combobox-value-".concat(item) : void 0,
       children: item
     },
@@ -564,12 +619,11 @@ const Separator = React.forwardRef((props, forwardRef) => {
   return /* @__PURE__ */ jsx(StyledSeparator, { ...props, ref: forwardRef, "aria-hidden": true });
 });
 
-const StyledComboboxContent = styled(Primitive.div, {
-  position: "relative",
-  width: "100%"
-});
-
-const Root = React.forwardRef(({ value: valueProp, onValueChange, children, ...restProps }, forwardRef) => {
+const Root = ({
+  value: valueProp,
+  children,
+  ...restProps
+}) => {
   const {
     openState,
     setOpenState,
@@ -579,8 +633,7 @@ const Root = React.forwardRef(({ value: valueProp, onValueChange, children, ...r
     required,
     readOnly,
     "aria-disabled": ariaDisabled,
-    disabled,
-    direction
+    disabled
   } = useComboboxContext();
   const { setRequired, setDisabled, setAriaDisabled, setReadOnly } = useFormFieldContext();
   useEffect(() => {
@@ -601,78 +654,70 @@ const Root = React.forwardRef(({ value: valueProp, onValueChange, children, ...r
   const onSetSelectedValue = (newValue) => {
     setValue(typeof newValue === "string" ? [newValue] : newValue);
   };
-  const comboboxProps = {
-    ...restProps,
-    onClick: (event) => {
-      if (!booleanify(disabled)) {
-        setOpenState(true);
-      }
-      if (restProps.onClick !== void 0) {
-        restProps.onClick(event);
-      }
+  const onOpenChange = (value2) => {
+    if (!booleanify(readOnly)) {
+      setOpenState(value2);
     }
   };
-  return /* @__PURE__ */ jsx(RadixPopover.Root, { open: openState, onOpenChange: setOpenState, children: /* @__PURE__ */ jsx(
-    ComboboxProvider$1,
+  return /* @__PURE__ */ jsx(
+    RadixPopover.Root,
     {
       open: openState,
-      setOpen: setOpenState,
-      defaultSelectedValue: defaultValue,
-      selectedValue: value,
-      setSelectedValue: onSetSelectedValue,
+      onOpenChange,
+      ...restProps,
       children: /* @__PURE__ */ jsx(
-        StyledComboboxContent,
+        ComboboxProvider$1,
         {
-          ...comboboxProps,
-          ref: forwardRef,
-          dir: direction,
+          open: openState,
+          setOpen: onOpenChange,
+          defaultSelectedValue: defaultValue,
+          selectedValue: value,
+          setSelectedValue: onSetSelectedValue,
           children
         }
       )
     }
-  ) });
-});
-const Combobox = React.forwardRef(
-  ({
-    "aria-disabled": ariaDisabled,
-    defaultOpen = false,
+  );
+};
+const Combobox = ({
+  "aria-disabled": ariaDisabled,
+  defaultOpen = false,
+  open,
+  valid,
+  disabled,
+  readOnly,
+  required,
+  value,
+  defaultValue,
+  onOpen,
+  onClose,
+  onSearchValueChange,
+  onValueChange,
+  direction = "ltr",
+  autoFilter = true,
+  noResultsText,
+  ...restProps
+}) => /* @__PURE__ */ jsx(
+  ComboboxProvider,
+  {
+    defaultValue,
+    value,
+    onValueChange,
+    onSearchValueChange,
+    defaultOpen,
     open,
+    onOpen,
+    onClose,
     valid,
+    required,
     disabled,
     readOnly,
-    required,
-    value,
-    defaultValue,
-    onOpen,
-    onClose,
-    onSearchValueChange,
-    onValueChange,
-    direction = "ltr",
-    autoFilter = true,
+    "aria-disabled": ariaDisabled,
+    direction,
+    autoFilter,
     noResultsText,
-    ...restProps
-  }, forwardRef) => /* @__PURE__ */ jsx(
-    ComboboxProvider,
-    {
-      defaultValue,
-      value,
-      onValueChange,
-      onSearchValueChange,
-      defaultOpen,
-      open,
-      onOpen,
-      onClose,
-      valid,
-      required,
-      disabled,
-      readOnly,
-      "aria-disabled": ariaDisabled,
-      direction,
-      autoFilter,
-      noResultsText,
-      children: /* @__PURE__ */ jsx(Root, { ...restProps, value, ref: forwardRef })
-    }
-  )
+    children: /* @__PURE__ */ jsx(Root, { ...restProps, value })
+  }
 );
 Combobox.Portal = Portal;
 Combobox.Trigger = Trigger;