@visactor/vrender-components 0.17.4 → 0.17.5-alpha.1

package/dist/index.js

@@ -3163,6 +3163,7 @@
     wordBreak: "break-all",
     ignoreBuf: !1,
     verticalMode: 0,
+    wrap: !1,
     whiteSpace: "no-wrap",
     heightLimit: 1 / 0,
     lineClamp: 1 / 0,
@@ -8218,7 +8219,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);
@@ -8278,7 +8279,9 @@
       key: "_isValid",
       value: function _isValid() {
         var text = this.attribute.text;
-        return null != text && "" !== text;
+        return vutils.isArray(text) ? !text.every(function (t) {
+          return null == t || "" === t;
+        }) : null != text && "" !== text;
       }
     }, {
       key: "doUpdateAABBBounds",
@@ -8426,7 +8429,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,
@@ -8584,7 +8590,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,
@@ -8771,9 +8780,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",
@@ -14311,7 +14322,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, vutils.isArray(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);
@@ -18554,6 +18565,10 @@
               e.stopPropagation();
               const { direction } = this.attribute;
               this._prePos = direction === 'horizontal' ? e.clientX : e.clientY;
+              this._dispatchEvent('scrollDown', {
+                  pos: this._prePos,
+                  event: e
+              });
               if (vglobal.env === 'browser') {
                   vglobal.addEventListener('pointermove', this._onSliderPointerMove, { capture: true });
                   vglobal.addEventListener('pointerup', this._onSliderPointerUp);
@@ -20693,6 +20708,7 @@
           const currentTextMap = new Map();
           const prevTextMap = this._graphicToText || new Map();
           const texts = [];
+          const labelLines = [];
           labels.forEach((text, index) => {
               var _a, _b, _c, _d, _e, _f, _g;
               const labelLine = this._labelLine(text);
@@ -20708,12 +20724,14 @@
                       this.add(text);
                       if (labelLine) {
                           this._setStatesOfLabelLine(labelLine);
+                          labelLines.push(labelLine);
                           this.add(labelLine);
                       }
                       this._syncStateWithRelatedGraphic(relatedGraphic);
                       relatedGraphic.once('animate-bind', a => {
                           text.setAttributes(from);
-                          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, to, this._animationConfig.enter);
+                          labelLine && labelLine.setAttributes(from);
+                          const listener = this._afterRelatedGraphicAttributeUpdate(text, texts, labelLine, labelLines, index, relatedGraphic, to, this._animationConfig.enter);
                           relatedGraphic.on('afterAttributeUpdate', listener);
                       });
                   }
@@ -20784,22 +20802,23 @@
               relatedGraphic.on('afterAttributeUpdate', this._handleRelatedGraphicSetState);
           }
       }
-      _afterRelatedGraphicAttributeUpdate(text, texts, index, relatedGraphic, to, { mode, duration, easing, delay }) {
+      _afterRelatedGraphicAttributeUpdate(text, texts, labelLine, labelLines, index, relatedGraphic, to, { mode, duration, easing, delay }) {
           const listener = (event) => {
-              var _a, _b;
+              var _a, _b, _c;
               const { detail } = event;
               if (!detail) {
                   return {};
               }
-              const isValidAnimateState = detail &&
-                  detail.type === AttributeUpdateType.ANIMATE_UPDATE &&
-                  detail.animationState &&
-                  ((_a = detail.animationState.step) === null || _a === void 0 ? void 0 : _a.type) !== 'wait';
+              const step = (_a = detail.animationState) === null || _a === void 0 ? void 0 : _a.step;
+              const isValidAnimateState = detail.type === AttributeUpdateType.ANIMATE_UPDATE &&
+                  step &&
+                  !(step.type === 'wait' && ((_b = step.prev) === null || _b === void 0 ? void 0 : _b.type) == null);
               if (!isValidAnimateState) {
                   return {};
               }
               if (detail.type === AttributeUpdateType.ANIMATE_END) {
                   text.setAttributes(to);
+                  labelLine && labelLine.setAttributes(to);
                   return;
               }
               const onStart = () => {
@@ -20812,6 +20831,7 @@
                   case 'after':
                       if (detail.animationState.end) {
                           text.animate({ onStart }).wait(delay).to(to, duration, easing);
+                          labelLine && labelLine.animate().wait(delay).to(to, duration, easing);
                       }
                       break;
                   case 'after-all':
@@ -20820,6 +20840,9 @@
                               texts.forEach(t => {
                                   t.animate({ onStart }).wait(delay).to(to, duration, easing);
                               });
+                              labelLines.forEach(t => {
+                                  t.animate().wait(delay).to(to, duration, easing);
+                              });
                           }
                       }
                       break;
@@ -20829,12 +20852,14 @@
                           const point = this._idToPoint.get(text.attribute.id);
                           if (point &&
                               (!text.animates || !text.animates.has('label-animate')) &&
-                              relatedGraphic.containsPoint(point.x, point.y, IContainPointMode.LOCAL, (_b = this.stage) === null || _b === void 0 ? void 0 : _b.pickerService)) {
+                              relatedGraphic.containsPoint(point.x, point.y, IContainPointMode.LOCAL, (_c = this.stage) === null || _c === void 0 ? void 0 : _c.pickerService)) {
                               text.animate({ onStart }).wait(delay).to(to, duration, easing);
+                              labelLine && labelLine.animate().wait(delay).to(to, duration, easing);
                           }
                       }
                       else if (detail.animationState.isFirstFrameOfStep) {
                           text.animate({ onStart }).wait(delay).to(to, duration, easing);
+                          labelLine && labelLine.animate().wait(delay).to(to, duration, easing);
                       }
                       break;
               }
@@ -29901,7 +29926,7 @@
       }
   };
 
-  const version = "0.17.4";
+  const version = "0.17.5-alpha.1";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;