Refactor and fix useLsState

rdmo/core/assets/js/hooks/useLsState.js

@@ -16,25 +16,30 @@ const useLsState = (path, initialValue, omit = []) => {
     localStorage.setItem(path, JSON.stringify(data))
   }
 
-  // get the value from the local storage
-  const lsValue = getLs(path)
+  const getInitialState = () => {
+    // get the value from the local storage
+    const lsValue = getLs(path)
+
+    // return the state with the value from the local storage or the provided initialValue
+    if (isPlainObject(lsValue)) {
+      return { ...initialValue, ...lsValue }
+    } else if (isEmpty(lsValue)) {
+      return initialValue
+    } else {
+      return lsValue
+    }
+  }
 
-  // setup the state with the value from the local storage or the provided initialValue
-  const [value, setValue] = useState(isEmpty(lsValue) ? initialValue : lsValue)
+  // setup the state
+  const [value, setValue] = useState(getInitialState())
 
   return [
     value,
     (value) => {
       setLs(path, value)
       setValue(value)
     },
-    () => {
-      if (isPlainObject(initialValue)) {
-        setValue({ ...initialValue, ...getLs(path) })
-      } else {
-        setValue(initialValue)
-      }
-    }
+    () => setValue(getInitialState())
   ]
 }