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

package/src/types/ContextObserverSeries.ts

@@ -1,9 +1,29 @@
-import { Observable } from 'rxjs'
-import type { ContextObserverBase } from './ContextObserver'
-import type { ComputedDatumSeries } from './ComputedDataSeries'
-
-export interface ContextObserverSeries<PluginParams> extends ContextObserverBase<'series', PluginParams> {
-  textSizePx$: Observable<number>
-  seriesHighlight$: Observable<ComputedDatumSeries[]>
-  SeriesDataMap$: Observable<Map<string, ComputedDatumSeries[]>>
-}
+import { Observable } from 'rxjs'
+import type { ContextObserverBase } from './ContextObserver'
+import type { ComputedDatumSeries } from './ComputedDataSeries'
+
+export interface ContextObserverSeries<PluginParams> extends ContextObserverBase<'series', PluginParams> {
+  textSizePx$: Observable<number>
+  seriesSeparate$: 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
+  // translate: [number, number]
+  startX: number
+  startY: number
+  centerX: number
+  centerY: number
+  width: number
+  height: number
+}

package/src/types/ContextObserverTree.ts

@@ -1,11 +1,11 @@
-import { Observable } from 'rxjs'
-import type { ContextObserverBase } from './ContextObserver'
-import type { ComputedDataTree } from './ComputedDataTree'
-
-export interface ContextObserverTree<PluginParams> extends ContextObserverBase<'tree', PluginParams> {
-  textSizePx$: Observable<number>
-  treeHighlight$: Observable<ComputedDataTree[]>
-  existCategoryLabels$: Observable<string[]>
-  CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>
-  visibleComputedData$: Observable<ComputedDataTree>
-}
+import { Observable } from 'rxjs'
+import type { ContextObserverBase } from './ContextObserver'
+import type { ComputedDataTree } from './ComputedDataTree'
+
+export interface ContextObserverTree<PluginParams> extends ContextObserverBase<'tree', PluginParams> {
+  textSizePx$: Observable<number>
+  treeHighlight$: Observable<ComputedDataTree[]>
+  existCategoryLabels$: Observable<string[]>
+  CategoryDataMap$: Observable<Map<string, ComputedDataTree[]>>
+  visibleComputedData$: Observable<ComputedDataTree>
+}

package/src/types/ContextSubject.ts

@@ -1,18 +1,18 @@
-import { Observable, Subject, BehaviorSubject } from 'rxjs'
-import type { ChartType } from './Chart'
-import type { EventTypeMap } from './Event'
-import type { ChartParamsPartial } from './ChartParams'
-// import type { Data } from './Data'
-import type { DataFormatterPartialTypeMap } from './DataFormatter'
-import type { DataTypeMap } from './Data'
-import type { DataFormatterTypeMap } from './DataFormatter'
-import type { PluginEntity } from './Plugin'
-
-export interface ContextSubject<T extends ChartType> {
-  data$: Subject<DataTypeMap<T>>
-  dataFormatter$: Subject<DataFormatterPartialTypeMap<T>>
-  plugins$: Subject<PluginEntity<T, any, any>[]>
-  // pluginParams$: Subject<{[keys: string]: unknown}>
-  chartParams$: Subject<ChartParamsPartial>
-  event$: Subject<EventTypeMap<T>>
-}
+import { Observable, Subject, BehaviorSubject } from 'rxjs'
+import type { ChartType } from './Chart'
+import type { EventTypeMap } from './Event'
+import type { ChartParamsPartial } from './ChartParams'
+// import type { Data } from './Data'
+import type { DataFormatterPartialTypeMap } from './DataFormatter'
+import type { DataTypeMap } from './Data'
+import type { DataFormatterTypeMap } from './DataFormatter'
+import type { PluginEntity } from './Plugin'
+
+export interface ContextSubject<T extends ChartType> {
+  data$: Subject<DataTypeMap<T>>
+  dataFormatter$: Subject<DataFormatterPartialTypeMap<T>>
+  plugins$: Subject<PluginEntity<T, any, any>[]>
+  // pluginParams$: Subject<{[keys: string]: unknown}>
+  chartParams$: Subject<ChartParamsPartial>
+  event$: Subject<EventTypeMap<T>>
+}

