From bb05003fa32c7a890d5f0c681e2b9b841b8079dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Fri, 25 Nov 2022 18:54:49 +0800
Subject: [PATCH] feat: show hover card in more places

---
 components/account/AccountAvatar.vue         | 18 +++++++++++++++++-
 components/account/AccountCard.vue           |  2 +-
 components/account/AccountInfo.vue           |  3 ++-
 components/account/AccountInlineInfo.vue     |  2 +-
 components/notification/NotificationCard.vue | 12 ++++++++----
 components/status/StatusAccountDetails.vue   |  2 +-
 components/status/StatusCard.vue             | 12 ++----------
 7 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/components/account/AccountAvatar.vue b/components/account/AccountAvatar.vue
index 0a0e57e2..8bc609b4 100644
--- a/components/account/AccountAvatar.vue
+++ b/components/account/AccountAvatar.vue
@@ -3,9 +3,25 @@ import type { Account } from 'masto'
 
 defineProps<{
   account: Account
+  hover?: boolean
 }>()
+
+defineOptions({
+  inheritAttrs: false,
+})
 </script>
 
 <template>
-  <img :src="account.avatar" :alt="account.username" loading="lazy" rounded-full bg-gray:10>
+  <div relative flex-shrink-0>
+    <div group>
+      <AccountHoverCard v-if="hover" top="-3.2" left="-4.4" absolute :account="account" op0 pointer-events-none group-hover="pointer-events-auto op100 scale-100" delay-250 transition transform scale-20 class="ease-[cubic-bezier(0.4, 0.0, 0.2, 1)]" />
+      <img
+        :src="account.avatar"
+        :alt="account.username"
+        loading="lazy"
+        rounded-full bg-gray:10
+        v-bind="$attrs"
+      >
+    </div>
+  </div>
 </template>
diff --git a/components/account/AccountCard.vue b/components/account/AccountCard.vue
index c0d32b93..517cf2b3 100644
--- a/components/account/AccountCard.vue
+++ b/components/account/AccountCard.vue
@@ -10,7 +10,7 @@ cacheAccount(account)
 
 <template>
   <div flex justify-between hover:bg-active transition-100>
-    <AccountInfo :account="account" p1 />
+    <AccountInfo :account="account" hover p1 />
     <div h-full p1>
       <AccountFollowButton :account="account" />
     </div>
diff --git a/components/account/AccountInfo.vue b/components/account/AccountInfo.vue
index 63f5f95c..1d2fa57f 100644
--- a/components/account/AccountInfo.vue
+++ b/components/account/AccountInfo.vue
@@ -5,6 +5,7 @@ const { account, link = true, fullServer = false } = defineProps<{
   account: Account
   link?: boolean
   fullServer?: boolean
+  hover?: boolean
 }>()
 
 const accountHandle = $(useAccountHandle(account, fullServer))
@@ -14,7 +15,7 @@ const accountHandle = $(useAccountHandle(account, fullServer))
   <div flex gap-3>
     <div>
       <NuxtLink :to="link ? getAccountPath(account) : null">
-        <AccountAvatar :account="account" w-12 h-12 />
+        <AccountAvatar :account="account" :hover="hover" w-12 h-12 />
       </NuxtLink>
     </div>
     <NuxtLink flex flex-col :to="link ? getAccountPath(account) : null">
