@visactor/vrender-components 0.16.17-alpha.3 → 0.16.17-alpha.4

package/dist/index.js

@@ -7715,7 +7715,7 @@
 
   var tempMatrix = new vutils.Matrix(),
     tempBounds$1 = new vutils.AABBBounds();
-  var GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "lineCap", "lineJoin", "miterLimit", "scaleX", "scaleY", "angle", "anchor"];
+  var GRAPHIC_UPDATE_TAG_KEY = ["lineWidth", "scaleX", "scaleY", "angle", "anchor", "visible"];
   var tempConstantXYKey = ["x", "y"],
     tempConstantScaleXYKey = ["scaleX", "scaleY"],
     tempConstantAngleKey = ["angle"],
@@ -12483,7 +12483,8 @@
         var _this2 = this;
         var _a;
         var _this$attribute = this.attribute,
-          textConfig = _this$attribute.textConfig,
+          _this$attribute$textC = _this$attribute.textConfig,
+          textConfig = _this$attribute$textC === void 0 ? [] : _this$attribute$textC,
           maxWidth = _this$attribute.maxWidth,
           maxHeight = _this$attribute.maxHeight,
           width = _this$attribute.width,
@@ -13526,6 +13527,7 @@
     }, {
       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,
@@ -13559,13 +13561,14 @@
     }, {
       key: "updateGlyphAABBBounds",
       value: function updateGlyphAABBBounds(attribute, theme, aabbBounds, graphic) {
-        return graphic.getSubGraphic().forEach(function (node) {
+        return this._validCheck(attribute, theme, aabbBounds, graphic) ? (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,
@@ -13618,6 +13621,7 @@
     }, {
       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;
@@ -13642,6 +13646,7 @@
     }, {
       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;
@@ -13693,6 +13698,7 @@
     }, {
       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;
@@ -13713,6 +13719,7 @@
     }, {
       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;
@@ -13746,6 +13753,7 @@
     }, {
       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;
@@ -13781,6 +13789,7 @@
     }, {
       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;
@@ -13809,6 +13818,7 @@
     }, {
       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;
@@ -13850,6 +13860,7 @@
     }, {
       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;
@@ -13882,6 +13893,7 @@
     }, {
       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,
@@ -13928,6 +13940,15 @@
         }
         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;
   }();
@@ -20795,18 +20816,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) {
@@ -20821,13 +20842,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;
@@ -20986,8 +21021,8 @@
           this.name = 'tag';
       }
       render() {
-          var _a, _b, _c;
-          const { text = '', textStyle = {}, shape = {}, panel = {}, space = 4, minWidth, maxWidth, padding = 4, visible, state, type = 'text' } = this.attribute;
+          var _a;
+          const { text = '', textStyle = {}, shape = {}, panel = {}, space = 4, minWidth, maxWidth, padding = 4, visible, state } = this.attribute;
           const parsedPadding = vutils.normalizePadding(padding);
           const group = this.createOrUpdateChild('tag-content', { x: 0, y: 0, zIndex: 1 }, 'group');
           let symbol;
@@ -21009,100 +21044,75 @@
           }
           tagWidth += symbolPlaceWidth;
           textX += symbolPlaceWidth;
-          let textShape;
-          if (type === 'rich') {
-              const richTextAttrs = Object.assign(Object.assign({ textConfig: text, visible: vutils.isValid(text) && visible !== false }, textStyle), { x: textX, y: 0, width: (_a = textStyle.width) !== null && _a !== void 0 ? _a : 0, height: (_b = textStyle.height) !== null && _b !== void 0 ? _b : 0 });
-              textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext');
-              const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
-              if (visible && vutils.isBoolean(bgVisible)) {
-                  const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, x: textShape.AABBBounds.x1, y: textShape.AABBBounds.y1, width: textShape.AABBBounds.width(), height: textShape.AABBBounds.height() }), 'rect');
-                  if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
-                      bgRect.states = state.panel;
-                  }
+          const textAttrs = Object.assign(Object.assign({ text, visible: vutils.isValid(text) && visible !== false, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }, textStyle), { x: textX, y: 0 });
+          if (vutils.isNil(textAttrs.lineHeight)) {
+              textAttrs.lineHeight = textAttrs.fontSize;
+          }
+          const textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text');
+          if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.text)) {
+              textShape.states = state.text;
+          }
+          const textBounds = measureTextSize(textAttrs.text, textStyle);
+          const textWidth = textBounds.width;
+          const textHeight = textBounds.height;
+          tagWidth += textWidth;
+          const size = (_a = shape.size) !== null && _a !== void 0 ? _a : 10;
+          const maxSize = vutils.isNumber(size) ? size : Math.max(size[0], size[1]);
+          tagHeight += Math.max(textHeight, (shape === null || shape === void 0 ? void 0 : shape.visible) ? maxSize : 0);
+          const { textAlign, textBaseline } = textStyle;
+          if (vutils.isValid(minWidth) || vutils.isValid(maxWidth)) {
+              if (vutils.isValid(minWidth) && tagWidth < minWidth) {
+                  tagWidth = minWidth;
+              }
+              if (vutils.isValid(maxWidth) && tagWidth > maxWidth) {
+                  tagWidth = maxWidth;
+                  textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);
+              }
+          }
+          let x = 0;
+          let y = 0;
+          if (textAlign === 'center') {
+              x -= tagWidth / 2;
+              if (symbol) {
+                  symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);
               }
+              group.setAttribute('x', -symbolPlaceWidth / 2);
           }
-          else if (type === 'html') {
-              const richTextAttrs = Object.assign(Object.assign({ textConfig: [], visible: vutils.isValid(text) && visible !== false, html: Object.assign({ dom: text, container: '', width: 30, height: 30, style: {} }, textStyle) }, textStyle), { x: textX, y: 0 });
-              textShape = group.createOrUpdateChild('tag-text', richTextAttrs, 'richtext');
-              const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
-              if (visible && vutils.isBoolean(bgVisible)) {
-                  const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, x: textShape.AABBBounds.x1, y: textShape.AABBBounds.y1, width: textShape.AABBBounds.width(), height: textShape.AABBBounds.height() }), 'rect');
-                  if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
-                      bgRect.states = state.panel;
-                  }
+          else if (textAlign === 'right' || textAlign === 'end') {
+              x -= tagWidth;
+              if (symbol) {
+                  symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);
               }
+              group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);
           }
