@visactor/vrender 0.17.4 → 0.17.5-alpha.1

package/cjs/index.d.ts

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

package/cjs/index.js

@@ -21,7 +21,7 @@ Object.defineProperty(exports, "__esModule", {
 
 const vrender_core_1 = require("@visactor/vrender-core"), vrender_kits_1 = require("@visactor/vrender-kits"), vrender_kits_2 = require("@visactor/vrender-kits");
 
-exports.version = "0.17.4", (0, vrender_core_1.isBrowserEnv)() ? (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, 
+exports.version = "0.17.5-alpha.1", (0, vrender_core_1.isBrowserEnv)() ? (0, vrender_kits_1.loadBrowserEnv)(vrender_core_1.container) : (0, 
 vrender_core_1.isNodeEnv)() && (0, vrender_kits_1.loadNodeEnv)(vrender_core_1.container), 
 (0, vrender_kits_2.registerArc)(), (0, vrender_kits_2.registerArc3d)(), (0, vrender_kits_2.registerArea)(), 
 (0, vrender_kits_2.registerCircle)(), (0, vrender_kits_2.registerGlyph)(), (0, vrender_kits_2.registerGroup)(), 

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAA4E;AAC5E,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AACnB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container, isBrowserEnv, isNodeEnv } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.17.4\";\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAA4E;AAC5E,yDAAqE;AACrE,yDAmBgC;AAEnB,QAAA,OAAO,GAAG,gBAAgB,CAAC;AAExC,IAAI,IAAA,2BAAY,GAAE,EAAE;IAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;CAC3B;KAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;IACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;CACxB;AACD,IAAA,0BAAW,GAAE,CAAC;AACd,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,4BAAa,GAAE,CAAC;AAChB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,8BAAe,GAAE,CAAC;AAClB,IAAA,gCAAiB,GAAE,CAAC;AACpB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,+BAAgB,GAAE,CAAC;AACnB,IAAA,iCAAkB,GAAE,CAAC;AACrB,IAAA,6BAAc,GAAE,CAAC;AACjB,IAAA,2BAAY,GAAE,CAAC;AACf,IAAA,+BAAgB,GAAE,CAAC;AACnB,yDAAuC;AACvC,yDAAuC","file":"index.js","sourcesContent":["import { container, isBrowserEnv, isNodeEnv } from '@visactor/vrender-core';\nimport { loadBrowserEnv, loadNodeEnv } from '@visactor/vrender-kits';\nimport {\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\nexport const version = \"0.17.5-alpha.1\";\n\nif (isBrowserEnv()) {\n  loadBrowserEnv(container);\n} else if (isNodeEnv()) {\n  loadNodeEnv(container);\n}\nregisterArc();\nregisterArc3d();\nregisterArea();\nregisterCircle();\nregisterGlyph();\nregisterGroup();\nregisterImage();\nregisterLine();\nregisterPath();\nregisterPolygon();\nregisterPyramid3d();\nregisterRect();\nregisterRect3d();\nregisterRichtext();\nregisterShadowRoot();\nregisterSymbol();\nregisterText();\nregisterWrapText();\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\n"]}

package/dist/index.js

@@ -5125,6 +5125,7 @@
     wordBreak: "break-all",
     ignoreBuf: !1,
     verticalMode: 0,
+    wrap: !1,
     whiteSpace: "no-wrap",
     heightLimit: 1 / 0,
     lineClamp: 1 / 0,
@@ -9765,6 +9766,7 @@
         var _ref3 = "function" == typeof this.params ? this.params() : this.params,
           center = _ref3.center,
           r = _ref3.r,
+          cb = _ref3.cb,
           deltaAngle = 2 * Math.PI * ratio,
           theta = this.theta + deltaAngle,
           phi = this.phi,
@@ -9772,7 +9774,7 @@
           y = r * Math.cos(phi) + center.y,
           z = r * Math.sin(phi) * Math.sin(theta) + center.z;
         for (out.x = x, out.y = y, out.z = z, out.alpha = theta + pi / 2; out.alpha > pi2;) out.alpha -= pi2;
-        out.alpha = pi2 - out.alpha, out.zIndex = -1e4 * out.z;
+        out.alpha = pi2 - out.alpha, out.zIndex = -1e4 * out.z, cb && cb(out);
       }
     }]);
     return RotateBySphereAnimate;
@@ -13679,7 +13681,7 @@
     return CanvasTextLayout;
   }();
 
