diff options
4 files changed, 7 insertions, 5 deletions
diff --git a/packages/frontend/src/components/MkImageEffectorFxForm.vue b/packages/frontend/src/components/MkImageEffectorFxForm.vue index d7ab620132..e581b1f743 100644 --- a/packages/frontend/src/components/MkImageEffectorFxForm.vue +++ b/packages/frontend/src/components/MkImageEffectorFxForm.vue @@ -8,7 +8,8 @@ SPDX-License-Identifier: AGPL-3.0-only <div v-for="v, k in paramDefs" :key="k"> <MkSwitch v-if="v.type === 'boolean'" - v-model="params[k]"> + v-model="params[k]" + > <template #label>{{ v.label ?? k }}</template> <template v-if="v.caption != null" #caption>{{ v.caption }}</template> </MkSwitch> @@ -53,12 +54,12 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script setup lang="ts"> +import type { ImageEffectorRGB, ImageEffectorFxParamDefs } from '@/utility/image-effector/ImageEffector.js'; import MkInput from '@/components/MkInput.vue'; import MkRadios from '@/components/MkRadios.vue'; import MkSwitch from '@/components/MkSwitch.vue'; import MkRange from '@/components/MkRange.vue'; import { i18n } from '@/i18n.js'; -import type { ImageEffectorRGB, ImageEffectorFxParamDefs } from '@/utility/image-effector/ImageEffector.js'; defineProps<{ paramDefs: ImageEffectorFxParamDefs; diff --git a/packages/frontend/src/components/MkInput.vue b/packages/frontend/src/components/MkInput.vue index 0c6f03d7d6..955bf72a6b 100644 --- a/packages/frontend/src/components/MkInput.vue +++ b/packages/frontend/src/components/MkInput.vue @@ -44,10 +44,10 @@ SPDX-License-Identifier: AGPL-3.0-only </template> <script lang="ts"> -type SupportedTypes = 'text' | 'password' | 'email' | 'url' | 'tel' | 'number' | 'search'; +type SupportedTypes = 'text' | 'password' | 'email' | 'url' | 'tel' | 'number' | 'search' | 'color'; type ModelValueType<T extends SupportedTypes> = T extends 'number' ? number : - T extends 'text' | 'password' | 'email' | 'url' | 'tel' | 'search' ? string : + T extends 'text' | 'password' | 'email' | 'url' | 'tel' | 'search' | 'color' ? string : never; </script> diff --git a/packages/frontend/src/components/grid/MkDataCell.vue b/packages/frontend/src/components/grid/MkDataCell.vue index 0f326b14ca..6f1dae8398 100644 --- a/packages/frontend/src/components/grid/MkDataCell.vue +++ b/packages/frontend/src/components/grid/MkDataCell.vue @@ -48,6 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only </div> <div v-else-if="cellType === 'image'"> <img + v-if="cell.value && typeof cell.value === 'string'" :src="cell.value" :alt="cell.value" :class="$style.viewImage" diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue index 6933d64214..42455bd18e 100644 --- a/packages/frontend/src/pages/user/home.vue +++ b/packages/frontend/src/pages/user/home.vue @@ -209,7 +209,7 @@ const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue')); const props = withDefaults(defineProps<{ user: Misskey.entities.UserDetailed; /** Test only; MkNotesTimeline currently causes problems in vitest */ - disableNotes: boolean; + disableNotes?: boolean; }>(), { disableNotes: false, }); |