@onjmin/dtm 2.1.3 → 2.1.4

package/dist/index.js

@@ -17794,8 +17794,10 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
   const getXY = (e) => {
     const { clientX, clientY } = e;
     const rect = g_grid_canvas.getBoundingClientRect();
-    const x2 = Math.floor(clientX - rect.left);
-    const y = Math.floor(clientY - rect.top);
+    const scaleX = rect.width > 0 ? g_grid_canvas.width / rect.width : 1;
+    const scaleY = rect.height > 0 ? g_grid_canvas.height / rect.height : 1;
+    const x2 = Math.floor((clientX - rect.left) * scaleX);
+    const y = Math.floor((clientY - rect.top) * scaleY);
     return [x2, y, e.buttons];
   };
   const getGridPosition = (e) => {
@@ -17829,7 +17831,7 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
         const absoluteY = y + g_draw_offset_y;
         const yIndex = Math.floor(absoluteY / keyHeight);
         const pitch = units(pitchRangeStart + (keyCount - 1 - yIndex) * upr);
-        if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount) {
+        if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount * upr) {
           requestAnimationFrame(() => callback(step, pitch));
         }
       },
@@ -19285,7 +19287,9 @@ var mountDAW = (target, options = {}) => {
       unitsPerRow: upr = UNITS_PER_SEMITONE
     } = renderConfig;
     const offset = renderer.getDrawOffset();
