From 2818b5b634d9c7df6a70391eac314d6be6dd7ccc Mon Sep 17 00:00:00 2001
From: tamania <tamaina@hotmail.co.jp>
Date: Mon, 31 Jul 2023 18:23:03 -0700
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20tapping=20Okay=20on=20rea?=
 =?UTF-8?q?ction=20will=20make=20it=20update=20immediately?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/pages/announcements.vue | 26 +++++++++++----------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index cc62ce0f57..c4ef36a475 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -5,14 +5,15 @@
 		/></template>
 		<MkSpacer :content-max="800">
 			<MkPagination
+				ref="paginationEl"
 				v-slot="{ items }"
 				:pagination="pagination"
-				class="ruryvtyk _content"
+				class="ruryvtyk _gaps_m"
 			>
 				<section
-					v-for="(announcement, i) in items"
+					v-for="announcement in items"
 					:key="announcement.id"
-					class="_card announcement"
+					class="announcement _panel"
 				>
 					<div class="_title">
 						<span v-if="$i && !announcement.isRead">🆕 </span>
@@ -31,7 +32,7 @@
 						/>
 					</div>
 					<div v-if="$i && !announcement.isRead" class="_footer">
-						<MkButton primary @click="read(items, announcement, i)"
+						<MkButton primary @click="read(announcement.id)"
 							><i class="ph-check ph-bold ph-lg"></i>
 							{{ i18n.ts.gotIt }}</MkButton
 						>
@@ -43,7 +44,7 @@
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
+import { ref } from "vue";
 import MkPagination from "@/components/MkPagination.vue";
 import MkButton from "@/components/MkButton.vue";
 import * as os from "@/os";
@@ -55,13 +56,14 @@ const pagination = {
 	limit: 10,
 };
 
-// TODO: これは実質的に親コンポーネントから子コンポーネントのプロパティを変更してるのでなんとかしたい
-function read(items, announcement, i) {
-	items[i] = {
-		...announcement,
-		isRead: true,
-	};
-	os.api("i/read-announcement", { announcementId: announcement.id });
+const paginationEl = ref<InstanceType<typeof MkPagination>>();
+function read(id: string) {
+	if (!paginationEl.value) return;
+	paginationEl.value.updateItem(id, (announcement) => {
+		announcement.isRead = true;
+		return announcement;
+	});
+	os.api("i/read-announcement", { announcementId: id });
 }
 
 const headerActions = $computed(() => []);