-          else {
-              const textAttrs = Object.assign(Object.assign({ text: text, visible: vutils.isValid(text) && visible !== false, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }, textStyle), { x: textX, y: 0 });
-              if (vutils.isNil(textAttrs.lineHeight)) {
-                  textAttrs.lineHeight = textStyle.fontSize;
-              }
-              textShape = group.createOrUpdateChild('tag-text', textAttrs, 'text');
-              if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.text)) {
-                  textShape.states = state.text;
-              }
-              const textBounds = measureTextSize(textAttrs.text, textStyle);
-              const textWidth = textBounds.width;
-              const textHeight = textBounds.height;
-              tagWidth += textWidth;
-              const size = (_c = shape.size) !== null && _c !== void 0 ? _c : 10;
-              const maxSize = vutils.isNumber(size) ? size : Math.max(size[0], size[1]);
-              tagHeight += Math.max(textHeight, (shape === null || shape === void 0 ? void 0 : shape.visible) ? maxSize : 0);
-              const { textAlign, textBaseline } = textStyle;
-              if (vutils.isValid(minWidth) || vutils.isValid(maxWidth)) {
-                  if (vutils.isValid(minWidth) && tagWidth < minWidth) {
-                      tagWidth = minWidth;
-                  }
-                  if (vutils.isValid(maxWidth) && tagWidth > maxWidth) {
-                      tagWidth = maxWidth;
-                      textShape.setAttribute('maxLineWidth', maxWidth - parsedPadding[1] - parsedPadding[2]);
-                  }
-              }
-              let x = 0;
-              let y = 0;
-              if (textAlign === 'center') {
-                  x -= tagWidth / 2;
-                  if (symbol) {
-                      symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth / 2);
-                  }
-                  group.setAttribute('x', -symbolPlaceWidth / 2);
-              }
-              else if (textAlign === 'right' || textAlign === 'end') {
-                  x -= tagWidth;
-                  if (symbol) {
-                      symbol.setAttribute('x', (symbol.attribute.x || 0) - textWidth);
-                  }
-                  group.setAttribute('x', -parsedPadding[1] - symbolPlaceWidth);
-              }
-              else if (textAlign === 'left' || textAlign === 'start') {
-                  group.setAttribute('x', parsedPadding[3]);
-              }
-              if (textBaseline === 'middle') {
-                  y -= tagHeight / 2;
-                  if (symbol) {
-                      symbol.setAttribute('y', 0);
-                  }
+          else if (textAlign === 'left' || textAlign === 'start') {
+              group.setAttribute('x', parsedPadding[3]);
+          }
+          if (textBaseline === 'middle') {
+              y -= tagHeight / 2;
+              if (symbol) {
+                  symbol.setAttribute('y', 0);
               }
-              else if (textBaseline === 'bottom') {
-                  y -= tagHeight;
-                  if (symbol) {
-                      symbol.setAttribute('y', -textHeight / 2);
-                  }
-                  group.setAttribute('y', -parsedPadding[2]);
+          }
+          else if (textBaseline === 'bottom') {
+              y -= tagHeight;
+              if (symbol) {
+                  symbol.setAttribute('y', -textHeight / 2);
               }
-              else if (textBaseline === 'top') {
-                  group.setAttribute('y', parsedPadding[0]);
-                  if (symbol) {
-                      symbol.setAttribute('y', textHeight / 2);
-                  }
+              group.setAttribute('y', -parsedPadding[2]);
+          }
+          else if (textBaseline === 'top') {
+              group.setAttribute('y', parsedPadding[0]);
+              if (symbol) {
+                  symbol.setAttribute('y', textHeight / 2);
               }
-              const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
-              if (visible && vutils.isBoolean(bgVisible)) {
-                  const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, x,
-                      y, width: tagWidth, height: tagHeight }), 'rect');
-                  if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
-                      bgRect.states = state.panel;
-                  }
+          }
+          const { visible: bgVisible } = panel, backgroundStyle = __rest(panel, ["visible"]);
+          if (visible && vutils.isBoolean(bgVisible)) {
+              const bgRect = this.createOrUpdateChild('tag-panel', Object.assign(Object.assign({}, backgroundStyle), { visible: bgVisible && !!text, x,
+                  y, width: tagWidth, height: tagHeight }), 'rect');
+              if (!vutils.isEmpty(state === null || state === void 0 ? void 0 : state.panel)) {
+                  bgRect.states = state.panel;
               }
           }
       }
@@ -22371,24 +22381,6 @@
           target.states = state;
       }
       _createLabelText(attributes) {
-          var _a, _b;
-          if (attributes.textType === 'rich') {
-              attributes.textConfig = attributes.text;
-              attributes.width = (_a = attributes.width) !== null && _a !== void 0 ? _a : 0;
-              attributes.height = (_b = attributes.height) !== null && _b !== void 0 ? _b : 0;
-              const text = createRichText(attributes);
-              this._bindEvent(text);
-              this._setStatesOfText(text);
-              return text;
-          }
-          else if (attributes.textType === 'html') {
-              attributes.textConfig = [];
-              attributes.html = Object.assign({ dom: attributes.text, container: '', width: 30, height: 30, style: {} }, attributes);
-              const text = createRichText(attributes);
-              this._bindEvent(text);
-              this._setStatesOfText(text);
-              return text;
-          }
           const text = createText(attributes);
           this._bindEvent(text);
           this._setStatesOfText(text);
@@ -22484,10 +22476,11 @@
                       : baseMark.attribute.fill }, textStyle), textData);
               const text = this._createLabelText(labelAttribute);
               const textBounds = this.getGraphicBounds(text);
+              const actualPosition = vutils.isFunction(position) ? position(textData) : position;
               const graphicBounds = this._isCollectionBase
-                  ? this.getGraphicBounds(null, this._idToPoint.get(textData.id))
-                  : this.getGraphicBounds(baseMark, { x: textData.x, y: textData.y });
-              const textLocation = this.labeling(textBounds, graphicBounds, vutils.isFunction(position) ? position(textData) : position, offset);
+                  ? this.getGraphicBounds(null, this._idToPoint.get(textData.id), actualPosition)
+                  : this.getGraphicBounds(baseMark, { x: textData.x, y: textData.y }, actualPosition);
+              const textLocation = this.labeling(textBounds, graphicBounds, actualPosition, offset);
               if (textLocation) {
                   labelAttribute.x = textLocation.x;
                   labelAttribute.y = textLocation.y;
@@ -22568,13 +22561,19 @@
               }
               if (!hasPlace && clampForce) {
                   const { dx = 0, dy = 0 } = clampText(text, bmpTool.width, bmpTool.height);
-                  if (!(dx === 0 && dy === 0) &&
-                      canPlace(bmpTool, bitmap, {
-                          x1: text.AABBBounds.x1 + dx,
-                          x2: text.AABBBounds.x2 + dx,
-                          y1: text.AABBBounds.y1 + dy,
-                          y2: text.AABBBounds.y2 + dy
-                      })) {
+                  if (dx === 0 && dy === 0) {
+                      if (canPlace(bmpTool, bitmap, text.AABBBounds)) {
+                          bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));
+                          result.push(text);
+                          continue;
+                      }
+                  }
+                  else if (canPlace(bmpTool, bitmap, {
+                      x1: text.AABBBounds.x1 + dx,
+                      x2: text.AABBBounds.x2 + dx,
+                      y1: text.AABBBounds.y1 + dy,
+                      y2: text.AABBBounds.y2 + dy
+                  })) {
                       text.setAttributes({ x: text.attribute.x + dx, y: text.attribute.y + dy });
                       bitmap.setRange(boundToRange(bmpTool, text.AABBBounds, true));
                       result.push(text);
@@ -22768,7 +22767,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';
@@ -22786,7 +22785,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);
@@ -22814,7 +22813,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;
                       }
@@ -22976,12 +22975,11 @@
           super(vutils.merge({}, LineLabel.defaultAttributes, attributes));
           this.name = 'line-label';
       }
