indicator-ui 0.0.62 → 0.0.64

package/dist/index.js

@@ -9478,11 +9478,10 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-function SelectField({ value, onChange, options = [], placeholder, isError, searching, required = false, multiple = false, disabled = false, offOptionsSyncing = true, offInitLoadMoreOptions = false, autoClose = false, onBlur, selectModalWindowAfterElement, loadMoreOptions, className = _styles__WEBPACK_IMPORTED_MODULE_4__.SelectFieldStyle, }) {
+function SelectField({ value, onChange, options = [], placeholder, isError, searching, required = false, multiple = false, disabled = false, offOptionsSyncing = true, offInitLoadMoreOptions = false, autoClose = false, onBlur, selectModalWindowAfterElement, loadMoreOptions, onBottomScroll, className = _styles__WEBPACK_IMPORTED_MODULE_4__.SelectFieldStyle, }) {
     const [isFocus, setIsFocus] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false);
     const [searchingString, setSearchingString] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)('');
     const [isShowModalWindow, setIsShowModalWindow] = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false);
-    const optionsCounter = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(options.length);
     const requestPromiseRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)(undefined);
     // Добавляем кэширование выбранных options
     const optionsCacheRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)([]);
@@ -9539,17 +9538,24 @@ function SelectField({ value, onChange, options = [], placeholder, isError, sear
         }
         return (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_FlexField__WEBPACK_IMPORTED_MODULE_2__.FlexField, { value: (0,_lib__WEBPACK_IMPORTED_MODULE_3__.getStringValue)(value, optionsCacheRef.current), isError: isError, disabled: disabled, placeholder: placeholder, notInput: true, onClick: () => setIsShowModalWindow(true), dropdown: true, dropdownState: isShowModalWindow, ref: inputRef });
     };
+    const processLoadMoreOptions = async () => {
+        let requestPromise = requestPromiseRef.current;
+        if (requestPromise !== undefined)
+            return;
+        requestPromise = loadMoreOptions && loadMoreOptions(optionsState?.length || 0, searchingString);
+        requestPromiseRef.current = requestPromise;
+        const newOptions = await requestPromise;
+        if (newOptions !== undefined) {
+            setOptionsState(prevState => {
+                requestPromiseRef.current = undefined;
+                return [...prevState, ...newOptions];
+            });
+        }
+    };
     const onScrollToBottom = async () => {
+        onBottomScroll && onBottomScroll();
         if (loadMoreOptions) {
-            const requestPromise = requestPromiseRef.current;
-            if (requestPromise === undefined) {
-                requestPromiseRef.current = loadMoreOptions(optionsState?.length || 0, searchingString);
-            }
-            const newOptions = await requestPromiseRef.current;
-            requestPromiseRef.current = undefined;
-            if (newOptions !== undefined) {
-                setOptionsState(prevState => [...prevState, ...newOptions]);
-            }
+            processLoadMoreOptions();
         }
     };
     return ((0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsxs)("div", { className: className?.selectField, children: [getViewField(), (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_ui__WEBPACK_IMPORTED_MODULE_6__.ModalWindowWrapper, { isShow: isShowModalWindow, setIsShow: setIsShowModalWindow, additionElements: [inputRef.current], className: className?.modalWindow, children: (0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_0__.jsx)(_SelectModalWindow__WEBPACK_IMPORTED_MODULE_5__["default"], { value: value, options: optionsState, onChange: handleChange, afterElement: selectModalWindowAfterElement, onScrollToBottom: onScrollToBottom, className: className }) })] }));