@visactor/vrender-components 0.17.0-alpha.5 → 0.17.0-alpha.6

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.17.0-alpha.5";
+export declare const version = "0.17.0-alpha.6";
 export * from './core/base';
 export * from './scrollbar';
 export * from './tag';

package/cjs/index.js

@@ -17,7 +17,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.version = void 0, exports.version = "0.17.0-alpha.5", __exportStar(require("./core/base"), exports), 
+}), exports.version = void 0, exports.version = "0.17.0-alpha.6", __exportStar(require("./core/base"), exports), 
 __exportStar(require("./scrollbar"), exports), __exportStar(require("./tag"), exports), 
 __exportStar(require("./poptip"), exports), __exportStar(require("./crosshair"), exports), 
 __exportStar(require("./label"), exports), __exportStar(require("./axis"), exports), 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,8CAA4B;AAC5B,8CAA4B;AAC5B,wCAAsB;AACtB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,8CAA4B;AAC5B,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.17.0-alpha.5\";\n\nexport * from './core/base';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,8CAA4B;AAC5B,8CAA4B;AAC5B,wCAAsB;AACtB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,8CAA4B;AAC5B,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.17.0-alpha.6\";\n\nexport * from './core/base';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\n"]}

package/dist/index.js

@@ -3269,12 +3269,16 @@
   var DefaultRectAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
     width: 0,
     height: 0,
+    x1: 0,
+    y1: 0,
     strokeBoundsBuffer: 0,
     cornerRadius: 0
   });
   var DefaultRect3dAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
     width: 0,
     height: 0,
+    x1: 0,
+    y1: 0,
     cornerRadius: 0,
     length: 0
   });
@@ -8345,13 +8349,13 @@
     return fill && opacity * fillOpacity > 0;
   }
   function rectFillVisible(opacity, fillOpacity, width, height, fill) {
-    return fill && opacity * fillOpacity > 0 && width > 0 && height > 0;
+    return fill && opacity * fillOpacity > 0 && 0 !== width && 0 !== height;
   }
   function strokeVisible(opacity, strokeOpacity) {
     return opacity * strokeOpacity > 0;
   }
   function rectStrokeVisible(opacity, strokeOpacity, width, height) {
-    return opacity * strokeOpacity > 0 && width > 0 && height > 0;
+    return opacity * strokeOpacity > 0 && 0 !== width && 0 !== height;
   }
   function drawPathProxy(graphic, context, x, y, drawContext, params, fillCb, strokeCb) {
     if (!graphic.pathProxy) return !1;
@@ -10405,7 +10409,7 @@
     curveType: 1
   }, NOWORK_ANIMATE_ATTR);
 