-      getGraphicBounds(graphic, point = {}) {
+      getGraphicBounds(graphic, point = {}, position = 'end') {
           var _a;
-          if (graphic.type !== 'line') {
+          if (!graphic || graphic.type !== 'line') {
               return super.getGraphicBounds(graphic, point);
           }
-          const { position = 'end' } = this.attribute;
           const points = ((_a = graphic === null || graphic === void 0 ? void 0 : graphic.attribute) === null || _a === void 0 ? void 0 : _a.points) || [point];
           const index = position === 'start' ? 0 : points.length - 1;
           return {
@@ -23732,39 +23730,16 @@
       pickable: false
   };
 
-  class LineDataLabel extends LabelBase {
-      constructor(attributes) {
-          super(vutils.merge({}, LineDataLabel.defaultAttributes, attributes));
-          this.name = 'line-data-label';
-      }
-      labeling(textBounds, graphicBounds, position = 'top', offset = 0) {
-          return labelingPoint(textBounds, graphicBounds, position, offset);
-      }
-  }
-  LineDataLabel.defaultAttributes = {
-      textStyle: {
-          fontSize: 12,
-          fill: '#000',
-          textAlign: 'center',
-          textBaseline: 'middle',
-          boundsPadding: [-1, 0, -1, 0]
-      },
-      position: 'top',
-      offset: 5,
-      pickable: false
-  };
-
   class AreaLabel extends LabelBase {
       constructor(attributes) {
           super(vutils.merge({}, AreaLabel.defaultAttributes, attributes));
           this.name = 'line-label';
       }
-      getGraphicBounds(graphic, point = {}) {
+      getGraphicBounds(graphic, point = {}, position = 'end') {
           var _a;
           if (graphic.type !== 'area') {
               return super.getGraphicBounds(graphic, point);
           }
-          const { position = 'end' } = this.attribute;
           const points = ((_a = graphic === null || graphic === void 0 ? void 0 : graphic.attribute) === null || _a === void 0 ? void 0 : _a.points) || [point];
           const index = position === 'start' ? 0 : points.length - 1;
           return {
@@ -23791,6 +23766,28 @@
       pickable: false
   };
 
+  class LineDataLabel extends LabelBase {
+      constructor(attributes) {
+          super(vutils.merge({}, LineDataLabel.defaultAttributes, attributes));
+          this.name = 'line-data-label';
+      }
+      labeling(textBounds, graphicBounds, position = 'top', offset = 0) {
+          return labelingPoint(textBounds, graphicBounds, position, offset);
+      }
+  }
+  LineDataLabel.defaultAttributes = {
+      textStyle: {
+          fontSize: 12,
+          fill: '#000',
+          textAlign: 'center',
+          textBaseline: 'middle',
+          boundsPadding: [-1, 0, -1, 0]
+      },
+      position: 'top',
+      offset: 5,
+      pickable: false
+  };
+
   const labelComponentMap = {
       rect: RectLabel,
       symbol: SymbolLabel,
@@ -24351,26 +24348,12 @@
           let textAlign = 'center';
           let textBaseline = 'middle';
           data.forEach((item, index) => {
-              var _a, _b, _c, _d;
+              var _a, _b;
               const labelStyle = this._getLabelAttribute(item, index, data, layer);
-              let text;
-              if ((labelStyle === null || labelStyle === void 0 ? void 0 : labelStyle.type) === 'rich') {
-                  labelStyle.textConfig = labelStyle.text;
-                  labelStyle.width = (_a = labelStyle.width) !== null && _a !== void 0 ? _a : 0;
-                  labelStyle.height = (_b = labelStyle.height) !== null && _b !== void 0 ? _b : 0;
-                  text = createRichText(labelStyle);
-              }
-              else if ((labelStyle === null || labelStyle === void 0 ? void 0 : labelStyle.type) === 'html') {
-                  labelStyle.textConfig = [];
-                  labelStyle.html = Object.assign({ dom: labelStyle.text, container: '', width: 30, height: 30, style: {} }, labelStyle);
-                  text = createRichText(labelStyle);
-              }
-              else {
-                  text = createText(labelStyle);
-              }
+              const text = createText(labelStyle);
               text.name = exports.AXIS_ELEMENT_NAME.label;
               text.id = this._getNodeId(`layer${layer}-label-${item.id}`);
-              if (vutils.isEmpty((_c = this.attribute.label) === null || _c === void 0 ? void 0 : _c.state)) {
+              if (vutils.isEmpty((_a = this.attribute.label) === null || _a === void 0 ? void 0 : _a.state)) {
                   text.states = DEFAULT_STATES$2;
               }
               else {
@@ -24383,7 +24366,7 @@
                   text.states = labelState;
               }
               labelGroup.add(text);
-              const angle = (_d = labelStyle.angle) !== null && _d !== void 0 ? _d : 0;
+              const angle = (_b = labelStyle.angle) !== null && _b !== void 0 ? _b : 0;
               maxTextWidth = Math.max(maxTextWidth, text.AABBBounds.width());
               maxTextHeight = Math.max(maxTextHeight, text.AABBBounds.height());
               if (angle) {
@@ -24532,7 +24515,7 @@
       }
       _getLabelAttribute(tickDatum, index, tickData, layer) {
           var _a, _b, _c, _d, _e, _f;
-          const _g = this.attribute.label, { space = 4, inside = false, formatMethod, type = 'text', text } = _g, tagAttributes = __rest(_g, ["space", "inside", "formatMethod", "type", "text"]);
+          const _g = this.attribute.label, { space = 4, inside = false, formatMethod } = _g, tagAttributes = __rest(_g, ["space", "inside", "formatMethod"]);
           let offset = space;
           let tickLength = 0;
           if (((_a = this.attribute.tick) === null || _a === void 0 ? void 0 : _a.visible) && ((_b = this.attribute.tick) === null || _b === void 0 ? void 0 : _b.inside) === inside) {
@@ -24553,9 +24536,7 @@
           }
           const point = this.getVerticalCoord(tickDatum.point, offset, inside);
           const vector = this.getVerticalVector(offset, inside, point);
-          const textContent = formatMethod
-              ? formatMethod(`${tickDatum.label}`, tickDatum, index, tickData, layer)
-              : tickDatum.label;
+          const text = formatMethod ? formatMethod(`${tickDatum.label}`, tickDatum, index, tickData, layer) : tickDatum.label;
           let { style: textStyle } = tagAttributes;
           textStyle = vutils.isFunction(textStyle)
               ? vutils.merge({}, DEFAULT_AXIS_THEME.label.style, textStyle(tickDatum, index, tickData, layer))
@@ -24570,7 +24551,7 @@
                   layer
               });
           }
-          return Object.assign(Object.assign(Object.assign({}, this.getLabelPosition(point, vector, textContent, textStyle)), { text: text !== null && text !== void 0 ? text : textContent, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize, type }), textStyle);
+          return Object.assign(Object.assign(Object.assign({}, this.getLabelPosition(point, vector, text, textStyle)), { text, lineHeight: textStyle === null || textStyle === void 0 ? void 0 : textStyle.fontSize }), textStyle);
       }
       getLabelPosition(point, vector, text, style) {
           return point;
@@ -25308,7 +25289,7 @@
           let titleSpacing = 0;
           const axisLineWidth = (line === null || line === void 0 ? void 0 : line.visible) ? (_b = line.style.lineWidth) !== null && _b !== void 0 ? _b : 1 : 0;
           const tickLength = (tick === null || tick === void 0 ? void 0 : tick.visible) ? (_c = tick.length) !== null && _c !== void 0 ? _c : 4 : 0;
-          if ((title === null || title === void 0 ? void 0 : title.visible) && typeof title.text === 'string') {
+          if (title === null || title === void 0 ? void 0 : title.visible) {
               titleHeight = measureTextSize(title.text, title.textStyle).height;
               const padding = vutils.normalizePadding(title.padding);
               titleSpacing = title.space + padding[0] + padding[2];
@@ -28150,7 +28131,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: false, pickMode: 'imprecise', boundsPadding: parsedPadding }));
+              focusShape = createSymbol(Object.assign(Object.assign({ x: 0, y: -focusSize / 2 - 1, strokeBoundsBuffer: 0 }, focusIconStyle), { visible: true, pickMode: 'imprecise', boundsPadding: parsedPadding }));
               this._appendDataToShape(focusShape, exports.LEGEND_ELEMENT_NAME.focus, item, itemGroup);
               focusSpace = focusSize;
           }
@@ -28225,6 +28206,7 @@
           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;
       }
@@ -29539,27 +29521,19 @@
           this.name = 'title';
       }
       render() {
-          var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, _65, _66, _67, _68, _69;
-          const { textType, text, subtextType, textStyle, subtext, subtextStyle, width, height, minWidth, maxWidth, minHeight, maxHeight, align, verticalAlign, padding = 0 } = this.attribute;
+          var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37;
+          const { text, textStyle, subtext, subtextStyle, width, height, minWidth, maxWidth, minHeight, maxHeight, align, verticalAlign, padding = 0 } = this.attribute;
           const parsedPadding = vutils.normalizePadding(padding);
           const group = this.createOrUpdateChild('title-container', { x: parsedPadding[3], y: parsedPadding[0], zIndex: 1 }, 'group');
           if (((_a = this.attribute) === null || _a === void 0 ? void 0 : _a.visible) !== false && (textStyle === null || textStyle === void 0 ? void 0 : textStyle.visible) !== false) {
-              if (textType === 'rich') {
-                  const attr = Object.assign({ x: (_b = textStyle.x) !== null && _b !== void 0 ? _b : 0, y: (_c = textStyle.y) !== null && _c !== void 0 ? _c : 0, width: (_e = (_d = textStyle.width) !== null && _d !== void 0 ? _d : width) !== null && _e !== void 0 ? _e : 0, height: (_g = (_f = textStyle.height) !== null && _f !== void 0 ? _f : height) !== null && _g !== void 0 ? _g : 0, ellipsis: (_h = textStyle.ellipsis) !== null && _h !== void 0 ? _h : true, wordBreak: (_j = textStyle.wordBreak) !== null && _j !== void 0 ? _j : 'break-word', maxHeight: textStyle.maxHeight, maxWidth: textStyle.maxWidth, textConfig: text }, textStyle);
-                  this._mainTitle = group.createOrUpdateChild('mainTitle', attr, 'richtext');
-              }
-              else if (textType === 'html') {
-                  const attr = Object.assign({ html: Object.assign({ dom: text, container: '', width: 30, height: 30, style: '' }, textStyle), x: (_k = textStyle.x) !== null && _k !== void 0 ? _k : 0, y: (_l = textStyle.y) !== null && _l !== void 0 ? _l : 0, width: (_o = (_m = textStyle.width) !== null && _m !== void 0 ? _m : width) !== null && _o !== void 0 ? _o : 0, height: (_q = (_p = textStyle.height) !== null && _p !== void 0 ? _p : height) !== null && _q !== void 0 ? _q : 0, ellipsis: (_r = textStyle.ellipsis) !== null && _r !== void 0 ? _r : true, wordBreak: (_s = textStyle.wordBreak) !== null && _s !== void 0 ? _s : 'break-word', maxHeight: textStyle.maxHeight, maxWidth: textStyle.maxWidth, textConfig: [] }, textStyle);
-                  this._mainTitle = group.createOrUpdateChild('mainTitle', attr, 'richtext');
-              }
-              else if (textStyle && vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.character)) {
+              if (textStyle && vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.character)) {
                   const attr = {
-                      x: (_t = textStyle.x) !== null && _t !== void 0 ? _t : 0,
-                      y: (_u = textStyle.y) !== null && _u !== void 0 ? _u : 0,
-                      width: (_w = (_v = textStyle.width) !== null && _v !== void 0 ? _v : width) !== null && _w !== void 0 ? _w : 0,
-                      height: (_y = (_x = textStyle.height) !== null && _x !== void 0 ? _x : height) !== null && _y !== void 0 ? _y : 0,
-                      ellipsis: (_z = textStyle.ellipsis) !== null && _z !== void 0 ? _z : true,
-                      wordBreak: (_0 = textStyle.wordBreak) !== null && _0 !== void 0 ? _0 : 'break-word',
+                      x: (_b = textStyle.x) !== null && _b !== void 0 ? _b : 0,
+                      y: (_c = textStyle.y) !== null && _c !== void 0 ? _c : 0,
+                      width: (_e = (_d = textStyle.width) !== null && _d !== void 0 ? _d : width) !== null && _e !== void 0 ? _e : 0,
+                      height: (_g = (_f = textStyle.height) !== null && _f !== void 0 ? _f : height) !== null && _g !== void 0 ? _g : 0,
+                      ellipsis: (_h = textStyle.ellipsis) !== null && _h !== void 0 ? _h : true,
+                      wordBreak: (_j = textStyle.wordBreak) !== null && _j !== void 0 ? _j : 'break-word',
                       maxHeight: textStyle.maxHeight,
                       maxWidth: textStyle.maxWidth,
                       textConfig: textStyle.character
@@ -29567,28 +29541,20 @@
                   this._mainTitle = group.createOrUpdateChild('mainTitle', attr, 'richtext');
               }
               else if (vutils.isValid(text)) {
-                  this._mainTitle = group.createOrUpdateChild('mainTitle', Object.assign(Object.assign({ text: [text] }, textStyle), { maxLineWidth: (_1 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.maxLineWidth) !== null && _1 !== void 0 ? _1 : width, heightLimit: textStyle === null || textStyle === void 0 ? void 0 : textStyle.heightLimit, lineClamp: textStyle === null || textStyle === void 0 ? void 0 : textStyle.lineClamp, ellipsis: (_2 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.ellipsis) !== null && _2 !== void 0 ? _2 : true, x: 0, y: 0 }), 'wrapText');
+                  this._mainTitle = group.createOrUpdateChild('mainTitle', Object.assign(Object.assign({ text: [text] }, textStyle), { maxLineWidth: (_k = textStyle === null || textStyle === void 0 ? void 0 : textStyle.maxLineWidth) !== null && _k !== void 0 ? _k : width, heightLimit: textStyle === null || textStyle === void 0 ? void 0 : textStyle.heightLimit, lineClamp: textStyle === null || textStyle === void 0 ? void 0 : textStyle.lineClamp, ellipsis: (_l = textStyle === null || textStyle === void 0 ? void 0 : textStyle.ellipsis) !== null && _l !== void 0 ? _l : true, x: 0, y: 0 }), 'wrapText');
               }
           }
-          const maintextHeight = this._mainTitle ? (_3 = this._mainTitle) === null || _3 === void 0 ? void 0 : _3.AABBBounds.height() : 0;
-          const maintextWidth = this._mainTitle ? (_4 = this._mainTitle) === null || _4 === void 0 ? void 0 : _4.AABBBounds.width() : 0;
-          if (((_5 = this.attribute) === null || _5 === void 0 ? void 0 : _5.visible) !== false && (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.visible) !== false) {
-              if (subtextType === 'rich') {
-                  const attr = Object.assign({ x: (_6 = subtextStyle.x) !== null && _6 !== void 0 ? _6 : 0, y: (_7 = subtextStyle.y) !== null && _7 !== void 0 ? _7 : 0, width: (_9 = (_8 = subtextStyle.width) !== null && _8 !== void 0 ? _8 : width) !== null && _9 !== void 0 ? _9 : 0, height: (_11 = (_10 = subtextStyle.height) !== null && _10 !== void 0 ? _10 : height) !== null && _11 !== void 0 ? _11 : 0, ellipsis: (_12 = subtextStyle.ellipsis) !== null && _12 !== void 0 ? _12 : true, wordBreak: (_13 = subtextStyle.wordBreak) !== null && _13 !== void 0 ? _13 : 'break-word', maxHeight: subtextStyle.maxHeight, maxWidth: subtextStyle.maxWidth, textConfig: subtext }, subtextStyle);
-                  this._subTitle = group.createOrUpdateChild('subTitle', attr, 'richtext');
-              }
-              else if (textType === 'html') {
-                  const attr = Object.assign({ html: Object.assign({ dom: subtext, container: '', width: 30, height: 30, style: {} }, subtextStyle), x: (_14 = subtextStyle.x) !== null && _14 !== void 0 ? _14 : 0, y: (_15 = subtextStyle.y) !== null && _15 !== void 0 ? _15 : 0, width: (_17 = (_16 = subtextStyle.width) !== null && _16 !== void 0 ? _16 : width) !== null && _17 !== void 0 ? _17 : 0, height: (_19 = (_18 = subtextStyle.height) !== null && _18 !== void 0 ? _18 : height) !== null && _19 !== void 0 ? _19 : 0, ellipsis: (_20 = subtextStyle.ellipsis) !== null && _20 !== void 0 ? _20 : true, wordBreak: (_21 = subtextStyle.wordBreak) !== null && _21 !== void 0 ? _21 : 'break-word', maxHeight: subtextStyle.maxHeight, maxWidth: subtextStyle.maxWidth, textConfig: [] }, subtextStyle);
-                  this._subTitle = group.createOrUpdateChild('subTitle', attr, 'richtext');
-              }
-              else if (subtextStyle && vutils.isValid(subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.character)) {
+          const maintextHeight = this._mainTitle ? (_m = this._mainTitle) === null || _m === void 0 ? void 0 : _m.AABBBounds.height() : 0;
+          const maintextWidth = this._mainTitle ? (_o = this._mainTitle) === null || _o === void 0 ? void 0 : _o.AABBBounds.width() : 0;
+          if (((_p = this.attribute) === null || _p === void 0 ? void 0 : _p.visible) !== false && (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.visible) !== false) {
+              if (subtextStyle && vutils.isValid(subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.character)) {
                   const attr = {
-                      x: (_22 = subtextStyle.x) !== null && _22 !== void 0 ? _22 : 0,
-                      y: (_23 = subtextStyle.y) !== null && _23 !== void 0 ? _23 : maintextHeight,
-                      width: (_25 = (_24 = subtextStyle.width) !== null && _24 !== void 0 ? _24 : width) !== null && _25 !== void 0 ? _25 : 0,
-                      height: (_27 = (_26 = subtextStyle.height) !== null && _26 !== void 0 ? _26 : height) !== null && _27 !== void 0 ? _27 : 0,
-                      ellipsis: (_28 = subtextStyle.ellipsis) !== null && _28 !== void 0 ? _28 : true,
-                      wordBreak: (_29 = subtextStyle.wordBreak) !== null && _29 !== void 0 ? _29 : 'break-word',
+                      x: (_q = subtextStyle.x) !== null && _q !== void 0 ? _q : 0,
+                      y: (_r = subtextStyle.y) !== null && _r !== void 0 ? _r : maintextHeight,
+                      width: (_t = (_s = subtextStyle.width) !== null && _s !== void 0 ? _s : width) !== null && _t !== void 0 ? _t : 0,
+                      height: (_v = (_u = subtextStyle.height) !== null && _u !== void 0 ? _u : height) !== null && _v !== void 0 ? _v : 0,
+                      ellipsis: (_w = subtextStyle.ellipsis) !== null && _w !== void 0 ? _w : true,
+                      wordBreak: (_x = subtextStyle.wordBreak) !== null && _x !== void 0 ? _x : 'break-word',
                       maxHeight: subtextStyle.maxHeight,
                       maxWidth: subtextStyle.maxWidth,
                       textConfig: subtextStyle.character
@@ -29596,17 +29562,17 @@
                   this._subTitle = group.createOrUpdateChild('subTitle', attr, 'richtext');
               }
               else if (vutils.isValid(subtext)) {
-                  this._subTitle = group.createOrUpdateChild('subTitle', Object.assign(Object.assign({ text: [subtext] }, subtextStyle), { maxLineWidth: (_30 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.maxLineWidth) !== null && _30 !== void 0 ? _30 : width, heightLimit: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.heightLimit, lineClamp: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.lineClamp, ellipsis: (_31 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.ellipsis) !== null && _31 !== void 0 ? _31 : true, x: 0, y: maintextHeight }), 'wrapText');
+                  this._subTitle = group.createOrUpdateChild('subTitle', Object.assign(Object.assign({ text: [subtext] }, subtextStyle), { maxLineWidth: (_y = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.maxLineWidth) !== null && _y !== void 0 ? _y : width, heightLimit: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.heightLimit, lineClamp: subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.lineClamp, ellipsis: (_z = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.ellipsis) !== null && _z !== void 0 ? _z : true, x: 0, y: maintextHeight }), 'wrapText');
               }
           }
-          const subtextHeight = this._subTitle ? (_32 = this._subTitle) === null || _32 === void 0 ? void 0 : _32.AABBBounds.height() : 0;
-          const subtextWidth = this._subTitle ? (_33 = this._subTitle) === null || _33 === void 0 ? void 0 : _33.AABBBounds.width() : 0;
+          const subtextHeight = this._subTitle ? (_0 = this._subTitle) === null || _0 === void 0 ? void 0 : _0.AABBBounds.height() : 0;
+          const subtextWidth = this._subTitle ? (_1 = this._subTitle) === null || _1 === void 0 ? void 0 : _1.AABBBounds.width() : 0;
           let titleWidth = Math.max(maintextWidth, subtextWidth);
-          let titleHeight = maintextHeight + ((_34 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _34 !== void 0 ? _34 : subtextHeight);
+          let titleHeight = maintextHeight + ((_2 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _2 !== void 0 ? _2 : subtextHeight);
           if (vutils.isValid(width)) {
               titleWidth = width;
-              (_35 = this._mainTitle) === null || _35 === void 0 ? void 0 : _35.setAttribute('maxLineWidth', width);
-              (_36 = this._subTitle) === null || _36 === void 0 ? void 0 : _36.setAttribute('maxLineWidth', width);
+              (_3 = this._mainTitle) === null || _3 === void 0 ? void 0 : _3.setAttribute('maxLineWidth', width);
+              (_4 = this._subTitle) === null || _4 === void 0 ? void 0 : _4.setAttribute('maxLineWidth', width);
           }
           if (vutils.isValid(height)) {
               titleHeight = height;
@@ -29615,10 +29581,10 @@
               titleWidth = minWidth;
           }
           if (vutils.isValid(maxWidth)) {
-              (_37 = this._mainTitle) === null || _37 === void 0 ? void 0 : _37.setAttribute('maxLineWidth', maxWidth);
-              (_38 = this._subTitle) === null || _38 === void 0 ? void 0 : _38.setAttribute('maxLineWidth', maxWidth);
-              (_39 = this._mainTitle) === null || _39 === void 0 ? void 0 : _39.setAttribute('maxWidth', maxWidth);
-              (_40 = this._subTitle) === null || _40 === void 0 ? void 0 : _40.setAttribute('maxWidth', maxWidth);
+              (_5 = this._mainTitle) === null || _5 === void 0 ? void 0 : _5.setAttribute('maxLineWidth', maxWidth);
+              (_6 = this._subTitle) === null || _6 === void 0 ? void 0 : _6.setAttribute('maxLineWidth', maxWidth);
+              (_7 = this._mainTitle) === null || _7 === void 0 ? void 0 : _7.setAttribute('maxWidth', maxWidth);
+              (_8 = this._subTitle) === null || _8 === void 0 ? void 0 : _8.setAttribute('maxWidth', maxWidth);
               if (titleWidth > maxWidth) {
                   titleWidth = maxWidth;
               }
@@ -29627,8 +29593,8 @@
               titleHeight = minHeight;
           }
           if (vutils.isValid(maxHeight)) {
-              (_41 = this._mainTitle) === null || _41 === void 0 ? void 0 : _41.setAttribute('maxHeight', maxHeight);
-              (_42 = this._subTitle) === null || _42 === void 0 ? void 0 : _42.setAttribute('maxHeight', maxHeight - maintextHeight);
+              (_9 = this._mainTitle) === null || _9 === void 0 ? void 0 : _9.setAttribute('maxHeight', maxHeight);
+              (_10 = this._subTitle) === null || _10 === void 0 ? void 0 : _10.setAttribute('maxHeight', maxHeight - maintextHeight);
               if (titleHeight > maxHeight) {
                   titleHeight = maxHeight;
               }
@@ -29638,67 +29604,67 @@
           group.attribute.boundsPadding = parsedPadding;
           if (vutils.isValid(align) || vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.align)) {
               const mainTitleAlign = (textStyle === null || textStyle === void 0 ? void 0 : textStyle.align) ? textStyle === null || textStyle === void 0 ? void 0 : textStyle.align : align;
-              const mainTitleWidth = (_43 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.width) !== null && _43 !== void 0 ? _43 : maintextWidth;
+              const mainTitleWidth = (_11 = textStyle === null || textStyle === void 0 ? void 0 : textStyle.width) !== null && _11 !== void 0 ? _11 : maintextWidth;
               if (mainTitleAlign === 'left') {
-                  (_44 = this._mainTitle) === null || _44 === void 0 ? void 0 : _44.setAttribute('x', 0);
-                  (_45 = this._mainTitle) === null || _45 === void 0 ? void 0 : _45.setAttribute('textAlign', 'left');
+                  (_12 = this._mainTitle) === null || _12 === void 0 ? void 0 : _12.setAttribute('x', 0);
+                  (_13 = this._mainTitle) === null || _13 === void 0 ? void 0 : _13.setAttribute('textAlign', 'left');
               }
               else if (mainTitleAlign === 'center') {
-                  (_46 = this._mainTitle) === null || _46 === void 0 ? void 0 : _46.setAttribute('x', mainTitleWidth / 2);
-                  (_47 = this._mainTitle) === null || _47 === void 0 ? void 0 : _47.setAttribute('textAlign', 'center');
+                  (_14 = this._mainTitle) === null || _14 === void 0 ? void 0 : _14.setAttribute('x', mainTitleWidth / 2);
+                  (_15 = this._mainTitle) === null || _15 === void 0 ? void 0 : _15.setAttribute('textAlign', 'center');
               }
               else if (mainTitleAlign === 'right') {
-                  (_48 = this._mainTitle) === null || _48 === void 0 ? void 0 : _48.setAttribute('x', mainTitleWidth);
-                  (_49 = this._mainTitle) === null || _49 === void 0 ? void 0 : _49.setAttribute('textAlign', 'right');
+                  (_16 = this._mainTitle) === null || _16 === void 0 ? void 0 : _16.setAttribute('x', mainTitleWidth);
+                  (_17 = this._mainTitle) === null || _17 === void 0 ? void 0 : _17.setAttribute('textAlign', 'right');
               }
           }
           if (vutils.isValid(verticalAlign) || vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign)) {
               const mainTitleVerticalAlign = (textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign) ? textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign : verticalAlign;
               const mainTitleHeight = (textStyle === null || textStyle === void 0 ? void 0 : textStyle.height) ? textStyle === null || textStyle === void 0 ? void 0 : textStyle.height : titleHeight;
               if (mainTitleVerticalAlign === 'top') {
-                  (_50 = this._mainTitle) === null || _50 === void 0 ? void 0 : _50.setAttribute('y', 0);
-                  (_51 = this._mainTitle) === null || _51 === void 0 ? void 0 : _51.setAttribute('textBaseline', 'top');
+                  (_18 = this._mainTitle) === null || _18 === void 0 ? void 0 : _18.setAttribute('y', 0);
+                  (_19 = this._mainTitle) === null || _19 === void 0 ? void 0 : _19.setAttribute('textBaseline', 'top');
               }
               else if (mainTitleVerticalAlign === 'middle') {
-                  (_52 = this._mainTitle) === null || _52 === void 0 ? void 0 : _52.setAttribute('y', mainTitleHeight / 2);
-                  (_53 = this._mainTitle) === null || _53 === void 0 ? void 0 : _53.setAttribute('textBaseline', 'middle');
+                  (_20 = this._mainTitle) === null || _20 === void 0 ? void 0 : _20.setAttribute('y', mainTitleHeight / 2);
+                  (_21 = this._mainTitle) === null || _21 === void 0 ? void 0 : _21.setAttribute('textBaseline', 'middle');
               }
               else if (mainTitleVerticalAlign === 'bottom') {
-                  (_54 = this._mainTitle) === null || _54 === void 0 ? void 0 : _54.setAttribute('y', mainTitleHeight);
-                  (_55 = this._mainTitle) === null || _55 === void 0 ? void 0 : _55.setAttribute('textBaseline', 'bottom');
+                  (_22 = this._mainTitle) === null || _22 === void 0 ? void 0 : _22.setAttribute('y', mainTitleHeight);
+                  (_23 = this._mainTitle) === null || _23 === void 0 ? void 0 : _23.setAttribute('textBaseline', 'bottom');
               }
           }
           if (vutils.isValid(align) || vutils.isValid(subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.align)) {
               const subTitleAlign = (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.align) ? subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.align : align;
-              const subTitleWidth = (_56 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.width) !== null && _56 !== void 0 ? _56 : subtextWidth;
+              const subTitleWidth = (_24 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.width) !== null && _24 !== void 0 ? _24 : subtextWidth;
               if (subTitleAlign === 'left') {
-                  (_57 = this._subTitle) === null || _57 === void 0 ? void 0 : _57.setAttribute('x', 0);
-                  (_58 = this._subTitle) === null || _58 === void 0 ? void 0 : _58.setAttribute('textAlign', 'left');
+                  (_25 = this._subTitle) === null || _25 === void 0 ? void 0 : _25.setAttribute('x', 0);
+                  (_26 = this._subTitle) === null || _26 === void 0 ? void 0 : _26.setAttribute('textAlign', 'left');
               }
               else if (subTitleAlign === 'center') {
-                  (_59 = this._subTitle) === null || _59 === void 0 ? void 0 : _59.setAttribute('x', subTitleWidth / 2);
-                  (_60 = this._subTitle) === null || _60 === void 0 ? void 0 : _60.setAttribute('textAlign', 'center');
+                  (_27 = this._subTitle) === null || _27 === void 0 ? void 0 : _27.setAttribute('x', subTitleWidth / 2);
+                  (_28 = this._subTitle) === null || _28 === void 0 ? void 0 : _28.setAttribute('textAlign', 'center');
               }
               else if (subTitleAlign === 'right') {
-                  (_61 = this._subTitle) === null || _61 === void 0 ? void 0 : _61.setAttribute('x', subTitleWidth);
-                  (_62 = this._subTitle) === null || _62 === void 0 ? void 0 : _62.setAttribute('textAlign', 'right');
+                  (_29 = this._subTitle) === null || _29 === void 0 ? void 0 : _29.setAttribute('x', subTitleWidth);
+                  (_30 = this._subTitle) === null || _30 === void 0 ? void 0 : _30.setAttribute('textAlign', 'right');
               }
           }
           if (vutils.isValid(verticalAlign) || vutils.isValid(textStyle === null || textStyle === void 0 ? void 0 : textStyle.verticalAlign)) {
               const subTitleVerticalAlign = (subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.verticalAlign) ? subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.verticalAlign : verticalAlign;
               const subTitleYStart = maintextHeight;
-              const subTitleHeight = (_63 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _63 !== void 0 ? _63 : 0;
+              const subTitleHeight = (_31 = subtextStyle === null || subtextStyle === void 0 ? void 0 : subtextStyle.height) !== null && _31 !== void 0 ? _31 : 0;
               if (subTitleVerticalAlign === 'top') {
-                  (_64 = this._subTitle) === null || _64 === void 0 ? void 0 : _64.setAttribute('y', subTitleYStart);
-                  (_65 = this._subTitle) === null || _65 === void 0 ? void 0 : _65.setAttribute('textBaseline', 'top');
+                  (_32 = this._subTitle) === null || _32 === void 0 ? void 0 : _32.setAttribute('y', subTitleYStart);
+                  (_33 = this._subTitle) === null || _33 === void 0 ? void 0 : _33.setAttribute('textBaseline', 'top');
               }
               else if (subTitleVerticalAlign === 'middle') {
-                  (_66 = this._subTitle) === null || _66 === void 0 ? void 0 : _66.setAttribute('y', subTitleYStart + subTitleHeight / 2);
-                  (_67 = this._subTitle) === null || _67 === void 0 ? void 0 : _67.setAttribute('textBaseline', 'middle');
+                  (_34 = this._subTitle) === null || _34 === void 0 ? void 0 : _34.setAttribute('y', subTitleYStart + subTitleHeight / 2);
+                  (_35 = this._subTitle) === null || _35 === void 0 ? void 0 : _35.setAttribute('textBaseline', 'middle');
               }
               else if (subTitleVerticalAlign === 'bottom') {
-                  (_68 = this._subTitle) === null || _68 === void 0 ? void 0 : _68.setAttribute('y', subTitleYStart + subTitleHeight);
-                  (_69 = this._subTitle) === null || _69 === void 0 ? void 0 : _69.setAttribute('textBaseline', 'bottom');
+                  (_36 = this._subTitle) === null || _36 === void 0 ? void 0 : _36.setAttribute('y', subTitleYStart + subTitleHeight);
+                  (_37 = this._subTitle) === null || _37 === void 0 ? void 0 : _37.setAttribute('textBaseline', 'bottom');
               }
           }
       }
@@ -29753,7 +29719,7 @@
           this.name = 'indicator';
       }
       render() {
-          var _a, _b, _c;
+          var _a;
           const { visible, title, content, size, limitRatio = Infinity } = this.attribute;
           const limit = Math.min(size.width, size.height) * limitRatio;
           const group = this.createOrUpdateChild('indicator-container', { x: 0, y: 0, zIndex: 1 }, 'group');
@@ -29764,15 +29730,7 @@
           if (vutils.isValid(title)) {
               if (title.visible !== false) {
                   const titleStyle = vutils.merge({}, vutils.get(DEFAULT_INDICATOR_THEME, 'title.style'), title.style);
-                  if (titleStyle.type === 'rich') {
-                      this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({ textConfig: titleStyle.text }, titleStyle), { visible: title.visible, x: 0, y: 0, width: (_a = titleStyle.width) !== null && _a !== void 0 ? _a : 0, height: (_b = titleStyle.height) !== null && _b !== void 0 ? _b : 0 }), 'richtext');
-                  }
-                  else if (titleStyle.type === 'html') {
-                      this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({ textConfig: [], html: Object.assign({ dom: titleStyle.text, container: '', width: 30, height: 30, style: {} }, titleStyle) }, titleStyle), { visible: title.visible, x: 0, y: 0 }), 'richtext');
-                  }
-                  else {
-                      this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({}, titleStyle), { lineHeight: vutils.isValid(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize, visible: title.visible, x: 0, y: 0 }), 'text');
-                  }
+                  this._title = group.createOrUpdateChild('indicator-title', Object.assign(Object.assign({}, titleStyle), { lineHeight: vutils.isValid(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize, visible: title.visible, x: 0, y: 0 }), 'text');
                   if (title.autoFit && vutils.isValidNumber(limit)) {
                       this._setAutoFit(limit, this._title, title);
                   }
@@ -29793,19 +29751,9 @@
               const contentComponents = [];
               let lastContentHeight = 0;
               contents.forEach((contentItem, i) => {
-                  var _a, _b;
                   if (contentItem.visible !== false) {
                       const contentStyle = vutils.merge({}, vutils.get(DEFAULT_INDICATOR_THEME, 'content.style'), contentItem.style);
-                      let contentComponent;
-                      if (contentStyle.type === 'rich') {
-                          contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({ textConfig: contentStyle.text }, contentStyle), { visible: title.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight, width: (_a = contentStyle.width) !== null && _a !== void 0 ? _a : 0, height: (_b = contentStyle.height) !== null && _b !== void 0 ? _b : 0 }), 'richtext');
-                      }
-                      else if (contentStyle.type === 'html') {
-                          contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({ textConfig: [], html: Object.assign({ dom: contentStyle.text, container: '', width: 30, height: 30, style: {} }, contentStyle) }, contentStyle), { visible: title.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight }), 'richtext');
-                      }
-                      else {
-                          contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({}, contentStyle), { lineHeight: vutils.isValid(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize, visible: contentItem.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight }), 'text');
-                      }
+                      const contentComponent = group.createOrUpdateChild('indicator-content-' + i, Object.assign(Object.assign({}, contentStyle), { lineHeight: vutils.isValid(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize, visible: contentItem.visible, x: 0, y: titleHeight + titleSpace + lastContentHeight }), 'text');
                       if (contentItem.autoFit && vutils.isValidNumber(limit)) {
                           this._setAutoFit(limit, contentComponent, contentItem);
                       }
@@ -29823,7 +29771,7 @@
               });
               this._content = contentComponents;
           }
-          const totalHeight = (_c = group === null || group === void 0 ? void 0 : group.AABBBounds.height()) !== null && _c !== void 0 ? _c : 0;
+          const totalHeight = (_a = group === null || group === void 0 ? void 0 : group.AABBBounds.height()) !== null && _a !== void 0 ? _a : 0;
           group.setAttribute('y', size.height / 2 - totalHeight / 2);
           group.setAttribute('x', size.width / 2);
       }
@@ -31068,17 +31016,6 @@
   };
   const getRichTextAttribute = (attr) => {
       const { width, height, wordBreak = 'break-word', textAlign, textBaseline, text } = attr;
-      if (typeof text === 'object') {
-          return {
-              width,
-              height,
-              wordBreak: wordBreak,
-              textAlign: textAlign,
-              textBaseline: textBaseline,
-              singleLine: false,
-              textConfig: text.text
-          };
-      }
       return {
           width,
           height,
@@ -31175,7 +31112,6 @@
           this.name = 'tooltip';
       }
       render() {
-          var _a;
           const { visible, content, panel, keyWidth, valueWidth, hasContentShape, autoCalculatePosition, autoMeasure } = this.attribute;
           if (!visible) {
               this.hideAll();
@@ -31194,22 +31130,11 @@
           this._tooltipTitleSymbol = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_SHAPE_NAME_SUFFIX}`, vutils.merge({ symbolType: 'circle' }, titleAttr.shape, {
               visible: isVisible(titleAttr) && isVisible(titleAttr.shape)
           }), 'symbol');
-          if (typeof titleAttr.value.text === 'object' &&
-              titleAttr.value.text !== null &&
-              (titleAttr.value.text.type === 'rich' ||
-                  titleAttr.value.text.type === 'html')) {
-              if (titleAttr.value.text.type === 'rich') {
-                  this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ visible: isVisible(titleAttr) && isVisible(titleAttr.value) }, getRichTextAttribute(titleAttr.value)), 'richtext');
-              }
-              else if (titleAttr.value.text.type === 'html') {
-                  this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ html: Object.assign({ dom: titleAttr.value.text.text, container: '', width: 30, height: 30, style: {} }, titleAttr.value), visible: isVisible(titleAttr) && isVisible(titleAttr.value), width: titleAttr.value.width, height: titleAttr.value.height, wordBreak: titleAttr.value.wordBreak, textAlign: titleAttr.value.textAlign, textBaseline: titleAttr.value.textBaseline, singleLine: false, textConfig: [] }, titleAttr.value), 'richtext');
-              }
-          }
-          else if (titleAttr.value.multiLine) {
+          if (titleAttr.value.multiLine) {
               this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ visible: isVisible(titleAttr) && isVisible(titleAttr.value) }, getRichTextAttribute(titleAttr.value)), 'richtext');
           }
           else {
-              this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ text: ((_a = titleAttr.value.text) !== null && _a !== void 0 ? _a : ''), visible: isVisible(titleAttr) && isVisible(titleAttr.value) }, titleAttr.value), 'text');
+              this._tooltipTitle = this._tooltipTitleContainer.createOrUpdateChild(`${TOOLTIP_TITLE_NAME}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign({ text: '', visible: isVisible(titleAttr) && isVisible(titleAttr.value) }, titleAttr.value), 'text');
           }
           const titlePaddingLeft = isVisible(titleAttr.shape) ? titleAttr.shape.size + titleAttr.shape.spacing : 0;
           const { textAlign, textBaseline } = titleAttr.value;
@@ -31240,7 +31165,7 @@
               this._tooltipContent.setAttribute('y', padding[0] + titleHeight);
               let lastYPos = 0;
               content.forEach((item, i) => {
-                  var _a, _b, _c;
+                  var _a;
                   const itemAttr = Tooltip.getContentAttr(this.attribute, i);
                   if (!isVisible(itemAttr)) {
                       return;
@@ -31262,21 +31187,8 @@
                       if (itemAttr.key.multiLine) {
                           element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_KEY_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true }, getRichTextAttribute(itemAttr.key)), { textBaseline: 'top' }), 'richtext');
                       }
