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

package/dist/index.js

@@ -7715,7 +7715,7 @@
 
   var tempMatrix = new vutils.Matrix(),
     tempBounds$1 = new vutils.AABBBounds();
-  var GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "scaleX", "scaleY", "angle", "anchor", "visible"];
+  var GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "lineCap", "lineJoin", "miterLimit", "scaleX", "scaleY", "angle", "anchor"];
   var tempConstantXYKey = ["x", "y"],
     tempConstantScaleXYKey = ["scaleX", "scaleY"],
     tempConstantAngleKey = ["angle"],
@@ -13526,7 +13526,6 @@
     }, {
       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,
@@ -13560,14 +13559,13 @@
     }, {
       key: "updateGlyphAABBBounds",
       value: function updateGlyphAABBBounds(attribute, theme, aabbBounds, graphic) {
-        return this._validCheck(attribute, theme, aabbBounds, graphic) ? (graphic.getSubGraphic().forEach(function (node) {
+        return 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,
@@ -13620,7 +13618,6 @@
     }, {
       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;
@@ -13645,7 +13642,6 @@
     }, {
       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;
@@ -13697,7 +13693,6 @@
     }, {
       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;
@@ -13718,7 +13713,6 @@
     }, {
       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;
@@ -13752,7 +13746,6 @@
     }, {
       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;
@@ -13788,7 +13781,6 @@
     }, {
       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;
@@ -13817,7 +13809,6 @@
     }, {
       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;
@@ -13859,7 +13850,6 @@
     }, {
       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;
@@ -13892,7 +13882,6 @@
     }, {
       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,
@@ -13939,15 +13928,6 @@
         }
         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;
   }();
@@ -20815,18 +20795,18 @@
 
   const defaultAlternativeColors = ['#ffffff', '#000000'];
   const { Color } = vutils.ColorUtil;
-  function labelSmartInvert(foregroundColorOrigin, backgroundColorOrogin, textType, contrastRatiosThreshold, alternativeColors) {
+  function labelSmartInvert(foregroundColorOrigin, backgroundColorOrogin, textType, contrastRatiosThreshold, alternativeColors, mode) {
       if (typeof foregroundColorOrigin !== 'string' || typeof backgroundColorOrogin !== 'string') {
           return foregroundColorOrigin;
       }
       const foregroundColor = new Color(foregroundColorOrigin).toHex();
       const backgroundColor = new Color(backgroundColorOrogin).toHex();
-      if (!contrastAccessibilityChecker(foregroundColor, backgroundColor, textType, contrastRatiosThreshold)) {
-          return improveContrastReverse(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors);
+      if (!contrastAccessibilityChecker(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, mode)) {
+          return improveContrastReverse(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors, mode);
       }
       return foregroundColor;
   }
-  function improveContrastReverse(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors) {
+  function improveContrastReverse(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors, mode) {
       const alternativeColorPalletes = [];
       if (alternativeColors) {
           if (alternativeColors instanceof Array) {
@@ -20841,13 +20821,27 @@
           if (foregroundColor === alternativeColor) {
               continue;
           }
-          if (contrastAccessibilityChecker(alternativeColor, backgroundColor, textType, contrastRatiosThreshold)) {
+          if (contrastAccessibilityChecker(alternativeColor, backgroundColor, textType, contrastRatiosThreshold, mode)) {
               return alternativeColor;
           }
       }
       return undefined;
   }
-  function contrastAccessibilityChecker(foregroundColor, backgroundColor, textType, contrastRatiosThreshold) {
+  function contrastAccessibilityChecker(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, mode) {
+      if (mode === 'lightness') {
+          const backgroundColorLightness = Color.getColorBrightness(new Color(backgroundColor));
+          const foregroundColorLightness = Color.getColorBrightness(new Color(foregroundColor));
+          if (foregroundColorLightness < 0.5) {
+              if (backgroundColorLightness >= 0.5) {
+                  return true;
+              }
+              return false;
+          }
+          if (backgroundColorLightness < 0.5) {
+              return true;
+          }
+          return false;
+      }
       if (contrastRatiosThreshold) {
           if (contrastRatios(foregroundColor, backgroundColor) > contrastRatiosThreshold) {
               return true;
@@ -22745,7 +22739,7 @@
       _smartInvert(labels) {
           var _a, _b, _c, _d, _e;
           const option = (this.attribute.smartInvert || {});
-          const { textType, contrastRatiosThreshold, alternativeColors } = option;
+          const { textType, contrastRatiosThreshold, alternativeColors, mode } = option;
           const fillStrategy = (_a = option.fillStrategy) !== null && _a !== void 0 ? _a : 'invertBase';
           const strokeStrategy = (_b = option.strokeStrategy) !== null && _b !== void 0 ? _b : 'base';
           const brightColor = (_c = option.brightColor) !== null && _c !== void 0 ? _c : '#ffffff';
@@ -22763,7 +22757,7 @@
               const backgroundColor = baseMark.attribute.fill;
               const foregroundColor = label.attribute.fill;
               const baseColor = backgroundColor;
-              const invertColor = labelSmartInvert(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors);
+              const invertColor = labelSmartInvert(foregroundColor, backgroundColor, textType, contrastRatiosThreshold, alternativeColors, mode);
               const similarColor = contrastAccessibilityChecker(invertColor, brightColor) ? brightColor : darkColor;
               if (outsideEnable) {
                   const fill = smartInvertStrategy(fillStrategy, baseColor, invertColor, similarColor);
@@ -22791,7 +22785,7 @@
                       }
                       if (label.attribute.stroke) {
                           label.setAttributes({
-                              fill: labelSmartInvert(label.attribute.fill, label.attribute.stroke, textType, contrastRatiosThreshold, alternativeColors)
+                              fill: labelSmartInvert(label.attribute.fill, label.attribute.stroke, textType, contrastRatiosThreshold, alternativeColors, mode)
                           });
                           continue;
                       }
@@ -22955,7 +22949,7 @@
       }
       getGraphicBounds(graphic, point = {}) {
           var _a;
-          if (!graphic || graphic.type !== 'line') {
+          if (graphic.type !== 'line') {
               return super.getGraphicBounds(graphic, point);
           }
           const { position = 'end' } = this.attribute;
@@ -28111,7 +28105,7 @@
           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: true, pickMode: 'imprecise', boundsPadding: parsedPadding }));
+              focusShape = createSymbol(Object.assign(Object.assign({ x: 0, y: -focusSize / 2 - 1, strokeBoundsBuffer: 0 }, focusIconStyle), { visible: false, pickMode: 'imprecise', boundsPadding: parsedPadding }));
               this._appendDataToShape(focusShape, exports.LEGEND_ELEMENT_NAME.focus, item, itemGroup);
               focusSpace = focusSize;
           }
@@ -28186,7 +28180,6 @@
           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;
       }
@@ -31538,7 +31531,7 @@
       }
   };
 
-  const version = "0.16.17-alpha.1";
+  const version = "0.16.17-alpha.2";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;