From 288f0abeac55500173166053a77a974afef7a0c3 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sun, 6 Jul 2025 20:37:09 +0900 Subject: [PATCH] chore(frontend): fix type errors --- packages/frontend/src/components/MkPullToRefresh.vue | 6 ++++-- packages/frontend/src/components/MkReactionIcon.vue | 1 + packages/frontend/src/pages/about-misskey.vue | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/components/MkPullToRefresh.vue b/packages/frontend/src/components/MkPullToRefresh.vue index b0638db785..98247f5d0f 100644 --- a/packages/frontend/src/components/MkPullToRefresh.vue +++ b/packages/frontend/src/components/MkPullToRefresh.vue @@ -56,10 +56,12 @@ const emit = defineEmits<{ }>(); function getScreenY(event: TouchEvent | MouseEvent | PointerEvent): number { - if (event.touches && event.touches[0] && event.touches[0].screenY != null) { + if (('touches' in event) && event.touches[0] && event.touches[0].screenY != null) { return event.touches[0].screenY; - } else { + } else if ('screenY' in event) { return event.screenY; + } else { + return 0; // TSを黙らせるため } } diff --git a/packages/frontend/src/components/MkReactionIcon.vue b/packages/frontend/src/components/MkReactionIcon.vue index 36d1103549..7d62456e03 100644 --- a/packages/frontend/src/components/MkReactionIcon.vue +++ b/packages/frontend/src/components/MkReactionIcon.vue @@ -24,6 +24,7 @@ const elRef = useTemplateRef('elRef'); if (props.withTooltip) { useTooltip(elRef, (showing) => { + if (elRef.value == null) return; const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkReactionTooltip.vue')), { showing, reaction: props.reaction.replace(/^:(\w+):$/, ':$1@.:'), diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue index 72a3313c95..057deec4cf 100644 --- a/packages/frontend/src/pages/about-misskey.vue +++ b/packages/frontend/src/pages/about-misskey.vue @@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }} + {{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name ?? host }) }} @@ -134,7 +134,7 @@ SPDX-License-Identifier: AGPL-3.0-only