@rescui/select 0.15.1-RUI-280-Update-select-component-e516591ed.54 → 0.15.1-RUI-280-Update-select-component-downshift-cd2a98813.66

package/lib/select-basic.js

@@ -1,78 +1,122 @@
-import React, { useRef } from 'react';
+import React from 'react';
 import cn from 'classnames';
-import { useSelectState } from 'react-stately';
-import { useSelect, useButton, useFocusRing, mergeProps, HiddenSelect } from 'react-aria';
-import { PopupContent } from './parts/popup-content.js';
+import { Dropdown } from '@rescui/dropdown';
+import { useSelect } from 'downshift';
+import { useFocusRing } from '@react-aria/focus';
+import scrollIntoView from 'scroll-into-view-if-needed';
+import { useLabelFocus } from './hooks/use-label-focus.js';
+import { useOptions } from './hooks/use-options.js';
+import { useA11y } from './hooks/use-a11y.js';
+import { ListBox } from './parts/list-box.js';
 import { Icons } from './parts/icons.js';
+import { HiddenSelect } from './parts/hidden-select.js';
 import { FormTriggerWrapper } from './parts/form-trigger-wrapper.js';
-import { useLabelFocus } from './hooks/use-label-focus.js';
 import { getEmptyMessage } from './utils/get-empty-message.js';
-import styles from './styles/common.p.module.css.js';
-const THEME_STYLES = {
-  light: styles.themeLight,
-  dark: styles.themeDark
-};
-const SIZE_STYLES = {
-  s: styles.sizeS,
-  m: styles.sizeM,
-  l: styles.sizeL
-};
-const MODE_STYLES = {
-  classic: styles.classic,
-  rock: styles.rock
-}; // eslint-disable-next-line complexity
+import { mergeProps } from './utils/merge-props.js';
+import { itemToString } from './utils/item-to-string.js';
+import { getOptionValue } from './utils/get-option-value.js';
+import { getRealItemsCnt } from './utils/get-real-items-cnt.js';
+import styles from './styles/common.p.module.css.js'; // eslint-disable-next-line complexity
 
 function SelectBasic(_ref) {
-  var _state$selectedItems$;
-
   let {
-    id,
+    options,
+    value: selectedItem,
+    onChange,
+    error,
+    label,
+    note,
     size,
     mode,
     theme,
-    style,
-    className,
-    isClearable,
-    isLoading,
     placement,
     boldLabel,
     reserveErrorLine,
-    noOptionsMessage,
     maxVisibleItems,
-    ...ariaProps
+    isClearable,
+    isLoading,
+    isDisabled,
+    name,
+    noOptionsMessage,
+    className,
+    id,
+    style,
+    placeholder,
+    ...rest
   } = _ref;
-  // Create state based on the incoming props
-  const state = useSelectState({ ...ariaProps,
-    allowsEmptyCollection: true
-  });
-  const hasValue = state.selectedItems.length > 0; // Get props for child elements from useSelect
-
-  const triggerRef = useRef(null);
+  const triggerRef = React.useRef(null);
+  const dropdownRef = React.useRef(null);
+  const menuRef = React.useRef(null);
+  const {
+    flattenedOptions,
+    listBoxItems
+  } = useOptions(options);
+  const isListBoxEmpty = getRealItemsCnt(listBoxItems) === 0;
+  const hasValue = Boolean(selectedItem);
+  const selectedMap = selectedItem ? new Map([[getOptionValue(selectedItem), selectedItem]]) : new Map();
   const {
-    labelProps,
-    triggerProps,
-    valueProps,
-    menuProps: listBoxProps,
-    hiddenSelectProps,
+    fieldProps,
     errorMessageProps,
-    descriptionProps
-  } = useSelect({ ...ariaProps,
-    onKeyDown: e => {
-      if (isClearable && hasValue) {
-        if (e.key === 'Backspace' || e.key === 'Delete') {
-          state.setValue(null);
-          e.stopPropagation();
-        }
-      }
-    }
-  }, state, triggerRef);
+    descriptionProps,
+    baseId
+  } = useA11y({
+    prefix: 'select',
+    error,
+    description: note
+  });
   const {
-    buttonProps
-  } = useButton({ ...triggerProps,
-    elementType: 'div'
-  }, triggerRef);
-  const isDisabled = ariaProps.isDisabled;
-  const isOpen = state.isOpen;
+    isOpen,
+    getToggleButtonProps,
+    getLabelProps,
+    getMenuProps,
+    highlightedIndex,
+    getItemProps,
+    reset
+  } = useSelect({
+    items: flattenedOptions,
+    itemToString,
+    id: baseId,
+    selectedItem,
+    // defining our scroll behavior because on the first menu render the hook
+    // doesn't know menuRef and use page as the scroll boundary
+    scrollIntoView: (listItemEl, listEl) => {
+      scrollIntoView(listItemEl, {
+        scrollMode: 'if-needed',
+        block: 'nearest',
+        boundary: listEl ?? menuRef.current
+      });
+    },
+    onSelectedItemChange: _ref2 => {
+      let {
+        selectedItem: newSelectedItem
+      } = _ref2;
+      onChange === null || onChange === void 0 || onChange(newSelectedItem);
+    },
+
+    isItemDisabled(item) {
+      return item && item.disabled;
+    }
+
+  });
+  const menuProps = getMenuProps({
+    ref: menuRef
+  }, {
+    suppressRefError: true
+  });
+  const triggerProps = getToggleButtonProps({
+    ref: triggerRef,
+    onKeyDown: event => {
+      // backspace and backspace removing the last selected item (when popup is closed)
+      if (isClearable && !isOpen && (event.key === 'Backspace' || event.key === 'Delete')) {
+        reset();
+      }
+    },
+    // fix screen-reader focus on an opened popup with an empty list
+    ...(isOpen && isListBoxEmpty ? {
+      'aria-activedescendant': menuProps.id
+    } : {})
+  }); // use it instead of ":has(:focus-visible), :focus-visible"
+
   const {
     isFocusVisible,
     focusProps
@@ -83,60 +127,83 @@ function SelectBasic(_ref) {
     isFocusedByLabel,
     labelClickProps,
     triggerFocusProps: labelFocusForTriggerProps
-  } = useLabelFocus(triggerRef);
+  } = useLabelFocus();
   const emptyListMessage = getEmptyMessage({
     isLoading,
     isNothingFound: false,
     noOptionsMessage
   });
