@visactor/vrender 0.14.3 → 0.14.5-alpha.2

package/dist/index.js

@@ -11795,20 +11795,23 @@
 	        this.dispatch.emit(type || e.type, e);
 	    }
 	    mapEvent(e) {
-	        var _a;
+	        var _a, _b, _c, _d, _e;
 	        if (!this.rootTarget) {
 	            return;
 	        }
 	        const mappers = this.mappingTable[e.type];
 	        let target;
 	        const cacheKey = `${e.canvasX}-${e.canvasY}`;
-	        if ((_a = this._prePointTargetCache) === null || _a === void 0 ? void 0 : _a[cacheKey]) {
+	        if (((_a = this._prePointTargetCache) === null || _a === void 0 ? void 0 : _a[cacheKey]) &&
+	            ((_c = (_b = this._prePointTargetCache) === null || _b === void 0 ? void 0 : _b[cacheKey]) === null || _c === void 0 ? void 0 : _c.stage.renderCount) ===
+	                ((_d = this._prePointTargetCache) === null || _d === void 0 ? void 0 : _d.stageRenderCount)) {
 	            target = this._prePointTargetCache[cacheKey];
 	        }
 	        else {
 	            target = this.pickTarget(e.canvasX, e.canvasY);
 	            this._prePointTargetCache = {
-	                [cacheKey]: target
+	                [cacheKey]: target,
+	                stageRenderCount: (_e = target === null || target === void 0 ? void 0 : target.stage.renderCount) !== null && _e !== void 0 ? _e : -1
 	            };
 	        }
 	        if (mappers) {
@@ -12025,9 +12028,7 @@
 	                }
 	            }
 	        }
-	        else {
-	            this.emitDelegation(e, type);
-	        }
+	        this.emitDelegation(e, type);
 	    }
 	    emitDelegation(e, type) {
 	        const events = e.currentTarget._events;
@@ -19176,6 +19177,16 @@
 	            return;
 	        }
 	        const { outerRadius = arcAttribute.outerRadius, innerRadius = arcAttribute.innerRadius, cap = arcAttribute.cap, forceShowCap = arcAttribute.forceShowCap } = arc.attribute;
+	        let conicalOffset = 0;
+	        const tempChangeConicalColor = ((isBoolean(cap) && cap) || cap[0]) && fill.gradient === 'conical';
+	        if (tempChangeConicalColor) {
+	            const { sc, startAngle, endAngle } = arc.getParsedAngle();
+	            if (abs(endAngle - startAngle) < pi2 - epsilon) {
+	                conicalOffset = sc || 0;
+	                fill.startAngle -= conicalOffset;
+	                fill.endAngle -= conicalOffset;
+	            }
+	        }
 	        let beforeRenderContribitionsRuned = false;
 	        const { isFullStroke, stroke: arrayStroke } = parseStroke(stroke);
 	        if (doFill || isFullStroke) {
@@ -19250,7 +19261,7 @@
 	                context.stroke();
 	            }
 	        }
