@visactor/vchart-types 2.0.0-alpha.0 → 2.0.0-alpha.2

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

@@ -1,20 +1,20 @@
 import type { IAreaChartSpec } from '../../chart/area/interface';
-import type { IBarChartSpec, IBar3dChartSpec } from '../../chart/bar/interface';
+import type { IBarChartSpec } from '../../chart/bar/interface';
 import type { IBoxPlotChartSpec } from '../../chart/box-plot/interface';
 import type { ICirclePackingChartSpec } from '../../chart/circle-packing/interface';
 import type { ICommonChartSpec } from '../../chart/common/interface';
-import type { IFunnelChartSpec, IFunnel3dChartSpec } from '../../chart/funnel/interface';
+import type { IFunnelChartSpec } from '../../chart/funnel/interface';
 import type { IGaugeChartSpec } from '../../chart/gauge/interface';
 import type { IHeatmapChartSpec } from '../../chart/heatmap/interface';
-import type { IHistogramChartSpec, IHistogram3dChartSpec } from '../../chart/histogram/interface';
+import type { IHistogramChartSpec } from '../../chart/histogram/interface';
 import type { ILineChartSpec } from '../../chart/line/interface';
 import type { IMapChartSpec } from '../../chart/map/interface';
-import type { IPieChartSpec, IPie3dChartSpec } from '../../chart/pie/interface';
+import type { IPieChartSpec } from '../../chart/pie/interface';
 import type { ICircularProgressChartSpec } from '../../chart/progress/circular/interface';
 import type { ILinearProgressChartSpec } from '../../chart/progress/linear/interface';
 import type { IRadarChartSpec } from '../../chart/radar/interface';
 import type { IRangeAreaChartSpec } from '../../chart/range-area/interface';
-import type { IRangeColumnChartSpec, IRangeColumn3dChartSpec } from '../../chart/range-column/interface';
+import type { IRangeColumnChartSpec } from '../../chart/range-column/interface';
 import type { IRoseChartSpec } from '../../chart/rose/interface';
 import type { ISankeyChartSpec } from '../../chart/sankey/interface';
 import type { IScatterChartSpec } from '../../chart/scatter/interface';
@@ -23,7 +23,7 @@ import type { ISunburstChartSpec } from '../../chart/sunburst/interface';
 import type { ITreemapChartSpec } from '../../chart/treemap/interface';
 import type { IWaterfallChartSpec } from '../../chart/waterfall/interface';
 import type { ICorrelationChartSpec } from '../../chart/correlation/interface';
