intelicoreact 1.1.48 → 1.1.50

package/dist/Molecular/InputAddress/InputAddress.js

@@ -83,30 +83,20 @@ var InputAddress = function InputAddress(_ref) {
       isLoading = _useState8[0],
       setIsLoading = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(false),
+  var _useState9 = (0, _react.useState)(null),
       _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-      internalError = _useState10[0],
-      setInternalError = _useState10[1];
+      hightlightedIndex = _useState10[0],
+      setHightlightedIndex = _useState10[1];
 
   var _useState11 = (0, _react.useState)(false),
       _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-      isSelectedFromList = _useState12[0],
-      setIsSelectedFromList = _useState12[1];
+      isFocused = _useState12[0],
+      setIsFocused = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(null),
+  var _useState13 = (0, _react.useState)(false),
       _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-      hightlightedIndex = _useState14[0],
-      setHightlightedIndex = _useState14[1];
-
-  var _useState15 = (0, _react.useState)(false),
-      _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-      isFocused = _useState16[0],
-      setIsFocused = _useState16[1];
-
-  var _useState17 = (0, _react.useState)(false),
-      _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-      isListVisible = _useState18[0],
-      setIsListVisible = _useState18[1];
+      isListVisible = _useState14[0],
+      setIsListVisible = _useState14[1];
 
   var isWrongAddress = (0, _react.useMemo)(function () {
     var _query$street;
@@ -120,7 +110,6 @@ var InputAddress = function InputAddress(_ref) {
 
   var setQueryAsItem = function setQueryAsItem(e, item) {
     if (e) e === null || e === void 0 ? void 0 : e.stopPropagation();
-    setIsSelectedFromList(true);
     setTimeout(function () {
       return setQuery(item);
     }, 1);
@@ -161,19 +150,18 @@ var InputAddress = function InputAddress(_ref) {
       setHightlightedIndex(null);
       inputRef === null || inputRef === void 0 ? void 0 : (_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.blur();
     } else {
-      var _listRef$current, _listRef$current$getB, _listRef$current2, _listRef$current2$get, _listRef$current3, _newHightlightedEleme;
+      var _listRef$current, _listRef$current$getB, _listRef$current2, _newHightlightedEleme;
 
-      var prevHightlightedIndex = hightlightedIndex;
       var newHightlightedIndex = null;
       var listItemsElements = document.getElementsByClassName('input-address__list--item');
-      var listTop = listRef === null || listRef === void 0 ? void 0 : (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : (_listRef$current$getB = _listRef$current.getBoundingClientRect()) === null || _listRef$current$getB === void 0 ? void 0 : _listRef$current$getB.top;
-      var listHeight = listRef === null || listRef === void 0 ? void 0 : (_listRef$current2 = listRef.current) === null || _listRef$current2 === void 0 ? void 0 : (_listRef$current2$get = _listRef$current2.getBoundingClientRect()) === null || _listRef$current2$get === void 0 ? void 0 : _listRef$current2$get.height;
-      var listScrollTop = (listRef === null || listRef === void 0 ? void 0 : (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 ? void 0 : _listRef$current3.scrollTop) || 0;
+      var listHeight = listRef === null || listRef === void 0 ? void 0 : (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : (_listRef$current$getB = _listRef$current.getBoundingClientRect()) === null || _listRef$current$getB === void 0 ? void 0 : _listRef$current$getB.height;
+      var listScrollTop = (listRef === null || listRef === void 0 ? void 0 : (_listRef$current2 = listRef.current) === null || _listRef$current2 === void 0 ? void 0 : _listRef$current2.scrollTop) || 0;
+      var lastItemIndex = parseInt(listItems === null || listItems === void 0 ? void 0 : listItems.length) - 1;
       /** Arrows Controllers **/
 
       if (keyCode === 40) {
         // Down Key Controller
-        if (hightlightedIndex === null || hightlightedIndex === (listItems === null || listItems === void 0 ? void 0 : listItems.length) - 1) {
+        if (hightlightedIndex === null || hightlightedIndex === lastItemIndex) {
           newHightlightedIndex = 0;
         } else if (hightlightedIndex + 1 < (listItems === null || listItems === void 0 ? void 0 : listItems.length)) {
           newHightlightedIndex = hightlightedIndex + 1;
@@ -181,7 +169,7 @@ var InputAddress = function InputAddress(_ref) {
       } else if (keyCode === 38) {
         // Up Key Controller
         if (hightlightedIndex === null || hightlightedIndex === 0) {
-          newHightlightedIndex = (listItems === null || listItems === void 0 ? void 0 : listItems.length) - 1;
+          newHightlightedIndex = lastItemIndex;
         } else if (hightlightedIndex - 1 >= 0) {
           newHightlightedIndex = hightlightedIndex - 1;
         }
@@ -194,23 +182,23 @@ var InputAddress = function InputAddress(_ref) {
 
       if (newHightlightedElementTopInList + newHightlightedElementHeight > listScrollTop + listHeight) {
         if (Math.abs(newHightlightedElementTopInList + newHightlightedElementHeight - (listScrollTop + listHeight)) <= newHightlightedElementHeight) {
-          var _listRef$current4;
+          var _listRef$current3;
 
-          listRef === null || listRef === void 0 ? void 0 : (_listRef$current4 = listRef.current) === null || _listRef$current4 === void 0 ? void 0 : _listRef$current4.scrollTo(0, listScrollTop + newHightlightedElementHeight);
+          listRef === null || listRef === void 0 ? void 0 : (_listRef$current3 = listRef.current) === null || _listRef$current3 === void 0 ? void 0 : _listRef$current3.scrollTo(0, listScrollTop + newHightlightedElementHeight);
         } else {
-          var _listRef$current5;
+          var _listRef$current4;
 
-          listRef === null || listRef === void 0 ? void 0 : (_listRef$current5 = listRef.current) === null || _listRef$current5 === void 0 ? void 0 : _listRef$current5.scrollTo(0, newHightlightedElementTopInList);
+          listRef === null || listRef === void 0 ? void 0 : (_listRef$current4 = listRef.current) === null || _listRef$current4 === void 0 ? void 0 : _listRef$current4.scrollTo(0, newHightlightedElementTopInList);
         }
       } else if (newHightlightedElementTopInList < listScrollTop) {
         if (Math.abs(newHightlightedElementTopInList - listScrollTop) < newHightlightedElementHeight) {
-          var _listRef$current6;
+          var _listRef$current5;
 
-          listRef === null || listRef === void 0 ? void 0 : (_listRef$current6 = listRef.current) === null || _listRef$current6 === void 0 ? void 0 : _listRef$current6.scrollTo(0, listScrollTop - newHightlightedElementHeight);
+          listRef === null || listRef === void 0 ? void 0 : (_listRef$current5 = listRef.current) === null || _listRef$current5 === void 0 ? void 0 : _listRef$current5.scrollTo(0, listScrollTop - newHightlightedElementHeight);
         } else {
-          var _listRef$current7;
+          var _listRef$current6;
 
-          listRef === null || listRef === void 0 ? void 0 : (_listRef$current7 = listRef.current) === null || _listRef$current7 === void 0 ? void 0 : _listRef$current7.scrollTo(0, newHightlightedElementTopInList);
+          listRef === null || listRef === void 0 ? void 0 : (_listRef$current6 = listRef.current) === null || _listRef$current6 === void 0 ? void 0 : _listRef$current6.scrollTo(0, newHightlightedElementTopInList);
         }
       }
 
@@ -220,23 +208,6 @@ var InputAddress = function InputAddress(_ref) {
 
   var onChangeInternal = function onChangeInternal(value) {
     setQuery(value);
-    setIsSelectedFromList(false);
-  };
-
-  var onFocus = function onFocus() {
-    setIsFocused(true);
-    setInternalError(false);
-  };
-
-  var onBlur = function onBlur() {
-    if (typeof query === 'string' && isWrongAddress) {
-      onChange('');
-      setInternalError(true);
-    }
-
-    setTimeout(function () {
-      return setIsFocused(false);
-    }, 50);
   };
 
   var getHintMessage = function getHintMessage() {
@@ -247,18 +218,19 @@ var InputAddress = function InputAddress(_ref) {
   var getSelectedItemLabel = function getSelectedItemLabel() {
     var _query$street2;
 
-    if (typeof query === "string") return query;
+    if (typeof query === 'string') return query;
     if (!renderSelectedItem || typeof renderSelectedItem !== 'function') return "".concat((query === null || query === void 0 ? void 0 : query.streetNumber) || '', " ").concat((query === null || query === void 0 ? void 0 : (_query$street2 = query.street) === null || _query$street2 === void 0 ? void 0 : _query$street2.fullName) || '');
     return renderSelectedItem(query);
   };
 
   var getListItemLabel = function getListItemLabel(item) {
-    if (typeof item === "string") return item;
+    if (typeof item === 'string') return item;
     if (!renderListItem || typeof renderListItem !== 'function') return item === null || item === void 0 ? void 0 : item.fullPrediction;
     return renderListItem(item);
   };
 
   var preparedValue = (0, _react.useMemo)(function () {
+    if (!value) return '';
     if (typeof value === 'string') return value === null || value === void 0 ? void 0 : value.trim();
     return value;
   }, [value]);
@@ -296,8 +268,12 @@ var InputAddress = function InputAddress(_ref) {
       className: (0, _classnames.default)('input-address__input', className),
       value: value,
       onChange: onChangeInternal,
-      onFocus: onFocus,
-      onBlur: onBlur,
+      onFocus: function onFocus() {
+        return setIsFocused(true);
+      },
+      onBlur: function onBlur() {
+        return setIsFocused(false);
+      },
       onKeyDown: onKeyDown
     }), isWrongAddress && /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)('input-address__alert', {
@@ -350,7 +326,7 @@ var InputAddress = function InputAddress(_ref) {
 
   return /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('input-address', {
-      'input-address--error': error || internalError || isWrongAddress && !isFocused
+      'input-address--error': error || isWrongAddress && !isFocused
     })
   }, renderInput(), isListVisible && renderList());
 };

package/package.json

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