@thecb/components 6.0.0-beta.28 → 6.0.0-beta.30

package/dist/index.cjs.js

@@ -20752,6 +20752,11 @@ var Dropdown = function Dropdown(_ref8) {
       inputChangedByAutofill = _useState14[0],
       setInputChangedByAutofill = _useState14[1];
 
+  var _useState15 = React.useState(false),
+      _useState16 = _slicedToArray(_useState15, 2),
+      focusedByClick = _useState16[0],
+      setFocusedByClick = _useState16[1];
+
   if (optionsState !== options) {
     setOptionsState(options);
     setOptionsChanged(true);
@@ -20762,10 +20767,10 @@ var Dropdown = function Dropdown(_ref8) {
     setOptionsChanged(false);
   }
 
-  var _useState15 = React.useState(null),
-      _useState16 = _slicedToArray(_useState15, 2),
-      timer = _useState16[0],
-      setTimer = _useState16[1];
+  var _useState17 = React.useState(null),
+      _useState18 = _slicedToArray(_useState17, 2),
+      timer = _useState18[0],
+      setTimer = _useState18[1];
 
   var optionRefs = React.useRef(_toConsumableArray(Array(options.length)).map(function () {
     return /*#__PURE__*/React.createRef();
@@ -20880,14 +20885,23 @@ var Dropdown = function Dropdown(_ref8) {
   };
 
   React.useEffect(function () {
-    if (isOpen && selectedRef !== undefined && selectedRef.current !== null) {
+    var selectedRefExists = selectedRef !== undefined && selectedRef.current !== null;
+
+    if (isOpen && selectedRefExists && !focusedByClick) {
       // WAI-ARIA requires the selected option to receive focus
       selectedRef.current.focus();
-      console.log("input box ref", inputRef, inputRef.current);
-    } else if (isOpen && optionRefs.current[0].current) {
+    } else if (isOpen && optionRefs.current[0].current && !focusedByClick) {
       // If no selected option, first option receives focus
       optionRefs.current[0].current.focus();
-      console.log("input box ref", inputRef, inputRef.current);
+    }
+
+    if (isOpen && focusedByClick && selectedRefExists) {
+      selectedRef.current.scrollIntoView({
+        behavior: "smooth",
+        block: "nearest",
+        inline: "start"
+      });
+      setFocusedByClick(false);
     }
 
     clearTimeout(timer);
@@ -20936,6 +20950,8 @@ var Dropdown = function Dropdown(_ref8) {
     minWidth: "100%",
     onClick: function onClick() {
       if (!isOpen) {
+        setFocusedByClick(true);
+
         _onClick();
       }
     },