-	        if (cap && forceShowCap) {
+	        if (((isBoolean(cap) && cap) || cap[1]) && forceShowCap) {
 	            const { startAngle: sa, endAngle: ea } = arc.getParsedAngle();
 	            const deltaAngle = abs(ea - sa);
 	            if (deltaAngle >= pi2 - epsilon) {
@@ -19304,6 +19315,10 @@
 	        this._arcAfterRenderContribitions.forEach(c => {
 	            c.drawShape(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb);
 	        });
+	        if (tempChangeConicalColor) {
+	            fill.startAngle += conicalOffset;
+	            fill.endAngle += conicalOffset;
+	        }
 	    }
 	    draw(arc, renderService, drawContext, params) {
 	        const { context } = drawContext;
@@ -22603,7 +22618,9 @@
 	            if (capWidth > epsilon && outerRadius > epsilon) {
 	                return {
 	                    startAngle: startAngle - sign * capAngle * startCap,
-	                    endAngle: endAngle + sign * capAngle * endCap
+	                    endAngle: endAngle + sign * capAngle * endCap,
+	                    sc: sign * capAngle * startCap,
+	                    ec: sign * capAngle * endCap
 	                };
 	            }
 	        }
@@ -26812,7 +26829,9 @@
 	    }
 	    drawShape(arc, context, x, y, doFill, doStroke, fVisible, sVisible, arcAttribute, drawContext, fillCb, strokeCb) {
 	        const { innerRadius = arcAttribute.innerRadius, outerRadius = arcAttribute.outerRadius, startAngle = arcAttribute.startAngle, endAngle = arcAttribute.endAngle, opacity = arcAttribute.opacity, outerBorder, innerBorder } = arc.attribute;
-	        if (outerBorder) {
+	        const doStrokeOuter = !!(outerBorder && outerBorder.stroke);
+	        const doStrokeInner = !!(innerBorder && innerBorder.stroke);
+	        if (outerBorder && outerBorder.visible !== false) {
 	            const { distance = arcAttribute.outerBorder.distance } = outerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            const deltaAngle = distance / outerRadius;
@@ -26828,7 +26847,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, outerBorder, arcAttribute.outerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeOuter) {
 	                const lastOpacity = arcAttribute.outerBorder.opacity;
 	                arcAttribute.outerBorder.opacity = opacity;
 	                context.setStrokeStyle(arc, outerBorder, x, y, arcAttribute.outerBorder);
@@ -26836,7 +26855,7 @@
 	                context.stroke();
 	            }
 	        }
-	        if (innerBorder) {
+	        if (innerBorder && innerBorder.visible !== false) {
 	            const { distance = arcAttribute.innerBorder.distance } = innerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            const deltaAngle = distance / outerRadius;
@@ -26852,7 +26871,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, innerBorder, arcAttribute.innerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeInner) {
 	                const lastOpacity = arcAttribute.innerBorder.opacity;
 	                arcAttribute.innerBorder.opacity = opacity;
 	                context.setStrokeStyle(arc, innerBorder, x, y, arcAttribute.innerBorder);
@@ -26893,7 +26912,9 @@
 	    }
 	    drawShape(circle, context, x, y, doFill, doStroke, fVisible, sVisible, circleAttribute, drawContext, fillCb, strokeCb) {
 	        const { radius = circleAttribute.radius, startAngle = circleAttribute.startAngle, endAngle = circleAttribute.endAngle, opacity = circleAttribute.opacity, outerBorder, innerBorder } = circle.attribute;
-	        if (outerBorder) {
+	        const doStrokeOuter = !!(outerBorder && outerBorder.stroke);
+	        const doStrokeInner = !!(innerBorder && innerBorder.stroke);
+	        if (outerBorder && outerBorder.visible !== false) {
 	            const { distance = circleAttribute.outerBorder.distance } = outerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            const dw = d;
@@ -26904,7 +26925,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, outerBorder, circleAttribute.outerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeOuter) {
 	                const lastOpacity = circleAttribute.outerBorder.opacity;
 	                circleAttribute.outerBorder.opacity = opacity;
 	                context.setStrokeStyle(circle, outerBorder, x, y, circleAttribute.outerBorder);
@@ -26912,7 +26933,7 @@
 	                context.stroke();
 	            }
 	        }
-	        if (innerBorder) {
+	        if (innerBorder && innerBorder.visible !== false) {
 	            const { distance = circleAttribute.innerBorder.distance } = innerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            const dw = d;
@@ -26923,7 +26944,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, innerBorder, circleAttribute.innerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeInner) {
 	                const lastOpacity = circleAttribute.innerBorder.opacity;
 	                circleAttribute.innerBorder.opacity = opacity;
 	                context.setStrokeStyle(circle, innerBorder, x, y, circleAttribute.innerBorder);
@@ -27040,7 +27061,9 @@
 	    }
 	    drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
 	        const { width = rectAttribute.width, height = rectAttribute.height, cornerRadius = rectAttribute.cornerRadius, opacity = rectAttribute.opacity, outerBorder, innerBorder } = rect.attribute;
-	        if (outerBorder) {
+	        const doStrokeOuter = !!(outerBorder && outerBorder.stroke);
+	        const doStrokeInner = !!(innerBorder && innerBorder.stroke);
+	        if (outerBorder && outerBorder.visible !== false) {
 	            const { distance = rectAttribute.outerBorder.distance } = outerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            const nextX = x - d;
@@ -27058,7 +27081,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, outerBorder, rectAttribute.outerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeOuter) {
 	                const lastOpacity = rectAttribute.outerBorder.opacity;
 	                rectAttribute.outerBorder.opacity = opacity;
 	                context.setStrokeStyle(rect, outerBorder, x, y, rectAttribute.outerBorder);
@@ -27066,7 +27089,7 @@
 	                context.stroke();
 	            }
 	        }
-	        if (innerBorder) {
+	        if (innerBorder && innerBorder.visible !== false) {
 	            const { distance = rectAttribute.innerBorder.distance } = innerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            const nextX = x + d;
@@ -27084,7 +27107,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, innerBorder, rectAttribute.innerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeInner) {
 	                const lastOpacity = rectAttribute.innerBorder.opacity;
 	                rectAttribute.innerBorder.opacity = opacity;
 	                context.setStrokeStyle(rect, innerBorder, x, y, rectAttribute.innerBorder);
@@ -27189,7 +27212,9 @@
 	        if (!parsedPath) {
 	            return;
 	        }
-	        if (outerBorder) {
+	        const doStrokeOuter = !!(outerBorder && outerBorder.stroke);
+	        const doStrokeInner = !!(innerBorder && innerBorder.stroke);
+	        if (outerBorder && outerBorder.visible !== false) {
 	            const { distance = symbolAttribute.outerBorder.distance } = outerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            context.beginPath();
@@ -27200,7 +27225,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, outerBorder, symbolAttribute.outerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeOuter) {
 	                const lastOpacity = symbolAttribute.outerBorder.opacity;
 	                symbolAttribute.outerBorder.opacity = opacity;
 	                context.setStrokeStyle(symbol, outerBorder, x, y, symbolAttribute.outerBorder);
@@ -27208,7 +27233,7 @@
 	                context.stroke();
 	            }
 	        }
-	        if (innerBorder) {
+	        if (innerBorder && innerBorder.visible !== false) {
 	            const { distance = symbolAttribute.innerBorder.distance } = innerBorder;
 	            const d = getScaledStroke(context, distance, context.dpr);
 	            context.beginPath();
@@ -27219,7 +27244,7 @@
 	            if (strokeCb) {
 	                strokeCb(context, innerBorder, symbolAttribute.innerBorder);
 	            }
-	            else if (sVisible) {
+	            else if (doStrokeInner) {
 	                const lastOpacity = symbolAttribute.innerBorder.opacity;
 	                symbolAttribute.innerBorder.opacity = opacity;
 	                context.setStrokeStyle(symbol, innerBorder, x, y, symbolAttribute.innerBorder);
@@ -36910,7 +36935,7 @@
 	    'rect'
 	];
 
-	const version = "0.14.3";
+	const version = "0.14.5-alpha.2";
 
 	exports.ACustomAnimate = ACustomAnimate;
 	exports.ARC3D_NUMBER_TYPE = ARC3D_NUMBER_TYPE;