@thecb/components 6.0.0-beta.10 → 6.0.0-beta.11

package/package.json

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

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

@@ -41,7 +41,7 @@ const DropdownContentWrapper = styled.div`
   }
 `;
 
-const DropdownItemWrapper = styled.div`
+const DropdownItemWrapper = styled.li`
   background-color: ${({ selected, themeValues }) =>
     selected ? themeValues.selectedColor : WHITE};
   text-align: start;
@@ -170,6 +170,11 @@ const Dropdown = ({
           optionRefs?.current?.length ?? 0 - 1
         ].current.focus();
         break;
+      case "Escape":
+        if (isOpen) {
+          onClick();
+        }
+        break;
     }
   };
 
@@ -275,62 +280,67 @@ const Dropdown = ({
           value={inputValue}
           width="100%"
           dataQa={placeholder}
-        >
-          {isOpen ? (
-            <DropdownContentWrapper
-              maxHeight={maxHeight}
-              open={isOpen}
-              ref={dropdownRef}
-              widthFitOptions={widthFitOptions}
-              tabIndex={0}
-              role="listbox"
-              id={`${ariaLabelledby}_listbox`}
-            >
-              <Stack childGap="0">
-                {filteredOptions.map((choice, i) => {
-                  if (
-                    choice.value === value &&
-                    selectedRef !== optionRefs.current[i]
-                  ) {
-                    setSelectedRef(optionRefs.current[i]);
-                  }
-                  return (
-                    <DropdownItemWrapper
-                      id={
-                        focusedRef === optionRefs.current[i]
-                          ? "focused_option"
-                          : choice.value
-                      }
-                      key={choice.value}
-                      ref={optionRefs.current[i]}
-                      tabIndex={-1}
-                      onClick={
-                        disabledValues.includes(choice.value)
-                          ? evt => evt.preventDefault()
-                          : () => {
-                              setSelectedRef(optionRefs.current[i]);
-                              onSelect(choice.value);
-                            }
+        />
+        <IconWrapper open={isOpen}>
+          <DropdownIcon />
+        </IconWrapper>
+      </Stack>
+      <Fragment>
+        {isOpen ? (
+          <DropdownContentWrapper
+            maxHeight={maxHeight}
+            open={isOpen}
+            ref={dropdownRef}
+            widthFitOptions={widthFitOptions}
+            tabIndex={0}
+            role="listbox"
+            id={`${ariaLabelledby}_listbox`}
+          >
+            <Stack childGap="0" as="ul">
+              {filteredOptions.map((choice, i) => {
+                if (
+                  choice.value === value &&
+                  selectedRef !== optionRefs.current[i]
+                ) {
+                  setSelectedRef(optionRefs.current[i]);
+                }
+                return (
+                  <DropdownItemWrapper
+                    id={
+                      focusedRef === optionRefs.current[i]
+                        ? "focused_option"
+                        : choice.value
+                    }
+                    key={choice.value}
+                    ref={optionRefs.current[i]}
+                    tabIndex={-1}
+                    onClick={
+                      disabledValues.includes(choice.value)
+                        ? evt => evt.preventDefault()
+                        : () => {
+                            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}
+                    role="option"
+                    onFocus={() => setFocusedRef(optionRefs.current[i])}
+                  >
+                    <Text
+                      variant="p"
+                      color={
+                        choice.value === value
+                          ? WHITE
+                          : disabledValues.includes(choice.value)
+                          ? STORM_GREY
+                          : MINESHAFT_GREY
                       }
-                      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"
-                      onFocus={() => setFocusedRef(optionRefs.current[i])}
-                    >
-                      <Text
-                        variant="p"
-                        color={
-                          choice.value === value
-                            ? WHITE
-                            : disabledValues.includes(choice.value)
-                            ? STORM_GREY
-                            : MINESHAFT_GREY
-                        }
-                        extraStyles={`padding-left: 16px; 
+                      extraStyles={`padding-left: 16px; 
                       cursor: ${
                         disabledValues.includes(choice.value)
                           ? "default"
@@ -339,22 +349,18 @@ const Dropdown = ({
                       white-space: nowrap; 
                       overflow: hidden; 
                       text-overflow: ellipsis;`}
-                      >
-                        {choice.text}
-                      </Text>
-                    </DropdownItemWrapper>
-                  );
-                })}
-              </Stack>
-            </DropdownContentWrapper>
-          ) : (
-            <Fragment />
-          )}
-        </Box>
-        <IconWrapper open={isOpen}>
-          <DropdownIcon />
-        </IconWrapper>
-      </Stack>
+                    >
+                      {choice.text}
+                    </Text>
+                  </DropdownItemWrapper>
+                );
+              })}
+            </Stack>
+          </DropdownContentWrapper>
+        ) : (
+          <Fragment />
+        )}
+      </Fragment>
     </Fragment>
   );
 };