refactor(frontend): os.popup()のpropsの型チェックを有効化

zyoshoka · Feb 2, 2024 · c3a5d43 · c3a5d43
1 parent b0a38c0
commit c3a5d43
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 42 deletions.
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -134,6 +134,7 @@
 		"vite-plugin-turbosnap": "1.0.3",
 		"vitest": "0.34.6",
 		"vitest-fetch-mock": "0.2.2",
+		"vue-component-type-helpers": "^1.8.27",
 		"vue-eslint-parser": "9.4.2",
 		"vue-tsc": "1.8.27"
 	}

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
@@ -6,6 +6,7 @@
 // TODO: なんでもかんでもos.tsに突っ込むのやめたいのでよしなに分割する
 
 import { Component, markRaw, Ref, ref, defineAsyncComponent } from 'vue';
+import { ComponentExposed } from 'vue-component-type-helpers';
 import { EventEmitter } from 'eventemitter3';
 import insertTextAtCursor from 'insert-text-at-cursor';
 import * as Misskey from 'misskey-js';
@@ -143,7 +144,7 @@ export function claimZIndex(priority: keyof typeof zIndexes = 'low'): number {
 	return zIndexes[priority];
 }
 
-export async function popup(component: Component, props: Record<string, any>, events = {}, disposeEvent?: string) {
+export async function popup<T extends Component>(component: T, props: ComponentExposed<T>['$props'], events = {}, disposeEvent?: string) {
 	markRaw(component);
 
 	const id = ++popupIdCount;