From f8e4d40b0a9dea03ad1610066e4f13c20f172968 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Thu, 9 Feb 2023 07:17:46 +0000
Subject: [PATCH] =?UTF-8?q?-=20Layout=20Shift=E3=81=8C=E8=B5=B7=E3=81=93?=
 =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20-=20?=
 =?UTF-8?q?=E8=87=AA=E5=88=86=E3=81=AE=E3=83=AA=E3=82=A2=E3=82=AF=E3=82=B7?=
 =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AF=E5=BF=85=E3=81=9A=E3=81=A4=E3=81=91?=
 =?UTF-8?q?=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/MkReactionsViewer.vue      | 50 ++++++++++++++++---
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/packages/frontend/src/components/MkReactionsViewer.vue b/packages/frontend/src/components/MkReactionsViewer.vue
index 572b91cf2a..397099aa3b 100644
--- a/packages/frontend/src/components/MkReactionsViewer.vue
+++ b/packages/frontend/src/components/MkReactionsViewer.vue
@@ -7,9 +7,7 @@
 	:move-class="$store.state.animation ? $style.transition_x_move : ''"
 	tag="div" :class="$style.root"
 >
-	<template v-for="([reaction, count], i) in reactions">
-		<XReaction v-if="!maxNumber || i < maxNumber" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/>
-	</template>
+		<XReaction v-for="[reaction, count] in reactions" :key="reaction" :reaction="reaction" :count="count" :is-initial="initialReactions.has(reaction)" :note="note"/>
 	<slot name="extras" />
 </TransitionGroup>
 </template>
@@ -17,6 +15,7 @@
 <script lang="ts" setup>
 import * as misskey from 'misskey-js';
 import XReaction from '@/components/MkReactionsViewer.reaction.vue';
+import { watch } from 'vue';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
@@ -25,9 +24,48 @@ const props = defineProps<{
 
 const initialReactions = new Set(Object.keys(props.note.reactions));
 
-const reactions = $computed(() => {
-	return Object.entries(props.note.reactions).sort(([, countA], [, countB]) => countB - countA);
-});
+let reactions = $ref<[string, number][]>([]);
+
+if (props.note.myReaction && !Object.keys(reactions).includes(props.note.myReaction)) {
+	reactions[props.note.myReaction] = props.note.reactions[props.note.myReaction];
+}
+
+watch([() => props.note.reactions, () => props.maxNumber], ([newSource, maxNumber]) => {
+	console.log(newSource, maxNumber)
+	let newReactions: [string, number][] = [];
+
+	for (let i = 0; i < reactions.length; i++) {
+		const reaction = reactions[i][0];
+		console.log(reaction)
+		if (reaction in newSource && newSource[reaction] !== 0) {
+			reactions[i][1] = newSource[reaction];
+			newReactions.push(reactions[i]);
+		}
+	}
+
+	console.log(newReactions)
+
+	const newReactionsNames = newReactions.map(([x]) => x);
+	newReactions = [
+		...newReactions,
+		...Object.entries(newSource)
+			.sort(([, a], [, b]) => b - a)
+			.filter(([y], i) => {
+				if (maxNumber && i >= maxNumber) return false;
+				return !newReactionsNames.includes(y);
+			}),
+	]
+
+	if (maxNumber) {
+		newReactions = newReactions.slice(0, props.maxNumber);
+	}
+
+	if (props.note.myReaction && !newReactions.map(([x]) => x).includes(props.note.myReaction)) {
+		newReactions.push([props.note.myReaction, newSource[props.note.myReaction]]);
+	}
+
+	reactions = newReactions;
+}, { immediate: true, deep: true });
 </script>
 
 <style lang="scss" module>