@visactor/vrender-components 0.16.14-alpha.7 → 0.16.14

package/cjs/indicator/indicator.js

@@ -11,7 +11,7 @@ class Indicator extends base_1.AbstractComponent {
         super(...arguments), this.name = "indicator";
     }
     render() {
-        var _a, _b, _c;
+        var _a;
         const {visible: visible, title: title, content: content, size: size, limitRatio: limitRatio = 1 / 0} = this.attribute, limit = Math.min(size.width, size.height) * limitRatio, group = this.createOrUpdateChild("indicator-container", {
             x: 0,
             y: 0,
@@ -20,28 +20,7 @@ class Indicator extends base_1.AbstractComponent {
         if (!0 !== visible) return void (group && group.hideAll());
         if ((0, vutils_1.isValid)(title)) if (!1 !== title.visible) {
             const titleStyle = (0, vutils_1.merge)({}, (0, vutils_1.get)(config_1.DEFAULT_INDICATOR_THEME, "title.style"), title.style);
-            "rich" === titleStyle.type ? this._title = group.createOrUpdateChild("indicator-title", Object.assign(Object.assign({
-                textConfig: titleStyle.text
-            }, titleStyle), {
-                visible: title.visible,
-                x: 0,
-                y: 0,
-                width: null !== (_a = titleStyle.width) && void 0 !== _a ? _a : 0,
-                height: null !== (_b = titleStyle.height) && void 0 !== _b ? _b : 0
-            }), "richtext") : "html" === titleStyle.type ? 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") : this._title = group.createOrUpdateChild("indicator-title", Object.assign(Object.assign({}, titleStyle), {
+            this._title = group.createOrUpdateChild("indicator-title", Object.assign(Object.assign({}, titleStyle), {
                 lineHeight: (0, vutils_1.isValid)(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize,
                 visible: title.visible,
                 x: 0,
@@ -58,37 +37,14 @@ class Indicator extends base_1.AbstractComponent {
             vutils_1.array)(content), contentComponents = [];
             let lastContentHeight = 0;
             contents.forEach(((contentItem, i) => {
-                var _a, _b;
                 if (!1 !== contentItem.visible) {
-                    const contentStyle = (0, vutils_1.merge)({}, (0, vutils_1.get)(config_1.DEFAULT_INDICATOR_THEME, "content.style"), contentItem.style);
-                    let contentComponent;
-                    contentComponent = "rich" === contentStyle.type ? group.createOrUpdateChild("indicator-content-" + i, Object.assign(Object.assign({
-                        textConfig: contentStyle.text
-                    }, contentStyle), {
-                        visible: title.visible,
-                        x: 0,
-                        y: titleHeight + titleSpace + lastContentHeight,
-                        width: null !== (_a = contentStyle.width) && void 0 !== _a ? _a : 0,
-                        height: null !== (_b = contentStyle.height) && void 0 !== _b ? _b : 0
-                    }), "richtext") : "html" === contentStyle.type ? 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") : group.createOrUpdateChild("indicator-content-" + i, Object.assign(Object.assign({}, contentStyle), {
+                    const contentStyle = (0, vutils_1.merge)({}, (0, vutils_1.get)(config_1.DEFAULT_INDICATOR_THEME, "content.style"), contentItem.style), contentComponent = group.createOrUpdateChild("indicator-content-" + i, Object.assign(Object.assign({}, contentStyle), {
                         lineHeight: (0, vutils_1.isValid)(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize,
                         visible: contentItem.visible,
                         x: 0,
                         y: titleHeight + titleSpace + lastContentHeight
-                    }), "text"), contentItem.autoFit && (0, vutils_1.isValidNumber)(limit) && this._setAutoFit(limit, contentComponent, contentItem), 
+                    }), "text");
+                    contentItem.autoFit && (0, vutils_1.isValidNumber)(limit) && this._setAutoFit(limit, contentComponent, contentItem), 
                     contentItem.autoLimit && (0, vutils_1.isValidNumber)(limitRatio) && contentComponent.setAttribute("maxLineWidth", limit), 
                     contentComponents.push(contentComponent);
                     const contentSpace = (null == contentItem ? void 0 : contentItem.space) ? contentItem.space : 0;
@@ -99,7 +55,7 @@ class Indicator extends base_1.AbstractComponent {
                 }
             })), this._content = contentComponents;
         }
-        const totalHeight = null !== (_c = null == group ? void 0 : group.AABBBounds.height()) && void 0 !== _c ? _c : 0;
+        const totalHeight = null !== (_a = null == group ? void 0 : group.AABBBounds.height()) && void 0 !== _a ? _a : 0;
         group.setAttribute("y", size.height / 2 - totalHeight / 2), group.setAttribute("x", size.width / 2);
     }
     _setAutoFit(limit, indicatorItem, indicatorItemSpec) {

package/cjs/indicator/indicator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/indicator/indicator.ts"],"names":[],"mappings":"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","file":"indicator.js","sourcesContent":["/**\n * @description 指标卡组件\n */\nimport type { IGroup, INode, IText } from '@visactor/vrender-core';\nimport { merge, isValid, array, isValidNumber, get } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { measureTextSize } from '../util';\nimport type { IndicatorAttributes, IndicatorItemSpec } from './type';\nimport { DEFAULT_INDICATOR_THEME } from './config';\n\nexport class Indicator extends AbstractComponent<Required<IndicatorAttributes>> {\n  name = 'indicator';\n\n  private _title?: IText;\n  private _content?: IText | IText[];\n\n  protected render() {\n    const { visible, title, content, size, limitRatio = Infinity } = this.attribute as IndicatorAttributes;\n\n    const limit = Math.min(size.width, size.height) * limitRatio;\n\n    const group = this.createOrUpdateChild('indicator-container', { x: 0, y: 0, zIndex: 1 }, 'group') as IGroup;\n\n    // 指标卡全部隐藏\n    if (visible !== true) {\n      group && group.hideAll();\n      return;\n    }\n\n    if (isValid(title)) {\n      if (title.visible !== false) {\n        const titleStyle = merge({}, get(DEFAULT_INDICATOR_THEME, 'title.style'), title.style);\n        if (titleStyle.type === 'rich') {\n          this._title = group.createOrUpdateChild(\n            'indicator-title',\n            {\n              textConfig: titleStyle.text,\n              ...titleStyle,\n              visible: title.visible,\n              x: 0,\n              y: 0,\n              width: titleStyle.width ?? 0,\n              height: titleStyle.height ?? 0\n            },\n            'richtext'\n          ) as IText;\n        } else if (titleStyle.type === 'html') {\n          this._title = group.createOrUpdateChild(\n            'indicator-title',\n            {\n              textConfig: [],\n              html: {\n                dom: titleStyle.text as string,\n                container: '',\n                width: 30,\n                height: 30,\n                style: {},\n                ...titleStyle\n              },\n              ...titleStyle,\n              visible: title.visible,\n              x: 0,\n              y: 0\n            },\n            'richtext'\n          ) as IText;\n        } else {\n          this._title = group.createOrUpdateChild(\n            'indicator-title',\n            {\n              ...titleStyle,\n              /**\n               * 加入以下逻辑：如果没有声明lineHeight，默认 lineHeight 等于 fontSize\n               * 因为如果不声明 vrender 底层会默认给文本加上 2px 的高度，会影响布局计算\n               * 注意：在autoFit改变fontsize时，lineHeight也要同步修改\n               */\n              lineHeight: isValid(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize,\n              visible: title.visible,\n              x: 0,\n              y: 0\n            },\n            'text'\n          ) as IText;\n        }\n\n        // auto-fit\n        if (title.autoFit && isValidNumber(limit)) {\n          this._setAutoFit(limit, this._title, title);\n        }\n\n        //auto-limit\n        if (title.autoLimit && isValidNumber(limitRatio)) {\n          this._title.setAttribute('maxLineWidth', limit);\n        }\n      } else {\n        /**\n         * indicator部分隐藏\n         * 例如title隐藏了，content还保留。直接设置visible:false 计算group.AABBounts是错的，影响上下居中。\n         * 这里把隐藏的nodes删除后，group.AABBounts计算才正确。\n         */\n        const titleNode = group.find(node => node.name === 'indicator-title', false);\n        titleNode && group.removeChild(titleNode as INode);\n        this._title = undefined;\n      }\n    }\n\n    const titleHeight = this._title ? this._title.AABBBounds.height() : 0;\n\n    if (isValid(content)) {\n      const titleSpace = this._title ? (title?.space ? title.space : 0) : 0;\n      const contents: IndicatorItemSpec[] = array(content);\n      const contentComponents: IText[] = [];\n      let lastContentHeight = 0;\n      contents.forEach((contentItem, i) => {\n        if (contentItem.visible !== false) {\n          const contentStyle = merge({}, get(DEFAULT_INDICATOR_THEME, 'content.style'), contentItem.style);\n          let contentComponent;\n          if (contentStyle.type === 'rich') {\n            contentComponent = group.createOrUpdateChild(\n              'indicator-content-' + i,\n              {\n                textConfig: contentStyle.text,\n                ...contentStyle,\n                visible: title.visible,\n                x: 0,\n                y: titleHeight + titleSpace + lastContentHeight,\n                width: contentStyle.width ?? 0,\n                height: contentStyle.height ?? 0\n              },\n              'richtext'\n            ) as IText;\n          } else if (contentStyle.type === 'html') {\n            contentComponent = group.createOrUpdateChild(\n              'indicator-content-' + i,\n              {\n                textConfig: [],\n                html: {\n                  dom: contentStyle.text as string,\n                  container: '',\n                  width: 30,\n                  height: 30,\n                  style: {},\n                  ...contentStyle\n                },\n                ...contentStyle,\n                visible: title.visible,\n                x: 0,\n                y: titleHeight + titleSpace + lastContentHeight\n              },\n              'richtext'\n            ) as IText;\n          } else {\n            contentComponent = group.createOrUpdateChild(\n              'indicator-content-' + i,\n              {\n                ...contentStyle,\n                lineHeight: isValid(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize,\n                visible: contentItem.visible,\n                x: 0,\n                y: titleHeight + titleSpace + lastContentHeight\n              },\n              'text'\n            ) as IText;\n          }\n\n          // auto-fit\n          if (contentItem.autoFit && isValidNumber(limit)) {\n            this._setAutoFit(limit, contentComponent, contentItem);\n          }\n\n          //auto-limit\n          if (contentItem.autoLimit && isValidNumber(limitRatio)) {\n            contentComponent.setAttribute('maxLineWidth', limit);\n          }\n\n          contentComponents.push(contentComponent);\n          const contentSpace = contentItem?.space ? contentItem.space : 0;\n          lastContentHeight += contentComponent.AABBBounds.height() + contentSpace;\n        } else {\n          /**\n           * indicator部分隐藏\n           */\n          const contentItemNode = group.find(node => node.name === 'indicator-content-' + i, false);\n          contentItemNode && group.removeChild(contentItemNode as INode);\n        }\n      });\n      this._content = contentComponents;\n    }\n\n    const totalHeight = group?.AABBBounds.height() ?? 0;\n    group.setAttribute('y', size.height / 2 - totalHeight / 2);\n    group.setAttribute('x', size.width / 2);\n  }\n\n  private _setAutoFit(limit: number, indicatorItem: IText, indicatorItemSpec: IndicatorItemSpec) {\n    const originWidth = measureTextSize(indicatorItemSpec.style?.text ?? '', indicatorItemSpec.style ?? {}).width;\n    if (originWidth > 0) {\n      const ratio = (limit * (indicatorItemSpec.fitPercent ?? 0.5)) / originWidth;\n      const fontSize = Math.floor((indicatorItemSpec.style?.fontSize ?? 20) * ratio);\n      indicatorItem.setAttribute('fontSize', fontSize);\n      indicatorItem.setAttribute(\n        'lineHeight',\n        isValid(indicatorItemSpec.style.lineHeight) ? indicatorItemSpec.style.lineHeight : fontSize\n      );\n    }\n  }\n}\n"]}
+{"version":3,"sources":["../src/indicator/indicator.ts"],"names":[],"mappings":"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","file":"indicator.js","sourcesContent":["/**\n * @description 指标卡组件\n */\nimport type { IGroup, INode, IText } from '@visactor/vrender-core';\nimport { merge, isValid, array, isValidNumber, get } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { measureTextSize } from '../util';\nimport type { IndicatorAttributes, IndicatorItemSpec } from './type';\nimport { DEFAULT_INDICATOR_THEME } from './config';\n\nexport class Indicator extends AbstractComponent<Required<IndicatorAttributes>> {\n  name = 'indicator';\n\n  private _title?: IText;\n  private _content?: IText | IText[];\n\n  protected render() {\n    const { visible, title, content, size, limitRatio = Infinity } = this.attribute as IndicatorAttributes;\n\n    const limit = Math.min(size.width, size.height) * limitRatio;\n\n    const group = this.createOrUpdateChild('indicator-container', { x: 0, y: 0, zIndex: 1 }, 'group') as IGroup;\n\n    // 指标卡全部隐藏\n    if (visible !== true) {\n      group && group.hideAll();\n      return;\n    }\n\n    if (isValid(title)) {\n      if (title.visible !== false) {\n        const titleStyle = merge({}, get(DEFAULT_INDICATOR_THEME, 'title.style'), title.style);\n        this._title = group.createOrUpdateChild(\n          'indicator-title',\n          {\n            ...titleStyle,\n            /**\n             * 加入以下逻辑：如果没有声明lineHeight，默认 lineHeight 等于 fontSize\n             * 因为如果不声明 vrender 底层会默认给文本加上 2px 的高度，会影响布局计算\n             * 注意：在autoFit改变fontsize时，lineHeight也要同步修改\n             */\n            lineHeight: isValid(titleStyle.lineHeight) ? titleStyle.lineHeight : titleStyle.fontSize,\n            visible: title.visible,\n            x: 0,\n            y: 0\n          },\n          'text'\n        ) as IText;\n\n        // auto-fit\n        if (title.autoFit && isValidNumber(limit)) {\n          this._setAutoFit(limit, this._title, title);\n        }\n\n        //auto-limit\n        if (title.autoLimit && isValidNumber(limitRatio)) {\n          this._title.setAttribute('maxLineWidth', limit);\n        }\n      } else {\n        /**\n         * indicator部分隐藏\n         * 例如title隐藏了，content还保留。直接设置visible:false 计算group.AABBounts是错的，影响上下居中。\n         * 这里把隐藏的nodes删除后，group.AABBounts计算才正确。\n         */\n        const titleNode = group.find(node => node.name === 'indicator-title', false);\n        titleNode && group.removeChild(titleNode as INode);\n        this._title = undefined;\n      }\n    }\n\n    const titleHeight = this._title ? this._title.AABBBounds.height() : 0;\n\n    if (isValid(content)) {\n      const titleSpace = this._title ? (title?.space ? title.space : 0) : 0;\n      const contents: IndicatorItemSpec[] = array(content);\n      const contentComponents: IText[] = [];\n      let lastContentHeight = 0;\n      contents.forEach((contentItem, i) => {\n        if (contentItem.visible !== false) {\n          const contentStyle = merge({}, get(DEFAULT_INDICATOR_THEME, 'content.style'), contentItem.style);\n          const contentComponent = group.createOrUpdateChild(\n            'indicator-content-' + i,\n            {\n              ...contentStyle,\n              lineHeight: isValid(contentStyle.lineHeight) ? contentStyle.lineHeight : contentStyle.fontSize,\n              visible: contentItem.visible,\n              x: 0,\n              y: titleHeight + titleSpace + lastContentHeight\n            },\n            'text'\n          ) as IText;\n\n          // auto-fit\n          if (contentItem.autoFit && isValidNumber(limit)) {\n            this._setAutoFit(limit, contentComponent, contentItem);\n          }\n\n          //auto-limit\n          if (contentItem.autoLimit && isValidNumber(limitRatio)) {\n            contentComponent.setAttribute('maxLineWidth', limit);\n          }\n\n          contentComponents.push(contentComponent);\n          const contentSpace = contentItem?.space ? contentItem.space : 0;\n          lastContentHeight += contentComponent.AABBBounds.height() + contentSpace;\n        } else {\n          /**\n           * indicator部分隐藏\n           */\n          const contentItemNode = group.find(node => node.name === 'indicator-content-' + i, false);\n          contentItemNode && group.removeChild(contentItemNode as INode);\n        }\n      });\n      this._content = contentComponents;\n    }\n\n    const totalHeight = group?.AABBBounds.height() ?? 0;\n    group.setAttribute('y', size.height / 2 - totalHeight / 2);\n    group.setAttribute('x', size.width / 2);\n  }\n\n  private _setAutoFit(limit: number, indicatorItem: IText, indicatorItemSpec: IndicatorItemSpec) {\n    const originWidth = measureTextSize(indicatorItemSpec.style?.text ?? '', indicatorItemSpec.style ?? {}).width;\n    if (originWidth > 0) {\n      const ratio = (limit * (indicatorItemSpec.fitPercent ?? 0.5)) / originWidth;\n      const fontSize = Math.floor((indicatorItemSpec.style?.fontSize ?? 20) * ratio);\n      indicatorItem.setAttribute('fontSize', fontSize);\n      indicatorItem.setAttribute(\n        'lineHeight',\n        isValid(indicatorItemSpec.style.lineHeight) ? indicatorItemSpec.style.lineHeight : fontSize\n      );\n    }\n  }\n}\n"]}

package/cjs/indicator/type.d.ts

@@ -1,4 +1,4 @@
-import type { IGroupGraphicAttribute, ITextGraphicAttribute, IRichTextCharacter } from '@visactor/vrender-core';
+import type { IGroupGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';
 export interface IndicatorAttributes extends IGroupGraphicAttribute {
     visible?: boolean;
     size: {
@@ -17,8 +17,5 @@ export interface IndicatorItemSpec {
     autoLimit?: boolean;
     autoFit?: boolean;
     fitPercent?: number;
-    style?: ITextGraphicAttribute & {
-        type?: string;
-        text?: string | string[] | number | number[] | IRichTextCharacter[];
-    };
+    style?: ITextGraphicAttribute;
 }

package/cjs/indicator/type.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/indicator/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { IGroupGraphicAttribute, ITextGraphicAttribute, IRichTextCharacter } from '@visactor/vrender-core';\n\nexport interface IndicatorAttributes extends IGroupGraphicAttribute {\n  /**\n   * 是否显示指标卡组件\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 内容尺寸\n   */\n  size: { width: number; height: number };\n  /**\n   * 指标卡 x 方向偏移\n   * @default 0\n   */\n  dx?: number;\n  /**\n   * 指标卡 y 方向偏移\n   * @default 0\n   */\n  dy?: number;\n  /**\n   * 指标卡宽度占内容区域的最大比值（从0到1）\n   */\n  limitRatio?: number;\n  /**\n   * 指标卡标题文字配置\n   */\n  title?: IndicatorItemSpec;\n  /**\n   * 指标卡内容文字配置\n   */\n  content?: IndicatorItemSpec[] | IndicatorItemSpec;\n}\n\nexport interface IndicatorItemSpec {\n  /**\n   * 是否显示当前项\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * title.space: title 和 content 之间的间距\n   * contentItem.space: content 之间的间距\n   */\n  space?: number;\n  /**\n   * 是否自适应文字空间进行缩略\n   * 按照原字体大小，根据空间大小缩略文字\n   * @default false\n   */\n  autoLimit?: boolean;\n  /**\n   * 是否自适应文字空间缩放文字大小\n   * 不缩略文字，改变字体大小以适应空间\n   * @default false\n   */\n  autoFit?: boolean;\n  /**\n   * 自适应文字宽度与可用空间的比例\n   * @default 0.5\n   */\n  fitPercent?: number;\n  /**\n   * 文字样式\n   */\n  style?: ITextGraphicAttribute & {\n    /** 文本类型：text, rich, html */\n    type?: string;\n    /**\n     * 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n     * 支持富文本内容, 如textConfig, html\n     */\n    text?: string | string[] | number | number[] | IRichTextCharacter[];\n  };\n}\n"]}
+{"version":3,"sources":["../src/indicator/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { IGroupGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';\n\nexport interface IndicatorAttributes extends IGroupGraphicAttribute {\n  /**\n   * 是否显示指标卡组件\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 内容尺寸\n   */\n  size: { width: number; height: number };\n  /**\n   * 指标卡 x 方向偏移\n   * @default 0\n   */\n  dx?: number;\n  /**\n   * 指标卡 y 方向偏移\n   * @default 0\n   */\n  dy?: number;\n  /**\n   * 指标卡宽度占内容区域的最大比值（从0到1）\n   */\n  limitRatio?: number;\n  /**\n   * 指标卡标题文字配置\n   */\n  title?: IndicatorItemSpec;\n  /**\n   * 指标卡内容文字配置\n   */\n  content?: IndicatorItemSpec[] | IndicatorItemSpec;\n}\n\nexport interface IndicatorItemSpec {\n  /**\n   * 是否显示当前项\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * title.space: title 和 content 之间的间距\n   * contentItem.space: content 之间的间距\n   */\n  space?: number;\n  /**\n   * 是否自适应文字空间进行缩略\n   * 按照原字体大小，根据空间大小缩略文字\n   * @default false\n   */\n  autoLimit?: boolean;\n  /**\n   * 是否自适应文字空间缩放文字大小\n   * 不缩略文字，改变字体大小以适应空间\n   * @default false\n   */\n  autoFit?: boolean;\n  /**\n   * 自适应文字宽度与可用空间的比例\n   * @default 0.5\n   */\n  fitPercent?: number;\n  /**\n   * 文字样式\n   */\n  style?: ITextGraphicAttribute;\n}\n"]}

package/cjs/label/animate/animate.d.ts

@@ -1,7 +1,13 @@
-import type { ITextGraphicAttribute } from '@visactor/vrender-core';
-import type { ILabelAnimation } from '../type';
+import type { IText, ITextGraphicAttribute, EasingType } from '@visactor/vrender-core';
+import type { BaseLabelAttrs, ILabelAnimation, ILabelUpdateChannelAnimation } from '../type';
 export declare function getAnimationAttributes(textAttribute: ITextGraphicAttribute, type: 'fadeIn' | 'fadeOut'): {
     from: any;
     to: any;
 };
+export declare function updateAnimation(prev: IText, next: IText, animationConfig: BaseLabelAttrs['animationUpdate']): void;
+export declare const update: (prev: IText, next: IText, channel?: string[], options?: ILabelUpdateChannelAnimation['options']) => {
+    from: Partial<ITextGraphicAttribute>;
+    to: Partial<ITextGraphicAttribute>;
+};
+export declare function playIncreaseCount(prev: IText, next: IText, duration: number, easing: EasingType): void;
 export declare const DefaultLabelAnimation: ILabelAnimation;

package/cjs/label/animate/animate.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.DefaultLabelAnimation = exports.getAnimationAttributes = void 0;
+}), exports.DefaultLabelAnimation = exports.playIncreaseCount = exports.update = exports.updateAnimation = exports.getAnimationAttributes = void 0;
 
-const fadeIn = (textAttribute = {}) => {
+const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), fadeIn = (textAttribute = {}) => {
     var _a, _b, _c;
     return {
         from: {
@@ -45,7 +45,41 @@ function getAnimationAttributes(textAttribute, type) {
     };
 }
 
-exports.getAnimationAttributes = getAnimationAttributes, exports.DefaultLabelAnimation = {
+function updateAnimation(prev, next, animationConfig) {
+    if (!(0, vutils_1.isArray)(animationConfig)) {
+        const {duration: duration, easing: easing, increaseEffect: increaseEffect = !0} = animationConfig;
+        return prev.animate().to(next.attribute, duration, easing), void (increaseEffect && playIncreaseCount(prev, next, duration, easing));
+    }
+    animationConfig.forEach(((cfg, i) => {
+        const {duration: duration, easing: easing, increaseEffect: increaseEffect = !0, channel: channel} = cfg, {from: from, to: to} = (0, 
+        exports.update)(prev, next, channel, cfg.options);
+        (0, vutils_1.isEmpty)(to) || prev.animate().to(to, duration, easing), "text" in from && "text" in to && increaseEffect && playIncreaseCount(prev, next, duration, easing);
+    }));
+}
+
+exports.getAnimationAttributes = getAnimationAttributes, exports.updateAnimation = updateAnimation;
+
+const update = (prev, next, channel, options) => {
+    const from = Object.assign({}, prev.attribute), to = Object.assign({}, next.attribute);
+    return (0, vutils_1.array)(null == options ? void 0 : options.excludeChannels).forEach((key => {
+        delete to[key];
+    })), Object.keys(to).forEach((key => {
+        channel && !channel.includes(key) && delete to[key];
+    })), {
+        from: from,
+        to: to
+    };
+};
+
+function playIncreaseCount(prev, next, duration, easing) {
+    prev.attribute.text !== next.attribute.text && (0, vutils_1.isValidNumber)(Number(prev.attribute.text) * Number(next.attribute.text)) && prev.animate().play(new vrender_core_1.IncreaseCount({
+        text: prev.attribute.text
+    }, {
+        text: next.attribute.text
+    }, duration, easing));
+}
+
+exports.update = update, exports.playIncreaseCount = playIncreaseCount, exports.DefaultLabelAnimation = {
     mode: "same-time",
     duration: 300,
     easing: "linear"

package/cjs/label/animate/animate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/label/animate/animate.ts"],"names":[],"mappings":";;;AAGA,MAAM,MAAM,GAAG,CAAC,gBAAuC,EAAE,EAAE,EAAE;;IAC3D,OAAO;QACL,IAAI,EAAE;YACJ,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,CAAC;YACd,aAAa,EAAE,CAAC;SACjB;QACD,EAAE,EAAE;YACF,OAAO,EAAE,MAAA,aAAa,CAAC,OAAO,mCAAI,CAAC;YACnC,WAAW,EAAE,MAAA,aAAa,CAAC,WAAW,mCAAI,CAAC;YAC3C,aAAa,EAAE,MAAA,aAAa,CAAC,aAAa,mCAAI,CAAC;SAChD;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,gBAAuC,EAAE,EAAE,EAAE;;IAC5D,OAAO;QACL,IAAI,EAAE;YACJ,OAAO,EAAE,MAAA,aAAa,CAAC,OAAO,mCAAI,CAAC;YACnC,WAAW,EAAE,MAAA,aAAa,CAAC,WAAW,mCAAI,CAAC;YAC3C,aAAa,EAAE,MAAA,aAAa,CAAC,aAAa,mCAAI,CAAC;SAChD;QACD,EAAE,EAAE;YACF,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,CAAC;YACd,aAAa,EAAE,CAAC;SACjB;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AAE7C,SAAgB,sBAAsB,CACpC,aAAoC,EACpC,IAA0B;;IAK1B,OAAO,MAAA,MAAA,gBAAgB,CAAC,IAAI,CAAC,iEAAG,aAAa,CAAC,mCAAI,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;AACzE,CAAC;AARD,wDAQC;AAEY,QAAA,qBAAqB,GAAoB;IACpD,IAAI,EAAE,WAAW;IACjB,QAAQ,EAAE,GAAG;IACb,MAAM,EAAE,QAAsB;CAC/B,CAAC","file":"animate.js","sourcesContent":["import type { EasingType, ITextGraphicAttribute } from '@visactor/vrender-core';\nimport type { ILabelAnimation } from '../type';\n\nconst fadeIn = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    },\n    to: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    }\n  };\n};\n\nconst fadeOut = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    },\n    to: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    }\n  };\n};\n\nconst animationEffects = { fadeIn, fadeOut };\n\nexport function getAnimationAttributes(\n  textAttribute: ITextGraphicAttribute,\n  type: 'fadeIn' | 'fadeOut'\n): {\n  from: any;\n  to: any;\n} {\n  return animationEffects[type]?.(textAttribute) ?? { from: {}, to: {} };\n}\n\nexport const DefaultLabelAnimation: ILabelAnimation = {\n  mode: 'same-time',\n  duration: 300,\n  easing: 'linear' as EasingType\n};\n"]}
+{"version":3,"sources":["../src/label/animate/animate.ts"],"names":[],"mappings":"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","file":"animate.js","sourcesContent":["import type { IText, ITextGraphicAttribute, EasingType } from '@visactor/vrender-core';\nimport { IncreaseCount } from '@visactor/vrender-core';\nimport type { BaseLabelAttrs, ILabelAnimation, ILabelUpdateChannelAnimation } from '../type';\nimport { array, isArray, isEmpty, isValidNumber } from '@visactor/vutils';\n\nconst fadeIn = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    },\n    to: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    }\n  };\n};\n\nconst fadeOut = (textAttribute: ITextGraphicAttribute = {}) => {\n  return {\n    from: {\n      opacity: textAttribute.opacity ?? 1,\n      fillOpacity: textAttribute.fillOpacity ?? 1,\n      strokeOpacity: textAttribute.strokeOpacity ?? 1\n    },\n    to: {\n      opacity: 0,\n      fillOpacity: 0,\n      strokeOpacity: 0\n    }\n  };\n};\n\nconst animationEffects = { fadeIn, fadeOut };\n\nexport function getAnimationAttributes(\n  textAttribute: ITextGraphicAttribute,\n  type: 'fadeIn' | 'fadeOut'\n): {\n  from: any;\n  to: any;\n} {\n  return animationEffects[type]?.(textAttribute) ?? { from: {}, to: {} };\n}\n\nexport function updateAnimation(prev: IText, next: IText, animationConfig: BaseLabelAttrs['animationUpdate']) {\n  if (!isArray(animationConfig)) {\n    const { duration, easing, increaseEffect = true } = animationConfig;\n    prev.animate().to(next.attribute, duration, easing);\n    increaseEffect && playIncreaseCount(prev, next, duration, easing);\n    return;\n  }\n\n  animationConfig.forEach((cfg, i) => {\n    const { duration, easing, increaseEffect = true, channel } = cfg;\n    const { from, to } = update(prev, next, channel, cfg.options);\n    if (!isEmpty(to)) {\n      prev.animate().to(to, duration, easing);\n    }\n\n    if ('text' in from && 'text' in to && increaseEffect) {\n      playIncreaseCount(prev, next, duration, easing);\n    }\n  });\n}\n\nexport const update = (\n  prev: IText,\n  next: IText,\n  channel?: string[],\n  options?: ILabelUpdateChannelAnimation['options']\n) => {\n  const from = Object.assign({}, prev.attribute);\n  const to = Object.assign({}, next.attribute);\n  array(options?.excludeChannels).forEach(key => {\n    delete to[key];\n  });\n  Object.keys(to).forEach(key => {\n    if (channel && !channel.includes(key)) {\n      delete to[key];\n    }\n  });\n  return { from, to };\n};\n\nexport function playIncreaseCount(prev: IText, next: IText, duration: number, easing: EasingType) {\n  if (\n    prev.attribute.text !== next.attribute.text &&\n    isValidNumber(Number(prev.attribute.text) * Number(next.attribute.text))\n  ) {\n    prev\n      .animate()\n      .play(\n        new IncreaseCount(\n          { text: prev.attribute.text as string },\n          { text: next.attribute.text as string },\n          duration,\n          easing\n        )\n      );\n  }\n}\n\nexport const DefaultLabelAnimation: ILabelAnimation = {\n  mode: 'same-time',\n  duration: 300,\n  easing: 'linear' as EasingType\n};\n"]}

package/cjs/label/arc.d.ts

@@ -1,7 +1,6 @@
 import type { IAABBBounds, IBoundsLike } from '@visactor/vutils';
 import { LabelBase } from './base';
 import type { ArcLabelAttrs, IPoint, Quadrant, BaseLabelAttrs, LabelItem, IArcLabelLineSpec } from './type';
-import type { IRichText } from '@visactor/vrender-core';
 import { type IText, type IGraphic, type ILine } from '@visactor/vrender-core';
 export declare class ArcInfo {
     key: string;
@@ -40,12 +39,12 @@ export declare class ArcLabel extends LabelBase<ArcLabelAttrs> {
     private _arcLeft;
     private _arcRight;
     constructor(attributes: ArcLabelAttrs);
-    protected _overlapping(labels: (IText | IRichText)[]): (IRichText | IText)[];
+    protected _overlapping(labels: IText[]): IText[];
     protected labeling(textBounds: IBoundsLike, graphicBounds: IBoundsLike, position?: string, offset?: number): {
         x: number;
         y: number;
     } | undefined;
-    protected _layout(data?: LabelItem[]): (IRichText | IText)[];
+    protected _layout(data?: LabelItem[]): IText[];
     protected layoutArcLabels(position: BaseLabelAttrs['position'], attribute: any, currentMarks?: IGraphic[], data?: LabelItem[], textBoundsArray?: any, ellipsisWidth?: number): ArcInfo[];
     private _layoutInsideLabels;
     private _layoutOutsideLabels;
@@ -64,7 +63,7 @@ export declare class ArcLabel extends LabelBase<ArcLabelAttrs> {
     private _restoreY;
     private _checkYRange;
     private _coverLabels;
-    protected _labelLine(text: LabelItem): ILine;
+    protected _labelLine(text: IText): ILine;
     protected computeRadius(r: number, width?: number, height?: number, k?: number): number;
     protected computeLayoutRadius(width: number, height: number): number;
     protected _canPlaceInside(textBound: IBoundsLike, shapeBound: IAABBBounds): boolean;