@visactor/vrender-core 0.16.19 → 0.16.20-alpha.0

package/cjs/graphic/graphic-service/graphic-service.js

@@ -16,7 +16,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DefaultGraphicService = exports.shouldUseMat4 = exports.getModelMatrix = exports.getExtraModelMatrix = exports.multiplyMat4Mat4 = exports.multiplyMat4Mat3 = exports.mat3Tomat4 = exports.translate = exports.rotateY = exports.rotateX = void 0;
 
-const inversify_lite_1 = require("../../common/inversify-lite"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), rect_contribution_1 = require("./rect-contribution"), text_1 = require("../../common/text"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), circle_contribution_1 = require("./circle-contribution"), arc_contribution_1 = require("./arc-contribution"), path_contribution_1 = require("./path-contribution"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), contribution_provider_1 = require("../../common/contribution-provider"), bounds_context_1 = require("../../common/bounds-context"), render_command_list_1 = require("../../common/render-command-list"), utils_1 = require("../../common/utils"), constants_1 = require("../constants");
+const inversify_lite_1 = require("../../common/inversify-lite"), vutils_1 = require("@visactor/vutils"), tapable_1 = require("../../tapable"), text_1 = require("../../common/text"), symbol_contribution_1 = require("./symbol-contribution"), tools_1 = require("../tools"), matrix_allocate_1 = require("../../allocator/matrix-allocate"), bounds_context_1 = require("../../common/bounds-context"), render_command_list_1 = require("../../common/render-command-list"), utils_1 = require("../../common/utils"), constants_1 = require("../constants"), common_contribution_1 = require("./common-contribution");
 
 function identity(out) {
     return out[0] = 1, out[1] = 0, out[2] = 0, out[3] = 0, out[4] = 0, out[5] = 1, out[6] = 0, 
@@ -177,11 +177,8 @@ exports.getExtraModelMatrix = getExtraModelMatrix, exports.getModelMatrix = getM
 exports.shouldUseMat4 = shouldUseMat4;
 
 let DefaultGraphicService = class {
-    constructor(creator, rectBoundsContribitions, symbolBoundsContribitions, circleBoundsContribitions, arcBoundsContribitions, pathBoundsContribitions) {
-        this.creator = creator, this.rectBoundsContribitions = rectBoundsContribitions, 
-        this.symbolBoundsContribitions = symbolBoundsContribitions, this.circleBoundsContribitions = circleBoundsContribitions, 
-        this.arcBoundsContribitions = arcBoundsContribitions, this.pathBoundsContribitions = pathBoundsContribitions, 
-        this.hooks = {
+    constructor(creator) {
+        this.creator = creator, this.hooks = {
             onAttributeUpdate: new tapable_1.SyncHook([ "graphic" ]),
             onSetStage: new tapable_1.SyncHook([ "graphic", "stage" ]),
             onRemove: new tapable_1.SyncHook([ "graphic" ]),
@@ -190,7 +187,12 @@ let DefaultGraphicService = class {
             onClearIncremental: new tapable_1.SyncHook([ "graphic", "group", "stage" ]),
             beforeUpdateAABBBounds: new tapable_1.SyncHook([ "graphic", "stage", "willUpdate", "aabbBounds" ]),
             afterUpdateAABBBounds: new tapable_1.SyncHook([ "graphic", "stage", "aabbBounds", "globalAABBBounds", "selfChange" ])
-        }, this.tempAABBBounds1 = new vutils_1.AABBBounds, this.tempAABBBounds2 = new vutils_1.AABBBounds;
+        }, this.tempAABBBounds1 = new vutils_1.AABBBounds, this.tempAABBBounds2 = new vutils_1.AABBBounds, 
+        this._rectBoundsContribitions = [ new common_contribution_1.DefaultOuterBorderBoundsContribution ], 
+        this._symbolBoundsContribitions = [ new symbol_contribution_1.DefaultSymbolOuterBorderBoundsContribution ], 
+        this._circleBoundsContribitions = [ new common_contribution_1.DefaultOuterBorderBoundsContribution ], 
+        this._arcBoundsContribitions = [ new common_contribution_1.DefaultOuterBorderBoundsContribution ], 
+        this._pathBoundsContribitions = [ new common_contribution_1.DefaultOuterBorderBoundsContribution ];
     }
     onAttributeUpdate(graphic) {
         this.hooks.onAttributeUpdate.taps.length && this.hooks.onAttributeUpdate.call(graphic);
@@ -226,13 +228,14 @@ let DefaultGraphicService = class {
     updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
         if (!this._validCheck(attribute, rectTheme, aabbBounds, graphic)) return aabbBounds;
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
-            const {width: width = rectTheme.width, height: height = rectTheme.height} = attribute;
-            aabbBounds.set(0, 0, width, height);
+            let {width: width, height: height} = attribute;
+            const {x1: x1, y1: y1, x: x, y: y} = attribute;
+            width = null != width ? width : x1 - x, height = null != height ? height : y1 - y, 
+            aabbBounds.set(0, 0, width || 0, height || 0);
         }
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._rectBoundsContribitions || (this._rectBoundsContribitions = this.rectBoundsContribitions.getContributions() || []), 
-        this._rectBoundsContribitions.length && this._rectBoundsContribitions.forEach((c => {
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._rectBoundsContribitions.length && this._rectBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, rectTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         })), this.transformAABBBounds(attribute, aabbBounds, rectTheme, !1, graphic), aabbBounds;
     }
@@ -316,7 +319,6 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        this._pathBoundsContribitions || (this._pathBoundsContribitions = this.pathBoundsContribitions.getContributions() || []), 
         this._pathBoundsContribitions.length && this._pathBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, pathTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }));
@@ -421,8 +423,7 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateCircleAABBBoundsImprecise(attribute, circleTheme, aabbBounds, graphic) : this.updateCircleAABBBoundsAccurate(attribute, circleTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         return tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._circleBoundsContribitions || (this._circleBoundsContribitions = this.circleBoundsContribitions.getContributions() || []), 
-        this._circleBoundsContribitions.length && this._circleBoundsContribitions.forEach((c => {
+        tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), this._circleBoundsContribitions.length && this._circleBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, circleTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         })), this.transformAABBBounds(attribute, aabbBounds, circleTheme, !1, graphic), 
         aabbBounds;
@@ -441,7 +442,6 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        this._arcBoundsContribitions || (this._arcBoundsContribitions = this.arcBoundsContribitions.getContributions() || []), 
         this._arcBoundsContribitions.length && this._arcBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, arcTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }));
