intelicoreact 1.1.20 → 1.1.22

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

@@ -124,17 +124,15 @@ var Dropdown = function Dropdown(_ref) {
       return option.items = moveOtherToEnd(option.items);
     } else return option;
   });
-  var filteredGroups = optionsWithOtherAtTheEnd.filter(function (item) {
+  var filteredGroups = optionsWithOtherAtTheEnd.map(function (item) {
     var _item$items;
 
-    return (_item$items = item.items) === null || _item$items === void 0 ? void 0 : _item$items.length;
-  }).map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
-      items: isSearchable ? item.items.filter(function (el) {
+      items: !isSearchable || !isSearchChanged ? item === null || item === void 0 ? void 0 : item.items : (_item$items = item.items) === null || _item$items === void 0 ? void 0 : _item$items.slice().filter(function (el) {
         var _el$label;
 
-        return isSearchChanged ? el === null || el === void 0 ? void 0 : (_el$label = el.label) === null || _el$label === void 0 ? void 0 : _el$label.toLowerCase().includes((searchValue === null || searchValue === void 0 ? void 0 : searchValue.toLowerCase()) || '') : true;
-      }) : item === null || item === void 0 ? void 0 : item.items
+        return (el === null || el === void 0 ? void 0 : (_el$label = el.label) === null || _el$label === void 0 ? void 0 : _el$label.toLowerCase().includes((searchValue === null || searchValue === void 0 ? void 0 : searchValue.toLowerCase()) || '')) || !(el !== null && el !== void 0 && el.value) || (el === null || el === void 0 ? void 0 : el.value) === '';
+      })
     });
   }).filter(function (item) {
     var _item$items2;
@@ -148,7 +146,8 @@ var Dropdown = function Dropdown(_ref) {
   }).filter(function (item) {
     var _item$label;
 
-    return isSearchable && isSearchChanged ? (item === null || item === void 0 ? void 0 : (_item$label = item.label) === null || _item$label === void 0 ? void 0 : _item$label.toLowerCase().includes((searchValue === null || searchValue === void 0 ? void 0 : searchValue.toLowerCase()) || '')) || !(item !== null && item !== void 0 && item.value) || (item === null || item === void 0 ? void 0 : item.value) === '' : true;
+    if (!isSearchable || !isSearchChanged) return true;
+    return (item === null || item === void 0 ? void 0 : (_item$label = item.label) === null || _item$label === void 0 ? void 0 : _item$label.toLowerCase().includes((searchValue === null || searchValue === void 0 ? void 0 : searchValue.toLowerCase()) || '')) || !(item !== null && item !== void 0 && item.value) || (item === null || item === void 0 ? void 0 : item.value) === '';
   });
   var filteredOptions = [].concat((0, _toConsumableArray2.default)(filteredItems), (0, _toConsumableArray2.default)(filteredGroups));
   var modalBtnTrigger = entity && entity !== '' && typeof entity === 'string';
@@ -227,7 +226,7 @@ var Dropdown = function Dropdown(_ref) {
     return /*#__PURE__*/_react.default.createElement("button", {
       "data-testid": "dropdown--button--key-".concat(optTestId || (item === null || item === void 0 ? void 0 : (_item$value = item.value) === null || _item$value === void 0 ? void 0 : (_item$value$toString = _item$value.toString()) === null || _item$value$toString === void 0 ? void 0 : _item$value$toString.replace(/\s/, '-')) || (item === null || item === void 0 ? void 0 : item.key) || 'item', "--option"),
       key: (_item$value2 = item.value) === null || _item$value2 === void 0 ? void 0 : (_item$value2$toString = _item$value2.toString()) === null || _item$value2$toString === void 0 ? void 0 : _item$value2$toString.replace(/ /g, '_'),
-      onClick: function onClick() {
+      onMouseDown: function onMouseDown() {
         return depend.onChange(item);
       },
       className: (0, _classnames.default)("".concat(RC, "__list-item"), (_cn = {}, (0, _defineProperty2.default)(_cn, "".concat(RC, "__list-item_active"), item.value === value), (0, _defineProperty2.default)(_cn, "".concat(RC, "__list-item_disabled"), item.disabled), _cn), item.className)
@@ -366,6 +365,13 @@ var Dropdown = function Dropdown(_ref) {
     }, noOptionsText), disabled && isOpen && /*#__PURE__*/_react.default.createElement(_DropdownLoader.default, null));
   };
 
+  var toggleList = function toggleList(e) {
+    e === null || e === void 0 ? void 0 : e.stopPropagation();
+    setIsOpen(function (isOpen) {
+      return !isOpen;
+    });
+  };
+
   var closeList = handleClickOutside;
   (0, _react.useEffect)(function () {
     initListContainer();
@@ -415,17 +421,20 @@ var Dropdown = function Dropdown(_ref) {
   };
 
   (0, _react.useEffect)(function () {
-    if (!searchValue && (isOpen || isSearchInputFocused)) {
+    if (!searchValue && isSearchInputFocused) {
       setSearchValue(selectedLabel);
       setTimeout(function () {
         return searchInputRef.current.select();
       }, 1);
     }
 
-    if (!isSearchInputFocused) {
+    if (!isSearchInputFocused && !isOpen) {
       setSearchValue(null);
     }
-  }, [isOpen, isSearchInputFocused]);
+  }, [isSearchInputFocused]);
+  (0, _react.useEffect)(function () {
+    if (isOpen && !isSearchInputFocused) searchInputRef.current.focus();
+  }, [isOpen]);
   var postfixText = selectedLabel && ((_filteredOptions$find = filteredOptions.find(function (option) {
     return option.value === value;
   })) === null || _filteredOptions$find === void 0 ? void 0 : _filteredOptions$find.postfix) || null;
@@ -439,18 +448,9 @@ var Dropdown = function Dropdown(_ref) {
   }, /*#__PURE__*/_react.default.createElement("button", {
     "data-testid": "dropdown--".concat(testId || '', "--container"),
     className: "".concat(RC, "__trigger input__wrap ").concat(isOpen ? 'input__wrap--focus' : '', " ").concat(!value ? 'placeholder' : '', " ").concat(error ? 'error' : ''),
-    onClick: function onClick(e) {
-      e.stopPropagation();
-      setIsOpen(!isOpen);
-    },
-    onMouseDown: function onMouseDown() {
-      return setIsFocusedByClick(true);
-    },
+    onClick: toggleList,
     onKeyDown: onKeyDown,
-    onKeyUp: onKeyUp,
-    onFocus: function onFocus() {
-      return !isFocusedByClick ? setIsOpen(true) : null;
-    }
+    onKeyUp: onKeyUp
   }, isSearchable ? /*#__PURE__*/_react.default.createElement("input", {
     ref: searchInputRef,
     className: "".concat(RC, "__input"),
@@ -465,8 +465,11 @@ var Dropdown = function Dropdown(_ref) {
     onBlur: function onBlur() {
       return setIsSearchInputFocused(false);
     },
-    onClick: function onClick() {
-      if (!isOpen) setIsOpen(true);
+    onMouseDown: function onMouseDown() {
+      if (!isOpen) {
+        setIsSearchInputFocused(true);
+        setIsOpen(true);
+      }
     }
   }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     className: "text"
@@ -474,10 +477,7 @@ var Dropdown = function Dropdown(_ref) {
     className: "dropdown__list-item-postfix"
   }, postfixText)), /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _classnames.default)("".concat(RC, "__arrow"), (0, _defineProperty2.default)({}, "".concat(RC, "__arrow_active"), isOpen)),
-    onClick: function onClick(e) {
-      e === null || e === void 0 ? void 0 : e.stopPropagation();
-      setIsOpen(!isOpen);
-    }
+    onClick: toggleList
   }, isOpen ? /*#__PURE__*/_react.default.createElement(_reactFeather.ChevronUp, null) : /*#__PURE__*/_react.default.createElement(_reactFeather.ChevronDown, null))), isOpen && renderListContainer());
 };
 

package/package.json

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