diff --git a/packages/frontend/src/components/MkNotification.vue b/packages/frontend/src/components/MkNotification.vue index ff20bc591f..fcf4791240 100644 --- a/packages/frontend/src/components/MkNotification.vue +++ b/packages/frontend/src/components/MkNotification.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only --> <template> -<div ref="elRef" :class="$style.root"> +<div :class="$style.root"> <div :class="$style.head"> <MkAvatar v-if="notification.type === 'pollEnded'" :class="$style.icon" :user="notification.note.user" link preview/> <MkAvatar v-else-if="notification.type === 'note'" :class="$style.icon" :user="notification.note.user" link preview/> @@ -39,7 +39,7 @@ SPDX-License-Identifier: AGPL-3.0-only <!-- notification.reaction が null になることはまずないが、ここでoptional chaining使うと一部ブラウザで刺さるので念の為 --> <MkReactionIcon v-else-if="notification.type === 'reaction'" - ref="reactionRef" + :withTooltip="true" :reaction="notification.reaction ? notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : notification.reaction" :noStyle="true" style="width: 100%; height: 100%;" @@ -111,6 +111,7 @@ SPDX-License-Identifier: AGPL-3.0-only <MkAvatar :class="$style.reactionsItemAvatar" :user="reaction.user" link preview/> <div :class="$style.reactionsItemReaction"> <MkReactionIcon + :withTooltip="true" :reaction="reaction.reaction ? reaction.reaction.replace(/^:(\w+):$/, ':$1@.:') : reaction.reaction" :noStyle="true" style="width: 100%; height: 100%;" @@ -133,14 +134,12 @@ import { ref, shallowRef } from 'vue'; import * as Misskey from 'misskey-js'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; import MkFollowButton from '@/components/MkFollowButton.vue'; -import XReactionTooltip from '@/components/MkReactionTooltip.vue'; import MkButton from '@/components/MkButton.vue'; import { getNoteSummary } from '@/scripts/get-note-summary.js'; import { notePage } from '@/filters/note.js'; import { userPage } from '@/filters/user.js'; import { i18n } from '@/i18n.js'; import * as os from '@/os.js'; -import { useTooltip } from '@/scripts/use-tooltip.js'; import { $i } from '@/account.js'; import { infoImageUrl } from '@/instance.js'; @@ -153,9 +152,6 @@ const props = withDefaults(defineProps<{ full: false, }); -const elRef = shallowRef<HTMLElement>(null); -const reactionRef = ref(null); - const followRequestDone = ref(false); const acceptFollowRequest = () => { @@ -167,15 +163,6 @@ const rejectFollowRequest = () => { followRequestDone.value = true; os.api('following/requests/reject', { userId: props.notification.user.id }); }; - -useTooltip(reactionRef, (showing) => { - os.popup(XReactionTooltip, { - showing, - reaction: props.notification.reaction ? props.notification.reaction.replace(/^:(\w+):$/, ':$1@.:') : props.notification.reaction, - emojis: props.notification.note.emojis, - targetElement: reactionRef.value.$el, - }, {}, 'closed'); -}); </script> <style lang="scss" module> diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue index 55c812cbc1..fdc3bfd23c 100644 --- a/packages/frontend/src/components/MkReactionIcon.vue +++ b/packages/frontend/src/components/MkReactionIcon.vue @@ -4,16 +4,31 @@ SPDX-License-Identifier: AGPL-3.0-only --> <template> -<MkCustomEmoji v-if="reaction[0] === ':'" :name="reaction" :normal="true" :noStyle="noStyle" :url="emojiUrl"/> -<MkEmoji v-else :emoji="reaction" :normal="true" :noStyle="noStyle"/> +<MkCustomEmoji v-if="reaction[0] === ':'" ref="elRef" :name="reaction" :normal="true" :noStyle="noStyle" :url="emojiUrl"/> +<MkEmoji v-else ref="elRef" :emoji="reaction" :normal="true" :noStyle="noStyle"/> </template> <script lang="ts" setup> -import { } from 'vue'; +import { defineAsyncComponent, shallowRef } from 'vue'; +import { useTooltip } from '@/scripts/use-tooltip.js'; +import * as os from '@/os.js'; const props = defineProps<{ reaction: string; noStyle?: boolean; emojiUrl?: string; + withTooltip?: boolean; }>(); + +const elRef = shallowRef(); + +if (props.withTooltip) { + useTooltip(elRef, (showing) => { + os.popup(defineAsyncComponent(() => import('@/components/MkReactionTooltip.vue')), { + showing, + reaction: props.reaction.replace(/^:(\w+):$/, ':$1@.:'), + targetElement: elRef.value.$el, + }, {}, 'closed'); + }); +} </script> diff --git a/packages/frontend/src/scripts/use-tooltip.ts b/packages/frontend/src/scripts/use-tooltip.ts index 17ea380db0..aaf0a0285a 100644 --- a/packages/frontend/src/scripts/use-tooltip.ts +++ b/packages/frontend/src/scripts/use-tooltip.ts @@ -37,7 +37,7 @@ export function useTooltip( }; autoHidingTimer = window.setInterval(() => { - if (!document.body.contains(elRef.value)) { + if (elRef.value == null || !document.body.contains(elRef.value instanceof Element ? elRef.value : elRef.value.$el)) { if (!isHovering) return; isHovering = false; window.clearTimeout(timeoutId);