intelicoreact 0.2.25 → 0.2.26

package/dist/Atomic/FormElements/Dropdown/Dropdown.js

@@ -69,6 +69,12 @@ var Dropdown = function Dropdown(_ref) {
 
   var dropdownRef = (0, _react.useRef)(null);
   var dropdownListRef = (0, _react.useRef)(null);
+
+  var _useState5 = (0, _react.useState)(false),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      isFocusedByClick = _useState6[0],
+      setIsFocusedByClick = _useState6[1];
+
   if (!options) return null;
   var filteredGroups = options.filter(function (item) {
     var _item$items;
@@ -210,6 +216,8 @@ var Dropdown = function Dropdown(_ref) {
     };
   }, [value]);
   (0, _react.useEffect)(function () {
+    if (!isOpen) setIsFocusedByClick(false);
+
     if (scrollReactionObj && (0, _typeof2.default)(scrollReactionObj) === 'object' && isOpen && dropdownListRef && dropdownListRef.current) {
       dropdownListRef.current.addEventListener('scroll', doScrollCallback);
     }
@@ -218,6 +226,17 @@ var Dropdown = function Dropdown(_ref) {
       if (scrollReactionObj && (0, _typeof2.default)(scrollReactionObj) === 'object') removeEventListener('scroll', doScrollCallback);
     };
   }, [isOpen, dropdownListRef]);
+
+  var onKeyDown = function onKeyDown(e) {
+    if (![9, 13].includes(e.keyCode)) return false;
+    setIsOpen(false);
+  };
+
+  var onKeyUp = function onKeyUp(e) {
+    if (![9, 13].includes(e.keyCode)) return false;
+    setIsOpen(true);
+  };
+
   var postfixText = selectedLabel && ((_filteredOptions$find = filteredOptions.find(function (option) {
     return option.value === value;
   })) === null || _filteredOptions$find === void 0 ? void 0 : _filteredOptions$find.postfix) || null;
@@ -226,18 +245,20 @@ var Dropdown = function Dropdown(_ref) {
       disabled: disabled
     }),
     ref: dropdownRef,
-    onKeyDown: function onKeyDown(e) {
-      if (!['Tab', 'Enter'].includes(e.code)) return false;
-      setIsOpen(false);
-    },
-    onKeyUp: function onKeyUp(e) {
-      if (!['Tab', 'Enter'].includes(e.code)) return false;
-      setIsOpen(true);
-    }
+    onKeyDown: onKeyDown,
+    onKeyUp: onKeyUp
   }, /*#__PURE__*/_react.default.createElement("button", {
     className: "".concat(RC, "__trigger input__wrap ").concat(isOpen ? 'input__wrap--focus' : '', " ").concat(!value ? 'placeholder' : '', " ").concat(error ? 'error' : ''),
     onClick: function onClick() {
       return !isSearchable ? setIsOpen(!isOpen) : null;
+    },
+    onMouseDown: function onMouseDown() {
+      return setIsFocusedByClick(true);
+    },
+    onKeyDown: onKeyDown,
+    onKeyUp: onKeyUp,
+    onFocus: function onFocus() {
+      return !isFocusedByClick ? setIsOpen(true) : null;
     }
   }, isSearchable ? /*#__PURE__*/_react.default.createElement("input", {
     className: "".concat(RC, "__input"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelicoreact",
-  "version": "0.2.25",
+  "version": "0.2.26",
   "description": "",
   "main": "dist/index.js",
   "files": [