package/src/types/Data.ts

@@ -1,45 +1,45 @@
-import { ChartType } from './Chart'
-import { DataSeries, DataSeriesDatum, DataSeriesValue } from './DataSeries'
-import { DataGrid, DataGridDatum, DataGridValue } from './DataGrid'
-import { DataMultiGrid, DataMultiGridDatum, DataMultiGridValue } from './DataMultiGrid'
-import { DataMultiValue, DataMultiValueDatum, DataMultiValueValue } from './DataMultiValue'
-import { DataTree, DataTreeDatum, DataTreeObj } from './DataTree'
-import { DataRelationship, Node, Edge } from './DataRelationship'
-
-// 基本欄位（皆為可選，無填寫則在計算時產生預設值）
-export interface DatumBase {
-  id?: string
-  label?: string
-  description?: string
-  data?: any // 使用者注入的資料
-}
-
-// 需具備value的datum
-export interface DatumValue {
-  value: number | null
-}
-
-// 透過類型選擇Data
-export type DataTypeMap<T extends ChartType> = T extends 'series' ? DataSeries
-  : T extends 'grid' ? DataGrid
-  : T extends 'multiGrid' ? DataMultiGrid
-  : T extends 'multiValue' ? DataMultiValue
-  : T extends 'relationship' ? DataRelationship
-  : T extends 'tree' ? DataTree
-  : unknown
-
-// 透過類型選擇Datum
-export type DatumTypeMap<T extends ChartType> = T extends 'series' ? DataSeriesDatum | DataSeriesValue
-: T extends 'grid' ? DataGridDatum | DataGridValue
-: T extends 'multiGrid' ? DataMultiGridDatum | DataMultiGridValue
-: T extends 'multiValue' ? DataMultiValueDatum | DataMultiValueValue
-: T extends 'relationship' ? Node | Edge
-: T extends 'tree' ? DataTreeDatum | DataTreeObj
-: unknown
-
-// export type Data = DataSeries
-//   | DataGrid
-//   | DataMultiGrid
-//   | DataMultiValue
-//   | DataTree
-//   | DataRelationship
+import { ChartType } from './Chart'
+import { DataSeries, DataSeriesDatum, DataSeriesValue } from './DataSeries'
+import { DataGrid, DataGridDatum, DataGridValue } from './DataGrid'
+import { DataMultiGrid, DataMultiGridDatum, DataMultiGridValue } from './DataMultiGrid'
+import { DataMultiValue, DataMultiValueDatum, DataMultiValueValue } from './DataMultiValue'
+import { DataTree, DataTreeDatum, DataTreeObj } from './DataTree'
+import { DataRelationship, Node, Edge } from './DataRelationship'
+
+// 基本欄位（皆為可選，無填寫則在計算時產生預設值）
+export interface DatumBase {
+  id?: string
+  label?: string
+  description?: string
+  data?: any // 使用者注入的資料
+}
+
+// 需具備value的datum
+export interface DatumValue {
+  value: number | null
+}
+
+// 透過類型選擇Data
+export type DataTypeMap<T extends ChartType> = T extends 'series' ? DataSeries
+  : T extends 'grid' ? DataGrid
+  : T extends 'multiGrid' ? DataMultiGrid
+  : T extends 'multiValue' ? DataMultiValue
+  : T extends 'relationship' ? DataRelationship
+  : T extends 'tree' ? DataTree
+  : unknown
+
+// 透過類型選擇Datum
+export type DatumTypeMap<T extends ChartType> = T extends 'series' ? DataSeriesDatum | DataSeriesValue
+: T extends 'grid' ? DataGridDatum | DataGridValue
+: T extends 'multiGrid' ? DataMultiGridDatum | DataMultiGridValue
+: T extends 'multiValue' ? DataMultiValueDatum | DataMultiValueValue
+: T extends 'relationship' ? Node | Edge
+: T extends 'tree' ? DataTreeDatum | DataTreeObj
+: unknown
+
+// export type Data = DataSeries
+//   | DataGrid
+//   | DataMultiGrid
+//   | DataMultiValue
+//   | DataTree
+//   | DataRelationship

