@orbcharts/plugins-basic 3.0.0-alpha.75 → 3.0.0-alpha.77

package/src/grid/plugins/ValueStackAxis.ts

@@ -1,96 +1,96 @@
-import {
-  takeUntil,
-  map,
-  distinctUntilChanged,
-  shareReplay,
-  switchMap,
-  iif,
-  Observable,
-  Subject } from 'rxjs'
-import type { DefinePluginConfig } from '../../../lib/core-types'
-import {
-  defineGridPlugin } from '../../../lib/core'
-import { DEFAULT_VALUE_STACK_AXIS_PARAMS } from '../defaults'
-import { LAYER_INDEX_OF_AXIS } from '../../const'
-import { createBaseValueAxis } from '../../base/BaseValueAxis'
-
-const pluginName = 'ValueStackAxis'
-
-const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_VALUE_STACK_AXIS_PARAMS> = {
-  name: pluginName,
-  defaultParams: DEFAULT_VALUE_STACK_AXIS_PARAMS,
-  layerIndex: LAYER_INDEX_OF_AXIS,
-  validator: (params, { validateColumns }) => {
-    const result = validateColumns(params, {
-      labelOffset: {
-        toBe: '[number, number]',
-        test: (value: any) => {
-          return Array.isArray(value)
-            && value.length === 2
-            && typeof value[0] === 'number'
-            && typeof value[1] === 'number'
-        }
-      },
-      labelColorType: {
-        toBeOption: 'ColorType',
-      },
-      axisLineVisible: {
-        toBeTypes: ['boolean']
-      },
-      axisLineColorType: {
-        toBeOption: 'ColorType',
-      },
-      ticks: {
-        toBeTypes: ['number', 'null']
-      },
-      tickFormat: {
-        toBeTypes: ['string', 'Function']
-      },
-      tickLineVisible: {
-        toBeTypes: ['boolean']
-      },
-      tickPadding: {
-        toBeTypes: ['number']
-      },
-      tickFullLine: {
-        toBeTypes: ['boolean']
-      },
-      tickFullLineDasharray: {
-        toBeTypes: ['string']
-      },
-      tickColorType: {
-        toBeOption: 'ColorType',
-      },
-      tickTextRotate: {
-        toBeTypes: ['number']
-      },
-      tickTextColorType: {
-        toBeOption: 'ColorType',
-      }
-    })
-    return result
-  }
-}
-
-export const ValueStackAxis = defineGridPlugin(pluginConfig)(({ selection, name, observer, subject }) => {
-  
-  const destroy$ = new Subject()
-
-  const unsubscribeBaseValueAxis = createBaseValueAxis(pluginName, {
-    selection,
-    computedData$: observer.computedStackedData$, // 計算疊加value的資料
-    fullParams$: observer.fullParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    fullChartParams$: observer.fullChartParams$,  
-    gridAxesTransform$: observer.gridAxesTransform$,
-    gridAxesReverseTransform$: observer.gridAxesReverseTransform$,
-    gridAxesSize$: observer.gridAxesSize$,
-    gridContainerPosition$: observer.gridContainerPosition$,
-    isSeriesSeprate$: observer.isSeriesSeprate$,
-  })
-
-  return () => {
-    destroy$.next(undefined)
-    unsubscribeBaseValueAxis()
-  }
+import {
+  takeUntil,
+  map,
+  distinctUntilChanged,
+  shareReplay,
+  switchMap,
+  iif,
+  Observable,
+  Subject } from 'rxjs'
+import type { DefinePluginConfig } from '../../../lib/core-types'
+import {
+  defineGridPlugin } from '../../../lib/core'
+import { DEFAULT_VALUE_STACK_AXIS_PARAMS } from '../defaults'
+import { LAYER_INDEX_OF_AXIS } from '../../const'
+import { createBaseValueAxis } from '../../base/BaseValueAxis'
+
+const pluginName = 'ValueStackAxis'
+
+const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_VALUE_STACK_AXIS_PARAMS> = {
+  name: pluginName,
+  defaultParams: DEFAULT_VALUE_STACK_AXIS_PARAMS,
+  layerIndex: LAYER_INDEX_OF_AXIS,
+  validator: (params, { validateColumns }) => {
+    const result = validateColumns(params, {
+      labelOffset: {
+        toBe: '[number, number]',
+        test: (value: any) => {
+          return Array.isArray(value)
+            && value.length === 2
+            && typeof value[0] === 'number'
+            && typeof value[1] === 'number'
+        }
+      },
+      labelColorType: {
+        toBeOption: 'ColorType',
+      },
+      axisLineVisible: {
+        toBeTypes: ['boolean']
+      },
+      axisLineColorType: {
+        toBeOption: 'ColorType',
+      },
+      ticks: {
+        toBeTypes: ['number', 'null']
+      },
+      tickFormat: {
+        toBeTypes: ['string', 'Function']
+      },
+      tickLineVisible: {
+        toBeTypes: ['boolean']
+      },
+      tickPadding: {
+        toBeTypes: ['number']
+      },
+      tickFullLine: {
+        toBeTypes: ['boolean']
+      },
+      tickFullLineDasharray: {
+        toBeTypes: ['string']
+      },
+      tickColorType: {
+        toBeOption: 'ColorType',
+      },
+      tickTextRotate: {
+        toBeTypes: ['number']
+      },
+      tickTextColorType: {
+        toBeOption: 'ColorType',
+      }
+    })
+    return result
+  }
+}
+
+export const ValueStackAxis = defineGridPlugin(pluginConfig)(({ selection, name, observer, subject }) => {
+  
+  const destroy$ = new Subject()
+
+  const unsubscribeBaseValueAxis = createBaseValueAxis(pluginName, {
+    selection,
+    computedData$: observer.computedStackedData$, // 計算疊加value的資料
+    fullParams$: observer.fullParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    fullChartParams$: observer.fullChartParams$,  
+    gridAxesTransform$: observer.gridAxesTransform$,
+    gridAxesReverseTransform$: observer.gridAxesReverseTransform$,
+    gridAxesSize$: observer.gridAxesSize$,
+    gridContainerPosition$: observer.gridContainerPosition$,
+    isSeriesSeprate$: observer.isSeriesSeprate$,
+  })
+
+  return () => {
+    destroy$.next(undefined)
+    unsubscribeBaseValueAxis()
+  }
 })

package/src/index.ts

@@ -1,10 +1,10 @@
-// export { default as container } from './noneDataPlugins/container'
-// export { default as pie } from './seriesPlugins/pie'
-// export { default as pieEventTexts } from './seriesPlugins/pieEventTexts'
-// export { default as pieLabels } from './seriesPlugins/pieLabels'
-
-export * from './grid'
-export * from './multiGrid'
-export * from './noneData'
-export * from './series'
+// export { default as container } from './noneDataPlugins/container'
+// export { default as pie } from './seriesPlugins/pie'
+// export { default as pieEventTexts } from './seriesPlugins/pieEventTexts'
+// export { default as pieLabels } from './seriesPlugins/pieLabels'
+
+export * from './grid'
+export * from './multiGrid'
+export * from './noneData'
+export * from './series'
 export * from './tree'

package/src/multiGrid/defaults.ts

@@ -1,159 +1,159 @@
-import type {
-  MultiGridLegendParams,
-  MultiBarsParams,
-  MultiBarStackParams,
-  MultiBarsTriangleParams,
-  MultiLinesParams,
-  MultiLineAreasParams,
-  MultiDotsParams,
-  MultiGroupAxisParams,
-  MultiValueAxisParams,
-  MultiValueStackAxisParams,
-  OverlappingValueAxesParams,
-  OverlappingValueStackAxesParams
-} from './types'
-
-export const DEFAULT_MULTI_GRID_LEGEND_PARAMS: MultiGridLegendParams = {
-  position: 'right',
-  justify: 'end',
-  padding: 28,
-  backgroundFill: 'none',
-  backgroundStroke: 'none',
-  gap: 10,
-  listRectWidth: 14,
-  listRectHeight: 14,
-  listRectRadius: 0,
-  gridList: [
-    {
-      listRectWidth: 14,
-      listRectHeight: 14,
-      listRectRadius: 0,
-    }
-  ],
-  textColorType: 'primary'
-}
-
-export const DEFAULT_MULTI_GROUP_AXIS_PARAMS: MultiGroupAxisParams = {
-  // labelAnchor: 'start',
-  labelOffset: [0, 0],
-  labelColorType: 'primary',
-  axisLineVisible: true,
-  axisLineColorType: 'primary',
-  ticks: 'all',
-  tickFormat: text => text,
-  tickLineVisible: true,
-  tickPadding: 20,
-  tickFullLine: false,
-  tickFullLineDasharray: 'none',
-  tickColorType: 'secondary',
-  tickTextRotate: 0,
-  tickTextColorType: 'primary',
-  gridIndexes: [0]
-}
-DEFAULT_MULTI_GROUP_AXIS_PARAMS.tickFormat.toString = () => `text => text`
-
-export const DEFAULT_MULTI_VALUE_AXIS_PARAMS: MultiValueAxisParams = {
-  // labelAnchor: 'end',
-  labelOffset: [0, 0],
-  labelColorType: 'primary',
-  axisLineVisible: false,
-  axisLineColorType: 'primary',
-  ticks: 4,
-  tickFormat: ',.0f',
-  tickLineVisible: true,
-  tickPadding: 20,
-  tickFullLine: true,
-  tickFullLineDasharray: 'none',
-  tickColorType: 'secondary',
-  tickTextRotate: 0,
-  tickTextColorType: 'primary',
-  gridIndexes: [0]
-}
-
-export const DEFAULT_MULTI_VALUE_STACK_AXIS_PARAMS: MultiValueStackAxisParams = {
-  ...DEFAULT_MULTI_VALUE_AXIS_PARAMS
-}
-
-export const DEFAULT_MULTI_BARS_PARAMS: MultiBarsParams = {
-  barWidth: 0,
-  barPadding: 1,
-  barGroupPadding: 40,
-  barRadius: false,
-  gridIndexes: [0]
-}
-
-export const DEFAULT_MULTI_BAR_STACK_PARAMS: MultiBarStackParams = {
-  barWidth: 0,
-  barGroupPadding: 10,
-  barRadius: false,
-  gridIndexes: [0]
-}
-
-export const DEFAULT_MULTI_BARS_TRIANGLE_PARAMS: MultiBarsTriangleParams = {
-  barWidth: 0,
-  barPadding: 1,
-  barGroupPadding: 20,
-  linearGradientOpacity: [1, 0],
-  gridIndexes: [0]
-}
-
-export const DEFAULT_MULTI_LINES_PARAMS: MultiLinesParams = {
-  lineCurve: 'curveLinear',
-  lineWidth: 2,
-  gridIndexes: [1]
-}
-
-export const DEFAULT_MULTI_LINE_AREAS_PARAMS: MultiLineAreasParams = {
-  lineCurve: 'curveLinear',
-  linearGradientOpacity: [1, 0],
-  gridIndexes: [1]
-}
-
-export const DEFAULT_MULTI_DOTS_PARAMS: MultiDotsParams = {
-  radius: 4,
-  fillColorType: 'white',
-  strokeColorType: 'series',
-  strokeWidth: 2,
-  onlyShowHighlighted: false,
-  gridIndexes: [1]
-}
-
-export const DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS: OverlappingValueAxesParams = {
-  firstAxis: {
-    // labelAnchor: 'end',
-    labelOffset: [0, 0],
-    labelColorType: 'primary',
-    axisLineVisible: false,
-    axisLineColorType: 'primary',
-    ticks: 4,
-    tickFormat: ',.0f',
-    tickLineVisible: true,
-    tickPadding: 20,
-    tickFullLine: true,
-    tickFullLineDasharray: 'none',
-    tickColorType: 'secondary',
-    tickTextRotate: 0,
-    tickTextColorType: 'primary',
-  },
-  secondAxis: {
-    // labelAnchor: 'end',
-    labelOffset: [0, 0],
-    labelColorType: 'primary',
-    axisLineVisible: false,
-    axisLineColorType: 'primary',
-    ticks: 4,
-    tickFormat: ',.0f',
-    tickLineVisible: true,
-    tickPadding: 20,
-    tickFullLine: true,
-    tickFullLineDasharray: 'none',
-    tickColorType: 'secondary',
-    tickTextRotate: 0,
-    tickTextColorType: 'primary',
-  },
-  gridIndexes: [0, 1]
-}
-
-export const DEFAULT_OVERLAPPING_VALUE_STACK_AXES_PARAMS: OverlappingValueStackAxesParams = {
-  ...DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS
+import type {
+  MultiGridLegendParams,
+  MultiBarsParams,
+  MultiBarStackParams,
+  MultiBarsTriangleParams,
+  MultiLinesParams,
+  MultiLineAreasParams,
+  MultiDotsParams,
+  MultiGroupAxisParams,
+  MultiValueAxisParams,
+  MultiValueStackAxisParams,
+  OverlappingValueAxesParams,
+  OverlappingValueStackAxesParams
+} from '../../lib/plugins-basic-types'
+
+export const DEFAULT_MULTI_GRID_LEGEND_PARAMS: MultiGridLegendParams = {
+  position: 'right',
+  justify: 'end',
+  padding: 28,
+  backgroundFill: 'none',
+  backgroundStroke: 'none',
+  gap: 10,
+  listRectWidth: 14,
+  listRectHeight: 14,
+  listRectRadius: 0,
+  gridList: [
+    {
+      listRectWidth: 14,
+      listRectHeight: 14,
+      listRectRadius: 0,
+    }
+  ],
+  textColorType: 'primary'
+}
+
+export const DEFAULT_MULTI_GROUP_AXIS_PARAMS: MultiGroupAxisParams = {
+  // labelAnchor: 'start',
+  labelOffset: [0, 0],
+  labelColorType: 'primary',
+  axisLineVisible: true,
+  axisLineColorType: 'primary',
+  ticks: 'all',
+  tickFormat: text => text,
+  tickLineVisible: true,
+  tickPadding: 20,
+  tickFullLine: false,
+  tickFullLineDasharray: 'none',
+  tickColorType: 'secondary',
+  tickTextRotate: 0,
+  tickTextColorType: 'primary',
+  gridIndexes: [0]
+}
+DEFAULT_MULTI_GROUP_AXIS_PARAMS.tickFormat.toString = () => `text => text`
+
+export const DEFAULT_MULTI_VALUE_AXIS_PARAMS: MultiValueAxisParams = {
+  // labelAnchor: 'end',
+  labelOffset: [0, 0],
+  labelColorType: 'primary',
+  axisLineVisible: false,
+  axisLineColorType: 'primary',
+  ticks: 4,
+  tickFormat: ',.0f',
+  tickLineVisible: true,
+  tickPadding: 20,
+  tickFullLine: true,
+  tickFullLineDasharray: 'none',
+  tickColorType: 'secondary',
+  tickTextRotate: 0,
+  tickTextColorType: 'primary',
+  gridIndexes: [0]
+}
+
+export const DEFAULT_MULTI_VALUE_STACK_AXIS_PARAMS: MultiValueStackAxisParams = {
+  ...DEFAULT_MULTI_VALUE_AXIS_PARAMS
+}
+
+export const DEFAULT_MULTI_BARS_PARAMS: MultiBarsParams = {
+  barWidth: 0,
+  barPadding: 1,
+  barGroupPadding: 40,
+  barRadius: false,
+  gridIndexes: [0]
+}
+
+export const DEFAULT_MULTI_BAR_STACK_PARAMS: MultiBarStackParams = {
+  barWidth: 0,
+  barGroupPadding: 10,
+  barRadius: false,
+  gridIndexes: [0]
+}
+
+export const DEFAULT_MULTI_BARS_TRIANGLE_PARAMS: MultiBarsTriangleParams = {
+  barWidth: 0,
+  barPadding: 1,
+  barGroupPadding: 20,
+  linearGradientOpacity: [1, 0],
+  gridIndexes: [0]
+}
+
+export const DEFAULT_MULTI_LINES_PARAMS: MultiLinesParams = {
+  lineCurve: 'curveLinear',
+  lineWidth: 2,
+  gridIndexes: [1]
+}
+
+export const DEFAULT_MULTI_LINE_AREAS_PARAMS: MultiLineAreasParams = {
+  lineCurve: 'curveLinear',
+  linearGradientOpacity: [1, 0],
+  gridIndexes: [1]
+}
+
+export const DEFAULT_MULTI_DOTS_PARAMS: MultiDotsParams = {
+  radius: 4,
+  fillColorType: 'white',
+  strokeColorType: 'series',
+  strokeWidth: 2,
+  onlyShowHighlighted: false,
+  gridIndexes: [1]
+}
+
+export const DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS: OverlappingValueAxesParams = {
+  firstAxis: {
+    // labelAnchor: 'end',
+    labelOffset: [0, 0],
+    labelColorType: 'primary',
+    axisLineVisible: false,
+    axisLineColorType: 'primary',
+    ticks: 4,
+    tickFormat: ',.0f',
+    tickLineVisible: true,
+    tickPadding: 20,
+    tickFullLine: true,
+    tickFullLineDasharray: 'none',
+    tickColorType: 'secondary',
+    tickTextRotate: 0,
+    tickTextColorType: 'primary',
+  },
+  secondAxis: {
+    // labelAnchor: 'end',
+    labelOffset: [0, 0],
+    labelColorType: 'primary',
+    axisLineVisible: false,
+    axisLineColorType: 'primary',
+    ticks: 4,
+    tickFormat: ',.0f',
+    tickLineVisible: true,
+    tickPadding: 20,
+    tickFullLine: true,
+    tickFullLineDasharray: 'none',
+    tickColorType: 'secondary',
+    tickTextRotate: 0,
+    tickTextColorType: 'primary',
+  },
+  gridIndexes: [0, 1]
+}
+
+export const DEFAULT_OVERLAPPING_VALUE_STACK_AXES_PARAMS: OverlappingValueStackAxesParams = {
+  ...DEFAULT_OVERLAPPING_VALUE_AXES_PARAMS
 }

package/src/multiGrid/index.ts

@@ -1,14 +1,14 @@
-export * from './defaults'
-export * from './types'
-export { MultiGridLegend } from './plugins/MultiGridLegend'
-export { MultiBars } from './plugins/MultiBars'
-export { MultiBarStack } from './plugins/MultiBarStack'
-export { MultiBarsTriangle } from './plugins/MultiBarsTriangle'
-export { MultiLines } from './plugins/MultiLines'
-export { MultiLineAreas } from './plugins/MultiLineAreas'
-export { MultiDots } from './plugins/MultiDots'
-export { MultiGroupAxis } from './plugins/MultiGroupAxis'
-export { MultiValueAxis } from './plugins/MultiValueAxis'
-export { MultiValueStackAxis } from './plugins/MultiValueStackAxis'
-export { OverlappingValueAxes } from './plugins/OverlappingValueAxes'
+export * from './defaults'
+// export * from './types'
+export { MultiGridLegend } from './plugins/MultiGridLegend'
+export { MultiBars } from './plugins/MultiBars'
+export { MultiBarStack } from './plugins/MultiBarStack'
+export { MultiBarsTriangle } from './plugins/MultiBarsTriangle'
+export { MultiLines } from './plugins/MultiLines'
+export { MultiLineAreas } from './plugins/MultiLineAreas'
+export { MultiDots } from './plugins/MultiDots'
+export { MultiGroupAxis } from './plugins/MultiGroupAxis'
+export { MultiValueAxis } from './plugins/MultiValueAxis'
+export { MultiValueStackAxis } from './plugins/MultiValueStackAxis'
+export { OverlappingValueAxes } from './plugins/OverlappingValueAxes'
 export { OverlappingValueStackAxes } from './plugins/OverlappingValueStackAxes'

package/src/multiGrid/multiGridObservables.ts

@@ -1,49 +1,49 @@
-import type { Observable } from 'rxjs'
-import {
-  Subject,
-  takeUntil,
-  of,
-  map,
-  reduce,
-  switchMap,
-  combineLatest,
-  distinctUntilChanged,
-  shareReplay
-} from 'rxjs'
-import type {
-  ContextObserverMultiGrid,
-  ComputedDataGrid,
-  DataFormatterGrid,
-  ContextObserverGridDetail,
-  ContextObserverMultiGridDetail } from '../../lib/core-types'
-
-// 可設定多個gridIndex的params
-interface MultiGridPluginParams {
-  gridIndexes: number[] | 'all'
-}
-
-// 對應grid資料的plugin所需Observable（必須有gridIndexes）
-export const multiGridPluginDetailObservables = (observer: ContextObserverMultiGrid<MultiGridPluginParams>): Observable<ContextObserverMultiGridDetail[]> => {
-  const gridIndexes$ = observer.fullParams$.pipe(
-    map(fullParams => fullParams.gridIndexes),
-    distinctUntilChanged(),
-    shareReplay(1)
-  )
-
-  return combineLatest({
-    multiGridEachDetail: observer.multiGridEachDetail$,
-    gridIndexes: gridIndexes$,
-  }).pipe(
-    map(data => {
-      // 對應所有grid
-      if (data.gridIndexes === 'all') {
-        return data.multiGridEachDetail
-      }
-      // 自訂對應grid
-      return data.gridIndexes.map(gridIndex => {
-        return data.multiGridEachDetail[gridIndex] ?? data.multiGridEachDetail[0]
-      })
-    })
-  )
-}
-
+import type { Observable } from 'rxjs'
+import {
+  Subject,
+  takeUntil,
+  of,
+  map,
+  reduce,
+  switchMap,
+  combineLatest,
+  distinctUntilChanged,
+  shareReplay
+} from 'rxjs'
+import type {
+  ContextObserverMultiGrid,
+  ComputedDataGrid,
+  DataFormatterGrid,
+  ContextObserverGridDetail,
+  ContextObserverMultiGridDetail } from '../../lib/core-types'
+
+// 可設定多個gridIndex的params
+interface MultiGridPluginParams {
+  gridIndexes: number[] | 'all'
+}
+
+// 對應grid資料的plugin所需Observable（必須有gridIndexes）
+export const multiGridPluginDetailObservables = (observer: ContextObserverMultiGrid<MultiGridPluginParams>): Observable<ContextObserverMultiGridDetail[]> => {
+  const gridIndexes$ = observer.fullParams$.pipe(
+    map(fullParams => fullParams.gridIndexes),
+    distinctUntilChanged(),
+    shareReplay(1)
+  )
+
+  return combineLatest({
+    multiGridEachDetail: observer.multiGridEachDetail$,
+    gridIndexes: gridIndexes$,
+  }).pipe(
+    map(data => {
+      // 對應所有grid
+      if (data.gridIndexes === 'all') {
+        return data.multiGridEachDetail
+      }
+      // 自訂對應grid
+      return data.gridIndexes.map(gridIndex => {
+        return data.multiGridEachDetail[gridIndex] ?? data.multiGridEachDetail[0]
+      })
+    })
+  )
+}
+