ノート選択処理を改善

VOICEVOX · Feb 10, 2025 · 016265a · 016265a
1 parent aa0b5bd
commit 016265a
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 58 deletions.
diff --git a/src/sing/sequencerStateMachine/common.ts b/src/sing/sequencerStateMachine/common.ts
@@ -4,7 +4,6 @@ import { Rect } from "@/sing/utility";
 import { CursorState, PREVIEW_SOUND_DURATION } from "@/sing/viewHelper";
 import { Store } from "@/store";
 import { Note, SequencerEditTarget } from "@/store/type";
-import { isOnCommandOrCtrlKeyDown } from "@/store/utility";
 import { NoteId, TrackId } from "@/type/preload";
 
 export type PositionOnSequencer = {
@@ -200,60 +199,63 @@ export const getGuideLineTicks = (
 };
 
 /**
- * 指定されたノートのみを選択状態にする。
+ * 指定されたノートとすでに選択されているノートの間にある全てのノートを選択状態にする。
+ * @param context シーケンサーのコンテキスト
+ * @param mouseDownNote マウスでクリックされたノート
  */
-export const selectOnlyThisNote = (context: Context, note: Note) => {
-  void context.store.actions.DESELECT_ALL_NOTES();
-  void context.store.actions.SELECT_NOTES({ noteIds: [note.id] });
+export const selectNotesInRange = (context: Context, mouseDownNote: Note) => {
+  let minIndex = context.notesInSelectedTrack.value.length - 1;
+  let maxIndex = 0;
+  for (let i = 0; i < context.notesInSelectedTrack.value.length; i++) {
+    const noteId = context.notesInSelectedTrack.value[i].id;
+    if (
+      context.selectedNoteIds.value.has(noteId) ||
+      noteId === mouseDownNote.id
+    ) {
+      minIndex = Math.min(minIndex, i);
+      maxIndex = Math.max(maxIndex, i);
+    }
+  }
+  const noteIdsToSelect: NoteId[] = [];
+  for (let i = minIndex; i <= maxIndex; i++) {
+    const noteId = context.notesInSelectedTrack.value[i].id;
+    if (!context.selectedNoteIds.value.has(noteId)) {
+      noteIdsToSelect.push(noteId);
+    }
+  }
+  void context.store.actions.SELECT_NOTES({ noteIds: noteIdsToSelect });
 };
 
 /**
- * mousedown時のノート選択・選択解除の処理を実行する。
+ * 指定されたノートの選択状態を切り替える。
+ * 選択されている場合は選択解除し、選択されていない場合は選択状態にする。
+ * @param context シーケンサーのコンテキスト
+ * @param note 選択状態を切り替えるノート
  */
-export const executeNotesSelectionProcess = (
-  context: Context,
-  mouseEvent: MouseEvent,
-  mouseDownNote: Note,
-) => {
-  if (mouseEvent.shiftKey) {
-    // Shiftキーが押されている場合は選択ノートまでの範囲選択
-    let minIndex = context.notesInSelectedTrack.value.length - 1;
-    let maxIndex = 0;
-    for (let i = 0; i < context.notesInSelectedTrack.value.length; i++) {
-      const noteId = context.notesInSelectedTrack.value[i].id;
-      if (
-        context.selectedNoteIds.value.has(noteId) ||
-        noteId === mouseDownNote.id
-      ) {
-        minIndex = Math.min(minIndex, i);
-        maxIndex = Math.max(maxIndex, i);
-      }
-    }
-    const noteIdsToSelect: NoteId[] = [];
-    for (let i = minIndex; i <= maxIndex; i++) {
-      const noteId = context.notesInSelectedTrack.value[i].id;
-      if (!context.selectedNoteIds.value.has(noteId)) {
-        noteIdsToSelect.push(noteId);
-      }
-    }
-    void context.store.actions.SELECT_NOTES({ noteIds: noteIdsToSelect });
-  } else if (isOnCommandOrCtrlKeyDown(mouseEvent)) {
-    // CommandキーかCtrlキーが押されている場合
-    if (context.selectedNoteIds.value.has(mouseDownNote.id)) {
-      // 選択中のノートなら選択解除
-      void context.store.actions.DESELECT_NOTES({
-        noteIds: [mouseDownNote.id],
-      });
-      return;
-    }
-    // 未選択のノートなら選択に追加
-    void context.store.actions.SELECT_NOTES({ noteIds: [mouseDownNote.id] });
-  } else if (!context.selectedNoteIds.value.has(mouseDownNote.id)) {
-    // 選択中のノートでない場合は選択状態にする
-    void selectOnlyThisNote(context, mouseDownNote);
-    void context.store.actions.PLAY_PREVIEW_SOUND({
-      noteNumber: mouseDownNote.noteNumber,
-      duration: PREVIEW_SOUND_DURATION,
+export const toggleNoteSelection = (context: Context, note: Note) => {
+  if (context.selectedNoteIds.value.has(note.id)) {
+    void context.store.actions.DESELECT_NOTES({
+      noteIds: [note.id],
     });
+  } else {
+    void context.store.actions.SELECT_NOTES({ noteIds: [note.id] });
   }
 };
+
+/**
+ * 指定されたノートのみを選択状態にし、そのノートのプレビュー音を再生する。
+ * 他のノートの選択状態は全て解除される。
+ * @param context シーケンサーのコンテキスト
+ * @param note 選択してプレビュー音を再生するノート
+ */
+export const selectOnlyThisNoteAndPlayPreviewSound = (
+  context: Context,
+  note: Note,
+) => {
+  void context.store.actions.DESELECT_ALL_NOTES();
+  void context.store.actions.SELECT_NOTES({ noteIds: [note.id] });
+  void context.store.actions.PLAY_PREVIEW_SOUND({
+    noteNumber: note.noteNumber,
+    duration: PREVIEW_SOUND_DURATION,
+  });
+};
diff --git a/src/sing/sequencerStateMachine/states/editNotesToolIdleState.ts b/src/sing/sequencerStateMachine/states/editNotesToolIdleState.ts
@@ -1,13 +1,16 @@
 import { SetNextState, State } from "@/sing/stateMachine";
 import {
   Context,
-  executeNotesSelectionProcess,
   getGuideLineTicks,
   Input,
+  selectNotesInRange,
+  selectOnlyThisNoteAndPlayPreviewSound,
   SequencerStateDefinitions,
+  toggleNoteSelection,
 } from "@/sing/sequencerStateMachine/common";
 import { getButton, isSelfEventTarget } from "@/sing/viewHelper";
 import { isOnCommandOrCtrlKeyDown } from "@/store/utility";
+import { Note } from "@/store/type";
 
 export class EditNotesToolIdleState
   implements State<SequencerStateDefinitions, Input, Context>
@@ -70,7 +73,11 @@ export class EditNotesToolIdleState
             });
           }
         } else if (input.targetArea === "Note") {
-          executeNotesSelectionProcess(context, input.mouseEvent, input.note);
+          this.executeNotesSelectionProcess(
+            context,
+            input.mouseEvent,
+            input.note,
+          );
           setNextState("moveNote", {
             cursorPosAtStart: input.cursorPos,
             targetTrackId: selectedTrackId,
@@ -79,7 +86,11 @@ export class EditNotesToolIdleState
             returnStateId: this.id,
           });
         } else if (input.targetArea === "NoteLeftEdge") {
-          executeNotesSelectionProcess(context, input.mouseEvent, input.note);
+          this.executeNotesSelectionProcess(
+            context,
+            input.mouseEvent,
+            input.note,
+          );
           setNextState("resizeNoteLeft", {
             cursorPosAtStart: input.cursorPos,
             targetTrackId: selectedTrackId,
@@ -88,7 +99,11 @@ export class EditNotesToolIdleState
             returnStateId: this.id,
           });
         } else if (input.targetArea === "NoteRightEdge") {
-          executeNotesSelectionProcess(context, input.mouseEvent, input.note);
+          this.executeNotesSelectionProcess(
+            context,
+            input.mouseEvent,
+            input.note,
+          );
           setNextState("resizeNoteRight", {
             cursorPosAtStart: input.cursorPos,
             targetTrackId: selectedTrackId,
@@ -118,4 +133,18 @@ export class EditNotesToolIdleState
       context.cursorState.value = "DRAW";
     }
   }
+
+  private executeNotesSelectionProcess(
+    context: Context,
+    mouseEvent: MouseEvent,
+    mouseDownNote: Note,
+  ) {
+    if (mouseEvent.shiftKey) {
+      selectNotesInRange(context, mouseDownNote);
+    } else if (isOnCommandOrCtrlKeyDown(mouseEvent)) {
+      toggleNoteSelection(context, mouseDownNote);
+    } else if (!context.selectedNoteIds.value.has(mouseDownNote.id)) {
+      selectOnlyThisNoteAndPlayPreviewSound(context, mouseDownNote);
+    }
+  }
 }
diff --git a/src/sing/sequencerStateMachine/states/selectNotesToolIdleState.ts b/src/sing/sequencerStateMachine/states/selectNotesToolIdleState.ts
@@ -1,12 +1,16 @@
 import { SetNextState, State } from "@/sing/stateMachine";
 import {
   Context,
-  executeNotesSelectionProcess,
   getGuideLineTicks,
   Input,
+  selectNotesInRange,
+  selectOnlyThisNoteAndPlayPreviewSound,
   SequencerStateDefinitions,
+  toggleNoteSelection,
 } from "@/sing/sequencerStateMachine/common";
 import { getButton, isSelfEventTarget } from "@/sing/viewHelper";
+import { isOnCommandOrCtrlKeyDown } from "@/store/utility";
+import { Note } from "@/store/type";
 
 export class SelectNotesToolIdleState
   implements State<SequencerStateDefinitions, Input, Context>
@@ -50,7 +54,11 @@ export class SelectNotesToolIdleState
               returnStateId: this.id,
             });
           } else if (input.targetArea === "Note") {
-            executeNotesSelectionProcess(context, input.mouseEvent, input.note);
+            this.executeNotesSelectionProcess(
+              context,
+              input.mouseEvent,
+              input.note,
+            );
             setNextState("moveNote", {
               cursorPosAtStart: input.cursorPos,
               targetTrackId: selectedTrackId,
@@ -59,7 +67,11 @@ export class SelectNotesToolIdleState
               returnStateId: this.id,
             });
           } else if (input.targetArea === "NoteLeftEdge") {
-            executeNotesSelectionProcess(context, input.mouseEvent, input.note);
+            this.executeNotesSelectionProcess(
+              context,
+              input.mouseEvent,
+              input.note,
+            );
             setNextState("resizeNoteLeft", {
               cursorPosAtStart: input.cursorPos,
               targetTrackId: selectedTrackId,
@@ -68,7 +80,11 @@ export class SelectNotesToolIdleState
               returnStateId: this.id,
             });
           } else if (input.targetArea === "NoteRightEdge") {
-            executeNotesSelectionProcess(context, input.mouseEvent, input.note);
+            this.executeNotesSelectionProcess(
+              context,
+              input.mouseEvent,
+              input.note,
+            );
             setNextState("resizeNoteRight", {
               cursorPosAtStart: input.cursorPos,
               targetTrackId: selectedTrackId,
@@ -100,4 +116,18 @@ export class SelectNotesToolIdleState
       context.cursorState.value = "UNSET";
     }
   }
+
+  private executeNotesSelectionProcess(
+    context: Context,
+    mouseEvent: MouseEvent,
+    mouseDownNote: Note,
+  ) {
+    if (mouseEvent.shiftKey) {
+      selectNotesInRange(context, mouseDownNote);
+    } else if (isOnCommandOrCtrlKeyDown(mouseEvent)) {
+      toggleNoteSelection(context, mouseDownNote);
+    } else if (!context.selectedNoteIds.value.has(mouseDownNote.id)) {
+      selectOnlyThisNoteAndPlayPreviewSound(context, mouseDownNote);
+    }
+  }
 }