diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-05-07 16:33:18 +0000 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-05-07 16:33:18 +0000 |
| commit | d39a56c1b7d74dd07cc78b4c82a6fb6e51036252 (patch) | |
| tree | 24f9c6baa07fadc11c791f1a59bee2c3149cbf56 /packages/frontend/src/components/DynamicNote.vue | |
| parent | merge: Add BunnyCDN Edge Storage support (!952) (diff) | |
| parent | isNotUserHome > isUserHome (diff) | |
| download | sharkey-d39a56c1b7d74dd07cc78b4c82a6fb6e51036252.tar.gz sharkey-d39a56c1b7d74dd07cc78b4c82a6fb6e51036252.tar.bz2 sharkey-d39a56c1b7d74dd07cc78b4c82a6fb6e51036252.zip | |
merge: Merge upstream 2025.4.1 (!955)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/955
Closes #638, #1037, #734, and #766
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
Diffstat (limited to 'packages/frontend/src/components/DynamicNote.vue')
| -rw-r--r-- | packages/frontend/src/components/DynamicNote.vue | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/packages/frontend/src/components/DynamicNote.vue b/packages/frontend/src/components/DynamicNote.vue index 6703099591..a5008e9ddf 100644 --- a/packages/frontend/src/components/DynamicNote.vue +++ b/packages/frontend/src/components/DynamicNote.vue @@ -17,21 +17,19 @@ SPDX-License-Identifier: AGPL-3.0-only <script setup lang="ts"> import * as Misskey from 'misskey-js'; -import { computed, defineAsyncComponent, shallowRef } from 'vue'; +import { computed, defineAsyncComponent, useTemplateRef } from 'vue'; import type { ComponentExposed } from 'vue-component-type-helpers'; import type MkNote from '@/components/MkNote.vue'; import type SkNote from '@/components/SkNote.vue'; -import { defaultStore } from '@/store'; +import { prefer } from '@/preferences'; const XNote = computed(() => - defineAsyncComponent(() => - defaultStore.reactiveState.noteDesign.value === 'misskey' - ? import('@/components/MkNote.vue') - : import('@/components/SkNote.vue'), - ), + prefer.r.noteDesign.value === 'misskey' + ? defineAsyncComponent(() => import('@/components/MkNote.vue')) + : defineAsyncComponent(() => import('@/components/SkNote.vue')), ); -const rootEl = shallowRef<ComponentExposed<typeof MkNote | typeof SkNote>>(); +const rootEl = useTemplateRef<ComponentExposed<typeof MkNote | typeof SkNote>>('rootEl'); defineExpose({ rootEl }); |