@orbcharts/plugins-basic 3.0.0-alpha.44 → 3.0.0-alpha.46

package/dist/src/base/BaseBarStack.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subject } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDatumGrid, ComputedDataGrid, DataFormatterGrid, EventGrid, ChartParams, ContainerPosition, TransformData } from '@orbcharts/core';
+import { ComputedDatumGrid, ComputedDataGrid, ComputedLayoutDataGrid, DataFormatterGrid, EventGrid, ChartParams, GridContainerPosition, TransformData } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseBarStackParams {
     barWidth: number;
@@ -10,8 +10,10 @@ export interface BaseBarStackParams {
 interface BaseBarStackContext {
     selection: d3.Selection<any, unknown, any, unknown>;
     computedData$: Observable<ComputedDataGrid>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
     visibleComputedData$: Observable<ComputedDatumGrid[][]>;
-    existSeriesLabels$: Observable<string[]>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     fullParams$: Observable<BaseBarStackParams>;
@@ -25,8 +27,8 @@ interface BaseBarStackContext {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
-    isSeriesPositionSeprate$: Observable<boolean>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
+    isSeriesSeprate$: Observable<boolean>;
     event$: Subject<EventGrid>;
 }
 export declare const createBaseBarStack: BasePluginFn<BaseBarStackContext>;

package/dist/src/base/BaseBars.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subject } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDatumGrid, ComputedDataGrid, ContainerPosition, EventGrid, ChartParams, TransformData } from '@orbcharts/core';
+import { ComputedDatumGrid, ComputedDataGrid, ComputedLayoutDataGrid, GridContainerPosition, EventGrid, ChartParams, TransformData } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseBarsParams {
     barWidth: number;
@@ -11,8 +11,10 @@ export interface BaseBarsParams {
 interface BaseBarsContext {
     selection: d3.Selection<any, unknown, any, unknown>;
     computedData$: Observable<ComputedDataGrid>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
     visibleComputedData$: Observable<ComputedDatumGrid[][]>;
-    existSeriesLabels$: Observable<string[]>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     fullParams$: Observable<BaseBarsParams>;
@@ -25,8 +27,8 @@ interface BaseBarsContext {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
-    isSeriesPositionSeprate$: Observable<boolean>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
+    isSeriesSeprate$: Observable<boolean>;
     event$: Subject<EventGrid>;
 }
 export declare const createBaseBars: BasePluginFn<BaseBarsContext>;

package/dist/src/base/BaseBarsTriangle.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subject } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDatumGrid, ComputedDataGrid, EventGrid, ChartParams, ContainerPosition, TransformData } from '@orbcharts/core';
+import { ComputedDatumGrid, ComputedDataGrid, ComputedLayoutDataGrid, DataFormatterTypeMap, EventGrid, ChartParams, GridContainerPosition, TransformData } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseBarsTriangleParams {
     barWidth: number;
@@ -11,8 +11,11 @@ export interface BaseBarsTriangleParams {
 interface BaseBarsContext {
     selection: d3.Selection<any, unknown, any, unknown>;
     computedData$: Observable<ComputedDataGrid>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
     visibleComputedData$: Observable<ComputedDatumGrid[][]>;
-    existSeriesLabels$: Observable<string[]>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    fullDataFormatter$: Observable<DataFormatterTypeMap<'grid'>>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     fullParams$: Observable<BaseBarsTriangleParams>;
@@ -24,8 +27,8 @@ interface BaseBarsContext {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
-    isSeriesPositionSeprate$: Observable<boolean>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
+    isSeriesSeprate$: Observable<boolean>;
     event$: Subject<EventGrid>;
 }
 export declare const createBaseBarsTriangle: BasePluginFn<BaseBarsContext>;

package/dist/src/base/BaseDots.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subject } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDatumGrid, ComputedDataGrid, EventGrid, ChartParams, ContainerPosition, TransformData, ColorType } from '@orbcharts/core';
+import { ComputedDatumGrid, ComputedDataGrid, ComputedLayoutDataGrid, EventGrid, ChartParams, GridContainerPosition, TransformData, ColorType } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseDotsParams {
     radius: number;
@@ -12,8 +12,10 @@ export interface BaseDotsParams {
 interface BaseDotsContext {
     selection: d3.Selection<any, unknown, any, unknown>;
     computedData$: Observable<ComputedDataGrid>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
     visibleComputedData$: Observable<ComputedDatumGrid[][]>;
-    existSeriesLabels$: Observable<string[]>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     fullParams$: Observable<BaseDotsParams>;
@@ -26,7 +28,7 @@ interface BaseDotsContext {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
     event$: Subject<EventGrid>;
 }
 export declare const createBaseDots: BasePluginFn<BaseDotsContext>;

package/dist/src/base/BaseGroupAxis.d.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { ColorType, ComputedDataGrid, ContainerPosition, DataFormatterGrid, ChartParams, TransformData } from '@orbcharts/core';
+import { ColorType, ComputedDataGrid, GridContainerPosition, DataFormatterGrid, ChartParams, TransformData } from '@orbcharts/core';
 import { BasePluginFn } from './types';
 import * as d3 from 'd3';
 export interface BaseGroupAxisParams {
@@ -28,8 +28,8 @@ interface BaseGroupAxisContext {
         width: number;
         height: number;
     }>;
-    gridContainer$: Observable<ContainerPosition[]>;
-    isSeriesPositionSeprate$: Observable<boolean>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
+    isSeriesSeprate$: Observable<boolean>;
 }
 export declare const createBaseGroupAxis: BasePluginFn<BaseGroupAxisContext>;
 export {};

package/dist/src/base/BaseLineAreas.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subject } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDatumGrid, ComputedDataGrid, DataFormatterGrid, EventGrid, ContainerPosition, ChartParams, Layout, TransformData } from '@orbcharts/core';
+import { ComputedDatumGrid, ComputedDataGrid, ComputedLayoutDataGrid, DataFormatterGrid, EventGrid, GridContainerPosition, ChartParams, Layout, TransformData } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseLineAreasParams {
     lineCurve: string;
@@ -9,7 +9,10 @@ export interface BaseLineAreasParams {
 interface BaseLineAreasContext {
     selection: d3.Selection<any, unknown, any, unknown>;
     computedData$: Observable<ComputedDataGrid>;
-    existSeriesLabels$: Observable<string[]>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    visibleComputedData$: Observable<ComputedDatumGrid[][]>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     fullDataFormatter$: Observable<DataFormatterGrid>;
@@ -22,7 +25,7 @@ interface BaseLineAreasContext {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
     layout$: Observable<Layout>;
     event$: Subject<EventGrid>;
 }

package/dist/src/base/BaseLines.d.ts

@@ -1,6 +1,6 @@
 import { Observable, Subject } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDatumGrid, ComputedDataGrid, DataFormatterGrid, EventGrid, ContainerPosition, ChartParams, TransformData } from '@orbcharts/core';
+import { ComputedDatumGrid, ComputedDataGrid, ComputedLayoutDataGrid, DataFormatterGrid, EventGrid, GridContainerPosition, ChartParams, TransformData } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseLinesParams {
     lineCurve: string;
@@ -9,7 +9,10 @@ export interface BaseLinesParams {
 interface BaseLinesContext {
     selection: d3.Selection<any, unknown, any, unknown>;
     computedData$: Observable<ComputedDataGrid>;
-    existSeriesLabels$: Observable<string[]>;
+    computedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    visibleComputedData$: Observable<ComputedDatumGrid[][]>;
+    visibleComputedLayoutData$: Observable<ComputedLayoutDataGrid>;
+    seriesLabels$: Observable<string[]>;
     SeriesDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     GroupDataMap$: Observable<Map<string, ComputedDatumGrid[]>>;
     fullDataFormatter$: Observable<DataFormatterGrid>;
@@ -22,7 +25,7 @@ interface BaseLinesContext {
         height: number;
     }>;
     gridHighlight$: Observable<ComputedDatumGrid[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
     event$: Subject<EventGrid>;
 }
 export declare const createBaseLines: BasePluginFn<BaseLinesContext>;

package/dist/src/base/BaseValueAxis.d.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
 import { BasePluginFn } from './types';
-import { ComputedDataGrid, DataFormatterGrid, ChartParams, ContainerPosition, TransformData, ColorType } from '@orbcharts/core';
+import { ComputedDataGrid, DataFormatterGrid, ChartParams, GridContainerPosition, TransformData, ColorType } from '@orbcharts/core';
 import * as d3 from 'd3';
 export interface BaseValueAxisParams {
     labelOffset: [number, number];
@@ -29,8 +29,8 @@ interface BaseLinesContext {
         width: number;
         height: number;
     }>;
-    gridContainer$: Observable<ContainerPosition[]>;
-    isSeriesPositionSeprate$: Observable<boolean>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
+    isSeriesSeprate$: Observable<boolean>;
 }
 export declare const createBaseValueAxis: BasePluginFn<BaseLinesContext>;
 export {};

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

@@ -1,12 +1,12 @@
 import { Observable } from 'rxjs';
-import { ChartParams, DataFormatterGrid, ComputedDataGrid, TransformData, ContainerPosition } from '@orbcharts/core';
+import { ChartParams, DataFormatterGrid, ComputedDataGrid, TransformData, GridContainerPosition } from '@orbcharts/core';
 import * as d3 from 'd3';
-export declare const gridSelectionsObservable: ({ selection, pluginName, clipPathID, existSeriesLabels$, gridContainer$, gridAxesTransform$, gridGraphicTransform$ }: {
+export declare const gridSelectionsObservable: ({ selection, pluginName, clipPathID, seriesLabels$, gridContainerPosition$, gridAxesTransform$, gridGraphicTransform$ }: {
     selection: d3.Selection<any, unknown, any, unknown>;
     pluginName: string;
     clipPathID: string;
-    existSeriesLabels$: Observable<string[]>;
-    gridContainer$: Observable<ContainerPosition[]>;
+    seriesLabels$: Observable<string[]>;
+    gridContainerPosition$: Observable<GridContainerPosition[]>;
     gridAxesTransform$: Observable<TransformData>;
     gridGraphicTransform$: Observable<TransformData>;
 }) => {

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

@@ -1,12 +1,8 @@
 import { Observable } from 'rxjs';
-import { ContextObserverMultiGrid, ComputedDataGrid, DataFormatterGrid, ContextObserverGridDetail } from '@orbcharts/core';
+import { ContextObserverMultiGrid, ContextObserverMultiGridDetail } from '@orbcharts/core';
 
 interface MultiGridPluginParams {
     gridIndexes: number[];
 }
-interface MultiGridDetailObservables extends ContextObserverGridDetail {
-    gridComputedData$: Observable<ComputedDataGrid>;
-    gridDataFormatter$: Observable<DataFormatterGrid>;
-}
-export declare const multiGridDetailObservables: (observer: ContextObserverMultiGrid<MultiGridPluginParams>) => Observable<MultiGridDetailObservables[]>;
+export declare const multiGridPluginObservables: (observer: ContextObserverMultiGrid<MultiGridPluginParams>) => Observable<ContextObserverMultiGridDetail[]>;
 export {};

package/dist/src/series/plugins/PieEventTexts.d.ts

@@ -1 +1,3 @@
-export declare const PieEventTexts: import('@orbcharts/core').PluginConstructor<"series", string, import('..').PieEventTextsParams>;
+import { PieEventTextsParams } from '../types';
+
+export declare const PieEventTexts: import('@orbcharts/core').PluginConstructor<"series", string, PieEventTextsParams>;

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

@@ -0,0 +1,21 @@
+import { Observable } from 'rxjs';
+import { SeriesContainerPosition } from '@orbcharts/core';
+import * as d3 from 'd3';
+export declare const seriesStartSelectionObservable: ({ selection, pluginName, separateSeries$, seriesLabels$, seriesContainerPosition$ }: {
+    selection: d3.Selection<any, unknown, any, unknown>;
+    pluginName: string;
+    separateSeries$: Observable<boolean>;
+    seriesLabels$: Observable<string[]>;
+    seriesContainerPosition$: Observable<SeriesContainerPosition[]>;
+}) => {
+    seriesStartSelection$: Observable<d3.Selection<SVGGElement, string, any, unknown>>;
+};
+export declare const seriesCenterSelectionObservable: ({ selection, pluginName, separateSeries$, seriesLabels$, seriesContainerPosition$ }: {
+    selection: d3.Selection<any, unknown, any, unknown>;
+    pluginName: string;
+    separateSeries$: Observable<boolean>;
+    seriesLabels$: Observable<string[]>;
+    seriesContainerPosition$: Observable<SeriesContainerPosition[]>;
+}) => {
+    seriesCenterSelection$: Observable<d3.Selection<SVGGElement, string, any, unknown>>;
+};

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

@@ -1,4 +1,4 @@
-import { ComputedDataSeries, ComputedDatumSeries } from '@orbcharts/core';
+import { ComputedDatumSeries } from '@orbcharts/core';
 
 export interface D3PieDatum {
     data: any;
@@ -12,8 +12,8 @@ export interface PieDatum extends D3PieDatum {
     data: ComputedDatumSeries;
     id: string;
 }
-export declare function makePieData({ computedDataSeries, startAngle, endAngle }: {
-    computedDataSeries: ComputedDataSeries;
+export declare function makePieData({ data, startAngle, endAngle }: {
+    data: ComputedDatumSeries[];
     startAngle: number;
     endAngle: number;
 }): PieDatum[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/plugins-basic",
-  "version": "3.0.0-alpha.44",
+  "version": "3.0.0-alpha.46",
   "description": "plugins for OrbCharts",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "vite-plugin-dts": "^3.7.3"
   },
   "dependencies": {
-    "@orbcharts/core": "^3.0.0-alpha.42",
+    "@orbcharts/core": "^3.0.0-alpha.44",
     "d3": "^7.8.5",
     "rxjs": "^7.8.1"
   }