@onjmin/dtm 0.1.31 → 0.1.33

package/dist/index.d.mts

@@ -1219,6 +1219,13 @@ type MmlPlayerOptions = {
     embedUrl?: string;
     /** 利用規約への同意画面の表示をスキップするかどうか */
     skipConsent?: boolean;
+    /**
+     * 「MMLを表示」「MMLコピー」押下時に呼ばれる MML 取得コールバック。
+     * 省略時は mountMmlPlayer に渡した mml をそのまま使う。
+     * DAW と連携する場合は `() => daw.getMML().full` を渡すと
+     * 常に最新の full フォーマット（メタ行・#end; 込み）を返せる。
+     */
+    getMml?: () => string;
 };
 type MmlPlayerInstance = {
     play: () => void;

package/dist/index.d.ts

@@ -1219,6 +1219,13 @@ type MmlPlayerOptions = {
     embedUrl?: string;
     /** 利用規約への同意画面の表示をスキップするかどうか */
     skipConsent?: boolean;
+    /**
+     * 「MMLを表示」「MMLコピー」押下時に呼ばれる MML 取得コールバック。
+     * 省略時は mountMmlPlayer に渡した mml をそのまま使う。
+     * DAW と連携する場合は `() => daw.getMML().full` を渡すと
+     * 常に最新の full フォーマット（メタ行・#end; 込み）を返せる。
+     */
+    getMml?: () => string;
 };
 type MmlPlayerInstance = {
     play: () => void;

package/dist/index.js

@@ -6703,13 +6703,27 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   showMmlItem.addEventListener("click", (e) => {
     e.stopPropagation();
     toggleMenu(false);
-    const modalBody = openInfoModal("MML");
+    const modalBody = openInfoModal("MML\u3092\u8868\u793A");
+    const desc = doc.createElement("p");
+    desc.textContent = "\u3053\u306EMML\u3092\u30B3\u30D4\u30FC\u3057\u3066\u3001\u4ED6\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u3084\u5171\u6709URL\u306B\u8CBC\u308A\u4ED8\u3051\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002";
+    desc.style.marginBottom = "8px";
+    modalBody.appendChild(desc);
+    const sourceMml = options.getMml?.() ?? mml;
+    const displayMml = sourceMml.split(";").map((s) => s.trim()).filter((s) => s.length > 0).join(";\n");
     const pre = doc.createElement("pre");
-    pre.textContent = mml;
+    pre.textContent = displayMml;
     pre.style.whiteSpace = "pre-wrap";
     pre.style.wordBreak = "break-all";
+    pre.style.cursor = "text";
+    pre.addEventListener("click", () => {
+      const range = doc.createRange();
+      range.selectNodeContents(pre);
+      const sel = doc.defaultView?.getSelection();
+      sel?.removeAllRanges();
+      sel?.addRange(range);
+    });
     modalBody.appendChild(pre);
-    appendCopyButton(modalBody, mml);
+    appendCopyButton(modalBody, sourceMml);
   });
   mmlInfoItem.addEventListener("click", (e) => {
     e.stopPropagation();
@@ -6747,7 +6761,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   });
   copyMmlItem.addEventListener("click", async (e) => {
     e.stopPropagation();
-    const success = await copyToClipboard(doc, mml);
+    const success = await copyToClipboard(doc, options.getMml?.() ?? mml);
     if (success) {
       copyMmlItem.textContent = "\u30B3\u30D4\u30FC\u3057\u307E\u3057\u305F\uFF01";
     } else {
@@ -8265,7 +8279,7 @@ var mountDAW = (target, options = {}) => {
     redrawAll();
   };
   const togglePlay = () => {
-    if (playbackState === "playing") pause();
+    if (playbackState === "playing") stop();
     else play();
   };
   const updateTransport = () => {
@@ -8791,6 +8805,14 @@ var mountDAW = (target, options = {}) => {
     stop();
     clearAll();
     for (const t of trackStates) t.core.setLoadMode(true);
+    for (const t of trackStates) {
+      t.lyrics = "";
+      t.lyricModel = "";
+      t.vocalVolume = DEFAULT_VOCAL_VOLUME;
+      t.vocalGate = 100;
+      t.vocalPan = 64;
+      t.vocalOctave = 0;
+    }
     const { placements, bpm: parsedBpm } = isAdvanced ? extractMidiPlacementsByTrack(
       midi,
       selectedIndices,
@@ -8818,6 +8840,7 @@ var mountDAW = (target, options = {}) => {
       setDrawOffset(currentOffsetX, currentOffsetY);
     }
     redrawAll();
+    updateTrackPanel();
     updateUndoRedo();
   };
   const exportMIDI2 = () => exportMIDI({
@@ -9116,13 +9139,13 @@ var mountDAW = (target, options = {}) => {
     );
     if (showMidi) wireMidi();
     document.addEventListener("keydown", onKeyDown);
-    for (const ta of refs.root.querySelectorAll("textarea, input")) {
-      ta.addEventListener("keydown", (e) => {
-        const ke = e;
-        if ((ke.ctrlKey || ke.metaKey) && ["KeyZ", "KeyY", "KeyV", "KeyC", "KeyX"].includes(ke.code))
-          e.stopPropagation();
-      });
-    }
+    refs.root.addEventListener("keydown", (e) => {
+      const t = e.target;
+      if (t.tagName !== "TEXTAREA" && t.tagName !== "INPUT") return;
+      const ke = e;
+      if ((ke.ctrlKey || ke.metaKey) && ["KeyZ", "KeyY", "KeyV", "KeyC", "KeyX"].includes(ke.code))
+        e.stopPropagation();
+    });
   };
   let pendingMidi = null;
   let detectedTracks = [];

package/dist/index.mjs

@@ -6592,13 +6592,27 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   showMmlItem.addEventListener("click", (e) => {
     e.stopPropagation();
     toggleMenu(false);
-    const modalBody = openInfoModal("MML");
+    const modalBody = openInfoModal("MML\u3092\u8868\u793A");
+    const desc = doc.createElement("p");
+    desc.textContent = "\u3053\u306EMML\u3092\u30B3\u30D4\u30FC\u3057\u3066\u3001\u4ED6\u306E\u30D7\u30EC\u30A4\u30E4\u30FC\u3084\u5171\u6709URL\u306B\u8CBC\u308A\u4ED8\u3051\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002";
+    desc.style.marginBottom = "8px";
+    modalBody.appendChild(desc);
+    const sourceMml = options.getMml?.() ?? mml;
+    const displayMml = sourceMml.split(";").map((s) => s.trim()).filter((s) => s.length > 0).join(";\n");
     const pre = doc.createElement("pre");
-    pre.textContent = mml;
+    pre.textContent = displayMml;
     pre.style.whiteSpace = "pre-wrap";
     pre.style.wordBreak = "break-all";
+    pre.style.cursor = "text";
+    pre.addEventListener("click", () => {
+      const range = doc.createRange();
+      range.selectNodeContents(pre);
+      const sel = doc.defaultView?.getSelection();
+      sel?.removeAllRanges();
+      sel?.addRange(range);
+    });
     modalBody.appendChild(pre);
-    appendCopyButton(modalBody, mml);
+    appendCopyButton(modalBody, sourceMml);
   });
   mmlInfoItem.addEventListener("click", (e) => {
     e.stopPropagation();
@@ -6636,7 +6650,7 @@ var mountMmlPlayer = (target, mml, options = {}) => {
   });
   copyMmlItem.addEventListener("click", async (e) => {
     e.stopPropagation();
-    const success = await copyToClipboard(doc, mml);
+    const success = await copyToClipboard(doc, options.getMml?.() ?? mml);
     if (success) {
       copyMmlItem.textContent = "\u30B3\u30D4\u30FC\u3057\u307E\u3057\u305F\uFF01";
     } else {
@@ -8154,7 +8168,7 @@ var mountDAW = (target, options = {}) => {
     redrawAll();
   };
   const togglePlay = () => {
-    if (playbackState === "playing") pause();
+    if (playbackState === "playing") stop();
     else play();
   };
   const updateTransport = () => {
@@ -8680,6 +8694,14 @@ var mountDAW = (target, options = {}) => {
     stop();
     clearAll();
     for (const t of trackStates) t.core.setLoadMode(true);
+    for (const t of trackStates) {
+      t.lyrics = "";
+      t.lyricModel = "";
+      t.vocalVolume = DEFAULT_VOCAL_VOLUME;
+      t.vocalGate = 100;
+      t.vocalPan = 64;
+      t.vocalOctave = 0;
+    }
     const { placements, bpm: parsedBpm } = isAdvanced ? extractMidiPlacementsByTrack(
       midi,
       selectedIndices,
@@ -8707,6 +8729,7 @@ var mountDAW = (target, options = {}) => {
       setDrawOffset(currentOffsetX, currentOffsetY);
     }
     redrawAll();
+    updateTrackPanel();
     updateUndoRedo();
   };
   const exportMIDI2 = () => exportMIDI({
@@ -9005,13 +9028,13 @@ var mountDAW = (target, options = {}) => {
     );
     if (showMidi) wireMidi();
     document.addEventListener("keydown", onKeyDown);
-    for (const ta of refs.root.querySelectorAll("textarea, input")) {
-      ta.addEventListener("keydown", (e) => {
-        const ke = e;
-        if ((ke.ctrlKey || ke.metaKey) && ["KeyZ", "KeyY", "KeyV", "KeyC", "KeyX"].includes(ke.code))
-          e.stopPropagation();
-      });
-    }
+    refs.root.addEventListener("keydown", (e) => {
+      const t = e.target;
+      if (t.tagName !== "TEXTAREA" && t.tagName !== "INPUT") return;
+      const ke = e;
+      if ((ke.ctrlKey || ke.metaKey) && ["KeyZ", "KeyY", "KeyV", "KeyC", "KeyX"].includes(ke.code))
+        e.stopPropagation();
+    });
   };
   let pendingMidi = null;
   let detectedTracks = [];

package/package.json

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