@visactor/vrender-components 0.16.15 → 0.16.17-alpha.1

package/dist/index.js

@@ -7715,7 +7715,7 @@
 
   var tempMatrix = new vutils.Matrix(),
     tempBounds$1 = new vutils.AABBBounds();
-  var GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "lineCap", "lineJoin", "miterLimit", "scaleX", "scaleY", "angle", "anchor"];
+  var GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "scaleX", "scaleY", "angle", "anchor", "visible"];
   var tempConstantXYKey = ["x", "y"],
     tempConstantScaleXYKey = ["scaleX", "scaleY"],
     tempConstantAngleKey = ["angle"],
@@ -11337,32 +11337,37 @@
   }(BaseSymbol);
   var close$1 = new CloseSymbol();
 
-  function rect(ctx, size, x, y) {
+  function rectSizeArray(ctx, size, x, y) {
     return ctx.rect(x - size[0] / 2, y - size[1] / 2, size[0], size[1]), !1;
   }
+  function rectSize(ctx, size, x, y) {
+    var w = size,
+      h = size / 2;
+    return ctx.rect(x - w / 2, y - h / 2, w, h), !1;
+  }
   var RectSymbol = /*#__PURE__*/function (_BaseSymbol) {
     _inherits(RectSymbol, _BaseSymbol);
     var _super = _createSuper(RectSymbol);
     function RectSymbol() {
       var _this;
       _classCallCheck(this, RectSymbol);
-      _this = _super.apply(this, arguments), _this.type = "rect", _this.pathStr = "M-0.5,-0.5h1v1h-1Z";
+      _this = _super.apply(this, arguments), _this.type = "rect", _this.pathStr = "M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z";
       return _this;
     }
     _createClass(RectSymbol, [{
       key: "draw",
       value: function draw(ctx, size, x, y) {
-        return rect(ctx, vutils.isNumber(size) ? [size, size] : size, x, y);
+        return vutils.isNumber(size) ? rectSize(ctx, size, x, y) : rectSizeArray(ctx, size, x, y);
       }
     }, {
       key: "drawOffset",
       value: function drawOffset(ctx, size, x, y, offset) {
-        return rect(ctx, vutils.isNumber(size) ? [size + 2 * offset, size + 2 * offset] : [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
+        return vutils.isNumber(size) ? rectSize(ctx, size + 2 * offset, x, y) : rectSizeArray(ctx, [size[0] + 2 * offset, size[1] + 2 * offset], x, y);
       }
     }]);
     return RectSymbol;
   }(BaseSymbol);
-  var rect$1 = new RectSymbol();
+  var rect = new RectSymbol();
 
   var tempBounds = new vutils.AABBBounds();
   var CustomSymbolClass = /*#__PURE__*/function () {
@@ -11401,7 +11406,7 @@
     return CustomSymbolClass;
   }();
 
-  var builtinSymbols = [circle$1, cross$1, diamond$1, square$1, thinTriangle$1, triangle, star$1, arrow$1, wedge$1, stroke$1, wye$1, triangleLeft, triangleRight, triangleUp, triangleDown, arrow2Left$1, arrow2Right$1, arrow2Up$1, arrow2Down$1, rect$1, lineV$1, lineH$1, close$1];
+  var builtinSymbols = [circle$1, cross$1, diamond$1, square$1, thinTriangle$1, triangle, star$1, arrow$1, wedge$1, stroke$1, wye$1, triangleLeft, triangleRight, triangleUp, triangleDown, arrow2Left$1, arrow2Right$1, arrow2Up$1, arrow2Down$1, rect, lineV$1, lineH$1, close$1];
   var builtinSymbolsMap = {};
   builtinSymbols.forEach(function (symbol) {
     builtinSymbolsMap[symbol.type] = symbol;
@@ -11409,7 +11414,6 @@
   var builtInSymbolStrMap = {
     arrowLeft: "M 0.25 -0.5 L -0.25 0 l 0.5 0.5",
     arrowRight: "M -0.25 -0.5 l 0.5 0.5 l -0.5 0.5",
-    rect: "M -0.5,0.25 L 0.5,0.25 L 0.5,-0.25,L -0.5,-0.25 Z",
     rectRound: "M 0.3 -0.5 C 0.41 -0.5 0.5 -0.41 0.5 -0.3 C 0.5 -0.3 0.5 0.3 0.5 0.3 C 0.5 0.41 0.41 0.5 0.3 0.5 C 0.3 0.5 -0.3 0.5 -0.3 0.5 C -0.41 0.5 -0.5 0.41 -0.5 0.3 C -0.5 0.3 -0.5 -0.3 -0.5 -0.3 C -0.5 -0.41 -0.41 -0.5 -0.3 -0.5 C -0.3 -0.5 0.3 -0.5 0.3 -0.5 Z",
     roundLine: "M 1.2392 -0.258 L -1.3432 -0.258 C -1.4784 -0.258 -1.588 -0.1436 -1.588 -0.002 c 0 0.1416 0.1096 0.256 0.2448 0.256 l 2.5824 0 c 0.1352 0 0.2448 -0.1144 0.2448 -0.256 C 1.484 -0.1436 1.3744 -0.258 1.2392 -0.258 z"
   };
@@ -13522,6 +13526,7 @@
     }, {
       key: "updateRectAABBBounds",
       value: function updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, rectTheme, aabbBounds, graphic)) return aabbBounds;
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
           var _attribute$width = attribute.width,
             width = _attribute$width === void 0 ? rectTheme.width : _attribute$width,
@@ -13555,13 +13560,14 @@
     }, {
       key: "updateGlyphAABBBounds",
       value: function updateGlyphAABBBounds(attribute, theme, aabbBounds, graphic) {
-        return graphic.getSubGraphic().forEach(function (node) {
+        return this._validCheck(attribute, theme, aabbBounds, graphic) ? (graphic.getSubGraphic().forEach(function (node) {
           aabbBounds.union(node.AABBBounds);
-        }), aabbBounds;
+        }), aabbBounds) : aabbBounds;
       }
     }, {
       key: "updateRichTextAABBBounds",
       value: function updateRichTextAABBBounds(attribute, richtextTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, richtextTheme, aabbBounds, graphic)) return aabbBounds;
         if (!graphic) return aabbBounds;
         var _attribute$width2 = attribute.width,
           width = _attribute$width2 === void 0 ? richtextTheme.width : _attribute$width2,
@@ -13614,6 +13620,7 @@
     }, {
       key: "updateTextAABBBounds",
       value: function updateTextAABBBounds(attribute, textTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, textTheme, aabbBounds, graphic)) return aabbBounds;
         if (!graphic) return aabbBounds;
         var _graphic$attribute$te = graphic.attribute.text,
           text = _graphic$attribute$te === void 0 ? textTheme.text : _graphic$attribute$te;
@@ -13638,6 +13645,7 @@
     }, {
       key: "updatePathAABBBounds",
       value: function updatePathAABBBounds(attribute, pathTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, pathTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePathAABBBoundsImprecise(attribute, pathTheme, aabbBounds, graphic);
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13689,6 +13697,7 @@
     }, {
       key: "updatePolygonAABBBounds",
       value: function updatePolygonAABBBounds(attribute, polygonTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, polygonTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || this.updatePolygonAABBBoundsImprecise(attribute, polygonTheme, aabbBounds, graphic);
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13709,6 +13718,7 @@
     }, {
       key: "updateLineAABBBounds",
       value: function updateLineAABBBounds(attribute, lineTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, lineTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (attribute.segments ? this.updateLineAABBBoundsBySegments(attribute, lineTheme, aabbBounds, graphic) : this.updateLineAABBBoundsByPoints(attribute, lineTheme, aabbBounds, graphic));
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13742,6 +13752,7 @@
     }, {
       key: "updateAreaAABBBounds",
       value: function updateAreaAABBBounds(attribute, areaTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, areaTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (attribute.segments ? this.updateAreaAABBBoundsBySegments(attribute, areaTheme, aabbBounds, graphic) : this.updateAreaAABBBoundsByPoints(attribute, areaTheme, aabbBounds, graphic));
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13777,6 +13788,7 @@
     }, {
       key: "updateCircleAABBBounds",
       value: function updateCircleAABBBounds(attribute, circleTheme, aabbBounds, full, graphic) {
+        if (!this._validCheck(attribute, circleTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateCircleAABBBoundsImprecise(attribute, circleTheme, aabbBounds, graphic) : this.updateCircleAABBBoundsAccurate(attribute, circleTheme, aabbBounds, graphic));
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13805,6 +13817,7 @@
     }, {
       key: "updateArcAABBBounds",
       value: function updateArcAABBBounds(attribute, arcTheme, aabbBounds, full, graphic) {
+        if (!this._validCheck(attribute, arcTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateArcAABBBoundsImprecise(attribute, arcTheme, aabbBounds, graphic) : this.updateArcAABBBoundsAccurate(attribute, arcTheme, aabbBounds, graphic));
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13846,6 +13859,7 @@
     }, {
       key: "updateSymbolAABBBounds",
       value: function updateSymbolAABBBounds(attribute, symbolTheme, aabbBounds, full, graphic) {
+        if (!this._validCheck(attribute, symbolTheme, aabbBounds, graphic)) return aabbBounds;
         this.updatePathProxyAABBBounds(aabbBounds, graphic) || (full ? this.updateSymbolAABBBoundsImprecise(attribute, symbolTheme, aabbBounds, graphic) : this.updateSymbolAABBBoundsAccurate(attribute, symbolTheme, aabbBounds, graphic));
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -13878,6 +13892,7 @@
     }, {
       key: "updateImageAABBBounds",
       value: function updateImageAABBBounds(attribute, imageTheme, aabbBounds, graphic) {
+        if (!this._validCheck(attribute, imageTheme, aabbBounds, graphic)) return aabbBounds;
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
           var _attribute$width3 = attribute.width,
             width = _attribute$width3 === void 0 ? imageTheme.width : _attribute$width3,
@@ -13924,6 +13939,15 @@
         }
         this.combindShadowAABBBounds(aabbBounds, graphic), vutils.transformBoundsWithMatrix(aabbBounds, aabbBounds, graphic.transMatrix);
       }
+    }, {
+      key: "_validCheck",
+      value: function _validCheck(attribute, theme, aabbBounds, graphic) {
+        if (!graphic) return !0;
+        if (!graphic.valid) return aabbBounds.clear(), !1;
+        var _attribute$visible = attribute.visible,
+          visible = _attribute$visible === void 0 ? theme.visible : _attribute$visible;
+        return !!visible || (aabbBounds.clear(), !1);
+      }
     }]);
     return DefaultGraphicService;
   }();
@@ -22931,7 +22955,7 @@
       }
       getGraphicBounds(graphic, point = {}) {
           var _a;
-          if (graphic.type !== 'line') {
+          if (!graphic || graphic.type !== 'line') {
               return super.getGraphicBounds(graphic, point);
           }
           const { position = 'end' } = this.attribute;
@@ -28063,27 +28087,31 @@
           });
           itemGroup.add(innerGroup);
           let focusStartX = 0;
-          const shapeSize = vutils.get(shapeAttr, 'style.size', DEFAULT_SHAPE_SIZE);
-          const shapeSpace = vutils.get(shapeAttr, 'space', DEFAULT_SHAPE_SPACE);
-          const itemShape = createSymbol(Object.assign(Object.assign({ x: 0, y: 0, symbolType: 'circle', strokeBoundsBuffer: 0 }, shape), shapeAttr.style));
-          Object.keys(shapeAttr.state || {}).forEach(key => {
-              const color = shapeAttr.state[key].fill ||
-                  shapeAttr.state[key].stroke;
-              if (shape.fill && vutils.isNil(shapeAttr.state[key].fill) && color) {
-                  shapeAttr.state[key].fill = color;
-              }
-              if (shape.stroke && vutils.isNil(shapeAttr.state[key].stroke) && color) {
-                  shapeAttr.state[key].stroke = color;
-              }
-          });
-          this._appendDataToShape(itemShape, exports.LEGEND_ELEMENT_NAME.itemShape, item, itemGroup, shapeAttr === null || shapeAttr === void 0 ? void 0 : shapeAttr.state);
-          itemShape.addState(isSelected ? exports.LegendStateValue.selected : exports.LegendStateValue.unSelected);
-          innerGroup.add(itemShape);
+          let shapeSize = 0;
+          let shapeSpace = 0;
+          if ((shapeAttr === null || shapeAttr === void 0 ? void 0 : shapeAttr.visible) !== false) {
+              shapeSize = vutils.get(shapeAttr, 'style.size', DEFAULT_SHAPE_SIZE);
+              shapeSpace = vutils.get(shapeAttr, 'space', DEFAULT_SHAPE_SPACE);
+              const itemShape = createSymbol(Object.assign(Object.assign({ x: 0, y: 0, symbolType: 'circle', strokeBoundsBuffer: 0 }, shape), shapeAttr.style));
+              Object.keys(shapeAttr.state || {}).forEach(key => {
+                  const color = shapeAttr.state[key].fill ||
+                      shapeAttr.state[key].stroke;
+                  if (shape.fill && vutils.isNil(shapeAttr.state[key].fill) && color) {
+                      shapeAttr.state[key].fill = color;
+                  }
+                  if (shape.stroke && vutils.isNil(shapeAttr.state[key].stroke) && color) {
+                      shapeAttr.state[key].stroke = color;
+                  }
+              });
+              this._appendDataToShape(itemShape, exports.LEGEND_ELEMENT_NAME.itemShape, item, itemGroup, shapeAttr === null || shapeAttr === void 0 ? void 0 : shapeAttr.state);
+              itemShape.addState(isSelected ? exports.LegendStateValue.selected : exports.LegendStateValue.unSelected);
+              innerGroup.add(itemShape);
+          }
           let focusShape;
           let focusSpace = 0;
           if (focus) {
               const focusSize = vutils.get(focusIconStyle, 'size', DEFAULT_SHAPE_SIZE);
-              focusShape = createSymbol(Object.assign(Object.assign({ x: 0, y: -focusSize / 2 - 1, strokeBoundsBuffer: 0 }, focusIconStyle), { visible: false, pickMode: 'imprecise', boundsPadding: parsedPadding }));
+              focusShape = createSymbol(Object.assign(Object.assign({ x: 0, y: -focusSize / 2 - 1, strokeBoundsBuffer: 0 }, focusIconStyle), { visible: true, pickMode: 'imprecise', boundsPadding: parsedPadding }));
               this._appendDataToShape(focusShape, exports.LEGEND_ELEMENT_NAME.focus, item, itemGroup);
               focusSpace = focusSize;
           }
@@ -28158,6 +28186,7 @@
           const itemGroupHeight = this._itemHeightByUser || innerGroupHeight + parsedPadding[0] + parsedPadding[2];
           itemGroup.attribute.width = itemGroupWidth;
           itemGroup.attribute.height = itemGroupHeight;
+          focusShape && focusShape.setAttribute('visible', false);
           innerGroup.translateTo(-innerGroupBounds.x1 + parsedPadding[3], -innerGroupBounds.y1 + parsedPadding[0]);
           return itemGroup;
       }
@@ -31509,7 +31538,7 @@
       }
   };
 
-  const version = "0.16.15";
+  const version = "0.16.17-alpha.1";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;