@visactor/vrender-core 0.20.0-alpha.0 → 0.20.0-alpha.2

package/cjs/common/segment/catmull-rom-close.js

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.genCatmullRomClosedSegments = exports.CatmullRomClosed = void 0;
+
+const catmull_rom_1 = require("./catmull-rom");
+
+class CatmullRomClosed {
+    constructor(context, alpha = .5, startPoint) {
+        this.context = context, this.startPoint = startPoint, this._alpha = alpha;
+    }
+    areaStart() {
+        this._line = 0;
+    }
+    areaEnd() {
+        this._line = NaN;
+    }
+    lineStart() {
+        this._x0 = this._x1 = this._x2 = this._x3 = this._x4 = this._x5 = this._y0 = this._y1 = this._y2 = this._y3 = this._y4 = this._y5 = NaN, 
+        this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;
+    }
+    lineEnd() {
+        switch (this._point) {
+          case 1:
+            this.context.moveTo(this._x3, this._y3, this.lastPoint1), this.context.closePath();
+            break;
+
+          case 2:
+            this.context.lineTo(this._x3, this._y3, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1), 
+            this.context.closePath();
+            break;
+
+          case 3:
+            this.point({
+                x: this._x3,
+                y: this._y3
+            }), this.point({
+                x: this._x4,
+                y: this._y4
+            }), this.point({
+                x: this._x5,
+                y: this._y5
+            });
+        }
+    }
+    point(p) {
+        const {x: x, y: y} = p;
+        if (this._point) {
+            const x23 = this._x2 - x, y23 = this._y2 - y;
+            this._l23_a = Math.sqrt(this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha));
+        }
+        switch (this._point) {
+          case 0:
+            this._point = 1, this._x3 = x, this._y3 = y;
+            break;
+
+          case 1:
+            this._point = 2, this.context.moveTo(this._x4 = x, this._y4 = y, p);
+            break;
+
+          case 2:
+            this._point = 3, this._x5 = x, this._y5 = y;
+            break;
+
+          default:
+            (0, catmull_rom_1.point)(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, p);
+        }
+        this._l01_a = this._l12_a, this._l12_a = this._l23_a, this._l01_2a = this._l12_2a, 
+        this._l12_2a = this._l23_2a, this._x0 = this._x1, this._x1 = this._x2, this._x2 = x, 
+        this._y0 = this._y1, this._y1 = this._y2, this._y2 = y, this._lastDefined1 = this._lastDefined2, 
+        this._lastDefined2 = p.defined, this.lastPoint0 = this.lastPoint1, this.lastPoint1 = p;
+    }
+    tryUpdateLength() {
+        return this.context.tryUpdateLength();
+    }
+}
+
+exports.CatmullRomClosed = CatmullRomClosed, exports.genCatmullRomClosedSegments = (0, 
+catmull_rom_1.commonGenCatmullRomSegments)("catmullRomClosed", CatmullRomClosed);
+//# sourceMappingURL=catmull-rom-close.js.map

package/cjs/common/segment/catmull-rom-close.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/common/segment/catmull-rom-close.ts"],"names":[],"mappings":"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","file":"catmull-rom-close.js","sourcesContent":["import { epsilon, type IPointLike } from '@visactor/vutils';\nimport { genLinearSegments } from './linear';\nimport { genCurveSegments, genSegContext } from './common';\nimport type { ICurvedSegment, IGenSegmentParams, ILinearSegment, ISegPath2D } from '../../interface/curve';\nimport { commonGenCatmullRomSegments, point } from './catmull-rom';\n\nexport class CatmullRomClosed implements ICurvedSegment {\n  private _lastDefined1?: boolean;\n  private _lastDefined2?: boolean;\n  declare context: ISegPath2D;\n\n  protected startPoint?: IPointLike;\n  lastPoint0?: IPointLike;\n  lastPoint1?: IPointLike;\n\n  constructor(context: ISegPath2D, alpha: number = 0.5, startPoint?: IPointLike) {\n    this.context = context;\n    this.startPoint = startPoint;\n    this._alpha = alpha;\n  }\n  _alpha: number;\n  _x: number;\n  _y: number;\n  _x0: number;\n  _x1: number;\n  _y0: number;\n  _y1: number;\n  _x2: number;\n  _y2: number;\n  _x3: number;\n  _y3: number;\n  _x4: number;\n  _y4: number;\n  _x5: number;\n  _y5: number;\n  _line: number;\n  _point: number;\n  _l01_a: number;\n  _l12_a: number;\n  _l23_a: number;\n  _l01_2a: number;\n  _l12_2a: number;\n  _l23_2a: number;\n\n  areaStart() {\n    this._line = 0;\n  }\n  areaEnd() {\n    this._line = NaN;\n  }\n  lineStart() {\n    this._x0 =\n      this._x1 =\n      this._x2 =\n      this._x3 =\n      this._x4 =\n      this._x5 =\n      this._y0 =\n      this._y1 =\n      this._y2 =\n      this._y3 =\n      this._y4 =\n      this._y5 =\n        NaN;\n    this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;\n  }\n  lineEnd() {\n    switch (this._point) {\n      case 1: {\n        this.context.moveTo(this._x3, this._y3, this.lastPoint1);\n        this.context.closePath();\n        break;\n      }\n      case 2: {\n        this.context.lineTo(\n          this._x3,\n          this._y3,\n          this._lastDefined1 !== false && this._lastDefined2 !== false,\n          this.lastPoint1\n        );\n        this.context.closePath();\n        break;\n      }\n      case 3: {\n        this.point({ x: this._x3, y: this._y3 });\n        this.point({ x: this._x4, y: this._y4 });\n        this.point({ x: this._x5, y: this._y5 });\n        break;\n      }\n    }\n  }\n  point(p: IPointLike): void {\n    const { x, y } = p;\n\n    if (this._point) {\n      const x23 = this._x2 - x;\n      const y23 = this._y2 - y;\n      this._l23_a = Math.sqrt((this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha)));\n    }\n\n    switch (this._point) {\n      case 0:\n        this._point = 1;\n        (this._x3 = x), (this._y3 = y);\n        break;\n      case 1:\n        this._point = 2;\n        this.context.moveTo((this._x4 = x), (this._y4 = y), p);\n        break;\n      case 2:\n        this._point = 3;\n        (this._x5 = x), (this._y5 = y);\n        break;\n      default:\n        point(this as any, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false, p);\n        break;\n    }\n\n    (this._l01_a = this._l12_a), (this._l12_a = this._l23_a);\n    (this._l01_2a = this._l12_2a), (this._l12_2a = this._l23_2a);\n    (this._x0 = this._x1), (this._x1 = this._x2), (this._x2 = x);\n    (this._y0 = this._y1), (this._y1 = this._y2), (this._y2 = y);\n\n    this._lastDefined1 = this._lastDefined2;\n    this._lastDefined2 = p.defined;\n    this.lastPoint0 = this.lastPoint1;\n    this.lastPoint1 = p;\n  }\n\n  tryUpdateLength(): number {\n    return this.context.tryUpdateLength();\n  }\n}\n\n// export function genCatmullRomClosedTypeSegments(path: ILinearSegment, points: IPointLike[]): void {\n//   return genCurveSegments(path, points, 2);\n// }\n\nexport const genCatmullRomClosedSegments = commonGenCatmullRomSegments('catmullRomClosed', CatmullRomClosed);\n\n// export function genCatmullRomClosedSegments(\n//   points: IPointLike[],\n//   alpha: number,\n//   params: IGenSegmentParams = {}\n// ): ISegPath2D | null {\n//   const { direction, startPoint } = params;\n//   if (points.length < 2 - Number(!!startPoint)) {\n//     return null;\n//   }\n//   if (points.length < 3 - Number(!!startPoint)) {\n//     return genLinearSegments(points, params);\n//   }\n\n//   const segContext = genSegContext('catmullRom', direction, points);\n\n//   const gatmullRom = new CatmullRomClosed(segContext, alpha, startPoint);\n\n//   genCatmullRomClosedTypeSegments(gatmullRom, points);\n\n//   return segContext;\n// }\n"]}

