@procore/core-react 12.42.0 → 12.44.0

package/dist/SuperSelect/useSuperSelect.js

@@ -65,48 +65,17 @@ function useTokenNavigation(context) {
     enabled = _ref$enabled === void 0 ? true : _ref$enabled,
     _ref$value = _ref.value,
     value = _ref$value === void 0 ? [] : _ref$value,
-    _ref$activeIndex = _ref.activeIndex,
-    activeIndex = _ref$activeIndex === void 0 ? null : _ref$activeIndex,
-    _ref$onNavigate = _ref.onNavigate,
-    onNavigate = _ref$onNavigate === void 0 ? noop : _ref$onNavigate,
-    _ref$onChange = _ref.onChange,
-    onChange = _ref$onChange === void 0 ? noop : _ref$onChange;
+    tokenRemoveRefs = _ref.tokenRemoveRefs;
   return {
     reference: {
       onKeyDown: function onKeyDown(e) {
-        if (!enabled || !Array.isArray(value)) {
+        if (!enabled || !Array.isArray(value) || value.length === 0) {
           return;
         }
         if (e.key === 'ArrowLeft') {
-          if (activeIndex !== null) {
-            onNavigate(Math.max(0, activeIndex - 1));
-          } else if (value.length > 0) {
-            onNavigate(value.length - 1);
-          }
-        } else if (e.key === 'ArrowRight') {
-          if (activeIndex !== null) {
-            if (activeIndex === value.length - 1) {
-              onNavigate(null);
-            } else {
-              onNavigate(activeIndex + 1);
-            }
-          }
-        } else if (e.key === 'Backspace') {
-          if (!e.repeat) {
-            if (activeIndex !== null) {
-              var nextVal = value.filter(function (_, i) {
-                return i !== activeIndex;
-              });
-              onChange(nextVal);
-              if (activeIndex >= nextVal.length) {
-                onNavigate(null);
-              }
-            } else if (value.length > 0) {
-              onChange(value.filter(function (_, i) {
-                return i !== value.length - 1;
-              }));
-            }
-          }
+          var _tokenRemoveRefs$curr;
+          e.preventDefault();
+          tokenRemoveRefs === null || tokenRemoveRefs === void 0 ? void 0 : (_tokenRemoveRefs$curr = tokenRemoveRefs.current[value.length - 1]) === null || _tokenRemoveRefs$curr === void 0 ? void 0 : _tokenRemoveRefs$curr.focus();
         }
       }
     }
@@ -195,7 +164,8 @@ export function useSuperSelect(_ref3) {
     value_ = _ref3.value,
     _ref3$overlayMatchesT = _ref3.overlayMatchesTriggerWidth,
     overlayMatchesTriggerWidth = _ref3$overlayMatchesT === void 0 ? true : _ref3$overlayMatchesT,
-    ariaLabel = _ref3['aria-label'];
+    ariaLabel = _ref3['aria-label'],
+    ariaLabelledBy = _ref3['aria-labelledby'];
   React.useEffect(function () {
     if (!draggable) {
       return;
@@ -386,7 +356,8 @@ export function useSuperSelect(_ref3) {
   var searchRef = React.useRef(null);
   var overlayId = useId(); // TODO use React 18 useId
   var listId = useId(); // TODO use React 18 useId
-
+  var selectedValueId = useId();
+  var tokenListId = useId();
   var _React$useState5 = React.useState(false),
     _React$useState6 = _slicedToArray(_React$useState5, 2),
     open = _React$useState6[0],
@@ -426,10 +397,7 @@ export function useSuperSelect(_ref3) {
     _React$useState20 = _slicedToArray(_React$useState19, 2),
     activeMenuIndex = _React$useState20[0],
     setActiveMenuIndex = _React$useState20[1];
-  var _React$useState21 = React.useState(null),
-    _React$useState22 = _slicedToArray(_React$useState21, 2),
-    activeTokenIndex = _React$useState22[0],
-    setActiveTokenIndex = _React$useState22[1];
+  var tokenRemoveRefs = React.useRef([]);
   var components = _objectSpread(_objectSpread({}, defaultComponents), customComponents || {});
 
   // TODO #memogetters: consider having getOption... getter functions memoized by consumers
@@ -573,10 +541,10 @@ export function useSuperSelect(_ref3) {
     }
     return [selectAllOption].concat(_toConsumableArray(options));
   }, [selectAllEnabled, multiple, selectAllOption, options]);
-  var _React$useState23 = React.useState([]),
-    _React$useState24 = _slicedToArray(_React$useState23, 2),
-    draggableOptions = _React$useState24[0],
-    setDraggableOptions = _React$useState24[1];
+  var _React$useState21 = React.useState([]),
+    _React$useState22 = _slicedToArray(_React$useState21, 2),
+    draggableOptions = _React$useState22[0],
+    setDraggableOptions = _React$useState22[1];
   React.useEffect(function () {
     if (!draggable) {
       return;
@@ -846,9 +814,15 @@ export function useSuperSelect(_ref3) {
   }, [open]);
   var floating = useFloating({
     open: open,
-    onOpenChange: function onOpenChange(open) {
-      setOpen(open);
-      _onOpenChange(open);
+    onOpenChange: function onOpenChange(nextOpen) {
+      setOpen(nextOpen);
+      _onOpenChange(nextOpen);
+      if (!nextOpen && multiple) {
+        requestAnimationFrame(function () {
+          var _searchRef$current;
+          (_searchRef$current = searchRef.current) === null || _searchRef$current === void 0 ? void 0 : _searchRef$current.focus();
+        });
+      }
     },
     whileElementsMounted: function whileElementsMounted() {
       for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -884,6 +858,21 @@ export function useSuperSelect(_ref3) {
   });
   var _useZIndexContext = useZIndexContext(),
     zIndex = _useZIndexContext.value;
+  var activeDescendantId = React.useMemo(function () {
+    if (activeMenuIndex === null) return undefined;
+    var baseOptions = selectAllEnabled && multiple ? allOptionsWithSelectAll : options;
+    var option = baseOptions[activeMenuIndex];
+    if (!option) return undefined;
+    if (getOptionIsOptSelectAll(option)) return "item-".concat(selectAllOption.id);
+    return "item-".concat(getOptionValue(option));
+  }, [activeMenuIndex, selectAllEnabled, multiple, allOptionsWithSelectAll, options, selectAllOption]);
+  function getAriaLabelProps() {
+    return _objectSpread(_objectSpread({}, ariaLabel && {
+      'aria-label': ariaLabel
+    }), ariaLabelledBy && {
+      'aria-labelledby': ariaLabelledBy
+    });
+  }
   var _useInteractions = useInteractions([useClick(floating.context, {
       enabled: !disabled,
       keyboardHandlers: false
@@ -903,14 +892,8 @@ export function useSuperSelect(_ref3) {
       selectedIndex: selectedIndex,
       virtual: true
     }), useTokenNavigation(floating.context, {
-      activeIndex: activeTokenIndex,
       enabled: !disabled && multiple && searchValue === '',
-      onChange: setValue,
-      onNavigate: function onNavigate(i) {
-        return setActiveTokenIndex(function () {
-          return i;
-        });
-      },
+      tokenRemoveRefs: tokenRemoveRefs,
       value: value
     }), useKeyboardSelection(floating.context, {
       enabled: !disabled,
@@ -925,18 +908,20 @@ export function useSuperSelect(_ref3) {
         $multiple: multiple,
         $open: open,
         $placeholder: !selectedLabel,
-        'aria-controls': search ? overlayId : listId,
+        'aria-activedescendant': multiple ? undefined : activeDescendantId
+      }, !multiple && _objectSpread(_objectSpread({
+        'aria-controls': open ? overlayId : undefined,
+        'aria-describedby': selectedValueId,
         'aria-expanded': open,
         'aria-haspopup': 'listbox'
-      }, ariaLabel && {
-        'aria-label': ariaLabel
-      }), {}, {
+      }, getAriaLabelProps()), {}, {
+        role: 'button',
+        tabIndex: disabled ? -1 : tabIndex
+      })), {}, {
         onKeyDown: function onKeyDown() {
           setPointer(false);
         },
-        role: 'combobox',
-        search: search,
-        tabIndex: disabled ? -1 : tabIndex
+        search: search
       }),
       // TODO fix type
       floating: {
@@ -963,15 +948,23 @@ export function useSuperSelect(_ref3) {
     getItemProps = _useInteractions.getItemProps;
   function getLabelProps() {
     return {
-      $hoverable: false
+      $hoverable: false,
+      id: selectedValueId
     };
   }
   function getMultiInputProps() {
-    return {
+    var showPlaceholder = isEmpty();
+    return _objectSpread(_objectSpread({
+      'aria-activedescendant': activeDescendantId,
+      'aria-controls': open ? overlayId : undefined,
+      'aria-expanded': open,
+      'aria-haspopup': 'listbox'
+    }, getAriaLabelProps()), {}, {
+      role: 'combobox',
       ref: searchRef,
-      placeholder: isEmpty() ? placeholder : '',
+      tabIndex: disabled ? -1 : tabIndex,
+      placeholder: showPlaceholder ? placeholder : '',
       disabled: disabled,
-      'aria-controls': listId,
       onKeyDown: function onKeyDown(e) {
         if (e.key === 'Tab') {
           if (open) {
@@ -981,25 +974,59 @@ export function useSuperSelect(_ref3) {
             (_floating$refs$floati = floating.refs.floating.current) === null || _floating$refs$floati === void 0 ? void 0 : _floating$refs$floati.focus();
           }
         }
-      },
-      onChange: function onChange(e) {
-        setSearchValue(e.currentTarget.value);
-        setActiveTokenIndex(null);
-      },
-      style: {
-        opacity: activeTokenIndex === null ? 1 : 0
       }
-    };
+    });
   }
   function getMultiValueProps(index) {
+    function removeToken() {
+      if (!isMultiple(multiple, value)) return;
+      var nextVal = value.filter(function (_, i) {
+        return i !== index;
+      });
+      setValue(nextVal);
+      requestAnimationFrame(function () {
+        if (nextVal.length === 0) {
+          var _searchRef$current2;
+          (_searchRef$current2 = searchRef.current) === null || _searchRef$current2 === void 0 ? void 0 : _searchRef$current2.focus();
+        } else if (index >= nextVal.length) {
+          var _tokenRemoveRefs$curr2;
+          (_tokenRemoveRefs$curr2 = tokenRemoveRefs.current[nextVal.length - 1]) === null || _tokenRemoveRefs$curr2 === void 0 ? void 0 : _tokenRemoveRefs$curr2.focus();
+        } else {
+          var _tokenRemoveRefs$curr3;
+          (_tokenRemoveRefs$curr3 = tokenRemoveRefs.current[index]) === null || _tokenRemoveRefs$curr3 === void 0 ? void 0 : _tokenRemoveRefs$curr3.focus();
+        }
+      });
+    }
     return {
+      ref: function ref(el) {
+        tokenRemoveRefs.current[index] = el;
+      },
       onClick: function onClick(e) {
-        // prevent the menu from closing
         e.stopPropagation();
-        if (isMultiple(multiple, value)) {
-          setValue(value.filter(function (_, i) {
-            return i !== index;
-          }));
+        removeToken();
+      },
+      onKeyDown: function onKeyDown(e) {
+        if (e.key === 'Enter' || e.key === 'Backspace' || e.key === 'Delete') {
+          e.preventDefault();
+          e.stopPropagation();
+          removeToken();
+        } else if (e.key === 'ArrowLeft') {
+          e.preventDefault();
+          e.stopPropagation();
+          if (index > 0) {
+            var _tokenRemoveRefs$curr4;
+            (_tokenRemoveRefs$curr4 = tokenRemoveRefs.current[index - 1]) === null || _tokenRemoveRefs$curr4 === void 0 ? void 0 : _tokenRemoveRefs$curr4.focus();
+          }
+        } else if (e.key === 'ArrowRight') {
+          e.preventDefault();
+          e.stopPropagation();
+          if (isMultiple(multiple, value) && index < value.length - 1) {
+            var _tokenRemoveRefs$curr5;
+            (_tokenRemoveRefs$curr5 = tokenRemoveRefs.current[index + 1]) === null || _tokenRemoveRefs$curr5 === void 0 ? void 0 : _tokenRemoveRefs$curr5.focus();
+          } else {
+            var _searchRef$current3;
+            (_searchRef$current3 = searchRef.current) === null || _searchRef$current3 === void 0 ? void 0 : _searchRef$current3.focus();
+          }
         }
       }
     };
@@ -1014,12 +1041,15 @@ export function useSuperSelect(_ref3) {
   }
   function getSearchProps() {
     return {
+      'aria-activedescendant': activeDescendantId,
       'aria-controls': listId,
+      'aria-expanded': open,
+      'aria-haspopup': 'listbox',
       onChange: function onChange(value) {
         setSearchValue(value);
-        setActiveTokenIndex(null);
       },
-      placeholder: i18n.t('core.select.search')
+      placeholder: i18n.t('core.select.search'),
+      role: 'combobox'
     };
   }
   function getHeaderProps() {
@@ -1049,10 +1079,10 @@ export function useSuperSelect(_ref3) {
     return {
       'aria-hidden': true,
       'aria-label': i18n.t('core.select.clear'),
+      tabIndex: -1,
       onClick: function onClick(e) {
         // prevent the menu from closing
         e.stopPropagation();
-        setActiveTokenIndex(null);
         setValue(multiple ? [] : null);
         setOpen(true);
       }
@@ -1074,7 +1104,7 @@ export function useSuperSelect(_ref3) {
     };
     return {
       role: 'listbox',
-      id: search ? overlayId : listId,
+      id: listId,
       data: draggable ? queriedDraggableOptions : options,
       components: {
         Item: components === null || components === void 0 ? void 0 : components.Item // TODO fix type
@@ -1135,9 +1165,6 @@ export function useSuperSelect(_ref3) {
       setSearchValue(function () {
         return '';
       });
-      setActiveTokenIndex(function () {
-        return null;
-      });
     }
   }, [open]);
 
@@ -1210,12 +1237,12 @@ export function useSuperSelect(_ref3) {
     components: components,
     state: {
       activeMenuIndex: activeMenuIndex,
-      activeTokenIndex: activeTokenIndex,
       isEmpty: isEmpty,
       isSelectAllActive: isSelectAllActive,
       listContainerHeight: listContainerHeight,
       listId: listId,
       maxHeight: maxHeight,
+      tokenListId: tokenListId,
       onDragEnd: onDragEnd,
       onSelect: onSelect,
       onSelectAll: onSelectAll,