コメント修正と関数の統合

VOICEVOX · Aug 15, 2024 · d738f95 · d738f95
1 parent 97bd8eb
commit d738f95
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/components/Dialog/DictionaryManageDialog.vue b/src/components/Dialog/DictionaryManageDialog.vue
@@ -129,7 +129,6 @@
                 class="word-input"
                 dense
                 :disable="uiLocked"
-                @focus="clearSurfaceInputSelection()"
                 @blur="setSurface(surface)"
                 @keydown.enter="yomiFocus"
               >
@@ -154,7 +153,6 @@
                 dense
                 :error="!isOnlyHiraOrKana"
                 :disable="uiLocked"
-                @focus="clearYomiInputSelection()"
                 @blur="setYomi(yomi)"
                 @keydown.enter="setYomiWhenEnter"
               >
@@ -703,7 +701,6 @@ const {
   contextMenuHeader: surfaceContextMenuHeader,
   contextMenudata: surfaceContextMenudata,
   readyForContextMenu: readyForSurfaceContextMenu,
-  clearInputSelection: clearSurfaceInputSelection,
   startContextMenuOperation: startSurfaceContextMenuOperation,
   endContextMenuOperation: endSurfaceContextMenuOperation,
 } = useRightClickContextMenu(surfaceInput, surface);
@@ -713,7 +710,6 @@ const {
   contextMenuHeader: yomiContextMenuHeader,
   contextMenudata: yomiContextMenudata,
   readyForContextMenu: readyForYomiContextMenu,
-  clearInputSelection: clearYomiInputSelection,
   startContextMenuOperation: startYomiContextMenuOperation,
   endContextMenuOperation: endYomiContextMenuOperation,
 } = useRightClickContextMenu(yomiInput, yomi);

diff --git a/src/composables/useRightClickContextMenu.ts b/src/composables/useRightClickContextMenu.ts
@@ -1,12 +1,14 @@
+/**
+ * テキスト編集エリアの右クリック
+ * 参考実装: https://github.com/VOICEVOX/voicevox/pull/1374/files#diff-444f263f72d4db11fe82c672d5c232eb4c29d29dbc1ffd20e279d586b1b2c180
+ */
+
 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 { SelectionHelperForQInput } from "@/helpers/SelectionHelperForQInput";
 
-// テキスト編集エリアの右クリック
-// 参考実装: https://github.com/VOICEVOX/voicevox/pull/1374/files#diff-444f263f72d4db11fe82c672d5c232eb4c29d29dbc1ffd20e279d586b1b2c180R371-R379
-
 /**
  * コンポーネントの中で呼ばれた <QInput> に対して
  * 切り取りやコピー、貼り付けの処理を行う
@@ -145,16 +147,14 @@ export function useRightClickContextMenu(
     );
   };
 
-  const clearInputSelection = () => {
+  const startContextMenuOperation = () => {
+    willFocusOrBlur.value = true;
+
     if (!willFocusOrBlur.value) {
       inputSelection.toEmpty();
     }
   };
 
-  const startContextMenuOperation = () => {
-    willFocusOrBlur.value = true;
-  };
-
   const endContextMenuOperation = async () => {
     await nextTick();
     willFocusOrBlur.value = false;
@@ -165,7 +165,6 @@ export function useRightClickContextMenu(
     contextMenuHeader,
     contextMenudata,
     readyForContextMenu,
-    clearInputSelection,
     startContextMenuOperation,
     endContextMenuOperation,
   };