@versa_ai/vmml-editor 1.0.39 → 1.0.41

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @versa_ai/vmml-editor@1.0.39 build D:\code\work\vmml-player\packages\editor
+> @versa_ai/vmml-editor@1.0.41 build D:\code\work\vmml-player\packages\editor
 > tsup
 
 CLI Building entry: src/index.tsx
@@ -9,7 +9,6 @@
 CLI Target: node16
 CJS Build start
 ESM Build start
-DTS Build start
 
  WARN  ▲ [WARNING] Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0.
 
@@ -67,6 +66,7 @@ More info and automated migrator: https://sass-lang.com/d/slash-div [35
 
 
 
+DTS Build start
 
  WARN  ▲ [WARNING] Using / for division outside of calc() is deprecated and will be removed in Dart Sass 2.0.0.
 
@@ -124,12 +124,12 @@ More info and automated migrator: https://sass-lang.com/d/slash-div [35
 
 
 
-CJS dist\index.js     122.27 KB
-CJS dist\index.js.map 233.66 KB
-CJS ⚡️ Build success in 839ms
-ESM dist\index.mjs     120.58 KB
-ESM dist\index.mjs.map 233.36 KB
-ESM ⚡️ Build success in 839ms
-DTS ⚡️ Build success in 2050ms
+CJS dist\index.js     122.59 KB
+CJS dist\index.js.map 234.64 KB
+CJS ⚡️ Build success in 868ms
+ESM dist\index.mjs     120.90 KB
+ESM dist\index.mjs.map 234.34 KB
+ESM ⚡️ Build success in 868ms
+DTS ⚡️ Build success in 1828ms
 DTS dist\index.d.ts  158.00 B
 DTS dist\index.d.mts 158.00 B

package/dist/index.js

@@ -617,6 +617,20 @@ var VmmlConverter = class {
       rotationY: _rotationY
     };
   }
+  findClip(id) {
+    const tracks = this.vmml.template.tracks || [];
+    const isString = typeof id === "string";
+    const ids = isString ? [id] : id;
+    const list = [];
+    tracks.forEach((track) => {
+      track.clips.forEach((clip) => {
+        if (ids == null ? void 0 : ids.includes(clip.id)) {
+          list.push(clip);
+        }
+      });
+    });
+    return list;
+  }
   /**
    * 转换 TextClip
    * @param fObj - 画布fObj
@@ -709,19 +723,12 @@ var VmmlConverter = class {
    * @param fObj - 画布fObj
    */
   updateClip(fObj) {
-    console.log("updateClip fObj", fObj);
+    console.log("updateClip fObj", fObj, this.tracks);
     const posParam = this.setPosParam(fObj);
     const {
-      // clipData: { id, type, lineSpacing },
       clipData: { id, type, lineSpacing, originClip }
     } = fObj;
-    let existClip = null;
-    if (originClip) {
-      existClip = originClip;
-    } else {
-      const editorTrack = this.tracks.find((track) => track.editorType === type);
-      existClip = ((editorTrack == null ? void 0 : editorTrack.clips) || []).find((clip) => clip.id === id);
-    }
+    const [existClip] = this.findClip(id);
     if (existClip) {
       !originClip && (existClip.fObj = fObj);
       if (type === "\u8868\u60C5\u5305") {
@@ -742,7 +749,6 @@ var VmmlConverter = class {
         };
       }
     }
-    console.log("updateClip \u6700\u7EC8vmml", this.vmml);
   }
   /**
    * 删除 Clip
@@ -751,7 +757,13 @@ var VmmlConverter = class {
    */
   deleteClip({ id, type, originClip }) {
     if (originClip) {
-      originClip.duration = 0;
+      for (const track of this.tracks) {
+        const clip = (track.clips || []).find((c) => c.id === originClip.id);
+        if (clip) {
+          clip.duration = 0;
+          break;
+        }
+      }
     } else {
       const editorTrack = this.tracks.find((track) => track.editorType === type);
       const index = editorTrack.clips.findIndex((item) => item.id === id);
@@ -769,7 +781,9 @@ var VmmlConverter = class {
         }
       }
     }
-    console.log("deleteClip \u6700\u7EC8Vmml", this.vmml);
+  }
+  changeVmml(newVmml) {
+    this.vmml = newVmml;
   }
   //切换静音 视频/音频
   changeMute({ id, isMute }) {
@@ -1056,13 +1070,12 @@ var EditorCanvas = react.forwardRef(
       if (fc) {
         const ns = Math.floor((f ?? frame) / 30 * 1e6);
         const objects = fc.getObjects();
-        console.log(objects, "fc>>>>>>>>>>>>>>>>", frame);
         objects.forEach((item) => {
           var _a, _b, _c;
           if (((_a = item == null ? void 0 : item.clipData) == null ? void 0 : _a.type) === "\u6587\u5B57") {
-            item.set("visible", ns >= item.clipData.inPoint && ns < item.clipData.inPoint + (item.clipData.duration || vmml.template.duration));
+            item.set("visible", item.clipData.duration > 0 && ns >= item.clipData.inPoint && ns < item.clipData.inPoint + (item.clipData.duration || vmml.template.duration));
           } else {
-            item.set("visible", ns >= item.clipData.inPoint && ns < item.clipData.inPoint + ((_c = (_b = item.clipData) == null ? void 0 : _b.fileUrl) == null ? void 0 : _c.duration));
+            item.set("visible", item.clipData.duration > 0 && ns >= item.clipData.inPoint && ns < item.clipData.inPoint + ((_c = (_b = item.clipData) == null ? void 0 : _b.fileUrl) == null ? void 0 : _c.duration));
           }
         });
         fc.discardActiveObject();
@@ -1338,7 +1351,7 @@ var EditorCanvas = react.forwardRef(
             await document.fonts.ready;
           }
         }
-        const lines = textContent.split("\n");
+        const lines = textContent.split("\n").filter((item) => item);
         const lineHeight = 22 + strokeW;
         const textHeight = lines.length * lineHeight;
         const groupWidth = Math.max(...lines.map((l) => {
@@ -1762,8 +1775,12 @@ var EditorCanvas = react.forwardRef(
       }
     }, [fc, dragState]);
     react.useEffect(() => {
-      if (canvasSize.width && canvasSize.height && !vmmlConverterRef.current) {
-        vmmlConverterRef.current = new VmmlConverter_default({ vmml, canvasSize });
+      if (canvasSize.width && canvasSize.height) {
+        if (vmmlConverterRef.current) {
+          vmmlConverterRef.current.changeVmml(vmml);
+        } else {
+          vmmlConverterRef.current = new VmmlConverter_default({ vmml, canvasSize });
+        }
       }
     }, [canvasSize, vmml]);
     react.useEffect(() => {