package/src/types/DataFormatter.ts

@@ -1,95 +1,74 @@
-import type { ChartType } from './Chart'
-import type { ChartParams } from './ChartParams'
-import type { DataTypeMap, DatumTypeMap } from './Data'
-import type { DataFormatterSeries, DataFormatterSeriesPartial } from './DataFormatterSeries'
-import type { DataFormatterGrid, DataFormatterGridPartial } from './DataFormatterGrid'
-import type { DataFormatterMultiGrid, DataFormatterMultiGridPartial } from './DataFormatterMultiGrid'
-import type { DataFormatterMultiValue, DataFormatterMultiValuePartial } from './DataFormatterMultiValue'
-import type { DataFormatterTree, DataFormatterTreePartial } from './DataFormatterTree'
-import type { DataFormatterRelationship, DataFormatterRelationshipPartial } from './DataFormatterRelationship'
-import type { AxisPosition } from './Axis'
-import type { Layout } from './Layout'
-
-// export type DataFormatter = DataFormatterSeries
-//   | DataFormatterGrid
-//   | DataFormatterMultiGrid
-//   | DataFormatterMultiValue
-//   | DataFormatterTree
-//   | DataFormatterRelationship
-
-// export type DataFormatterPartial = DataFormatterSeriesPartial
-//   | DataFormatterGridPartial
-//   | DataFormatterMultiGridPartial
-//   | DataFormatterMultiValuePartial
-//   | DataFormatterTreePartial
-//   | DataFormatterRelationshipPartial
-
-// dataFormatter計算當中會使用的資料
-export interface DataFormatterContext<T extends ChartType> {
-  data: DataTypeMap<T>
-  dataFormatter: DataFormatterTypeMap<T>
-  chartParams: ChartParams
-  layout: Layout
-}
-
-
-// 透過類型選擇DataFormatter
-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>
-
-// 透過類型選擇DataFormatter（可選欄位）
-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>
-
-// 基本介面
-export interface DataFormatterBase<T extends ChartType> {
-  type: T
-}
-
-export type DataFormatterBasePartial<T extends ChartType> = Partial<DataFormatterBase<T>>
-
-// 有value
-// export interface DataFormatterValue {
-//   valueFormat: ValueFormat
-// }
-
-// 有axis
-// export interface DataFormatterAxis {
-//   // domainMinValue?: number
-//   // domainMaxValue?: number
-//   // domainMinRange?: number
-//   // domainMaxRange?: number
-//   valueDomain: [number | 'auto', number | 'auto']
-//   valueRange: [number, number] // 0-1
-// }
-
-export interface DataFormatterValueAxis {
-  position: AxisPosition
-  scaleDomain: [number | 'auto', number | 'auto']
-  scaleRange: [number, number]
-  label: string
-}
-
-export interface DataFormatterGroupAxis {
-  position: AxisPosition
-  scaleDomain: [number | 'auto', number | 'auto']
-  scalePadding: number
-  label: string
-}
-
-
-// export type ValueFormat = string | ((text: d3.NumberValue) => 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
+import type { ChartType } from './Chart'
+import type { ChartParams } from './ChartParams'
+import type { DataTypeMap, DatumTypeMap } from './Data'
+import type { ComputedDataTypeMap, ComputedDatumTypeMap } from './ComputedData'
+import type { DataFormatterSeries, DataFormatterSeriesPartial } from './DataFormatterSeries'
+import type { DataFormatterGrid, DataFormatterGridPartial } from './DataFormatterGrid'
+import type { DataFormatterMultiGrid, DataFormatterMultiGridPartial } from './DataFormatterMultiGrid'
+import type { DataFormatterMultiValue, DataFormatterMultiValuePartial } from './DataFormatterMultiValue'
+import type { DataFormatterTree, DataFormatterTreePartial } from './DataFormatterTree'
+import type { DataFormatterRelationship, DataFormatterRelationshipPartial } from './DataFormatterRelationship'
+import type { AxisPosition } from './Axis'
+
+
+// dataFormatter計算當中會使用的資料
+export interface DataFormatterContext<T extends ChartType> {
+  data: DataTypeMap<T>
+  dataFormatter: DataFormatterTypeMap<T>
+  chartParams: ChartParams
+  // layout: Layout
+}
+
+
+// 透過類型選擇DataFormatter
+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>
+
+// 透過類型選擇DataFormatter（可選欄位）
+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>
+
+// 基本介面
+export interface DataFormatterBase<T extends ChartType> {
+  type: T
+}
+
+export type DataFormatterBasePartial<T extends ChartType> = Partial<DataFormatterBase<T>>
+
+export interface DataFormatterValueAxis {
+  position: AxisPosition
+  scaleDomain: [number | 'auto', number | 'auto']
+  scaleRange: [number, number]
+  label: string
+}
+
+export interface DataFormatterGroupAxis {
+  position: AxisPosition
+  scaleDomain: [number | 'auto', number | 'auto']
+  scalePadding: number
+  label: string
+}
+
+
+// export type ValueFormat = string | ((text: d3.NumberValue) => string)
+
+export type VisibleFilter<T extends ChartType> = (datum: ComputedDatumTypeMap<T>, context: DataFormatterContext<T>) => boolean | null
+
+// export type TooltipContentFormat<T extends ChartType> = (datum: DatumTypeMap<T>, rowIndex: number, columnIndex: number, context: DataFormatterContext<T>) => string | null
+
+export interface DataFormatterContainer {
+  gap: number
+  rowAmount: number
+  columnAmount: number
+}
+

