fix(piano-roll): allow pasting overlapping copied notes

Author: 808StaN

src/components/piano-roll/pianoRollClipboard.js

@@ -49,7 +49,6 @@ export const buildClipboardPastePayload = function ({
   minFreeLength,
   pitchMin,
   pitchMax,
-  channelNotes,
   defaultVelocity,
   clampFn,
   makeIdFn,
@@ -74,12 +73,6 @@ export const buildClipboardPastePayload = function ({
     ? sharedPianoClipboard.pasteCountInSource
     : 0;
 
-  const occupied = new Set(
-    (channelNotes || []).map(function (note) {
-      return Math.round((note.start || 0) * 1000) + ":" + note.pitch;
-    }),
-  );
-
   const notesToAdd = [];
   const nextSelection = [];
 
@@ -88,13 +81,6 @@ export const buildClipboardPastePayload = function ({
     const maxLen = Math.max(minFreeLength, patternLength - start);
     const length = clampFn(entry.length, minFreeLength, maxLen);
     const pitch = clampFn(entry.pitch, pitchMin, pitchMax);
-    const key = Math.round(start * 1000) + ":" + pitch;
-
-    if (occupied.has(key)) {
-      return;
-    }
-
-    occupied.add(key);
     const newId = makeIdFn("paste");
     notesToAdd.push({
       id: newId,

src/components/piano-roll/pianoRollClipboard.test.js

@@ -0,0 +1,46 @@
+import { describe, it, expect } from "vitest";
+import {
+  buildClipboardPastePayload,
+  copySelectedNotesToClipboard,
+} from "./pianoRollClipboard";
+
+function clamp(value, min, max) {
+  return Math.max(min, Math.min(max, value));
+}
+
+function makeId(prefix) {
+  makeId.count = (makeId.count || 0) + 1;
+  return prefix + "-" + makeId.count;
+}
+
+describe("pianoRollClipboard", () => {
+  it("keeps overlapping copied notes in paste payload", () => {
+    copySelectedNotesToClipboard({
+      activePatternId: "pat-1",
+      activeChannelId: "ch-1",
+      defaultVelocity: 95,
+      clampFn: clamp,
+      selectedNotes: [
+        { start: 0, pitch: 60, length: 4, velocity: 100 },
+        { start: 0, pitch: 60, length: 1, velocity: 80 },
+      ],
+    });
+
+    const { notesToAdd, nextSelection } = buildClipboardPastePayload({
+      activePatternId: "pat-1",
+      activeChannelId: "ch-1",
+      patternLength: 16,
+      minFreeLength: 0.0625,
+      pitchMin: 0,
+      pitchMax: 127,
+      defaultVelocity: 95,
+      clampFn: clamp,
+      makeIdFn: makeId,
+    });
+
+    expect(notesToAdd).toHaveLength(2);
+    expect(notesToAdd[0]).toMatchObject({ start: 1, pitch: 60, length: 4 });
+    expect(notesToAdd[1]).toMatchObject({ start: 1, pitch: 60, length: 1 });
+    expect(nextSelection).toHaveLength(2);
+  });
+});

src/components/piano-roll/usePianoRollClipboardActions.js

@@ -95,15 +95,13 @@ export const usePianoRollClipboardActions = function ({
         return;
       }
 
-      const channelNotes = activePattern.pianoPreview?.[activeChannel.id] || [];
       const { notesToAdd, nextSelection } = buildClipboardPastePayload({
         activePatternId,
         activeChannelId: activeChannel.id,
         patternLength,
         minFreeLength,
         pitchMin,
         pitchMax,
-        channelNotes,
         defaultVelocity,
         clampFn,
         makeIdFn,
@@ -115,6 +113,7 @@ export const usePianoRollClipboardActions = function ({
             patternId: activePatternId,
             channelId: activeChannel.id,
             notes: notesToAdd,
+            allowOverlaps: true,
           }),
         );
       }

src/store/reducers/project.js

@@ -1319,11 +1319,14 @@ export const projectReducers = {
 
     const patternLength = Math.max(1, pattern.lengthSteps || 16);
     const notes = pattern.pianoPreview[channelId];
-    const occupied = new Set(
-      notes.map(function (note) {
-        return Math.round((note.start || 0) * 1000) + ":" + note.pitch;
-      }),
-    );
+    const allowOverlaps = Boolean(action.payload.allowOverlaps);
+    const occupied = allowOverlaps
+      ? null
+      : new Set(
+          notes.map(function (note) {
+            return Math.round((note.start || 0) * 1000) + ":" + note.pitch;
+          }),
+        );
 
     incomingNotes.forEach(function (inputNote) {
       const start = Math.max(
@@ -1343,11 +1346,11 @@ export const projectReducers = {
         ),
       );
       const key = Math.round(start * 1000) + ":" + pitch;
-      if (occupied.has(key)) {
+      if (occupied?.has(key)) {
         return;
       }
 
-      occupied.add(key);
+      occupied?.add(key);
       notes.push({
         id:
           inputNote?.id ||

src/store/reducers/project.test.js

@@ -147,4 +147,47 @@ describe("projectReducers", () => {
       expect(state.project.activePatternId).toBe("pat-1");
     });
   });
+
+  describe("addPianoNotesBatch", () => {
+    it("skips duplicate start/pitch by default", () => {
+      const state = createMinimalState();
+      state.project.patterns[0].pianoPreview["ch-1"] = [
+        { id: "existing", start: 1, length: 4, pitch: 60, velocity: 100 },
+      ];
+
+      projectReducers.addPianoNotesBatch(state, {
+        payload: {
+          patternId: "pat-1",
+          channelId: "ch-1",
+          notes: [{ id: "new", start: 1, length: 1, pitch: 60, velocity: 80 }],
+        },
+      });
+
+      expect(state.project.patterns[0].pianoPreview["ch-1"]).toHaveLength(1);
+    });
+
+    it("allows overlapping notes when requested by paste", () => {
+      const state = createMinimalState();
+      state.project.patterns[0].pianoPreview["ch-1"] = [
+        { id: "existing", start: 1, length: 4, pitch: 60, velocity: 100 },
+      ];
+
+      projectReducers.addPianoNotesBatch(state, {
+        payload: {
+          patternId: "pat-1",
+          channelId: "ch-1",
+          allowOverlaps: true,
+          notes: [{ id: "new", start: 1, length: 1, pitch: 60, velocity: 80 }],
+        },
+      });
+
+      expect(state.project.patterns[0].pianoPreview["ch-1"]).toHaveLength(2);
+      expect(state.project.patterns[0].pianoPreview["ch-1"][1]).toMatchObject({
+        id: "new",
+        start: 1,
+        length: 1,
+        pitch: 60,
+      });
+    });
+  });
 });