refactor 2

pmndrs · May 24, 2024 · 38bb47e · 38bb47e
1 parent 1044dfa
commit 38bb47e
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/src/vanilla/utils/atomWithStorage.ts b/src/vanilla/utils/atomWithStorage.ts
@@ -161,25 +161,26 @@ export function createJSONStorage<Value>(
         callback(newValue)
       })
 
-  const subscriber: StringSubscribe | undefined =
-    getStringStorage()?.subscribe ||
-    (typeof window !== 'undefined' &&
-      typeof window.addEventListener === 'function' &&
-      ((key, callback) => {
-        if (!(getStringStorage() instanceof window.Storage)) {
-          return () => {}
+  let subscriber = getStringStorage()?.subscribe
+  if (
+    !subscriber &&
+    typeof window !== 'undefined' &&
+    typeof window.addEventListener === 'function' &&
+    window.Storage &&
+    getStringStorage() instanceof window.Storage
+  ) {
+    subscriber = (key, callback) => {
+      const storageEventCallback = (e: StorageEvent) => {
+        if (e.storageArea === getStringStorage() && e.key === key) {
+          callback(e.newValue)
         }
-        const storageEventCallback = (e: StorageEvent) => {
-          if (e.storageArea === getStringStorage() && e.key === key) {
-            callback(e.newValue)
-          }
-        }
-        window.addEventListener('storage', storageEventCallback)
-        return () => {
-          window.removeEventListener('storage', storageEventCallback)
-        }
-      })) ||
-    undefined
+      }
+      window.addEventListener('storage', storageEventCallback)
+      return () => {
+        window.removeEventListener('storage', storageEventCallback)
+      }
+    }
+  }
 
   if (subscriber) {
     storage.subscribe = createHandleSubscribe(subscriber)