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

package/cjs/index.d.ts

@@ -1,3 +1,3 @@
-export declare const version = "0.17.0-alpha.5";
+export declare const version = "0.17.0-alpha.6";
 export * from '@visactor/vrender-core';
 export * from '@visactor/vrender-kits';

package/cjs/index.js

@@ -21,5 +21,5 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits");
 
-exports.version = "0.17.0-alpha.5", (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container), 
+exports.version = "0.17.0-alpha.6", (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container), 
 __exportStar(require("@visactor/vrender-core"), exports), __exportStar(require("@visactor/vrender-kits"), exports);

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAwD;AAG3C,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;AAE1B,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadBrowserEnv } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.17.0-alpha.5\";\n\nloadBrowserEnv(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAAmD;AACnD,yDAAwD;AAG3C,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;AAE1B,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container } from '@visactor/vrender-core';\nimport { loadBrowserEnv } from '@visactor/vrender-kits';\n\n// 导出版本号\nexport const version = \"0.17.0-alpha.6\";\n\nloadBrowserEnv(container);\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -5115,12 +5115,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
   });
@@ -12747,13 +12751,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;
@@ -14946,7 +14950,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);
@@ -14964,10 +14968,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",
@@ -15004,11 +15005,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",
@@ -17096,11 +17093,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;
@@ -17136,10 +17135,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,
@@ -17251,8 +17250,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,
@@ -17452,10 +17451,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,
@@ -18265,7 +18264,7 @@
   var halfPi = pi / 2;
   function createRectPath(path, x, y, width, height, rectCornerRadius) {
     var cornerRadius;
-    if (isNumber$2(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), isNumber$2(rectCornerRadius, !0)) cornerRadius = [rectCornerRadius, rectCornerRadius, rectCornerRadius, rectCornerRadius];else if (Array.isArray(rectCornerRadius)) {
       var cornerRadiusArr = rectCornerRadius;
       switch (cornerRadiusArr.length) {
         case 0:
@@ -18409,10 +18408,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,
@@ -18425,7 +18420,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,
@@ -18484,13 +18485,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;
         })) {
@@ -19708,10 +19709,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,
@@ -19724,11 +19721,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);
@@ -23318,7 +23321,7 @@
         canvasControled: !1 !== params.canvasControled,
         title: params.title || "",
         canvas: params.canvas
-      }), _this._viewBox = new AABBBounds(), params.viewBox ? _this._viewBox.setValue(params.viewBox.x1, params.viewBox.y1, params.viewBox.x2, params.viewBox.y2) : _this._viewBox.setValue(0, 0, _this.width, _this.height), _this.state = "normal", _this.renderCount = 0, _this._subView = !(_this._viewBox.width() === _this.width && _this._viewBox.height() === _this.height), _this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig$1.BACKGROUND, _this.appendChild(_this.layerService.createLayer(_assertThisInitialized(_this), {
+      }), _this._viewBox = new AABBBounds(), params.viewBox ? _this._viewBox.setValue(params.viewBox.x1, params.viewBox.y1, params.viewBox.x2, params.viewBox.y2) : _this._viewBox.setValue(0, 0, _this.width, _this.height), _this.state = "normal", _this.renderCount = 0, _this.tryInitEventSystem(), _this._subView = !(_this._viewBox.width() === _this.width && _this._viewBox.height() === _this.height), _this._background = null !== (_a = params.background) && void 0 !== _a ? _a : DefaultConfig$1.BACKGROUND, _this.appendChild(_this.layerService.createLayer(_assertThisInitialized(_this), {
         main: !0
       })), _this.nextFrameRenderLayerSet = new Set(), _this.willNextFrameRender = !1, _this.stage = _assertThisInitialized(_this), _this.renderStyle = params.renderStyle, params.autoRender && _this.enableAutoRender(), !1 === params.disableDirtyBounds && _this.enableDirtyBounds(), params.enableHtmlAttribute && _this.enableHtmlAttribute(params.enableHtmlAttribute), params.enableLayout && _this.enableLayout(), _this.hooks.beforeRender.tap("constructor", _this.beforeRender), _this.hooks.afterRender.tap("constructor", _this.afterRender), _this._beforeRender = params.beforeRender, _this._afterRender = params.afterRender, _this.ticker = params.ticker || defaultTicker, _this.supportInteractiveLayer = !1 !== params.interactiveLayer, _this.timeline = new DefaultTimeline(), _this.ticker.addTimeline(_this.timeline), _this.timeline.pause(), params.optimize || (params.optimize = {}), _this.optmize(params.optimize), params.background && isString$1(_this._background) && _this._background.includes("/") && _this.setAttributes({
         background: _this._background
@@ -23406,7 +23409,7 @@
     }, {
       key: "eventSystem",
       get: function get() {
-        return this.tryInitEventSystem(), this._eventSystem;
+        return this._eventSystem;
       }
     }, {
       key: "tryInitEventSystem",
@@ -27487,10 +27490,8 @@
           fillColor = _rect$attribute3$fill2 === void 0 ? rectAttribute.fill : _rect$attribute3$fill2,
           _rect$attribute3$stro2 = _rect$attribute3.strokeColor,
           strokeColor = _rect$attribute3$stro2 === void 0 ? rectAttribute.stroke : _rect$attribute3$stro2,
-          _rect$attribute3$widt = _rect$attribute3.width,
-          width = _rect$attribute3$widt === void 0 ? rectAttribute.width : _rect$attribute3$widt,
-          _rect$attribute3$heig = _rect$attribute3.height,
-          height = _rect$attribute3$heig === void 0 ? rectAttribute.height : _rect$attribute3$heig,
+          x1 = _rect$attribute3.x1,
+          y1 = _rect$attribute3.y1,
           _rect$attribute3$line = _rect$attribute3.lineWidth,
           lineWidth = _rect$attribute3$line === void 0 ? rectAttribute.lineWidth : _rect$attribute3$line,
           _rect$attribute3$maxR = _rect$attribute3.maxRandomnessOffset,
@@ -27535,7 +27536,12 @@
           preserveVertices = _rect$attribute3$pres === void 0 ? defaultRouthThemeSpec.preserveVertices : _rect$attribute3$pres,
           _rect$attribute3$fixe = _rect$attribute3.fixedDecimalPlaceDigits,
           fixedDecimalPlaceDigits = _rect$attribute3$fixe === void 0 ? defaultRouthThemeSpec.fixedDecimalPlaceDigits : _rect$attribute3$fixe;
-        rc.rectangle(x, y, width, height, {
+        var _rect$attribute4 = rect.attribute,
+          _rect$attribute4$widt = _rect$attribute4.width,
+          width = _rect$attribute4$widt === void 0 ? rectAttribute.width : _rect$attribute4$widt,
+          _rect$attribute4$heig = _rect$attribute4.height,
+          height = _rect$attribute4$heig === void 0 ? rectAttribute.height : _rect$attribute4$heig;
+        width = (null != width ? width : x1 - x) || 0, height = (null != height ? height : y1 - y) || 0, rc.rectangle(x, y, width, height, {
           fill: fill ? fillColor : void 0,
           stroke: stroke ? strokeColor : void 0,
           strokeWidth: lineWidth,
@@ -33415,7 +33421,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.17.0-alpha.5";
+  const version = "0.17.0-alpha.6";
   loadBrowserEnv(container);
 
   exports.ACustomAnimate = ACustomAnimate;