From 0a788d1df1f7477df11906edf7ede843ebe48f0e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 29 Jan 2022 18:45:24 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E5=9E=8B?=
 =?UTF-8?q?=E5=AE=9A=E7=BE=A9=E3=82=92=E5=88=86=E9=9B=A2=20(TypeScript?=
 =?UTF-8?q?=E3=81=AE=E5=9E=8B=E6=94=AF=E6=8F=B4=E3=81=8C=E5=8A=B9=E3=81=8B?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/src/components/ui/context-menu.vue |  3 ++-
 packages/client/src/components/ui/menu.vue    | 22 +------------------
 .../client/src/components/ui/popup-menu.vue   |  3 ++-
 packages/client/src/os.ts                     |  2 +-
 packages/client/src/types/menu.ts             | 19 ++++++++++++++++
 5 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 packages/client/src/types/menu.ts

diff --git a/packages/client/src/components/ui/context-menu.vue b/packages/client/src/components/ui/context-menu.vue
index 463426282..f491b43b4 100644
--- a/packages/client/src/components/ui/context-menu.vue
+++ b/packages/client/src/components/ui/context-menu.vue
@@ -9,7 +9,8 @@
 <script lang="ts" setup>
 import { onMounted, onBeforeUnmount } from 'vue';
 import contains from '@/scripts/contains';
-import MkMenu, { MenuItem } from './menu.vue';
+import MkMenu from './menu.vue';
+import { MenuItem } from './types/menu.vue';
 import * as os from '@/os';
 
 const props = defineProps<{
diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/ui/menu.vue
index 6e8e2dd94..02f470ac3 100644
--- a/packages/client/src/components/ui/menu.vue
+++ b/packages/client/src/components/ui/menu.vue
@@ -44,31 +44,11 @@
 </div>
 </template>
 
-<script lang="ts">
-import * as Misskey from 'misskey-js';
-import { Ref } from 'vue';
-
-export type MenuAction = (ev: MouseEvent) => void;
-
-export type MenuDivider = null;
-export type MenuNull = undefined;
-export type MenuLabel = { type: 'label', text: string };
-export type MenuLink = { type: 'link', to: string, text: string, icon?: string, indicate?: boolean, avatar: Misskey.entities.User };
-export type MenuA = { type: 'a', href: string, target?: string, download?: string, text: string, icon?: string, indicate?: boolean };
-export type MenuUser = { type: 'user', user: Misskey.entities.User, active?: boolean, indicate?: boolean, action: MenuAction };
-export type MenuSwitch = { type: 'switch', ref: Ref<boolean>, text: string };
-export type MenuButton = { type?: 'button', text: string, icon?: string, indicate?: boolean, danger?: boolean, active?: boolean, avatar: Misskey.entities.User; action: MenuAction };
-
-export type MenuPending = { type: 'pending' };
-
-type OuterMenuItem = MenuDivider | MenuNull | MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton;
-export type MenuItem = OuterMenuItem | Promise<OuterMenuItem>;
-export type InnerMenuItem = MenuDivider | MenuPending | MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton;
-</script>
 <script lang="ts" setup>
 import { nextTick, onMounted, watch } from 'vue';
 import { focusPrev, focusNext } from '@/scripts/focus';
 import FormSwitch from '@/components/form/switch.vue';
+import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu';
 
 const props = defineProps<{
 	items: MenuItem[];
diff --git a/packages/client/src/components/ui/popup-menu.vue b/packages/client/src/components/ui/popup-menu.vue
index ecf5db1b7..0a86c77e9 100644
--- a/packages/client/src/components/ui/popup-menu.vue
+++ b/packages/client/src/components/ui/popup-menu.vue
@@ -7,7 +7,8 @@
 <script lang="ts" setup>
 import { } from 'vue';
 import MkModal from './modal.vue';
-import MkMenu, { MenuItem } from './menu.vue';
+import MkMenu from './menu.vue';
+import { MenuItem } from '@/types/menu';
 
 defineProps<{
 	items: MenuItem[];
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 3c8e5708b..a8d1f933d 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -7,7 +7,7 @@ import * as Misskey from 'misskey-js';
 import { apiUrl, url } from '@/config';
 import MkPostFormDialog from '@/components/post-form-dialog.vue';
 import MkWaitingDialog from '@/components/waiting-dialog.vue';
-import { MenuItem } from '@/components/ui/menu.vue';
+import { MenuItem } from '@/types/menu';
 import { resolve } from '@/router';
 import { $i } from '@/account';
 
diff --git a/packages/client/src/types/menu.ts b/packages/client/src/types/menu.ts
new file mode 100644
index 000000000..ec79e74c0
--- /dev/null
+++ b/packages/client/src/types/menu.ts
@@ -0,0 +1,19 @@
+import * as Misskey from 'misskey-js';
+import { Ref } from 'vue';
+
+export type MenuAction = (ev: MouseEvent) => void;
+
+export type MenuDivider = null;
+export type MenuNull = undefined;
+export type MenuLabel = { type: 'label', text: string };
+export type MenuLink = { type: 'link', to: string, text: string, icon?: string, indicate?: boolean, avatar: Misskey.entities.User };
+export type MenuA = { type: 'a', href: string, target?: string, download?: string, text: string, icon?: string, indicate?: boolean };
+export type MenuUser = { type: 'user', user: Misskey.entities.User, active?: boolean, indicate?: boolean, action: MenuAction };
+export type MenuSwitch = { type: 'switch', ref: Ref<boolean>, text: string };
+export type MenuButton = { type?: 'button', text: string, icon?: string, indicate?: boolean, danger?: boolean, active?: boolean, avatar: Misskey.entities.User; action: MenuAction };
+
+export type MenuPending = { type: 'pending' };
+
+type OuterMenuItem = MenuDivider | MenuNull | MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton;
+export type MenuItem = OuterMenuItem | Promise<OuterMenuItem>;
+export type InnerMenuItem = MenuDivider | MenuPending | MenuLabel | MenuLink | MenuA | MenuUser | MenuSwitch | MenuButton;