From 4b5f6fe048d4dd20afc13e9029b663c720c19363 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Fri, 22 Nov 2024 18:11:24 +0900
Subject: [PATCH 1/3] =?UTF-8?q?Migrate:=20ContextMenu=E3=82=92Container/Pr?=
 =?UTF-8?q?esentation=E3=81=AB=E5=88=86=E9=9B=A2=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dialog/DictionaryManageDialog.vue         |  2 +-
 src/components/Menu/ContextMenu/Container.vue | 32 +++++++++++++++++++
 .../Presentation.vue}                         | 11 +++----
 .../Sing/PlayheadPositionDisplay.vue          |  2 +-
 src/components/Sing/ScoreSequencer.vue        |  2 +-
 src/components/Sing/SequencerNote.vue         |  2 +-
 src/components/Sing/SideBar/TrackItem.vue     |  2 +-
 src/components/Talk/AccentPhrase.vue          |  2 +-
 src/components/Talk/AudioCell.vue             |  2 +-
 src/composables/useRightClickContextMenu.ts   |  2 +-
 10 files changed, 45 insertions(+), 14 deletions(-)
 create mode 100644 src/components/Menu/ContextMenu/Container.vue
 rename src/components/Menu/{ContextMenu.vue => ContextMenu/Presentation.vue} (87%)

diff --git a/src/components/Dialog/DictionaryManageDialog.vue b/src/components/Dialog/DictionaryManageDialog.vue
index 5567117996..8ac6d412c1 100644
--- a/src/components/Dialog/DictionaryManageDialog.vue
+++ b/src/components/Dialog/DictionaryManageDialog.vue
@@ -289,7 +289,7 @@
 import { computed, ref, watch } from "vue";
 import { QInput } from "quasar";
 import AudioAccent from "@/components/Talk/AudioAccent.vue";
-import ContextMenu from "@/components/Menu/ContextMenu.vue";
+import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { useRightClickContextMenu } from "@/composables/useRightClickContextMenu";
 import { useStore } from "@/store";
 import type { FetchAudioResult } from "@/store/type";
diff --git a/src/components/Menu/ContextMenu/Container.vue b/src/components/Menu/ContextMenu/Container.vue
new file mode 100644
index 0000000000..96311f69be
--- /dev/null
+++ b/src/components/Menu/ContextMenu/Container.vue
@@ -0,0 +1,32 @@
+<template>
+  <Presentation ref="contextMenu" :header :menudata :uiLocked />
+</template>
+
+<script setup lang="ts">
+import { computed, useTemplateRef } from "vue";
+import type { ComponentExposed } from "vue-component-type-helpers";
+import Presentation, { ContextMenuItemData } from "./Presentation.vue";
+import { useStore } from "@/store";
+
+defineOptions({
+  name: "ContextMenu",
+});
+
+defineProps<{
+  header?: string;
+  menudata: ContextMenuItemData[];
+}>();
+defineExpose({
+  hide: () => {
+    contextMenu.value?.hide();
+  },
+});
+
+const store = useStore();
+const uiLocked = computed(() => store.getters.UI_LOCKED);
+const contextMenu =
+  useTemplateRef<ComponentExposed<typeof Presentation>>("contextMenu");
+</script>
+<script lang="ts">
+export type { ContextMenuItemData } from "./Presentation.vue";
+</script>
diff --git a/src/components/Menu/ContextMenu.vue b/src/components/Menu/ContextMenu/Presentation.vue
similarity index 87%
rename from src/components/Menu/ContextMenu.vue
rename to src/components/Menu/ContextMenu/Presentation.vue
index 398e75e8d3..da26802ac7 100644
--- a/src/components/Menu/ContextMenu.vue
+++ b/src/components/Menu/ContextMenu/Presentation.vue
@@ -26,23 +26,22 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, onUnmounted, ref } from "vue";
+import { onMounted, onUnmounted, ref } from "vue";
 import { QMenu } from "quasar";
