@meta2d/core 1.1.21 → 1.1.23

package/src/grid/defaultGrid.d.ts

@@ -0,0 +1,3 @@
+import { GridDrawerContext } from '../store';
+import { Point } from '../point';
+export declare function defaultGridDrawer(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, { area, align, size, color, rotate }: GridDrawerContext, mousePos: Point): boolean;

package/src/grid/defaultGrid.js

@@ -0,0 +1,73 @@
+export function defaultGridDrawer(ctx, { area, align, size, color, rotate }, mousePos) {
+    ctx.lineWidth = 1;
+    ctx.strokeStyle = color;
+    if (rotate) {
+        const radian1 = (rotate * Math.PI) / 180;
+        const radian2 = radian1 + Math.PI / 2;
+        const normal1 = { x: Math.sin(radian1), y: -Math.cos(radian1) };
+        const normal2 = { x: Math.sin(radian2), y: -Math.cos(radian2) };
+        drawPreciseLines(ctx, area, size, normal1, radian1);
+        drawPreciseLines(ctx, area, size, normal2, radian2);
+    }
+    else {
+        const m = align.x / size;
+        const n = align.y / size;
+        const offset = size * 10;
+        const newX = align.x - Math.ceil(m) * size;
+        const newY = align.y - Math.ceil(n) * size;
+        const endX = area.x + area.width + offset;
+        const endY = area.y + area.height + offset;
+        ctx.beginPath();
+        for (let i = newX; i <= endX; i += size) {
+            ctx.moveTo(i, newY);
+            ctx.lineTo(i, area.y + area.height + offset);
+        }
+        for (let i = newY; i <= endY; i += size) {
+            ctx.moveTo(newX, i);
+            ctx.lineTo(area.x + area.width + offset, i);
+        }
+        ctx.stroke();
+    }
+    return false;
+}
+function drawPreciseLines(ctx, area, spacing, normal, angle) {
+    const corners = [
+        { x: area.x, y: area.y },
+        { x: area.x + area.width, y: area.y },
+        { x: area.x + area.width, y: area.y + area.height },
+        { x: area.x, y: area.y + area.height },
+    ];
+    let minProjection = Infinity;
+    let maxProjection = -Infinity;
+    corners.forEach((corner) => {
+        const proj = corner.x * normal.x + corner.y * normal.y;
+        minProjection = Math.min(minProjection, proj);
+        maxProjection = Math.max(maxProjection, proj);
+    });
+    const lineCount = Math.ceil((maxProjection - minProjection) / spacing);
+    ctx.beginPath();
+    for (let i = 0; i <= lineCount; i++) {
+        const d = minProjection + i * spacing;
+        let points = [];
+        for (let j = 0; j < corners.length; j++) {
+            const p1 = corners[j];
+            const p2 = corners[(j + 1) % corners.length];
+            const denom = normal.x * (p2.y - p1.y) - normal.y * (p2.x - p1.x);
+            if (Math.abs(denom) > 1e-6) {
+                const t = (d - p1.x * normal.x - p1.y * normal.y) /
+                    (normal.x * (p2.x - p1.x) + normal.y * (p2.y - p1.y));
+                if (t >= 0 && t <= 1) {
+                    const x = p1.x + t * (p2.x - p1.x);
+                    const y = p1.y + t * (p2.y - p1.y);
+                    points.push({ x, y });
+                }
+            }
+        }
+        if (points.length >= 2) {
+            ctx.moveTo(points[0].x, points[0].y);
+            ctx.lineTo(points[1].x, points[1].y);
+        }
+    }
+    ctx.stroke();
+}
+//# sourceMappingURL=defaultGrid.js.map

package/src/grid/defaultGrid.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultGrid.js","sourceRoot":"","sources":["../../../../packages/core/src/grid/defaultGrid.ts"],"names":[],"mappings":"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"}

package/src/grid/dotGrid.d.ts

@@ -0,0 +1,3 @@
+import { GridDrawerContext } from '../store';
+import { Point } from '../point';
+export declare function dotGridDrawer(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, { store, area, align, size, color }: GridDrawerContext, mousePos?: Point): boolean;