-    for (const note of active.core.getNotes()) {
+    const notes = active.core.getNotes();
+    for (let i2 = notes.length - 1; i2 >= 0; i2--) {
+      const note = notes[i2];
       const logicalX = note.startStep * stepWidth;
       const yIndex = keyCount - 1 - (note.pitchUnits - pitchRangeStart) / upr;
       const logicalY = yIndex * keyHeight;
@@ -19361,14 +19365,18 @@ var mountDAW = (target, options = {}) => {
       return;
     }
     hasDragged = false;
-    const existing = findActiveNoteAt(x2, y, TOUCH_HIT_MARGIN);
+    const hitMargin = event.pointerType === "mouse" ? 0 : Math.min(
+      TOUCH_HIT_MARGIN,
+      Math.max(0, Math.floor(renderConfig.keyHeight * 0.25))
+    );
+    const existing = findActiveNoteAt(x2, y, hitMargin);
     if (existing) {
       playPreview(existing.pitchUnits);
       const { stepWidth } = renderConfig;
       const offset = renderer.getDrawOffset();
       const renderX = existing.startStep * stepWidth - offset.x;
       const w = existing.durationSteps * stepWidth;
-      if (x2 >= renderX + w - resizeHandleWidth && x2 <= renderX + w) {
+      if (x2 >= renderX + w - resizeHandleWidth && x2 <= renderX + w + hitMargin) {
         dragState = {
           noteId: existing.id,
           mode: "resize",
@@ -19383,7 +19391,7 @@ var mountDAW = (target, options = {}) => {
           noteId: existing.id,
           mode: "move",
           dragOffsetStep: step - existing.startStep,
-          dragOffsetPitch: pitch - existing.pitchUnits,
+          dragOffsetPitch: 0,
           startStep: existing.startStep,
           durationSteps: existing.durationSteps,
           lastPreviewPitch: existing.pitchUnits
@@ -19498,7 +19506,7 @@ var mountDAW = (target, options = {}) => {
             const orig = selectedOriginal.find((o) => o.id === grab.id);
             if (orig) {
               const newGrab = units(orig.pitch + deltaPitch);
-              if (newGrab !== lastMultiPreviewPitch && newGrab >= 0 && newGrab < 128) {
+              if (newGrab !== lastMultiPreviewPitch && newGrab >= PITCH_RANGE_START && newGrab <= PITCH_RANGE_END) {
                 lastMultiPreviewPitch = newGrab;
                 playPreview(newGrab);
               }
@@ -19647,11 +19655,9 @@ var mountDAW = (target, options = {}) => {
     gridCanvas.addEventListener("dblclick", (event) => {
       event.preventDefault();
       if (isActiveLocked()) return;
-      const { step, pitch } = renderer.getGridPosition(event);
+      const { x: x2, y } = renderer.getGridPosition(event);
       const active = getActive();
-      const note = active.core.getNotes().find(
-        (n) => n.pitchUnits === pitch && step >= n.startStep && step < n.startStep + n.durationSteps
-      );
+      const note = findActiveNoteAt(x2, y);
       if (note) active.core.deleteNoteById(note.id);
     });
     gridCanvas.addEventListener(
@@ -23549,7 +23555,7 @@ var createPianoRoll = (options, handlers) => {
       const h = keyHeight;
       const renderX = logicalX - offset.x;
       const renderY = logicalY - offset.y;
-      if (x2 >= renderX && x2 <= renderX + w && y >= renderY && y <= renderY + h) {
+      if (x2 >= renderX && x2 < renderX + w && y >= renderY && y < renderY + h) {
         return note;
       }
     }

package/dist/index.mjs

@@ -17612,8 +17612,10 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
   const getXY = (e) => {
     const { clientX, clientY } = e;
     const rect = g_grid_canvas.getBoundingClientRect();
-    const x2 = Math.floor(clientX - rect.left);
-    const y = Math.floor(clientY - rect.top);
+    const scaleX = rect.width > 0 ? g_grid_canvas.width / rect.width : 1;
+    const scaleY = rect.height > 0 ? g_grid_canvas.height / rect.height : 1;
+    const x2 = Math.floor((clientX - rect.left) * scaleX);
+    const y = Math.floor((clientY - rect.top) * scaleY);
     return [x2, y, e.buttons];
   };
   const getGridPosition = (e) => {
@@ -17647,7 +17649,7 @@ var createRenderer = (mountTarget, width = 800, height = 450, config) => {
         const absoluteY = y + g_draw_offset_y;
         const yIndex = Math.floor(absoluteY / keyHeight);
         const pitch = units(pitchRangeStart + (keyCount - 1 - yIndex) * upr);
-        if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount) {
+        if (pitch >= pitchRangeStart && pitch < pitchRangeStart + keyCount * upr) {
           requestAnimationFrame(() => callback(step, pitch));
         }
       },
@@ -19103,7 +19105,9 @@ var mountDAW = (target, options = {}) => {
       unitsPerRow: upr = UNITS_PER_SEMITONE
     } = renderConfig;
     const offset = renderer.getDrawOffset();
-    for (const note of active.core.getNotes()) {
+    const notes = active.core.getNotes();
+    for (let i2 = notes.length - 1; i2 >= 0; i2--) {
+      const note = notes[i2];
       const logicalX = note.startStep * stepWidth;
       const yIndex = keyCount - 1 - (note.pitchUnits - pitchRangeStart) / upr;
       const logicalY = yIndex * keyHeight;
@@ -19179,14 +19183,18 @@ var mountDAW = (target, options = {}) => {
       return;
     }
     hasDragged = false;
-    const existing = findActiveNoteAt(x2, y, TOUCH_HIT_MARGIN);
+    const hitMargin = event.pointerType === "mouse" ? 0 : Math.min(
+      TOUCH_HIT_MARGIN,
+      Math.max(0, Math.floor(renderConfig.keyHeight * 0.25))
+    );
+    const existing = findActiveNoteAt(x2, y, hitMargin);
     if (existing) {
       playPreview(existing.pitchUnits);
       const { stepWidth } = renderConfig;
       const offset = renderer.getDrawOffset();
       const renderX = existing.startStep * stepWidth - offset.x;
       const w = existing.durationSteps * stepWidth;
-      if (x2 >= renderX + w - resizeHandleWidth && x2 <= renderX + w) {
+      if (x2 >= renderX + w - resizeHandleWidth && x2 <= renderX + w + hitMargin) {
         dragState = {
           noteId: existing.id,
           mode: "resize",
@@ -19201,7 +19209,7 @@ var mountDAW = (target, options = {}) => {
           noteId: existing.id,
           mode: "move",
           dragOffsetStep: step - existing.startStep,
-          dragOffsetPitch: pitch - existing.pitchUnits,
+          dragOffsetPitch: 0,
           startStep: existing.startStep,
           durationSteps: existing.durationSteps,
           lastPreviewPitch: existing.pitchUnits
@@ -19316,7 +19324,7 @@ var mountDAW = (target, options = {}) => {
             const orig = selectedOriginal.find((o) => o.id === grab.id);
             if (orig) {
               const newGrab = units(orig.pitch + deltaPitch);
-              if (newGrab !== lastMultiPreviewPitch && newGrab >= 0 && newGrab < 128) {
+              if (newGrab !== lastMultiPreviewPitch && newGrab >= PITCH_RANGE_START && newGrab <= PITCH_RANGE_END) {
                 lastMultiPreviewPitch = newGrab;
                 playPreview(newGrab);
               }
@@ -19465,11 +19473,9 @@ var mountDAW = (target, options = {}) => {
     gridCanvas.addEventListener("dblclick", (event) => {
       event.preventDefault();
       if (isActiveLocked()) return;
-      const { step, pitch } = renderer.getGridPosition(event);
+      const { x: x2, y } = renderer.getGridPosition(event);
       const active = getActive();
-      const note = active.core.getNotes().find(
-        (n) => n.pitchUnits === pitch && step >= n.startStep && step < n.startStep + n.durationSteps
-      );
+      const note = findActiveNoteAt(x2, y);
       if (note) active.core.deleteNoteById(note.id);
     });
     gridCanvas.addEventListener(
@@ -23367,7 +23373,7 @@ var createPianoRoll = (options, handlers) => {
       const h = keyHeight;
       const renderX = logicalX - offset.x;
       const renderY = logicalY - offset.y;
-      if (x2 >= renderX && x2 <= renderX + w && y >= renderY && y <= renderY + h) {
+      if (x2 >= renderX && x2 < renderX + w && y >= renderY && y < renderY + h) {
         return note;
       }
     }

package/package.json

@@ -2,7 +2,7 @@
   "author": "onjmin",
   "license": "MIT",
   "name": "@onjmin/dtm",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "MMLを中間言語に用いた、モバイルファーストなDAW / ピアノロール打ち込みコンポーネント",
   "homepage": "https://onjmin.github.io/dtm",
   "repository": {