package/cjs/common/segment/catmull-rom.d.ts

@@ -0,0 +1,38 @@
+import { type IPointLike } from '@visactor/vutils';
+import type { ICurvedSegment, IGenSegmentParams, ISegPath2D } from '../../interface/curve';
+import type { ICurveType } from '../../interface';
+export declare function point(curveClass: CatmullRom, x: number, y: number, defined: boolean, p: IPointLike): void;
+export declare class CatmullRom implements ICurvedSegment {
+    private _lastDefined1?;
+    private _lastDefined2?;
+    context: ISegPath2D;
+    protected startPoint?: IPointLike;
+    lastPoint0?: IPointLike;
+    lastPoint1?: IPointLike;
+    constructor(context: ISegPath2D, alpha?: number, startPoint?: IPointLike);
+    _alpha: number;
+    _x: number;
+    _y: number;
+    _x0: number;
+    _x1: number;
+    _y0: number;
+    _y1: number;
+    _x2: number;
+    _y2: number;
+    _line: number;
+    _point: number;
+    _l01_a: number;
+    _l12_a: number;
+    _l23_a: number;
+    _l01_2a: number;
+    _l12_2a: number;
+    _l23_2a: number;
+    areaStart(): void;
+    areaEnd(): void;
+    lineStart(): void;
+    lineEnd(): void;
+    point(p: IPointLike): void;
+    tryUpdateLength(): number;
+}
+export declare function commonGenCatmullRomSegments(type: ICurveType, cons: any): (points: IPointLike[], alpha: number, params?: IGenSegmentParams) => ISegPath2D | null;
+export declare const genCatmullRomSegments: (points: IPointLike[], alpha: number, params?: IGenSegmentParams) => ISegPath2D | null;

package/cjs/common/segment/catmull-rom.js

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.genCatmullRomSegments = exports.commonGenCatmullRomSegments = exports.CatmullRom = exports.point = void 0;
+
+const vutils_1 = require("@visactor/vutils"), linear_1 = require("./linear"), common_1 = require("./common");
+
+function point(curveClass, x, y, defined, p) {
+    let x1 = curveClass._x1, y1 = curveClass._y1, x2 = curveClass._x2, y2 = curveClass._y2;
+    if (curveClass._l01_a > vutils_1.epsilon) {
+        const a = 2 * curveClass._l01_2a + 3 * curveClass._l01_a * curveClass._l12_a + curveClass._l12_2a, n = 3 * curveClass._l01_a * (curveClass._l01_a + curveClass._l12_a);
+        x1 = (x1 * a - curveClass._x0 * curveClass._l12_2a + curveClass._x2 * curveClass._l01_2a) / n, 
+        y1 = (y1 * a - curveClass._y0 * curveClass._l12_2a + curveClass._y2 * curveClass._l01_2a) / n;
+    }
+    if (curveClass._l23_a > vutils_1.epsilon) {
+        const b = 2 * curveClass._l23_2a + 3 * curveClass._l23_a * curveClass._l12_a + curveClass._l12_2a, m = 3 * curveClass._l23_a * (curveClass._l23_a + curveClass._l12_a);
+        x2 = (x2 * b + curveClass._x1 * curveClass._l23_2a - x * curveClass._l12_2a) / m, 
+        y2 = (y2 * b + curveClass._y1 * curveClass._l23_2a - y * curveClass._l12_2a) / m;
+    }
+    curveClass.context.bezierCurveTo(x1, y1, x2, y2, curveClass._x2, curveClass._y2, defined, curveClass.lastPoint1);
+}
+
+exports.point = point;
+
+class CatmullRom {
+    constructor(context, alpha = .5, startPoint) {
+        this.context = context, this.startPoint = startPoint, this._alpha = alpha;
+    }
+    areaStart() {
+        this._line = 0;
+    }
+    areaEnd() {
+        this._line = NaN;
+    }
+    lineStart() {
+        this._x0 = this._x1 = this._x2 = this._y0 = this._y1 = this._y2 = NaN, this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;
+    }
+    lineEnd() {
+        switch (this._point) {
+          case 2:
+            this.context.lineTo(this._x2, this._y2, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1);
+            break;
+
+          case 3:
+            this.point({
+                x: this._x2,
+                y: this._y2
+            });
+        }
+        (this._line || 0 !== this._line && 1 === this._point) && this.context.closePath(), 
+        this._line = 1 - this._line;
+    }
+    point(p) {
+        const {x: x, y: y} = p;
+        if (this._point) {
+            const x23 = this._x2 - x, y23 = this._y2 - y;
+            this._l23_a = Math.sqrt(this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha));
+        }
+        switch (this._point) {
+          case 0:
+            this._point = 1, this._line ? this.context.lineTo(x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2) : this.context.moveTo(x, y);
+            break;
+
+          case 1:
+            this._point = 2;
+            break;
+
+          case 2:
+            this._point = 3;
+
+          default:
+            point(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, p);
+        }
+        this._l01_a = this._l12_a, this._l12_a = this._l23_a, this._l01_2a = this._l12_2a, 
+        this._l12_2a = this._l23_2a, this._x0 = this._x1, this._x1 = this._x2, this._x2 = x, 
+        this._y0 = this._y1, this._y1 = this._y2, this._y2 = y, this._lastDefined1 = this._lastDefined2, 
+        this._lastDefined2 = p.defined, this.lastPoint0 = this.lastPoint1, this.lastPoint1 = p;
+    }
+    tryUpdateLength() {
+        return this.context.tryUpdateLength();
+    }
+}
+
+function commonGenCatmullRomSegments(type, cons) {
+    return function(points, alpha, params = {}) {
+        const {direction: direction, startPoint: startPoint} = params;
+        if (points.length < 2 - Number(!!startPoint)) return null;
+        if (points.length < 3 - Number(!!startPoint)) return (0, linear_1.genLinearSegments)(points, params);
+        const segContext = (0, common_1.genSegContext)(type, direction, points), gatmullRom = new cons(segContext, alpha, startPoint);
+        return (0, common_1.genCurveSegments)(gatmullRom, points, 2), segContext;
+    };
+}
+
+exports.CatmullRom = CatmullRom, exports.commonGenCatmullRomSegments = commonGenCatmullRomSegments, 
+exports.genCatmullRomSegments = commonGenCatmullRomSegments("catmullRom", CatmullRom);
+//# sourceMappingURL=catmull-rom.js.map

