@visactor/vrender 0.19.19-alpha.2 → 0.19.20-alpha.2

package/dist/index.js

@@ -3182,7 +3182,7 @@
       return genCurveSegments(path, points);
     }
 
-    function point$2(curveClass, x, y, defined, p) {
+    function point$3(curveClass, x, y, defined, p) {
       curveClass.context.bezierCurveTo((2 * curveClass._x0 + curveClass._x1) / 3, (2 * curveClass._y0 + curveClass._y1) / 3, (curveClass._x0 + 2 * curveClass._x1) / 3, (curveClass._y0 + 2 * curveClass._y1) / 3, (curveClass._x0 + 4 * curveClass._x1 + x) / 6, (curveClass._y0 + 4 * curveClass._y1 + y) / 6, defined, curveClass.lastPoint1);
     }
     class Basis {
@@ -3199,7 +3199,7 @@
         this._x0 = this._x1 = this._y0 = this._y1 = NaN, this._point = 0, this.startPoint && this.point(this.startPoint);
       }
       lineEnd() {
-        if (2 === this._point) point$2(this, 6 * this._x1 - (this._x0 + 4 * this._x1), 6 * this._y1 - (this._y0 + 4 * this._y1), !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1);
+        if (2 === this._point) point$3(this, 6 * this._x1 - (this._x0 + 4 * this._x1), 6 * this._y1 - (this._y0 + 4 * this._y1), !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1);
         (this._line || 0 !== this._line && 1 === this._point) && this.context.closePath(), this._line = 1 - this._line;
       }
       point(p) {
@@ -3213,7 +3213,7 @@
             this._point = 2;
             break;
           default:
-            point$2(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
+            point$3(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
         }
         this._x0 = this._x1, this._x1 = x, this._y0 = this._y1, this._y1 = y, this._lastDefined1 = this._lastDefined2, this._lastDefined2 = p.defined, this.lastPoint0 = this.lastPoint1, this.lastPoint1 = p;
       }
@@ -3251,7 +3251,7 @@
       const h = curveClass._x1 - curveClass._x0;
       return h ? (3 * (curveClass._y1 - curveClass._y0) / h - t) / 2 : t;
     }
-    function point$1(curveClass, t0, t1, defined, p) {
+    function point$2(curveClass, t0, t1, defined, p) {
       const x0 = curveClass._x0,
         y0 = curveClass._y0,
         x1 = curveClass._x1,
@@ -3278,7 +3278,7 @@
             this.context.lineTo(this._x1, this._y1, !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1);
             break;
           case 3:
-            point$1(this, this._t0, slope2(this, this._t0), !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1);
+            point$2(this, this._t0, slope2(this, this._t0), !1 !== this._lastDefined1 && !1 !== this._lastDefined2, this.lastPoint1);
         }
         (this._line || 0 !== this._line && 1 === this._point) && this.context.closePath(), this._line = 1 - this._line;
       }
@@ -3294,10 +3294,10 @@
             this._point = 2;
             break;
           case 2:
-            this._point = 3, point$1(this, slope2(this, t1 = slope3(this, x, y)), t1, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
+            this._point = 3, point$2(this, slope2(this, t1 = slope3(this, x, y)), t1, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
             break;
           default:
-            point$1(this, this._t0, t1 = slope3(this, x, y), !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
+            point$2(this, this._t0, t1 = slope3(this, x, y), !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
         }
         this._x0 = this._x1, this._x1 = x, this._y0 = this._y1, this._y1 = y, this._t0 = t1, this._lastDefined1 = this._lastDefined2, this._lastDefined2 = !1 !== p.defined, this.lastPoint0 = this.lastPoint1, this.lastPoint1 = p;
       }
@@ -3418,6 +3418,162 @@
       return genCurveSegments(path, points);
     }
 
+    function point$1(curveClass, x, y, defined, p) {
+      let x1 = curveClass._x1,
+        y1 = curveClass._y1,
+        x2 = curveClass._x2,
+        y2 = curveClass._y2;
+      if (curveClass._l01_a > 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 > 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);
+    }
+    class CatmullRom {
+      constructor(context) {
+        let alpha = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : .5;
+        let startPoint = arguments.length > 2 ? arguments[2] : undefined;
+        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$1(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
+        }
+        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) {
+        let params = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+        const {
+          direction: direction,
+          startPoint: startPoint
+        } = params;
+        if (points.length < 2 - Number(!!startPoint)) return null;
+        if (points.length < 3 - Number(!!startPoint)) return genLinearSegments(points, params);
+        const segContext = genSegContext(type, direction, points),
+          gatmullRom = new cons(segContext, alpha, startPoint);
+        return genCurveSegments(gatmullRom, points), segContext;
+      };
+    }
+    const genCatmullRomSegments = commonGenCatmullRomSegments("catmullRom", CatmullRom);
+
+    class CatmullRomClosed {
+      constructor(context) {
+        let alpha = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : .5;
+        let startPoint = arguments.length > 2 ? arguments[2] : undefined;
+        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:
+            point$1(this, x, y, !1 !== this._lastDefined1 && !1 !== this._lastDefined2);
+        }
+        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();
+      }
+    }
+    const genCatmullRomClosedSegments = commonGenCatmullRomSegments("catmullRomClosed", CatmullRomClosed);
+
     class CurveContext {
       constructor(path) {
         this.path = path, this._lastX = this._lastY = this._startX = this._startY = 0;
@@ -3457,6 +3613,7 @@
     }
 
     function calcLineCache$1(points, curveType, params) {
+      var _a, _b;
       switch (curveType) {
         case "linear":
         default:
@@ -3473,6 +3630,10 @@
           return genStepSegments(points, 0, params);
         case "stepAfter":
           return genStepSegments(points, 1, params);
+        case "catmullRom":
+          return genCatmullRomSegments(points, null !== (_a = null == params ? void 0 : params.curveTension) && void 0 !== _a ? _a : .5, params);
+        case "catmullRomClosed":
+          return genCatmullRomClosedSegments(points, null !== (_b = null == params ? void 0 : params.curveTension) && void 0 !== _b ? _b : .5, params);
         case "linearClosed":
           return genLinearClosedSegments(points, params);
       }
@@ -3913,7 +4074,8 @@
       segments: [],
       curveType: "linear",
       clipRange: 1,
-      closePath: !1
+      closePath: !1,
+      curveTension: 1
     });
     const DefaultCircleAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
       radius: 1,
@@ -3948,7 +4110,8 @@
       curveType: "linear",
       clipRange: 1,
       clipRangeByDimension: "default",
-      closePath: !1
+      closePath: !1,
+      curveTension: 1
     });
     const DefaultPathAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
       path: new CustomPath2D(),
