@thecb/components 6.0.0-beta.3 → 6.0.0-beta.6

package/dist/index.cjs.js

@@ -19446,31 +19446,31 @@ var DropdownItemWrapper = styled__default.div.withConfig({
 var SearchInput = styled__default.input.withConfig({
   displayName: "Dropdown__SearchInput",
   componentId: "sc-pn6m0h-3"
-})(["border:none;background-color:", ";font-size:16px;height:24px;"], function (_ref8) {
-  var themeValues = _ref8.themeValues;
-  return themeValues.hoverColor && themeValues.hoverColor;
-});
-
-var Dropdown = function Dropdown(_ref9) {
-  var placeholder = _ref9.placeholder,
-      options = _ref9.options,
-      value = _ref9.value,
-      isOpen = _ref9.isOpen,
-      isError = _ref9.isError,
-      onSelect = _ref9.onSelect,
-      _ref9$disabledValues = _ref9.disabledValues,
-      disabledValues = _ref9$disabledValues === void 0 ? [] : _ref9$disabledValues,
-      _ref9$onClick = _ref9.onClick,
-      onClick = _ref9$onClick === void 0 ? noop : _ref9$onClick,
-      themeValues = _ref9.themeValues,
-      maxHeight = _ref9.maxHeight,
-      _ref9$widthFitOptions = _ref9.widthFitOptions,
-      widthFitOptions = _ref9$widthFitOptions === void 0 ? false : _ref9$widthFitOptions,
-      disabled = _ref9.disabled,
-      _ref9$hasTitles = _ref9.hasTitles,
-      hasTitles = _ref9$hasTitles === void 0 ? false : _ref9$hasTitles,
-      _ref9$autoEraseTypeAh = _ref9.autoEraseTypeAhead,
-      autoEraseTypeAhead = _ref9$autoEraseTypeAh === void 0 ? true : _ref9$autoEraseTypeAh;
+})(["border:none;background-color:transparent;font-size:16px;height:24px;min-width:80%;"]);
+
+var Dropdown = function Dropdown(_ref8) {
+  var placeholder = _ref8.placeholder,
+      options = _ref8.options,
+      value = _ref8.value,
+      isOpen = _ref8.isOpen,
+      isError = _ref8.isError,
+      onSelect = _ref8.onSelect,
+      _ref8$disabledValues = _ref8.disabledValues,
+      disabledValues = _ref8$disabledValues === void 0 ? [] : _ref8$disabledValues,
+      _ref8$onClick = _ref8.onClick,
+      onClick = _ref8$onClick === void 0 ? noop : _ref8$onClick,
+      themeValues = _ref8.themeValues,
+      maxHeight = _ref8.maxHeight,
+      _ref8$widthFitOptions = _ref8.widthFitOptions,
+      widthFitOptions = _ref8$widthFitOptions === void 0 ? false : _ref8$widthFitOptions,
+      disabled = _ref8.disabled,
+      _ref8$hasTitles = _ref8.hasTitles,
+      hasTitles = _ref8$hasTitles === void 0 ? false : _ref8$hasTitles,
+      _ref8$autoEraseTypeAh = _ref8.autoEraseTypeAhead,
+      autoEraseTypeAhead = _ref8$autoEraseTypeAh === void 0 ? true : _ref8$autoEraseTypeAh,
+      ariaLabelledby = _ref8.ariaLabelledby,
+      _ref8$autocompleteVal = _ref8.autocompleteValue,
+      autocompleteValue = _ref8$autocompleteVal === void 0 ? "" : _ref8$autocompleteVal;
 
   var _useState = React.useState(""),
       _useState2 = _slicedToArray(_useState, 2),
@@ -19526,6 +19526,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;
@@ -19579,10 +19581,18 @@ var Dropdown = function Dropdown(_ref9) {
 
       case "Backspace" :
         e.preventDefault();
-        console.log("input value is", inputValue);
-        console.log("new input value will be", inputValue.slice(0, -1));
         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) {
@@ -19596,7 +19606,11 @@ var Dropdown = function Dropdown(_ref9) {
     console.log("selected refs in isopen useffect", selectedRef);
     console.log("value in isopen useffect", value);
 
-    if (isOpen && optionRefs.current[0].current) {
+    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();
     }
 
@@ -19617,6 +19631,8 @@ var Dropdown = function Dropdown(_ref9) {
   }, [inputValue]);
   React.useEffect(function () {
     if (!isOpen && filteredOptions[0] && !disabledValues.includes(filteredOptions[0].value) && filteredOptions[0].text != placeholder) {
+      console.log("filtered options are", filteredOptions);
+      console.log("option refs are", optionRefs);
       onSelect(filteredOptions[0].value);
     }
 
@@ -19633,6 +19649,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, {
@@ -19649,31 +19669,43 @@ var Dropdown = function Dropdown(_ref9) {
     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",
+    bottomItem: 2,
+    extraStyles: "position: relative;"
+  }, /*#__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",
+    isOpen: isOpen,
+    tabIndex: -1,
+    name: autocompleteValue,
+    autocomplete: autocompleteValue
+  }), /*#__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) {
+    if (choice.value === value && selectedRef !== optionRefs.current[i]) {
       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",
@@ -19681,13 +19713,16 @@ var Dropdown = function Dropdown(_ref9) {
       onClick: disabledValues.includes(choice.value) ? function (evt) {
         return evt.preventDefault();
       } : function () {
-        return onSelect(choice.value);
+        setSelectedRef(optionRefs.current[i]);
+        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,
@@ -19832,7 +19867,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 : "",