diff --git a/components/account/AccountInlineInfo.vue b/components/account/AccountInlineInfo.vue
index fe859023..02bd90f3 100644
--- a/components/account/AccountInlineInfo.vue
+++ b/components/account/AccountInlineInfo.vue
@@ -9,7 +9,7 @@ const { link = true } = defineProps<{
 
 <template>
   <NuxtLink :to="link ? getAccountPath(account) : undefined" min-w-0 flex gap-1 items-center>
-    <AccountAvatar :account="account" w-5 h-5 />
+    <AccountAvatar :account="account" w-5 h-5 hover />
     <ContentRichSetup :content="getDisplayName(account)" :emojis="account.emojis" />
   </NuxtLink>
 </template>
diff --git a/components/notification/NotificationCard.vue b/components/notification/NotificationCard.vue
index 9b82a02b..2b4c8b9b 100644
--- a/components/notification/NotificationCard.vue
+++ b/components/notification/NotificationCard.vue
@@ -11,14 +11,16 @@ const { notification } = defineProps<{
     <template v-if="notification.type === 'follow'">
       <div flex ml-4 items-center>
         <div i-ri:user-follow-fill mr-3 color-primary />
-        <AccountLink :account="notification.account" mr1 /> followed you
+        <AccountInlineInfo :account="notification.account" mr1 />
+        followed you
       </div>
       <AccountCard :account="notification.account" p3 />
     </template>
     <template v-if="notification.type === 'follow_request'">
       <div flex ml-4 items-center>
         <div i-ri:user-follow-fill mr-3 />
-        <AccountLink :account="notification.account" mr1 /> requested to follow you
+        <AccountInlineInfo :account="notification.account" mr1 />
+        requested to follow you
       </div>
       <!-- TODO: accept request -->
       <AccountCard :account="notification.account" p3 />
@@ -26,14 +28,16 @@ const { notification } = defineProps<{
     <template v-if="notification.type === 'favourite'">
       <div flex ml-4 items-center>
         <div i-ri:heart-fill mr-3 color-red />
-        <AccountLink :account="notification.account" mr1 /> favourited your post
+        <AccountInlineInfo :account="notification.account" mr1 />
+        favourited your post
       </div>
       <StatusCard :status="notification.status!" p3 />
     </template>
     <template v-if="notification.type === 'reblog'">
       <div flex ml-4 items-center>
         <div i-ri:repeat-fill mr-3 color-green />
-        <AccountLink :account="notification.account" mr1 /> reblogged your post
+        <AccountInlineInfo :account="notification.account" mr1 />
+        reblogged your post
       </div>
       <StatusCard :status="notification.status!" p3 />
     </template>
diff --git a/components/status/StatusAccountDetails.vue b/components/status/StatusAccountDetails.vue
index 240335dd..d89a3af4 100644
--- a/components/status/StatusAccountDetails.vue
+++ b/components/status/StatusAccountDetails.vue
@@ -12,7 +12,7 @@ const accountHandle = $(useAccountHandle(account))
 <template>
   <NuxtLink
     :to="link ? getAccountPath(account) : undefined"
-    flex="col 1" min-w-0 md:flex="~ gap-2" md:items-center
+    flex="~ col" min-w-0 md:flex="~ row gap-2" md:items-center
   >
     <ContentRichSetup font-bold break-words :content="getDisplayName(account)" :emojis="account.emojis" />
     <p op35 text-sm>
diff --git a/components/status/StatusCard.vue b/components/status/StatusCard.vue
index a2b92859..93d96e4a 100644
--- a/components/status/StatusCard.vue
+++ b/components/status/StatusCard.vue
@@ -7,10 +7,7 @@ const props = withDefaults(
     actions?: boolean
     hover?: boolean
   }>(),
-  {
-    actions: true,
-    hover: true,
-  },
+  { actions: true },
 )
 
 const status = $computed(() => {
@@ -80,12 +77,7 @@ const timeago = useTimeAgo(() => status.createdAt, {
       </div>
     </div>
     <div flex gap-4>
-      <div relative flex-shrink-0>
-        <div group>
-          <AccountHoverCard top="-3.2" left="-4.4" absolute :account="status.account" op0 pointer-events-none group-hover="pointer-events-auto op100 scale-100" delay-250 transition transform scale-20 class="ease-[cubic-bezier(0.4, 0.0, 0.2, 1)]" />
-          <AccountAvatar mt1 w-12 h-12 :account="status.account" />
-        </div>
-      </div>
+      <AccountAvatar mt1 w-12 h-12 :account="status.account" hover />
       <div flex="~ col 1" min-w-0>
         <div flex>
           <StatusAccountDetails :account="status.account" />