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

package/package.json

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

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

@@ -93,12 +93,14 @@ const Dropdown = ({
   maxHeight,
   widthFitOptions = false,
   disabled,
-  hasTitles = false
+  hasTitles = false,
+  autoEraseTypeAhead = true // legacy behavior as of 05/22
 }) => {
   const [inputValue, setInputValue] = useState("");
   const [optionsState, setOptionsState] = useState([]);
   const [filteredOptions, setFilteredOptions] = useState([]);
   const [optionsChanged, setOptionsChanged] = useState(true);
+  const [selectedRef, setSelectedRef] = useState(undefined);
 
   if (optionsState !== options) {
     setOptionsState(options);
@@ -175,6 +177,7 @@ const Dropdown = ({
       "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 && optionRefs.current[0].current) {
       optionRefs.current[0].current.focus();
@@ -184,8 +187,10 @@ const Dropdown = ({
   }, [isOpen]);
 
   useEffect(() => {
-    clearTimeout(timer);
-    setTimer(setTimeout(() => setInputValue(""), 2000));
+    if (autoEraseTypeAhead) {
+      clearTimeout(timer);
+      setTimer(setTimeout(() => setInputValue(""), 2000));
+    }
     setFilteredOptions(
       options.filter(
         option =>
@@ -286,33 +291,37 @@ const Dropdown = ({
           tabIndex={0}
         >
           <Stack childGap="0">
-            {filteredOptions.map((choice, i) => (
-              <DropdownItemWrapper
-                key={choice.value}
-                ref={optionRefs.current[i]}
-                as="button"
-                tabIndex={-1}
-                onClick={
-                  disabledValues.includes(choice.value)
-                    ? evt => evt.preventDefault()
-                    : () => onSelect(choice.value)
-                }
-                selected={choice.value === value}
-                disabled={disabledValues.includes(choice.value)}
-                data-qa={choice.text}
-                themeValues={themeValues}
-                title={hasTitles ? choice.text : null}
-              >
-                <Text
-                  variant="p"
-                  color={
-                    choice.value === value
-                      ? WHITE
-                      : disabledValues.includes(choice.value)
-                      ? STORM_GREY
-                      : MINESHAFT_GREY
+            {filteredOptions.map((choice, i) => {
+              if (selectedRef === undefined && choice.value === value) {
+                setSelectedRef(optionRefs.current[i]);
+              }
+              return (
+                <DropdownItemWrapper
+                  key={choice.value}
+                  ref={optionRefs.current[i]}
+                  as="button"
+                  tabIndex={-1}
+                  onClick={
+                    disabledValues.includes(choice.value)
+                      ? evt => evt.preventDefault()
+                      : () => onSelect(choice.value)
                   }
-                  extraStyles={`padding-left: 16px; 
+                  selected={choice.value === value}
+                  disabled={disabledValues.includes(choice.value)}
+                  data-qa={choice.text}
+                  themeValues={themeValues}
+                  title={hasTitles ? choice.text : null}
+                >
+                  <Text
+                    variant="p"
+                    color={
+                      choice.value === value
+                        ? WHITE
+                        : disabledValues.includes(choice.value)
+                        ? STORM_GREY
+                        : MINESHAFT_GREY
+                    }
+                    extraStyles={`padding-left: 16px; 
                       cursor: ${
                         disabledValues.includes(choice.value)
                           ? "default"
@@ -321,11 +330,12 @@ const Dropdown = ({
                       white-space: nowrap; 
                       overflow: hidden; 
                       text-overflow: ellipsis;`}
-                >
-                  {choice.text}
-                </Text>
-              </DropdownItemWrapper>
-            ))}
+                  >
+                    {choice.text}
+                  </Text>
+                </DropdownItemWrapper>
+              );
+            })}
           </Stack>
         </DropdownContentWrapper>
       ) : (