@visactor/vrender-components 0.15.0-alpha.25 → 0.15.0-alpha.26

package/dist/index.js

@@ -2420,16 +2420,13 @@
     }
 
     class ArcInfo {
-        constructor(refDatum, center, outerCenter, quadrant, radian, middleAngle, innerRadius, outerRadius, circleCenter) {
+        constructor(refDatum, center, outerCenter, quadrant, radian, middleAngle) {
             this.refDatum = refDatum;
             this.center = center;
             this.outerCenter = outerCenter;
             this.quadrant = quadrant;
             this.radian = radian;
             this.middleAngle = middleAngle;
-            this.innerRadius = innerRadius;
-            this.outerRadius = outerRadius;
-            this.circleCenter = circleCenter;
             this.labelVisible = true;
             this.labelLimit = 0;
         }
@@ -2489,9 +2486,11 @@
             return labels;
         }
         layoutArcLabels(position, attribute, currentMarks, data, textBoundsArray, ellipsisWidth) {
+            var _a;
             this._arcLeft.clear();
             this._arcRight.clear();
             this._ellipsisWidth = ellipsisWidth;
+            const centerOffset = (_a = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _a !== void 0 ? _a : 0;
             let maxRadius = 0;
             currentMarks.forEach(currentMarks => {
                 if (currentMarks.attribute.outerRadius > maxRadius) {
@@ -2502,15 +2501,15 @@
                 var _a, _b;
                 const graphicAttribute = currentMark.attribute;
                 const center = { x: (_a = graphicAttribute === null || graphicAttribute === void 0 ? void 0 : graphicAttribute.x) !== null && _a !== void 0 ? _a : 0, y: (_b = graphicAttribute === null || graphicAttribute === void 0 ? void 0 : graphicAttribute.y) !== null && _b !== void 0 ? _b : 0 };
-                const item = data[index];
-                const textBounds = textBoundsArray[index];
+                const item = data[index] ? data[index] : null;
+                const textBounds = textBoundsArray[index] ? textBoundsArray[index] : 0;
                 const arcMiddleAngle = (graphicAttribute.startAngle + graphicAttribute.endAngle) / 2;
                 const intervalAngle = graphicAttribute.endAngle - graphicAttribute.startAngle;
                 const arcQuadrant = computeQuadrant(graphicAttribute.endAngle - intervalAngle / 2);
                 const arcMiddle = circlePoint(center.x, center.y, graphicAttribute.outerRadius, arcMiddleAngle);
                 const outerArcMiddle = circlePoint(center.x, center.y, maxRadius + attribute.line.line1MinLength, arcMiddleAngle);
-                const arc = new ArcInfo(item, arcMiddle, outerArcMiddle, arcQuadrant, intervalAngle, arcMiddleAngle, graphicAttribute.innerRadius, graphicAttribute.outerRadius, center);
-                arc.pointA = circlePoint(center.x, center.y, this.computeDatumRadius(center.x * 2, center.y * 2, graphicAttribute.outerRadius), arc.middleAngle);
+                const arc = new ArcInfo(item, arcMiddle, outerArcMiddle, arcQuadrant, intervalAngle, arcMiddleAngle);
+                arc.pointA = circlePoint(center.x, center.y, this.computeDatumRadius(center.x * 2, center.y * 2, graphicAttribute.outerRadius, centerOffset), arc.middleAngle);
                 arc.labelSize = {
                     width: textBounds.x2 - textBounds.x1,
                     height: textBounds.y2 - textBounds.y1
@@ -2536,13 +2535,18 @@
             return arcs;
         }
         _layoutInsideLabels(arcs, attribute, currentMarks) {
+            var _a, _b, _c, _d, _e;
+            const center = { x: (_b = (_a = currentMarks[0].attribute) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0, y: (_d = (_c = currentMarks[0].attribute) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0 };
+            const centerOffset = (_e = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _e !== void 0 ? _e : 0;
+            const innerRadiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.innerRadius, attribute.width, attribute.height);
+            const outerRadiusRatio = this.computeLayoutOuterRadius(currentMarks[0].attribute.outerRadius, attribute.width, attribute.height);
             const labelConfig = attribute;
             const spaceWidth = labelConfig.spaceWidth;
             arcs.forEach((arc) => {
                 var _a, _b;
                 const { labelSize, radian } = arc;
-                const innerRadius = arc.innerRadius;
-                const outerRadius = arc.outerRadius;
+                const innerRadius = this.computeRadius(innerRadiusRatio, attribute.width, attribute.height, centerOffset, 1);
+                const outerRadius = this.computeRadius(outerRadiusRatio, attribute.width, attribute.height, centerOffset, 1);
                 const minRadian = connectLineRadian(outerRadius, labelSize.height);
                 let limit;
                 if (radian < minRadian) {
@@ -2567,7 +2571,7 @@
                 const align = this._computeAlign(arc, attribute);
                 const alignOffset = align === 'left' ? labelWidth : align === 'right' ? 0 : labelWidth / 2;
                 const labelRadius = outerRadius - spaceWidth - alignOffset;
-                arc.labelPosition = circlePoint(arc.circleCenter.x, arc.circleCenter.y, labelRadius, arc.middleAngle);
+                arc.labelPosition = circlePoint(center.x, center.y, labelRadius, arc.middleAngle);
                 arc.labelLimit = labelWidth;
                 if (!vutils.isGreater(labelWidth, 0)) {
                     arc.labelVisible = false;
@@ -2642,8 +2646,9 @@
             return arcs;
         }
         _computeX(arc, attribute, currentMarks) {
-            var _a;
-            const center = arc.circleCenter;
+            var _a, _b, _c, _d, _e, _f;
+            const center = { x: (_b = (_a = currentMarks[0].attribute) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0, y: (_d = (_c = currentMarks[0].attribute) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0 };
+            const centerOffset = (_e = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _e !== void 0 ? _e : 0;
             const plotLayout = { width: center.x * 2, height: center.y * 2 };
             let maxRadius = 0;
             currentMarks.forEach((currentMark) => {
@@ -2654,7 +2659,7 @@
             const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
             const line1MinLength = attribute.line.line1MinLength;
             const line2MinLength = attribute.line.line2MinLength;
-            const labelLayoutAlign = (_a = attribute.layout) === null || _a === void 0 ? void 0 : _a.align;
+            const labelLayoutAlign = (_f = attribute.layout) === null || _f === void 0 ? void 0 : _f.align;
             const spaceWidth = attribute.spaceWidth;
             const { labelPosition, quadrant, pointB } = arc;
             if (!vutils.isValidNumber(pointB.x * pointB.y)) {
@@ -2662,7 +2667,7 @@
                 labelPosition.x = NaN;
                 arc.labelLimit = 0;
             }
-            const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height);
+            const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset);
             const flag = isQuadrantLeft(quadrant) ? -1 : 1;
             let cx = 0;
             const restWidth = flag > 0 ? plotLayout.width - pointB.x : pointB.x;
@@ -2880,6 +2885,7 @@
             return -1;
         }
         _computePointB(arc, r, attribute, currentMarks) {
+            var _a, _b, _c, _d, _e;
             const labelConfig = attribute;
             let maxRadius = 0;
             currentMarks.forEach((currentMark) => {
@@ -2897,10 +2903,11 @@
                 };
             }
             else {
-                const center = arc.circleCenter;
-                const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height);
+                const center = { x: (_b = (_a = currentMarks[0].attribute) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0, y: (_d = (_c = currentMarks[0].attribute) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0 };
+                const centerOffset = (_e = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _e !== void 0 ? _e : 0;
+                const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset);
                 const { labelPosition, quadrant } = arc;
-                const outerR = Math.max(radius + line1MinLength, arc.outerRadius);
+                const outerR = Math.max(radius + line1MinLength, currentMarks[0].attribute.outerRadius);
                 const rd = r - outerR;
                 const x = Math.sqrt(r ** 2 - Math.abs(center.y - labelPosition.y) ** 2) - rd;
                 if (vutils.isValidNumber(x)) {
@@ -2922,7 +2929,8 @@
             }
         }
         _computeYRange(arc, attribute, currentMarks) {
-            const center = arc.circleCenter;
+            var _a, _b, _c, _d, _e;
+            const center = { x: (_b = (_a = currentMarks[0].attribute) === null || _a === void 0 ? void 0 : _a.x) !== null && _b !== void 0 ? _b : 0, y: (_d = (_c = currentMarks[0].attribute) === null || _c === void 0 ? void 0 : _c.y) !== null && _d !== void 0 ? _d : 0 };
             const plotRect = { width: center.x * 2, height: center.y * 2 };
             let maxRadius = 0;
             currentMarks.forEach((currentMark) => {
@@ -2933,7 +2941,8 @@
             const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
             const line1MinLength = attribute.line.line1MinLength;
             const { width, height } = plotRect;
-            const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height);
+            const centerOffset = (_e = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _e !== void 0 ? _e : 0;
+            const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset);
             const r = this._computeLayoutRadius(height / 2, attribute, currentMarks);
             const cx = Math.abs(arc.center.x - width / 2);
             const cy = arc.center.y - height / 2;
@@ -2992,6 +3001,7 @@
             arc.labelYRange = [min, max];
         }
         _computeLayoutRadius(halfYLength, attribute, currentMarks) {
+            var _a;
             const labelConfig = attribute;
             const layoutArcGap = labelConfig.layoutArcGap;
             const line1MinLength = labelConfig.line.line1MinLength;
@@ -3002,7 +3012,8 @@
                 }
             });
             const radiusRatio = this.computeLayoutOuterRadius(maxRadius, attribute.width, attribute.height);
-            const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height);
+            const centerOffset = (_a = attribute === null || attribute === void 0 ? void 0 : attribute.centerOffset) !== null && _a !== void 0 ? _a : 0;
+            const radius = this.computeRadius(radiusRatio, attribute.width, attribute.height, centerOffset);
             const outerR = radius + line1MinLength;
             const a = outerR - layoutArcGap;
             return Math.max((a ** 2 + halfYLength ** 2) / (2 * a), outerR);
@@ -3081,8 +3092,9 @@
                 : undefined;
             return labelLine;
         }
-        computeRadius(r, width, height, k) {
-            return this.computeLayoutRadius(width ? width : 0, height ? height : 0) * r * (vutils.isNil(k) ? 1 : k);
+        computeRadius(r, width, height, centerOffset, k) {
+            var _a;
+            return ((_a = this.computeLayoutRadius(width ? width : 0, height ? height : 0) * r * (vutils.isNil(k) ? 1 : k) + centerOffset) !== null && _a !== void 0 ? _a : 0);
         }
         computeLayoutRadius(width, height) {
             return Math.min(width / 2, height / 2);
@@ -3093,9 +3105,10 @@
         computeLayoutOuterRadius(r, width, height) {
             return r / (Math.min(width, height) / 2);
         }
-        computeDatumRadius(width, height, outerRadius) {
+        computeDatumRadius(width, height, outerRadius, centerOffset) {
+            var _a;
             const outerRadiusRatio = this.computeLayoutOuterRadius(outerRadius, width, height);
-            return this.computeLayoutRadius(width ? width : 0, height ? height : 0) * outerRadiusRatio;
+            return (_a = this.computeLayoutRadius(width ? width : 0, height ? height : 0) * outerRadiusRatio + centerOffset) !== null && _a !== void 0 ? _a : 0;
         }
     }
     ArcLabel.defaultAttributes = {
@@ -10345,7 +10358,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.15.0-alpha.25";
+    const version = "0.15.0-alpha.26";
 
     exports.AbstractComponent = AbstractComponent;
     exports.ArcInfo = ArcInfo;