From 3cf640c2a09c8a6414e4e6601e63dad32f777e86 Mon Sep 17 00:00:00 2001 From: zyoshoka Date: Wed, 7 Feb 2024 15:25:21 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=94=E3=82=8A=E5=80=A4?= =?UTF-8?q?=E3=81=AE=E5=9E=8B=E3=82=92=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/MkEmojiPickerDialog.vue | 4 ++-- packages/frontend/src/os.ts | 4 ++-- packages/frontend/src/pages/settings/emoji-picker.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/frontend/src/components/MkEmojiPickerDialog.vue b/packages/frontend/src/components/MkEmojiPickerDialog.vue index 444e8a4cec..6b58d735f8 100644 --- a/packages/frontend/src/components/MkEmojiPickerDialog.vue +++ b/packages/frontend/src/components/MkEmojiPickerDialog.vue @@ -56,7 +56,7 @@ const props = withDefaults(defineProps<{ }); const emit = defineEmits<{ - (ev: 'done', v: any): void; + (ev: 'done', v: string): void; (ev: 'close'): void; (ev: 'closed'): void; }>(); @@ -64,7 +64,7 @@ const emit = defineEmits<{ const modal = shallowRef>(); const picker = shallowRef>(); -function chosen(emoji: any) { +function chosen(emoji: string) { emit('done', emoji); if (props.choseAndClose) { modal.value?.close(); diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts index 77d74b0bef..1782a7671a 100644 --- a/packages/frontend/src/os.ts +++ b/packages/frontend/src/os.ts @@ -435,7 +435,7 @@ export function waiting(): Promise { }); } -export function form(title: string, form: any): Promise { +export function form(title: string, form: any): Promise<{ canceled?: boolean, result?: unknown }> { return new Promise(resolve => { popup(defineAsyncComponent(() => import('@/components/MkFormDialog.vue')), { title, form }, { done: result => { @@ -488,7 +488,7 @@ export async function selectDriveFolder(multiple: boolean): Promise { +export async function pickEmoji(src: HTMLElement, opts: ComponentProps): Promise { return new Promise(resolve => { popup(MkEmojiPickerDialog, { src, diff --git a/packages/frontend/src/pages/settings/emoji-picker.vue b/packages/frontend/src/pages/settings/emoji-picker.vue index 1215af35cf..dc289a7233 100644 --- a/packages/frontend/src/pages/settings/emoji-picker.vue +++ b/packages/frontend/src/pages/settings/emoji-picker.vue @@ -213,7 +213,7 @@ async function pickEmoji(itemsRef: Ref, ev: MouseEvent) { os.pickEmoji(getHTMLElement(ev), { showPinned: false, }).then(it => { - const emoji = it as string; + const emoji = it; if (!itemsRef.value.includes(emoji)) { itemsRef.value.push(emoji); }