From 9bfe864178008802e0a5634f49f1631cc828d0c3 Mon Sep 17 00:00:00 2001
From: riku6460 <17585784+riku6460@users.noreply.github.com>
Date: Mon, 25 Dec 2023 19:55:56 +0900
Subject: [PATCH] fix merge defect

---
 .../frontend/src/components/MkAbuseReportResolver.vue     | 8 ++++----
 packages/frontend/src/components/MkNote.vue               | 6 ------
 packages/frontend/src/components/MkPagination.vue         | 2 +-
 .../src/components/MkUserAnnouncementEditDialog.vue       | 6 +++---
 packages/frontend/src/pages/settings/account-stats.vue    | 6 +++---
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/packages/frontend/src/components/MkAbuseReportResolver.vue b/packages/frontend/src/components/MkAbuseReportResolver.vue
index acbe49b765..d1ce5d6fbc 100644
--- a/packages/frontend/src/components/MkAbuseReportResolver.vue
+++ b/packages/frontend/src/components/MkAbuseReportResolver.vue
@@ -37,7 +37,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </div>
 </template>
 <script lang="ts" setup>
-import { computed, watch } from 'vue';
+import { computed, watch, ref } from 'vue';
 import MkInput from '@/components/MkInput.vue';
 import MkSelect from '@/components/MkSelect.vue';
 import MkSwitch from '@/components/MkSwitch.vue';
@@ -66,7 +66,7 @@ const props = defineProps<{
 		previousExpiresAt?: string;
 	}
 }>();
-let expirationDate: Date | null = $ref(null);
+const expirationDate = ref<Date | null>(null);
 
 type NonNullType<T> = {
 	[P in keyof T]: NonNullable<T[P]>
@@ -105,9 +105,9 @@ const value = computed({
 
 function renderExpirationDate(empty = false) {
 	if (value.value.expirationDate && !empty) {
-		expirationDate = new Date(value.value.expirationDate);
+		expirationDate.value = new Date(value.value.expirationDate);
 	} else {
-		expirationDate = null;
+		expirationDate.value = null;
 	}
 }
 
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 98c5ced627..f61ccd72a0 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -142,12 +142,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</template>
 	</I18n>
 </div>
-<div v-else>
-	<!--
-		MkDateSeparatedList uses TransitionGroup which requires single element in the child elements
-		so MkNote create empty div instead of no elements
-	-->
-</div>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 5455100133..1fa693f11d 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -321,7 +321,7 @@ watch(visibility, () => {
 
 const prepend = (item: MisskeyEntity): void => {
 	// 初回表示時はunshiftだけでOK
-	if (!rootEl) {
+	if (!rootEl.value) {
 		items.value.unshift(item);
 		return;
 	}
diff --git a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
index e5e45c0d36..24d87840e7 100644
--- a/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
+++ b/packages/frontend/src/components/MkUserAnnouncementEditDialog.vue
@@ -66,7 +66,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { ref } from 'vue';
+import { ref, shallowRef } from 'vue';
 import * as Misskey from 'misskey-js';
 import MkModalWindow from '@/components/MkModalWindow.vue';
 import MkButton from '@/components/MkButton.vue';
@@ -99,10 +99,10 @@ const emit = defineEmits<{
 	(ev: 'closed'): void
 }>();
 
-const announceTitleEl = $shallowRef<HTMLInputElement | null>(null);
+const announceTitleEl = shallowRef<HTMLInputElement | null>(null);
 
 function insertEmoji(ev: MouseEvent): void {
-	os.openEmojiPicker((ev.currentTarget ?? ev.target) as HTMLElement, {}, announceTitleEl);
+	os.openEmojiPicker((ev.currentTarget ?? ev.target) as HTMLElement, {}, announceTitleEl.value);
 }
 
 async function done(): Promise<void> {
diff --git a/packages/frontend/src/pages/settings/account-stats.vue b/packages/frontend/src/pages/settings/account-stats.vue
index 89de92b930..5b95a81842 100644
--- a/packages/frontend/src/pages/settings/account-stats.vue
+++ b/packages/frontend/src/pages/settings/account-stats.vue
@@ -120,7 +120,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import FormSection from '@/components/form/section.vue';
 import MkKeyValue from '@/components/MkKeyValue.vue';
 import * as os from '@/os.js';
@@ -140,9 +140,9 @@ onMounted(() => {
 	});
 });
 
-const headerActions = $computed(() => []);
+const headerActions = computed(() => []);
 
-const headerTabs = $computed(() => []);
+const headerTabs = computed(() => []);
 
 definePageMetadata({
 	title: i18n.ts.accountInfo,