@@ -10527,6 +10690,7 @@
       }
       if (outerRadius <= epsilon) context.moveTo(cx, cy);else if (deltaAngle >= pi2 - epsilon) context.moveTo(cx + outerRadius * cos(startAngle), cy + outerRadius * sin(startAngle)), context.arc(cx, cy, outerRadius, startAngle, endAngle, !clockwise), innerRadius > epsilon && (context.moveTo(cx + innerRadius * cos(endAngle), cy + innerRadius * sin(endAngle)), context.arc(cx, cy, innerRadius, endAngle, startAngle, clockwise));else {
         const cornerRadius = arc.getParsedCornerRadius(),
+          cornerRadiusIsArray = isArray$1(cornerRadius),
           {
             outerDeltaAngle: outerDeltaAngle,
             innerDeltaAngle: innerDeltaAngle,
@@ -10535,10 +10699,10 @@
             innerEndAngle: innerEndAngle,
             innerStartAngle: innerStartAngle
           } = arc.getParsePadAngle(startAngle, endAngle),
-          outerCornerRadiusStart = cornerRadius,
-          outerCornerRadiusEnd = cornerRadius,
-          innerCornerRadiusEnd = cornerRadius,
-          innerCornerRadiusStart = cornerRadius,
+          outerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[0] : cornerRadius,
+          outerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[1] : cornerRadius,
+          innerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[2] : cornerRadius,
+          innerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[3] : cornerRadius,
           maxOuterCornerRadius = Math.max(outerCornerRadiusEnd, outerCornerRadiusStart),
           maxInnerCornerRadius = Math.max(innerCornerRadiusEnd, innerCornerRadiusStart);
         let limitedOcr = maxOuterCornerRadius,
@@ -12095,7 +12259,7 @@
       return new Symbol$1(attributes);
     }
 
