@visactor/vchart-types 1.10.3 → 1.10.4

package/types/chart/base/base-chart.d.ts

@@ -39,9 +39,10 @@ export declare class BaseChart<T extends IChartSpec> extends CompilableBase impl
     protected _viewBox: IBoundsLike;
     protected _layoutTag: boolean;
     getLayoutTag(): boolean;
-    setLayoutTag(tag: boolean, morphConfig?: IMorphConfig, reLayout?: boolean): boolean;
+    setLayoutTag(tag: boolean, morphConfig?: IMorphConfig, renderNextTick?: boolean): boolean;
     protected _modelOption: IModelOption;
     protected _globalScale: IGlobalScale;
+    getGlobalScale(): IGlobalScale;
     protected _idMap: Map<number, IModel | IMark>;
     protected _event: IEvent;
     getEvent(): IEvent;

package/types/chart/common/interface.d.ts

@@ -36,6 +36,6 @@ export interface ICommonChartSpec extends Omit<IChartSpec, 'series'> {
     axes?: ICartesianAxisSpec[] | IPolarAxisSpec[];
     crosshair?: ICartesianCrosshairSpec | ICartesianCrosshairSpec[] | IPolarCrosshairSpec | IPolarCrosshairSpec[];
     markLine?: IMarkLineSpec | IMarkLineSpec[];
-    markArea?: IMarkAreaSpec;
-    markPoint?: IMarkPointSpec;
+    markArea?: IMarkAreaSpec | IMarkAreaSpec[];
+    markPoint?: IMarkPointSpec | IMarkPointSpec[];
 }

package/types/chart/interface/chart.d.ts

@@ -12,6 +12,8 @@ import type { IBoundsLike, IPadding } from '@visactor/vutils';
 import type { ICompilable } from '../../compile/interface';
 import type { IRegionQuerier, MaybeArray, Datum, IMarkStateSpec, StringOrNumber, IShowTooltipOption, IDataValues, ILayoutRect, IData } from '../../typings';
 import type { DataView } from '@visactor/vdataset';
