@rolster/react-components 18.13.4 → 18.13.5

package/dist/cjs/index.js

@@ -1371,41 +1371,63 @@ const MAX_ELEMENTS = 6;
 function useAutocompleteField({ disabled, formControl, onSelect, onValue, suggestions }) {
     const [pattern, setPattern] = react.useState('');
     const [coincidences, setCoincidences] = react.useState([]);
-    const [store, setStore] = react.useState({
+    const currentStore = react.useRef({
         pattern: '',
         coincidences: [],
         previous: null
     });
     const listControl = useListControl({ suggestions, formControl });
     const { collection, inputRef, navigationElement, navigationInput, setFocused, setValue, setVisible } = listControl;
+    const initializedState = react.useRef(false);
+    const initializedCollection = react.useRef(false);
     const changeInternal = react.useRef(false);
-    react.useEffect(() => filterSuggestions(pattern, true), [suggestions]);
-    react.useEffect(() => filterSuggestions(pattern), [pattern]);
     react.useEffect(() => {
+        refreshCoincidences(pattern, true);
+    }, [suggestions]);
+    react.useEffect(() => {
+        refreshCoincidences(pattern);
+    }, [pattern]);
+    react.useEffect(() => {
+        if (!initializedState.current || !initializedCollection.current) {
+            initializedState.current = true;
+            return;
+        }
         if (changeInternal.current) {
             changeInternal.current = false;
+            return;
         }
-        else {
-            resetState(formControl?.state);
-        }
+        refresh(collection, formControl?.state);
     }, [formControl?.state]);
-    react.useEffect(() => resetCollection(collection, formControl?.state), [collection]);
+    react.useEffect(() => {
+        if (!initializedCollection.current || !initializedState.current) {
+            initializedCollection.current = true;
+            return;
+        }
+        refresh(collection, formControl?.state);
+    }, [collection]);
+    function refresh(collection, state) {
+        if (!state) {
+            return setValue('');
+        }
+        const element = collection.find(state);
+        if (element) {
+            return setValue(element.description);
+        }
+        setValue('');
+        setFormState(undefined);
+    }
     function setFormState(value) {
         if (formControl) {
             changeInternal.current = true;
             formControl.setState(value);
         }
     }
-    function resetCollection(collection, state) {
-        setValue(state ? collection.find(state)?.description || '' : '');
-    }
-    function resetState(state) {
-        resetCollection(collection, state);
-    }
     function onClickControl() {
         if (!disabled) {
             setVisible(true);
-            setTimeout(() => inputRef?.current?.focus(), DURATION_ANIMATION$1);
+            setTimeout(() => {
+                inputRef?.current?.focus();
+            }, DURATION_ANIMATION$1);
         }
     }
     function onFocusInput() {
@@ -1459,15 +1481,15 @@ function useAutocompleteField({ disabled, formControl, onSelect, onValue, sugges
             onValue(value);
         }
     }
-    function filterSuggestions(pattern, reboot = false) {
-        const result = createStoreAutocomplete({
+    function refreshCoincidences(pattern, reboot = false) {
+        const { collection, store } = createStoreAutocomplete({
             pattern,
             suggestions,
             reboot,
-            store
+            store: currentStore.current
         });
-        setCoincidences(result.collection.slice(0, MAX_ELEMENTS));
-        setStore(result.store);
+        currentStore.current = store;
+        setCoincidences(collection.slice(0, MAX_ELEMENTS));
     }
     return {
         coincidences,
@@ -1908,28 +1930,44 @@ function RlsFormNavigation({ children, visible, rlsTheme }) {
 function useSelectField({ suggestions, formControl, onSelect, onValue }) {
     const listControl = useListControl({ suggestions, formControl });
     const { collection, inputRef, visible, navigationElement, navigationInput, setFocused, setValue, setVisible } = listControl;
+    const initializedState = react.useRef(false);
+    const initializedCollection = react.useRef(false);
     const changeInternal = react.useRef(false);
     react.useEffect(() => {
+        if (!initializedState.current || !initializedCollection.current) {
+            initializedState.current = true;
+            return;
+        }
         if (changeInternal.current) {
             changeInternal.current = false;
+            return;
         }
-        else {
-            resetState(formControl?.state);
-        }
+        refresh(collection, formControl?.state);
     }, [formControl?.state]);
-    react.useEffect(() => resetCollection(collection, formControl?.state), [collection]);
+    react.useEffect(() => {
+        if (!initializedCollection.current || !initializedState.current) {
+            initializedCollection.current = true;
+            return;
+        }
+        refresh(collection, formControl?.state);
+    }, [collection]);
+    function refresh(collection, state) {
+        if (!state) {
+            return setValue('');
+        }
+        const element = collection.find(state);
+        if (element) {
+            return setValue(element.description);
+        }
+        setValue('');
+        setFormState(undefined);
+    }
     function setFormState(value) {
         if (formControl) {
             changeInternal.current = true;
             formControl.setState(value);
         }
     }
-    function resetCollection(collection, state) {
-        setValue(state ? collection.find(state)?.description || '' : '');
-    }
-    function resetState(state) {
-        resetCollection(collection, state);
-    }
     function onFocusInput() {
         setFocused(true);
     }
@@ -1955,9 +1993,8 @@ function useSelectField({ suggestions, formControl, onSelect, onValue }) {
         }
     }
     function onClickAction() {
-        const newVisible = !visible;
-        setVisible(newVisible);
-        if (newVisible) {
+        setVisible(!visible);
+        if (!visible) {
             inputRef?.current?.focus();
         }
     }