-    const LINE_UPDATE_TAG_KEY = ["segments", "points", "curveType", ...GRAPHIC_UPDATE_TAG_KEY];
+    const LINE_UPDATE_TAG_KEY = ["segments", "points", "curveType", "curveTension", ...GRAPHIC_UPDATE_TAG_KEY];
     let Line$1 = class Line extends Graphic {
       constructor() {
         let params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -13172,7 +13336,7 @@
       return new Path(attributes);
     }
 
-    const AREA_UPDATE_TAG_KEY = ["segments", "points", "curveType", ...GRAPHIC_UPDATE_TAG_KEY];
+    const AREA_UPDATE_TAG_KEY = ["segments", "points", "curveType", "curveTension", ...GRAPHIC_UPDATE_TAG_KEY];
     class Area extends Graphic {
       constructor(params) {
         super(params), this.type = "area", this.numberType = AREA_NUMBER_TYPE;
@@ -13282,8 +13446,13 @@
           innerRadius = arcTheme.innerRadius
         } = this.attribute;
         if (outerRadius += outerPadding, innerRadius -= innerPadding, 0 === cornerRadius || "0%" === cornerRadius) return 0;
-        const deltaRadius = Math.abs(outerRadius - innerRadius);
-        return Math.min(isNumber$1(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+        const deltaRadius = Math.abs(outerRadius - innerRadius),
+          parseCR = cornerRadius => Math.min(isNumber$1(cornerRadius, !0) ? cornerRadius : deltaRadius * parseFloat(cornerRadius) / 100, deltaRadius / 2);
+        if (isArray$1(cornerRadius)) {
+          const crList = cornerRadius.map(cr => parseCR(cr) || 0);
+          return 0 === crList.length ? [crList[0], crList[0], crList[0], crList[0]] : 2 === crList.length ? [crList[0], crList[1], crList[0], crList[1]] : (3 === crList.length && crList.push(0), crList);
+        }
+        return parseCR(cornerRadius);
       }
       getParsedAngle() {
         const arcTheme = getTheme(this).arc;
@@ -15577,6 +15746,7 @@
           outerRadius = innerRadius, innerRadius = temp;
         }
         const cornerRadius = arc.getParsedCornerRadius(),
+          cornerRadiusIsArray = isArray$1(cornerRadius),
           {
             outerDeltaAngle: outerDeltaAngle,
             innerDeltaAngle: innerDeltaAngle,
@@ -15585,10 +15755,10 @@
             innerEndAngle: innerEndAngle,
             innerStartAngle: innerStartAngle
           } = arc.getParsePadAngle(startAngle, endAngle),
-          outerCornerRadiusStart = cornerRadius,
-          outerCornerRadiusEnd = cornerRadius,
-          innerCornerRadiusEnd = cornerRadius,
-          innerCornerRadiusStart = cornerRadius,
+          outerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[0] : cornerRadius,
+          outerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[1] : cornerRadius,
+          innerCornerRadiusEnd = cornerRadiusIsArray ? cornerRadius[2] : cornerRadius,
+          innerCornerRadiusStart = cornerRadiusIsArray ? cornerRadius[3] : cornerRadius,
           maxOuterCornerRadius = Math.max(outerCornerRadiusEnd, outerCornerRadiusStart),
           maxInnerCornerRadius = Math.max(innerCornerRadiusEnd, innerCornerRadiusStart);
         let limitedOcr = maxOuterCornerRadius,
@@ -15979,7 +16149,8 @@
             strokeOpacity = lineAttribute.strokeOpacity,
             segments: segments,
             points: points,
-            closePath: closePath
+            closePath: closePath,
+            curveTension = lineAttribute.curveTension
           } = line.attribute;
         if (!this.valid(line, lineAttribute, fillCb, strokeCb)) return;
         let {
@@ -16013,7 +16184,8 @@
                 defined: lastSeg.curves[lastSeg.curves.length - 1].defined
               } : index > 1 && (startPoint.x = lastSeg.endX, startPoint.y = lastSeg.endY, startPoint.defined = lastSeg.curves[lastSeg.curves.length - 1].defined);
               const data = calcLineCache$1(seg.points, curveType, {
-                startPoint: startPoint
+                startPoint: startPoint,
+                curveTension: curveTension
               });
               return lastSeg = data, data;
             }).filter(item => !!item), "linearClosed" === curveType) {
@@ -16030,7 +16202,9 @@
             }
           } else {
             if (!points || !points.length) return line.cache = null, void line.clearUpdateShapeTag();
-            line.cache = calcLineCache$1(_points, curveType);
+            line.cache = calcLineCache$1(_points, curveType, {
+              curveTension: curveTension
+            });
           }
           line.clearUpdateShapeTag();
         }
