@rolster/react-components 18.10.5 → 18.10.7

package/dist/es/index.js

@@ -1125,7 +1125,7 @@ const ELEMENT_SIZE_REM = 4;
 const BASE_SIZE_PX = 16;
 const ELEMENT_SIZE_PX = BASE_SIZE_PX * ELEMENT_SIZE_REM;
 const MAZ_LIST_SIZE_PX = BASE_SIZE_PX * LIST_SIZE_REM;
-function useListControl({ suggestions, formControl, withHigher = false }) {
+function useListControl({ suggestions, formControl, higher: withHigher = false }) {
     const boxContentRef = useRef(null);
     const listRef = useRef(null);
     const inputRef = useRef(null);
@@ -1217,10 +1217,7 @@ function useListControl({ suggestions, formControl, withHigher = false }) {
             setPositionElement(0);
             elements.item(0).focus();
             setTimeout(() => {
-                listRef?.current?.scroll({
-                    top: 0,
-                    behavior: 'smooth'
-                });
+                listRef?.current?.scroll({ top: 0, behavior: 'smooth' });
             }, 100);
         }
     }
@@ -1252,19 +1249,19 @@ function useListControl({ suggestions, formControl, withHigher = false }) {
         higher,
         inputRef,
         listRef,
-        value,
-        visible,
         navigationElement,
         navigationInput,
         setFocused,
         setValue,
-        setVisible
+        setVisible,
+        value,
+        visible
     };
 }
 
 const DURATION_ANIMATION$1 = 240;
 const MAX_ELEMENTS = 6;
-function useAutocompleteField({ suggestions, disabled, formControl, onSelect, onValue }) {
+function useAutocompleteField({ disabled, formControl, onSelect, onValue, suggestions }) {
     const [pattern, setPattern] = useState('');
     const [coincidences, setCoincidences] = useState([]);
     const [store, setStore] = useState({
@@ -1275,26 +1272,37 @@ function useAutocompleteField({ suggestions, disabled, formControl, onSelect, on
     const listControl = useListControl({
         suggestions,
         formControl,
-        withHigher: true
+        higher: true
     });
-    const { collection, inputRef, setFocused, setValue, setVisible, navigationElement, navigationInput } = listControl;
+    const { collection, inputRef, navigationElement, navigationInput, setFocused, setValue, setVisible } = listControl;
     const [changeInternal, setChangeInternal] = useState(false);
     useEffect(() => filterSuggestions(pattern, true), [suggestions]);
     useEffect(() => filterSuggestions(pattern), [pattern]);
     useEffect(() => {
-        changeInternal ? setChangeInternal(false) : resetState();
+        changeInternal ? setChangeInternal(false) : resetState(formControl?.state);
     }, [formControl?.state]);
-    useEffect(() => resetState(), [collection]);
-    function requestCurrentElement() {
-        return formControl?.state && collection.find(formControl.state);
-    }
-    function resetState() {
-        const element = requestCurrentElement();
-        setValue(element?.description || '');
-        if (!element) {
-            setChangeInternal(true);
-            formControl?.setState(undefined);
+    useEffect(() => resetCollection(collection, formControl?.state), [collection]);
+    function setFormState(value) {
+        setChangeInternal(true);
+        formControl?.setState(value);
+    }
+    function resetCollection(collection, state) {
+        if (state) {
+            const element = collection.find(state);
+            if (element) {
+                setValue(element.description);
+            }
+            else {
+                setValue('');
+                setFormState(undefined);
+            }
         }
+        else {
+            setValue('');
+        }
+    }
+    function resetState(state) {
+        setValue(state ? collection.find(state)?.description || '' : '');
     }
     function onClickControl() {
         if (!disabled) {
@@ -1325,8 +1333,7 @@ function useAutocompleteField({ suggestions, disabled, formControl, onSelect, on
         setVisible(false);
         setValue('');
         if (formControl) {
-            setChangeInternal(true);
-            formControl.setState(undefined);
+            setFormState(undefined);
         }
         if (onValue) {
             onValue(undefined);
@@ -1359,8 +1366,7 @@ function useAutocompleteField({ suggestions, disabled, formControl, onSelect, on
         }
         else {
             if (formControl) {
-                setChangeInternal(true);
-                formControl.setState(value);
+                setFormState(value);
             }
             setValue(description);
         }
@@ -1414,7 +1420,6 @@ function useAutocompleteField({ suggestions, disabled, formControl, onSelect, on
     return {
         coincidences,
         listControl,
-        pattern,
         onBlurInput,
         onClickAction,
         onClickBackdrop,
@@ -1423,6 +1428,7 @@ function useAutocompleteField({ suggestions, disabled, formControl, onSelect, on
         onFocusInput,
         onKeydownElement,
         onKeydownInput,
+        pattern,
         setPattern
     };
 }
@@ -1886,22 +1892,33 @@ function RlsFormNavigation({ children, visible, rlsTheme }) {
 
 function useSelectField({ suggestions, formControl, onSelect, onValue }) {
     const listControl = useListControl({ suggestions, formControl });
-    const { collection, inputRef, visible, setFocused, setValue, setVisible, navigationElement, navigationInput } = listControl;
+    const { collection, inputRef, visible, navigationElement, navigationInput, setFocused, setValue, setVisible } = listControl;
     const [changeInternal, setChangeInternal] = useState(false);
     useEffect(() => {
-        changeInternal ? setChangeInternal(false) : resetState();
+        changeInternal ? setChangeInternal(false) : resetState(formControl?.state);
     }, [formControl?.state]);
-    useEffect(() => resetState(), [collection]);
-    function requestCurrentElement() {
-        return formControl?.state && collection.find(formControl.state);
-    }
-    function resetState() {
-        const element = requestCurrentElement();
-        setValue(element?.description || '');
-        if (!element) {
-            setChangeInternal(true);
-            formControl?.setState(undefined);
+    useEffect(() => resetCollection(collection, formControl?.state), [collection]);
+    function setFormState(value) {
+        setChangeInternal(true);
+        formControl?.setState(value);
+    }
+    function resetCollection(collection, state) {
+        if (state) {
+            const element = collection.find(state);
+            if (element) {
+                setValue(element.description);
+            }
+            else {
+                setValue('');
+                setFormState(undefined);
+            }
         }
+        else {
+            setValue('');
+        }
+    }
+    function resetState(state) {
+        setValue(state ? collection.find(state)?.description || '' : '');
     }
     function onFocusInput() {
         setFocused(true);
@@ -1966,8 +1983,7 @@ function useSelectField({ suggestions, formControl, onSelect, onValue }) {
         }
         else {
             if (formControl) {
-                setChangeInternal(true);
-                formControl.setState(value);
+                setFormState(value);
             }
             setValue(description);
         }