package/src/grid/dotGrid.js

@@ -0,0 +1,21 @@
+export function dotGridDrawer(ctx, { store, area, align, size, color }, mousePos) {
+    const baseColor = color;
+    ctx.fillStyle = baseColor;
+    const radius = Math.max(0.5, 1.5 * store.data.scale);
+    const m = align.x / size;
+    const n = align.y / size;
+    const offset = size * 10;
+    const newX = align.x - Math.ceil(m) * size;
+    const newY = align.y - Math.ceil(n) * size;
+    const endX = area.x + area.width + offset;
+    const endY = area.y + area.height + offset;
+    for (let x = newX + radius; x <= endX - radius; x += size) {
+        for (let y = newY + radius; y <= endY - radius; y += size) {
+            ctx.beginPath();
+            ctx.arc(x, y, radius, 0, Math.PI * 2);
+            ctx.fill();
+        }
+    }
+    return true;
+}
+//# sourceMappingURL=dotGrid.js.map

package/src/grid/dotGrid.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dotGrid.js","sourceRoot":"","sources":["../../../../packages/core/src/grid/dotGrid.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,aAAa,CAC3B,GAAiE,EACjE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAqB,EACtD,QAAgB;IAEhB,MAAM,SAAS,GAAG,KAAK,CAAC;IACxB,GAAG,CAAC,SAAS,GAAG,SAAS,CAAC;IAE1B,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAErD,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC;IACzB,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC;IACzB,MAAM,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;IACzB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC3C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;IAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IAE3C,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;QAC1D,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC;YAC1D,GAAG,CAAC,SAAS,EAAE,CAAC;YAChB,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;YACtC,GAAG,CAAC,IAAI,EAAE,CAAC;QACb,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}

package/src/grid/index.d.ts

@@ -0,0 +1,2 @@
+export { defaultGridDrawer } from './defaultGrid';
+export { dotGridDrawer } from './dotGrid';

package/src/grid/index.js

@@ -0,0 +1,3 @@
+export { defaultGridDrawer } from './defaultGrid';
+export { dotGridDrawer } from './dotGrid';
+//# sourceMappingURL=index.js.map

package/src/grid/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/grid/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC"}

package/src/options.d.ts

@@ -6,6 +6,7 @@ export declare enum KeydownType {
     Document = 0,
     Canvas = 1
 }
