From d6d10712e215b0216c63c2f2f1db92a4498c30e4 Mon Sep 17 00:00:00 2001 From: "Mr.Hope" Date: Sat, 5 Mar 2022 19:11:17 +0800 Subject: [PATCH] fix(pwa2): fix default slot warning --- .../client/global-components/SWUpdatePopup.ts | 16 ++++++++-------- packages/pwa2/src/client/styles/popup.scss | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/pwa2/src/client/global-components/SWUpdatePopup.ts b/packages/pwa2/src/client/global-components/SWUpdatePopup.ts index 72c31f053459..dcb1c0d13be4 100644 --- a/packages/pwa2/src/client/global-components/SWUpdatePopup.ts +++ b/packages/pwa2/src/client/global-components/SWUpdatePopup.ts @@ -20,7 +20,7 @@ export default defineComponent({ const reload = (): void => { if (registration.value) { useSkipWaiting(registration.value); - location.reload(); + window.location.reload(); registration.value = null; } @@ -40,16 +40,16 @@ export default defineComponent({ h( Transition, { name: "popup" }, - slots.default?.({ - enabled: enabled.value, - reload, - }) || + () => + slots.default?.({ + enabled: enabled.value, + reload, + }) || (enabled.value ? h( - "div", + "button", { class: "sw-update-popup", - role: "button", tabindex: 0, onClick: () => reload(), }, @@ -58,7 +58,7 @@ export default defineComponent({ h("span", { class: "update" }, h(UpdateIcon)), ] ) - : "") + : null) ); }, }); diff --git a/packages/pwa2/src/client/styles/popup.scss b/packages/pwa2/src/client/styles/popup.scss index cd3f17213ead..3c2aaa7c849f 100644 --- a/packages/pwa2/src/client/styles/popup.scss +++ b/packages/pwa2/src/client/styles/popup.scss @@ -28,6 +28,7 @@ right: 1rem; bottom: 1rem; padding: 0.5rem 0.75rem; + border-width: 0; border-radius: 0.5rem; box-shadow: 0 2px 12px 0 var(--card-shadow); background: var(--c-bg, #fff);