@orbcharts/plugins-basic 3.0.0-alpha.27 → 3.0.0-alpha.29

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

@@ -1,7 +1,7 @@
-import { BubblesPluginParams, PiePluginParams, PieEventTextsPluginParams, PieLabelsPluginParams, SeriesLegendParams } from './types';
+import { BubblesParams, PieParams, PieEventTextsParams, PieLabelsParams, SeriesLegendParams } from './types';
 
-export declare const DEFAULT_BUBBLES_PLUGIN_PARAMS: BubblesPluginParams;
-export declare const DEFAULT_PIE_PLUGIN_PARAMS: PiePluginParams;
-export declare const DEFAULT_PIE_EVENT_TEXTS_PARAMS: PieEventTextsPluginParams;
-export declare const DEFAULT_PIE_LABELS_PARAMS: PieLabelsPluginParams;
+export declare const DEFAULT_BUBBLES_PLUGIN_PARAMS: BubblesParams;
+export declare const DEFAULT_PIE_PLUGIN_PARAMS: PieParams;
+export declare const DEFAULT_PIE_EVENT_TEXTS_PARAMS: PieEventTextsParams;
+export declare const DEFAULT_PIE_LABELS_PARAMS: PieLabelsParams;
 export declare const DEFAULT_SERIES_LEGEND_PARAMS: SeriesLegendParams;

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 import { ComputedDatumSeries, EventSeries, EventName, ColorType } from '@orbcharts/core';
 import { BaseLegendParams } from '../base/BaseLegend';
 
