@orbcharts/core 3.0.0-alpha.42 → 3.0.0-alpha.44

package/dist/src/grid/computeGridData.d.ts

@@ -1,13 +1,6 @@
 import { ComputedDataFn } from '../types/ComputedData';
-import { DataGridDatum } from '../types/DataGrid';
-import { DataFormatterContext } from '../types/DataFormatter';
-import { DataFormatterGrid } from '../types/DataFormatterGrid';
-import { Layout } from '../types/Layout';
-import * as d3 from 'd3';
-export interface DataGridDatumTemp extends DataGridDatum {
-    _visible: boolean;
-}
-export declare function createTransposedDataGrid(context: DataFormatterContext<'grid'>): DataGridDatumTemp[][];
-export declare function createGroupScale(transposedDataGrid: DataGridDatumTemp[][], dataFormatter: DataFormatterGrid, layout: Layout): d3.ScaleLinear<number, number, never>;
-export declare function createSeriesValueScaleArr(transposedDataGrid: DataGridDatumTemp[][], dataFormatter: DataFormatterGrid, layout: Layout): d3.ScaleLinear<number, number, never>[];
+import { DataGrid, DataGridDatum } from '../types/DataGrid';
+import { DataFormatterGridGrid } from '../types/DataFormatterGrid';
+
+export declare function createTransposedDataGrid(data: DataGrid, dataFormatterGrid: DataFormatterGridGrid): DataGridDatum[][];
 export declare const computeGridData: ComputedDataFn<'grid'>;

package/dist/src/grid/gridObservables.d.ts

@@ -1,6 +1,11 @@
 import { Observable } from 'rxjs';
-import { ChartParams, ComputedDataTypeMap, DataFormatterTypeMap, DataFormatterGrid, ContainerPosition, Layout, TransformData } from '../types';
+import { ComputedDataTypeMap, ComputedDatumGrid, DataFormatterTypeMap, DataFormatterGrid, ComputedLayoutDatumGrid, ComputedLayoutDataGrid, GridContainerPosition, Layout, TransformData } from '../types';
 
