summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-07-06 20:37:09 +0900
committersyuilo <4439005+syuilo@users.noreply.github.com>2025-07-06 20:37:09 +0900
commit288f0abeac55500173166053a77a974afef7a0c3 (patch)
tree4c20a151aa5e1335462f52d853c060079bab4bbc
parentfix(frontend): MkRange/MkSelectでdisabledが効かなくなっている問... (diff)
downloadmisskey-288f0abeac55500173166053a77a974afef7a0c3.tar.gz
misskey-288f0abeac55500173166053a77a974afef7a0c3.tar.bz2
misskey-288f0abeac55500173166053a77a974afef7a0c3.zip
chore(frontend): fix type errors
Diffstat (limited to '')
-rw-r--r--packages/frontend/src/components/MkPullToRefresh.vue6
-rw-r--r--packages/frontend/src/components/MkReactionIcon.vue1
-rw-r--r--packages/frontend/src/pages/about-misskey.vue6
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
<FormSection v-if="instance.repositoryUrl !== 'https://github.com/misskey-dev/misskey'">
<div class="_gaps_s">
<MkInfo>
- {{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name }) }}
+ {{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name ?? host }) }}
</MkInfo>
<FormLink v-if="instance.repositoryUrl" :to="instance.repositoryUrl" external>
<template #icon><i class="ti ti-code"></i></template>
@@ -134,7 +134,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { nextTick, onBeforeUnmount, ref, useTemplateRef, computed } from 'vue';
-import { version } from '@@/js/config.js';
+import { host, version } from '@@/js/config.js';
import FormLink from '@/components/form/link.vue';
import FormSection from '@/components/form/section.vue';
import MkButton from '@/components/MkButton.vue';
@@ -414,6 +414,7 @@ const easterEggEngine = ref<{ stop: () => void } | null>(null);
const containerEl = useTemplateRef('containerEl');
function iconLoaded() {
+ if (containerEl.value == null) return;
const emojis = prefer.s.emojiPalettes[0].emojis;
const containerWidth = containerEl.value.offsetWidth;
for (let i = 0; i < 32; i++) {
@@ -431,6 +432,7 @@ function iconLoaded() {
}
function gravity() {
+ if (containerEl.value == null) return;
if (!easterEggReady) return;
easterEggReady = false;
easterEggEngine.value = physics(containerEl.value);