intelicoreact 1.2.85 → 1.2.87

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

@@ -53,7 +53,7 @@ var RC = 'dropdown';
 var MIN_ITEMS_FOR_SHOW_MOBILE_SEARCH = 10;
 
 var Dropdown = function Dropdown(_ref) {
-  var _options$find, _dropdownListWrapperR4, _dropdownListWrapperR5, _dropdownListRef$curr3, _dropdownListRef$curr4, _filteredOptions$find;
+  var _options$find, _dropdownListWrapperR4, _dropdownListWrapperR5, _dropdownListRef$curr5, _dropdownListRef$curr6, _filteredOptions$find;
 
   var label = _ref.label,
       _ref$options = _ref.options,
@@ -144,10 +144,10 @@ var Dropdown = function Dropdown(_ref) {
   if (!options) return null;
   var getTotalOptions = (0, _react.useCallback)(function () {
     return options === null || options === void 0 ? void 0 : options.reduce(function (result, item) {
-      if (item !== null && item !== void 0 && item.list) {
-        var _item$list;
+      if (item !== null && item !== void 0 && item.list || item !== null && item !== void 0 && item.items) {
+        var _item$list, _item$items;
 
-        result += (item === null || item === void 0 ? void 0 : (_item$list = item.list) === null || _item$list === void 0 ? void 0 : _item$list.length) || 0;
+        result += (item === null || item === void 0 ? void 0 : (_item$list = item.list) === null || _item$list === void 0 ? void 0 : _item$list.length) || (item === null || item === void 0 ? void 0 : (_item$items = item.items) === null || _item$items === void 0 ? void 0 : _item$items.length) || 0;
       } else {
         ++result;
       }
@@ -177,24 +177,24 @@ var Dropdown = function Dropdown(_ref) {
     } else return option;
   });
   var filteredGroups = optionsWithOtherAtTheEnd.map(function (item) {
-    var _item$items;
+    var _item$items2;
 
     return _objectSpread(_objectSpread({}, item), {}, {
-      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) {
+      items: !isSearchable || !isSearchChanged ? item === null || item === void 0 ? void 0 : item.items : (_item$items2 = item.items) === null || _item$items2 === void 0 ? void 0 : _item$items2.slice().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()) || '')) || !(el !== null && el !== void 0 && el.value) || (el === null || el === void 0 ? void 0 : el.value) === '';
       })
     });
   }).filter(function (item) {
-    var _item$items2;
+    var _item$items3;
 
-    return ((_item$items2 = item.items) === null || _item$items2 === void 0 ? void 0 : _item$items2.length) > 0;
+    return ((_item$items3 = item.items) === null || _item$items3 === void 0 ? void 0 : _item$items3.length) > 0;
   });
   var filteredItems = optionsWithOtherAtTheEnd.filter(function (item) {
-    var _item$items3;
+    var _item$items4;
 
-    return !((_item$items3 = item.items) !== null && _item$items3 !== void 0 && _item$items3.length);
+    return !((_item$items4 = item.items) !== null && _item$items4 !== void 0 && _item$items4.length);
   }).filter(function (item) {
     var _item$label;
 
@@ -322,11 +322,11 @@ var Dropdown = function Dropdown(_ref) {
   var selectedLabel = ((_options$find = options.find(function (el) {
     return el.value === value;
   })) === null || _options$find === void 0 ? void 0 : _options$find.label) || options.reduce(function (acc, item) {
-    var _item$items4, _item$items4$find;
+    var _item$items5, _item$items5$find;
 
-    return acc || ((_item$items4 = item.items) === null || _item$items4 === void 0 ? void 0 : (_item$items4$find = _item$items4.find(function (el) {
+    return acc || ((_item$items5 = item.items) === null || _item$items5 === void 0 ? void 0 : (_item$items5$find = _item$items5.find(function (el) {
       return el.value === value;
-    })) === null || _item$items4$find === void 0 ? void 0 : _item$items4$find.label);
+    })) === null || _item$items5$find === void 0 ? void 0 : _item$items5$find.label);
   }, null);
   var doScrollCallback = (0, _react.useCallback)(function (e) {
     var _ref2 = scrollReactionObj || {},
@@ -614,35 +614,35 @@ var Dropdown = function Dropdown(_ref) {
     }
   }, [isOpen]);
   (0, _react.useEffect)(function () {
-    if (isOpen && isMobile && dropdownListRef !== null && dropdownListRef !== void 0 && dropdownListRef.current) {
-      var _dropdownListRef$curr, _dropdownListRef$curr2;
+    if (isOpen && isMobile && dropdownListRef !== null && dropdownListRef !== void 0 && dropdownListRef.current && !searchValue) {
+      var _dropdownListRef$curr, _dropdownListRef$curr2, _dropdownListRef$curr3, _dropdownListRef$curr4;
 
       setIsScrollableList((dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr = dropdownListRef.current) === null || _dropdownListRef$curr === void 0 ? void 0 : _dropdownListRef$curr.scrollHeight) > (dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr2 = dropdownListRef.current) === null || _dropdownListRef$curr2 === void 0 ? void 0 : _dropdownListRef$curr2.clientHeight));
-      setIsFixedMaxHeight(isScrollableList !== null ? isScrollableList : false);
+      setIsFixedMaxHeight(isScrollableList || (dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr3 = dropdownListRef.current) === null || _dropdownListRef$curr3 === void 0 ? void 0 : _dropdownListRef$curr3.scrollHeight) > (dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr4 = dropdownListRef.current) === null || _dropdownListRef$curr4 === void 0 ? void 0 : _dropdownListRef$curr4.clientHeight));
     }
-  }, [isOpen, isMobile, isScrollableList, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr3 = dropdownListRef.current) === null || _dropdownListRef$curr3 === void 0 ? void 0 : _dropdownListRef$curr3.scrollHeight, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr4 = dropdownListRef.current) === null || _dropdownListRef$curr4 === void 0 ? void 0 : _dropdownListRef$curr4.clientHeight]);
+  }, [isOpen, isMobile, isScrollableList, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr5 = dropdownListRef.current) === null || _dropdownListRef$curr5 === void 0 ? void 0 : _dropdownListRef$curr5.scrollHeight, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr6 = dropdownListRef.current) === null || _dropdownListRef$curr6 === void 0 ? void 0 : _dropdownListRef$curr6.clientHeight]);
   (0, _react.useEffect)(function () {
     var setScrollTopValue = function setScrollTopValue(e) {
       setScrollTop(parseInt(e.target.scrollTop));
     };
 
     if (isOpen && isMobile && dropdownListRef !== null && dropdownListRef !== void 0 && dropdownListRef.current) {
-      var _dropdownListRef$curr5;
+      var _dropdownListRef$curr7;
 
-      dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr5 = dropdownListRef.current) === null || _dropdownListRef$curr5 === void 0 ? void 0 : _dropdownListRef$curr5.addEventListener('scroll', setScrollTopValue);
+      dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr7 = dropdownListRef.current) === null || _dropdownListRef$curr7 === void 0 ? void 0 : _dropdownListRef$curr7.addEventListener('scroll', setScrollTopValue);
     }
 
     return function () {
-      var _dropdownListRef$curr6;
+      var _dropdownListRef$curr8;
 
-      dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr6 = dropdownListRef.current) === null || _dropdownListRef$curr6 === void 0 ? void 0 : _dropdownListRef$curr6.removeEventListener('scroll', setScrollTopValue);
+      dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr8 = dropdownListRef.current) === null || _dropdownListRef$curr8 === void 0 ? void 0 : _dropdownListRef$curr8.removeEventListener('scroll', setScrollTopValue);
     };
   }, [isOpen, isMobile, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current]);
   (0, _react.useEffect)(function () {
     if (dropdownListRef !== null && dropdownListRef !== void 0 && dropdownListRef.current) {
-      var _dropdownListRef$curr7, _dropdownListRef$curr8;
+      var _dropdownListRef$curr9, _dropdownListRef$curr10;
 
-      setScrollHeight(parseInt((dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr7 = dropdownListRef.current) === null || _dropdownListRef$curr7 === void 0 ? void 0 : _dropdownListRef$curr7.scrollHeight) - (dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr8 = dropdownListRef.current) === null || _dropdownListRef$curr8 === void 0 ? void 0 : _dropdownListRef$curr8.clientHeight)));
+      setScrollHeight(parseInt((dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr9 = dropdownListRef.current) === null || _dropdownListRef$curr9 === void 0 ? void 0 : _dropdownListRef$curr9.scrollHeight) - (dropdownListRef === null || dropdownListRef === void 0 ? void 0 : (_dropdownListRef$curr10 = dropdownListRef.current) === null || _dropdownListRef$curr10 === void 0 ? void 0 : _dropdownListRef$curr10.clientHeight)));
     }
   }, [scrollTop, dropdownListRef === null || dropdownListRef === void 0 ? void 0 : dropdownListRef.current]);
   var postfixText = selectedLabel && ((_filteredOptions$find = filteredOptions.find(function (option) {

package/package.json

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