@thecb/components 6.0.0-beta.1 → 6.0.0-beta.4

package/dist/index.cjs.js

@@ -19468,7 +19468,10 @@ var Dropdown = function Dropdown(_ref9) {
       widthFitOptions = _ref9$widthFitOptions === void 0 ? false : _ref9$widthFitOptions,
       disabled = _ref9.disabled,
       _ref9$hasTitles = _ref9.hasTitles,
-      hasTitles = _ref9$hasTitles === void 0 ? false : _ref9$hasTitles;
+      hasTitles = _ref9$hasTitles === void 0 ? false : _ref9$hasTitles,
+      _ref9$autoEraseTypeAh = _ref9.autoEraseTypeAhead,
+      autoEraseTypeAhead = _ref9$autoEraseTypeAh === void 0 ? true : _ref9$autoEraseTypeAh,
+      ariaLabelledby = _ref9.ariaLabelledby;
 
   var _useState = React.useState(""),
       _useState2 = _slicedToArray(_useState, 2),
@@ -19490,6 +19493,11 @@ var Dropdown = function Dropdown(_ref9) {
       optionsChanged = _useState8[0],
       setOptionsChanged = _useState8[1];
 
+  var _useState9 = React.useState(undefined),
+      _useState10 = _slicedToArray(_useState9, 2),
+      selectedRef = _useState10[0],
+      setSelectedRef = _useState10[1];
+
   if (optionsState !== options) {
     setOptionsState(options);
     setOptionsChanged(true);
@@ -19500,10 +19508,10 @@ var Dropdown = function Dropdown(_ref9) {
     setOptionsChanged(false);
   }
 
-  var _useState9 = React.useState(null),
-      _useState10 = _slicedToArray(_useState9, 2),
-      timer = _useState10[0],
-      setTimer = _useState10[1];
+  var _useState11 = React.useState(null),
+      _useState12 = _slicedToArray(_useState11, 2),
+      timer = _useState12[0],
+      setTimer = _useState12[1];
 
   var optionRefs = React.useRef(_toConsumableArray(Array(options.length)).map(function () {
     return /*#__PURE__*/React.createRef();
@@ -19519,6 +19527,8 @@ var Dropdown = function Dropdown(_ref9) {
   };
 
   var onKeyDown = function onKeyDown(e) {
+    var _optionRefs$current$l, _optionRefs$current;
+
     var key = e.key,
         keyCode = e.keyCode;
     var focus = document.activeElement;
@@ -19574,6 +19584,16 @@ var Dropdown = function Dropdown(_ref9) {
         e.preventDefault();
         setInputValue(inputValue.slice(0, -1));
         break;
+
+      case "Home":
+        e.preventDefault();
+        optionRefs.current[0].current.focus();
+        break;
+
+      case "End":
+        e.preventDefault();
+        optionRefs.current[(_optionRefs$current$l = optionRefs === null || optionRefs === void 0 ? void 0 : (_optionRefs$current = optionRefs.current) === null || _optionRefs$current === void 0 ? void 0 : _optionRefs$current.length) !== null && _optionRefs$current$l !== void 0 ? _optionRefs$current$l : 0 - 1].current.focus();
+        break;
     }
 
     if (keyCode > 64 && keyCode < 91 || keyCode == 32 || keyCode == 189) {
@@ -19583,7 +19603,15 @@ var Dropdown = function Dropdown(_ref9) {
   };
 
   React.useEffect(function () {
-    if (isOpen && optionRefs.current[0].current) {
+    console.log("option refs in isopen useffect", optionRefs.current[0].current);
+    console.log("selected refs in isopen useffect", selectedRef);
+    console.log("value in isopen useffect", value);
+
+    if (isOpen && selectedRef !== undefined) {
+      // WAI-ARIA requires the selected option to receive focus
+      selectedRef.current.focus();
+    } else if (isOpen && optionRefs.current[0].current) {
+      // If no selected option, first option receives focus
       optionRefs.current[0].current.focus();
     }
 
@@ -19591,10 +19619,13 @@ var Dropdown = function Dropdown(_ref9) {
     setInputValue("");
   }, [isOpen]);
   React.useEffect(function () {
-    clearTimeout(timer);
-    setTimer(setTimeout(function () {
-      return setInputValue("");
-    }, 2000));
+    if (autoEraseTypeAhead) {
+      clearTimeout(timer);
+      setTimer(setTimeout(function () {
+        return setInputValue("");
+      }, 2000));
+    }
+
     setFilteredOptions(options.filter(function (option) {
       return option.value.toLowerCase().startsWith(inputValue.toLowerCase()) || option.text.toLowerCase().startsWith(inputValue.toLowerCase());
     }));
@@ -19617,6 +19648,10 @@ var Dropdown = function Dropdown(_ref9) {
     width: "100%",
     hoverStyles: "background-color: ".concat(themeValues.hoverColor, ";"),
     "aria-expanded": isOpen,
+    role: "combobox",
+    "aria-owns": "".concat(ariaLabelledby, "_listbox"),
+    "aria-haspopup": "listbox",
+    "aria-labelledby": ariaLabelledby,
     extraStyles: disabled && "color: #6e727e;\n      background-color: #f7f7f7;\n      pointer-events: none;",
     title: hasTitles ? getSelection() : null
   }, /*#__PURE__*/React__default.createElement(Box, {
@@ -19628,32 +19663,43 @@ var Dropdown = function Dropdown(_ref9) {
     borderSize: "1px",
     borderColor: isError ? ERROR_COLOR : isOpen ? themeValues.selectedColor : GREY_CHATEAU,
     borderRadius: "2px",
-    tabIndex: 0,
     dataQa: placeholder,
     extraStyles: "height: 48px;\n          ".concat(disabled && "color: #6e727e;\n          background-color: #f7f7f7;\n          pointer-events: none;", "\n          ")
   }, /*#__PURE__*/React__default.createElement(Stack, {
     direction: "row",
     bottomItem: 2
-  }, isOpen ? /*#__PURE__*/React__default.createElement(SearchInput, {
-    "aria-label": inputValue || "Dropdown awaiting search value",
+  }, /*#__PURE__*/React__default.createElement(SearchInput, {
+    "aria-label": getSelection(),
+    placeholder: getSelection(),
     value: inputValue,
     onChange: noop,
-    themeValues: themeValues
-  }) : /*#__PURE__*/React__default.createElement(Text$1, {
-    variant: "p",
-    extraStyles: disabled && "color: #6e727e;\n            background-color: #f7f7f7;\n            pointer-events: none;"
-  }, getSelection()), /*#__PURE__*/React__default.createElement(IconWrapper, {
+    themeValues: themeValues,
+    role: "searchbox",
+    type: "text",
+    "aria-multiline": "false",
+    "aria-autocomplete": "list",
+    "aria-controls": "".concat(ariaLabelledby, "_listbox"),
+    "aria-activedescendant": "selected_option",
+    tabIndex: 0
+  }), /*#__PURE__*/React__default.createElement(IconWrapper, {
     open: isOpen
   }, /*#__PURE__*/React__default.createElement(DropdownIcon, null)))), isOpen ? /*#__PURE__*/React__default.createElement(DropdownContentWrapper, {
     maxHeight: maxHeight,
     open: isOpen,
     ref: dropdownRef,
     widthFitOptions: widthFitOptions,
-    tabIndex: 0
+    tabIndex: 0,
+    role: "listbox",
+    id: "".concat(ariaLabelledby, "_listbox")
   }, /*#__PURE__*/React__default.createElement(Stack, {
     childGap: "0"
   }, filteredOptions.map(function (choice, i) {
+    if (selectedRef === undefined && choice.value === value) {
+      setSelectedRef(optionRefs.current[i]);
+    }
+
     return /*#__PURE__*/React__default.createElement(DropdownItemWrapper, {
+      id: choice.value === value ? "selected_option" : choice.value,
       key: choice.value,
       ref: optionRefs.current[i],
       as: "button",
@@ -19664,10 +19710,12 @@ var Dropdown = function Dropdown(_ref9) {
         return onSelect(choice.value);
       },
       selected: choice.value === value,
+      "aria-selected": choice.value === value,
       disabled: disabledValues.includes(choice.value),
       "data-qa": choice.text,
       themeValues: themeValues,
-      title: hasTitles ? choice.text : null
+      title: hasTitles ? choice.text : null,
+      role: "option"
     }, /*#__PURE__*/React__default.createElement(Text$1, {
       variant: "p",
       color: choice.value === value ? WHITE : disabledValues.includes(choice.value) ? STORM_GREY : MINESHAFT_GREY,
@@ -19812,7 +19860,7 @@ var FormSelect = function FormSelect(_ref) {
     extraStyles: "word-break: break-word;\n              font-family: Public Sans;\n              &::first-letter {\n                text-transform: uppercase;\n              }",
     id: labelTextWhenNoError.replace(/\s+/g, "-")
   }, labelTextWhenNoError))), /*#__PURE__*/React__default.createElement(Dropdown$1, {
-    "aria-labelledby": labelTextWhenNoError.replace(/\s+/g, "-"),
+    ariaLabelledby: labelTextWhenNoError.replace(/\s+/g, "-"),
     maxHeight: dropdownMaxHeight,
     hasTitles: hasTitles,
     placeholder: options[0] ? options[0].text : "",