From 952c085c0ce77fcff93b5912829dac14361b3fc2 Mon Sep 17 00:00:00 2001 From: Yury Rudey Date: Sun, 18 Sep 2022 21:36:05 +0300 Subject: [PATCH 1/4] fix(useStorage): added reset after calling `storage.clear()` method --- packages/core/useStorage/index.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/core/useStorage/index.ts b/packages/core/useStorage/index.ts index f2ca68b9e52..c6e4c862521 100644 --- a/packages/core/useStorage/index.ts +++ b/packages/core/useStorage/index.ts @@ -218,7 +218,15 @@ export function useStorage } function update(event?: StorageEvent) { - if (event && event.key !== key) + if (event?.storageArea !== storage) + return + + if (event?.key === null) { + data.value = null + return + } + + if (event?.key !== key) return data.value = read(event) From 2252e6c98e86f5be68ad6a5dd1c69a4597063b37 Mon Sep 17 00:00:00 2001 From: Yury Rudey Date: Sun, 18 Sep 2022 23:59:26 +0300 Subject: [PATCH 2/4] fix: replaced optional chaining(?.) with logical AND(&&) --- packages/core/useStorage/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/core/useStorage/index.ts b/packages/core/useStorage/index.ts index c6e4c862521..18fa93c013d 100644 --- a/packages/core/useStorage/index.ts +++ b/packages/core/useStorage/index.ts @@ -218,15 +218,15 @@ export function useStorage } function update(event?: StorageEvent) { - if (event?.storageArea !== storage) + if (event && event.storageArea !== storage) return - if (event?.key === null) { + if (event && event.key === null) { data.value = null return } - if (event?.key !== key) + if (event && event.key !== key) return data.value = read(event) From 4f22811a6f63dfa1e4a138157fa89d91e8a12aa8 Mon Sep 17 00:00:00 2001 From: Yury Rudey Date: Mon, 19 Sep 2022 01:21:26 +0300 Subject: [PATCH 3/4] fix: added defaults assignment --- packages/core/useStorage/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/useStorage/index.ts b/packages/core/useStorage/index.ts index 18fa93c013d..5a448aa0c38 100644 --- a/packages/core/useStorage/index.ts +++ b/packages/core/useStorage/index.ts @@ -222,7 +222,7 @@ export function useStorage return if (event && event.key === null) { - data.value = null + data.value = rawInit return } From 7cda094ad3812b617c91eee7a659854baa6a250d Mon Sep 17 00:00:00 2001 From: Yury Rudey Date: Mon, 19 Sep 2022 01:27:29 +0300 Subject: [PATCH 4/4] fix: removed unnecessary code --- packages/core/useStorage/index.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/core/useStorage/index.ts b/packages/core/useStorage/index.ts index 5a448aa0c38..fcc1b0ce3f7 100644 --- a/packages/core/useStorage/index.ts +++ b/packages/core/useStorage/index.ts @@ -180,9 +180,6 @@ export function useStorage } function read(event?: StorageEvent) { - if (event && event.key !== key) - return - pauseWatch() try { const rawValue = event