refactor more, cleaner more contained solution

jotaijs · Feb 27, 2024 · ec84c87 · ec84c87
1 parent 80c21f9
commit ec84c87
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/atomWithHash.ts b/src/atomWithHash.ts
@@ -26,12 +26,7 @@ export function atomWithHash<Value>(
   },
 ): WritableAtom<Value, [SetStateActionWithReset<Value>], void> {
   const serialize = options?.serialize || JSON.stringify;
-  let initialValueInHash: string | null = null;
-  if (typeof window !== 'undefined') {
-    initialValueInHash = new URLSearchParams(window.location.hash.slice(1)).get(
-      key,
-    );
-  }
+
   const deserialize = options?.deserialize || safeJSONParse(initialValue);
   const subscribe =
     options?.subscribe ||
@@ -57,15 +52,20 @@ export function atomWithHash<Value>(
   if (typeof setHashOption === 'function') {
     setHash = setHashOption;
   }
-  const strAtom = atom(initialValueInHash);
+  const isLocationAvailable =
+    typeof window !== 'undefined' && !!window.location;
+
+  const strAtom = atom(
+    isLocationAvailable
+      ? new URLSearchParams(window.location.hash.slice(1)).get(key)
+      : null,
+  );
   strAtom.onMount = (setAtom) => {
-    if (typeof window === 'undefined' || !window.location) {
+    if (!isLocationAvailable) {
       return undefined;
     }
     const callback = () => {
-      const searchParams = new URLSearchParams(window.location.hash.slice(1));
-      const str = searchParams.get(key);
-      setAtom(str);
+      setAtom(new URLSearchParams(window.location.hash.slice(1)).get(key));
     };
     const unsubscribe = subscribe(callback);
     callback();