From d688de597ea148b316b3f65ae294431c6907adc4 Mon Sep 17 00:00:00 2001
From: zyoshoka <root@zyoshoka.com>
Date: Sat, 10 Feb 2024 17:31:43 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20`popup()`=E3=81=AE`props`=E3=81=AB`?=
 =?UTF-8?q?ref`=E3=81=AA=E5=80=A4=E3=82=92=E5=85=A5=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=81=AE=E3=82=92=E8=A8=B1=E5=8F=AF=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/account.ts                     | 2 +-
 packages/frontend/src/components/MkWaitingDialog.vue | 6 +++---
 packages/frontend/src/os.ts                          | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/frontend/src/account.ts b/packages/frontend/src/account.ts
index 8f139e9bf2..524009eb14 100644
--- a/packages/frontend/src/account.ts
+++ b/packages/frontend/src/account.ts
@@ -185,7 +185,7 @@ export async function refreshAccount() {
 export async function login(token: Account['token'], redirect?: string) {
 	const showing = ref(true);
 	popup(defineAsyncComponent(() => import('@/components/MkWaitingDialog.vue')), {
-		success: ref(false),
+		success: false,
 		showing: showing,
 	}, {}, 'closed');
 	if (_DEV_) console.log('logging as token ', token);
diff --git a/packages/frontend/src/components/MkWaitingDialog.vue b/packages/frontend/src/components/MkWaitingDialog.vue
index 47191ded7e..9f0064f641 100644
--- a/packages/frontend/src/components/MkWaitingDialog.vue
+++ b/packages/frontend/src/components/MkWaitingDialog.vue
@@ -14,14 +14,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { Ref, watch, shallowRef } from 'vue';
+import { watch, shallowRef } from 'vue';
 import MkModal from '@/components/MkModal.vue';
 
 const modal = shallowRef<InstanceType<typeof MkModal>>();
 
 const props = defineProps<{
-	success: Ref<boolean>;
-	showing: Ref<boolean>;
+	success: boolean;
+	showing: boolean;
 	text?: string;
 }>();
 
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 806f384fad..3cb579f5e7 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -8,7 +8,7 @@
 import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
 import { EventEmitter } from 'eventemitter3';
 import * as Misskey from 'misskey-js';
-import type { ComponentProps } from 'vue-component-type-helpers';
+import type { ComponentProps as CP } from 'vue-component-type-helpers';
 import type { Form, GetFormResultType } from '@/scripts/form.js';
 import { misskeyApi } from '@/scripts/misskey-api.js';
 import { i18n } from '@/i18n.js';
@@ -159,6 +159,9 @@ type ComponentEmit<T> = T extends new () => { $props: infer Props }
 			: never
 		: never;
 
+// props に ref を許可するようにする
+type ComponentProps<T extends Component> = { [K in keyof CP<T>]: CP<T>[K] | Ref<CP<T>[K]> };
+
 type EmitsExtractor<T> = {
 	[K in keyof T as K extends `onVnode${string}` ? never : K extends `on${infer E}` ? Uncapitalize<E> : K extends string ? never : K]: T[K];
 };
@@ -416,7 +419,7 @@ export function success(): Promise<void> {
 			showing.value = false;
 		}, 1000);
 		popup(MkWaitingDialog, {
-			success: ref(true),
+			success: true,
 			showing: showing,
 		}, {
 			done: () => resolve(),
@@ -428,7 +431,7 @@ export function waiting(): Promise<void> {
 	return new Promise(resolve => {
 		const showing = ref(true);
 		popup(MkWaitingDialog, {
-			success: ref(false),
+			success: false,
 			showing: showing,
 		}, {
 			done: () => resolve(),