package/src/types/DataFormatterGrid.ts

@@ -1,56 +1,68 @@
-import type { DataGridDatum, DataGridValue } from './DataGrid'
-import type { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, DataFormatterGroupAxis, VisibleFilter } from './DataFormatter'
-// import type { AxisPosition } from './Axis'
-
-export type SeriesDirection = 'row' | 'column' // default: 'row'
-
-export interface DataFormatterGrid extends DataFormatterBase<'grid'> {
-  grid: DataFormatterGridGrid
-  container: DataFormatterGridContainer
-  // visibleGroupRange: [number, number] | null
-  // colorsPredicate: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string
-}
-
-export interface DataFormatterGridPartial extends DataFormatterBasePartial<'grid'> {
-  grid?: DataFormatterGridGridPartial
-  container?: Partial<DataFormatterGridContainer>
-}
-
-export interface DataFormatterGridGrid {
-  visibleFilter: VisibleFilter<'grid'>
-  gridData: DataFormatterGridGridData
-  valueAxis: DataFormatterValueAxis
-  groupAxis: DataFormatterGroupAxis
-  slotIndex: number | null
-  seriesSlotIndexes: number[] | null
-}
-
-export interface DataFormatterGridGridPartial {
-  visibleFilter?: VisibleFilter<'grid'>
-  gridData?: Partial<DataFormatterGridGridData>
-  valueAxis?: Partial<DataFormatterValueAxis>
-  groupAxis?: Partial<DataFormatterGroupAxis>
-  slotIndex?: number | null
-  seriesSlotIndexes?: number[] | null
-}
-
-export interface DataFormatterGridContainer {
-  gap: number
-  rowAmount: number
-  columnAmount: number
-}
-
-// grid欄位
-export interface DataFormatterGridGridData {
-  seriesDirection: SeriesDirection
-  rowLabels: string[]
-  columnLabels: string[]
-}
-
-// const test: DataFormatterGridPartial = {
-//   type: 'grid',
-//   grid: {
-//     rowLabels: [],
-//     // a: ''
-//   }
+import type { 
+  DataFormatterBase, 
+  DataFormatterBasePartial, 
+  DataFormatterValueAxis, 
+  DataFormatterGroupAxis, 
+  VisibleFilter,
+  DataFormatterContainer
+} from './DataFormatter'
+
+
+export type SeriesDirection = 'row' | 'column' // default: 'row'
+
+export interface DataFormatterGrid extends DataFormatterBase<'grid'> {
+  visibleFilter: VisibleFilter<'grid'>
+  grid: DataFormatterGridGrid
+  container: DataFormatterContainer
+}
+
+export interface DataFormatterGridPartial extends DataFormatterBasePartial<'grid'> {
+  visibleFilter?: VisibleFilter<'grid'>
+  grid?: DataFormatterGridGridPartial
+  container?: Partial<DataFormatterContainer>
+}
+
+export interface DataFormatterGridGrid {
+  // gridData: DataFormatterGridGridData
+  // slotIndex: number | null
+  // seriesSlotIndexes: number[] | null
+  seriesDirection: SeriesDirection
+  rowLabels: string[]
+  columnLabels: string[]
+  valueAxis: DataFormatterValueAxis
+  groupAxis: DataFormatterGroupAxis
+  separateSeries: boolean
+}
+
+export interface DataFormatterGridGridPartial {
+  // gridData?: Partial<DataFormatterGridGridData>
+  // slotIndex?: number | null
+  // seriesSlotIndexes?: number[] | null
+  seriesDirection?: SeriesDirection
+  rowLabels?: string[]
+  columnLabels?: string[]
+  valueAxis?: Partial<DataFormatterValueAxis>
+  groupAxis?: Partial<DataFormatterGroupAxis>
+  separateSeries?: boolean
+}
+
+export interface DataFormatterGridContainer {
+  gap: number
+  rowAmount: number
+  columnAmount: number
+}
+
+// grid欄位
+// export interface DataFormatterGridGridData {
+//   seriesDirection: SeriesDirection
+//   rowLabels: string[]
+//   columnLabels: string[]
+// }
+
+// const test: DataFormatterGridPartial = {
+//   type: 'grid',
+//   grid: {
+//     rowLabels: [],
+//     // a: ''
+//   }
 // }