+import type { IGlobalScale } from '../../scale/interface';
+import type { IMorphConfig } from '../../animation/spec';
 export type DimensionIndexOption = {
     filter?: (cmp: IComponent) => boolean;
     tooltip?: boolean;
@@ -35,10 +37,11 @@ export interface IChart extends ICompilable {
     getCanvasRect: () => ILayoutRect;
     getOption: () => IChartOption;
     getEvent: () => IEvent;
+    getGlobalScale: () => IGlobalScale;
     setLayout: (layout: LayoutCallBack) => void;
     layout: (context: ILayoutParams) => void;
     getLayoutTag: () => boolean;
-    setLayoutTag: (tag: boolean) => boolean;
+    setLayoutTag: (tag: boolean, morphConfig?: IMorphConfig, renderNextTick?: boolean) => boolean;
     updateData: (id: StringOrNumber, data: unknown, updateGlobalScale?: boolean, options?: IParserOptions) => void;
     updateFullData: (data: IDataValues | IDataValues[]) => void;
     updateGlobalScaleDomain: () => void;

package/types/component/axis/cartesian/interface/common.d.ts

@@ -23,6 +23,7 @@ export interface ILinearAxis extends IAxis {
     readonly zero: boolean;
     readonly nice: boolean;
     setExtendDomain: (key: string, value: number | undefined) => void;
+    niceLabelFormatter?: (value: StringOrNumber) => StringOrNumber;
 }
 export interface IAxisHelper {
     isContinuous: boolean;

package/types/component/axis/mixin/linear-axis-mixin.d.ts

@@ -3,6 +3,7 @@ import type { IAxisLocationCfg, ITick } from '../interface';
 import type { IEvent } from '../../../event/interface';
 import type { IOrientType } from '../../../typings/space';
 import type { IComponentOption } from '../../interface/common';
+import type { StringOrNumber } from '../../../typings';
 export declare const e10: number;
 export declare const e5: number;
 export declare const e2: number;
@@ -31,11 +32,13 @@ export interface LinearAxisMixin {
     event: IEvent;
     _orient: IOrientType;
     _option: IComponentOption;
+    niceLabelFormatter: (value: StringOrNumber) => StringOrNumber;
 }
 export declare class LinearAxisMixin {
     protected _extend: {
         [key: string]: number;
     };
+    niceLabelFormatter: (value: StringOrNumber) => StringOrNumber;
     setExtraAttrFromSpec(): void;
     transformScaleDomain(): void;
     setLinearScaleNice(): void;
@@ -61,4 +64,5 @@ export declare class LinearAxisMixin {
     setZero(zero: boolean): void;
     protected updateScaleDomain(): void;
     protected updateScaleDomainByModel(domain?: number[]): void;
+    protected _updateNiceLabelFormatter(domain: number[]): void;
 }

package/types/component/crosshair/interface/cartesian.d.ts

@@ -1,23 +1,20 @@
 import type { StringOrNumber } from '../../../typings';
 import type { IAxis } from '../../axis';
+export interface ICrosshairLabelInfo {
+    visible: boolean;
+    text: StringOrNumber;
+    dx: number;
+    dy: number;
+    defaultFormatter?: (value: StringOrNumber) => StringOrNumber;
+}
 export interface ICrosshairInfoX {
     height: number;
     leftPos: number;
     rightPos: number;
     topPos: number;
     x: number;
-    bottom: {
-        visible: boolean;
-        text: StringOrNumber;
-        dx: number;
-        dy: number;
-    };
-    top: {
-        visible: boolean;
-        text: StringOrNumber;
-        dx: number;
-        dy: number;
-    };
+    bottom: ICrosshairLabelInfo;
+    top: ICrosshairLabelInfo;
     visible: boolean;
     _isCache?: boolean;
     axis: IAxis;
@@ -28,18 +25,8 @@ export interface ICrosshairInfoY {
     topPos: number;
     bottomPos: number;
     y: number;
-    left: {
-        visible: boolean;
-        text: StringOrNumber;
-        dx: number;
-        dy: number;
-    };
-    right: {
-        visible: boolean;
-        text: StringOrNumber;
-        dx: number;
-        dy: number;
-    };
+    left: ICrosshairLabelInfo;
+    right: ICrosshairLabelInfo;
     visible: boolean;
     _isCache?: boolean;
     axis: IAxis;

package/types/component/crosshair/interface/polar.d.ts

@@ -14,10 +14,12 @@ export interface IPolarCrosshairInfo {
     angle: number;
     point: IPoint;
     _isCache?: boolean;
-    label?: {
-        visible: boolean;
-        text: StringOrNumber;
-        offset: number;
-    };
+    label?: IPolarCrosshairLabelInfo;
     axis?: IPolarAxis;
 }
+export interface IPolarCrosshairLabelInfo {
+    visible: boolean;
+    text: StringOrNumber;
+    offset: number;
+    defaultFormatter?: (value: StringOrNumber) => StringOrNumber;
+}

package/types/component/data-zoom/data-filter-base-component.d.ts

@@ -19,6 +19,7 @@ export declare abstract class DataFilterBaseComponent<T extends IDataFilterCompo
     protected _fixedBandSize?: number;
     protected _cacheRect?: ILayoutRect;
     protected _cacheVisibility?: boolean;
+    protected _dataUpdating: boolean;
     protected _stateScale: IBaseScale;
     protected _relatedAxisComponent: IComponent;
     protected _originalStateFields: Record<number, string | number>;

package/types/core/interface.d.ts

@@ -13,6 +13,7 @@ import type { Compiler } from '../compile/compiler';
 import type { IChart, IChartSpecInfo } from '../chart/interface';
 import type { Stage } from '@visactor/vrender-core';
 import type { IContainerSize } from '@visactor/vrender-components';
+import type { IBaseScale } from '@visactor/vscale';
 export type DataLinkSeries = {
     seriesId?: StringOrNumber;
     seriesIndex?: number;
@@ -81,6 +82,7 @@ export interface IVChart {
     getContainer: () => Maybe<HTMLElement>;
     getComponents: () => IComponent[];
     getDataSet: () => Maybe<DataSet>;
+    getScale: (scaleId: string) => IBaseScale | null;
     convertDatumToPosition: (datum: Datum, dataLinkInfo?: DataLinkSeries, isRelativeToCanvas?: boolean, checkInViewData?: boolean) => IPoint | null;
     convertValueToPosition: ((value: StringOrNumber, dataLinkInfo: DataLinkAxis, isRelativeToCanvas?: boolean) => number | null) & ((value: [StringOrNumber, StringOrNumber], dataLinkInfo: DataLinkSeries, isRelativeToCanvas?: boolean) => IPoint | null);
     stopAnimation: () => void;

package/types/core/vchart.d.ts

@@ -6,8 +6,7 @@ import type { ISeriesConstructor } from '../series/interface';
 import type { DimensionIndexOption, IChart, IChartConstructor, IChartOption, IChartSpecInfo } from '../chart/interface';
 import type { IComponentConstructor } from '../component/interface';
 import type { EventCallback, EventParams, EventQuery, EventType } from '../event/interface';
-import type { IParserOptions } from '@visactor/vdataset';
-import type { Transform, DataView } from '@visactor/vdataset';
+import type { IParserOptions, Transform, DataView } from '@visactor/vdataset';
 import { DataSet } from '@visactor/vdataset';
 import type { Stage } from '@visactor/vrender-core';
 import type { GeoSourceType } from '../typings/geo';
@@ -169,6 +168,7 @@ export declare class VChart implements IVChart {
     getCanvas(): HTMLCanvasElement | undefined;
     getContainer(): Maybe<HTMLElement>;
     getComponents(): import("../component/interface").IComponent[];
+    getScale(scaleId: string): import("@visactor/vscale").IBaseScale;
     setDimensionIndex(value: StringOrNumber, opt?: DimensionIndexOption): void;
     stopAnimation(): void;
     pauseAnimation(): void;

package/types/event/interface.d.ts

@@ -10,6 +10,7 @@ import type { ChartEvent, Event_Bubble_Level, Event_Source_Type, VGRAMMAR_HOOK_E
 import type { SeriesType } from '../series/interface';
 import type { TooltipEventParams } from '../component/tooltip/interface/event';
 import type { ILayoutItem } from '../layout/interface';
+import type { IVChart } from '../core/interface';
 export type EventType = 'pointerdown' | 'pointerup' | 'pointerupoutside' | 'pointertap' | 'pointerover' | 'pointermove' | 'pointerenter' | 'pointerleave' | 'pointerout' | 'mousedown' | 'mouseup' | 'mouseupoutside' | 'rightdown' | 'rightup' | 'rightupoutside' | 'click' | 'dblclick' | 'mousemove' | 'mouseover' | 'mouseout' | 'mouseenter' | 'mouseleave' | 'wheel' | 'touchstart' | 'touchend' | 'touchendoutside' | 'touchmove' | 'touchcancel' | 'tap' | 'dragstart' | 'drag' | 'dragenter' | 'dragleave' | 'dragover' | 'dragend' | 'drop' | 'pan' | 'panstart' | 'panend' | 'press' | 'pressup' | 'pressend' | 'pinch' | 'pinchstart' | 'pinchend' | 'swipe' | keyof typeof ChartEvent | keyof typeof VGRAMMAR_HOOK_EVENT | string;
 export type EventBubbleLevel = keyof typeof Event_Bubble_Level;
 export type ComponentType = 'axis' | 'dataZoom' | 'indicator' | 'legend' | 'mapLabel' | 'markLine' | 'markArea' | 'markPoint' | 'tooltip' | 'title' | 'label' | 'totalLabel' | 'customMark';
@@ -35,6 +36,7 @@ export type EventParams = {
     chart?: IChart;
     datum?: Datum;
     node?: IGraphic;
+    vchart?: IVChart;
 };
 type SuperEvent = Event & {
     [key: string]: any;

package/types/layout/grid-layout/grid-layout.d.ts

@@ -30,7 +30,7 @@ export declare class GridLayout implements IBaseLayout {
     }[], gridSize: GridSize[], gridMax: number, maxSize: number): void;
     protected clearLayoutSize(): void;
     protected getItemGridInfo(item: ILayoutItem): ElementSpec;
-    protected getSizeFromGird(spec: ElementSpec, type: 'col' | 'row'): number | undefined;
+    protected getSizeFromGrid(spec: ElementSpec, type: 'col' | 'row'): number | undefined;
     protected getSizeFromUser(spec: ElementSpec, type: 'col' | 'row'): number | undefined;
     protected setItemLayoutSizeToGrid(item: ILayoutItem, gridSpec: ElementSpec): void;
     protected layoutGrid(type: 'col' | 'row'): void;

package/types/region/interface.d.ts

@@ -13,6 +13,7 @@ export interface IRegion extends ILayoutModel {
     animate?: IAnimate;
     interaction: IInteraction;
     getStackInverse: () => boolean;
+    getStackSort: () => boolean;
     getMaxWidth: () => number | undefined;
     setMaxWidth: (value: number) => void;
     getMaxHeight: () => number | undefined;
@@ -48,6 +49,7 @@ export interface IRegionSpec extends ILayoutItemSpec {
     coordinate?: CoordinateType;
     style?: ConvertToMarkStyleSpec<IRectMarkSpec>;
     stackInverse?: boolean;
+    stackSort?: boolean;
 }
 export interface IGeoRegionSpec extends IRegionSpec {
     coordinate?: 'geo';

package/types/region/region.d.ts

@@ -33,6 +33,7 @@ export declare class Region<T extends IRegionSpec = IRegionSpec> extends LayoutM
     protected _interactionMark: IGroupMark;
     getInteractionMark(): IGroupMark;
     getStackInverse(): boolean;
+    getStackSort(): boolean;
     protected _backgroundMark?: IRectMark;
     protected _foregroundMark?: IRectMark;
     protected _trigger: ITrigger;

package/types/typings/spec/common.d.ts

@@ -81,6 +81,7 @@ export interface IChartSpec {
     theme?: Omit<ITheme, 'name'> | string;
     background?: IBackgroundSpec;
     stackInverse?: boolean;
+    stackSort?: boolean;
     media?: IMediaQuerySpec;
 }
 export type IBackgroundStyleSpec = ConvertToMarkStyleSpec<Omit<IFillMarkSpec, 'width' | 'height' | 'background'>> & {

package/types/util/data.d.ts

@@ -1,6 +1,7 @@
 import type { DataView } from '@visactor/vdataset';
 import type { StatisticOperations } from '../data/transforms/dimension-statistics';
 import type { ISeries, ISeriesStackDataMeta } from '../series/interface';
+import type { IRegion } from '../region/interface';
 export declare function mergeFields(targetFields: {
     key: string;
     operations: StatisticOperations;
@@ -18,6 +19,11 @@ export interface IStackCacheNode {
         s: ISeries;
         values: any[];
     }[];
+    sortDatums: {
+        datum: any;
+        index: number;
+        series: ISeries;
+    }[];
     nodes: {
         [key: string]: IStackCacheNode;
     };
@@ -28,12 +34,23 @@ export interface IStackCacheRoot {
         [key: string]: IStackCacheNode;
     };
 }
-export declare function getRegionStackGroup(region: {
-    getSeries: () => any[];
-}, setInitialValue: boolean, filter?: (s: any) => boolean): {
+export interface IStackSortCache {
+    [key: string]: {
+        lastIndex: number;
+        sort: {
+            [key: string]: number;
+        };
+    };
+}
+export declare function getRegionStackGroup(region: IRegion, setInitialValue: boolean, filter?: (s: any) => boolean): {
     [key: string]: IStackCacheRoot;
 };
+export declare function sortStackValueGroup(stackValueGroup: {
+    [key: string]: IStackCacheNode;
+}, stackSortCache: IStackSortCache): {
+    [key: string]: IStackCacheNode;
+};
 export declare function stackTotal(stackData: IStackCacheNode, valueField: string): void;
 export declare function stackOffsetSilhouette(stackCache: IStackCacheNode): void;
 export declare function stack(stackCache: IStackCacheNode, stackInverse: boolean, hasPercent?: boolean): void;
-export declare function stackGroup(s: ISeries, stackData: ISeriesStackDataMeta, stackCache: IStackCacheNode, valueField: string, setInitialValue: boolean, stackKey?: string): void;
+export declare function stackGroup(s: ISeries, stackData: ISeriesStackDataMeta, stackCache: IStackCacheNode, valueField: string, setInitialValue: boolean, stackSortCache: IStackSortCache, stackKey?: string): void;

package/types/util/index.d.ts

@@ -11,6 +11,7 @@ export * from './object';
 export * from './scale';
 export * from './space';
 export * from './type';
+export * from './theme';
 export * from './spec';
 export * from './text';
 export * from './data';

package/types/util/spec/index.d.ts

@@ -1,7 +1,2 @@
 export * from './background';
-export * from './clone-deep';
-export * from './common';
-export * from './merge-spec';
-export * from '../theme/merge-theme';
-export * from '../theme/preprocess';
 export * from './transform';