+export declare const gridComputedLayoutDataObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"grid">>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
+    layout$: Observable<Layout>;
+}) => Observable<ComputedLayoutDatumGrid[][]>;
 export declare const gridAxesTransformObservable: ({ fullDataFormatter$, layout$ }: {
     fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
     layout$: Observable<Layout>;
@@ -13,8 +18,8 @@ export declare const gridGraphicTransformObservable: ({ computedData$, fullDataF
     fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
     layout$: Observable<Layout>;
 }) => Observable<TransformData>;
-export declare const gridGraphicReverseScaleObservable: ({ gridContainer$, gridAxesTransform$, gridGraphicTransform$ }: {
-    gridContainer$: Observable<ContainerPosition[]>;
+export declare const gridGraphicReverseScaleObservable: ({ gridContainerPosition$, gridAxesTransform$, gridGraphicTransform$ }: {
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
     gridAxesTransform$: Observable<TransformData>;
     gridGraphicTransform$: Observable<TransformData>;
 }) => Observable<[number, number][]>;
@@ -25,25 +30,17 @@ export declare const gridAxesSizeObservable: ({ fullDataFormatter$, layout$ }: {
     width: number;
     height: number;
 }>;
-export declare const existSeriesLabelsObservable: ({ computedData$ }: {
+export declare const seriesLabelsObservable: ({ computedData$ }: {
     computedData$: Observable<ComputedDataTypeMap<"grid">>;
 }) => Observable<string[]>;
 export declare const gridVisibleComputedDataObservable: ({ computedData$ }: {
     computedData$: Observable<ComputedDataTypeMap<"grid">>;
-}) => Observable<import('../types').ComputedDatumGrid[][]>;
-export declare const isSeriesPositionSeprateObservable: ({ computedData$, fullDataFormatter$ }: {
+}) => Observable<ComputedDatumGrid[][]>;
+export declare const gridVisibleComputedLayoutDataObservable: ({ computedLayoutData$ }: {
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
+}) => Observable<ComputedLayoutDatumGrid[][]>;
+export declare const gridContainerPositionObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
     computedData$: Observable<ComputedDataTypeMap<"grid">>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
-}) => Observable<boolean>;
-export declare const gridContainerObservable: ({ computedData$, fullDataFormatter$, fullChartParams$, layout$ }: {
-    computedData$: Observable<ComputedDataTypeMap<"grid">>;
-    fullDataFormatter$: Observable<DataFormatterTypeMap<"grid">>;
-    fullChartParams$: Observable<ChartParams>;
     layout$: Observable<Layout>;
-}) => Observable<{
-    slotIndex: number;
-    rowIndex: number;
-    columnIndex: number;
-    translate: [number, number];
-    scale: [number, number];
-}[]>;
+}) => Observable<GridContainerPosition[]>;

package/dist/src/multiGrid/multiGridObservables.d.ts

@@ -1,5 +1,5 @@
 import { Subject, Observable } from 'rxjs';
-import { ChartParams, ComputedDataTypeMap, DataFormatterTypeMap, EventMultiGrid, Layout, ContextObserverGridDetail } from '../types';
+import { ChartParams, ComputedDataTypeMap, DataFormatterTypeMap, EventMultiGrid, Layout, ContextObserverMultiGridDetail, GridContainerPosition } from '../types';
 
 export declare const multiGridEachDetailObservable: ({ fullDataFormatter$, computedData$, layout$, fullChartParams$, event$ }: {
     fullDataFormatter$: Observable<DataFormatterTypeMap<"multiGrid">>;
@@ -7,16 +7,9 @@ export declare const multiGridEachDetailObservable: ({ fullDataFormatter$, compu
     layout$: Observable<Layout>;
     fullChartParams$: Observable<ChartParams>;
     event$: Subject<EventMultiGrid>;
-}) => Observable<ContextObserverGridDetail[]>;
-export declare const multiGridContainerObservable: ({ computedData$, fullDataFormatter$, fullChartParams$, layout$ }: {
+}) => Observable<ContextObserverMultiGridDetail[]>;
+export declare const multiGridContainerObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
     computedData$: Observable<ComputedDataTypeMap<"multiGrid">>;
     fullDataFormatter$: Observable<DataFormatterTypeMap<"multiGrid">>;
-    fullChartParams$: Observable<ChartParams>;
     layout$: Observable<Layout>;
-}) => Observable<{
-    slotIndex: number;
-    rowIndex: number;
-    columnIndex: number;
-    translate: [number, number];
-    scale: [number, number];
-}[][]>;
+}) => Observable<GridContainerPosition[][]>;

package/dist/src/series/seriesObservables.d.ts

@@ -1 +1,26 @@
-export {};
+import { Observable } from 'rxjs';
+import { ComputedDatumSeries, ComputedDataTypeMap, DataFormatterTypeMap, SeriesContainerPosition, Layout } from '../types';
+
+export declare const separateSeriesObservable: ({ fullDataFormatter$ }: {
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
+}) => Observable<boolean>;
+export declare const seriesLabelsObservable: ({ computedData$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"series">>;
+}) => Observable<string[]>;
+export declare const visibleComputedDataObservable: ({ computedData$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"series">>;
+}) => Observable<ComputedDatumSeries[][]>;
+export declare const computedLayoutDataObservable: ({ computedData$, fullDataFormatter$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"series">>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
+}) => Observable<ComputedDatumSeries[][]>;
+export declare const seriesContainerPositionObservable: ({ computedData$, fullDataFormatter$, layout$ }: {
+    computedData$: Observable<ComputedDataTypeMap<"series">>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<"series">>;
+    layout$: Observable<Layout>;
+}) => Observable<SeriesContainerPosition[]>;
+export declare const seriesContainerPositionMapObservable: ({ seriesContainerPosition$, seriesLabels$, separateSeries$ }: {
+    seriesContainerPosition$: Observable<SeriesContainerPosition[]>;
+    seriesLabels$: Observable<string[]>;
+    separateSeries$: Observable<boolean>;
+}) => Observable<Map<string, SeriesContainerPosition>>;

package/dist/src/types/ComputedData.d.ts

@@ -23,6 +23,7 @@ export interface ComputedDatumSeriesValue {
     color: string;
     seriesIndex: number;
     seriesLabel: string;
+    seq: number;
 }
 export interface ComputedDatumGridValue {
     gridIndex: number;

package/dist/src/types/ComputedDataGrid.d.ts

@@ -1,8 +1,5 @@
 import { ComputedDatumBase, ComputedDatumGridValue } from './ComputedData';
 
 export interface ComputedDatumGrid extends ComputedDatumBase, ComputedDatumGridValue {
-    axisX: number;
-    axisY: number;
-    axisYFromZero: number;
 }
 export type ComputedDataGrid = ComputedDatumGrid[][];

package/dist/src/types/ComputedDataSeries.d.ts

@@ -1,6 +1,5 @@
 import { ComputedDatumBase, ComputedDatumSeriesValue } from './ComputedData';
 
 export interface ComputedDatumSeries extends ComputedDatumBase, ComputedDatumSeriesValue {
-    sortedIndex: number;
 }
-export type ComputedDataSeries = ComputedDatumSeries[];
+export type ComputedDataSeries = ComputedDatumSeries[][];

package/dist/src/types/ContextObserverGrid.d.ts

@@ -7,7 +7,7 @@ export interface ContextObserverGrid<PluginParams> extends ContextObserverBase<'
     textSizePx$: Observable<number>;
 }
 export interface ContextObserverGridDetail {
-    gridContainer$: Observable<ContainerPosition[]>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
     gridAxesTransform$: Observable<TransformData>;
     gridAxesReverseTransform$: Observable<TransformData>;
     gridGraphicTransform$: Observable<TransformData>;
@@ -17,13 +17,20 @@ export interface ContextObserverGridDetail {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    existSeriesLabels$: Observable<string[]>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
     visibleComputedData$: Observable<ComputedDataGrid>;
-    isSeriesPositionSeprate$: Observable<boolean>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
 }
-export interface ContainerPosition {
+export type ComputedLayoutDataGrid = ComputedLayoutDatumGrid[][];
+export interface ComputedLayoutDatumGrid extends ComputedDatumGrid {
+    axisX: number;
+    axisY: number;
+    axisYFromZero: number;
+}
+export interface GridContainerPosition {
     slotIndex: number;
     rowIndex: number;
     columnIndex: number;

package/dist/src/types/ContextObserverMultiGrid.d.ts

@@ -1,9 +1,14 @@
 import { Observable } from 'rxjs';
 import { ContextObserverBase } from './ContextObserver';
-import { ContainerPosition, ContextObserverGridDetail } from './ContextObserverGrid';
+import { ComputedDataGrid } from './ComputedDataGrid';
+import { DataFormatterGrid } from './DataFormatterGrid';
+import { ContextObserverGridDetail } from './ContextObserverGrid';
 
 export interface ContextObserverMultiGrid<PluginParams> extends ContextObserverBase<'multiGrid', PluginParams> {
     textSizePx$: Observable<number>;
-    multiGridEachDetail$: Observable<ContextObserverGridDetail[]>;
-    multiGridContainer$: Observable<ContainerPosition[][]>;
+    multiGridEachDetail$: Observable<ContextObserverMultiGridDetail[]>;
+}
+export interface ContextObserverMultiGridDetail extends ContextObserverGridDetail {
+    computedData$: Observable<ComputedDataGrid>;
+    dataFormatter$: Observable<DataFormatterGrid>;
 }

package/dist/src/types/ContextObserverSeries.d.ts

@@ -4,6 +4,24 @@ import { ComputedDatumSeries } from './ComputedDataSeries';
 
 export interface ContextObserverSeries<PluginParams> extends ContextObserverBase<'series', PluginParams> {
     textSizePx$: Observable<number>;
+    separateSeries$: Observable<boolean>;
+    visibleComputedData$: Observable<ComputedDatumSeries[][]>;
+    computedLayoutData$: Observable<ComputedDatumSeries[][]>;
+    visibleComputedLayoutData$: Observable<ComputedDatumSeries[][]>;
     seriesHighlight$: Observable<ComputedDatumSeries[]>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumSeries[]>>;
+    seriesContainerPosition$: Observable<SeriesContainerPosition[]>;
+    SeriesContainerPositionMap$: Observable<Map<string, SeriesContainerPosition>>;
+}
+export interface SeriesContainerPosition {
+    slotIndex: number;
+    rowIndex: number;
+    columnIndex: number;
+    startX: number;
+    startY: number;
+    centerX: number;
+    centerY: number;
+    width: number;
+    height: number;
 }

package/dist/src/types/DataFormatter.d.ts

@@ -1,6 +1,7 @@
 import { ChartType } from './Chart';
 import { ChartParams } from './ChartParams';
-import { DataTypeMap, DatumTypeMap } from './Data';
+import { DataTypeMap } from './Data';
+import { ComputedDatumTypeMap } from './ComputedData';
 import { DataFormatterSeries, DataFormatterSeriesPartial } from './DataFormatterSeries';
 import { DataFormatterGrid, DataFormatterGridPartial } from './DataFormatterGrid';
 import { DataFormatterMultiGrid, DataFormatterMultiGridPartial } from './DataFormatterMultiGrid';
@@ -8,13 +9,11 @@ import { DataFormatterMultiValue, DataFormatterMultiValuePartial } from './DataF
 import { DataFormatterTree, DataFormatterTreePartial } from './DataFormatterTree';
 import { DataFormatterRelationship, DataFormatterRelationshipPartial } from './DataFormatterRelationship';
 import { AxisPosition } from './Axis';
-import { Layout } from './Layout';
 
 export interface DataFormatterContext<T extends ChartType> {
     data: DataTypeMap<T>;
     dataFormatter: DataFormatterTypeMap<T>;
     chartParams: ChartParams;
-    layout: Layout;
 }
 export type DataFormatterTypeMap<T extends ChartType> = T extends 'series' ? DataFormatterSeries : T extends 'grid' ? DataFormatterGrid : T extends 'multiGrid' ? DataFormatterMultiGrid : T extends 'multiValue' ? DataFormatterMultiValue : T extends 'relationship' ? DataFormatterRelationship : T extends 'tree' ? DataFormatterTree : DataFormatterBase<T>;
 export type DataFormatterPartialTypeMap<T extends ChartType> = T extends 'series' ? DataFormatterSeriesPartial : T extends 'grid' ? DataFormatterGridPartial : T extends 'multiGrid' ? DataFormatterMultiGridPartial : T extends 'multiValue' ? DataFormatterMultiValuePartial : T extends 'relationship' ? DataFormatterRelationshipPartial : T extends 'tree' ? DataFormatterTreePartial : DataFormatterBasePartial<T>;
@@ -34,5 +33,9 @@ export interface DataFormatterGroupAxis {
     scalePadding: number;
     label: string;
 }
-export type VisibleFilter<T extends ChartType> = (datum: DatumTypeMap<T>, rowIndex: number, columnIndex: number, context: DataFormatterContext<T>) => boolean | null;
-export type TooltipContentFormat<T extends ChartType> = (datum: DatumTypeMap<T>, rowIndex: number, columnIndex: number, context: DataFormatterContext<T>) => string | null;
+export type VisibleFilter<T extends ChartType> = (datum: ComputedDatumTypeMap<T>, context: DataFormatterContext<T>) => boolean | null;
+export interface DataFormatterContainer {
+    gap: number;
+    rowAmount: number;
+    columnAmount: number;
+}

package/dist/src/types/DataFormatterGrid.d.ts

@@ -1,37 +1,34 @@
-import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, DataFormatterGroupAxis, VisibleFilter } from './DataFormatter';
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, DataFormatterGroupAxis, VisibleFilter, DataFormatterContainer } from './DataFormatter';
 
 export type SeriesDirection = 'row' | 'column';
 export interface DataFormatterGrid extends DataFormatterBase<'grid'> {
+    visibleFilter: VisibleFilter<'grid'>;
     grid: DataFormatterGridGrid;
-    container: DataFormatterGridContainer;
+    container: DataFormatterContainer;
 }
 export interface DataFormatterGridPartial extends DataFormatterBasePartial<'grid'> {
+    visibleFilter?: VisibleFilter<'grid'>;
     grid?: DataFormatterGridGridPartial;
-    container?: Partial<DataFormatterGridContainer>;
+    container?: Partial<DataFormatterContainer>;
 }
 export interface DataFormatterGridGrid {
-    visibleFilter: VisibleFilter<'grid'>;
-    gridData: DataFormatterGridGridData;
+    seriesDirection: SeriesDirection;
+    rowLabels: string[];
+    columnLabels: string[];
     valueAxis: DataFormatterValueAxis;
     groupAxis: DataFormatterGroupAxis;
-    slotIndex: number | null;
-    seriesSlotIndexes: number[] | null;
+    separateSeries: boolean;
 }
 export interface DataFormatterGridGridPartial {
-    visibleFilter?: VisibleFilter<'grid'>;
-    gridData?: Partial<DataFormatterGridGridData>;
+    seriesDirection?: SeriesDirection;
+    rowLabels?: string[];
+    columnLabels?: string[];
     valueAxis?: Partial<DataFormatterValueAxis>;
     groupAxis?: Partial<DataFormatterGroupAxis>;
-    slotIndex?: number | null;
-    seriesSlotIndexes?: number[] | null;
+    separateSeries?: boolean;
 }
 export interface DataFormatterGridContainer {
     gap: number;
     rowAmount: number;
     columnAmount: number;
 }
-export interface DataFormatterGridGridData {
-    seriesDirection: SeriesDirection;
-    rowLabels: string[];
-    columnLabels: string[];
-}

package/dist/src/types/DataFormatterMultiGrid.d.ts

@@ -1,17 +1,20 @@
-import { DataFormatterGridGrid, DataFormatterGridGridPartial, DataFormatterGridContainer } from './DataFormatterGrid';
-import { DataFormatterBase, DataFormatterBasePartial } from './DataFormatter';
+import { VisibleFilter, DataFormatterContainer, DataFormatterBase, DataFormatterBasePartial } from './DataFormatter';
+import { DataFormatterGridGrid, DataFormatterGridGridPartial } from './DataFormatterGrid';
 
 export interface DataFormatterMultiGrid extends DataFormatterBase<'multiGrid'> {
+    visibleFilter: VisibleFilter<'multiGrid'>;
     gridList: Array<DataFormatterGridGrid>;
     container: DataFormatterMultiGridContainer;
+    separateGrid: boolean;
 }
 export interface DataFormatterMultiGridPartial extends DataFormatterBasePartial<'multiGrid'> {
     gridList?: Array<DataFormatterGridGridPartial>;
     container?: Partial<DataFormatterMultiGridContainer>;
+    separateGrid?: boolean;
 }
 export interface DataFormatterMultiGridGrid extends DataFormatterGridGrid {
 }
 export interface DataFormatterMultiGridGridPartial extends DataFormatterGridGridPartial {
 }
-export interface DataFormatterMultiGridContainer extends DataFormatterGridContainer {
+export interface DataFormatterMultiGridContainer extends DataFormatterContainer {
 }

package/dist/src/types/DataFormatterMultiValue.d.ts

@@ -2,11 +2,14 @@ import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, Vi
 
 export interface DataFormatterMultiValue extends DataFormatterBase<'multiValue'> {
     visibleFilter: VisibleFilter<'multiValue'>;
+    categoryLabels: string[];
     multiValue: Array<DataFormatterMultiValueMultiValue>;
     xAxis: DataFormatterValueAxis;
     yAxis: DataFormatterValueAxis;
 }
 export interface DataFormatterMultiValuePartial extends DataFormatterBasePartial<'multiValue'> {
+    visibleFilter?: VisibleFilter<'multiValue'>;
+    categoryLabels?: string[];
     multiValue?: Array<Partial<DataFormatterMultiValueMultiValue>>;
     xAxis?: Partial<DataFormatterValueAxis>;
     yAxis?: Partial<DataFormatterValueAxis>;

package/dist/src/types/DataFormatterRelationship.d.ts

@@ -2,6 +2,9 @@ import { DataFormatterBase, DataFormatterBasePartial, VisibleFilter } from './Da
 
 export interface DataFormatterRelationship extends DataFormatterBase<'relationship'> {
     visibleFilter: VisibleFilter<'relationship'>;
+    categoryLabels: string[];
 }
 export interface DataFormatterRelationshipPartial extends DataFormatterBasePartial<'relationship'> {
+    visibleFilter?: VisibleFilter<'relationship'>;
+    categoryLabels?: string[];
 }

package/dist/src/types/DataFormatterSeries.d.ts

@@ -1,12 +1,19 @@
-import { DataSeriesDatum, DataSeriesValue } from './DataSeries';
-import { DataFormatterBase, DataFormatterBasePartial, VisibleFilter } from './DataFormatter';
+import { ComputedDatumSeries } from './ComputedDataSeries';
+import { DataFormatterBase, DataFormatterBasePartial, VisibleFilter, DataFormatterContainer } from './DataFormatter';
 
 export interface DataFormatterSeries extends DataFormatterBase<'series'> {
     visibleFilter: VisibleFilter<'series'>;
+    sort: ((a: ComputedDatumSeries, b: ComputedDatumSeries) => number) | null;
     seriesLabels: string[];
-    sort: ((a: DataSeriesDatum | DataSeriesValue, b: DataSeriesDatum | number) => number) | null;
+    container: DataFormatterContainer;
+    separateSeries: boolean;
+    sumSeries: boolean;
 }
 export interface DataFormatterSeriesPartial extends DataFormatterBasePartial<'series'> {
+    visibleFilter?: VisibleFilter<'series'>;
+    sort?: ((a: ComputedDatumSeries, b: ComputedDatumSeries) => number) | null;
     seriesLabels?: string[];
-    sort?: ((a: DataSeriesDatum | DataSeriesValue, b: DataSeriesDatum | number) => number) | null;
+    container?: Partial<DataFormatterContainer>;
+    separateSeries?: boolean;
+    sumSeries?: boolean;
 }

package/dist/src/utils/orbchartsUtils.d.ts

@@ -5,32 +5,35 @@ import { DataSeries } from '../types/DataSeries';
 import { DataGrid, DataGridDatum } from '../types/DataGrid';
 import { DataMultiGrid } from '../types/DataMultiGrid';
 import { DataMultiValue } from '../types/DataMultiValue';
-import { SeriesDirection, DataFormatterGrid, DataFormatterGridContainer } from '../types/DataFormatterGrid';
+import { DataFormatterContainer } from '../types/DataFormatter';
+import { SeriesDirection, DataFormatterGridGrid } from '../types/DataFormatterGrid';
+import { SeriesContainerPosition } from '../types/ContextObserverSeries';
+import { GridContainerPosition } from '../types/ContextObserverGrid';
 import { Layout } from '../types/Layout';
 import * as d3 from 'd3';
 export declare function formatValueToLabel(value: any, valueFormatter: string | ((text: d3.NumberValue) => string)): string;
 export declare function createDefaultDatumId(chartTypeOrPrefix: string, levelOneIndex: number, levelTwoIndex: number, levelThreeIndex?: number): string;
 export declare function createDefaultSeriesLabel(chartTypeOrPrefix: string, seriesIndex: number): string;
 export declare function createDefaultGroupLabel(chartTypeOrPrefix: string, groupIndex: number): string;
-export declare function createGridSeriesLabels({ transposedDataGrid, dataFormatter, chartType }: {
+export declare function createGridSeriesLabels({ transposedDataGrid, dataFormatterGrid, chartType }: {
     transposedDataGrid: DataGridDatum[][];
-    dataFormatter: DataFormatterGrid;
+    dataFormatterGrid: DataFormatterGridGrid;
     chartType?: ChartType;
 }): string[];
-export declare function createMultiGridSeriesLabels({ transposedDataGrid, dataFormatter, chartType, gridIndex }: {
+export declare function createMultiGridSeriesLabels({ transposedDataGrid, dataFormatterGrid, chartType, gridIndex }: {
     transposedDataGrid: DataGridDatum[][];
-    dataFormatter: DataFormatterGrid;
+    dataFormatterGrid: DataFormatterGridGrid;
     chartType?: ChartType;
     gridIndex?: number;
 }): string[];
-export declare function createGridGroupLabels({ transposedDataGrid, dataFormatter, chartType }: {
+export declare function createGridGroupLabels({ transposedDataGrid, dataFormatterGrid, chartType }: {
     transposedDataGrid: DataGridDatum[][];
-    dataFormatter: DataFormatterGrid;
+    dataFormatterGrid: DataFormatterGridGrid;
     chartType?: ChartType;
 }): string[];
-export declare function createMultiGridGroupLabels({ transposedDataGrid, dataFormatter, chartType, gridIndex }: {
+export declare function createMultiGridGroupLabels({ transposedDataGrid, dataFormatterGrid, chartType, gridIndex }: {
     transposedDataGrid: DataGridDatum[][];
-    dataFormatter: DataFormatterGrid;
+    dataFormatterGrid: DataFormatterGridGrid;
     chartType?: ChartType;
     gridIndex?: number;
 }): string[];
@@ -42,7 +45,5 @@ export declare function getMinAndMaxMultiGrid(data: DataMultiGrid): [number, num
 export declare function getMinAndMaxMultiValue(data: DataMultiValue, valueIndex?: number): [number, number];
 export declare function transposeData<T>(seriesDirection: SeriesDirection, data: T[][]): T[][];
 export declare function seriesColorPredicate(seriesIndex: number, chartParams: ChartParams): string;
-export declare function calcGridContainerPosition(layout: Layout, container: DataFormatterGridContainer, rowIndex: number, columnIndex: number): {
-    translate: [number, number];
-    scale: [number, number];
-};
+export declare function calcSeriesContainerLayout(layout: Layout, container: DataFormatterContainer, amount: number): SeriesContainerPosition[];
+export declare function calcGridContainerLayout(layout: Layout, container: DataFormatterContainer, amount: number): GridContainerPosition[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/core",
-  "version": "3.0.0-alpha.42",
+  "version": "3.0.0-alpha.44",
   "description": "OrbCharts is an open source chart library based on d3.js and rx.js",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",

package/src/base/createBaseChart.ts

@@ -59,14 +59,14 @@ import {
   CHART_HEIGHT_DEFAULT } from '../defaults'
 
 // 判斷dataFormatter是否需要size參數
-const isAxesTypeMap: {[key in ChartType]: Boolean} = {
-  series: false,
-  grid: true,
-  multiGrid: true,
-  multiValue: true,
-  tree: false,
-  relationship: false
-}
+// const isAxesTypeMap: {[key in ChartType]: Boolean} = {
+//   series: false,
+//   grid: true,
+//   multiGrid: true,
+//   multiValue: true,
+//   tree: false,
+//   relationship: false
+// }
 
 function resizeObservable(elem: HTMLElement | Element): Observable<DOMRectReadOnly> {
   return new Observable(subscriber => {
@@ -267,7 +267,7 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({ defaultD
       data: sharedData$,
       dataFormatter: shareAndMergedDataFormatter$,
       chartParams: shareAndMergedChartParams$,
-      layout: iif(() => isAxesTypeMap[chartType] === true, layout$, of(undefined))
+      // layout: iif(() => isAxesTypeMap[chartType] === true, layout$, of(undefined))
     }).pipe(
       takeUntil(destroy$),
       switchMap(async d => d),
@@ -276,7 +276,7 @@ export const createBaseChart: CreateBaseChart = <T extends ChartType>({ defaultD
           .pipe(
             map(_d => {
               try {
-                return computedDataFn({ data: _d.data, dataFormatter: _d.dataFormatter, chartParams: _d.chartParams, layout: _d.layout })
+                return computedDataFn({ data: _d.data, dataFormatter: _d.dataFormatter, chartParams: _d.chartParams })
               } catch (e) {
                 console.error(e)
                 throw new Error(e)