ts: rename Text to TSpan

src/component/toolbox/ToolboxView.ts

@@ -36,8 +36,8 @@ import {
     UserDefinedToolboxFeature
 } from './featureManager';
 import { getUID } from '../../util/component';
-import { RichText } from 'zrender/src/export';
 import Displayable from 'zrender/src/graphic/Displayable';
+import RichText from 'zrender/src/graphic/RichText';
 
 type IconPath = ToolboxFeatureModel['iconPaths'][string];
 

src/component/tooltip/TooltipRichContent.ts

@@ -18,8 +18,6 @@
 */
 
 import * as zrUtil from 'zrender/src/core/util';
-// import Group from 'zrender/src/graphic/Group';
-import Text from 'zrender/src/graphic/Text';
 import ExtensionAPI from '../../ExtensionAPI';
 import { ZRenderType } from 'zrender/src/zrender';
 import { TooltipOption } from './TooltipModel';

src/model/mixin/textStyle.ts

@@ -20,7 +20,7 @@
 import * as graphicUtil from '../../util/graphic';
 import Model from '../Model';
 import { LabelOption, ColorString } from '../../util/types';
-import { RichText } from 'zrender/src/export';
+import RichText from 'zrender/src/graphic/RichText';
 
 const PATH_COLOR = ['textStyle', 'color'] as const;
 

src/util/types.ts

@@ -42,7 +42,7 @@ import { AnimationEasing } from 'zrender/src/animation/easing';
 import { LinearGradientObject } from 'zrender/src/graphic/LinearGradient';
 import { RadialGradientObject } from 'zrender/src/graphic/RadialGradient';
 import { RectLike } from 'zrender/src/core/BoundingRect';
-import { TextStyleProps } from 'zrender/src/graphic/Text';
+import { TSpanStyleProps } from 'zrender/src/graphic/TSpan';
 import { PathStyleProps } from 'zrender/src/graphic/Path';
 import { ImageStyleProps } from 'zrender/src/graphic/Image';
 import RichText, { RichTextStyleProps } from 'zrender/src/graphic/RichText';
@@ -78,7 +78,7 @@ export type ZRElementEvent = ElementEvent;
 
 export type ZRRectLike = RectLike;
 
-export type ZRStyleProps = PathStyleProps | ImageStyleProps | TextStyleProps | RichTextStyleProps;
+export type ZRStyleProps = PathStyleProps | ImageStyleProps | TSpanStyleProps | RichTextStyleProps;
 
 // ComponentFullType can be:
 //     'xxx.yyy': means ComponentMainType.ComponentSubType.