@mce/bigesj 0.16.7 → 0.17.0

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { plugin } from './plugin';
 export * from './composables';
 export * from './convert';
-export * from './editorOptions';
 export * from './loaders';
+export * from './options';
 export * from './plugin';
 export default plugin;

package/dist/index.js

@@ -1093,8 +1093,8 @@ function signedArea(data, start, end, dim) {
   }
   return sum;
 }
-function drawPoint(ctx, x, y, options = {}) {
-  const { radius = 1 } = options;
+function drawPoint(ctx, x, y, options2 = {}) {
+  const { radius = 1 } = options2;
   ctx.moveTo(x, y);
   ctx.arc(x, y, radius, 0, Math.PI * 2);
 }
@@ -2624,7 +2624,7 @@ function cubicBezierP3(t, p) {
 function cubicBezier(t, p0, p1, p2, p3) {
   return cubicBezierP0(t, p0) + cubicBezierP1(t, p1) + cubicBezierP2(t, p2) + cubicBezierP3(t, p3);
 }
-function fillTriangulate(pointArray, options = {}) {
+function fillTriangulate(pointArray, options2 = {}) {
   let {
     vertices = [],
     indices = [],
@@ -2632,7 +2632,7 @@ function fillTriangulate(pointArray, options = {}) {
     verticesStride = 2,
     verticesOffset = vertices.length / verticesStride,
     indicesOffset = indices.length
-  } = options;
+  } = options2;
   const triangles = earcut(pointArray, holes, 2);
   if (triangles.length) {
     for (let i = 0; i < triangles.length; i += 3) {
@@ -2938,7 +2938,7 @@ function quadraticBezier(t, p0, p1, p2) {
 }
 const closePointEps = 1e-4;
 const curveEps = 1e-4;
-function strokeTriangulate(points, options = {}) {
+function strokeTriangulate(points, options2 = {}) {
   const {
     vertices = [],
     indices = [],
@@ -2951,7 +2951,7 @@ function strokeTriangulate(points, options = {}) {
     },
     flipAlignment = false,
     closed = true
-  } = options;
+  } = options2;
   const eps = closePointEps;
   if (points.length === 0) {
     return { vertices, indices };
@@ -3503,16 +3503,16 @@ class Curve {
   getFillVertices(_options) {
     return this.getAdaptiveVertices();
   }
-  fillTriangulate(options) {
+  fillTriangulate(options2) {
     return fillTriangulate(
-      this.getFillVertices(options),
-      options
+      this.getFillVertices(options2),
+      options2
     );
   }
-  strokeTriangulate(options) {
+  strokeTriangulate(options2) {
     return strokeTriangulate(
       this.getAdaptiveVertices(),
-      options
+      options2
     );
   }
   toCommands() {
@@ -4043,15 +4043,15 @@ class LineCurve extends Curve {
       { type: "L", x: p2.x, y: p2.y }
     ];
   }
-  getFillVertices(options = {}) {
+  getFillVertices(options2 = {}) {
     const minX = Math.min(this.p1.x, this.p2.x);
     const maxX = Math.max(this.p1.x, this.p2.x);
     const minY = Math.min(this.p1.y, this.p2.y);
     const maxY = Math.max(this.p1.y, this.p2.y);
     const x = minX;
     const y = minY;
-    const width = maxX - minX || options.style?.strokeWidth || 0;
-    const height = maxY - minY || options.style?.strokeWidth || 0;
+    const width = maxX - minX || options2.style?.strokeWidth || 0;
+    const height = maxY - minY || options2.style?.strokeWidth || 0;
     return [
       x,
       y,
@@ -4158,16 +4158,16 @@ class CompositeCurve extends Curve {
     });
     return output;
   }
-  strokeTriangulate(options) {
+  strokeTriangulate(options2) {
     if (this.curves.length === 1) {
-      return this.curves[0].strokeTriangulate(options);
+      return this.curves[0].strokeTriangulate(options2);
     } else {
-      return super.strokeTriangulate(options);
+      return super.strokeTriangulate(options2);
     }
   }
-  getFillVertices(options) {
+  getFillVertices(options2) {
     if (this.curves.length === 1) {
-      return this.curves[0].getFillVertices(options);
+      return this.curves[0].getFillVertices(options2);
     } else {
       const output = [];
       let offset;
@@ -4176,7 +4176,7 @@ class CompositeCurve extends Curve {
         if (curve instanceof LineCurve) {
           arr = curve.getAdaptiveVertices();
         } else {
-          arr = curve.getFillVertices(options);
+          arr = curve.getFillVertices(options2);
         }
         output.push(...arr);
         if (offset) {
@@ -4585,9 +4585,9 @@ class CurvePath extends CompositeCurve {
       super.getAdaptiveVertices(output)
     );
   }
-  getFillVertices(options) {
+  getFillVertices(options2) {
     return this._closeVertices(
-      super.getFillVertices(options)
+      super.getFillVertices(options2)
     );
   }
   _setCurrentPoint(point) {
@@ -4986,12 +4986,12 @@ class Path2D extends CompositeCurve {
     });
     return { min: min.finite(), max: max.finite() };
   }
-  strokeTriangulate(options) {
-    const indices = options?.indices ?? [];
-    const vertices = options?.vertices ?? [];
+  strokeTriangulate(options2) {
+    const indices = options2?.indices ?? [];
+    const vertices = options2?.vertices ?? [];
     this.curves.forEach((curve) => {
       curve.strokeTriangulate({
-        ...options,
+        ...options2,
         indices,
         vertices,
         style: { ...this.style }
@@ -4999,12 +4999,12 @@ class Path2D extends CompositeCurve {
     });
     return { indices, vertices };
   }
-  fillTriangulate(options) {
+  fillTriangulate(options2) {
     const _options = {
-      ...options,
+      ...options2,
       style: {
         ...this.style,
-        ...options?.style
+        ...options2?.style
       }
     };
     const indices = _options.indices ?? [];
@@ -5030,7 +5030,7 @@ class Path2D extends CompositeCurve {
           }
         }
         fillTriangulate(_pointArray, {
-          ...options,
+          ...options2,
           indices,
           vertices,
           holes,
@@ -5040,7 +5040,7 @@ class Path2D extends CompositeCurve {
     } else {
       this.curves.forEach((curve) => {
         curve.fillTriangulate({
-          ...options,
+          ...options2,
           indices,
           vertices,
           style: { ...this.style }
@@ -5210,8 +5210,8 @@ ${content}
   toSvg() {
     return new DOMParser().parseFromString(this.toSvgString(), "image/svg+xml").documentElement;
   }
-  toCanvas(options = {}) {
-    const { pixelRatio = 2, ...style } = options;
+  toCanvas(options2 = {}) {
+    const { pixelRatio = 2, ...style } = options2;
     const { left, top, width, height } = this.getBoundingBox();
     const canvas = document.createElement("canvas");
     canvas.width = width * pixelRatio;
@@ -5466,22 +5466,22 @@ async function convertShapeElementToSvg(el) {
   </svg>`;
   return doc;
 }
-function resolveOptions(options) {
+function resolveOptions(options2) {
   return {
     width: 0,
     height: 0,
     strokeWidth: 0,
-    ...options,
-    variables: { ...options.variables }
+    ...options2,
+    variables: { ...options2.variables }
   };
 }
-function _createPresetShape(node, options) {
+function _createPresetShape(node, options2) {
   const shape = parsePresetShapeDefinition(node);
   return {
     ...shape,
     cate: Number(node.attr("@cate") ?? 0),
     title: node.attr("@title") ?? node.name,
-    svg: shape.generateSvgString(resolveOptions(options))
+    svg: shape.generateSvgString(resolveOptions(options2))
   };
 }
 let root;
@@ -5492,13 +5492,13 @@ async function getRoot() {
   }
   return root;
 }
-async function createPresetShape(name, options = {}) {
+async function createPresetShape(name, options2 = {}) {
   const node = (await getRoot()).find(name);
   return _createPresetShape(node, {
     width: 18,
     height: 18,
     strokeWidth: 1,
-    ...options
+    ...options2
   });
 }
 function parseCssStyleLinearGradient(linearGradient) {
@@ -5837,7 +5837,6 @@ async function convertElement(el, parent, context) {
   }
   switch (el.type) {
     case "image":
-      element.name = element.name ?? "图片";
       meta.inCanvasIs = "Element2D";
       meta.inPptIs = "Picture";
       meta.lockAspectRatio = true;
@@ -5848,7 +5847,7 @@ async function convertElement(el, parent, context) {
       if (el.clipUrl) {
         meta.rawForegroundImage = el.url;
       }
-      if (el.maskUrl) {
+      if (el.maskUrl && el.maskUrl !== el.url) {
         style.maskImage = el.maskUrl;
       }
       if (el.cropping) {
@@ -5866,7 +5865,6 @@ async function convertElement(el, parent, context) {
       }
       break;
     case "svg": {
-      element.name = element.name ?? "SVG";
       meta.inCanvasIs = "Element2D";
       meta.inPptIs = "Picture";
       meta.lockAspectRatio = true;
@@ -5877,7 +5875,6 @@ async function convertElement(el, parent, context) {
       break;
     }
     case "text": {
-      element.name = element.name ?? "文字";
       meta.inCanvasIs = "Element2D";
       meta.inPptIs = "Shape";
       if (style.writingMode === "horizontal-tb") {
@@ -5902,7 +5899,6 @@ async function convertElement(el, parent, context) {
       break;
     }
     case "com":
-      element.name = element.name ?? "组合";
       meta.inCanvasIs = "Element2D";
       meta.inPptIs = "GroupShape";
       element.children.push(
@@ -5919,7 +5915,6 @@ async function convertElement(el, parent, context) {
       );
       break;
     case "shape": {
-      element.name = element.name ?? "形状";
       meta.inCanvasIs = "Element2D";
       meta.inPptIs = "Shape";
       const svg = await convertShapeElementToSvg(el);
@@ -5952,12 +5947,10 @@ async function convertElement(el, parent, context) {
       break;
     }
     case "anim":
-      element.name = element.name ?? "Lottie";
       meta.inCanvasIs = "Lottie2D";
       element.src = el.url;
       break;
     case "video":
-      element.name = element.name ?? "视频";
       meta.inCanvasIs = "Video2D";
       element.src = el.src;
       break;
@@ -6017,11 +6010,11 @@ async function convertLayout(layout, isFrame = true, context) {
     meta
   };
 }
-async function convertDoc(doc, options = {}) {
+async function convertDoc(doc, options2 = {}) {
   const {
     gap = 0,
     included
-  } = options;
+  } = options2;
   let data;
   let raw = {};
   if (doc.content) {
@@ -6177,14 +6170,14 @@ async function convertImageElementToUrl(el) {
         effectCanvas = canvas1;
       }
       stroke?.forEach(({ width: width2, color }) => {
-        effectCanvas = new ImageStroke().use((ctx2, image, options) => {
+        effectCanvas = new ImageStroke().use((ctx2, image, options2) => {
           const [, ctx1] = createCanvas(image.width, image.height);
           ctx1.drawImage(image, 0, 0);
           const paths = getContours(ctx1);
-          const x = options.thickness;
-          const y = options.thickness;
-          ctx2.strokeStyle = options.color;
-          ctx2.lineWidth = options.thickness * 2;
+          const x = options2.thickness;
+          const y = options2.thickness;
+          ctx2.strokeStyle = options2.color;
+          ctx2.lineWidth = options2.thickness * 2;
           ctx2.lineJoin = "round";
           paths.forEach((path) => {
             ctx2.beginPath();
@@ -6239,18 +6232,18 @@ class ImageStroke {
     this.method = method;
     return this;
   }
-  make(image, options) {
+  make(image, options2) {
     const { canvas } = this;
     const ctx = this.canvas.getContext("2d");
-    const strokeSize = options.thickness * 2;
+    const strokeSize = options2.thickness * 2;
     const [resultWidth, resultHeight] = [image.width, image.height].map((val) => val + strokeSize);
     if (resultWidth !== canvas.width || resultHeight !== canvas.height) {
       canvas.width = resultWidth;
       canvas.height = resultHeight;
     }
     ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-    this.method(ctx, image, options);
-    ctx.drawImage(image, options.thickness, options.thickness);
+    this.method(ctx, image, options2);
+    ctx.drawImage(image, options2.thickness, options2.thickness);
     return canvas;
   }
 }
@@ -6378,7 +6371,7 @@ function bidTidLoader(editor, api) {
             doc.children.push(element);
           }
         });
-        left += width + config.value.frameGap;
+        left += width + config.value.canvas.frame.gap;
       });
       return doc;
     }
@@ -6402,11 +6395,11 @@ function bigeLoader() {
     }
   };
 }
-function plugin(options = {}) {
+function plugin(options2 = {}) {
   const {
     font,
     api
-  } = options;
+  } = options2;
   const _api = {
     fonts: "/new/design/fonts",
     bid: "/new/udesign/info/%d",
@@ -6477,23 +6470,37 @@ async function setupFonts(editor, api) {
     await loadBigeFonts(api.fonts, true);
   });
 }
-const editorOptions = {
-  checkerboard: true,
-  checkerboardStyle: "grid",
-  pixelGrid: true,
-  camera: true,
-  ruler: true,
-  scrollbar: true,
-  statusbar: true,
-  frameGap: 48,
-  zoomToFit: "width",
-  typographyStrategy: "autoHeight",
+const options = {
   locale: { locale: "zhHans" },
-  defaultFont: { family: "SourceHanSansCN-Normal", src: "https://bige.cdn.bcebos.com/files/202006/cBNrzOsE_rAQB.woff" },
-  transformControls: {
-    handleShape: "circle",
-    handleStrategy: "point",
-    rotator: true
+  viewport: {
+    camera: { enabled: true },
+    zoom: { strategy: "containWidth" },
+    screenPadding: { left: 110, top: 60, right: 110, bottom: 60 }
+  },
+  canvas: {
+    checkerboard: { enabled: true, style: "grid" },
+    pixelGrid: { enabled: true },
+    frame: { outline: false }
+  },
+  ui: {
+    ruler: { visible: true },
+    scrollbar: { visible: true },
+    statusbar: { visible: true }
+  },
+  interaction: {
+    transform: {
+      handleShape: "circle",
+      handleStyle: "8-points",
+      lockAspectRatioStrategy: "diagonal",
+      rotator: true
+    }
+  },
+  typography: {
+    strategy: "autoHeight",
+    defaultFont: {
+      family: "SourceHanSansCN-Normal",
+      src: "https://bige.cdn.bcebos.com/files/202006/cBNrzOsE_rAQB.woff"
+    }
   }
 };
 export {
@@ -6511,9 +6518,9 @@ export {
   convertTextStyle,
   croppingToCropRect,
   plugin as default,
-  editorOptions,
   getStyle,
   getTextContents,
+  options,
   parseAnimations,
   plugin,
   transformToCropRect,

package/dist/options.d.ts

@@ -0,0 +1,2 @@
+import type { Options } from 'mce';
+export declare const options: Options;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mce/bigesj",
   "type": "module",
-  "version": "0.16.7",
+  "version": "0.17.0",
   "description": "Plugin for mce",
   "author": "wxm",
   "license": "MIT",
@@ -49,7 +49,7 @@
     "modern-openxml": "^1.10.1"
   },
   "devDependencies": {
-    "mce": "0.16.7"
+    "mce": "0.17.0"
   },
   "peerDependencies": {
     "mce": "^0"

package/dist/editorOptions.d.ts

@@ -1 +0,0 @@
-export declare const editorOptions: Partial<Mce.Options>;