deserialize value before emit event

zCloak-Network · Mar 16, 2023 · c16f269 · c16f269
1 parent 433d9a7
commit c16f269
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/.changeset/funny-poets-decide.md b/.changeset/funny-poets-decide.md
@@ -3,3 +3,4 @@
 ---
 
 fix emit not trigger in browser
+deserialize value before emit event
diff --git a/packages/ui-store/src/store/LocalStorage.ts b/packages/ui-store/src/store/LocalStorage.ts
@@ -25,8 +25,11 @@ export class LocalStorage extends Events<StorageEvent> {
           }
         } else {
           if (event.key) {
-            this.#items.set(event.key, event.newValue);
-            this.emit('store_changed', event.key, event.oldValue, event.newValue);
+            const oldValue = deserialize(event.oldValue);
+            const newValue = deserialize(event.newValue);
+
+            this.#items.set(event.key, newValue);
+            this.emit('store_changed', event.key, oldValue, newValue);
           }
         }
       }
@@ -48,13 +51,15 @@ export class LocalStorage extends Events<StorageEvent> {
     const oldValue = this.#items.get(key);
 
     this.#items.set(key, val);
-    this.emit('store_changed', key, oldValue, value);
+    this.emit('store_changed', key, oldValue, val);
   }
 
   public remove(key: string) {
     localStorage.removeItem(key);
+    const oldValue = this.#items.get(key);
+
     this.#items.delete(key);
-    this.emit('store_changed', key, this.#items.get(key), null);
+    this.emit('store_changed', key, oldValue, null);
   }
 
   public each(fn: (key: string, val: any) => void): void {

diff --git a/packages/ui-store/src/store/SessionStorage.ts b/packages/ui-store/src/store/SessionStorage.ts
@@ -25,8 +25,11 @@ export class SessionStorage extends Events<StorageEvent> {
           }
         } else {
           if (event.key) {
-            this.#items.set(event.key, event.newValue);
-            this.emit('store_changed', event.key, event.oldValue, event.newValue);
+            const oldValue = deserialize(event.oldValue);
+            const newValue = deserialize(event.newValue);
+
+            this.#items.set(event.key, newValue);
+            this.emit('store_changed', event.key, oldValue, newValue);
           }
         }
       }
@@ -48,13 +51,15 @@ export class SessionStorage extends Events<StorageEvent> {
     const oldValue = this.#items.get(key);
 
     this.#items.set(key, val);
-    this.emit('store_changed', key, oldValue, value);
+    this.emit('store_changed', key, oldValue, val);
   }
 
   public remove(key: string) {
     sessionStorage.removeItem(key);
+    const oldValue = this.#items.get(key);
+
     this.#items.delete(key);
-    this.emit('store_changed', key, this.#items.get(key), null);
+    this.emit('store_changed', key, oldValue, null);
   }
 
   public each(fn: (key: string, val: any) => void): void {