editedフラグをinnerContextに移動

VOICEVOX · Feb 4, 2025 · 14ee6ed · 14ee6ed
1 parent 41d42a0
commit 14ee6ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/src/sing/sequencerStateMachine/states/moveNoteState.ts b/src/sing/sequencerStateMachine/states/moveNoteState.ts
@@ -25,14 +25,14 @@ export class MoveNoteState
   private readonly returnStateId: IdleStateId;
 
   private currentCursorPos: PositionOnSequencer;
-  private edited: boolean;
   private applyPreview: boolean;
 
   private innerContext:
     | {
         targetNotesAtStart: Map<NoteId, Note>;
         previewRequestId: number;
         executePreviewProcess: boolean;
+        edited: boolean;
         guideLineTicksAtStart: number;
       }
     | undefined;
@@ -54,7 +54,6 @@ export class MoveNoteState
     this.returnStateId = args.returnStateId;
 
     this.currentCursorPos = args.cursorPosAtStart;
-    this.edited = false;
     this.applyPreview = false;
   }
 
@@ -93,7 +92,7 @@ export class MoveNoteState
       context.previewNotes.value = previewNotes.map((value) => {
         return editedNotes.get(value.id) ?? value;
       });
-      this.edited = true;
+      this.innerContext.edited = true;
     }
 
     context.guideLineTicks.value =
@@ -131,6 +130,7 @@ export class MoveNoteState
       targetNotesAtStart: targetNotesMap,
       executePreviewProcess: false,
       previewRequestId,
+      edited: false,
       guideLineTicksAtStart: guideLineTicks,
     };
   }
@@ -155,7 +155,7 @@ export class MoveNoteState
         input.mouseEvent.type === "mouseup" &&
         mouseButton === "LEFT_BUTTON"
       ) {
-        this.applyPreview = this.edited;
+        this.applyPreview = this.innerContext.edited;
         setNextState(this.returnStateId, undefined);
       }
     }

diff --git a/src/sing/sequencerStateMachine/states/resizeNoteLeftState.ts b/src/sing/sequencerStateMachine/states/resizeNoteLeftState.ts
@@ -25,14 +25,14 @@ export class ResizeNoteLeftState
   private readonly returnStateId: IdleStateId;
 
   private currentCursorPos: PositionOnSequencer;
-  private edited: boolean;
   private applyPreview: boolean;
 
   private innerContext:
     | {
         targetNotesAtStart: Map<NoteId, Note>;
         previewRequestId: number;
         executePreviewProcess: boolean;
+        edited: boolean;
         guideLineTicksAtStart: number;
       }
     | undefined;
@@ -54,7 +54,6 @@ export class ResizeNoteLeftState
     this.returnStateId = args.returnStateId;
 
     this.currentCursorPos = args.cursorPosAtStart;
-    this.edited = false;
     this.applyPreview = false;
   }
 
@@ -89,7 +88,7 @@ export class ResizeNoteLeftState
       context.previewNotes.value = previewNotes.map((value) => {
         return editedNotes.get(value.id) ?? value;
       });
-      this.edited = true;
+      this.innerContext.edited = true;
     }
 
     context.guideLineTicks.value = newNotePos;
@@ -127,6 +126,7 @@ export class ResizeNoteLeftState
       targetNotesAtStart: targetNotesMap,
       executePreviewProcess: false,
       previewRequestId,
+      edited: false,
       guideLineTicksAtStart: guideLineTicks,
     };
   }
@@ -151,7 +151,7 @@ export class ResizeNoteLeftState
         input.mouseEvent.type === "mouseup" &&
         mouseButton === "LEFT_BUTTON"
       ) {
-        this.applyPreview = this.edited;
+        this.applyPreview = this.innerContext.edited;
         setNextState(this.returnStateId, undefined);
       }
     }

diff --git a/src/sing/sequencerStateMachine/states/resizeNoteRightState.ts b/src/sing/sequencerStateMachine/states/resizeNoteRightState.ts
@@ -24,14 +24,14 @@ export class ResizeNoteRightState
   private readonly returnStateId: IdleStateId;
 
   private currentCursorPos: PositionOnSequencer;
-  private edited: boolean;
   private applyPreview: boolean;
 
   private innerContext:
     | {
         targetNotesAtStart: Map<NoteId, Note>;
         previewRequestId: number;
         executePreviewProcess: boolean;
+        edited: boolean;
         guideLineTicksAtStart: number;
       }
     | undefined;
@@ -53,7 +53,6 @@ export class ResizeNoteRightState
     this.returnStateId = args.returnStateId;
 
     this.currentCursorPos = args.cursorPosAtStart;
-    this.edited = false;
     this.applyPreview = false;
   }
 
@@ -87,7 +86,7 @@ export class ResizeNoteRightState
       context.previewNotes.value = previewNotes.map((value) => {
         return editedNotes.get(value.id) ?? value;
       });
-      this.edited = true;
+      this.innerContext.edited = true;
     }
 
     context.guideLineTicks.value = newNoteEndPos;
@@ -126,6 +125,7 @@ export class ResizeNoteRightState
       targetNotesAtStart: targetNotesMap,
       executePreviewProcess: false,
       previewRequestId,
+      edited: false,
       guideLineTicksAtStart: guideLineTicks,
     };
   }
@@ -150,7 +150,7 @@ export class ResizeNoteRightState
         input.mouseEvent.type === "mouseup" &&
         mouseButton === "LEFT_BUTTON"
       ) {
-        this.applyPreview = this.edited;
+        this.applyPreview = this.innerContext.edited;
         setNextState(this.returnStateId, undefined);
       }
     }