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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thecb/components",
-  "version": "6.0.0-beta.3",
+  "version": "6.0.0-beta.4",
   "description": "Common lib for CityBase react components",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",

package/src/components/atoms/dropdown/Dropdown.js

@@ -94,7 +94,8 @@ const Dropdown = ({
   widthFitOptions = false,
   disabled,
   hasTitles = false,
-  autoEraseTypeAhead = true // legacy behavior as of 05/22
+  autoEraseTypeAhead = true, // legacy behavior as of 05/22
+  ariaLabelledby
 }) => {
   const [inputValue, setInputValue] = useState("");
   const [optionsState, setOptionsState] = useState([]);
@@ -161,10 +162,18 @@ const Dropdown = ({
         break;
       case "Backspace" || "Delete":
         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?.length ?? 0 - 1
+        ].current.focus();
+        break;
     }
     if ((keyCode > 64 && keyCode < 91) || keyCode == 32 || keyCode == 189) {
       e.preventDefault();
@@ -179,7 +188,11 @@ const Dropdown = ({
     );
     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();
     }
     clearTimeout(timer);
@@ -224,6 +237,10 @@ const Dropdown = ({
       width="100%"
       hoverStyles={`background-color: ${themeValues.hoverColor};`}
       aria-expanded={isOpen}
+      role="combobox"
+      aria-owns={`${ariaLabelledby}_listbox`}
+      aria-haspopup="listbox"
+      aria-labelledby={ariaLabelledby}
       extraStyles={
         disabled &&
         `color: #6e727e;
@@ -247,7 +264,6 @@ const Dropdown = ({
             : GREY_CHATEAU
         }
         borderRadius="2px"
-        tabIndex={0}
         dataQa={placeholder}
         extraStyles={`height: 48px;
           ${disabled &&
@@ -257,26 +273,20 @@ const Dropdown = ({
           `}
       >
         <Stack direction="row" bottomItem={2}>
-          {isOpen ? (
-            <SearchInput
-              aria-label={inputValue || "Dropdown awaiting search value"}
-              value={inputValue}
-              onChange={noop}
-              themeValues={themeValues}
-            />
-          ) : (
-            <Text
-              variant="p"
-              extraStyles={
-                disabled &&
-                `color: #6e727e;
-            background-color: #f7f7f7;
-            pointer-events: none;`
-              }
-            >
-              {getSelection()}
-            </Text>
-          )}
+          <SearchInput
+            aria-label={getSelection()}
+            placeholder={getSelection()}
+            value={inputValue}
+            onChange={noop}
+            themeValues={themeValues}
+            role="searchbox"
+            type="text"
+            aria-multiline="false"
+            aria-autocomplete="list"
+            aria-controls={`${ariaLabelledby}_listbox`}
+            aria-activedescendant="selected_option"
+            tabIndex={0}
+          />
           <IconWrapper open={isOpen}>
             <DropdownIcon />
           </IconWrapper>
@@ -289,6 +299,8 @@ const Dropdown = ({
           ref={dropdownRef}
           widthFitOptions={widthFitOptions}
           tabIndex={0}
+          role="listbox"
+          id={`${ariaLabelledby}_listbox`}
         >
           <Stack childGap="0">
             {filteredOptions.map((choice, i) => {
@@ -297,6 +309,7 @@ const Dropdown = ({
               }
               return (
                 <DropdownItemWrapper
+                  id={choice.value === value ? "selected_option" : choice.value}
                   key={choice.value}
                   ref={optionRefs.current[i]}
                   as="button"
@@ -307,10 +320,12 @@ const Dropdown = ({
                       : () => 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}
+                  role="option"
                 >
                   <Text
                     variant="p"

package/src/components/atoms/form-select/FormSelect.js

@@ -58,7 +58,7 @@ const FormSelect = ({
         </Cluster>
       </Box>
       <Dropdown
-        aria-labelledby={labelTextWhenNoError.replace(/\s+/g, "-")}
+        ariaLabelledby={labelTextWhenNoError.replace(/\s+/g, "-")}
         maxHeight={dropdownMaxHeight}
         hasTitles={hasTitles}
         placeholder={options[0] ? options[0].text : ""}