From 7924daf7f8913e196e10dcd467b66ad68146b185 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Mon, 25 Aug 2025 13:46:22 +0900 Subject: [PATCH] refactor --- packages/frontend/src/components/MkLink.vue | 2 +- packages/frontend/src/components/MkMenu.child.vue | 8 ++++---- packages/frontend/src/components/MkMenu.vue | 2 +- packages/frontend/src/components/MkNote.vue | 4 ++-- packages/frontend/src/components/MkNoteDetailed.vue | 4 ++-- packages/frontend/src/components/MkRange.vue | 4 ++-- packages/frontend/src/components/MkReactionIcon.vue | 2 +- packages/frontend/src/components/MkReactionTooltip.vue | 4 ++-- .../frontend/src/components/MkReactionsViewer.details.vue | 4 ++-- .../src/components/MkReactionsViewer.reaction.vue | 2 +- packages/frontend/src/components/MkTooltip.vue | 4 ++-- packages/frontend/src/components/MkUrlPreviewPopup.vue | 8 ++++---- packages/frontend/src/components/MkUsersTooltip.vue | 4 ++-- packages/frontend/src/components/global/MkUrl.vue | 2 +- packages/frontend/src/components/grid/MkCellTooltip.vue | 4 ++-- packages/frontend/src/components/grid/MkDataCell.vue | 2 +- packages/frontend/src/directives/tooltip.ts | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) diff --git a/packages/frontend/src/components/MkLink.vue b/packages/frontend/src/components/MkLink.vue index a8545f9445..1959f97565 100644 --- a/packages/frontend/src/components/MkLink.vue +++ b/packages/frontend/src/components/MkLink.vue @@ -42,7 +42,7 @@ if (isEnabledUrlPreview.value) { const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUrlPreviewPopup.vue')), { showing, url: props.url, - anchorEl: el.value instanceof HTMLElement ? el.value : el.value?.$el, + anchorElement: el.value instanceof HTMLElement ? el.value : el.value?.$el, }, { closed: () => dispose(), }); diff --git a/packages/frontend/src/components/MkMenu.child.vue b/packages/frontend/src/components/MkMenu.child.vue index f7cd72b6c6..37c3a3f5e3 100644 --- a/packages/frontend/src/components/MkMenu.child.vue +++ b/packages/frontend/src/components/MkMenu.child.vue @@ -16,7 +16,7 @@ import type { MenuItem } from '@/types/menu.js'; const props = defineProps<{ items: MenuItem[]; - targetElement: HTMLElement; + anchorElement: HTMLElement; rootElement: HTMLElement; width?: number; }>(); @@ -36,10 +36,10 @@ const SCROLLBAR_THICKNESS = 16; function setPosition() { if (el.value == null) return; const rootRect = props.rootElement.getBoundingClientRect(); - const parentRect = props.targetElement.getBoundingClientRect(); + const parentRect = props.anchorElement.getBoundingClientRect(); const myRect = el.value.getBoundingClientRect(); - let left = props.targetElement.offsetWidth; + let left = props.anchorElement.offsetWidth; let top = (parentRect.top - rootRect.top) - 8; if (rootRect.left + left + myRect.width >= (window.innerWidth - SCROLLBAR_THICKNESS)) { left = -myRect.width; @@ -59,7 +59,7 @@ function onChildClosed(actioned?: boolean) { } } -watch(() => props.targetElement, () => { +watch(() => props.anchorElement, () => { setPosition(); }); diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index fbae4f0d8a..6c8fac934c 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -208,7 +208,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- +
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index d0b7059b34..17d4c70bfc 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -429,7 +429,7 @@ if (!props.mock) { showing, users, count: appearNote.renoteCount, - targetElement: renoteButton.value, + anchorElement: renoteButton.value, }, { closed: () => dispose(), }); @@ -452,7 +452,7 @@ if (!props.mock) { reaction: '❤️', users, count: $appearNote.reactionCount, - targetElement: reactButton.value!, + anchorElement: reactButton.value!, }, { closed: () => dispose(), }); diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index f3e990e65a..fea796e8b1 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -405,7 +405,7 @@ useTooltip(renoteButton, async (showing) => { showing, users, count: appearNote.renoteCount, - targetElement: renoteButton.value, + anchorElement: renoteButton.value, }, { closed: () => dispose(), }); @@ -428,7 +428,7 @@ if (appearNote.reactionAcceptance === 'likeOnly') { reaction: '❤️', users, count: $appearNote.reactionCount, - targetElement: reactButton.value!, + anchorElement: reactButton.value!, }, { closed: () => dispose(), }); diff --git a/packages/frontend/src/components/MkRange.vue b/packages/frontend/src/components/MkRange.vue index 67a9094cad..c0acfa8c60 100644 --- a/packages/frontend/src/components/MkRange.vue +++ b/packages/frontend/src/components/MkRange.vue @@ -167,7 +167,7 @@ function onMouseenter() { text: computed(() => { return props.textConverter(finalValue.value); }), - targetElement: thumbEl.value ?? undefined, + anchorElement: thumbEl.value ?? undefined, }, { closed: () => dispose(), }); @@ -191,7 +191,7 @@ function onMousedown(ev: MouseEvent | TouchEvent) { text: computed(() => { return props.textConverter(finalValue.value); }), - targetElement: thumbEl.value ?? undefined, + anchorElement: thumbEl.value ?? undefined, }, { closed: () => dispose(), }); diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue index 7d62456e03..2bfdfa7599 100644 --- a/packages/frontend/src/components/MkReactionIcon.vue +++ b/packages/frontend/src/components/MkReactionIcon.vue @@ -28,7 +28,7 @@ if (props.withTooltip) { const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkReactionTooltip.vue')), { showing, reaction: props.reaction.replace(/^:(\w+):$/, ':$1@.:'), - targetElement: elRef.value.$el, + anchorElement: elRef.value.$el, }, { closed: () => dispose(), }); diff --git a/packages/frontend/src/components/MkReactionTooltip.vue b/packages/frontend/src/components/MkReactionTooltip.vue index 77ca841ad0..971ebc060b 100644 --- a/packages/frontend/src/components/MkReactionTooltip.vue +++ b/packages/frontend/src/components/MkReactionTooltip.vue @@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only -->