From 1a883f4f052c2c3340310b66aef4ce102f61cffd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 31 Oct 2021 19:37:18 +0900
Subject: [PATCH] =?UTF-8?q?fix(client):=20=E3=82=B3=E3=83=B3=E3=83=88?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=AB=E3=83=91=E3=83=8D=E3=83=AB=E3=81=AE?=
 =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0=E7=B5=B5=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=82=BF=E3=83=96=E3=81=8C=E5=88=87=E3=82=8A=E6=9B=BF=E3=82=8F?=
 =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E8=A6=8B?=
 =?UTF-8?q?=E3=81=88=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                      |  1 +
 src/client/pages/admin/emojis.vue |  4 ++--
 src/client/pages/admin/index.vue  | 10 ++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eef1345c96..551c93ddf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - リレー向けのActivityが一部実装で除外されてしまうことがあるのを修正
 - 削除したノートやユーザーがリモートから参照されると復活することがあるのを修正
 - クライアント: ページ編集時のドロップダウンメニューなどが動作しない問題を修正
+- クライアント: コントロールパネルのカスタム絵文字タブが切り替わらないように見える問題を修正
 
 ## 12.94.1 (2021/10/25)
 
diff --git a/src/client/pages/admin/emojis.vue b/src/client/pages/admin/emojis.vue
index 80e0e00ba9..f5952f93b8 100644
--- a/src/client/pages/admin/emojis.vue
+++ b/src/client/pages/admin/emojis.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineComponent } from 'vue';
+import { computed, defineComponent, toRef } from 'vue';
 import MkButton from '@client/components/ui/button.vue';
 import MkInput from '@client/components/form/input.vue';
 import MkPagination from '@client/components/ui/pagination.vue';
@@ -112,7 +112,7 @@ export default defineComponent({
 	},
 
 	async mounted() {
-		this.$emit('info', this[symbols.PAGE_INFO]);
+		this.$emit('info', toRef(this, symbols.PAGE_INFO));
 	},
 
 	methods: {
diff --git a/src/client/pages/admin/index.vue b/src/client/pages/admin/index.vue
index cda3ab912a..28157ff05a 100644
--- a/src/client/pages/admin/index.vue
+++ b/src/client/pages/admin/index.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script lang="ts">
-import { computed, defineAsyncComponent, defineComponent, nextTick, onMounted, reactive, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, defineComponent, isRef, nextTick, onMounted, reactive, ref, watch } from 'vue';
 import { i18n } from '@client/i18n';
 import MkSuperMenu from '@client/components/ui/super-menu.vue';
 import FormGroup from '@client/components/debobigego/group.vue';
@@ -73,7 +73,13 @@ export default defineComponent({
 		const view = ref(null);
 		const el = ref(null);
 		const onInfo = (viewInfo) => {
-			childInfo.value = viewInfo;
+			if (isRef(viewInfo)) {
+				watch(viewInfo, () => {
+					childInfo.value = viewInfo.value;
+				}, { immediate: true });
+			} else {
+				childInfo.value = viewInfo;
+			}
 		};
 		const pageProps = ref({});