@versa_ai/vmml-editor 1.0.32 → 1.0.34

package/dist/index.mjs

@@ -1053,6 +1053,7 @@ var EditorCanvas = forwardRef(
       if (fc) {
         const ns = Math.floor((f ?? frame) / 30 * 1e6);
         const objects = fc.getObjects();
+        console.log(objects, "checkObjectInPoint>>>objects>>>>>>>>>>>", ns, f, frame);
         objects.forEach((item) => {
           var _a, _b, _c;
           if (((_a = item == null ? void 0 : item.clipData) == null ? void 0 : _a.type) === "\u6587\u5B57") {
@@ -1439,6 +1440,25 @@ var EditorCanvas = forwardRef(
         return null;
       }
     };
+    const setTextAlign = (p, stroke, direction) => {
+      if (direction === "center") {
+        p.style.justifyContent = "center";
+        stroke.style.left = "50%";
+        stroke.style.top = "50%";
+        stroke.style.transform = "translate(-50%, -50%)";
+      }
+      if (direction === "left") {
+        stroke.style.left = "0";
+        stroke.style.top = "0";
+        stroke.style.transform = "none";
+      }
+      if (direction === "right") {
+        p.style.justifyContent = "flex-end";
+        stroke.style.right = "0";
+        stroke.style.top = "50%";
+        stroke.style.transform = "translateY(-50%)";
+      }
+    };
     const createTextImg = async ({ textContent, bgColor, textColor, stColor, strokeW, fontAssetUrl = null, textBasicInfo, letterSpacing }) => {
       const fontBase64 = await loadFont(fontAssetUrl);
       const container = document.createElement("div");
@@ -1460,7 +1480,6 @@ var EditorCanvas = forwardRef(
         p.style.padding = "0";
         if (letterSpacing) p.style.letterSpacing = `${letterSpacing}px`;
         p.style.zIndex = "2";
-        if (textWarapCenter) p.style.justifyContent = "center";
         const fill = document.createElement("span");
         fill.textContent = line || " ";
         fill.style.color = textColor;
@@ -1472,15 +1491,9 @@ var EditorCanvas = forwardRef(
         stroke.style.color = "transparent";
         stroke.style.webkitTextStrokeWidth = `${strokeW}px`;
         stroke.style.webkitTextStrokeColor = stColor;
-        if (textWarapCenter) {
-          stroke.style.left = "50%";
-          stroke.style.top = "50%";
-          stroke.style.transform = "translate(-50%, -50%)";
-        } else {
-          stroke.style.left = "0";
-          stroke.style.top = "0";
-        }
-        stroke.style.zIndex = "-1";
+        let dr = textBasicInfo.textAlign || "left";
+        if (textWarapCenter) dr = "center";
+        setTextAlign(p, stroke, dr);
         p.appendChild(fill);
         p.appendChild(stroke);
         container.appendChild(p);
@@ -2760,24 +2773,24 @@ var EditorFn = ({
     }
   }, [dragState]);
   const updateEditor = (v, checkFrame) => {
-    var _a2, _b, _c, _d;
+    var _a2, _b, _c, _d, _e;
     const { current: playerCurrent } = vmmlPlayerRef;
     const { current: canvasCurrent } = canvasRef;
     if (!playerCurrent) return;
-    const isSame = JSON.stringify(v) === JSON.stringify(vmmlState);
-    console.log(v, vmmlState, isSame, "\u5224\u65ADvmml\u662F\u5426\u76F8\u540C");
     needPlay.current = false;
     once.current = false;
     const convertedVmml = convertVmmlTextScaleByForbidden(v);
+    const isSame = JSON.stringify(convertedVmml) === JSON.stringify(vmmlState);
+    const currentFrame = checkFrame ?? (((_a2 = player == null ? void 0 : player.getCurrentFrame) == null ? void 0 : _a2.call(player)) ?? frame ?? pauseFrame);
+    setFrame(currentFrame);
+    playerCurrent.setVmml(convertedVmml, currentFrame);
     if (!isSame) {
-      (_b = (_a2 = canvasCurrent == null ? void 0 : canvasCurrent.getCanvasCtx()) == null ? void 0 : _a2.clear) == null ? void 0 : _b.call(_a2);
+      (_c = (_b = canvasCurrent == null ? void 0 : canvasCurrent.getCanvasCtx()) == null ? void 0 : _b.clear) == null ? void 0 : _c.call(_b);
       setVmmlState(convertedVmml);
-      setDurationInFrames(getFrames(((_c = v == null ? void 0 : v.template) == null ? void 0 : _c.duration) || 1, fps));
-      setRefreshEdit(Date.now());
+      setDurationInFrames(getFrames(((_d = convertedVmml == null ? void 0 : convertedVmml.template) == null ? void 0 : _d.duration) || 1, fps));
+    } else {
+      (_e = canvasCurrent == null ? void 0 : canvasCurrent.checkObjectInPoint) == null ? void 0 : _e.call(canvasCurrent, currentFrame);
     }
-    const currentFrame = checkFrame ?? pauseFrame;
-    playerCurrent.setVmml(convertedVmml, currentFrame);
-    (_d = canvasCurrent == null ? void 0 : canvasCurrent.checkObjectInPoint) == null ? void 0 : _d.call(canvasCurrent, currentFrame);
   };
   const getCurrentFrame = () => {
     if (!player) return 0;
@@ -2786,6 +2799,7 @@ var EditorFn = ({
   const editorSeekTo = (frame2) => {
     var _a2;
     (_a2 = player == null ? void 0 : player.seekTo) == null ? void 0 : _a2.call(player, frame2 ?? 0);
+    setFrame(frame2 ?? 0);
     const { current: canvasCurrent } = canvasRef;
     if (canvasCurrent) {
       canvasCurrent.checkObjectInPoint(frame2);