package/src/types/DataFormatterMultiGrid.ts

@@ -1,43 +1,45 @@
-import type { VisibleFilter } from './DataFormatter'
-import type { DataFormatterGridGrid, DataFormatterGridGridPartial, DataFormatterGridContainer } from './DataFormatterGrid'
-import type {
-  DataFormatterBase,
-  DataFormatterBasePartial,
-  DataFormatterValueAxis,
-  DataFormatterGroupAxis,
-  DataFormatterContext } from './DataFormatter'
-import type { AxisPosition } from './Axis'
-
-export interface DataFormatterMultiGrid extends DataFormatterBase<'multiGrid'> {
-  // visibleFilter: VisibleFilter<'multiGrid'>
-  gridList: Array<DataFormatterGridGrid>
-  container: DataFormatterMultiGridContainer
-}
-
-export interface DataFormatterMultiGridPartial extends DataFormatterBasePartial<'multiGrid'> {
-  // visibleFilter?: VisibleFilter<'multiGrid'>
-  gridList?: Array<DataFormatterGridGridPartial>
-  container?: Partial<DataFormatterMultiGridContainer>
-}
-
-export interface DataFormatterMultiGridGrid extends DataFormatterGridGrid {
-
-}
-
-export interface DataFormatterMultiGridGridPartial extends DataFormatterGridGridPartial {
-
-}
-
-// container
-export interface DataFormatterMultiGridContainer extends DataFormatterGridContainer {
-
-}
-
-// multiGrid欄位
-// export interface DataFormatterMultiGridMultiGrid {
-//   grid: DataFormatterGridGridData
-//   valueAxis: DataFormatterValueAxis // default: 'left'
-//   groupAxis: DataFormatterGroupAxis // default: 'bottom'
-//   colorsPredicate: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string
-//   // colors: Colors
+import type { VisibleFilter, DataFormatterContainer } from './DataFormatter'
+import type { DataFormatterGridGrid, DataFormatterGridGridPartial } from './DataFormatterGrid'
+import type {
+  DataFormatterBase,
+  DataFormatterBasePartial,
+  DataFormatterValueAxis,
+  DataFormatterGroupAxis,
+  DataFormatterContext } from './DataFormatter'
+import type { AxisPosition } from './Axis'
+
+export interface DataFormatterMultiGrid extends DataFormatterBase<'multiGrid'> {
+  visibleFilter: VisibleFilter<'multiGrid'>
+  gridList: Array<DataFormatterGridGrid>
+  container: DataFormatterMultiGridContainer
+  separateGrid: boolean
+}
+
+export interface DataFormatterMultiGridPartial extends DataFormatterBasePartial<'multiGrid'> {
+  // visibleFilter?: VisibleFilter<'multiGrid'>
+  gridList?: Array<DataFormatterGridGridPartial>
+  container?: Partial<DataFormatterMultiGridContainer>
+  separateGrid?: boolean
+}
+
+export interface DataFormatterMultiGridGrid extends DataFormatterGridGrid {
+
+}
+
+export interface DataFormatterMultiGridGridPartial extends DataFormatterGridGridPartial {
+
+}
+
+// container
+export interface DataFormatterMultiGridContainer extends DataFormatterContainer {
+
+}
+
+// multiGrid欄位
+// export interface DataFormatterMultiGridMultiGrid {
+//   grid: DataFormatterGridGridData
+//   valueAxis: DataFormatterValueAxis // default: 'left'
+//   groupAxis: DataFormatterGroupAxis // default: 'bottom'
+//   colorsPredicate: (datum: DataGridDatum | DataGridValue, rowIndex: number, columnIndex: number, context: DataFormatterContext<'grid'>) => string
+//   // colors: Colors
 // }