-import type { IWordCloudChartSpec, IWordCloud3dChartSpec } from '../../chart/word-cloud/interface';
+import type { IWordCloudChartSpec } from '../../chart/word-cloud/interface';
 import type { IChartSpec } from './common';
 import type { ILiquidChartSpec } from '../../chart/liquid/interface';
 export interface ChartSpecMap {
@@ -31,15 +31,11 @@ export interface ChartSpecMap {
     readonly area: IAreaChartSpec;
     readonly line: ILineChartSpec;
     readonly bar: IBarChartSpec;
-    readonly bar3d: IBar3dChartSpec;
     readonly histogram: IHistogramChartSpec;
-    readonly histogram3d: IHistogram3dChartSpec;
     readonly rangeColumn: IRangeColumnChartSpec;
-    readonly rangeColumn3d: IRangeColumn3dChartSpec;
     readonly rangeArea: IRangeAreaChartSpec;
     readonly map: IMapChartSpec;
     readonly pie: IPieChartSpec;
-    readonly pie3d: IPie3dChartSpec;
     readonly radar: IRadarChartSpec;
     readonly rose: IRoseChartSpec;
     readonly scatter: IScatterChartSpec;
@@ -47,9 +43,7 @@ export interface ChartSpecMap {
     readonly circleProgress: ICircularProgressChartSpec;
     readonly linearProgress: ILinearProgressChartSpec;
     readonly wordCloud: IWordCloudChartSpec;
-    readonly wordCloud3d: IWordCloud3dChartSpec;
     readonly funnel: IFunnelChartSpec;
-    readonly funnel3d: IFunnel3dChartSpec;
     readonly waterfall: IWaterfallChartSpec;
     readonly boxplot: IBoxPlotChartSpec;
     readonly gauge: IGaugeChartSpec;

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

@@ -7,7 +7,7 @@ import type { IHoverSpec, ISelectSpec, IInteractionSpec } from '../../interactio
 import type { IRenderOption } from '../../compile/interface';
 import type { ISeriesTooltipSpec, ITooltipSpec } from '../../component/tooltip/interface';
 import type { ILayoutSpec } from '../../layout/interface';
-import type { ConvertToMarkStyleSpec, IArc3dMarkSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IPyramid3dMarkSpec, IRect3dMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
+import type { ConvertToMarkStyleSpec, IArcMarkSpec, IAreaMarkSpec, IBoxPlotMarkSpec, ICommonSpec, IGroupMarkSpec, ILineMarkSpec, ILinkPathMarkSpec, IPathMarkSpec, IPolygonMarkSpec, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, IRippleMarkSpec, ITextMarkSpec, IVisualSpecScale } from '../visual';
 import type { ISeriesStyle, SeriesType } from '../../series/interface';
 import type { Datum, StringOrNumber } from '../common';
 import type { IInvalidType } from '../data';
@@ -106,10 +106,11 @@ export type BuildInTransformOptions = {
 export interface IFieldsMeta {
     alias?: string;
     domain?: StringOrNumber[];
-    lockStatisticsByDomain?: boolean;
+    lockStatisticsByDomain?: boolean | 'onlyFull';
     type?: 'ordinal' | 'linear';
     sortIndex?: number;
     sortReverse?: boolean;
+    sort?: 'desc' | 'asc';
 }
 export interface SheetParseOptions extends CommonParseOptions {
     type: 'csv' | 'dsv' | 'tsv';
@@ -262,14 +263,11 @@ export type IBuildinMarkSpec = {
     line: ILineMarkSpec;
     text: ITextMarkSpec;
     rect: IRectMarkSpec;
-    rect3d: IRect3dMarkSpec;
     image: IImageMarkSpec;
     path: IPathMarkSpec;
     area: IAreaMarkSpec;
     arc: IArcMarkSpec;
-    arc3d: IArc3dMarkSpec;
     polygon: IPolygonMarkSpec;
-    pyramid3d: IPyramid3dMarkSpec;
     boxPlot: IBoxPlotMarkSpec;
     linkPath: ILinkPathMarkSpec;
     ripple: IRippleMarkSpec;

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

@@ -6,7 +6,7 @@ export interface ITooltipPositionFixedValue {
     offset?: number;
 }
 export type TooltipPositionPatternItem = TooltipPositionValue | ITooltipPositionFixedValue;
-export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'center' | 'centerTop' | 'centerBottom' | 'centerLeft' | 'centerRight' | 'inside';
+export type TooltipFixedPosition = 'top' | 'bottom' | 'left' | 'right' | 'tl' | 'lt' | 'tr' | 'rt' | 'bl' | 'lb' | 'br' | 'rb' | 'center' | 'centerTop' | 'centerBottom' | 'centerLeft' | 'centerRight' | 'inside' | 'insideTop' | 'insideBottom' | 'insideLeft' | 'insideRight' | 'insideTopLeft' | 'insideTopRight' | 'insideBottomLeft' | 'insideBottomRight';
 export type TooltipPositionMode = 'pointer' | 'mark' | 'crosshair';
 export interface IGlobalTooltipPositionPattern {
     left?: TooltipPositionValue;

package/types/typings/visual.d.ts

@@ -57,7 +57,7 @@ export interface ICommonSpec {
     x?: number;
     y?: number;
     z?: number;
-    stroke?: string | IGradient | false | (number | boolean)[] | IColorKey;
+    stroke?: string | IGradient | false | (number | boolean)[] | IColorKey | null;
     strokeOpacity?: number;
     opacity?: number;
     lineWidth?: number;
@@ -157,9 +157,6 @@ export interface IRectMarkSpec extends IFillMarkSpec {
     x1?: number;
     y1?: number;
 }
-export interface IRect3dMarkSpec extends IRectMarkSpec {
-    length?: number;
-}
 export interface IBoxPlotMarkSpec extends ICommonSpec {
     lineWidth?: number;
     boxWidth?: number;
@@ -220,9 +217,6 @@ export interface IArcMarkSpec extends IFillMarkSpec {
     cap?: boolean | [boolean, boolean];
     autoCapConical?: boolean;
 }
-export interface IArc3dMarkSpec extends IArcMarkSpec {
-    height?: number;
-}
 export interface ICellMarkSpec extends ISymbolMarkSpec {
     padding?: number | number[] | IPadding;
 }
@@ -238,9 +232,6 @@ export interface IPolygonMarkSpec extends ICommonSpec, IFillMarkSpec {
     scaleX?: number;
     scaleY?: number;
 }
-export interface IPyramid3dMarkSpec extends IPolygonMarkSpec {
-    points?: IPoint[];
-}
 export type RepeatType = 'no-repeat' | 'repeat-x' | 'repeat-y' | 'repeat';
 export type RepeatXYType = 'no-repeat' | 'repeat' | 'stretch';
 export type ImageOriginType = 'top' | 'bottom';
@@ -296,7 +287,7 @@ export interface IImageMarkSpec extends IFillMarkSpec {
     height?: number;
     repeatX?: IRepeatType;
     repeatY?: IRepeatType;
-    image: string | HTMLImageElement | HTMLCanvasElement;
+    image?: string | HTMLImageElement | HTMLCanvasElement;
 }
 export type TextAlign = TextAlignType;
 export type TextBaseLine = TextBaselineType;

package/types/util/mark.d.ts

@@ -1,5 +1,5 @@
 import type { IGraphic } from '@visactor/vrender-core';
 import type { IMarkGraphic } from '../mark/interface/common';
 export declare const isCollectionMark: (type: string) => boolean;
-export declare const getDatumOfGraphic: (g: IMarkGraphic) => import("../typings").Datum;
+export declare const getDatumOfGraphic: (g: IMarkGraphic) => import("..").Datum;
 export declare const findMarkGraphic: (rootGroup: IGraphic, target: IGraphic) => IGraphic<Partial<import("@visactor/vrender-core").IGraphicAttribute>>;

package/types/util/region.d.ts

@@ -0,0 +1,5 @@
+import type { IRegion } from '../region/interface';
+export declare const getCombinedSizeOfRegions: (regions: IRegion[]) => {
+    width: number;
+    height: number;
+};

package/types/util/scale.d.ts

@@ -17,5 +17,6 @@ export declare function createScaleWithSpec(spec: IVisual<any>, context: {
     seriesId: number;
 }): IBaseScale | null;
 export declare function valueInScaleRange(v: number, s?: IBaseScale, useWholeRange?: boolean): number;
+export declare function isValueInScaleDomain(v: number | number[], s?: IBaseScale, useWholeRange?: boolean): boolean;
 export declare function isSpecValueWithScale(specValue: any): boolean;
 export {};

package/types/util/theme/common.d.ts

@@ -1,2 +1,2 @@
 import type { ITheme } from '../../theme';
-export declare function getThemeObject(theme?: string | ITheme, transformed?: boolean): ITheme;
+export declare function getThemeObject(theme?: string | ITheme): ITheme;

package/types/util/theme/merge-theme.d.ts

@@ -1,6 +1,6 @@
 import type { Maybe } from '@visactor/vutils';
-import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, ITheme } from '../../theme';
+import type { ITheme } from '../../theme';
 import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
 export declare function mergeTheme(target: Maybe<ITheme>, ...sources: Maybe<ITheme>[]): Maybe<ITheme>;
 export declare function transformColorSchemeToMerge(colorScheme?: Maybe<IThemeColorScheme>): Maybe<IThemeColorScheme>;
-export declare function transformSeriesThemeToMerge(seriesTheme: any, seriesType: string, markByType: IGlobalMarkThemeByType, markByName: IGlobalMarkThemeByName): any;
+export declare function transformSeriesThemeToMerge(seriesTheme: any, seriesType: string, getTheme: (...keys: string[]) => any): any;

package/types/util/theme/preprocess.d.ts

@@ -1,4 +1,3 @@
 import type { IThemeColorScheme } from '../../theme/color-scheme/interface';
-import type { ISeriesSpec } from '../../typings';
 import type { TokenMap } from '../../theme/token';
-export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, tokenMap?: TokenMap, seriesSpec?: ISeriesSpec): any;
+export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, tokenMap?: TokenMap): any;

package/types/vrender-tools.d.ts

@@ -0,0 +1 @@
+export { randomOpacity, columnLeftToRight, columnRightToLeft, rowTopToBottom, rowBottomToTop, diagonalCenterToEdge, diagonalTopLeftToBottomRight, rotationScan, rippleEffect, snakeWave, alternatingWave, spiralEffect, columnEdgeToCenter, columnCenterToEdge, rowEdgeToCenter, rowCenterToEdge, cornerToCenter, centerToCorner, pulseWave, particleEffect } from '@visactor/vrender-kits';

package/types/interaction/triggers/element-highlight-by-graphic-name.d.ts

@@ -1,13 +0,0 @@
-import { ElementHighlight } from './element-highlight';
-import type { BaseEventParams } from '../../event/interface';
-export declare class ElementHighlightByGraphicName extends ElementHighlight {
-    static type: string;
-    type: string;
-    protected _filterByName(e: BaseEventParams): boolean;
-    protected _parseTargetKey(e: BaseEventParams): string;
-    start(itemKey: any): void;
-    reset(): void;
-    handleStart: (e: BaseEventParams) => void;
-    handleReset: (e: BaseEventParams) => void;
-}
-export declare const registerElementHighlightByGraphicName: () => void;

package/types/interaction/triggers/element-select-by-graphic-name.d.ts

@@ -1,8 +0,0 @@
-import type { IMarkGraphic } from '../../mark/interface/common';
-import { ElementSelect } from './element-select';
-export declare class ElementSelectByGraphicName extends ElementSelect {
-    static type: string;
-    type: string;
-    start(markGraphic: IMarkGraphic): void;
-}
-export declare const registerElementSelectByGraphicName: () => void;