-                      else if (typeof itemAttr.key.text === 'object' &&
-                          itemAttr.key.text !== null &&
-                          (itemAttr.key.text.type === 'rich' ||
-                              itemAttr.key.text.type === 'html')) {
-                          if (itemAttr.key.text.type === 'rich') {
-                              element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true }, getRichTextAttribute(itemAttr.key)), { textBaseline: 'top' }), 'richtext');
-                          }
-                          else {
-                              element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, {
-                                  html: Object.assign({ dom: itemAttr.key.text.text, container: '', width: 30, height: 30, style: {} }, itemAttr.key)
-                              }, 'richtext');
-                          }
-                      }
                       else {
-                          element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_KEY_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true, text: ((_b = itemAttr.key.text) !== null && _b !== void 0 ? _b : '') }, itemAttr.key), { textBaseline: 'top' }), 'text');
+                          element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_KEY_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true }, itemAttr.key), { textBaseline: 'top' }), 'text');
                       }
                       const { textAlign } = itemAttr.key;
                       if (textAlign === 'center') {
@@ -31296,21 +31208,8 @@
                       if (itemAttr.value.multiLine) {
                           element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true }, getRichTextAttribute(itemAttr.value)), { textBaseline: 'top' }), 'richtext');
                       }
-                      else if (typeof itemAttr.value.text === 'object' &&
-                          itemAttr.value.text !== null &&
-                          (itemAttr.value.text.type === 'rich' ||
-                              itemAttr.value.text.type === 'html')) {
-                          if (itemAttr.value.text.type === 'rich') {
-                              element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true }, getRichTextAttribute(itemAttr.value)), { textBaseline: 'top' }), 'richtext');
-                          }
-                          else {
-                              element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, {
-                                  html: Object.assign({ dom: itemAttr.value.text.text, container: '', width: 30, height: 30, style: {} }, itemAttr.value)
-                              }, 'richtext');
-                          }
-                      }
                       else {
-                          element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true, text: ((_c = itemAttr.value.text) !== null && _c !== void 0 ? _c : '') }, itemAttr.value), { textBaseline: 'top' }), 'text');
+                          element = itemGroup.createOrUpdateChild(`${itemGroupName}-${TOOLTIP_VALUE_NAME_SUFFIX}`, Object.assign(Object.assign({ visible: true }, itemAttr.value), { textBaseline: 'top' }), 'text');
                       }
                       let textAlign = 'right';
                       if (vutils.isValid(itemAttr.value.textAlign)) {
@@ -31402,7 +31301,7 @@
           let titleMaxHeight = 0;
           const { value: titleValue, shape: titleShape } = titleAttr;
           const { visible: titleHasShape = false, symbolType: titleShapeType = '' } = titleShape !== null && titleShape !== void 0 ? titleShape : {};
-          if (vutils.isValid(titleValue) && typeof titleAttr.value.text !== 'object') {
+          if (vutils.isValid(titleValue)) {
               const { width, height } = initTextMeasure(titleValue).quickMeasure(titleValue.text);
               maxWidth = width;
               titleMaxHeight = height;
@@ -31659,11 +31558,12 @@
       }
   };
 
-  const version = "0.16.17-alpha.3";
+  const version = "0.16.17-alpha.4";
 
   exports.AbstractComponent = AbstractComponent;
   exports.ArcInfo = ArcInfo;
   exports.ArcLabel = ArcLabel;
+  exports.AreaLabel = AreaLabel;
   exports.BasePlayer = BasePlayer;
   exports.Brush = Brush;
   exports.CheckBox = CheckBox;