[refactor] Menu系のコンポーネントをまとめ、型を別ファイルに分ける

src/components/ContextMenu.vue → src/components/Menu/ContextMenu.vue

@@ -28,11 +28,8 @@
 <script setup lang="ts">
 import { computed, onMounted, onUnmounted, ref } from "vue";
 import { QMenu } from "quasar";
-import MenuItem from "@/components/MenuItem.vue";
-import {
-  MenuItemButton,
-  MenuItemSeparator,
-} from "@/components/BaseMenuBar.vue";
+import MenuItem from "./MenuItem.vue";
+import { MenuItemButton, MenuItemSeparator } from "./type";
 import { useStore } from "@/store";
 
 defineProps<{

src/components/BaseMenuBar.vue → src/components/Menu/MenuBar/BaseMenuBar.vue

@@ -28,40 +28,13 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
-import MenuButton from "./MenuButton.vue";
+import { MenuItemData, MenuItemRoot } from "../type";
+import MenuButton from "../MenuButton.vue";
 import TitleBarButtons from "./TitleBarButtons.vue";
 import TitleBarEditorSwitcher from "./TitleBarEditorSwitcher.vue";
 import { useStore } from "@/store";
 import { base64ImageToUri } from "@/helpers/imageHelper";
 
-export type MenuItemBase<T extends string> = {
-  type: T;
-  label?: string;
-};
-
-export type MenuItemSeparator = MenuItemBase<"separator">;
-
-export type MenuItemRoot = MenuItemBase<"root"> & {
-  onClick?: () => void;
-  subMenu: MenuItemData[];
-  icon?: string;
-  disabled?: boolean;
-  disableWhenUiLocked: boolean;
-  disablreloadingLocked?: boolean;
-};
-
-export type MenuItemButton = MenuItemBase<"button"> & {
-  onClick: () => void;
-  icon?: string;
-  disabled?: boolean;
-  disableWhenUiLocked: boolean;
-  disablreloadingLocked?: boolean;
-};
-
-export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton;
-
-export type MenuItemType = MenuItemData["type"];
-
 const props =
   defineProps<{
     /** 「ファイル」メニューのサブメニュー */

src/components/TitleBarButtons.vue → src/components/Menu/MenuBar/TitleBarButtons.vue

@@ -88,8 +88,8 @@
 
 <script setup lang="ts">
 import { computed } from "vue";
+import MinMaxCloseButtons from "./MinMaxCloseButtons.vue";
 import { useStore } from "@/store";
-import MinMaxCloseButtons from "@/components/MinMaxCloseButtons.vue";
 
 const store = useStore();
 

src/components/MenuButton.vue → src/components/Menu/MenuButton.vue

@@ -43,8 +43,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
 import { debounce } from "quasar";
-import MenuItem from "@/components/MenuItem.vue";
-import { MenuItemData } from "@/components/BaseMenuBar.vue";
+import MenuItem from "./MenuItem.vue";
+import { MenuItemData } from "./type";
 import { useStore } from "@/store";
 
 const props = withDefaults(

src/components/MenuItem.vue → src/components/Menu/MenuItem.vue

@@ -72,7 +72,7 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
-import type { MenuItemData } from "@/components/BaseMenuBar.vue";
+import { MenuItemData } from "./type";
 import { useStore } from "@/store";
 import { hotkeyActionSchema } from "@/type/preload";
 const props = withDefaults(

src/components/Menu/type.ts

@@ -0,0 +1,27 @@
+export type MenuItemBase<T extends string> = {
+  type: T;
+  label?: string;
+};
+
+export type MenuItemSeparator = MenuItemBase<"separator">;
+
+export type MenuItemRoot = MenuItemBase<"root"> & {
+  onClick?: () => void;
+  subMenu: MenuItemData[];
+  icon?: string;
+  disabled?: boolean;
+  disableWhenUiLocked: boolean;
+  disablreloadingLocked?: boolean;
+};
+
+export type MenuItemButton = MenuItemBase<"button"> & {
+  onClick: () => void;
+  icon?: string;
+  disabled?: boolean;
+  disableWhenUiLocked: boolean;
+  disablreloadingLocked?: boolean;
+};
+
+export type MenuItemData = MenuItemSeparator | MenuItemRoot | MenuItemButton;
+
+export type MenuItemType = MenuItemData["type"];

src/components/Sing/MenuBar.vue

@@ -4,10 +4,11 @@
 
 <script setup lang="ts">
 import { computed } from "vue";
+import { MenuItemData } from "@/components/Menu/type";
 import { useStore } from "@/store";
 import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";
 import { setHotkeyFunctions } from "@/store/setting";
-import BaseMenuBar, { MenuItemData } from "@/components/BaseMenuBar.vue";
+import BaseMenuBar from "@/components/Menu/MenuBar/BaseMenuBar.vue";
 
 const store = useStore();
 const uiLocked = computed(() => store.getters.UI_LOCKED);

src/components/Sing/SequencerNote.vue

@@ -41,8 +41,8 @@ import {
   tickToBaseX,
   noteNumberToBaseY,
 } from "@/sing/viewHelper";
-import ContextMenu from "@/components/ContextMenu.vue";
-import { MenuItemButton } from "@/components/BaseMenuBar.vue";
+import ContextMenu from "@/components/Menu/ContextMenu.vue";
+import { MenuItemButton } from "@/components/Menu/type";
 
 type NoteState = "NORMAL" | "SELECTED" | "OVERLAPPING";
 

src/components/Talk/AccentPhrase.vue

@@ -209,8 +209,8 @@
 import { computed, ref } from "vue";
 import AudioAccent from "./AudioAccent.vue";
 import AudioParameter from "./AudioParameter.vue";
-import { MenuItemButton } from "@/components/BaseMenuBar.vue";
-import ContextMenu from "@/components/ContextMenu.vue";
+import { MenuItemButton } from "@/components/Menu/type";
+import ContextMenu from "@/components/Menu/ContextMenu.vue";
 import { useStore } from "@/store";
 import { AudioKey, MoraDataType } from "@/type/preload";
 import { Mora } from "@/openapi/models/Mora";

src/components/Talk/AudioCell.vue

@@ -113,11 +113,8 @@
 import { computed, watch, ref, nextTick } from "vue";
 import { QInput } from "quasar";
 import CharacterButton from "@/components/CharacterButton.vue";
-import {
-  MenuItemButton,
-  MenuItemSeparator,
-} from "@/components/BaseMenuBar.vue";
-import ContextMenu from "@/components/ContextMenu.vue";
+import { MenuItemButton, MenuItemSeparator } from "@/components/Menu/type";
+import ContextMenu from "@/components/Menu/ContextMenu.vue";
 import { useStore } from "@/store";
 import { AudioKey, SplitTextWhenPasteType, Voice } from "@/type/preload";
 import { SelectionHelperForQInput } from "@/helpers/SelectionHelperForQInput";

src/components/Talk/MenuBar.vue

@@ -4,13 +4,14 @@
 
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
+import { MenuItemData } from "@/components/Menu/type";
 import {
   generateAndConnectAndSaveAudioWithDialog,
   multiGenerateAndSaveAudioWithDialog,
   generateAndSaveOneAudioWithDialog,
   connectAndExportTextWithDialog,
 } from "@/components/Dialog/Dialog";
-import BaseMenuBar, { MenuItemData } from "@/components/BaseMenuBar.vue";
+import BaseMenuBar from "@/components/Menu/MenuBar/BaseMenuBar.vue";
 
 import { useStore } from "@/store";
 import { HotkeyActionType, HotkeyReturnType } from "@/type/preload";