-  return /*#__PURE__*/React.createElement("div", {
-    className: cn(className, styles.root, THEME_STYLES[theme], SIZE_STYLES[size], MODE_STYLES[mode], isDisabled ? styles.disabled : styles.enabled, Boolean(ariaProps.errorMessage) && styles.error),
-    id: id,
-    style: style,
-    "data-test": "select"
-  }, /*#__PURE__*/React.createElement(FormTriggerWrapper, {
+  const listBoxState = {
+    selectedMap,
+    selectionMode: 'single',
+    highlightedIndex,
+    getItemProps,
+    menuProps
+  };
+  return /*#__PURE__*/React.createElement(FormTriggerWrapper, {
     theme: theme,
     size: size,
     disabled: isDisabled,
-    label: ariaProps.label,
-    labelProps: mergeProps(labelClickProps, labelProps),
+    label: label,
+    labelProps: mergeProps(getLabelProps(), labelClickProps),
     boldLabel: boldLabel,
-    error: ariaProps.errorMessage,
+    error: error,
     reserveErrorLine: reserveErrorLine,
     errorMessageProps: errorMessageProps,
-    note: ariaProps.description,
+    note: note,
     descriptionProps: descriptionProps
-  }, /*#__PURE__*/React.createElement(HiddenSelect, { ...hiddenSelectProps
-  }), /*#__PURE__*/React.createElement("div", { ...mergeProps(buttonProps, focusProps, labelFocusForTriggerProps),
-    ref: triggerRef,
-    className: styles.trigger,
-    "data-open": isOpen,
-    "data-focus-visible": isFocusVisible,
-    "data-label-focused": isFocusedByLabel,
-    "data-test": "select__trigger"
-  }, /*#__PURE__*/React.createElement("span", { ...valueProps,
-    className: cn(styles.triggerText, !hasValue && styles.labelNotSelected),
-    "data-test": "select__trigger_content"
-  }, ((_state$selectedItems$ = state.selectedItems[0]) === null || _state$selectedItems$ === void 0 ? void 0 : _state$selectedItems$.rendered) ?? ariaProps.placeholder), /*#__PURE__*/React.createElement(Icons, {
-    isLoading: isLoading,
-    canHaveClearIcon: isClearable && !isDisabled && hasValue,
-    onClear: () => {
-      var _triggerRef$current;
-
-      state.setValue(null);
-      (_triggerRef$current = triggerRef.current) === null || _triggerRef$current === void 0 || _triggerRef$current.focus();
-    },
-    triggerId: triggerProps.id
-  })), /*#__PURE__*/React.createElement(PopupContent, {
+  }, /*#__PURE__*/React.createElement(HiddenSelect, {
+    name: name,
+    value: selectedItem,
+    isMultiple: false,
+    options: flattenedOptions
+  }), /*#__PURE__*/React.createElement(Dropdown, {
+    mode: mode,
     theme: theme,
-    state: state,
-    triggerRef: triggerRef,
+    ref: dropdownRef,
     placement: placement,
+    maxWidth: "trigger",
+    minWidth: "trigger",
+    isOpen: isOpen,
+    cancelCloseAnimation: true,
+    disableFocusLock: true,
+    trigger: _ref3 => {
+      let {
+        ref: triggerRefForDropdown
+      } = _ref3;
+      return /*#__PURE__*/React.createElement("div", { ...rest,
+        ...mergeProps(fieldProps, // aria-invalid & aria-describedby, rest are overridden by triggerProps
+        triggerProps, focusProps, labelFocusForTriggerProps, {
+          ref: triggerRefForDropdown
+        }),
+        className: styles.trigger,
+        "data-open": isOpen,
+        "data-has-focus-visible": isFocusVisible,
+        "data-label-focused": isFocusedByLabel,
+        "data-test": "select__trigger"
+      }, /*#__PURE__*/React.createElement("span", {
+        className: cn(styles.triggerText, !hasValue && styles.labelNotSelected),
+        "data-test": "select__trigger_content"
+      }, (selectedItem === null || selectedItem === void 0 ? void 0 : selectedItem.label) ?? placeholder), /*#__PURE__*/React.createElement(Icons, {
+        isLoading: isLoading,
+        canHaveClearIcon: isClearable && !isDisabled && hasValue,
+        onClear: () => {
+          var _triggerRef$current;
+
+          reset();
+          (_triggerRef$current = triggerRef.current) === null || _triggerRef$current === void 0 || _triggerRef$current.focus({
+            focusVisible: false
+          });
+        },
+        triggerId: triggerProps.id
+      }));
+    }
+  }, /*#__PURE__*/React.createElement(ListBox, {
+    state: listBoxState,
     size: size,
-    mode: mode,
-    listBoxProps: listBoxProps,
+    maxVisibleItems: maxVisibleItems,
     emptyListMessage: emptyListMessage,
-    maxVisibleItems: maxVisibleItems
+    items: listBoxItems
   })));
 }
 

package/lib/select-searchable.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import type { InnerSingleComponentProps } from './types';
-export declare function SelectSearchable<T extends object>({ id, size, mode, theme, className, style, isClearable, isLoading, placement, boldLabel, reserveErrorLine, noOptionsMessage, maxVisibleItems, ...ariaProps }: InnerSingleComponentProps<T>): JSX.Element;
+import { InnerSingleComponentProps } from './types';
+export declare function SelectSearchable({ options, value: selectedItem, onChange, error, label, note, size, mode, theme, placement, boldLabel, reserveErrorLine, maxVisibleItems, isClearable, isLoading, isDisabled, name, noOptionsMessage, className, id, style, placeholder, ...rest }: InnerSingleComponentProps): JSX.Element;

package/lib/select-searchable.js

@@ -1,94 +1,163 @@
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
-import React, { useRef } from 'react';
-import cn from 'classnames';
-import { useComboBoxState } from 'react-stately';
-import { useComboBox, useButton, useFocusRing, mergeProps, HiddenSelect } from 'react-aria';
-import { PopupContent } from './parts/popup-content.js';
+import React, { useRef, useState } from 'react';
+import { Dropdown } from '@rescui/dropdown';
+import { useCombobox } from 'downshift';
+import { useFocusRing } from '@react-aria/focus';
+import scrollIntoView from 'scroll-into-view-if-needed';
+import { useLabelFocus } from './hooks/use-label-focus.js';
+import { useOptions } from './hooks/use-options.js';
+import { useA11y } from './hooks/use-a11y.js';
+import { ListBox } from './parts/list-box.js';
 import { Icons } from './parts/icons.js';
+import { HiddenSelect } from './parts/hidden-select.js';
 import { FormTriggerWrapper } from './parts/form-trigger-wrapper.js';
-import { useLabelFocus } from './hooks/use-label-focus.js';
 import { getEmptyMessage } from './utils/get-empty-message.js';
-import styles from './styles/common.p.module.css.js';
-const THEME_STYLES = {
-  light: styles.themeLight,
-  dark: styles.themeDark
-};
-const SIZE_STYLES = {
-  s: styles.sizeS,
-  m: styles.sizeM,
-  l: styles.sizeL
-};
-const MODE_STYLES = {
-  classic: styles.classic,
-  rock: styles.rock
-}; // Do not use useFilter from 'react-aria' package as it's much slower for most cases
-
-const contains = (string, substring) => {
-  var _context;
-
-  if (substring.length === 0) {
-    return true;
-  }
-
-  return _includesInstanceProperty(_context = string.toLowerCase()).call(_context, substring.toLowerCase());
-}; // eslint-disable-next-line complexity
-
+import { mergeProps } from './utils/merge-props.js';
+import { itemToString } from './utils/item-to-string.js';
+import { getOptionValue } from './utils/get-option-value.js';
+import { getRealItemsCnt } from './utils/get-real-items-cnt.js';
+import styles from './styles/common.p.module.css.js'; // eslint-disable-next-line complexity
 
 function SelectSearchable(_ref) {
-  var _state$inputValue;
-
   let {
-    id,
+    options,
+    value: selectedItem,
+    onChange,
+    error,
+    label,
+    note,
     size,
     mode,
     theme,
-    className,
-    style,
-    isClearable,
-    isLoading,
     placement,
     boldLabel,
     reserveErrorLine,
-    noOptionsMessage,
     maxVisibleItems,
-    ...ariaProps
+    isClearable,
+    isLoading,
+    isDisabled,
+    name,
+    noOptionsMessage,
+    className,
+    id,
+    style,
+    placeholder,
+    ...rest
   } = _ref;
-  // Create state based on the incoming props
-  const state = useComboBoxState({ ...ariaProps,
-    defaultFilter: contains,
-    allowsEmptyCollection: true
-  });
-  const hasValue = state.selectedItems.length > 0; // Setup refs and get props for child elements.
-
   const triggerRef = useRef(null);
-  const inputRef = useRef(null);
-  const listBoxRef = useRef(null);
-  const popoverRef = useRef(null);
-  const {
-    labelProps,
-    buttonProps: triggerProps,
-    listBoxProps,
-    inputProps: inputPropsWithName,
-    errorMessageProps,
-    descriptionProps
-  } = useComboBox({ ...ariaProps,
-    inputRef,
-    buttonRef: triggerRef,
-    listBoxRef,
-    popoverRef
-  }, state); // Extract name from inputProps to use with HiddenSelect instead
+  const dropdownRef = useRef(null);
+  const menuRef = React.useRef(null); // use it instead of :has(.searchInput:focus)
 
+  const [inputFocused, setInputFocused] = useState(false);
   const {
-    name,
-    ...inputProps
-  } = inputPropsWithName;
+    flattenedOptions,
+    listBoxItems,
+    setFilterString
+  } = useOptions(options);
+  const isListBoxEmpty = getRealItemsCnt(listBoxItems) === 0;
+  const hasValue = Boolean(selectedItem);
+  const selectedMap = selectedItem ? new Map([[getOptionValue(selectedItem), selectedItem]]) : new Map();
   const {
-    buttonProps
-  } = useButton({ ...triggerProps,
-    elementType: 'div'
-  }, triggerRef);
-  const isDisabled = ariaProps.isDisabled;
-  const isOpen = state.isOpen;
+    fieldProps,
+    errorMessageProps,
+    descriptionProps,
+    baseId
+  } = useA11y({
+    prefix: 'select',
+    error,
+    description: note
+  });
+  const {
+    isOpen,
+    getToggleButtonProps,
+    getLabelProps,
+    getMenuProps,
+    getInputProps,
+    highlightedIndex,
+    getItemProps,
+    reset,
+    setInputValue
+  } = useCombobox({
+    onInputValueChange(_ref2) {
+      let {
+        inputValue,
+        type
+      } = _ref2;
+
+      if (type === useCombobox.stateChangeTypes.InputChange) {
+        setFilterString(inputValue);
+      }
+    },
+
+    items: flattenedOptions,
+    id: baseId,
+    itemToString,
+    selectedItem,
+    // defining our scroll behavior because on the first menu render the hook
+    // doesn't know menuRef and use page as the scroll boundary
+    scrollIntoView: (listItemEl, listEl) => {
+      scrollIntoView(listItemEl, {
+        scrollMode: 'if-needed',
+        block: 'nearest',
+        boundary: listEl ?? menuRef.current
+      });
+    },
+    onSelectedItemChange: _ref3 => {
+      let {
+        selectedItem: newSelectedItem
+      } = _ref3;
+      onChange === null || onChange === void 0 || onChange(newSelectedItem);
+    },
+
+    isItemDisabled(item) {
+      return item && item.disabled;
+    },
+
+    onIsOpenChange(_ref4) {
+      let {
+        isOpen: newIsOpen,
+        selectedItem: newSelectedItem
+      } = _ref4;
+
+      if (newIsOpen) {
+        setFilterString('');
+      } else {
+        setInputValue(itemToString(newSelectedItem));
+      }
+    },
+
+    stateReducer(state, actionAndChanges) {
+      const {
+        changes,
+        type
+      } = actionAndChanges;
+
+      switch (type) {
+        case useCombobox.stateChangeTypes.InputKeyDownEscape:
+          if (!state.isOpen) {
+            return state;
+          }
+
+          return changes;
+
+        default:
+          return changes;
+      }
+    }
+
+  });
+  const menuProps = getMenuProps({
+    ref: menuRef
+  }, {
+    suppressRefError: true
+  });
+  const triggerProps = getToggleButtonProps({
+    ref: triggerRef,
+    // fix screen-reader focus on an opened popup with an empty list
+    ...(isOpen && isListBoxEmpty ? {
+      'aria-activedescendant': menuProps.id
+    } : {})
+  }); // use it instead of ":has(:focus-visible), :focus-visible"
+
   const {
     isFocusVisible,
     focusProps
@@ -99,69 +168,90 @@ function SelectSearchable(_ref) {
     isFocusedByLabel,
     labelClickProps,
     triggerFocusProps: labelFocusForTriggerProps
-  } = useLabelFocus(triggerRef);
+  } = useLabelFocus();
   const emptyListMessage = getEmptyMessage({
     isLoading,
-    isNothingFound: ((_state$inputValue = state.inputValue) === null || _state$inputValue === void 0 ? void 0 : _state$inputValue.length) > 0,
+    isNothingFound: false,
     noOptionsMessage
   });
-  return /*#__PURE__*/React.createElement("div", {
-    className: cn(className, styles.root, THEME_STYLES[theme], SIZE_STYLES[size], MODE_STYLES[mode], isDisabled ? styles.disabled : styles.enabled, Boolean(ariaProps.errorMessage) && styles.error),
-    id: id,
-    style: style,
-    "data-test": "select"
-  }, /*#__PURE__*/React.createElement(FormTriggerWrapper, {
+  const listBoxState = {
+    selectedMap,
+    selectionMode: 'single',
+    highlightedIndex,
+    getItemProps,
+    menuProps
+  };
+  return /*#__PURE__*/React.createElement(FormTriggerWrapper, {
     theme: theme,
     size: size,
     disabled: isDisabled,
-    label: ariaProps.label,
-    labelProps: mergeProps(labelClickProps, labelProps),
+    label: label,
+    labelProps: mergeProps(getLabelProps(), labelClickProps),
     boldLabel: boldLabel,
-    error: ariaProps.errorMessage,
+    error: error,
     reserveErrorLine: reserveErrorLine,
     errorMessageProps: errorMessageProps,
-    note: ariaProps.description,
+    note: note,
     descriptionProps: descriptionProps
   }, /*#__PURE__*/React.createElement(HiddenSelect, {
-    state: state,
-    triggerRef: triggerRef,
-    label: ariaProps.label,
     name: name,
-    isDisabled: isDisabled
-  }), /*#__PURE__*/React.createElement("div", { ...mergeProps(buttonProps, focusProps, labelFocusForTriggerProps),
-    ref: triggerRef,
-    className: styles.trigger,
-    "data-open": isOpen,
-    "data-focus-visible": isFocusVisible,
-    "data-label-focused": isFocusedByLabel,
-    "data-test": "select__trigger"
-  }, /*#__PURE__*/React.createElement("input", { ...inputProps,
-    ref: inputRef,
-    className: styles.searchInput,
-    value: inputProps.value,
-    "data-test": "select__trigger_input"
-  }), /*#__PURE__*/React.createElement(Icons, {
-    isLoading: isLoading,
-    canHaveClearIcon: isClearable && !isDisabled && hasValue,
-    onClear: () => {
-      var _inputRef$current;
-
-      state.setValue(null);
-      (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
-    },
-    triggerId: triggerProps.id
-  })), /*#__PURE__*/React.createElement(PopupContent, {
+    value: selectedItem,
+    isMultiple: false,
+    options: flattenedOptions
+  }), /*#__PURE__*/React.createElement(Dropdown, {
+    mode: mode,
     theme: theme,
-    state: state,
-    triggerRef: triggerRef,
-    popoverRef: popoverRef,
-    listBoxRef: listBoxRef,
+    ref: dropdownRef,
     placement: placement,
+    maxWidth: "trigger",
+    minWidth: "trigger",
+    isOpen: isOpen,
+    cancelCloseAnimation: true,
+    disableFocusLock: true,
+    trigger: _ref5 => {
+      let {
+        ref: triggerRefForDropdown
+      } = _ref5;
+      return /*#__PURE__*/React.createElement("div", { ...rest,
+        ...mergeProps(fieldProps, // aria-invalid & aria-describedby, rest are overridden by triggerProps
+        triggerProps, focusProps, labelFocusForTriggerProps, {
+          ref: triggerRefForDropdown
+        }),
+        className: styles.trigger,
+        "data-open": isOpen,
+        "data-has-focus-visible": isFocusVisible || inputFocused,
+        "data-label-focused": isFocusedByLabel,
+        "data-test": "select__trigger"
+      }, /*#__PURE__*/React.createElement("input", { ...getInputProps({
+          onFocus: () => setInputFocused(true),
+          onBlur: () => setInputFocused(false)
+        }),
+        // by the downshift spec, it's expected to place input near the trigger and not nest them,
+        // but we try to keep basic select and searchable similar, so that's a little hack to nest these elements
+        onClick: () => {},
+        className: styles.searchInput,
+        placeholder: placeholder,
+        "data-test": "select__trigger_input"
+      }), /*#__PURE__*/React.createElement(Icons, {
+        isLoading: isLoading,
+        canHaveClearIcon: isClearable && !isDisabled && hasValue,
+        onClear: () => {
+          var _triggerRef$current;
+
+          reset();
+          (_triggerRef$current = triggerRef.current) === null || _triggerRef$current === void 0 || _triggerRef$current.focus({
+            focusVisible: false
+          });
+        },
+        triggerId: triggerProps.id
+      }));
+    }
+  }, /*#__PURE__*/React.createElement(ListBox, {
+    state: listBoxState,
     size: size,
-    mode: mode,
-    listBoxProps: listBoxProps,
+    maxVisibleItems: maxVisibleItems,
     emptyListMessage: emptyListMessage,
-    maxVisibleItems: maxVisibleItems
+    items: listBoxItems
   })));
 }