package/cjs/common/segment/catmull-rom.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/common/segment/catmull-rom.ts"],"names":[],"mappings":"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","file":"catmull-rom.js","sourcesContent":["import { epsilon, type IPointLike } from '@visactor/vutils';\nimport { genLinearSegments } from './linear';\nimport { genCurveSegments, genSegContext } from './common';\nimport type { ICurvedSegment, IGenSegmentParams, ILinearSegment, ISegPath2D } from '../../interface/curve';\nimport type { ICurveType } from '../../interface';\n\n/**\n * 部分源码参考 https://github.com/d3/d3-shape/\n * Copyright 2010-2022 Mike Bostock\n\n  Permission to use, copy, modify, and/or distribute this software for any purpose\n  with or without fee is hereby granted, provided that the above copyright notice\n  and this permission notice appear in all copies.\n\n  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\n  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND\n  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\n  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS\n  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER\n  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF\n  THIS SOFTWARE.\n */\n\n// 基于d3-shape重构\n// https://github.com/d3/d3-shape/blob/main/src/curve/basis.js\nexport function point(curveClass: CatmullRom, x: number, y: number, defined: boolean, p: IPointLike) {\n  let x1 = curveClass._x1;\n  let y1 = curveClass._y1;\n  let x2 = curveClass._x2;\n  let y2 = curveClass._y2;\n\n  if (curveClass._l01_a > epsilon) {\n    const a = 2 * curveClass._l01_2a + 3 * curveClass._l01_a * curveClass._l12_a + curveClass._l12_2a;\n    const n = 3 * curveClass._l01_a * (curveClass._l01_a + curveClass._l12_a);\n    x1 = (x1 * a - curveClass._x0 * curveClass._l12_2a + curveClass._x2 * curveClass._l01_2a) / n;\n    y1 = (y1 * a - curveClass._y0 * curveClass._l12_2a + curveClass._y2 * curveClass._l01_2a) / n;\n  }\n\n  if (curveClass._l23_a > epsilon) {\n    const b = 2 * curveClass._l23_2a + 3 * curveClass._l23_a * curveClass._l12_a + curveClass._l12_2a;\n    const m = 3 * curveClass._l23_a * (curveClass._l23_a + curveClass._l12_a);\n    x2 = (x2 * b + curveClass._x1 * curveClass._l23_2a - x * curveClass._l12_2a) / m;\n    y2 = (y2 * b + curveClass._y1 * curveClass._l23_2a - y * curveClass._l12_2a) / m;\n  }\n\n  curveClass.context.bezierCurveTo(x1, y1, x2, y2, curveClass._x2, curveClass._y2, defined, curveClass.lastPoint1);\n}\n\nexport class CatmullRom implements ICurvedSegment {\n  private _lastDefined1?: boolean;\n  private _lastDefined2?: boolean;\n  declare context: ISegPath2D;\n\n  protected startPoint?: IPointLike;\n  lastPoint0?: IPointLike;\n  lastPoint1?: IPointLike;\n\n  constructor(context: ISegPath2D, alpha: number = 0.5, startPoint?: IPointLike) {\n    this.context = context;\n    this.startPoint = startPoint;\n    this._alpha = alpha;\n  }\n  _alpha: number;\n  _x: number;\n  _y: number;\n  _x0: number;\n  _x1: number;\n  _y0: number;\n  _y1: number;\n  _x2: number;\n  _y2: number;\n  _line: number;\n  _point: number;\n  _l01_a: number;\n  _l12_a: number;\n  _l23_a: number;\n  _l01_2a: number;\n  _l12_2a: number;\n  _l23_2a: number;\n\n  areaStart() {\n    this._line = 0;\n  }\n  areaEnd() {\n    this._line = NaN;\n  }\n  lineStart() {\n    this._x0 = this._x1 = this._x2 = this._y0 = this._y1 = this._y2 = NaN;\n    this._l01_a = this._l12_a = this._l23_a = this._l01_2a = this._l12_2a = this._l23_2a = this._point = 0;\n  }\n  lineEnd() {\n    switch (this._point) {\n      case 2:\n        this.context.lineTo(\n          this._x2,\n          this._y2,\n          this._lastDefined1 !== false && this._lastDefined2 !== false,\n          this.lastPoint1\n        );\n        break;\n      case 3:\n        this.point({ x: this._x2, y: this._y2 });\n        break;\n    }\n    if (this._line || (this._line !== 0 && this._point === 1)) {\n      this.context.closePath();\n    }\n    this._line = 1 - this._line;\n  }\n  point(p: IPointLike): void {\n    const { x, y } = p;\n\n    if (this._point) {\n      const x23 = this._x2 - x;\n      const y23 = this._y2 - y;\n      this._l23_a = Math.sqrt((this._l23_2a = Math.pow(x23 * x23 + y23 * y23, this._alpha)));\n    }\n\n    switch (this._point) {\n      case 0:\n        this._point = 1;\n        this._line\n          ? this.context.lineTo(x, y, this._lastDefined1 !== false && this._lastDefined2 !== false)\n          : this.context.moveTo(x, y);\n        break;\n      case 1:\n        this._point = 2;\n        break;\n      case 2:\n        this._point = 3; // falls through\n      default:\n        point(this, x, y, this._lastDefined1 !== false && this._lastDefined2 !== false, p);\n        break;\n    }\n\n    (this._l01_a = this._l12_a), (this._l12_a = this._l23_a);\n    (this._l01_2a = this._l12_2a), (this._l12_2a = this._l23_2a);\n    (this._x0 = this._x1), (this._x1 = this._x2), (this._x2 = x);\n    (this._y0 = this._y1), (this._y1 = this._y2), (this._y2 = y);\n\n    this._lastDefined1 = this._lastDefined2;\n    this._lastDefined2 = p.defined;\n    this.lastPoint0 = this.lastPoint1;\n    this.lastPoint1 = p;\n  }\n\n  tryUpdateLength(): number {\n    return this.context.tryUpdateLength();\n  }\n}\n\n// export function genCatmullRomTypeSegments(path: ILinearSegment, points: IPointLike[]): void {\n//   return genCurveSegments(path, points, 2);\n// }\n\nexport function commonGenCatmullRomSegments(type: ICurveType, cons: any) {\n  return function genCatmullRomSegments(\n    points: IPointLike[],\n    alpha: number,\n    params: IGenSegmentParams = {}\n  ): ISegPath2D | null {\n    const { direction, startPoint } = params;\n    if (points.length < 2 - Number(!!startPoint)) {\n      return null;\n    }\n    if (points.length < 3 - Number(!!startPoint)) {\n      return genLinearSegments(points, params);\n    }\n\n    const segContext = genSegContext(type, direction, points);\n\n    const gatmullRom = new cons(segContext, alpha, startPoint);\n\n    genCurveSegments(gatmullRom, points, 2);\n    // genCatmullRomTypeSegments(gatmullRom, points);\n\n    return segContext;\n  };\n}\n\nexport const genCatmullRomSegments = commonGenCatmullRomSegments('catmullRom', CatmullRom);\n\n// export function genCatmullRomSegments(\n//   points: IPointLike[],\n//   alpha: number,\n//   params: IGenSegmentParams = {}\n// ): ISegPath2D | null {\n//   const { direction, startPoint } = params;\n//   if (points.length < 2 - Number(!!startPoint)) {\n//     return null;\n//   }\n//   if (points.length < 3 - Number(!!startPoint)) {\n//     return genLinearSegments(points, params);\n//   }\n\n//   const segContext = genSegContext('catmullRom', direction, points);\n\n//   const gatmullRom = new CatmullRom(segContext, alpha, startPoint);\n\n//   genCatmullRomTypeSegments(gatmullRom, points);\n\n//   return segContext;\n// }\n"]}

