Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

select note component in <setup>

Browse source 
this makes our templates much more similar to upstream's, making
merges simpler

changing note design is already marked as needing a reload, so having
non-reactive code that selects the note component is not a problem
This commit is contained in:
dakkar 2024-05-12 13:14:44 +01:00
parent 717696c472
commit 513a8e5de4
5 changed files with 29 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
packages/frontend/src/components/MkNotes.vue
View file

@ -15,7 +15,6 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #default="{ items: notes }">
<div :class="[$style.root, { [$style.noGap]: noGap }]">
<MkDateSeparatedList
v-if="defaultStore.state.noteDesign === 'misskey'"
ref="notes"
v-slot="{ item: note }"
:items="notes"
@ -27,19 +26,6 @@ SPDX-License-Identifier: AGPL-3.0-only
>
<MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note" :withHardMute="true"/>
</MkDateSeparatedList>
<MkDateSeparatedList
v-else-if="defaultStore.state.noteDesign === 'sharkey'"
ref="notes"
v-slot="{ item: note }"
:items="notes"
:direction="pagination.reversed ? 'up' : 'down'"
:reversed="pagination.reversed"
:noGap="noGap"
:ad="true"
:class="$style.notes"
>
<SkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note" :withHardMute="true"/>
</MkDateSeparatedList>
</div>
</template>
</MkPagination>
@ -47,14 +33,17 @@ SPDX-License-Identifier: AGPL-3.0-only
<script lang="ts" setup>
import { shallowRef, ref } from 'vue';
import MkNote from '@/components/MkNote.vue';
import SkNote from '@/components/SkNote.vue';
import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue';
import MkPagination, { Paging } from '@/components/MkPagination.vue';
import { i18n } from '@/i18n.js';
import { infoImageUrl } from '@/instance.js';
import { defaultStore } from '@/store.js';
const MkNote = (
(defaultStore.state.noteDesign === 'misskey') ? (await import('@/components/MkNote.vue')).default :
(defaultStore.state.noteDesign === 'sharkey') ? (await import('@/components/SkNote.vue')).default :
null);
const props = defineProps<{
pagination: Paging;
noGap?: boolean;