diff --git a/packages/frontend/src/components/MkAbuseReportWindow.vue b/packages/frontend/src/components/MkAbuseReportWindow.vue index 039f77c8590ff4a4d59168a6333c8b525ad1a3a0..ab90ed357a9045da3772f81cc66d98f4c081987f 100644 --- a/packages/frontend/src/components/MkAbuseReportWindow.vue +++ b/packages/frontend/src/components/MkAbuseReportWindow.vue @@ -23,7 +23,7 @@ </template> <script setup lang="ts"> -import { ref } from 'vue'; +import { ref, shallowRef } from 'vue'; import * as Misskey from 'misskey-js'; import XWindow from '@/components/MkWindow.vue'; import MkTextarea from '@/components/form/textarea.vue'; @@ -40,7 +40,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const uiWindow = ref<InstanceType<typeof XWindow>>(); +const uiWindow = shallowRef<InstanceType<typeof XWindow>>(); const comment = ref(props.initialComment || ''); function send() { diff --git a/packages/frontend/src/components/MkCropperDialog.vue b/packages/frontend/src/components/MkCropperDialog.vue index 3ff73d6669eb9f4705106341d62b803ab0d40e49..f00fef12f14654a0f9e42e9f89dcae657bee5fe6 100644 --- a/packages/frontend/src/components/MkCropperDialog.vue +++ b/packages/frontend/src/components/MkCropperDialog.vue @@ -50,7 +50,7 @@ const props = defineProps<{ }>(); const imgUrl = getProxiedImageUrl(props.file.url); -let dialogEl = $ref<InstanceType<typeof XModalWindow>>(); +let dialogEl = $shallowRef<InstanceType<typeof XModalWindow>>(); let imgEl = $shallowRef<HTMLImageElement>(); let cropper: Cropper | null = null; let loading = $ref(true); diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue index 374ecd8abf60ae53012784217c7dc8a9a6b98a26..18c9f9203c438189ddf3de24567d7d541d135407 100644 --- a/packages/frontend/src/components/MkDialog.vue +++ b/packages/frontend/src/components/MkDialog.vue @@ -39,7 +39,7 @@ </template> <script lang="ts" setup> -import { onBeforeUnmount, onMounted, ref } from 'vue'; +import { onBeforeUnmount, onMounted, ref, shallowRef } from 'vue'; import MkModal from '@/components/MkModal.vue'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; @@ -94,7 +94,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const modal = ref<InstanceType<typeof MkModal>>(); +const modal = shallowRef<InstanceType<typeof MkModal>>(); const inputValue = ref(props.input?.default || null); const selectedValue = ref(props.select?.default || null); diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue index 843c5f1c544ae8a1f73ebf9f210b67fcc1207c95..112a64f52d263730e47dbeb546dd8d7751a02273 100644 --- a/packages/frontend/src/components/MkDrive.vue +++ b/packages/frontend/src/components/MkDrive.vue @@ -118,7 +118,7 @@ const emit = defineEmits<{ (ev: 'open-folder', v: Misskey.entities.DriveFolder): void; }>(); -const loadMoreFiles = ref<InstanceType<typeof MkButton>>(); +const loadMoreFiles = shallowRef<InstanceType<typeof MkButton>>(); const fileInput = shallowRef<HTMLInputElement>(); const folder = ref<Misskey.entities.DriveFolder | null>(null); diff --git a/packages/frontend/src/components/MkDriveSelectDialog.vue b/packages/frontend/src/components/MkDriveSelectDialog.vue index 3ee821b539e3ce40dd320af0da8080cbe41246e5..6a96e758fa17bbf090db321d8dfef0d9c44f6149 100644 --- a/packages/frontend/src/components/MkDriveSelectDialog.vue +++ b/packages/frontend/src/components/MkDriveSelectDialog.vue @@ -19,7 +19,7 @@ </template> <script lang="ts" setup> -import { ref } from 'vue'; +import { ref, shallowRef } from 'vue'; import * as Misskey from 'misskey-js'; import XDrive from '@/components/MkDrive.vue'; import XModalWindow from '@/components/MkModalWindow.vue'; @@ -38,7 +38,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const dialog = ref<InstanceType<typeof XModalWindow>>(); +const dialog = shallowRef<InstanceType<typeof XModalWindow>>(); const selected = ref<Misskey.entities.DriveFile[]>([]); diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue index 3b41f9d75b4026c92c2d46f76741a554bef58126..da68ecd80922fdd2aa7ac119abc670ce7b72eec6 100644 --- a/packages/frontend/src/components/MkEmojiPickerDialog.vue +++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue @@ -26,7 +26,7 @@ </template> <script lang="ts" setup> -import { ref } from 'vue'; +import { shallowRef } from 'vue'; import MkModal from '@/components/MkModal.vue'; import MkEmojiPicker from '@/components/MkEmojiPicker.vue'; import { defaultStore } from '@/store'; @@ -48,8 +48,8 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const modal = ref<InstanceType<typeof MkModal>>(); -const picker = ref<InstanceType<typeof MkEmojiPicker>>(); +const modal = shallowRef<InstanceType<typeof MkModal>>(); +const picker = shallowRef<InstanceType<typeof MkEmojiPicker>>(); function chosen(emoji: any) { emit('done', emoji); diff --git a/packages/frontend/src/components/MkFileCaptionEditWindow.vue b/packages/frontend/src/components/MkFileCaptionEditWindow.vue index e6b6c468ac64208330611182e516a3f8d2cb1bd0..b3bd194dc34560a6a896d4d5f8daae20bb2e88d6 100644 --- a/packages/frontend/src/components/MkFileCaptionEditWindow.vue +++ b/packages/frontend/src/components/MkFileCaptionEditWindow.vue @@ -37,7 +37,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const dialog = $ref<InstanceType<typeof XModalWindow>>(); +const dialog = $shallowRef<InstanceType<typeof XModalWindow>>(); let caption = $ref(props.default); diff --git a/packages/frontend/src/components/MkImageViewer.vue b/packages/frontend/src/components/MkImageViewer.vue index f074b1a2f28db9523fa05d649e25d6b812ba3cfb..22b7c12e38dbed8b27c3a29e61d9d5d57fa9c2fd 100644 --- a/packages/frontend/src/components/MkImageViewer.vue +++ b/packages/frontend/src/components/MkImageViewer.vue @@ -28,7 +28,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const modal = $ref<InstanceType<typeof MkModal>>(); +const modal = $shallowRef<InstanceType<typeof MkModal>>(); </script> <style lang="scss" scoped> diff --git a/packages/frontend/src/components/MkLaunchPad.vue b/packages/frontend/src/components/MkLaunchPad.vue index 1ccc648c72f77d4ddce91813ff5a1c553695b14f..3ea90712a0e837c4bb9da93533cc24dc352a2b8f 100644 --- a/packages/frontend/src/components/MkLaunchPad.vue +++ b/packages/frontend/src/components/MkLaunchPad.vue @@ -44,7 +44,7 @@ const preferedModalType = (deviceKind === 'desktop' && props.src != null) ? 'pop deviceKind === 'smartphone' ? 'drawer' : 'dialog'; -const modal = $ref<InstanceType<typeof MkModal>>(); +const modal = $shallowRef<InstanceType<typeof MkModal>>(); const menu = defaultStore.state.menu; diff --git a/packages/frontend/src/components/MkMenu.vue b/packages/frontend/src/components/MkMenu.vue index 0db0767fac59ee944173a6468f6dbdd4c1a2765a..808b2e8b811c1e42d14ed6183a5640d755163aac 100644 --- a/packages/frontend/src/components/MkMenu.vue +++ b/packages/frontend/src/components/MkMenu.vue @@ -82,7 +82,7 @@ let itemsEl = $shallowRef<HTMLDivElement>(); let items2: InnerMenuItem[] = $ref([]); -let child = $ref<InstanceType<typeof XChild>>(); +let child = $shallowRef<InstanceType<typeof XChild>>(); let keymap = $computed(() => ({ 'up|k|shift+tab': focusUp, diff --git a/packages/frontend/src/components/MkModalPageWindow.vue b/packages/frontend/src/components/MkModalPageWindow.vue index 645da6a49c8c8f6d172e2fc8c7417b55800bbf55..2791d5ceb926f148863635b4b1a6d06f4b6973d3 100644 --- a/packages/frontend/src/components/MkModalPageWindow.vue +++ b/packages/frontend/src/components/MkModalPageWindow.vue @@ -49,7 +49,7 @@ router.addListener('push', ctx => { let pageMetadata = $ref<null | ComputedRef<PageMetadata>>(); let rootEl = $ref(); -let modal = $ref<InstanceType<typeof MkModal>>(); +let modal = $shallowRef<InstanceType<typeof MkModal>>(); let path = $ref(props.initialPath); let width = $ref(860); let height = $ref(660); diff --git a/packages/frontend/src/components/MkModalWindow.vue b/packages/frontend/src/components/MkModalWindow.vue index bd7146ab88c0df1956f7d2974b5dac3ae353e7b2..1e93f01c8d0b61d034c0ac996f060a65ae27a058 100644 --- a/packages/frontend/src/components/MkModalWindow.vue +++ b/packages/frontend/src/components/MkModalWindow.vue @@ -41,7 +41,7 @@ const emit = defineEmits<{ (event: 'ok'): void; }>(); -let modal = $ref<InstanceType<typeof MkModal>>(); +let modal = $shallowRef<InstanceType<typeof MkModal>>(); let rootEl = $shallowRef<HTMLElement>(); let headerEl = $shallowRef<HTMLElement>(); let bodyWidth = $ref(0); diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue index 4bbd44122d1bcda71fad2935f42fb0508530a821..883368a21ac2302f085513dc8802566a1a3576fd 100644 --- a/packages/frontend/src/components/MkNote.vue +++ b/packages/frontend/src/components/MkNote.vue @@ -158,7 +158,7 @@ const isRenote = ( const el = shallowRef<HTMLElement>(); const menuButton = shallowRef<HTMLElement>(); -const renoteButton = ref<InstanceType<typeof MkRenoteButton>>(); +const renoteButton = shallowRef<InstanceType<typeof MkRenoteButton>>(); const renoteTime = shallowRef<HTMLElement>(); const reactButton = shallowRef<HTMLElement>(); let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note); diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue index 31188704ab30cbed83565bf2d99802db16af869f..bac9c58b50869c31af9c3fb1280e37d9ed89d8de 100644 --- a/packages/frontend/src/components/MkNoteDetailed.vue +++ b/packages/frontend/src/components/MkNoteDetailed.vue @@ -168,7 +168,7 @@ const isRenote = ( const el = shallowRef<HTMLElement>(); const menuButton = shallowRef<HTMLElement>(); -const renoteButton = ref<InstanceType<typeof MkRenoteButton>>(); +const renoteButton = shallowRef<InstanceType<typeof MkRenoteButton>>(); const renoteTime = shallowRef<HTMLElement>(); const reactButton = shallowRef<HTMLElement>(); let appearNote = $computed(() => isRenote ? note.renote as misskey.entities.Note : note); diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue index 5abcdc2298af5fb4f07415fb52ec74283a4960f9..0d7759753167d15ecc7bf3db571dcdbc58345543 100644 --- a/packages/frontend/src/components/MkNotes.vue +++ b/packages/frontend/src/components/MkNotes.vue @@ -18,7 +18,7 @@ </template> <script lang="ts" setup> -import { ref } from 'vue'; +import { shallowRef } from 'vue'; import XNote from '@/components/MkNote.vue'; import XList from '@/components/MkDateSeparatedList.vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; @@ -29,7 +29,7 @@ const props = defineProps<{ noGap?: boolean; }>(); -const pagingComponent = ref<InstanceType<typeof MkPagination>>(); +const pagingComponent = shallowRef<InstanceType<typeof MkPagination>>(); defineExpose({ pagingComponent, diff --git a/packages/frontend/src/components/MkNotificationSettingWindow.vue b/packages/frontend/src/components/MkNotificationSettingWindow.vue index 92165ef4767ed8b13ea5f8796fe007af24af1380..754d8d687b1b0dc6f305de1fd6cd89e6aa9c5085 100644 --- a/packages/frontend/src/components/MkNotificationSettingWindow.vue +++ b/packages/frontend/src/components/MkNotificationSettingWindow.vue @@ -56,7 +56,7 @@ const props = withDefaults(defineProps<{ let includingTypes = $computed(() => props.includingTypes || []); -const dialog = $ref<InstanceType<typeof XModalWindow>>(); +const dialog = $shallowRef<InstanceType<typeof XModalWindow>>(); let typesMap = $ref<Record<typeof notificationTypes[number], boolean>>({}); let useGlobalSetting = $ref((includingTypes === null || includingTypes.length === 0) && props.showGlobalToggle); diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue index 0e1cc06743e0b612d87af3e5f1a8ba530a4d368f..18aa76deebcd96399fd497f50203cad165c685ab 100644 --- a/packages/frontend/src/components/MkNotifications.vue +++ b/packages/frontend/src/components/MkNotifications.vue @@ -17,7 +17,7 @@ </template> <script lang="ts" setup> -import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue'; +import { defineComponent, markRaw, onUnmounted, onMounted, computed, shallowRef } from 'vue'; import { notificationTypes } from 'misskey-js'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import XNotification from '@/components/MkNotification.vue'; @@ -33,7 +33,7 @@ const props = defineProps<{ unreadOnly?: boolean; }>(); -const pagingComponent = ref<InstanceType<typeof MkPagination>>(); +const pagingComponent = shallowRef<InstanceType<typeof MkPagination>>(); const pagination: Paging = { endpoint: 'i/notifications' as const, diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue index d47823c71f996e2901f30e899bc93df96fd7b8fc..e25737d50cc8d082971482f56a5f15a5b705fde2 100644 --- a/packages/frontend/src/components/MkPageWindow.vue +++ b/packages/frontend/src/components/MkPageWindow.vue @@ -47,7 +47,7 @@ defineEmits<{ const router = new Router(routes, props.initialPath); let pageMetadata = $ref<null | ComputedRef<PageMetadata>>(); -let windowEl = $ref<InstanceType<typeof XWindow>>(); +let windowEl = $shallowRef<InstanceType<typeof XWindow>>(); const history = $ref<{ path: string; key: any; }[]>([{ path: router.getCurrentPath(), key: router.getCurrentKey(), diff --git a/packages/frontend/src/components/MkPopupMenu.vue b/packages/frontend/src/components/MkPopupMenu.vue index f04c7f56181499a7cd87fd40068d2ed3cca87ed9..b5987715a94d3b6b478245841d23524cddd8a001 100644 --- a/packages/frontend/src/components/MkPopupMenu.vue +++ b/packages/frontend/src/components/MkPopupMenu.vue @@ -22,7 +22,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -let modal = $ref<InstanceType<typeof MkModal>>(); +let modal = $shallowRef<InstanceType<typeof MkModal>>(); </script> <style lang="scss" scoped> diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue index 71c07ed658f8bedf39730d8a89aaccd7f943e6b7..f71dbdfdab2c59b9140a762fdcc61fa01ebc06eb 100644 --- a/packages/frontend/src/components/MkPostFormDialog.vue +++ b/packages/frontend/src/components/MkPostFormDialog.vue @@ -31,8 +31,8 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -let modal = $ref<InstanceType<typeof MkModal>>(); -let form = $ref<InstanceType<typeof MkPostForm>>(); +let modal = $shallowRef<InstanceType<typeof MkModal>>(); +let form = $shallowRef<InstanceType<typeof MkPostForm>>(); function onPosted() { modal.close({ diff --git a/packages/frontend/src/components/MkSigninDialog.vue b/packages/frontend/src/components/MkSigninDialog.vue index fd27244516476e7c7b26952f96755ce045ee4022..5015d09e64018669ab06b08b3a760a3bf94112d4 100644 --- a/packages/frontend/src/components/MkSigninDialog.vue +++ b/packages/frontend/src/components/MkSigninDialog.vue @@ -32,7 +32,7 @@ const emit = defineEmits<{ (ev: 'cancelled'): void; }>(); -const dialog = $ref<InstanceType<typeof XModalWindow>>(); +const dialog = $shallowRef<InstanceType<typeof XModalWindow>>(); function onClose() { emit('cancelled'); diff --git a/packages/frontend/src/components/MkSignupDialog.vue b/packages/frontend/src/components/MkSignupDialog.vue index 77497021c30f517769455141957edb4481ab5980..e1b76474a0e0959c347ca980932684801cba9d7d 100644 --- a/packages/frontend/src/components/MkSignupDialog.vue +++ b/packages/frontend/src/components/MkSignupDialog.vue @@ -33,7 +33,7 @@ const emit = defineEmits<{ (ev: 'closed'): void; }>(); -const dialog = $ref<InstanceType<typeof XModalWindow>>(); +const dialog = $shallowRef<InstanceType<typeof XModalWindow>>(); function onSignup(res) { emit('done', res); diff --git a/packages/frontend/src/components/MkTokenGenerateWindow.vue b/packages/frontend/src/components/MkTokenGenerateWindow.vue index b846034a24adb8b6940a48732186728c80948d03..8d5b6f8635e2532081b89b0ef138de59c80df56e 100644 --- a/packages/frontend/src/components/MkTokenGenerateWindow.vue +++ b/packages/frontend/src/components/MkTokenGenerateWindow.vue @@ -54,7 +54,7 @@ const emit = defineEmits<{ (ev: 'done', result: { name: string | null, permissions: string[] }): void; }>(); -const dialog = $ref<InstanceType<typeof XModalWindow>>(); +const dialog = $shallowRef<InstanceType<typeof XModalWindow>>(); let name = $ref(props.initialName); let permissions = $ref({}); diff --git a/packages/frontend/src/components/MkUpdated.vue b/packages/frontend/src/components/MkUpdated.vue index 48aeb3022453cc9db355a7cab420dfa710bf0d90..2f2864220e174f8e6d94ff70c40b750b42f1bdf5 100644 --- a/packages/frontend/src/components/MkUpdated.vue +++ b/packages/frontend/src/components/MkUpdated.vue @@ -10,14 +10,14 @@ </template> <script lang="ts" setup> -import { ref } from 'vue'; +import { shallowRef } from 'vue'; import MkModal from '@/components/MkModal.vue'; import MkButton from '@/components/MkButton.vue'; import MkSparkle from '@/components/MkSparkle.vue'; import { version } from '@/config'; import { i18n } from '@/i18n'; -const modal = ref<InstanceType<typeof MkModal>>(); +const modal = shallowRef<InstanceType<typeof MkModal>>(); const whatIsNew = () => { modal.value.close(); diff --git a/packages/frontend/src/components/MkUserList.vue b/packages/frontend/src/components/MkUserList.vue index e1f47c7673d91dc452a005b446cfdc5f12e36035..b7bc200a55ffcfd8308999d593a26f039fcceb3a 100644 --- a/packages/frontend/src/components/MkUserList.vue +++ b/packages/frontend/src/components/MkUserList.vue @@ -1,5 +1,5 @@ <template> -<MkPagination ref="pagingComponent" :pagination="pagination"> +<MkPagination :pagination="pagination"> <template #empty> <div class="_fullinfo"> <img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/> @@ -16,7 +16,7 @@ </template> <script lang="ts" setup> -import { ref } from 'vue'; +import { shallowRef } from 'vue'; import MkUserInfo from '@/components/MkUserInfo.vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import { userPage } from '@/filters/user'; @@ -26,8 +26,6 @@ const props = defineProps<{ pagination: Paging; noGap?: boolean; }>(); - -const pagingComponent = ref<InstanceType<typeof MkPagination>>(); </script> <style lang="scss" scoped> diff --git a/packages/frontend/src/components/MkVisibilityPicker.vue b/packages/frontend/src/components/MkVisibilityPicker.vue index 8f0bcdeae801f1f4e66936ec5f9fa57818795e51..99b5d93d5f9384364f2a4a112eed5b6cd30c4bd8 100644 --- a/packages/frontend/src/components/MkVisibilityPicker.vue +++ b/packages/frontend/src/components/MkVisibilityPicker.vue @@ -48,7 +48,7 @@ import * as misskey from 'misskey-js'; import MkModal from '@/components/MkModal.vue'; import { i18n } from '@/i18n'; -const modal = $ref<InstanceType<typeof MkModal>>(); +const modal = $shallowRef<InstanceType<typeof MkModal>>(); const props = withDefaults(defineProps<{ currentVisibility: typeof misskey.noteVisibilities[number]; diff --git a/packages/frontend/src/components/MkWaitingDialog.vue b/packages/frontend/src/components/MkWaitingDialog.vue index f4a9f4f22cc89da3e3101d455fbf5aabf72830f5..984cdc5266d18e69c4a17949bf12e259bc5e64fd 100644 --- a/packages/frontend/src/components/MkWaitingDialog.vue +++ b/packages/frontend/src/components/MkWaitingDialog.vue @@ -9,10 +9,10 @@ </template> <script lang="ts" setup> -import { watch, ref } from 'vue'; +import { watch, shallowRef } from 'vue'; import MkModal from '@/components/MkModal.vue'; -const modal = ref<InstanceType<typeof MkModal>>(); +const modal = shallowRef<InstanceType<typeof MkModal>>(); const props = defineProps<{ success: boolean; diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue index 973ec871ab447e40d7b2e23b0f5ec8c388cc09df..3bff312b8b479978ca2297821fe57fe46e2080c0 100644 --- a/packages/frontend/src/pages/admin/abuses.vue +++ b/packages/frontend/src/pages/admin/abuses.vue @@ -58,7 +58,7 @@ import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; -let reports = $ref<InstanceType<typeof MkPagination>>(); +let reports = $shallowRef<InstanceType<typeof MkPagination>>(); let state = $ref('unresolved'); let reporterOrigin = $ref('combined'); diff --git a/packages/frontend/src/pages/admin/emojis.vue b/packages/frontend/src/pages/admin/emojis.vue index 4bd78a6a5f79d870fc564c958701bd20622a1331..3d56ab1962dcb462b0c7e2057778612e5a35760a 100644 --- a/packages/frontend/src/pages/admin/emojis.vue +++ b/packages/frontend/src/pages/admin/emojis.vue @@ -68,7 +68,7 @@ </template> <script lang="ts" setup> -import { computed, defineAsyncComponent, defineComponent, ref, toRef } from 'vue'; +import { computed, defineAsyncComponent, defineComponent, ref, shallowRef } from 'vue'; import XHeader from './_header_.vue'; import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; @@ -81,7 +81,7 @@ import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; -const emojisPaginationComponent = ref<InstanceType<typeof MkPagination>>(); +const emojisPaginationComponent = shallowRef<InstanceType<typeof MkPagination>>(); const tab = ref('local'); const query = ref(null); diff --git a/packages/frontend/src/pages/admin/overview.queue.vue b/packages/frontend/src/pages/admin/overview.queue.vue index 72ebddc72fdb1c464021218335a23467d649c8df..7e5888293841105dae37fd50efbdf49500753d73 100644 --- a/packages/frontend/src/pages/admin/overview.queue.vue +++ b/packages/frontend/src/pages/admin/overview.queue.vue @@ -43,10 +43,10 @@ const activeSincePrevTick = ref(0); const active = ref(0); const delayed = ref(0); const waiting = ref(0); -let chartProcess = $ref<InstanceType<typeof XChart>>(); -let chartActive = $ref<InstanceType<typeof XChart>>(); -let chartDelayed = $ref<InstanceType<typeof XChart>>(); -let chartWaiting = $ref<InstanceType<typeof XChart>>(); +let chartProcess = $shallowRef<InstanceType<typeof XChart>>(); +let chartActive = $shallowRef<InstanceType<typeof XChart>>(); +let chartDelayed = $shallowRef<InstanceType<typeof XChart>>(); +let chartWaiting = $shallowRef<InstanceType<typeof XChart>>(); const props = defineProps<{ domain: string; diff --git a/packages/frontend/src/pages/admin/queue.chart.vue b/packages/frontend/src/pages/admin/queue.chart.vue index 186a22c43e207196c8290c953156fbc275f96d79..7f1dc2cd77f76cd82bc4f9d0263841db5854783f 100644 --- a/packages/frontend/src/pages/admin/queue.chart.vue +++ b/packages/frontend/src/pages/admin/queue.chart.vue @@ -53,10 +53,10 @@ const active = ref(0); const delayed = ref(0); const waiting = ref(0); const jobs = ref([]); -let chartProcess = $ref<InstanceType<typeof XChart>>(); -let chartActive = $ref<InstanceType<typeof XChart>>(); -let chartDelayed = $ref<InstanceType<typeof XChart>>(); -let chartWaiting = $ref<InstanceType<typeof XChart>>(); +let chartProcess = $shallowRef<InstanceType<typeof XChart>>(); +let chartActive = $shallowRef<InstanceType<typeof XChart>>(); +let chartDelayed = $shallowRef<InstanceType<typeof XChart>>(); +let chartWaiting = $shallowRef<InstanceType<typeof XChart>>(); const props = defineProps<{ domain: string; diff --git a/packages/frontend/src/pages/admin/users.vue b/packages/frontend/src/pages/admin/users.vue index 24ce98a02fe8a6d48ddf4e34de67bfe8c3f2e966..16fa45b1fc420e2249bd0ec1cb77dd707688eb5b 100644 --- a/packages/frontend/src/pages/admin/users.vue +++ b/packages/frontend/src/pages/admin/users.vue @@ -65,7 +65,7 @@ import { definePageMetadata } from '@/scripts/page-metadata'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; import { dateString } from '@/filters/date'; -let paginationComponent = $ref<InstanceType<typeof MkPagination>>(); +let paginationComponent = $shallowRef<InstanceType<typeof MkPagination>>(); let sort = $ref('+createdAt'); let state = $ref('all'); diff --git a/packages/frontend/src/pages/antenna-timeline.vue b/packages/frontend/src/pages/antenna-timeline.vue index fd98ef5604e748a7227a38f9b9302fab4dc3ee6c..af7e95d5439822414105446b7141119dade71779 100644 --- a/packages/frontend/src/pages/antenna-timeline.vue +++ b/packages/frontend/src/pages/antenna-timeline.vue @@ -35,7 +35,7 @@ const props = defineProps<{ let antenna = $ref(null); let queue = $ref(0); let rootEl = $shallowRef<HTMLElement>(); -let tlEl = $ref<InstanceType<typeof XTimeline>>(); +let tlEl = $shallowRef<InstanceType<typeof XTimeline>>(); const keymap = $computed(() => ({ 't': focus, })); diff --git a/packages/frontend/src/pages/explore.users.vue b/packages/frontend/src/pages/explore.users.vue index bfee0a6c077fdf7898ae72d3bc98514400bb808e..611ca0f003e20d19de9e2fc18254ef88fb917b0d 100644 --- a/packages/frontend/src/pages/explore.users.vue +++ b/packages/frontend/src/pages/explore.users.vue @@ -72,7 +72,7 @@ const props = defineProps<{ }>(); let origin = $ref('local'); -let tagsEl = $ref<InstanceType<typeof MkFolder>>(); +let tagsEl = $shallowRef<InstanceType<typeof MkFolder>>(); let tagsLocal = $ref([]); let tagsRemote = $ref([]); diff --git a/packages/frontend/src/pages/explore.vue b/packages/frontend/src/pages/explore.vue index 3f6c239bc12ef95f0f7c398ad1047948afbae07d..4494f6154d5397e8f9fb40a97bc5a154577a7484 100644 --- a/packages/frontend/src/pages/explore.vue +++ b/packages/frontend/src/pages/explore.vue @@ -51,7 +51,7 @@ const props = withDefaults(defineProps<{ }); let tab = $ref(props.initialTab); -let tagsEl = $ref<InstanceType<typeof MkFolder>>(); +let tagsEl = $shallowRef<InstanceType<typeof MkFolder>>(); let searchQuery = $ref(null); let searchOrigin = $ref('combined'); diff --git a/packages/frontend/src/pages/favorites.vue b/packages/frontend/src/pages/favorites.vue index ab47efec71135d6af27f17e8cf6a0f8c88739e0d..7fd660f93b21eab3ea5e86bcb42219f4450d135b 100644 --- a/packages/frontend/src/pages/favorites.vue +++ b/packages/frontend/src/pages/favorites.vue @@ -2,7 +2,7 @@ <MkStickyContainer> <template #header><MkPageHeader/></template> <MkSpacer :content-max="800"> - <MkPagination ref="pagingComponent" :pagination="pagination"> + <MkPagination :pagination="pagination"> <template #empty> <div class="_fullinfo"> <img src="https://xn--931a.moe/assets/info.jpg" class="_ghost"/> @@ -33,8 +33,6 @@ const pagination = { limit: 10, }; -const pagingComponent = ref<InstanceType<typeof MkPagination>>(); - definePageMetadata({ title: i18n.ts.favorites, icon: 'ti ti-star', diff --git a/packages/frontend/src/pages/follow-requests.vue b/packages/frontend/src/pages/follow-requests.vue index b9d614b356b53b58f18aa519526dca643143e0e8..99401e1fc722fcf2fb594940fcfd6580bfacf6d3 100644 --- a/packages/frontend/src/pages/follow-requests.vue +++ b/packages/frontend/src/pages/follow-requests.vue @@ -35,14 +35,14 @@ </template> <script lang="ts" setup> -import { ref, computed } from 'vue'; +import { shallowRef, computed } from 'vue'; import MkPagination from '@/components/MkPagination.vue'; import { userPage, acct } from '@/filters/user'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; -const paginationComponent = ref<InstanceType<typeof MkPagination>>(); +const paginationComponent = shallowRef<InstanceType<typeof MkPagination>>(); const pagination = { endpoint: 'following/requests/list' as const, diff --git a/packages/frontend/src/pages/messaging/messaging-room.vue b/packages/frontend/src/pages/messaging/messaging-room.vue index 0db431b083111de8880864e1f34d974882e31a60..f0a36fb8b1da36b5f4601e168a704d815254dbd7 100644 --- a/packages/frontend/src/pages/messaging/messaging-room.vue +++ b/packages/frontend/src/pages/messaging/messaging-room.vue @@ -72,8 +72,8 @@ const props = defineProps<{ }>(); let rootEl = $shallowRef<HTMLDivElement>(); -let formEl = $ref<InstanceType<typeof XForm>>(); -let pagingComponent = $ref<InstanceType<typeof MkPagination>>(); +let formEl = $shallowRef<InstanceType<typeof XForm>>(); +let pagingComponent = $shallowRef<InstanceType<typeof MkPagination>>(); let fetching = $ref(true); let user: Misskey.entities.UserDetailed | null = $ref(null); diff --git a/packages/frontend/src/pages/my-clips/index.vue b/packages/frontend/src/pages/my-clips/index.vue index dd6b5b3a37f69ff2cb4fa6b414b607358598c0a7..6c0508134ff96823bf8b278be90f4ce7192d2097 100644 --- a/packages/frontend/src/pages/my-clips/index.vue +++ b/packages/frontend/src/pages/my-clips/index.vue @@ -29,7 +29,7 @@ const pagination = { limit: 10, }; -const pagingComponent = $ref<InstanceType<typeof MkPagination>>(); +const pagingComponent = $shallowRef<InstanceType<typeof MkPagination>>(); async function create() { const { canceled, result } = await os.form(i18n.ts.createNewClip, { diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue index 3476436b27da468d9aa36f16edf6358e093e9691..510e0173df280b54028b4db49895f42814cecb38 100644 --- a/packages/frontend/src/pages/my-lists/index.vue +++ b/packages/frontend/src/pages/my-lists/index.vue @@ -25,7 +25,7 @@ import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; -const pagingComponent = $ref<InstanceType<typeof MkPagination>>(); +const pagingComponent = $shallowRef<InstanceType<typeof MkPagination>>(); const pagination = { endpoint: 'users/lists/list' as const, diff --git a/packages/frontend/src/pages/settings/notifications.vue b/packages/frontend/src/pages/settings/notifications.vue index e85fede15729aebc52de93d02ad997ef2ada9741..c1b7130245e20147e92422aba4cac63727784321 100644 --- a/packages/frontend/src/pages/settings/notifications.vue +++ b/packages/frontend/src/pages/settings/notifications.vue @@ -34,7 +34,7 @@ import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; import MkPushNotificationAllowButton from '@/components/MkPushNotificationAllowButton.vue'; -let allowButton = $ref<InstanceType<typeof MkPushNotificationAllowButton>>(); +let allowButton = $shallowRef<InstanceType<typeof MkPushNotificationAllowButton>>(); let pushRegistrationInServer = $computed(() => allowButton?.pushRegistrationInServer); let sendReadMessage = $computed(() => pushRegistrationInServer?.sendReadMessage || false); diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue index 640d940d91af1d557059b534dafc37a42658e01f..75f62d38f7e91559df1e5e9dc570637b7103306c 100644 --- a/packages/frontend/src/pages/timeline.vue +++ b/packages/frontend/src/pages/timeline.vue @@ -41,7 +41,7 @@ const keymap = { 't': focus, }; -const tlComponent = $ref<InstanceType<typeof XTimeline>>(); +const tlComponent = $shallowRef<InstanceType<typeof XTimeline>>(); const rootEl = $shallowRef<HTMLElement>(); let queue = $ref(0); diff --git a/packages/frontend/src/pages/user-list-timeline.vue b/packages/frontend/src/pages/user-list-timeline.vue index b69bbd575f13633711484ac675fb3a4c36fe14f1..542c280594dc89897af677218e2606e08aba995c 100644 --- a/packages/frontend/src/pages/user-list-timeline.vue +++ b/packages/frontend/src/pages/user-list-timeline.vue @@ -34,7 +34,7 @@ const props = defineProps<{ let list = $ref(null); let queue = $ref(0); -let tlEl = $ref<InstanceType<typeof XTimeline>>(); +let tlEl = $shallowRef<InstanceType<typeof XTimeline>>(); let rootEl = $shallowRef<HTMLElement>(); watch(() => props.listId, async () => { diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue index ba14530662fb84bdee721c50548b474ac1b4743c..53d744676cec1fb2ae1c155c230468f00ceef43f 100644 --- a/packages/frontend/src/ui/deck/antenna-column.vue +++ b/packages/frontend/src/ui/deck/antenna-column.vue @@ -26,7 +26,7 @@ const emit = defineEmits<{ (ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void; }>(); -let timeline = $ref<InstanceType<typeof XTimeline>>(); +let timeline = $shallowRef<InstanceType<typeof XTimeline>>(); onMounted(() => { if (props.column.antennaId == null) { diff --git a/packages/frontend/src/ui/deck/list-column.vue b/packages/frontend/src/ui/deck/list-column.vue index d9f3f7b4e7c04c1033d2973190b71b73bdbc9c01..e31446ebb2ec3c598ec6971bd09e21dea0df7b1f 100644 --- a/packages/frontend/src/ui/deck/list-column.vue +++ b/packages/frontend/src/ui/deck/list-column.vue @@ -26,7 +26,7 @@ const emit = defineEmits<{ (ev: 'parent-focus', direction: 'up' | 'down' | 'left' | 'right'): void; }>(); -let timeline = $ref<InstanceType<typeof XTimeline>>(); +let timeline = $shallowRef<InstanceType<typeof XTimeline>>(); if (props.column.listId == null) { setList(); diff --git a/packages/frontend/src/widgets/instance-cloud.vue b/packages/frontend/src/widgets/instance-cloud.vue index 6d522ddbe8dfbc3810843793fc304dda169ff935..1068c5ac4b03c6b57316d9fef9c0dc8201dbc38a 100644 --- a/packages/frontend/src/widgets/instance-cloud.vue +++ b/packages/frontend/src/widgets/instance-cloud.vue @@ -45,7 +45,7 @@ const { widgetProps, configure } = useWidgetPropsManager(name, emit, ); -let cloud = $ref<InstanceType<typeof MkTagCloud> | null>(); +let cloud = $shallowRef<InstanceType<typeof MkTagCloud> | null>(); let activeInstances = $shallowRef(null); function onInstanceClick(i) {