From ec6a84150bb5344c5cbfb97a3a4a4d0f36a9eb5e Mon Sep 17 00:00:00 2001
From: Hakadao <a578457889743@gmail.com>
Date: Sun, 23 Feb 2025 17:20:09 +0800
Subject: [PATCH] feat(notifications-drawer): improve notifications drawer
 experiences

---
 src/components/TopBar/TopBar.vue              | 12 ++++---
 .../TopBar/components/NotificationsDrawer.vue | 34 ++++++++++++++-----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index 8bc43ec0..00cf1ce5 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -928,11 +928,13 @@ defineExpose({
         </div>
       </main>
 
-      <NotificationsDrawer
-        v-if="drawerVisible.notifications && settings.openNotificationsPageAsDrawer"
-        :url="notificationsDrawerUrl"
-        @close="drawerVisible.notifications = false"
-      />
+      <KeepAlive v-if="settings.openNotificationsPageAsDrawer">
+        <NotificationsDrawer
+          v-if="drawerVisible.notifications"
+          :url="notificationsDrawerUrl"
+          @close="drawerVisible.notifications = false"
+        />
+      </KeepAlive>
     </header>
   </Transition>
 </template>
diff --git a/src/components/TopBar/components/NotificationsDrawer.vue b/src/components/TopBar/components/NotificationsDrawer.vue
index b1064295..2705f72e 100644
--- a/src/components/TopBar/components/NotificationsDrawer.vue
+++ b/src/components/TopBar/components/NotificationsDrawer.vue
@@ -7,7 +7,7 @@ import { settings } from '~/logic'
 // TODO: support shortcuts like `Ctrl+Alt+T` to open in new tab, `Esc` to close
 
 const props = defineProps<{
-  url?: string
+  url: string
 }>()
 
 const emit = defineEmits<{
@@ -17,19 +17,30 @@ const emit = defineEmits<{
 const { mainAppRef } = useBewlyApp()
 
 const show = ref(false)
-const headerShow = ref(false)
 const iframeRef = ref<HTMLIFrameElement | null>(null)
 const currentUrl = ref<string>(props.url || 'https://message.bilibili.com/')
 const showIframe = ref(false)
 const delayCloseTimer = ref<NodeJS.Timeout | null>(null)
 
 onMounted(() => {
+  handleOpen()
+})
+
+onActivated(() => {
+  handleOpen()
+})
+
+const beforeUrl = ref<string>('')
+function handleOpen() {
   show.value = true
-  headerShow.value = true
+  if (beforeUrl.value !== props.url) {
+    currentUrl.value = props.url
+    beforeUrl.value = props.url
+  }
   nextTick(() => {
     iframeRef.value?.focus()
   })
-})
+}
 
 onBeforeUnmount(() => {
   releaseIframeResources()
@@ -39,9 +50,8 @@ async function handleClose() {
   if (delayCloseTimer.value) {
     clearTimeout(delayCloseTimer.value)
   }
-  await releaseIframeResources()
+  // await releaseIframeResources()
   show.value = false
-  headerShow.value = false
   delayCloseTimer.value = setTimeout(() => {
     emit('close')
   }, 300)
@@ -125,6 +135,7 @@ nextTick(() => {
 <template>
   <Teleport :to="mainAppRef">
     <div
+      :style="{ pointerEvents: show ? 'auto' : 'none' }"
       pos="fixed top-0 left-0" of-hidden w-full h-full
       z-999999
     >
@@ -139,12 +150,11 @@ nextTick(() => {
 
       <Transition name="drawer">
         <div
-          v-if="show"
+          v-show="show"
           pos="absolute top-0 right-0" of-hidden bg="$bew-bg"
           w="xl:70vw lg:80vw md:100vw 100vw" max-w-1400px h-full
         >
           <div
-            v-if="headerShow"
             pos="fixed top-0 right-0" z-10 flex="~ items-center justify-between gap-2"
             w-inherit max-w-inherit h="$bew-top-bar-height"
             m-auto px-4
@@ -202,6 +212,14 @@ nextTick(() => {
             </div>
           </div>
 
+          <Transition name="fade">
+            <Loading
+              v-if="!showIframe"
+              pos="absolute top-0 right-0" of-hidden
+              w-full h-full
+            />
+          </Transition>
+
           <Transition name="fade">
             <!-- Iframe -->
             <iframe