@@ -473,7 +473,6 @@ let DefaultGraphicService = class {
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateSymbolAABBBoundsImprecise(attribute, symbolTheme, aabbBounds, graphic) : this.updateSymbolAABBBoundsAccurate(attribute, symbolTheme, aabbBounds, graphic));
         const tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
         tb1.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), tb2.setValue(aabbBounds.x1, aabbBounds.y1, aabbBounds.x2, aabbBounds.y2), 
-        this._symbolBoundsContribitions || (this._symbolBoundsContribitions = this.symbolBoundsContribitions.getContributions() || []), 
         this._symbolBoundsContribitions.length && this._symbolBoundsContribitions.forEach((c => {
             c.updateBounds(attribute, symbolTheme, tb1, graphic), aabbBounds.union(tb1), tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }));
@@ -512,9 +511,9 @@ let DefaultGraphicService = class {
         }
     }
     transformAABBBounds(attribute, aabbBounds, theme, miter, graphic) {
-        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, pickStrokeBuffer: pickStrokeBuffer = theme.pickStrokeBuffer, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
-        if (stroke) {
-            const scaledHalfLineWidth = (lineWidth + pickStrokeBuffer) / Math.abs(scaleX + scaleY);
+        const {scaleX: scaleX = theme.scaleX, scaleY: scaleY = theme.scaleY, stroke: stroke = theme.stroke, shadowBlur: shadowBlur = theme.shadowBlur, lineWidth: lineWidth = theme.lineWidth, strokeBoundsBuffer: strokeBoundsBuffer = theme.strokeBoundsBuffer} = attribute, tb1 = this.tempAABBBounds1, tb2 = this.tempAABBBounds2;
+        if (stroke && lineWidth) {
+            const scaledHalfLineWidth = lineWidth / Math.abs(scaleX + scaleY);
             (0, tools_1.boundStroke)(tb1, scaledHalfLineWidth, miter, strokeBoundsBuffer), aabbBounds.union(tb1), 
             tb1.setValue(tb2.x1, tb2.y1, tb2.x2, tb2.y2);
         }
@@ -523,7 +522,11 @@ let DefaultGraphicService = class {
             (0, tools_1.boundStroke)(tb1, shadowBlurWidth, !1, strokeBoundsBuffer + 1), tb1.translate(shadowOffsetX, shadowOffsetY), 
             aabbBounds.union(tb1);
         }
-        this.combindShadowAABBBounds(aabbBounds, graphic), (0, vutils_1.transformBoundsWithMatrix)(aabbBounds, aabbBounds, graphic.transMatrix);
+        this.combindShadowAABBBounds(aabbBounds, graphic);
+        let updateMatrix = !0;
+        const m = graphic.transMatrix;
+        graphic && graphic.isContainer && (updateMatrix = !(1 === m.a && 0 === m.b && 0 === m.c && 1 === m.d && 0 === m.e && 0 === m.f)), 
+        updateMatrix && (0, vutils_1.transformBoundsWithMatrix)(aabbBounds, aabbBounds, m);
     }
     _validCheck(attribute, theme, aabbBounds, graphic) {
         if (!graphic) return !0;
@@ -534,15 +537,6 @@ let DefaultGraphicService = class {
 };
 
 DefaultGraphicService = __decorate([ (0, inversify_lite_1.injectable)(), __param(0, (0, 
-inversify_lite_1.inject)(constants_1.GraphicCreator)), __param(1, (0, inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(1, (0, 
-inversify_lite_1.named)(rect_contribution_1.RectBoundsContribution)), __param(2, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(2, (0, 
-inversify_lite_1.named)(symbol_contribution_1.SymbolBoundsContribution)), __param(3, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(3, (0, 
-inversify_lite_1.named)(circle_contribution_1.CircleBoundsContribution)), __param(4, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(4, (0, 
-inversify_lite_1.named)(arc_contribution_1.ArcBoundsContribution)), __param(5, (0, 
-inversify_lite_1.inject)(contribution_provider_1.ContributionProvider)), __param(5, (0, 
-inversify_lite_1.named)(path_contribution_1.PathBoundsContribution)), __metadata("design:paramtypes", [ Object, Object, Object, Object, Object, Object ]) ], DefaultGraphicService), 
+inversify_lite_1.inject)(constants_1.GraphicCreator)), __metadata("design:paramtypes", [ Object ]) ], DefaultGraphicService), 
 exports.DefaultGraphicService = DefaultGraphicService;
 //# sourceMappingURL=graphic-service.js.map