@via-profit/ui-kit 0.1.0-rc.80 → 0.1.0-rc.82

package/Autocomplete/AutocompleteContainer.js

@@ -98,7 +98,7 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
             case 'ArrowDown':
                 {
                     event.preventDefault();
-                    if (!currentOpen) {
+                    if (!currentOpen && filteredItems.length > 0) {
                         onRequestOpen(event);
                     }
                     if (currentOpen) {
@@ -132,7 +132,7 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
                 // do nothing
                 break;
         }
-    }, [currentOpen, onRequestClose, onRequestOpen]);
+    }, [currentOpen, onRequestClose, onRequestOpen, filteredItems.length]);
     const applyFilterForItems = react_1.default.useCallback((inputValue, itemList) => {
         const query = inputValue.toLowerCase().trim();
         // Apply filter
@@ -190,12 +190,14 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
                 parentElem = parentElem.parentNode;
             }
             // Click outside
-            if (needToClose) {
+            if (needToClose && currentOpen) {
                 if (clearOnBlur) {
+                    const newInputValue = currentValue === null
+                        ? ''
+                        : selectedItemToString(currentValue);
                     dispatch((0, context_1.actionSetPartial)({
-                        inputValue: currentValue === null
-                            ? ''
-                            : selectedItemToString(currentValue),
+                        filteredItems: multiple ? filteredItems : applyFilterForItems(newInputValue, items),
+                        inputValue: newInputValue,
                     }));
                 }
                 if (isOpen) {
@@ -210,12 +212,18 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
     }, [
         onRequestClose,
         anchorElement,
+        filteredItems,
+        items,
         isOpen,
         clearOnBlur,
+        currentOpen,
         dispatch,
         value,
         selectedItemToString,
         currentValue,
+        applyFilterForItems,
+        inputValue,
+        multiple,
     ]);
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.useMemo(() => (react_1.default.createElement(overridesMap.TextField, Object.assign({ placeholder: placeholder, label: label, error: error, requiredAsterisk: requiredAsterisk, errorText: errorText, fullWidth: fullWidth, startIcon: startIcon, isLoading: currentLoading, endIcon: clearable ? (react_1.default.createElement(Button_1.default, { iconOnly: true, type: "button", onClick: () => (currentLoading ? 'undefined' : clear()) }, currentLoading ? react_1.default.createElement(Spinner_1.default, null) : react_1.default.createElement(IconClear_1.default, null))) : undefined }, nativeInputProps, { onKeyDown: event => {
@@ -242,29 +250,32 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
                 }
             }, onFocus: event => {
                 isFocusedRef.current = true;
-                if (openOnFocus) {
+                if (openOnFocus && !currentOpen && filteredItems.length > 0) {
                     onRequestOpen(event);
                 }
-                if (!openOnFocus && !currentOpen && inputValue !== '') {
+                if (!openOnFocus && !currentOpen && inputValue !== '' && filteredItems.length > 0) {
                     onRequestOpen(event);
                 }
                 if (typeof nativeInputProps.onFocus === 'function') {
                     nativeInputProps.onFocus(event);
                 }
             }, onClick: event => {
-                // if (isFocusedRef.current) {
-                //   onRequestOpen(event);
-                // }
                 if (typeof nativeInputProps.onClick === 'function') {
                     nativeInputProps.onClick(event);
                 }
+                if (isFocusedRef.current && !currentOpen && filteredItems.length > 0) {
+                    onRequestOpen(event);
+                }
             }, onChange: event => {
                 if (typeof onInputChange === 'function') {
                     onInputChange(event);
                 }
                 // If openOnFocus is false, but value is not empty
                 // we should open menu list if is not opened
-                if (!openOnFocus && isFocusedRef.current && !currentOpen) {
+                if (!openOnFocus &&
+                    isFocusedRef.current &&
+                    !currentOpen &&
+                    filteredItems.length > 0) {
                     onRequestOpen(event);
                 }
                 // console.debug('set filteredItems');
@@ -292,16 +303,25 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
             inputRef,
             openOnFocus,
             currentOpen,
+            filteredItems.length,
             onRequestOpen,
             onInputChange,
-            applyFilterForItems,
             items,
+            applyFilterForItems,
         ]),
-        react_1.default.useMemo(() => (react_1.default.createElement(Menu_1.default, { ref: menuRef, anchorPos: anchorPos, multiple: multiple, items: filteredItems, value: currentValue, isOpen: currentOpen && filteredItems.length > 0, autofocus: false, anchorElement: anchorElement, closeOutsideClick: false, getOptionSelected: getOptionSelected, onSelectItem: item => {
+        react_1.default.useMemo(() => (react_1.default.createElement(Menu_1.default, { ref: menuRef, anchorPos: anchorPos, multiple: multiple, items: filteredItems, value: currentValue, isOpen: currentOpen, autofocus: false, anchorElement: anchorElement, closeOutsideClick: false, getOptionSelected: getOptionSelected, onRequestClose: onRequestClose, closeOnSelect: multiple ? false : true, onSelectItem: item => {
+                if (!multiple) {
+                    dispatch({
+                        type: 'setPartial',
+                        payload: {
+                            filteredItems: applyFilterForItems(selectedItemToString(item), items),
+                        },
+                    });
+                }
                 if (typeof onChange === 'function') {
                     onChange(item);
                 }
-            }, onRequestClose: onRequestClose, closeOnSelect: multiple ? false : true }, ({ index, item }, itemProps) => children({ index, item: item, inputValue }, itemProps))), [
+            } }, ({ index, item }, itemProps) => children({ index, item: item, inputValue }, itemProps))), [
             anchorPos,
             multiple,
             filteredItems,
@@ -309,8 +329,12 @@ const Autocomplete = react_1.default.forwardRef((props, ref) => {
             currentOpen,
             anchorElement,
             getOptionSelected,
-            onChange,
             onRequestClose,
+            dispatch,
+            applyFilterForItems,
+            selectedItemToString,
+            items,
+            onChange,
             children,
             inputValue,
         ])));

package/Modal/BaseModal/ModalWrapper.js

@@ -67,7 +67,10 @@ const ModalWrapper = props => {
         const keyDown = (event) => {
             var _a, _b, _c, _d;
             const key = ((_a = event === null || event === void 0 ? void 0 : event.key) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '';
-            if (key === 'escape' && closeOnEscape) {
+            if (key === 'escape' &&
+                closeOnEscape &&
+                isOpenProp &&
+                TabManager_1.default.isCurrentContainer(containerRef.current)) {
                 const portal = window.document.querySelector(`#${context_1.PORTAL_ID}`);
                 const lastID = (_d = (_b = portal === null || portal === void 0 ? void 0 : portal.children) === null || _b === void 0 ? void 0 : _b[((_c = portal === null || portal === void 0 ? void 0 : portal.childNodes) === null || _c === void 0 ? void 0 : _c.length) - 1]) === null || _d === void 0 ? void 0 : _d.id;
                 if (lastID === id) {

package/PhoneField/usePhoneUtils.js

@@ -8,7 +8,7 @@ const react_1 = __importDefault(require("react"));
 const UnknownFlag_1 = __importDefault(require("./UnknownFlag"));
 const usePhoneUtils = (params) => {
     const { templates } = params;
-    const templatesList = templates.concat([
+    const templatesList = react_1.default.useMemo(() => templates.concat([
         [
             null,
             react_1.default.createElement(UnknownFlag_1.default, { key: "unknnown" }),
@@ -17,7 +17,7 @@ const usePhoneUtils = (params) => {
             '+7 987 654-32-10',
             /^\+{0,1}.*/,
         ],
-    ]);
+    ]), [templates]);
     /**
      * Get template info by parset value
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@via-profit/ui-kit",
-  "version": "0.1.0-rc.80",
+  "version": "0.1.0-rc.82",
   "description": "UI Kit",
   "repository": {
     "type": "git",