-  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
+  var TEXT_UPDATE_TAG_KEY = ["text", "maxLineWidth", "heightLimit", "lineClamp", "fontSize", "fontFamily", "fontWeight", "ellipsis", "lineHeight", "direction", "wordBreak", "heightLimit", "lineClamp"].concat(_toConsumableArray(GRAPHIC_UPDATE_TAG_KEY));
   var Text = /*#__PURE__*/function (_Graphic) {
     _inherits(Text, _Graphic);
     var _super = _createSuper(Text);
@@ -13739,7 +13741,9 @@
       key: "_isValid",
       value: function _isValid() {
         var text = this.attribute.text;
-        return null != text && "" !== text;
+        return isArray$1(text) ? !text.every(function (t) {
+          return null == t || "" === t;
+        }) : null != text && "" !== text;
       }
     }, {
       key: "doUpdateAABBBounds",
@@ -13887,7 +13891,10 @@
       value: function updateHorizontalSinglelineAABBBounds(text) {
         var _a, _b;
         var textTheme = getTheme(this).text,
-          textMeasure = application.graphicUtil.textMeasure;
+          _this$attribute$wrap = this.attribute.wrap,
+          wrap = _this$attribute$wrap === void 0 ? textTheme.wrap : _this$attribute$wrap;
+        if (wrap) return this.updateWrapAABBBounds([text]);
+        var textMeasure = application.graphicUtil.textMeasure;
         var width, str;
         var attribute = this.attribute,
           _attribute$maxLineWid3 = attribute.maxLineWidth,
@@ -14045,7 +14052,10 @@
       value: function updateHorizontalMultilineAABBBounds(text) {
         var _a, _b;
         var textTheme = getTheme(this).text,
-          attribute = this.attribute,
+          _this$attribute$wrap2 = this.attribute.wrap,
+          wrap = _this$attribute$wrap2 === void 0 ? textTheme.wrap : _this$attribute$wrap2;
+        if (wrap) return this.updateWrapAABBBounds(text);
+        var attribute = this.attribute,
           _attribute$fontFamily3 = attribute.fontFamily,
           fontFamily = _attribute$fontFamily3 === void 0 ? textTheme.fontFamily : _attribute$fontFamily3,
           _attribute$textAlign3 = attribute.textAlign,
@@ -14232,9 +14242,11 @@
   var WrapText = /*#__PURE__*/function (_Text) {
     _inherits(WrapText, _Text);
     var _super = _createSuper(WrapText);
-    function WrapText() {
+    function WrapText(params) {
       _classCallCheck(this, WrapText);
-      return _super.apply(this, arguments);
+      return _super.call(this, Object.assign(Object.assign({}, params), {
+        wrap: !0
+      }));
     }
     _createClass(WrapText, [{
       key: "_isValid",
@@ -20266,7 +20278,7 @@
         if (context.beginPath(), keepDirIn3d && context.camera && context.project) {
           var p = context.project(x, y, z),
             camera = context.camera;
-          context.camera = null, !1 === parsedPath.draw(context, size, p.x, p.y, void 0, function (p, a) {
+          context.camera = null, !1 === parsedPath.draw(context, isArray$1(size) ? [size[0] * scaleX, size[1] * scaleY] : size * scaleX, p.x, p.y, void 0, function (p, a) {
             var _a, _b, _c;
             if (symbol._parsedPath.svgCache) {
               var obj = Object.assign({}, a);
@@ -22891,6 +22903,8 @@
       key: "tryLayout",
       value: function tryLayout(graphic) {
         var _this = this;
+        if (this.layouting) return;
+        this.layouting = !0;
         var p = graphic.parent;
         if (!p || !graphic.needUpdateLayout()) return;
         var theme = getTheme(p).group,
@@ -23017,7 +23031,7 @@
         }
         children.forEach(function (child, idx) {
           child.addUpdateBoundTag(), child.addUpdatePositionTag(), child.clearUpdateLayoutTag();
-        }), p.addUpdateLayoutTag(), clip || this.tempBounds.equals(p.AABBBounds) || this.tryLayout(p);
+        }), p.addUpdateLayoutTag(), clip || this.tempBounds.equals(p.AABBBounds) || (this.tryLayout(p), this.layouting = !1);
       }
     }, {
       key: "layoutMain",
@@ -23038,33 +23052,38 @@
             var _pos3 = padding;
             for (var _i3 = lastIdx; _i3 <= currSeg.idx; _i3++) children[_i3].attribute[main.field] = _pos3 + getPadding(children[_i3], main.field), _pos3 += mianLenArray[_i3].mainLen + 2 * padding;
           }
-        } else if ("space-between" === justifyContent) if (currSeg.mainLen >= main.len) {
-          var _pos4 = 0;
-          for (var _i4 = lastIdx; _i4 <= currSeg.idx; _i4++) children[_i4].attribute[main.field] = _pos4 + getPadding(children[_i4], main.field), _pos4 += mianLenArray[_i4].mainLen;
-        } else {
-          var _size = currSeg.idx - lastIdx + 1,
-            _padding2 = (main.len - currSeg.mainLen) / (2 * _size - 2);
-          var _pos5 = 0;
-          for (var _i5 = lastIdx; _i5 <= currSeg.idx; _i5++) children[_i5].attribute[main.field] = _pos5 + getPadding(children[_i5], main.field), _pos5 += mianLenArray[_i5].mainLen + 2 * _padding2;
+        } else if ("space-between" === justifyContent) {
+          if (currSeg.mainLen >= main.len) {
+            var _pos4 = 0;
+            for (var _i4 = lastIdx; _i4 <= currSeg.idx; _i4++) children[_i4].attribute[main.field] = _pos4 + getPadding(children[_i4], main.field), _pos4 += mianLenArray[_i4].mainLen;
+          } else {
+            var _size = currSeg.idx - lastIdx + 1,
+              _padding2 = (main.len - currSeg.mainLen) / (2 * _size - 2);
+            var _pos5 = 0;
+            for (var _i5 = lastIdx; _i5 <= currSeg.idx; _i5++) children[_i5].attribute[main.field] = _pos5 + getPadding(children[_i5], main.field), _pos5 += mianLenArray[_i5].mainLen + 2 * _padding2;
+          }
+        } else if ("center" === justifyContent) {
+          var _pos6 = (main.len - currSeg.mainLen) / 2;
+          for (var _i6 = lastIdx; _i6 <= currSeg.idx; _i6++) children[_i6].attribute[main.field] = _pos6 + getPadding(children[_i6], main.field), _pos6 += mianLenArray[_i6].mainLen;
         }
       }
     }, {
       key: "layoutCross",
       value: function layoutCross(children, alignItem, cross, anchorPos, lenArray, currSeg, lastIdx) {
-        if ("flex-end" === alignItem) for (var i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[cross.field] = anchorPos - lenArray[i].crossLen + getPadding(children[i], cross.field);else if ("center" === alignItem) for (var _i6 = lastIdx; _i6 <= currSeg.idx; _i6++) children[_i6].attribute[cross.field] = anchorPos - lenArray[_i6].crossLen / 2 + getPadding(children[_i6], cross.field);else for (var _i7 = lastIdx; _i7 <= currSeg.idx; _i7++) children[_i7].attribute[cross.field] = anchorPos + getPadding(children[_i7], cross.field);
+        if ("flex-end" === alignItem) for (var i = lastIdx; i <= currSeg.idx; i++) children[i].attribute[cross.field] = anchorPos - lenArray[i].crossLen + getPadding(children[i], cross.field);else if ("center" === alignItem) for (var _i7 = lastIdx; _i7 <= currSeg.idx; _i7++) children[_i7].attribute[cross.field] = anchorPos - lenArray[_i7].crossLen / 2 + getPadding(children[_i7], cross.field);else for (var _i8 = lastIdx; _i8 <= currSeg.idx; _i8++) children[_i8].attribute[cross.field] = anchorPos + getPadding(children[_i8], cross.field);
       }
     }, {
       key: "activate",
       value: function activate(context) {
         var _this2 = this;
         this.pluginService = context, application.graphicService.hooks.onAttributeUpdate.tap(this.key, function (graphic) {
-          graphic.glyphHost && (graphic = graphic.glyphHost), _this2.tryLayout(graphic);
+          graphic.glyphHost && (graphic = graphic.glyphHost), _this2.tryLayout(graphic), _this2.layouting = !1;
         }), application.graphicService.hooks.beforeUpdateAABBBounds.tap(this.key, function (graphic, stage, willUpdate, bounds) {
-          graphic.glyphHost && (graphic = graphic.glyphHost), stage && stage === _this2.pluginService.stage && stage.renderCount && _tempBounds.copy(bounds);
+          graphic.glyphHost && (graphic = graphic.glyphHost), stage && stage === _this2.pluginService.stage && graphic.isContainer && _tempBounds.copy(bounds);
         }), application.graphicService.hooks.afterUpdateAABBBounds.tap(this.key, function (graphic, stage, bounds, params, selfChange) {
-          stage && stage === _this2.pluginService.stage && stage.renderCount && (_tempBounds.equals(bounds) || _this2.tryLayout(graphic));
+          stage && stage === _this2.pluginService.stage && graphic.isContainer && (_tempBounds.equals(bounds) || (_this2.tryLayout(graphic), _this2.layouting = !1));
         }), application.graphicService.hooks.onSetStage.tap(this.key, function (graphic) {
-          graphic.glyphHost && (graphic = graphic.glyphHost), _this2.tryLayout(graphic);
+          graphic.glyphHost && (graphic = graphic.glyphHost), _this2.tryLayout(graphic), _this2.layouting = !1;
         });
       }
     }, {
@@ -34327,7 +34346,7 @@
 
   var roughModule = _roughModule;
 
-  const version = "0.17.4";
+  const version = "0.17.5-alpha.1";
   if (isBrowserEnv()) {
       loadBrowserEnv(container);
   }