package/cjs/common/segment/index.d.ts

@@ -1,9 +1,12 @@
 import type { IPointLike } from '@visactor/vutils';
-import type { ICurveType, IGenSegmentParams, ISegPath2D } from '../../interface';
+import type { ICurveType, ISegPath2D } from '../../interface';
 export * from './linear';
 export * from './linear-closed';
 export * from './basis';
 export * from './monotone';
 export * from './step';
 export * from './curve/curve-context';
-export declare function calcLineCache(points: IPointLike[], curveType: ICurveType, params?: IGenSegmentParams): ISegPath2D | null;
+export declare function calcLineCache(points: IPointLike[], curveType: ICurveType, params?: {
+    startPoint?: IPointLike;
+    curveTension?: number;
+}): ISegPath2D | null;

package/cjs/common/segment/index.js

@@ -19,9 +19,10 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.calcLineCache = void 0;
 
-const linear_1 = require("./linear"), basis_1 = require("./basis"), monotone_1 = require("./monotone"), step_1 = require("./step"), linear_closed_1 = require("./linear-closed");
+const linear_1 = require("./linear"), basis_1 = require("./basis"), monotone_1 = require("./monotone"), step_1 = require("./step"), linear_closed_1 = require("./linear-closed"), catmull_rom_1 = require("./catmull-rom"), catmull_rom_close_1 = require("./catmull-rom-close");
 
 function calcLineCache(points, curveType, params) {
+    var _a, _b;
     switch (curveType) {
       case "linear":
       default:
@@ -45,6 +46,12 @@ function calcLineCache(points, curveType, params) {
       case "stepAfter":
         return (0, step_1.genStepSegments)(points, 1, params);
 
+      case "catmullRom":
+        return (0, catmull_rom_1.genCatmullRomSegments)(points, null !== (_a = null == params ? void 0 : params.curveTension) && void 0 !== _a ? _a : .5, params);
+
+      case "catmullRomClosed":
+        return (0, catmull_rom_close_1.genCatmullRomClosedSegments)(points, null !== (_b = null == params ? void 0 : params.curveTension) && void 0 !== _b ? _b : .5, params);
+
       case "linearClosed":
         return (0, linear_closed_1.genLinearClosedSegments)(points, params);
     }

package/cjs/common/segment/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/segment/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAC7C,mCAA2C;AAC3C,yCAAwE;AACxE,iCAAyC;AACzC,mDAA0D;AAE1D,2CAAyB;AACzB,kDAAgC;AAChC,0CAAwB;AACxB,6CAA2B;AAC3B,yCAAuB;AACvB,wDAAsC;AAEtC,SAAgB,aAAa,CAC3B,MAAoB,EACpB,SAAqB,EACrB,MAA0B;IAE1B,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,IAAA,0BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,KAAK,OAAO;YACV,OAAO,IAAA,wBAAgB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1C,KAAK,WAAW;YACd,OAAO,IAAA,+BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,WAAW;YACd,OAAO,IAAA,+BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,MAAM;YACT,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,YAAY;YACf,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,WAAW;YACd,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,cAAc;YACjB,OAAO,IAAA,uCAAuB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjD;YACE,OAAO,IAAA,0BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC5C;AACH,CAAC;AAzBD,sCAyBC","file":"index.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { ICurveType, IGenSegmentParams, ISegPath2D } from '../../interface';\nimport { genLinearSegments } from './linear';\nimport { genBasisSegments } from './basis';\nimport { genMonotoneXSegments, genMonotoneYSegments } from './monotone';\nimport { genStepSegments } from './step';\nimport { genLinearClosedSegments } from './linear-closed';\n\nexport * from './linear';\nexport * from './linear-closed';\nexport * from './basis';\nexport * from './monotone';\nexport * from './step';\nexport * from './curve/curve-context';\n\nexport function calcLineCache(\n  points: IPointLike[],\n  curveType: ICurveType,\n  params?: IGenSegmentParams\n): ISegPath2D | null {\n  switch (curveType) {\n    case 'linear':\n      return genLinearSegments(points, params);\n    case 'basis':\n      return genBasisSegments(points, params);\n    case 'monotoneX':\n      return genMonotoneXSegments(points, params);\n    case 'monotoneY':\n      return genMonotoneYSegments(points, params);\n    case 'step':\n      return genStepSegments(points, 0.5, params);\n    case 'stepBefore':\n      return genStepSegments(points, 0, params);\n    case 'stepAfter':\n      return genStepSegments(points, 1, params);\n    case 'linearClosed':\n      return genLinearClosedSegments(points, params);\n    default:\n      return genLinearSegments(points, params);\n  }\n}\n"]}
+{"version":3,"sources":["../src/common/segment/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,qCAA6C;AAC7C,mCAA2C;AAC3C,yCAAwE;AACxE,iCAAyC;AACzC,mDAA0D;AAC1D,+CAAsD;AACtD,2DAAkE;AAElE,2CAAyB;AACzB,kDAAgC;AAChC,0CAAwB;AACxB,6CAA2B;AAC3B,yCAAuB;AACvB,wDAAsC;AAEtC,SAAgB,aAAa,CAC3B,MAAoB,EACpB,SAAqB,EACrB,MAA2D;;IAE3D,QAAQ,SAAS,EAAE;QACjB,KAAK,QAAQ;YACX,OAAO,IAAA,0BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC3C,KAAK,OAAO;YACV,OAAO,IAAA,wBAAgB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC1C,KAAK,WAAW;YACd,OAAO,IAAA,+BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,WAAW;YACd,OAAO,IAAA,+BAAoB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,MAAM;YACT,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QAC9C,KAAK,YAAY;YACf,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,WAAW;YACd,OAAO,IAAA,sBAAe,EAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC5C,KAAK,YAAY;YACf,OAAO,IAAA,mCAAqB,EAAC,MAAM,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,mCAAI,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5E,KAAK,kBAAkB;YACrB,OAAO,IAAA,+CAA2B,EAAC,MAAM,EAAE,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,mCAAI,GAAG,EAAE,MAAM,CAAC,CAAC;QAClF,KAAK,cAAc;YACjB,OAAO,IAAA,uCAAuB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjD;YACE,OAAO,IAAA,0BAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KAC5C;AACH,CAAC;AA7BD,sCA6BC","file":"index.js","sourcesContent":["import type { IPointLike } from '@visactor/vutils';\nimport type { ICurveType, IGenSegmentParams, ISegPath2D } from '../../interface';\nimport { genLinearSegments } from './linear';\nimport { genBasisSegments } from './basis';\nimport { genMonotoneXSegments, genMonotoneYSegments } from './monotone';\nimport { genStepSegments } from './step';\nimport { genLinearClosedSegments } from './linear-closed';\nimport { genCatmullRomSegments } from './catmull-rom';\nimport { genCatmullRomClosedSegments } from './catmull-rom-close';\n\nexport * from './linear';\nexport * from './linear-closed';\nexport * from './basis';\nexport * from './monotone';\nexport * from './step';\nexport * from './curve/curve-context';\n\nexport function calcLineCache(\n  points: IPointLike[],\n  curveType: ICurveType,\n  params?: { startPoint?: IPointLike; curveTension?: number }\n): ISegPath2D | null {\n  switch (curveType) {\n    case 'linear':\n      return genLinearSegments(points, params);\n    case 'basis':\n      return genBasisSegments(points, params);\n    case 'monotoneX':\n      return genMonotoneXSegments(points, params);\n    case 'monotoneY':\n      return genMonotoneYSegments(points, params);\n    case 'step':\n      return genStepSegments(points, 0.5, params);\n    case 'stepBefore':\n      return genStepSegments(points, 0, params);\n    case 'stepAfter':\n      return genStepSegments(points, 1, params);\n    case 'catmullRom':\n      return genCatmullRomSegments(points, params?.curveTension ?? 0.5, params);\n    case 'catmullRomClosed':\n      return genCatmullRomClosedSegments(points, params?.curveTension ?? 0.5, params);\n    case 'linearClosed':\n      return genLinearClosedSegments(points, params);\n    default:\n      return genLinearSegments(points, params);\n  }\n}\n"]}

package/cjs/common/sort.js

@@ -26,8 +26,18 @@ var __awaiter = this && this.__awaiter || function(thisArg, _arguments, P, gener
     }));
 };
 