-import MenuItem from "./MenuItem.vue";
-import { MenuItemButton, MenuItemSeparator } from "./type";
-import { useStore } from "@/store";
+import MenuItem from "../MenuItem.vue";
+import { MenuItemButton, MenuItemSeparator } from "../type";
 
 defineProps<{
   header?: string;
   menudata: ContextMenuItemData[];
+
+  uiLocked?: boolean;
 }>();
 defineExpose({
   hide: () => {
     contextMenu.value?.hide();
   },
 });
-const store = useStore();
-const uiLocked = computed(() => store.getters.UI_LOCKED);
 
 const contextMenu = ref<QMenu>();
 /**
diff --git a/src/components/Sing/PlayheadPositionDisplay.vue b/src/components/Sing/PlayheadPositionDisplay.vue
index 42292df909..5f77c19bcb 100644
--- a/src/components/Sing/PlayheadPositionDisplay.vue
+++ b/src/components/Sing/PlayheadPositionDisplay.vue
@@ -18,7 +18,7 @@ import { ref, computed } from "vue";
 import { useStore } from "@/store";
 import ContextMenu, {
   ContextMenuItemData,
-} from "@/components/Menu/ContextMenu.vue";
+} from "@/components/Menu/ContextMenu/Container.vue";
 import {
   getTimeSignaturePositions,
   MeasuresBeats,
diff --git a/src/components/Sing/ScoreSequencer.vue b/src/components/Sing/ScoreSequencer.vue
index f814b1549b..cd25e6f370 100644
--- a/src/components/Sing/ScoreSequencer.vue
+++ b/src/components/Sing/ScoreSequencer.vue
@@ -172,7 +172,7 @@ import {
 } from "vue";
 import ContextMenu, {
   ContextMenuItemData,
-} from "@/components/Menu/ContextMenu.vue";
+} from "@/components/Menu/ContextMenu/Container.vue";
 import { NoteId } from "@/type/preload";
 import { useStore } from "@/store";
 import { Note, SequencerEditTarget } from "@/store/type";
diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue
index 849559b0c3..0e84687a55 100644
--- a/src/components/Sing/SequencerNote.vue
+++ b/src/components/Sing/SequencerNote.vue
@@ -75,7 +75,7 @@ import {
 } from "@/sing/viewHelper";
 import ContextMenu, {
   ContextMenuItemData,
-} from "@/components/Menu/ContextMenu.vue";
+} from "@/components/Menu/ContextMenu/Container.vue";
 
 const props = defineProps<{
   note: Note;
diff --git a/src/components/Sing/SideBar/TrackItem.vue b/src/components/Sing/SideBar/TrackItem.vue
index e9cd54178a..3a5c64c977 100644
--- a/src/components/Sing/SideBar/TrackItem.vue
+++ b/src/components/Sing/SideBar/TrackItem.vue
@@ -165,7 +165,7 @@ import { computed, watchEffect, ref } from "vue";
 import CharacterSelectMenu from "@/components/Sing/CharacterMenuButton/CharacterSelectMenu.vue";
 import SingerIcon from "@/components/Sing/SingerIcon.vue";
 import { useStore } from "@/store";
-import ContextMenu from "@/components/Menu/ContextMenu.vue";
+import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { shouldPlayTracks } from "@/sing/domain";
 import { CharacterInfo, StyleInfo, TrackId } from "@/type/preload";
 
diff --git a/src/components/Talk/AccentPhrase.vue b/src/components/Talk/AccentPhrase.vue
index 070ba90d7f..5e167b9878 100644
--- a/src/components/Talk/AccentPhrase.vue
+++ b/src/components/Talk/AccentPhrase.vue
@@ -208,7 +208,7 @@ import { computed, ref } from "vue";
 import AudioAccent from "./AudioAccent.vue";
 import AudioParameter from "./AudioParameter.vue";
 import { MenuItemButton } from "@/components/Menu/type";
-import ContextMenu from "@/components/Menu/ContextMenu.vue";
+import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { useStore } from "@/store";
 import { AudioKey, MoraDataType } from "@/type/preload";
 import { Mora } from "@/openapi/models/Mora";
diff --git a/src/components/Talk/AudioCell.vue b/src/components/Talk/AudioCell.vue
index 52cc9bacad..7bd2679535 100644
--- a/src/components/Talk/AudioCell.vue
+++ b/src/components/Talk/AudioCell.vue
@@ -114,7 +114,7 @@ import { computed, watch, ref, nextTick } from "vue";
 import { QInput } from "quasar";
 import CharacterButton from "@/components/CharacterButton.vue";
 import { MenuItemButton, MenuItemSeparator } from "@/components/Menu/type";
-import ContextMenu from "@/components/Menu/ContextMenu.vue";
+import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { useStore } from "@/store";
 import { AudioKey, SplitTextWhenPasteType, Voice } from "@/type/preload";
 import { SelectionHelperForQInput } from "@/helpers/SelectionHelperForQInput";
diff --git a/src/composables/useRightClickContextMenu.ts b/src/composables/useRightClickContextMenu.ts
index 6e63bc7a7f..36c7b1c76b 100644
--- a/src/composables/useRightClickContextMenu.ts
+++ b/src/composables/useRightClickContextMenu.ts
@@ -6,7 +6,7 @@
 import { QInput } from "quasar";
 import { ref, Ref, nextTick } from "vue";
 import { MenuItemButton, MenuItemSeparator } from "@/components/Menu/type";
-import ContextMenu from "@/components/Menu/ContextMenu.vue";
+import ContextMenu from "@/components/Menu/ContextMenu/Container.vue";
 import { SelectionHelperForQInput } from "@/helpers/SelectionHelperForQInput";
 
 /**

From 059bfd884a68d15ba35c9cc49eee4e38458747c4 Mon Sep 17 00:00:00 2001
From: sevenc-nanashi <sevenc7c@sevenc7c.com>
Date: Sat, 23 Nov 2024 09:09:17 +0900
Subject: [PATCH 2/3] =?UTF-8?q?Code:=20=E9=80=9A=E5=B8=B8script=E3=82=92?=
 =?UTF-8?q?=E4=B8=8A=E3=81=AB=E6=8C=81=E3=81=A3=E3=81=A6=E3=81=84=E3=81=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Menu/ContextMenu/Container.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Menu/ContextMenu/Container.vue b/src/components/Menu/ContextMenu/Container.vue
index 96311f69be..56c1b5448a 100644
--- a/src/components/Menu/ContextMenu/Container.vue
+++ b/src/components/Menu/ContextMenu/Container.vue
@@ -2,6 +2,9 @@
   <Presentation ref="contextMenu" :header :menudata :uiLocked />
 </template>
 
+<script lang="ts">
+export type { ContextMenuItemData } from "./Presentation.vue";
+</script>
 <script setup lang="ts">
 import { computed, useTemplateRef } from "vue";
 import type { ComponentExposed } from "vue-component-type-helpers";
@@ -27,6 +30,3 @@ const uiLocked = computed(() => store.getters.UI_LOCKED);
 const contextMenu =
   useTemplateRef<ComponentExposed<typeof Presentation>>("contextMenu");
 </script>
-<script lang="ts">
-export type { ContextMenuItemData } from "./Presentation.vue";
-</script>

From a785026433a238238d87b93f9b7a9f0d43903072 Mon Sep 17 00:00:00 2001
From: Hiroshiba <hihokaruta@gmail.com>
Date: Sat, 23 Nov 2024 17:47:02 +0900
Subject: [PATCH 3/3] Update src/components/Menu/ContextMenu/Container.vue

---
 src/components/Menu/ContextMenu/Container.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/Menu/ContextMenu/Container.vue b/src/components/Menu/ContextMenu/Container.vue
index 56c1b5448a..d71ba3d9b7 100644
--- a/src/components/Menu/ContextMenu/Container.vue
+++ b/src/components/Menu/ContextMenu/Container.vue
@@ -1,3 +1,5 @@
+<!-- StoreのUI_LOCKEDを参照してContextMenuを表示する -->
+
 <template>
   <Presentation ref="contextMenu" :header :menudata :uiLocked />
 </template>