-export type ScaleType = 'area' | 'radius';
-export interface BubblesPluginParams {
+export type BubbleScaleType = 'area' | 'radius';
+export interface BubblesParams {
     force: {
         strength: number;
         velocityDecay: number;
@@ -14,9 +14,9 @@ export interface BubblesPluginParams {
         lineLengthMin: number;
     };
     highlightRIncrease: number;
-    scaleType: ScaleType;
+    bubbleScaleType: BubbleScaleType;
 }
-export interface PiePluginParams {
+export interface PieParams {
     outerRadius: number;
     innerRadius: number;
     outerMouseoverRadius: number;
@@ -26,7 +26,7 @@ export interface PiePluginParams {
     padAngle: number;
     cornerRadius: number;
 }
-export interface PieEventTextsPluginParams {
+export interface PieEventTextsParams {
     eventFn: (d: EventSeries, eventName: EventName, t: number) => string[];
     textAttrs: Array<{
         [key: string]: string | number;
@@ -35,7 +35,7 @@ export interface PieEventTextsPluginParams {
         [key: string]: string | number;
     }>;
 }
-export interface PieLabelsPluginParams {
+export interface PieLabelsParams {
     outerRadius: number;
     outerMouseoverRadius: number;
     startAngle: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/plugins-basic",
-  "version": "3.0.0-alpha.27",
+  "version": "3.0.0-alpha.29",
   "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.24",
+    "@orbcharts/core": "^3.0.0-alpha.25",
     "d3": "^7.8.5",
     "rxjs": "^7.8.1"
   }

package/src/grid/defaults.ts

@@ -1,22 +1,22 @@
 import type {
-  LinesPluginParams,
-  GroupAreaPluginParams,
-  DotsPluginParams,
-  BarsPluginParams,
-  BarStackPluginParams,
-  BarsTrianglePluginParams,
-  GroupingAxisParams,
+  LinesParams,
+  GroupAreaParams,
+  DotsParams,
+  BarsParams,
+  BarStackParams,
+  BarsTriangleParams,
+  GroupAxisParams,
   ValueAxisParams,
   ValueStackAxisParams,
   ScalingAreaParams,
   GridLegendParams } from './types'
 
-export const DEFAULT_LINES_PLUGIN_PARAMS: LinesPluginParams = {
+export const DEFAULT_LINES_PLUGIN_PARAMS: LinesParams = {
   lineCurve: 'curveLinear',
   lineWidth: 2
 }
 
-export const DEFAULT_DOTS_PLUGIN_PARAMS: DotsPluginParams = {
+export const DEFAULT_DOTS_PLUGIN_PARAMS: DotsParams = {
   radius: 4,
   fillColorType: 'white',
   strokeColorType: 'series',
@@ -24,7 +24,7 @@ export const DEFAULT_DOTS_PLUGIN_PARAMS: DotsPluginParams = {
   onlyShowHighlighted: false
 }
 
-export const DEFAULT_GROUP_AREA_PLUGIN_PARAMS: GroupAreaPluginParams = {
+export const DEFAULT_GROUP_AREA_PLUGIN_PARAMS: GroupAreaParams = {
   showLine: true,
   showLabel: true,
   lineDashArray: '3, 3',
@@ -35,7 +35,7 @@ export const DEFAULT_GROUP_AREA_PLUGIN_PARAMS: GroupAreaPluginParams = {
   labelPadding: 24,
 }
 
-export const DEFAULT_BARS_PLUGIN_PARAMS: BarsPluginParams = {
+export const DEFAULT_BARS_PLUGIN_PARAMS: BarsParams = {
   // barType: 'rect',
   barWidth: 0,
   barPadding: 1,
@@ -43,20 +43,20 @@ export const DEFAULT_BARS_PLUGIN_PARAMS: BarsPluginParams = {
   barRadius: false,
 }
 
-export const DEFAULT_BAR_STACK_PLUGIN_PARAMS: BarStackPluginParams = {
+export const DEFAULT_BAR_STACK_PLUGIN_PARAMS: BarStackParams = {
   barWidth: 0,
   barGroupPadding: 10,
   barRadius: false,
 }
 
-export const DEFAULT_BARS_TRIANGLE_PLUGIN_PARAMS: BarsTrianglePluginParams = {
+export const DEFAULT_BARS_TRIANGLE_PLUGIN_PARAMS: BarsTriangleParams = {
   barWidth: 0,
   barPadding: 1,
   barGroupPadding: 20,
   linearGradientOpacity: [1, 0]
 }
 
-export const DEFAULT_GROUPING_AXIS_PLUGIN_PARAMS: GroupingAxisParams = {
+export const DEFAULT_GROUPING_AXIS_PLUGIN_PARAMS: GroupAxisParams = {
   // labelAnchor: 'start',
   labelOffset: [0, 0],
   labelColorType: 'primary',

package/src/grid/plugins/BarStack.ts

@@ -17,7 +17,7 @@ import type {
   ChartParams, 
   DataSeriesDatum,
   Layout } from '@orbcharts/core'
-import type { BarStackPluginParams } from '../types'
+import type { BarStackParams } from '../types'
 import { DEFAULT_BAR_STACK_PLUGIN_PARAMS } from '../defaults'
 import { getD3TransitionEase } from '../../utils/d3Utils'
 import { getClassName, getUniID } from '../../utils/orbchartsUtils'
@@ -33,7 +33,7 @@ interface RenderBarParams {
   zeroY: number
   groupLabels: string[]
   // barScale: d3.ScalePoint<string>
-  params: BarStackPluginParams
+  params: BarStackParams
   chartParams: ChartParams
   barWidth: number
   transformedBarRadius: [number, number]
@@ -66,7 +66,7 @@ function calcBarWidth ({ axisWidth, groupAmount, barGroupPadding = 0 }: {
 
 }
 
-// function makeBarScale (barWidth: number, seriesLabels: string[], params: BarStackPluginParams) {
+// function makeBarScale (barWidth: number, seriesLabels: string[], params: BarStackParams) {
 //   const barHalfWidth = barWidth! / 2
 //   const barGroupWidth = barWidth * seriesLabels.length + params.barPadding! * seriesLabels.length
 //   return d3.scalePoint()

package/src/grid/plugins/Bars.ts

@@ -19,7 +19,7 @@ import type {
   EventGrid,
   ChartParams, 
   Layout } from '@orbcharts/core'
-import type { BarsPluginParams } from '../types'
+import type { BarsParams } from '../types'
 import { DEFAULT_BARS_PLUGIN_PARAMS } from '../defaults'
 import { getD3TransitionEase } from '../../utils/d3Utils'
 import { getClassName, getUniID } from '../../utils/orbchartsUtils'
@@ -30,7 +30,7 @@ interface RenderBarParams {
   zeroY: number
   groupLabels: string[]
   barScale: d3.ScalePoint<string>
-  params: BarsPluginParams
+  params: BarsParams
   chartParams: ChartParams
   barWidth: number
   transformedBarRadius: [number, number]
@@ -64,7 +64,7 @@ function calcBarWidth ({ axisWidth, groupAmount, barAmountOfGroup, barPadding =
   return width > 1 ? width : 1
 }
 
-function makeBarScale (barWidth: number, seriesLabels: string[], params: BarsPluginParams) {
+function makeBarScale (barWidth: number, seriesLabels: string[], params: BarsParams) {
   const barHalfWidth = barWidth! / 2
   const barGroupWidth = barWidth * seriesLabels.length + params.barPadding! * seriesLabels.length
   return d3.scalePoint()

package/src/grid/plugins/BarsTriangle.ts

@@ -16,7 +16,7 @@ import type {
   ChartParams, 
   DataSeriesDatum,
   Layout } from '@orbcharts/core'
-import type { BarsTrianglePluginParams } from '../types'
+import type { BarsTriangleParams } from '../types'
 import { DEFAULT_BARS_TRIANGLE_PLUGIN_PARAMS } from '../defaults'
 import { getD3TransitionEase } from '../../utils/d3Utils'
 import {
@@ -29,7 +29,7 @@ interface RenderBarParams {
   zeroY: number
   groupLabels: string[]
   barScale: d3.ScalePoint<string>
-  params: BarsTrianglePluginParams
+  params: BarsTriangleParams
   chartParams: ChartParams
   barWidth: number
   delayGroup: number
@@ -65,7 +65,7 @@ function calcBarWidth ({ axisWidth, groupAmount, barAmountOfGroup, barPadding =
   return width > 1 ? width : 1
 }
 
-function makeBarScale (barWidth: number, seriesLabels: string[], params: BarsTrianglePluginParams) {
+function makeBarScale (barWidth: number, seriesLabels: string[], params: BarsTriangleParams) {
   const barHalfWidth = barWidth! / 2
   const barGroupWidth = barWidth * seriesLabels.length + params.barPadding! * seriesLabels.length
   return d3.scalePoint()
@@ -165,7 +165,7 @@ function renderTriangleBars ({ selection, barData, zeroY, groupLabels, barScale,
 function renderLinearGradient ({ defsSelection, barData, params }: {
   defsSelection: d3.Selection<SVGDefsElement, ComputedDatumGrid, any, any>
   barData: BarDatumGrid[][]
-  params: BarsTrianglePluginParams
+  params: BarsTriangleParams
 }) {
   const linearGradientUpdate = defsSelection!
       .selectAll<SVGLinearGradientElement, ComputedDatumGrid>('linearGradient')

package/src/grid/plugins/Dots.ts

@@ -15,7 +15,7 @@ import type {
   ChartParams,
   ComputedDatumGrid,
   Layout } from '@orbcharts/core'
-import type { DotsPluginParams } from '../types'
+import type { DotsParams } from '../types'
 import { DEFAULT_DOTS_PLUGIN_PARAMS } from '../defaults'
 import { getDatumColor, getClassName, getUniID } from '../../utils/orbchartsUtils'
 
@@ -34,7 +34,7 @@ const circleClassName = getClassName(pluginName, 'circle')
 function renderDots ({ selection, data, fullParams, fullChartParams, graphicOppositeScale }: {
   selection: d3.Selection<SVGGElement, any, any, any>
   data: ComputedDatumGrid[]
-  fullParams: DotsPluginParams
+  fullParams: DotsParams
   fullChartParams: ChartParams
   graphicOppositeScale: [number, number]
 }) {

package/src/grid/plugins/GroupArea.ts

@@ -24,7 +24,7 @@ import { getColor, getClassName, getUniID } from '../../utils/orbchartsUtils'
 import { d3EventObservable } from '../../utils/observables'
 import { gridGroupPositionFnObservable } from '../gridObservables'
 import { createAxisPointScale } from '@orbcharts/core'
-import type { GroupAreaPluginParams } from '../types'
+import type { GroupAreaParams } from '../types'
 
 interface LineDatum {
   id: string
@@ -48,7 +48,7 @@ function createLineData ({ groupLabel, axisX, axisHeight, fullParams }: {
   groupLabel: string
   axisX: number
   axisHeight: number
-  fullParams: GroupAreaPluginParams
+  fullParams: GroupAreaParams
 }): LineDatum[] {
   return fullParams.showLine && groupLabel
     ? [{
@@ -65,7 +65,7 @@ function renderLine ({ selection, pluginName, lineData, fullParams, fullChartPar
   selection: d3.Selection<any, unknown, any, unknown>
   pluginName: string
   lineData: LineDatum[]
-  fullParams: GroupAreaPluginParams
+  fullParams: GroupAreaParams
   fullChartParams: ChartParams
 }) {
   const gClassName = getClassName(pluginName, 'auxline')
@@ -114,7 +114,7 @@ function removeLine (selection: d3.Selection<any, unknown, any, unknown>) {
 function createLabelData ({ groupLabel, axisX, fullParams }: {
   groupLabel: string
   axisX: number
-  fullParams: GroupAreaPluginParams
+  fullParams: GroupAreaParams
 }) {
   return fullParams.showLabel && groupLabel
     ? [{
@@ -129,7 +129,7 @@ function createLabelData ({ groupLabel, axisX, fullParams }: {
 function renderLabel ({ selection, labelData, fullParams, fullChartParams, gridAxesOppositeTransformValue }: {
   selection: d3.Selection<any, unknown, any, unknown>
   labelData: LabelDatum[]
-  fullParams: GroupAreaPluginParams
+  fullParams: GroupAreaParams
   fullChartParams: ChartParams
   gridAxesOppositeTransformValue: string
 }) {

package/src/grid/plugins/GroupAxis.ts

@@ -15,7 +15,7 @@ import type {
   DataFormatterGrid,
   ChartParams,
   TransformData } from '@orbcharts/core'
-import type { GroupingAxisParams } from '../types'
+import type { GroupAxisParams } from '../types'
 import { DEFAULT_GROUPING_AXIS_PLUGIN_PARAMS } from '../defaults'
 import { parseTickFormatValue } from '../../utils/d3Utils'
 import { getColor, getClassName } from '../../utils/orbchartsUtils'
@@ -32,7 +32,7 @@ const defaultTickSize = 6
 
 function renderPointAxis ({ selection, params, tickTextAlign, axisLabelAlign, gridAxesSize, fullDataFormatter, chartParams, groupScale, contentTransform }: {
   selection: d3.Selection<SVGGElement, any, any, any>,
-  params: GroupingAxisParams
+  params: GroupAxisParams
   tickTextAlign: TextAlign
   axisLabelAlign: TextAlign
   gridAxesSize: { width: number, height: number }
@@ -44,19 +44,19 @@ function renderPointAxis ({ selection, params, tickTextAlign, axisLabelAlign, gr
 }) {
 
   const xAxisSelection = selection
-    .selectAll<SVGGElement, GroupingAxisParams>(`g.${xAxisClassName}`)
+    .selectAll<SVGGElement, GroupAxisParams>(`g.${xAxisClassName}`)
     .data([params])
     .join('g')
     .classed(xAxisClassName, true)
 
   const axisLabelSelection = selection
-    .selectAll<SVGGElement, GroupingAxisParams>(`g.${groupingLabelClassName}`)
+    .selectAll<SVGGElement, GroupAxisParams>(`g.${groupingLabelClassName}`)
     .data([params])
     .join('g')
     .classed(groupingLabelClassName, true)
     .each((d, i, g) => {
       const text = d3.select(g[i])
-        .selectAll<SVGTextElement, GroupingAxisParams>('text')
+        .selectAll<SVGTextElement, GroupAxisParams>('text')
         .data([d])
         .join(
           enter => {

package/src/grid/plugins/Lines.ts

@@ -17,7 +17,7 @@ import type {
   ComputedDatumGrid,
   ChartParams,
   Layout } from '@orbcharts/core'
-import type { LinesPluginParams } from '../types'
+import type { LinesParams } from '../types'
 import { DEFAULT_LINES_PLUGIN_PARAMS } from '../defaults'
 import { getD3TransitionEase } from '../../utils/d3Utils'
 import { getClassName, getUniID } from '../../utils/orbchartsUtils'
@@ -71,7 +71,7 @@ function renderLine ({ selection, segmentData, linePath, params }: {
   selection: d3.Selection<SVGGElement, unknown, any, unknown>
   segmentData: ComputedDatumGrid[][]
   linePath: d3.Line<ComputedDatumGrid>
-  params: LinesPluginParams
+  params: LinesParams
 }): d3.Selection<SVGPathElement, ComputedDatumGrid[], any, any> {
   // if (!data[0]) {
   //   return undefined

package/src/grid/types.ts

@@ -4,7 +4,7 @@ import type { BaseLegendParams } from '../base/BaseLegend'
 // export type LineType = 'line' | 'area' | 'gradientArea'
 // export type BarType = 'rect' | 'triangle'
 
-export interface LinesPluginParams {
+export interface LinesParams {
   // lineType: LineType
   lineCurve: string
   lineWidth: number
@@ -16,7 +16,7 @@ export interface LinesPluginParams {
   // labelPadding: number
 }
 
-export interface DotsPluginParams {
+export interface DotsParams {
   radius: number
   fillColorType: ColorType
   strokeColorType: ColorType
@@ -24,7 +24,7 @@ export interface DotsPluginParams {
   onlyShowHighlighted: boolean
 }
 
-export interface GroupAreaPluginParams {
+export interface GroupAreaParams {
   showLine: boolean
   showLabel: boolean
   lineDashArray: string
@@ -35,7 +35,7 @@ export interface GroupAreaPluginParams {
   labelPadding: number
 }
 
-export interface BarsPluginParams {
+export interface BarsParams {
   // barType: BarType
   barWidth: number
   barPadding: number
@@ -43,20 +43,20 @@ export interface BarsPluginParams {
   barRadius: number | boolean
 }
 
-export interface BarStackPluginParams {
+export interface BarStackParams {
   barWidth: number
   barGroupPadding: number
   barRadius: number | boolean
 }
 
-export interface BarsTrianglePluginParams {
+export interface BarsTriangleParams {
   barWidth: number
   barPadding: number
   barGroupPadding: number // 群組和群組間的間隔
   linearGradientOpacity: [number, number]
 }
 
-export interface GroupingAxisParams {
+export interface GroupAxisParams {
   // xLabel: string
   // labelAnchor: 'start' | 'end'
   labelOffset: [number, number]

package/src/series/defaults.ts

@@ -1,13 +1,13 @@
 import type { ComputedDatumSeries, EventSeries, EventName, ColorType } from '@orbcharts/core'
 import type {
-  BubblesPluginParams,
-  PiePluginParams,
-  PieEventTextsPluginParams,
-  PieLabelsPluginParams,
+  BubblesParams,
+  PieParams,
+  PieEventTextsParams,
+  PieLabelsParams,
   SeriesLegendParams } from './types'
 
   
-export const DEFAULT_BUBBLES_PLUGIN_PARAMS: BubblesPluginParams = {
+export const DEFAULT_BUBBLES_PLUGIN_PARAMS: BubblesParams = {
   force: {
     strength: 0.03, // 泡泡引力
     velocityDecay: 0.2, // 衰減數
@@ -19,10 +19,10 @@ export const DEFAULT_BUBBLES_PLUGIN_PARAMS: BubblesPluginParams = {
     lineLengthMin: 4
   },
   highlightRIncrease: 0,
-  scaleType: 'area'
+  bubbleScaleType: 'area'
 }
 
-export const DEFAULT_PIE_PLUGIN_PARAMS: PiePluginParams = {
+export const DEFAULT_PIE_PLUGIN_PARAMS: PieParams = {
   // padding: {
   //   top: 50,
   //   right: 70,
@@ -44,7 +44,7 @@ export const DEFAULT_PIE_PLUGIN_PARAMS: PiePluginParams = {
   // highlightLabel: null,
 }
 
-export const DEFAULT_PIE_EVENT_TEXTS_PARAMS: PieEventTextsPluginParams = {
+export const DEFAULT_PIE_EVENT_TEXTS_PARAMS: PieEventTextsParams = {
   eventFn: (d: EventSeries, eventName: EventName, t: number) => {
     if (eventName === 'mouseover' || eventName === 'mousemove') {
       return [String(d.datum!.value)]
@@ -68,7 +68,7 @@ export const DEFAULT_PIE_EVENT_TEXTS_PARAMS: PieEventTextsPluginParams = {
   ]
 }
 
-export const DEFAULT_PIE_LABELS_PARAMS: PieLabelsPluginParams = {
+export const DEFAULT_PIE_LABELS_PARAMS: PieLabelsParams = {
   // solidColor: undefined,
   // colors: DEFAULT_COLORS,
   outerRadius: 0.95,

package/src/series/plugins/Bubbles.ts

@@ -17,7 +17,7 @@ import type {
   ComputedDatumSeries } from '@orbcharts/core'
 import {
   defineSeriesPlugin } from '@orbcharts/core'
-import type { BubblesPluginParams, ScaleType } from '../types'
+import type { BubblesParams, BubbleScaleType } from '../types'
 import { DEFAULT_BUBBLES_PLUGIN_PARAMS } from '../defaults'
 import { renderCircleText } from '../../utils/d3Graphics'
 
@@ -30,7 +30,7 @@ interface BubblesDatum extends ComputedDatumSeries {
 
 let force: d3.Simulation<d3.SimulationNodeDatum, undefined> | undefined
 
-function makeForce (bubblesSelection: d3.Selection<SVGGElement, any, any, any>, fullParams: BubblesPluginParams) {
+function makeForce (bubblesSelection: d3.Selection<SVGGElement, any, any, any>, fullParams: BubblesParams) {
   return d3.forceSimulation()
     .velocityDecay(fullParams.force!.velocityDecay!)
     // .alphaDecay(0.2)
@@ -86,7 +86,7 @@ function createBubblesData ({ data, LastBubbleDataMap, graphicWidth, graphicHeig
   LastBubbleDataMap: Map<string, BubblesDatum>
   graphicWidth: number
   graphicHeight: number
-  scaleType: ScaleType
+  scaleType: BubbleScaleType
   // highlightIds: string[]
 }) {
   const bubbleGroupR = Math.min(...[graphicWidth, graphicHeight]) / 2
@@ -140,7 +140,7 @@ function createBubblesData ({ data, LastBubbleDataMap, graphicWidth, graphicHeig
 function renderBubbles ({ graphicSelection, bubblesData, fullParams }: {
   graphicSelection: d3.Selection<SVGGElement, any, any, any>
   bubblesData: BubblesDatum[]
-  fullParams: BubblesPluginParams
+  fullParams: BubblesParams
 }) {
   let update = graphicSelection.selectAll<SVGGElement, BubblesDatum>("g")
     .data(bubblesData, (d) => d.id)
@@ -203,7 +203,7 @@ function renderBubbles ({ graphicSelection, bubblesData, fullParams }: {
 
 function setHighlightData ({ data, highlightRIncrease, highlightIds }: {
   data: BubblesDatum[]
-  // fullParams: BubblesPluginParams
+  // fullParams: BubblesParams
   highlightRIncrease: number
   highlightIds: string[]
 }) {
@@ -254,7 +254,7 @@ function drag (): d3.DragBehavior<Element, unknown, unknown> {
 // }
 
 function groupBubbles ({ fullParams, graphicWidth, graphicHeight }: {
-  fullParams: BubblesPluginParams
+  fullParams: BubblesParams
   graphicWidth: number
   graphicHeight: number
 }) {
@@ -363,7 +363,7 @@ export const Bubbles = defineSeriesPlugin('Bubbles', DEFAULT_BUBBLES_PLUGIN_PARA
 
   const scaleType$ = observer.fullParams$.pipe(
     takeUntil(destroy$),
-    map(d => d.scaleType),
+    map(d => d.bubbleScaleType),
     distinctUntilChanged()
   )
 

package/src/series/plugins/Pie.ts

@@ -17,7 +17,7 @@ import {
   defineSeriesPlugin } from '@orbcharts/core'
 import type {
   ChartParams } from '@orbcharts/core'
-import type { PiePluginParams } from '../types'
+import type { PieParams } from '../types'
 import type { PieDatum } from '../seriesUtils'
 import { DEFAULT_PIE_PLUGIN_PARAMS } from '../defaults'
 import { makePieData } from '../seriesUtils'
@@ -32,7 +32,7 @@ function makeTweenPieRenderDataFn ({ enter, exit, data, lastData, fullParams }:
   exit: d3.Selection<SVGPathElement, unknown, any, any>
   data: PieDatum[]
   lastData: PieDatum[]
-  fullParams: PiePluginParams
+  fullParams: PieParams
 }): (t: number) => PieDatum[] {
   // 無更新資料項目則只計算資料變化 (新資料 * t + 舊資料 * (1 - t))
   if (!enter.size() && !exit.size()) {

package/src/series/plugins/PieLabels.ts

@@ -10,7 +10,7 @@ import {
   defineSeriesPlugin } from '@orbcharts/core'
 import type {
   ChartParams } from '@orbcharts/core'
-import type { PieLabelsPluginParams } from '../types'
+import type { PieLabelsParams } from '../types'
 import type { PieDatum } from '../seriesUtils'
 import { DEFAULT_PIE_LABELS_PARAMS } from '../defaults'
 import { makePieData } from '../seriesUtils'
@@ -49,7 +49,7 @@ function makeRenderData (pieData: PieDatum[], arc: d3.Arc<any, d3.DefaultArcObje
 }
 
 // 繪製圓餅圖
-function renderLabel (selection: d3.Selection<SVGGElement, undefined, any, any>, data: RenderDatum[], pluginParams: PieLabelsPluginParams, fullChartParams: ChartParams) {
+function renderLabel (selection: d3.Selection<SVGGElement, undefined, any, any>, data: RenderDatum[], pluginParams: PieLabelsParams, fullChartParams: ChartParams) {
   // console.log(data)
   // let update = this.gSelection.selectAll('g').data(pieData)
   let update: d3.Selection<SVGPathElement, RenderDatum, any, any> = selection

package/src/series/types.ts

@@ -1,9 +1,9 @@
 import type { ComputedDatumSeries, EventSeries, EventName, ColorType } from '@orbcharts/core'
 import type { BaseLegendParams } from '../base/BaseLegend'
 
-export type ScaleType = 'area' | 'radius'
+export type BubbleScaleType = 'area' | 'radius'
 
-export interface BubblesPluginParams {
+export interface BubblesParams {
   force: {
     strength: number; // 泡泡引力
     velocityDecay: number; // 衰減數
@@ -15,10 +15,10 @@ export interface BubblesPluginParams {
     lineLengthMin: number
   }
   highlightRIncrease: number
-  scaleType: ScaleType
+  bubbleScaleType: BubbleScaleType
 }
 
-export interface PiePluginParams {
+export interface PieParams {
   // padding: Padding
   outerRadius: number;
   innerRadius: number;
@@ -32,13 +32,13 @@ export interface PiePluginParams {
   cornerRadius: number
 }
 
-export interface PieEventTextsPluginParams {
+export interface PieEventTextsParams {
   eventFn: (d: EventSeries, eventName: EventName, t: number) => string[]
   textAttrs: Array<{ [key:string]: string | number }>
   textStyles: Array<{ [key:string]: string | number }>
 }
 
-export interface PieLabelsPluginParams {
+export interface PieLabelsParams {
   // solidColor?: string;
   // colors?: string[];
   outerRadius: number