@visactor/vchart-types 1.11.2-alpha.5 → 1.11.2

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

@@ -1,4 +1,4 @@
-import type { IChartSpec } from '../../typings';
+import type { IChartSpec, ISeriesSpec } from '../../typings';
 import type { IChartSpecInfo, IChartSpecTransformer, IChartSpecTransformerOption } from '../interface';
 import type { IModelConstructor, IModelSpecInfo } from '../../model/interface';
 import type { IRegionConstructor } from '../../region/interface';
@@ -20,6 +20,7 @@ export declare class BaseChartSpecTransformer<T extends IChartSpec> implements I
     forEachSeriesInSpec<K>(chartSpec: T, callbackfn: (constructor: ISeriesConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => K, chartSpecInfo?: IChartSpecInfo): K[];
     forEachComponentInSpec<K>(chartSpec: T, callbackfn: (constructor: IComponentConstructor, specInfo: IModelSpecInfo, chartSpecInfo?: IChartSpecInfo) => K, chartSpecInfo?: IChartSpecInfo): K[];
     transformSeriesSpec(spec: T): void;
+    protected _findBandAxisBySeries(seriesSpec: ISeriesSpec, seriesIndex: number, axesSpec: any): any;
     protected _applyAxisBandSize(axis: ICartesianBandAxisSpec, extend: number, barWidthSpec: {
         barMaxWidth: number | string;
         barMinWidth: number | string;

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

@@ -1,7 +1,8 @@
 import type { IPolarAxisSpec } from '../../component/axis/polar/interface';
 import type { IPolarCrosshairSpec } from '../../component/crosshair/interface';
-import type { IChartSpec } from '../../typings';
+import type { IChartSpec, ILayoutRect, IPoint } from '../../typings';
 export interface IPolarChartSpec extends IChartSpec {
     axes?: IPolarAxisSpec[];
     crosshair?: IPolarCrosshairSpec | IPolarCrosshairSpec[];
+    layoutRadius?: 'auto' | number | ((layoutRect: ILayoutRect, center: IPoint) => number);
 }

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

@@ -1,4 +1,4 @@
-import type { ITickDataOpt } from '@visactor/vutils-extension';
+import type { ITickDataOpt } from '@visactor/vrender-components';
 import type { IBaseScale } from '@visactor/vscale';
 import type { IGroup, IGraphic } from '@visactor/vrender-core';
 import type { IOrientType, IPolarOrientType, StringOrNumber, CoordinateType } from '../../typings';

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

@@ -11,7 +11,7 @@ import type { ILayoutRect, ILayoutType } from '../../../typings/layout';
 import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
 import type { IAxis, ITick } from '../interface';
-import type { ICartesianTickDataOpt } from '@visactor/vutils-extension';
+import type { ICartesianTickDataOpt } from '@visactor/vrender-components';
 import type { DataSet } from '@visactor/vdataset';
 import { AxisComponent } from '../base-axis';
 import type { IGraphic } from '@visactor/vrender-core';

package/types/component/axis/polar/axis.d.ts

@@ -2,7 +2,7 @@ import type { IBaseScale } from '@visactor/vscale';
 import type { IPolarAxis, IPolarAxisCommonSpec } from './interface';
 import type { IComponentOption } from '../../interface';
 import { ComponentTypeEnum } from '../../interface/type';
-import type { IPolarTickDataOpt } from '@visactor/vutils-extension';
+import type { IPolarTickDataOpt } from '@visactor/vrender-components';
 import type { IPolarSeries } from '../../../series/interface';
 import type { IPoint, IPolarOrientType, IPolarPoint, StringOrNumber, ILayoutType } from '../../../typings';
 import type { Maybe } from '@visactor/vutils';
@@ -20,8 +20,14 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
     layoutType: ILayoutType;
     layoutZIndex: number;
     protected _tick: ITick | undefined;
-    protected _center: IPoint | null;
-    get center(): IPoint;
+    protected _center: {
+        x: string | number;
+        y: string | number;
+    } | null;
+    get center(): {
+        x: string | number;
+        y: string | number;
+    };
     protected _startAngle: number;
     get startAngle(): number;
     protected _endAngle: number;
@@ -58,6 +64,7 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
         coordToPoint: (point: IPolarPoint) => IPoint;
         pointToCoord: (point: IPoint) => IPolarPoint;
         center: () => IPoint;
+        layoutRadius: () => number;
         getScale: (depth: number) => IBaseScale;
         getAxisId: () => number;
         getSpec: () => T;
@@ -75,6 +82,7 @@ export declare abstract class PolarAxis<T extends IPolarAxisCommonSpec = IPolarA
     private _layoutAngleAxis;
     private _layoutRadiusAxis;
     protected _getRelatedAngleAxis(): IPolarAxis | undefined;
+    private computeLayoutRadius;
     private computeLayoutOuterRadius;
     private computeLayoutInnerRadius;
     private getRefLayoutRect;

package/types/component/axis/polar/band-axis.d.ts

@@ -25,6 +25,7 @@ export declare class PolarBandAxis<T extends IPolarBandAxisSpec = IPolarBandAxis
         coordToPoint: (point: import("../../../typings").IPolarPoint) => import("../../../typings").IPoint;
         pointToCoord: (point: import("../../../typings").IPoint) => import("../../../typings").IPolarPoint;
         center: () => import("../../../typings").IPoint;
+        layoutRadius: () => number;
         getScale: (depth: number) => import("@visactor/vscale").IBaseScale;
         getAxisId: () => number;
         getSpec: () => T;

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

@@ -11,6 +11,7 @@ export interface IPolarAxisHelper {
     coordToPoint: (point: IPolarPoint) => IPoint;
     pointToCoord: (point: IPoint) => IPolarPoint;
     center: () => IPoint;
+    layoutRadius: () => number;
     getScale: (depth?: number) => IBaseScale;
     getBandwidth?: (depth?: number) => number;
     getAxisId: () => number;

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

@@ -1,8 +1,9 @@
-import type { IPoint, IPolarOrientType } from '../../../../typings';
+import type { ILayoutRect, IPoint, IPolarOrientType } from '../../../../typings';
 import type { IBandAxisSpec, IDomainLine, ILinearAxisSpec, ITitle, ILabel, ICommonAxisSpec } from '../../interface';
 import type { IPolarGrid } from './common';
 export type IPolarAxisSpec = IPolarLinearAxisSpec | IPolarBandAxisSpec;
 export type IPolarAxisCommonSpec = Omit<ICommonAxisSpec, 'center'> & {
+    layoutRadius?: 'auto' | number | ((layoutRect: ILayoutRect, center: IPoint) => number);
     inside?: boolean;
     orient: IPolarOrientType;
     grid?: IPolarGrid;
@@ -13,7 +14,10 @@ export type IPolarAxisCommonSpec = Omit<ICommonAxisSpec, 'center'> & {
     title?: ITitle;
     innerRadius?: number;
     outerRadius?: number;
-    center?: IPoint;
+    center?: {
+        x: number | string;
+        y: number | string;
+    };
     startAngle?: number;
     endAngle?: number;
 };

package/types/component/axis/polar/util/common.d.ts

@@ -6,4 +6,5 @@ export declare const getPolarAxisInfo: (spec: IPolarAxisCommonSpec, chartSpec: a
     endAngle: any;
     center: any;
     outerRadius: any;
+    layoutRadius: any;
 };

package/types/series/pie/pie.d.ts

@@ -46,7 +46,6 @@ export declare class BasePieSeries<T extends IBasePieSeriesSpec> extends PolarSe
     getMeasureField(): string[];
     private viewDataLabelUpdate;
     protected generateRadiusStyle(spec: any): any;
-    protected computeLayoutRadius(): number;
     computeCenter(datum: Datum): IPoint;
     getRadius(state?: StateValueType): number;
     getInnerRadius(state?: StateValueType): number;

package/types/series/polar/interface.d.ts

@@ -1,7 +1,7 @@
 import type { ISeriesSpec } from '../../typings/spec/common';
 export interface IPolarSeriesSpec extends ISeriesSpec {
-    centerX?: number;
-    centerY?: number;
+    centerX?: number | string;
+    centerY?: number | string;
     outerRadius?: number;
     innerRadius?: number;
     startAngle?: number;

package/types/util/math.d.ts

@@ -1,10 +1,9 @@
 import type { IBoundsLike } from '@visactor/vutils';
-import type { IPoint, IPolarPoint, Quadrant } from '../typings';
-import { isNumberClose, isGreater, isLess } from '@visactor/vutils';
-import { normalizeAngle, angleLabelOrientAttribute } from '@visactor/vutils-extension';
+import type { IPoint, Quadrant } from '../typings';
+import { isNumberClose, isGreater, isLess, normalizeAngle } from '@visactor/vutils';
+import { angleLabelOrientAttribute } from '@visactor/vrender-components';
 export declare const isClose: typeof isNumberClose;
 export { isGreater, isLess, normalizeAngle, angleLabelOrientAttribute };
-export declare function polarToCartesian(point: IPolarPoint): IPoint;
 export declare function computeQuadrant(angle: number): Quadrant;
 export declare function normalizeStartEndAngle(start: number | null, end: number | null): {
     startAngle: number;

package/types/util/space.d.ts

@@ -5,7 +5,7 @@ import type { ILayoutNumber, ILayoutRect, IPercent, IPercentOffset, ILayoutPaddi
 export declare function isValidOrient(orient: string): boolean;
 export declare function isPercent(v: any): v is IPercent;
 export declare function isPercentOffset(v: any): v is IPercentOffset;
-export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect): number;
+export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect, defaultValue?: number): number;
 export declare function calcPadding(paddingSpec: ILayoutOrientPadding, rect: ILayoutRect, callOp: ILayoutRect): IPadding;
 export declare function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect;
 export declare function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding;