@visactor/vchart-types 1.7.0-alpha.2 → 1.7.0

package/types/component/axis/base-axis.d.ts

@@ -99,31 +99,7 @@ export declare abstract class AxisComponent<T extends ICommonAxisSpec & Record<s
             style: any;
             state: {};
         };
-        title: {
-            visible: any;
-            position: any;
-            space: any;
-            autoRotate: boolean;
-            angle: number;
-            textStyle: any;
-            padding: any;
-            shape: {
-                visible: any;
-                space: any;
-                style: any;
-            };
-            background: {
-                visible: any;
-                style: any;
-            };
-            state: {
-                text: {};
-                shape: {};
-                background: {};
-            };
-            pickable: boolean;
-            childrenPickable: boolean;
-        };
+        title: any;
         panel: {
             visible: any;
             style: any;

package/types/component/axis/interface/spec.d.ts

@@ -3,6 +3,7 @@ import type { IAnimationSpec } from '../../../animation/spec';
 import type { Datum, IPadding, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../../typings';
 import type { IComponentSpec } from '../../base/interface';
 import type { AxisType, IAxisItem, ITickCallbackOption, StyleCallback } from './common';
+import type { IRichTextCharacter } from '@visactor/vrender-core';
 export interface ICommonAxisSpec extends Omit<IComponentSpec, 'orient' | 'center'>, IAnimationSpec<string, string> {
     type?: AxisType;
     visible?: boolean;
@@ -64,7 +65,8 @@ export interface ISubTick extends IAxisItem<IRuleMarkSpec> {
     state?: AxisItemStateStyle<IRuleMarkSpec>;
 }
 export interface ILabel extends IAxisItem<ITextMarkSpec> {
-    formatMethod?: (text: string | string[], datum?: Datum) => string | string[];
+    type?: 'text' | 'rich' | 'html';
+    formatMethod?: (text: string | string[], datum?: Datum) => string | string[] | IRichTextCharacter[];
     space?: number;
     inside?: boolean;
     minGap?: number;
@@ -86,7 +88,8 @@ export interface ITitle extends IAxisItem<ITextMarkSpec> {
         space?: number;
         state?: AxisItemStateStyle<Partial<ISymbolMarkSpec>>;
     };
-    text?: string | string[];
+    type?: 'text' | 'rich' | 'html';
+    text?: string | string[] | IRichTextCharacter[];
     angle?: number;
     state?: AxisItemStateStyle<Partial<ITextMarkSpec>>;
 }

package/types/component/indicator/interface.d.ts

@@ -2,6 +2,7 @@ import type { IPercent } from '../../typings/layout';
 import type { ConvertToMarkStyleSpec, ITextMarkSpec } from '../../typings/visual';
 import type { IComponentSpec } from '../base/interface';
 import type { IComponent } from '../interface';
+import type { IRichTextCharacter } from '@visactor/vrender-core';
 export interface IIndicatorItemSpec {
     visible?: boolean;
     field?: string;
@@ -9,7 +10,10 @@ export interface IIndicatorItemSpec {
     autoLimit?: boolean;
     autoFit?: boolean;
     fitPercent?: number;
-    style?: Omit<ConvertToMarkStyleSpec<ITextMarkSpec>, 'visible'>;
+    style?: Omit<ConvertToMarkStyleSpec<ITextMarkSpec>, 'visible' | 'text'> & {
+        type?: 'text' | 'rich' | 'html';
+        text?: string | string[] | number | number[] | IRichTextCharacter[];
+    };
 }
 export type IIndicator = IComponent;
 export interface IIndicatorSpec extends IComponentSpec {

package/types/component/label/interface.d.ts

@@ -2,6 +2,7 @@ import type { BaseLabelAttrs } from '@visactor/vrender-components';
 import type { ConvertToMarkStyleSpec, Datum, ITextMarkSpec } from '../../typings';
 import type { IComponentSpec } from '../base/interface';
 import type { ISeries } from '../..';
+import type { IRichTextCharacter } from '@visactor/vrender-core';
 import type { ILabelMark } from '../../mark/label';
 export interface ILabelFormatMethodContext {
     series?: ISeries;
@@ -9,7 +10,8 @@ export interface ILabelFormatMethodContext {
 export interface ILabelSpec extends IComponentSpec {
     visible?: boolean;
     interactive?: boolean;
-    formatMethod?: (text: string | string[], datum?: Datum, ctx?: ILabelFormatMethodContext) => string | string[];
+    textType?: string;
+    formatMethod?: (text: string | string[], datum?: Datum, ctx?: ILabelFormatMethodContext) => string | string[] | IRichTextCharacter[];
     formatter?: string;
     offset?: number;
     position?: string;

package/types/component/marker/interface.d.ts

@@ -1,5 +1,5 @@
 import type { IPadding } from '@visactor/vutils';
-import type { SymbolType } from '@visactor/vrender-core';
+import type { SymbolType, IRichTextCharacter } from '@visactor/vrender-core';
 import type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';
 import type { IComponentSpec } from '../base/interface';
 import type { Datum } from '@visactor/vrender-components';
@@ -33,8 +33,9 @@ export type IMarkerLabelWithoutRefSpec = {
         padding?: IPadding | number[] | number;
         style?: Omit<IRectMarkSpec, 'visible'>;
     };
-    text?: string | string[] | number | number[];
-    formatMethod?: (markData: Datum[], seriesData: Datum[]) => string | string[] | number | number[];
+    type?: 'text' | 'rich' | 'html';
+    text?: string | string[] | number | number[] | IRichTextCharacter[];
+    formatMethod?: (markData: Datum[], seriesData: Datum[]) => string | string[] | number | number[] | IRichTextCharacter[];
     style?: Omit<ITextMarkSpec, 'visible'>;
     shape?: {
         visible?: boolean;

package/types/component/title/interface/spec.d.ts

@@ -5,8 +5,10 @@ import type { IComponentSpec } from '../../base/interface';
 export interface ITitleSpec extends Omit<IComponentSpec, 'orient'> {
     visible?: boolean;
     orient?: IOrientType;
-    text: Text | Text[];
-    subtext?: Text | Text[];
+    text?: string | number | string[] | number[] | IRichTextCharacter[];
+    textType?: string;
+    subtext?: string | number | string[] | number[] | IRichTextCharacter[];
+    subtextType?: string;
     x?: number;
     y?: number;
     width?: number;

package/types/component/title/title.d.ts

@@ -1,10 +1,10 @@
+import type { IRegion } from '../../region/interface';
+import type { IPoint, IOrientType, ILayoutType, ILayoutRect } from '../../typings';
 import { BaseComponent } from '../base/base-component';
-import { ComponentTypeEnum } from '../interface/type';
 import type { IComponentOption } from '../interface';
+import { ComponentTypeEnum } from '../interface/type';
 import type { ITitle, ITitleSpec, ITitleTheme } from './interface';
-import type { IRegion } from '../../region/interface';
 import type { IGraphic } from '@visactor/vrender-core';
-import type { IPoint, IOrientType, ILayoutType, ILayoutRect } from '../../typings';
 export declare class Title extends BaseComponent<ITitleSpec> implements ITitle {
     static type: ComponentTypeEnum;
     type: ComponentTypeEnum;

package/types/component/tooltip/handler/base.d.ts

@@ -43,7 +43,7 @@ export declare abstract class BaseTooltipHandler implements ITooltipHandler {
     protected _getActualTooltipPosition: (actualTooltip: IToolTipActual, params: TooltipHandlerParams, tooltipBoxSize: IContainerSize | undefined) => ITooltipPositionActual;
     protected _getTooltipBoxSize(actualTooltip: IToolTipActual, changePositionOnly: boolean): IContainerSize | undefined;
     protected _getParentElement(spec: ITooltipSpec): HTMLElement;
-    getTooltipContainer(): HTMLElement | IGroup;
+    getTooltipContainer(): IGroup | HTMLElement;
     protected _initFromSpec(): void;
     reInit(): void;
 }

package/types/component/tooltip/handler/utils/common.d.ts

@@ -2,6 +2,7 @@ import type { Datum } from '@visactor/vgrammar-core';
 import type { MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings';
 import type { TooltipHandlerParams } from '../../interface';
 import type { ITooltipTextStyle } from '../interface/style';
+import type { TooltipRichTextAttrs } from '@visactor/vrender-components';
 export declare function escapeHTML(value: any): string;
 export declare const getTooltipContentValue: <T>(field?: TooltipContentProperty<T>, datum?: any, params?: TooltipHandlerParams) => T;
 export declare const getTooltipPatternValue: <T>(field?: MaybeArray<TooltipPatternProperty<T>>, data?: TooltipData, params?: TooltipHandlerParams) => MaybeArray<TooltipPatternProperty<T>> extends TooltipPatternProperty<T>[] ? MaybeArray<T> : T;
@@ -12,7 +13,7 @@ export declare const getScale: (element: HTMLElement, boundingClientRect?: DOMRe
 interface ITooltipTextInfo {
     width: number;
     height: number;
-    text: MaybeArray<number> | MaybeArray<string>;
+    text: MaybeArray<number> | MaybeArray<string> | TooltipRichTextAttrs;
 }
-export declare const measureTooltipText: (text: string, style: ITooltipTextStyle) => ITooltipTextInfo;
+export declare const measureTooltipText: (text: string | TooltipRichTextAttrs, style: ITooltipTextStyle) => ITooltipTextInfo;
 export {};

package/types/mark/text.d.ts

@@ -1,10 +1,12 @@
 import type { ITextMarkSpec } from '../typings/visual';
 import { BaseMark } from './base/base-mark';
 import type { IMarkRaw, IMarkStyle } from './interface';
-import { MarkTypeEnum } from './interface/type';
+import { MarkTypeEnum } from './interface';
+import type { IGroupMark } from '@visactor/vgrammar-core';
 export type ITextMark = IMarkRaw<ITextMarkSpec>;
 export declare class TextMark extends BaseMark<ITextMarkSpec> implements ITextMark {
     static readonly type = MarkTypeEnum.text;
     readonly type = MarkTypeEnum.text;
     protected _getDefaultStyle(): IMarkStyle<ITextMarkSpec>;
+    protected _initProduct(group?: string | IGroupMark): void;
 }

package/types/typings/tooltip/line.d.ts

@@ -1,16 +1,17 @@
 import type { TooltipContentProperty } from './common';
 import type { ITooltipLabelActual, ITooltipLabelPattern } from './label';
 import type { ITooltipShapeActual, ITooltipShapePattern } from './shape';
+import type { TooltipRichTextAttrs } from '@visactor/vrender-components';
 export interface IToolTipLinePattern extends ITooltipShapePattern, ITooltipLabelPattern {
     key?: TooltipContentProperty<string>;
-    value?: TooltipContentProperty<string>;
+    value?: TooltipContentProperty<string | TooltipRichTextAttrs>;
     visible?: TooltipContentProperty<boolean>;
     isKeyAdaptive?: TooltipContentProperty<boolean>;
     spaceRow?: TooltipContentProperty<number>;
 }
 export interface IToolTipLineActual extends ITooltipShapeActual, ITooltipLabelActual {
     key?: string;
-    value?: string;
+    value?: string | TooltipRichTextAttrs;
     visible?: boolean;
     isKeyAdaptive?: boolean;
     spaceRow?: number;

package/types/typings/visual.d.ts

@@ -10,6 +10,7 @@ import type { Datum, StringOrNumber } from './common';
 import type { IPadding } from '@visactor/vutils';
 import type { IColorKey } from '../theme/color-scheme/interface';
 import type { IRepeatType, TextAlignType, TextBaselineType } from '@visactor/vrender-core';
+import type { IRichTextCharacter } from '@visactor/vrender-core';
 export interface IVisualSpecBase<D, T> {
     type: ScaleType;
     domain: D[];
@@ -115,7 +116,8 @@ export interface IRuleMarkSpec extends ILineMarkSpec {
     y1?: number;
 }
 export interface ITextMarkSpec extends IFillMarkSpec {
-    text?: StringOrNumber | string[];
+    type?: 'html' | 'rich' | 'text';
+    text?: StringOrNumber | string[] | IRichTextCharacter[] | Function;
     dx?: number;
     dy?: number;
     fontSize?: number;