indicator-ui 0.1.8 → 0.1.9

package/dist/index.js

@@ -62262,7 +62262,7 @@ var _Dropdown = function _Dropdown(props, ref) {
     }
   };
   var getItemProps = function getItemProps(curItem) {
-    if ((0,_lib__WEBPACK_IMPORTED_MODULE_3__.isObject)(curItem) && 'value' in curItem) {
+    if ((0,_lib__WEBPACK_IMPORTED_MODULE_3__.isObject)(curItem)) {
       return curItem;
     } else {
       return {
@@ -66274,7 +66274,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
 // extracted by mini-css-extract-plugin
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"selectField":"SelectField-module__selectField___p9S2j","modalWindowWrapper":"SelectField-module__modalWindowWrapper___i4_Uy","modalWindow":"SelectField-module__modalWindow___JVZ8d","selectModalWindow":"SelectField-module__selectModalWindow___w55Pm","show-animation":"SelectField-module__show-animation___Ee3LS","selectFieldOptionsItem":"SelectField-module__selectFieldOptionsItem___hQMC7","label":"SelectField-module__label___Orjua","active":"SelectField-module__active___a3j2T"});
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = ({"selectField":"SelectField-module__selectField___p9S2j"});
 
 /***/ }),
 
@@ -66388,7 +66388,9 @@ function SelectField(_ref) {
     onBlur = _ref.onBlur,
     pagination = _ref.pagination,
     _onFocus = _ref.onFocus,
-    isActiveItem = _ref.isActiveItem;
+    isActiveItem = _ref.isActiveItem,
+    _ref$position = _ref.position,
+    position = _ref$position === void 0 ? 'absolute' : _ref$position;
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFocus = _useState2[0],
@@ -66397,19 +66399,27 @@ function SelectField(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     searchingString = _useState4[0],
     setSearchingString = _useState4[1];
-  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isShowModalWindow = _useState6[0],
-    setIsShowModalWindow = _useState6[1];
   var requestPromiseRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(undefined);
   // Кэширование выбранных options
   var optionsCacheRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(options);
-  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(options),
-    _useState8 = _slicedToArray(_useState7, 2),
-    optionsState = _useState8[0],
-    setOptionsState = _useState8[1];
+  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(options),
+    _useState6 = _slicedToArray(_useState5, 2),
+    optionsState = _useState6[0],
+    setOptionsState = _useState6[1];
   var inputRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
   var searchingTimeoutRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
+  var targetRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
+  var modalRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(null);
+  var _useModal = (0,_hooks__WEBPACK_IMPORTED_MODULE_2__.useModal)(modalRef, {
+      targetRef: targetRef,
+      position: position,
+      animeType: 'dropdown'
+    }),
+    getIsShow = _useModal.getIsShow,
+    open = _useModal.open,
+    close = _useModal.close,
+    switching = _useModal.switching,
+    isShow = _useModal.isShow;
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
     // Установка значения при required
     var firstOptions = optionsState === null || optionsState === void 0 ? void 0 : optionsState[0];
@@ -66471,7 +66481,7 @@ function SelectField(_ref) {
       onChange === null || onChange === void 0 || onChange(resValues);
     } else {
       onChange === null || onChange === void 0 || onChange(resValues[resValues.length - 1]);
-      setIsShowModalWindow(false);
+      close();
       onBlur === null || onBlur === void 0 || onBlur();
     }
   };
@@ -66593,22 +66603,20 @@ function SelectField(_ref) {
         onChange: search,
         disabled: disabled,
         onFocus: function onFocus() {
-          setIsShowModalWindow(true);
+          if (!getIsShow()) {
+            open();
+          }
           setIsFocus(true);
           _onFocus === null || _onFocus === void 0 || _onFocus();
         },
         onBlur: function onBlur() {
           return setIsFocus(false);
         },
-        onDropdownClick: function onDropdownClick() {
-          return setIsShowModalWindow(function (prevState) {
-            return !prevState;
-          });
-        },
+        onDropdownClick: switching,
         isError: isError,
         placeholder: placeholder,
         dropdown: true,
-        dropdownState: isShowModalWindow,
+        dropdownState: isShow,
         ref: inputRef
       });
     }
@@ -66619,37 +66627,21 @@ function SelectField(_ref) {
       placeholder: placeholder,
       notInput: true,
       onFocus: _onFocus,
-      onClick: function onClick() {
-        return setIsShowModalWindow(function (prevState) {
-          return !prevState;
-        });
-      },
+      onClick: switching,
       dropdown: true,
-      dropdownState: isShowModalWindow,
+      dropdownState: isShow,
       ref: inputRef
     });
   };
   return (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", {
     className: _styles__WEBPACK_IMPORTED_MODULE_7__.SelectFieldStyle.selectField,
-    children: [getViewField(), (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)("div", {
-      className: _styles__WEBPACK_IMPORTED_MODULE_7__.SelectFieldStyle.modalWindowWrapper,
-      children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_ui__WEBPACK_IMPORTED_MODULE_3__.ModalWindowWrapper, {
-        isShow: isShowModalWindow,
-        setIsShow: function setIsShow(newValue) {
-          if (newValue === false) {
-            onBlur === null || onBlur === void 0 || onBlur();
-          }
-          setIsShowModalWindow(newValue);
-        },
-        additionElements: [inputRef.current],
-        className: _styles__WEBPACK_IMPORTED_MODULE_7__.SelectFieldStyle.modalWindow,
-        children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_ui__WEBPACK_IMPORTED_MODULE_3__.Dropdown, {
-          items: getOptionsItems(),
-          onScrollBottom: onScrollToBottom,
-          onClick: handleClick,
-          isActive: isActive
-        })
-      })
+    ref: targetRef,
+    children: [getViewField(), (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_ui__WEBPACK_IMPORTED_MODULE_3__.Dropdown, {
+      items: getOptionsItems(),
+      onScrollBottom: onScrollToBottom,
+      onClick: handleClick,
+      isActive: isActive,
+      ref: modalRef
     })]
   });
 }