package/src/types/DataFormatterMultiValue.ts

@@ -1,21 +1,24 @@
-import { DataMultiValueDatum, DataMultiValue } from './DataMultiValue'
-import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, VisibleFilter } from './DataFormatter'
-
-export interface DataFormatterMultiValue extends DataFormatterBase<'multiValue'> {
-  visibleFilter: VisibleFilter<'multiValue'>
-  // labelFormat: (datum: unknown) => string
-  multiValue: Array<DataFormatterMultiValueMultiValue>
-  xAxis: DataFormatterValueAxis
-  yAxis: DataFormatterValueAxis
-}
-
-export interface DataFormatterMultiValuePartial extends DataFormatterBasePartial<'multiValue'> {
-  multiValue?: Array<Partial<DataFormatterMultiValueMultiValue>>
-  xAxis?: Partial<DataFormatterValueAxis>
-  yAxis?: Partial<DataFormatterValueAxis>
-}
-
-// multiValue欄位
-export interface DataFormatterMultiValueMultiValue {
-  // unitLabel: string
+import { DataMultiValueDatum, DataMultiValue } from './DataMultiValue'
+import { DataFormatterBase, DataFormatterBasePartial, DataFormatterValueAxis, VisibleFilter } from './DataFormatter'
+
+export interface DataFormatterMultiValue extends DataFormatterBase<'multiValue'> {
+  visibleFilter: VisibleFilter<'multiValue'>
+  // labelFormat: (datum: unknown) => string
+  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>
+}
+
+// multiValue欄位
+export interface DataFormatterMultiValueMultiValue {
+  // unitLabel: string
 }