+export declare const TRANSPARENT_COLOR = "#FFFFFF00";
 export interface Options {
     color?: string;
     activeColor?: string;
@@ -55,6 +56,9 @@ export interface Options {
     grid?: boolean;
     gridColor?: string;
     gridSize?: number;
+    gridType?: string;
+    gridScope?: 'full' | 'inner' | 'outer';
+    gridAlwaysRender?: boolean;
     rule?: boolean;
     ruleColor?: string;
     ruleOptions?: {

package/src/options.js

@@ -4,6 +4,7 @@ export var KeydownType;
     KeydownType[KeydownType["Document"] = 0] = "Document";
     KeydownType[KeydownType["Canvas"] = 1] = "Canvas";
 })(KeydownType || (KeydownType = {}));
+export const TRANSPARENT_COLOR = '#FFFFFF00';
 export const defaultOptions = {
     fontFamily: '"Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial',
     fontSize: 12,

package/src/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../packages/core/src/options.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,8CAAS,CAAA;IACT,qDAAQ,CAAA;IACR,iDAAM,CAAA;AACR,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAyID,MAAM,CAAC,MAAM,cAAc,GAAY;IACrC,UAAU,EACR,2EAA2E;IAC7E,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,GAAG;IACf,SAAS,EAAE,QAAQ;IACnB,YAAY,EAAE,QAAQ;IACtB,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,SAAS;IACtB,UAAU,EAAE,uBAAuB;IACnC,WAAW,EAAE,SAAS;IACtB,gBAAgB,EAAE,SAAS;IAC3B,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,MAAM;IACxB,SAAS,EAAE,uBAAuB;IAClC,YAAY,EAAE,SAAS;IACvB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,YAAY;IAC1B,WAAW,EAAE,WAAW;IACxB,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,SAAS;IACtB,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,WAAW,CAAC,QAAQ;IAC7B,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,OAAO;IACxB,QAAQ,EAAE,EAAE;IACZ,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,EAAE;IACnB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,KAAK;IACpB,YAAY,EAAE,SAAS;IACvB,aAAa,EAAE,SAAS;IACxB,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,CAAC;IAChB,UAAU,EAAE,EAAE;IACd,WAAW,EAAE,WAAW;IACxB,WAAW,EAAE,CAAC;IACd,cAAc,EAAE;QACd;YACE,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC;SACL;QACD;YACE,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;SACP;QACD;YACE,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC;SACL;QACD;YACE,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;SACP;KACF;IACD,gBAAgB,EAAE,IAAI;IACtB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,IAAI;IACtB,gBAAgB,EAAE,KAAK;IACvB,iBAAiB,EAAE,CAAC;IACpB,oBAAoB,EAAE,KAAK;IAC3B,WAAW,EAAE,IAAI;IACjB,GAAG,EAAE,EAAE;IACP,aAAa,EAAE,EAAE;IACjB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,EAAE;IACb,eAAe,EAAC,CAAC,WAAW,CAAC;IAC7B,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAC,IAAI;IAClB,aAAa,EAAC,EAAE;CACjB,CAAC"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../packages/core/src/options.ts"],"names":[],"mappings":"AAIA,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,8CAAS,CAAA;IACT,qDAAQ,CAAA;IACR,iDAAM,CAAA;AACR,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAAA;AA4I5C,MAAM,CAAC,MAAM,cAAc,GAAY;IACrC,UAAU,EACR,2EAA2E;IAC7E,QAAQ,EAAE,EAAE;IACZ,UAAU,EAAE,GAAG;IACf,SAAS,EAAE,QAAQ;IACnB,YAAY,EAAE,QAAQ;IACtB,KAAK,EAAE,SAAS;IAChB,WAAW,EAAE,SAAS;IACtB,UAAU,EAAE,uBAAuB;IACnC,WAAW,EAAE,SAAS;IACtB,gBAAgB,EAAE,SAAS;IAC3B,YAAY,EAAE,CAAC;IACf,gBAAgB,EAAE,MAAM;IACxB,SAAS,EAAE,uBAAuB;IAClC,YAAY,EAAE,SAAS;IACvB,SAAS,EAAE,SAAS;IACpB,YAAY,EAAE,YAAY;IAC1B,WAAW,EAAE,WAAW;IACxB,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,SAAS;IACtB,QAAQ,EAAE,GAAG;IACb,QAAQ,EAAE,EAAE;IACZ,OAAO,EAAE,WAAW,CAAC,QAAQ;IAC7B,QAAQ,EAAE,EAAE;IACZ,SAAS,EAAE,SAAS;IACpB,SAAS,EAAE,SAAS;IACpB,eAAe,EAAE,OAAO;IACxB,QAAQ,EAAE,EAAE;IACZ,YAAY,EAAE,EAAE;IAChB,OAAO,EAAE,IAAI;IACb,eAAe,EAAE,EAAE;IACnB,YAAY,EAAE,IAAI;IAClB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,KAAK;IACpB,YAAY,EAAE,SAAS;IACvB,aAAa,EAAE,SAAS;IACxB,aAAa,EAAE,CAAC;IAChB,aAAa,EAAE,CAAC;IAChB,UAAU,EAAE,EAAE;IACd,WAAW,EAAE,WAAW;IACxB,WAAW,EAAE,CAAC;IACd,cAAc,EAAE;QACd;YACE,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC;SACL;QACD;YACE,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;SACP;QACD;YACE,CAAC,EAAE,GAAG;YACN,CAAC,EAAE,CAAC;SACL;QACD;YACE,CAAC,EAAE,CAAC;YACJ,CAAC,EAAE,GAAG;SACP;KACF;IACD,gBAAgB,EAAE,IAAI;IACtB,iBAAiB,EAAE,IAAI;IACvB,gBAAgB,EAAE,IAAI;IACtB,gBAAgB,EAAE,KAAK;IACvB,iBAAiB,EAAE,CAAC;IACpB,oBAAoB,EAAE,KAAK;IAC3B,WAAW,EAAE,IAAI;IACjB,GAAG,EAAE,EAAE;IACP,aAAa,EAAE,EAAE;IACjB,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,EAAE;IACb,eAAe,EAAC,CAAC,WAAW,CAAC;IAC7B,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,eAAe,EAAE,EAAE;IACnB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAC,IAAI;IAClB,aAAa,EAAC,EAAE;CACjB,CAAC"}