@@ -16201,6 +16375,7 @@
         };
       };
     function calcLineCache(points, curveType, params) {
+      var _a, _b;
       switch (curveType) {
         case "linear":
         default:
@@ -16217,6 +16392,10 @@
           return genStepSegments(points, 0, params);
         case "stepAfter":
           return genStepSegments(points, 1, params);
+        case "catmullRom":
+          return genCatmullRomSegments(points, null !== (_a = null == params ? void 0 : params.curveTension) && void 0 !== _a ? _a : .5, params);
+        case "catmullRomClosed":
+          return genCatmullRomClosedSegments(points, null !== (_b = null == params ? void 0 : params.curveTension) && void 0 !== _b ? _b : .5, params);
         case "linearClosed":
           return genLinearClosedSegments(points, params);
       }
@@ -16281,7 +16460,8 @@
             stroke = areaAttribute.stroke,
             fillOpacity = areaAttribute.fillOpacity,
             z = areaAttribute.z,
-            strokeOpacity = areaAttribute.strokeOpacity
+            strokeOpacity = areaAttribute.strokeOpacity,
+            curveTension = areaAttribute.curveTension
           } = area.attribute,
           data = this.valid(area, areaAttribute, fillCb, strokeCb);
         if (!data) return;
@@ -16312,7 +16492,8 @@
                 y: lastTopSeg.endY
               } : index > 1 && (startPoint.x = lastTopSeg.endX, startPoint.y = lastTopSeg.endY);
               const data = calcLineCache(seg.points, curveType, {
-                startPoint: startPoint
+                startPoint: startPoint,
+                curveTension: curveTension
               });
               return lastTopSeg = data, data;
             }).filter(item => !!item);
@@ -16333,7 +16514,9 @@
                   y: null !== (_d = endPoint.y1) && void 0 !== _d ? _d : endPoint.y
                 });
               }
-              bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType), bottomCaches.unshift(lastBottomSeg));
+              bottomPoints.length > 1 && (lastBottomSeg = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
+                curveTension: curveTension
+              }), bottomCaches.unshift(lastBottomSeg));
             }
             area.cacheArea = bottomCaches.map((item, index) => ({
               top: topCaches[index],
@@ -16348,8 +16531,12 @@
                 x: null !== (_e = points[i].x1) && void 0 !== _e ? _e : points[i].x,
                 y: null !== (_f = points[i].y1) && void 0 !== _f ? _f : points[i].y
               });
-              const topCache = calcLineCache(topPoints, curveType),
-                bottomCache = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType);
+              const topCache = calcLineCache(topPoints, curveType, {
+                  curveTension: curveTension
+                }),
+                bottomCache = calcLineCache(bottomPoints, "stepBefore" === curveType ? "stepAfter" : "stepAfter" === curveType ? "stepBefore" : curveType, {
+                  curveTension: curveTension
+                });
               area.cacheArea = {
                 top: topCache,
                 bottom: bottomCache
@@ -29111,7 +29298,7 @@
 
     const roughModule = _roughModule;
 
-    const version = "0.19.19-alpha.2";
+    const version = "0.19.20-alpha.2";
     preLoadAllModule();
     if (isBrowserEnv()) {
         loadBrowserEnv(container);
@@ -29623,7 +29810,7 @@
     exports.pathMathPickModule = pathMathPickModule;
     exports.pathModule = pathModule;
     exports.pathToBezierCurves = pathToBezierCurves;
-    exports.point = point$2;
+    exports.point = point$3;
     exports.pointEqual = pointEqual;
     exports.pointInterpolation = pointInterpolation;
     exports.pointInterpolationHighPerformance = pointInterpolationHighPerformance;