-  var RECT_UPDATE_TAG_KEY = ["width", "height", "cornerRadius"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
+  var RECT_UPDATE_TAG_KEY = ["width", "x1", "y1", "height", "cornerRadius"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
   var Rect = /*#__PURE__*/function (_Graphic) {
     _inherits(Rect, _Graphic);
     var _super = _createSuper(Rect);
@@ -10423,10 +10427,7 @@
     }, {
       key: "_isValid",
       value: function _isValid() {
-        var _this$attribute = this.attribute,
-          width = _this$attribute.width,
-          height = _this$attribute.height;
-        return this._validNumber(width) && this._validNumber(height);
+        return !0;
       }
     }, {
       key: "doUpdateAABBBounds",
@@ -10463,11 +10464,7 @@
     }, {
       key: "toCustomPath",
       value: function toCustomPath() {
-        var attribute = this.attribute,
-          width = attribute.width,
-          height = attribute.height,
-          path = new CustomPath2D();
-        return path.moveTo(0, 0), path.rect(0, 0, width, height), path;
+        throw new Error("暂不支持");
       }
     }, {
       key: "clone",
@@ -12196,11 +12193,13 @@
       key: "updateRectAABBBounds",
       value: function updateRectAABBBounds(attribute, rectTheme, aabbBounds, graphic) {
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
-          var _attribute$width = attribute.width,
-            width = _attribute$width === void 0 ? rectTheme.width : _attribute$width,
-            _attribute$height = attribute.height,
-            height = _attribute$height === void 0 ? rectTheme.height : _attribute$height;
-          aabbBounds.set(0, 0, width, height);
+          var width = attribute.width,
+            height = attribute.height;
+          var x1 = attribute.x1,
+            y1 = attribute.y1,
+            x = attribute.x,
+            y = attribute.y;
+          width = null != width ? width : x1 - x, height = null != height ? height : y1 - y, aabbBounds.set(0, 0, width || 0, height || 0);
         }
         var tb1 = this.tempAABBBounds1,
           tb2 = this.tempAABBBounds2;
@@ -12236,10 +12235,10 @@
       key: "updateRichTextAABBBounds",
       value: function updateRichTextAABBBounds(attribute, richtextTheme, aabbBounds, graphic) {
         if (!graphic) return aabbBounds;
-        var _attribute$width2 = attribute.width,
-          width = _attribute$width2 === void 0 ? richtextTheme.width : _attribute$width2,
-          _attribute$height2 = attribute.height,
-          height = _attribute$height2 === void 0 ? richtextTheme.height : _attribute$height2,
+        var _attribute$width = attribute.width,
+          width = _attribute$width === void 0 ? richtextTheme.width : _attribute$width,
+          _attribute$height = attribute.height,
+          height = _attribute$height === void 0 ? richtextTheme.height : _attribute$height,
           _attribute$maxWidth = attribute.maxWidth,
           maxWidth = _attribute$maxWidth === void 0 ? richtextTheme.maxWidth : _attribute$maxWidth,
           _attribute$maxHeight = attribute.maxHeight,
@@ -12351,8 +12350,8 @@
         if (!stage || !stage.camera) return aabbBounds;
         var _attribute$outerRadiu = attribute.outerRadius,
           outerRadius = _attribute$outerRadiu === void 0 ? arcTheme.outerRadius : _attribute$outerRadiu,
-          _attribute$height3 = attribute.height,
-          height = _attribute$height3 === void 0 ? 0 : _attribute$height3,
+          _attribute$height2 = attribute.height,
+          height = _attribute$height2 === void 0 ? 0 : _attribute$height2,
           r = outerRadius + height;
         aabbBounds.setValue(-r, -r, r, r);
         var tb1 = this.tempAABBBounds1,
@@ -12552,10 +12551,10 @@
       key: "updateImageAABBBounds",
       value: function updateImageAABBBounds(attribute, imageTheme, aabbBounds, graphic) {
         if (!this.updatePathProxyAABBBounds(aabbBounds, graphic)) {
-          var _attribute$width3 = attribute.width,
-            width = _attribute$width3 === void 0 ? imageTheme.width : _attribute$width3,
-            _attribute$height4 = attribute.height,
-            height = _attribute$height4 === void 0 ? imageTheme.height : _attribute$height4;
+          var _attribute$width2 = attribute.width,
+            width = _attribute$width2 === void 0 ? imageTheme.width : _attribute$width2,
+            _attribute$height3 = attribute.height,
+            height = _attribute$height3 === void 0 ? imageTheme.height : _attribute$height3;
           aabbBounds.set(0, 0, width, height);
         }
         var tb1 = this.tempAABBBounds1,
@@ -13353,7 +13352,7 @@
   var halfPi = vutils.pi / 2;
   function createRectPath(path, x, y, width, height, rectCornerRadius) {
     var cornerRadius;
-    if (vutils.isNumber(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
+    if (width < 0 && (x += width, width = -width), height < 0 && (y += height, height = -height), vutils.isNumber(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
       var cornerRadiusArr = rectCornerRadius;
       switch (cornerRadiusArr.length) {
         case 0:
@@ -13497,10 +13496,6 @@
           doInnerBorder = innerBorder && !1 !== innerBorder.visible;
         if (!doOuterBorder && !doInnerBorder) return;
         var _rect$attribute2 = rect.attribute,
-          _rect$attribute2$widt = _rect$attribute2.width,
-          width = _rect$attribute2$widt === void 0 ? rectAttribute.width : _rect$attribute2$widt,
-          _rect$attribute2$heig = _rect$attribute2.height,
-          height = _rect$attribute2$heig === void 0 ? rectAttribute.height : _rect$attribute2$heig,
           _rect$attribute2$corn = _rect$attribute2.cornerRadius,
           cornerRadius = _rect$attribute2$corn === void 0 ? rectAttribute.cornerRadius : _rect$attribute2$corn,
           _rect$attribute2$opac = _rect$attribute2.opacity,
@@ -13513,7 +13508,13 @@
           scaleX = _rect$attribute2$scal === void 0 ? rectAttribute.scaleX : _rect$attribute2$scal,
           _rect$attribute2$scal2 = _rect$attribute2.scaleY,
           scaleY = _rect$attribute2$scal2 === void 0 ? rectAttribute.scaleY : _rect$attribute2$scal2,
-          doStrokeOuter = !(!outerBorder || !outerBorder.stroke),
+          x1 = _rect$attribute2.x1,
+          y1 = _rect$attribute2.y1;
+        var _rect$attribute3 = rect.attribute,
+          width = _rect$attribute3.width,
+          height = _rect$attribute3.height;
+        width = (null != width ? width : x1 - x) || 0, height = (null != height ? height : y1 - y) || 0;
+        var doStrokeOuter = !(!outerBorder || !outerBorder.stroke),
           doStrokeInner = !(!innerBorder || !innerBorder.stroke);
         if (doOuterBorder) {
           var _outerBorder$distance = outerBorder.distance,
@@ -13572,13 +13573,13 @@
     _createClass(SplitRectAfterRenderContribution, [{
       key: "drawShape",
       value: function drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, groupAttribute, drawContext, fillCb, strokeCb) {
-        var _rect$attribute3 = rect.attribute,
-          _rect$attribute3$widt = _rect$attribute3.width,
-          width = _rect$attribute3$widt === void 0 ? groupAttribute.width : _rect$attribute3$widt,
-          _rect$attribute3$heig = _rect$attribute3.height,
-          height = _rect$attribute3$heig === void 0 ? groupAttribute.height : _rect$attribute3$heig,
-          _rect$attribute3$stro = _rect$attribute3.stroke,
-          stroke = _rect$attribute3$stro === void 0 ? groupAttribute.stroke : _rect$attribute3$stro;
+        var _rect$attribute4 = rect.attribute,
+          _rect$attribute4$widt = _rect$attribute4.width,
+          width = _rect$attribute4$widt === void 0 ? groupAttribute.width : _rect$attribute4$widt,
+          _rect$attribute4$heig = _rect$attribute4.height,
+          height = _rect$attribute4$heig === void 0 ? groupAttribute.height : _rect$attribute4$heig,
+          _rect$attribute4$stro = _rect$attribute4.stroke,
+          stroke = _rect$attribute4$stro === void 0 ? groupAttribute.stroke : _rect$attribute4$stro;
         if (Array.isArray(stroke) && stroke.some(function (s) {
           return !1 === s;
         })) {
@@ -14796,10 +14797,6 @@
           background = _rect$attribute.background,
           _rect$attribute$strok = _rect$attribute.stroke,
           stroke = _rect$attribute$strok === void 0 ? rectAttribute.stroke : _rect$attribute$strok,
-          _rect$attribute$width = _rect$attribute.width,
-          width = _rect$attribute$width === void 0 ? rectAttribute.width : _rect$attribute$width,
-          _rect$attribute$heigh = _rect$attribute.height,
-          height = _rect$attribute$heigh === void 0 ? rectAttribute.height : _rect$attribute$heigh,
           _rect$attribute$corne = _rect$attribute.cornerRadius,
           cornerRadius = _rect$attribute$corne === void 0 ? rectAttribute.cornerRadius : _rect$attribute$corne,
           _rect$attribute$opaci = _rect$attribute.opacity,
@@ -14812,11 +14809,17 @@
           strokeOpacity = _rect$attribute$strok2 === void 0 ? rectAttribute.strokeOpacity : _rect$attribute$strok2,
           _rect$attribute$visib = _rect$attribute.visible,
           visible = _rect$attribute$visib === void 0 ? rectAttribute.visible : _rect$attribute$visib,
+          x1 = _rect$attribute.x1,
+          y1 = _rect$attribute.y1,
           _rect$attribute$x = _rect$attribute.x,
           originX = _rect$attribute$x === void 0 ? rectAttribute.x : _rect$attribute$x,
           _rect$attribute$y = _rect$attribute.y,
-          originY = _rect$attribute$y === void 0 ? rectAttribute.y : _rect$attribute$y,
-          fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
+          originY = _rect$attribute$y === void 0 ? rectAttribute.y : _rect$attribute$y;
+        var _rect$attribute2 = rect.attribute,
+          width = _rect$attribute2.width,
+          height = _rect$attribute2.height;
+        width = (null != width ? width : x1 - originX) || 0, height = (null != height ? height : y1 - originY) || 0;
+        var fVisible = rectFillVisible(opacity, fillOpacity, width, height, fill),
           sVisible = rectStrokeVisible(opacity, strokeOpacity, width, height),
           doFill = runFill(fill, background),
           doStroke = runStroke(stroke, lineWidth);
@@ -30274,7 +30277,7 @@
       }
   };
 
-  const version = "0.17.0-alpha.5";
+  const version = "0.17.0-alpha.6";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;