intelicoreact 1.1.17 → 1.1.19

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

@@ -79,19 +79,19 @@ var Dropdown = function Dropdown(_ref) {
       searchValue = _useState4[0],
       setSearchValue = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(false),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      isSearching = _useState6[0],
-      setIsSearching = _useState6[1];
-
   var dropdownRef = (0, _react.useRef)(null);
   var dropdownListRef = (0, _react.useRef)(null);
   var searchInputRef = (0, _react.useRef)(null);
 
-  var _useState7 = (0, _react.useState)(null),
+  var _useState5 = (0, _react.useState)(null),
+      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+      initListHeight = _useState6[0],
+      setInitListHeight = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(false),
       _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-      initListHeight = _useState8[0],
-      setInitListHeight = _useState8[1];
+      isSearchChanged = _useState8[0],
+      setIsSearchChanged = _useState8[1];
 
   var _useState9 = (0, _react.useState)(false),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
@@ -128,7 +128,7 @@ var Dropdown = function Dropdown(_ref) {
       items: item.items.filter(function (el) {
         var _el$label;
 
-        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()) || '');
+        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;
       })
     });
   }).filter(function (item) {
@@ -143,7 +143,7 @@ var Dropdown = function Dropdown(_ref) {
   }).filter(function (item) {
     var _item$label;
 
-    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) === '';
+    return 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;
   });
   var filteredOptions = [].concat((0, _toConsumableArray2.default)(filteredItems), (0, _toConsumableArray2.default)(filteredGroups));
   var modalBtnTrigger = entity && entity !== '' && typeof entity === 'string';
@@ -188,6 +188,7 @@ var Dropdown = function Dropdown(_ref) {
   var onSearchHandler = function onSearchHandler(name) {
     var inputValue = name;
     if (!isNotValidateASCII) inputValue = (0, _fieldValueFormatters.formatToOnlyASCIICodeText)(inputValue);
+    setIsSearchChanged(true);
     setSearchValue(inputValue);
   };
 
@@ -216,9 +217,9 @@ var Dropdown = function Dropdown(_ref) {
   var depend = getDepends(modalBtnTrigger);
 
   var getMarkupForElement = function getMarkupForElement(item, index, optTestId) {
-    var _item$label2, _item$label2$toLowerC, _item$label2$toLowerC2, _item$label2$toLowerC3, _searchValue$toLowerC, _item$value, _item$value$toString, _item$value2, _item$value2$toString, _cn;
+    var _item$value, _item$value$toString, _item$value2, _item$value2$toString, _cn;
 
-    return item !== null && item !== void 0 && (_item$label2 = item.label) !== null && _item$label2 !== void 0 && (_item$label2$toLowerC = _item$label2.toLowerCase) !== null && _item$label2$toLowerC !== void 0 && (_item$label2$toLowerC2 = _item$label2$toLowerC.call(_item$label2)) !== null && _item$label2$toLowerC2 !== void 0 && (_item$label2$toLowerC3 = _item$label2$toLowerC2.includes) !== null && _item$label2$toLowerC3 !== void 0 && _item$label2$toLowerC3.call(_item$label2$toLowerC2, (searchValue === null || searchValue === void 0 ? void 0 : (_searchValue$toLowerC = searchValue.toLowerCase) === null || _searchValue$toLowerC === void 0 ? void 0 : _searchValue$toLowerC.call(searchValue)) || '') || !(item !== null && item !== void 0 && item.value) || (item === null || item === void 0 ? void 0 : item.value) === '' || (item === null || item === void 0 ? void 0 : item.value) === 'open_modal' ? /*#__PURE__*/_react.default.createElement("button", {
+    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() {
@@ -232,7 +233,7 @@ var Dropdown = function Dropdown(_ref) {
       dangerouslySetInnerHTML: {
         __html: hightlightedText(item.label, item.postfix)
       }
-    })) : null;
+    }));
   };
 
   var filteredOptionList = function filteredOptionList(filteredOption) {
@@ -384,7 +385,10 @@ var Dropdown = function Dropdown(_ref) {
     };
   }, [value]);
   (0, _react.useEffect)(function () {
-    if (!isOpen) setIsFocusedByClick(false);
+    if (!isOpen) {
+      setIsFocusedByClick(false);
+      setIsSearchChanged(false);
+    }
 
     if (scrollReactionObj && (0, _typeof2.default)(scrollReactionObj) === 'object' && isOpen && dropdownListRef && dropdownListRef.current) {
       dropdownListRef.current.addEventListener('scroll', doScrollCallback);
@@ -406,13 +410,13 @@ var Dropdown = function Dropdown(_ref) {
   };
 
   (0, _react.useEffect)(function () {
-    if (isOpen && isSearching) {
+    if (isOpen) {
       setSearchValue(selectedLabel);
       setTimeout(function () {
         return searchInputRef.current.select();
       }, 1);
     }
-  }, [isSearching]);
+  }, [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;
@@ -427,7 +431,7 @@ var Dropdown = function Dropdown(_ref) {
     "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() {
-      return !isSearchable ? setIsOpen(!isOpen) : null;
+      return setIsOpen(!isOpen);
     },
     onMouseDown: function onMouseDown() {
       return setIsFocusedByClick(true);
@@ -440,24 +444,11 @@ var Dropdown = function Dropdown(_ref) {
   }, isSearchable ? /*#__PURE__*/_react.default.createElement("input", {
     ref: searchInputRef,
     className: "".concat(RC, "__input"),
-    value: isSearching ? searchValue !== null && searchValue !== void 0 ? searchValue : '' : selectedLabel || '',
+    value: isOpen ? searchValue !== null && searchValue !== void 0 ? searchValue : '' : selectedLabel || '',
     onChange: function onChange(e) {
       return onSearchHandler(e.target.value);
     },
     placeholder: placeholder,
-    onFocus: function onFocus(e) {
-      if (!isOpen) {
-        e.preventDefault();
-        e.stopPropagation();
-        e.target.blur();
-        return;
-      } else {
-        setIsSearching(true);
-      }
-    },
-    onBlur: function onBlur() {
-      return setIsSearching(false);
-    },
     onClick: function onClick() {
       if (!isOpen) setIsOpen(true);
     }

package/package.json

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