-function foreach(graphic, defaultZIndex, cb, reverse = !1, sort3d = !1) {
+function parseChildMap(graphic, defaultZIndex, reverse) {
     const childMap = {}, zIdxArray = [];
+    return graphic.forEachChildren((item => {
+        const {zIndex: zIndex = defaultZIndex} = item.attribute;
+        childMap[zIndex] ? childMap[zIndex].push(item) : (childMap[zIndex] = [ item ], zIdxArray.push(zIndex));
+    }), reverse), zIdxArray.sort(((a, b) => reverse ? b - a : a - b)), {
+        childMap: childMap,
+        zIdxArray: zIdxArray
+    };
+}
+
+function foreach(graphic, defaultZIndex, cb, reverse = !1, sort3d = !1) {
     let needSort = !1;
     if (sort3d) needSort = !0; else {
         let lastZIndex;
@@ -39,13 +49,10 @@ function foreach(graphic, defaultZIndex, cb, reverse = !1, sort3d = !1) {
         }), reverse);
     }
     if (needSort) {
-        graphic.forEachChildren((item => {
-            const {zIndex: zIndex = defaultZIndex} = item.attribute;
-            childMap[zIndex] ? childMap[zIndex].push(item) : (childMap[zIndex] = [ item ], zIdxArray.push(zIndex));
-        }), reverse), zIdxArray.sort(((a, b) => reverse ? b - a : a - b));
+        const {childMap: childMap, zIdxArray: zIdxArray} = parseChildMap(graphic, defaultZIndex, reverse);
         let skip = !1;
         for (let i = 0; i < zIdxArray.length && !skip; i++) {
-            const idx = zIdxArray[i], children = childMap[idx];
+            const children = childMap[zIdxArray[i]];
             sort3d && children.sort(((a, b) => {
                 var _a, _b;
                 return (reverse ? -1 : 1) * ((null !== (_a = b.attribute.z) && void 0 !== _a ? _a : 0) - (null !== (_b = a.attribute.z) && void 0 !== _b ? _b : 0));
@@ -65,7 +72,6 @@ function foreachAsync(graphic, defaultZIndex, cb, reverse = !1) {
 }
 
 function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
-    const childMap = {}, zIdxArray = [];
     let needSort = !1;
     graphic.forEachChildren(((item, i) => {
         const {zIndex: zIndex = defaultZIndex} = item.attribute;
@@ -74,13 +80,10 @@ function findNextGraphic(graphic, id, defaultZIndex, reverse = !1) {
     }), reverse);
     let result = null, next = !1;
     if (needSort) {
-        graphic.forEachChildren((item => {
-            const {zIndex: zIndex = defaultZIndex} = item.attribute;
-            childMap[zIndex] ? childMap[zIndex].push(item) : (childMap[zIndex] = [ item ], zIdxArray.push(zIndex));
-        }), reverse), zIdxArray.sort(((a, b) => reverse ? b - a : a - b));
+        const {childMap: childMap, zIdxArray: zIdxArray} = parseChildMap(graphic, defaultZIndex, reverse);
         let skip = !1;
         for (let i = 0; i < zIdxArray.length && !skip; i++) {
-            const idx = zIdxArray[i], children = childMap[idx];
+            const children = childMap[zIdxArray[i]];
             for (let i = 0; i < children.length; i++) {
                 if (next) {
                     skip = !0, result = children[i];

package/cjs/common/sort.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/sort.ts"],"names":[],"mappings":"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","file":"sort.js","sourcesContent":["import type { IGraphic } from '../interface';\n\nexport function foreach(\n  graphic: IGraphic,\n  defaultZIndex: number,\n  cb: (...data: any) => boolean | void,\n  reverse: boolean = false,\n  sort3d: boolean = false\n) {\n  const childMap: { [id: number]: IGraphic[] } = {};\n  const zIdxArray: number[] = [];\n  // 遍历一遍查看是否有zIndex不同的\n  let needSort = false;\n  if (sort3d) {\n    needSort = true;\n  } else {\n    let lastZIndex: number;\n    graphic.forEachChildren((item: IGraphic, i: number) => {\n      const { zIndex = defaultZIndex } = item.attribute;\n      if (i === 0) {\n        lastZIndex = zIndex;\n      } else if (lastZIndex !== zIndex) {\n        needSort = true;\n        return true;\n      }\n      return false;\n    }, reverse);\n  }\n  if (needSort) {\n    graphic.forEachChildren((item: IGraphic) => {\n      const { zIndex = defaultZIndex } = item.attribute;\n      if (childMap[zIndex]) {\n        childMap[zIndex].push(item);\n      } else {\n        childMap[zIndex] = [item];\n        zIdxArray.push(zIndex);\n      }\n    }, reverse);\n    zIdxArray.sort((a, b) => (reverse ? b - a : a - b));\n    let skip = false;\n    for (let i = 0; i < zIdxArray.length; i++) {\n      if (skip) {\n        break;\n      }\n      const idx = zIdxArray[i];\n      const children = childMap[idx];\n      // 根据z进行排序\n      if (sort3d) {\n        children.sort((a, b) => {\n          return (reverse ? -1 : 1) * ((b.attribute.z ?? 0) - (a.attribute.z ?? 0));\n        });\n      }\n      for (let i = 0; i < children.length; i++) {\n        if (cb(children[i], i)) {\n          skip = true;\n          break;\n        }\n      }\n    }\n  } else {\n    graphic.forEachChildren(cb, reverse);\n  }\n}\n\nexport async function foreachAsync(\n  graphic: IGraphic,\n  defaultZIndex: number,\n  cb: (data: any, i: number) => boolean | void | Promise<boolean | void>,\n  reverse: boolean = false\n) {\n  // 不支持zIndex\n  await graphic.forEachChildrenAsync(cb, reverse);\n  // const childMap: { [id: number]: IGraphic[] } = {};\n  // const zIdxArray: number[] = [];\n  // // 遍历一遍查看是否有zIndex不同的\n  // let needSort = false;\n  // let lastZIndex: number;\n  // graphic.forEachChildren((item: IGraphic, i: number) => {\n  //   const { zIndex = defaultZIndex } = item.attribute;\n  //   if (i === 0) {\n  //     lastZIndex === zIndex;\n  //   } else if (lastZIndex !== zIndex) {\n  //     needSort = true;\n  //     return true;\n  //   }\n  //   return false;\n  // }, reverse);\n  // if (needSort) {\n  //   graphic.forEachChildren((item: IGraphic) => {\n  //     const { zIndex = defaultZIndex } = item.attribute;\n  //     if (childMap[zIndex]) {\n  //       childMap[zIndex].push(item);\n  //     } else {\n  //       childMap[zIndex] = [item];\n  //       zIdxArray.push(zIndex);\n  //     }\n  //   }, reverse);\n  //   zIdxArray.sort((a, b) => (reverse ? b - a : a - b));\n  //   let skip = false;\n  //   for (let i = 0; i < zIdxArray.length; i++) {\n  //     if (skip) {\n  //       break;\n  //     }\n  //     const idx = zIdxArray[i];\n  //     const children = childMap[idx];\n  //     for (let i = 0; i < children.length; i++) {\n  //       let d = cb(children[i], i);\n  //       if ((d as any).then) {\n  //         d = await d;\n  //       }\n  //       if (d) {\n  //         skip = true;\n  //         break;\n  //       }\n  //     }\n  //   }\n  // } else {\n  //   await graphic.forEachChildrenAsync(cb, reverse);\n  // }\n}\n\nexport function findNextGraphic(graphic: IGraphic, id: number, defaultZIndex: number, reverse: boolean = false) {\n  const childMap: { [id: number]: IGraphic[] } = {};\n  const zIdxArray: number[] = [];\n  // 遍历一遍查看是否有zIndex不同的\n  let needSort = false;\n  let lastZIndex: number;\n  graphic.forEachChildren((item: IGraphic, i: number) => {\n    const { zIndex = defaultZIndex } = item.attribute;\n    if (i === 0) {\n      lastZIndex === zIndex;\n    } else if (lastZIndex !== zIndex) {\n      needSort = true;\n      return true;\n    }\n    return false;\n  }, reverse);\n  let result: IGraphic | null = null;\n  let next: boolean = false;\n  if (needSort) {\n    graphic.forEachChildren((item: IGraphic) => {\n      const { zIndex = defaultZIndex } = item.attribute;\n      if (childMap[zIndex]) {\n        childMap[zIndex].push(item);\n      } else {\n        childMap[zIndex] = [item];\n        zIdxArray.push(zIndex);\n      }\n    }, reverse);\n    zIdxArray.sort((a, b) => (reverse ? b - a : a - b));\n    let skip = false;\n    for (let i = 0; i < zIdxArray.length; i++) {\n      if (skip) {\n        break;\n      }\n      const idx = zIdxArray[i];\n      const children = childMap[idx];\n      for (let i = 0; i < children.length; i++) {\n        if (next) {\n          skip = true;\n          result = children[i];\n          break;\n        }\n        if (children[i]._uid === id) {\n          next = true;\n          continue;\n        }\n      }\n    }\n  } else {\n    graphic.forEachChildren(item => {\n      if (next) {\n        result = item as IGraphic;\n        return true;\n      }\n      if (item._uid === id) {\n        next = true;\n      }\n      return false;\n    }, reverse);\n  }\n\n  return result;\n}\n"]}
+{"version":3,"sources":["../src/common/sort.ts"],"names":[],"mappings":"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","file":"sort.js","sourcesContent":["import type { IGraphic } from '../interface';\n\nfunction parseChildMap(graphic: IGraphic, defaultZIndex: number, reverse: boolean) {\n  const childMap: { [id: number]: IGraphic[] } = {};\n  const zIdxArray: number[] = [];\n\n  graphic.forEachChildren((item: IGraphic) => {\n    const { zIndex = defaultZIndex } = item.attribute;\n    if (childMap[zIndex]) {\n      childMap[zIndex].push(item);\n    } else {\n      childMap[zIndex] = [item];\n      zIdxArray.push(zIndex);\n    }\n  }, reverse);\n  zIdxArray.sort((a, b) => (reverse ? b - a : a - b));\n\n  return { childMap, zIdxArray };\n}\n\nexport function foreach(\n  graphic: IGraphic,\n  defaultZIndex: number,\n  cb: (...data: any) => boolean | void,\n  reverse: boolean = false,\n  sort3d: boolean = false\n) {\n  // 遍历一遍查看是否有zIndex不同的\n  let needSort = false;\n  if (sort3d) {\n    needSort = true;\n  } else {\n    let lastZIndex: number;\n    graphic.forEachChildren((item: IGraphic, i: number) => {\n      const { zIndex = defaultZIndex } = item.attribute;\n      if (i === 0) {\n        lastZIndex = zIndex;\n      } else if (lastZIndex !== zIndex) {\n        needSort = true;\n        return true;\n      }\n      return false;\n    }, reverse);\n  }\n  if (needSort) {\n    const { childMap, zIdxArray } = parseChildMap(graphic, defaultZIndex, reverse);\n    let skip = false;\n    for (let i = 0; i < zIdxArray.length; i++) {\n      if (skip) {\n        break;\n      }\n      const idx = zIdxArray[i];\n      const children = childMap[idx];\n      // 根据z进行排序\n      if (sort3d) {\n        children.sort((a, b) => {\n          return (reverse ? -1 : 1) * ((b.attribute.z ?? 0) - (a.attribute.z ?? 0));\n        });\n      }\n      for (let i = 0; i < children.length; i++) {\n        if (cb(children[i], i)) {\n          skip = true;\n          break;\n        }\n      }\n    }\n  } else {\n    graphic.forEachChildren(cb, reverse);\n  }\n}\n\nexport async function foreachAsync(\n  graphic: IGraphic,\n  defaultZIndex: number,\n  cb: (data: any, i: number) => boolean | void | Promise<boolean | void>,\n  reverse: boolean = false\n) {\n  // 不支持zIndex\n  await graphic.forEachChildrenAsync(cb, reverse);\n  // const childMap: { [id: number]: IGraphic[] } = {};\n  // const zIdxArray: number[] = [];\n  // // 遍历一遍查看是否有zIndex不同的\n  // let needSort = false;\n  // let lastZIndex: number;\n  // graphic.forEachChildren((item: IGraphic, i: number) => {\n  //   const { zIndex = defaultZIndex } = item.attribute;\n  //   if (i === 0) {\n  //     lastZIndex === zIndex;\n  //   } else if (lastZIndex !== zIndex) {\n  //     needSort = true;\n  //     return true;\n  //   }\n  //   return false;\n  // }, reverse);\n  // if (needSort) {\n  //   graphic.forEachChildren((item: IGraphic) => {\n  //     const { zIndex = defaultZIndex } = item.attribute;\n  //     if (childMap[zIndex]) {\n  //       childMap[zIndex].push(item);\n  //     } else {\n  //       childMap[zIndex] = [item];\n  //       zIdxArray.push(zIndex);\n  //     }\n  //   }, reverse);\n  //   zIdxArray.sort((a, b) => (reverse ? b - a : a - b));\n  //   let skip = false;\n  //   for (let i = 0; i < zIdxArray.length; i++) {\n  //     if (skip) {\n  //       break;\n  //     }\n  //     const idx = zIdxArray[i];\n  //     const children = childMap[idx];\n  //     for (let i = 0; i < children.length; i++) {\n  //       let d = cb(children[i], i);\n  //       if ((d as any).then) {\n  //         d = await d;\n  //       }\n  //       if (d) {\n  //         skip = true;\n  //         break;\n  //       }\n  //     }\n  //   }\n  // } else {\n  //   await graphic.forEachChildrenAsync(cb, reverse);\n  // }\n}\n\nexport function findNextGraphic(graphic: IGraphic, id: number, defaultZIndex: number, reverse: boolean = false) {\n  // 遍历一遍查看是否有zIndex不同的\n  let needSort = false;\n  let lastZIndex: number;\n  graphic.forEachChildren((item: IGraphic, i: number) => {\n    const { zIndex = defaultZIndex } = item.attribute;\n    if (i === 0) {\n      lastZIndex === zIndex;\n    } else if (lastZIndex !== zIndex) {\n      needSort = true;\n      return true;\n    }\n    return false;\n  }, reverse);\n  let result: IGraphic | null = null;\n  let next: boolean = false;\n  if (needSort) {\n    const { childMap, zIdxArray } = parseChildMap(graphic, defaultZIndex, reverse);\n    let skip = false;\n    for (let i = 0; i < zIdxArray.length; i++) {\n      if (skip) {\n        break;\n      }\n      const idx = zIdxArray[i];\n      const children = childMap[idx];\n      for (let i = 0; i < children.length; i++) {\n        if (next) {\n          skip = true;\n          result = children[i];\n          break;\n        }\n        if (children[i]._uid === id) {\n          next = true;\n          continue;\n        }\n      }\n    }\n  } else {\n    graphic.forEachChildren(item => {\n      if (next) {\n        result = item as IGraphic;\n        return true;\n      }\n      if (item._uid === id) {\n        next = true;\n      }\n      return false;\n    }, reverse);\n  }\n\n  return result;\n}\n"]}

package/cjs/common/text.d.ts

@@ -1,6 +1,4 @@
-import { type ITextFontParams } from '@visactor/vutils';
 import type { ITextGraphicAttribute, TextAlignType, TextBaselineType } from '../interface';
-export declare function getContextFont(text: Partial<ITextFontParams>, defaultAttr?: Partial<ITextFontParams>, fontSizeScale?: number): string;
 export declare function textDrawOffsetY(baseline: TextBaselineType, h: number): number;
 export declare function textDrawOffsetX(textAlign: TextAlignType, width: number): number;
 export declare function textLayoutOffsetY(baseline: TextBaselineType, lineHeight: number, fontSize: number, buf?: number): number;

package/cjs/common/text.js

@@ -2,16 +2,10 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.textAttributesToStyle = exports.textLayoutOffsetY = exports.textDrawOffsetX = exports.textDrawOffsetY = exports.getContextFont = void 0;
+}), exports.textAttributesToStyle = exports.textLayoutOffsetY = exports.textDrawOffsetX = exports.textDrawOffsetY = void 0;
 
 const vutils_1 = require("@visactor/vutils");
 
-function getContextFont(text, defaultAttr = {}, fontSizeScale) {
-    fontSizeScale || (fontSizeScale = 1);
-    const {fontStyle: fontStyle = defaultAttr.fontStyle, fontVariant: fontVariant = defaultAttr.fontVariant, fontWeight: fontWeight = defaultAttr.fontWeight, fontSize: fontSize = defaultAttr.fontSize, fontFamily: fontFamily = defaultAttr.fontFamily} = text;
-    return (fontStyle ? fontStyle + " " : "") + (fontVariant ? fontVariant + " " : "") + (fontWeight ? fontWeight + " " : "") + fontSize * fontSizeScale + "px " + (fontFamily || "sans-serif");
-}
-
 function textDrawOffsetY(baseline, h) {
     return "top" === baseline ? Math.ceil(.79 * h) : "middle" === baseline ? Math.round(.3 * h) : "bottom" === baseline ? Math.round(-.21 * h) : 0;
 }
@@ -26,18 +20,18 @@ function textLayoutOffsetY(baseline, lineHeight, fontSize, buf = 0) {
 }
 
 function textAttributesToStyle(attrs) {
-    const style = {};
+    const style = {}, parsePxValue = value => /^\d+(\.\d+)?$/.test(`${value}`) ? `${value}px` : `${value}`;
     return [ "textAlign", "fontFamily", "fontVariant", "fontStyle", "fontWeight" ].forEach((key => {
         attrs[key] && (style[(0, vutils_1.lowerCamelCaseToMiddle)(key)] = attrs[key]);
     })), [ "fontSize", "lineHeight" ].forEach((key => {
         const styleKey = (0, vutils_1.lowerCamelCaseToMiddle)(key);
-        (0, vutils_1.isNil)(attrs[key]) || (style[styleKey] = /^[0-9]*$/.test(`${attrs[key]}`) ? `${attrs[key]}px` : `${attrs[key]}`);
-    })), attrs.underline ? style["text-decoration"] = "underline" : attrs.lineThrough && (style["text-decoration"] = "line-through"), 
+        (0, vutils_1.isNil)(attrs[key]) || (style[styleKey] = parsePxValue(attrs[key]));
+    })), (0, vutils_1.isValid)(attrs.maxLineWidth) && (style["max-width"] = parsePxValue(attrs.maxLineWidth)), 
+    attrs.underline ? style["text-decoration"] = "underline" : attrs.lineThrough && (style["text-decoration"] = "line-through"), 
     attrs.fill && (0, vutils_1.isString)(attrs.fill) && (style.color = attrs.fill), 
     style;
 }
 
-exports.getContextFont = getContextFont, exports.textDrawOffsetY = textDrawOffsetY, 
-exports.textDrawOffsetX = textDrawOffsetX, exports.textLayoutOffsetY = textLayoutOffsetY, 
-exports.textAttributesToStyle = textAttributesToStyle;
-//# sourceMappingURL=text.js.map
+exports.textDrawOffsetY = textDrawOffsetY, exports.textDrawOffsetX = textDrawOffsetX, 
+exports.textLayoutOffsetY = textLayoutOffsetY, exports.textAttributesToStyle = textAttributesToStyle;
+//# sourceMappingURL=text.js.map

package/cjs/common/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/common/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["// 存放一些公共方法，公共配置\n\nimport { isNil, isString, type ITextFontParams, lowerCamelCaseToMiddle } from '@visactor/vutils';\nimport type { ITextGraphicAttribute, TextAlignType, TextBaselineType } from '../interface';\n\nexport function getContextFont(\n  text: Partial<ITextFontParams>,\n  defaultAttr: Partial<ITextFontParams> = {},\n  fontSizeScale?: number\n): string {\n  if (!fontSizeScale) {\n    fontSizeScale = 1;\n  }\n  const {\n    fontStyle = defaultAttr.fontStyle,\n    fontVariant = defaultAttr.fontVariant,\n    fontWeight = defaultAttr.fontWeight,\n    fontSize = defaultAttr.fontSize,\n    fontFamily = defaultAttr.fontFamily\n  } = text;\n  return (\n    '' +\n    (fontStyle ? fontStyle + ' ' : '') +\n    (fontVariant ? fontVariant + ' ' : '') +\n    (fontWeight ? fontWeight + ' ' : '') +\n    fontSize * fontSizeScale +\n    'px ' +\n    (fontFamily ? fontFamily : 'sans-serif')\n  );\n}\n// TODO: 更好的方案\n/**\n * 用于绘制的时候偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param h\n * @returns\n */\nexport function textDrawOffsetY(baseline: TextBaselineType, h: number): number {\n  const offset =\n    baseline === 'top'\n      ? Math.ceil(0.79 * h)\n      : baseline === 'middle'\n      ? Math.round(0.3 * h)\n      : baseline === 'bottom'\n      ? Math.round(-0.21 * h)\n      : 0;\n  return offset;\n}\n\n/**\n * 用于绘制的时候偏移\n * @param textAlign\n * @param width\n * @returns\n */\nexport function textDrawOffsetX(textAlign: TextAlignType, width: number): number {\n  if (textAlign === 'end' || textAlign === 'right') {\n    return -width;\n  } else if (textAlign === 'center') {\n    return -width / 2;\n  }\n  return 0;\n}\n\n/**\n * 用于计算布局的偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param lineHeight\n * @returns\n */\nexport function textLayoutOffsetY(\n  baseline: TextBaselineType,\n  lineHeight: number,\n  fontSize: number,\n  buf: number = 0\n): number {\n  if (baseline === 'middle') {\n    return -lineHeight / 2;\n  }\n  if (baseline === 'top') {\n    return 0;\n  }\n  if (baseline === 'bottom') {\n    return buf - lineHeight;\n  }\n  if (!baseline || baseline === 'alphabetic') {\n    if (!fontSize) {\n      fontSize = lineHeight;\n    }\n    return -(lineHeight - fontSize) / 2 - 0.79 * fontSize;\n  }\n  return 0;\n}\n\nexport function textAttributesToStyle(attrs: ITextGraphicAttribute) {\n  const stringTypes = ['textAlign', 'fontFamily', 'fontVariant', 'fontStyle', 'fontWeight'];\n  const pxKeys = ['fontSize', 'lineHeight'];\n  const style: any = {};\n\n  stringTypes.forEach(key => {\n    if (attrs[key]) {\n      style[lowerCamelCaseToMiddle(key)] = attrs[key];\n    }\n  });\n\n  pxKeys.forEach(key => {\n    const styleKey = lowerCamelCaseToMiddle(key);\n    if (!isNil(attrs[key])) {\n      style[styleKey] = /^[0-9]*$/.test(`${attrs[key]}`) ? `${attrs[key]}px` : `${attrs[key]}`;\n    }\n  });\n\n  if (attrs.underline) {\n    style['text-decoration'] = 'underline';\n  } else if (attrs.lineThrough) {\n    style['text-decoration'] = 'line-through';\n  }\n\n  if (attrs.fill) {\n    if (isString(attrs.fill)) {\n      style.color = attrs.fill;\n    }\n  }\n\n  return style;\n}\n"]}
+{"version":3,"sources":["../src/common/text.ts"],"names":[],"mappings":"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","file":"text.js","sourcesContent":["// 存放一些公共方法，公共配置\n\nimport { isNil, isString, isValid, lowerCamelCaseToMiddle } from '@visactor/vutils';\nimport type { ITextGraphicAttribute, TextAlignType, TextBaselineType } from '../interface';\n\n// TODO: 更好的方案\n/**\n * 用于绘制的时候偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param h\n * @returns\n */\nexport function textDrawOffsetY(baseline: TextBaselineType, h: number): number {\n  const offset =\n    baseline === 'top'\n      ? Math.ceil(0.79 * h)\n      : baseline === 'middle'\n      ? Math.round(0.3 * h)\n      : baseline === 'bottom'\n      ? Math.round(-0.21 * h)\n      : 0;\n  return offset;\n}\n\n/**\n * 用于绘制的时候偏移\n * @param textAlign\n * @param width\n * @returns\n */\nexport function textDrawOffsetX(textAlign: TextAlignType, width: number): number {\n  if (textAlign === 'end' || textAlign === 'right') {\n    return -width;\n  } else if (textAlign === 'center') {\n    return -width / 2;\n  }\n  return 0;\n}\n\n/**\n * 用于计算布局的偏移\n * 经验值，来源于 https://github.com/vega/vega/blob/b45cf431cd6c0d0c0e1567f087f9b3b55bc236fa/packages/vega-scenegraph/src/util/text.js\n * @param baseline\n * @param lineHeight\n * @returns\n */\nexport function textLayoutOffsetY(\n  baseline: TextBaselineType,\n  lineHeight: number,\n  fontSize: number,\n  buf: number = 0\n): number {\n  if (baseline === 'middle') {\n    return -lineHeight / 2;\n  }\n  if (baseline === 'top') {\n    return 0;\n  }\n  if (baseline === 'bottom') {\n    return buf - lineHeight;\n  }\n  if (!baseline || baseline === 'alphabetic') {\n    if (!fontSize) {\n      fontSize = lineHeight;\n    }\n    return -(lineHeight - fontSize) / 2 - 0.79 * fontSize;\n  }\n  return 0;\n}\n\nexport function textAttributesToStyle(attrs: ITextGraphicAttribute) {\n  const stringTypes = ['textAlign', 'fontFamily', 'fontVariant', 'fontStyle', 'fontWeight'];\n  const pxKeys = ['fontSize', 'lineHeight'];\n  const style: any = {};\n  const parsePxValue = (value: string | number) => {\n    return /^\\d+(\\.\\d+)?$/.test(`${value}`) ? `${value}px` : `${value}`;\n  };\n\n  stringTypes.forEach(key => {\n    if (attrs[key]) {\n      style[lowerCamelCaseToMiddle(key)] = attrs[key];\n    }\n  });\n\n  pxKeys.forEach(key => {\n    const styleKey = lowerCamelCaseToMiddle(key);\n    if (!isNil(attrs[key])) {\n      style[styleKey] = parsePxValue(attrs[key]);\n    }\n  });\n\n  if (isValid(attrs.maxLineWidth)) {\n    style['max-width'] = parsePxValue(attrs.maxLineWidth);\n  }\n\n  if (attrs.underline) {\n    style['text-decoration'] = 'underline';\n  } else if (attrs.lineThrough) {\n    style['text-decoration'] = 'line-through';\n  }\n\n  if (attrs.fill) {\n    if (isString(attrs.fill)) {\n      style.color = attrs.fill;\n    }\n  }\n\n  return style;\n}\n"]}

package/cjs/common/utils.js

@@ -160,4 +160,4 @@ const calculateLineHeight = (lineHeight, fontSize) => {
 };
 
 exports.calculateLineHeight = calculateLineHeight;
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=utils.js.map