package/src/pen/render.js

@@ -10,6 +10,7 @@ import { renderFromArrow, renderToArrow } from './arrow';
 import { Gradient, PenType } from '../pen';
 import { pSBC, rgba, cubicBezierY } from '../utils';
 import { isEmptyText } from '../utils/tool';
+import { TRANSPARENT_COLOR } from "../options";
 const LINE = "line";
 const REPEAT = "repeat";
 /**
@@ -1837,32 +1838,27 @@ export function ctxDrawLinePath(canUsePath = true, ctx, pen, store) {
                 setCtxLineAnimate(ctx, pen, store);
                 ctx.beginPath();
                 if (path instanceof Path2D) {
-                    if (pen.lineName === 'polyline' || pen.lineName === 'line') {
-                        if (pen.lineAnimateType === LineAnimateType.Arrow ||
-                            pen.lineAnimateType === LineAnimateType.WaterDrop) {
-                            //箭头动画
-                            const _path = drawArrow(pen);
-                            ctx.stroke(_path);
-                            ctx.fill(_path);
-                        }
-                        else {
-                            if (pen.calculative.gradientSmooth ||
-                                pen.calculative.lineSmooth) {
-                                if (!pen.calculative.gradientAnimatePath) {
-                                    pen.calculative.gradientAnimatePath =
-                                        getGradientAnimatePath(pen);
-                                }
-                                if (pen.calculative.gradientAnimatePath instanceof Path2D) {
-                                    ctx.stroke(pen.calculative.gradientAnimatePath);
-                                }
+                    if (pen.lineAnimateType === LineAnimateType.Arrow ||
+                        pen.lineAnimateType === LineAnimateType.WaterDrop) {
+                        //箭头动画
+                        const _path = drawArrow(pen);
+                        ctx.stroke(_path);
+                        ctx.fill(_path);
+                    }
+                    else {
+                        if (pen.calculative.gradientSmooth ||
+                            pen.calculative.lineSmooth) {
+                            if (!pen.calculative.gradientAnimatePath) {
+                                pen.calculative.gradientAnimatePath =
+                                    getGradientAnimatePath(pen);
                             }
-                            else {
-                                ctx.stroke(path);
+                            if (pen.calculative.gradientAnimatePath instanceof Path2D) {
+                                ctx.stroke(pen.calculative.gradientAnimatePath);
                             }
                         }
-                    }
-                    else {
-                        ctx.stroke(path);
+                        else {
+                            ctx.stroke(path);
+                        }
                     }
                 }
                 else {
@@ -1888,7 +1884,9 @@ export function ctxDrawLinePath(canUsePath = true, ctx, pen, store) {
  * 设置线条动画，ctx 的 strokeStyle lineDash 等属性更改
  */
 export function setCtxLineAnimate(ctx, pen, store) {
-    ctx.strokeStyle = pen.animateColor || store.styles.animateColor;
+    ctx.strokeStyle = pen.lineAnimateType === LineAnimateType.Custom ?
+        pen.animateColor || TRANSPARENT_COLOR
+        : (pen.animateColor || store.styles.animateColor);
     if (pen.animateShadow) {
         ctx.shadowBlur = pen.animateShadowBlur || pen.animateLineWidth || 6;
         ctx.shadowColor =
@@ -2060,7 +2058,7 @@ function lineAnimatePenRender(tracks) {
             height: viewHeight,
             rotate: state.rotate,
         };
-        meta2d.setValue({ id: targetPen.id, ...data });
+        meta2d.setValue({ id: targetPen.id, ...data }, { render: false, doEvent: false, history: false });
     };
 }
 function lineAnimateIconRender(icon) {