@orbcharts/plugins-basic 3.0.0-beta.2 → 3.0.0-beta.20

package/src/multiGrid/plugins/{MultiValueStackAxis.ts → MultiStackedValueAxis.ts}

@@ -1,133 +1,134 @@
-import * as d3 from 'd3'
-import {
-  Subject,
-  map,
-  distinctUntilChanged,
-  shareReplay,
-  takeUntil
-} from 'rxjs'
-import type { DefinePluginConfig } from '../../../lib/core-types'
-import {
-  defineMultiGridPlugin } from '../../../lib/core'
-import { DEFAULT_MULTI_VALUE_AXIS_PARAMS } from '../defaults'
-import { createBaseValueAxis } from '../../base/BaseValueAxis'
-import { multiGridPluginDetailObservables } from '../multiGridObservables'
-import { getClassName, getUniID } from '../../utils/orbchartsUtils'
-import { LAYER_INDEX_OF_AXIS } from '../../const'
-
-const pluginName = 'MultiValueStackAxis'
-
-const gridClassName = getClassName(pluginName, 'grid')
-
-const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_VALUE_AXIS_PARAMS> = {
-  name: pluginName,
-  defaultParams: DEFAULT_MULTI_VALUE_AXIS_PARAMS,
-  layerIndex: LAYER_INDEX_OF_AXIS,
-  validator: (params, { validateColumns }) => {
-    const result = validateColumns(params, {
-      gridIndexes: {
-        toBe: 'number[] | "all"',
-        test: (value: any) => {
-          return value === 'all' || (Array.isArray(value) && value.every((v: any) => typeof v === 'number'))
-        }
-      },
-      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 MultiValueStackAxis = defineMultiGridPlugin(pluginConfig)(({ selection, name, subject, observer }) => {
-  const destroy$ = new Subject()
-
-  const unsubscribeFnArr: (() => void)[] = []
-
-  const multiGridPluginDetail$ = multiGridPluginDetailObservables(observer)
-
-  multiGridPluginDetail$
-    .pipe(
-      takeUntil(destroy$)
-    )
-    .subscribe(data => {
-      // 每次重新計算時，清除之前的訂閱
-      unsubscribeFnArr.forEach(fn => fn())
-
-      selection.selectAll(`g.${gridClassName}`)
-        .data(data)
-        .join('g')
-        .attr('class', gridClassName)
-        .each((d, i, g) => {
-
-          const gridSelection = d3.select(g[i])
-
-          const isSeriesSeprate$ = d.dataFormatter$.pipe(
-            takeUntil(destroy$),
-            map(d => d.grid.separateSeries),
-            distinctUntilChanged(),
-            shareReplay(1)
-          )
-
-          unsubscribeFnArr[i] = createBaseValueAxis(pluginName, {
-            selection: gridSelection,
-            computedData$: d.computedStackedData$, // 計算疊加value的資料
-            fullParams$: observer.fullParams$,
-            fullDataFormatter$: d.dataFormatter$,
-            fullChartParams$: observer.fullChartParams$,  
-            gridAxesTransform$: d.gridAxesTransform$,
-            gridAxesReverseTransform$: d.gridAxesReverseTransform$,
-            gridAxesSize$: d.gridAxesSize$,
-            gridContainerPosition$: d.gridContainerPosition$,
-            isSeriesSeprate$,
-          })
-        })
-    })
-
-  return () => {
-    destroy$.next(undefined)
-    unsubscribeFnArr.forEach(fn => fn())
-  }
-})
+import * as d3 from 'd3'
+import {
+  Subject,
+  map,
+  distinctUntilChanged,
+  shareReplay,
+  takeUntil
+} from 'rxjs'
+import type { DefinePluginConfig } from '../../../lib/core-types'
+import {
+  defineMultiGridPlugin } from '../../../lib/core'
+import { DEFAULT_MULTI_VALUE_AXIS_PARAMS } from '../defaults'
+import { createBaseValueAxis } from '../../base/BaseValueAxis'
+import { multiGridPluginDetailObservables } from '../multiGridObservables'
+import { getClassName, getUniID } from '../../utils/orbchartsUtils'
+import { LAYER_INDEX_OF_AXIS } from '../../const'
+
+const pluginName = 'MultiStackedValueAxis'
+
+const gridClassName = getClassName(pluginName, 'grid')
+
+const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_VALUE_AXIS_PARAMS> = {
+  name: pluginName,
+  defaultParams: DEFAULT_MULTI_VALUE_AXIS_PARAMS,
+  layerIndex: LAYER_INDEX_OF_AXIS,
+  validator: (params, { validateColumns }) => {
+    const result = validateColumns(params, {
+      gridIndexes: {
+        toBe: 'number[] | "all"',
+        test: (value: any) => {
+          return value === 'all' || (Array.isArray(value) && value.every((v: any) => typeof v === 'number'))
+        }
+      },
+      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 MultiStackedValueAxis = defineMultiGridPlugin(pluginConfig)(({ selection, name, subject, observer }) => {
+  const destroy$ = new Subject()
+
+  const unsubscribeFnArr: (() => void)[] = []
+
+  const multiGridPluginDetail$ = multiGridPluginDetailObservables(observer)
+
+  multiGridPluginDetail$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(data => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
+
+      selection.selectAll(`g.${gridClassName}`)
+        .data(data)
+        .join('g')
+        .attr('class', gridClassName)
+        .each((d, i, g) => {
+
+          const gridSelection = d3.select(g[i])
+
+          const isSeriesSeprate$ = d.dataFormatter$.pipe(
+            takeUntil(destroy$),
+            map(d => d.separateSeries),
+            distinctUntilChanged(),
+            shareReplay(1)
+          )
+
+          unsubscribeFnArr[i] = createBaseValueAxis(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedStackedData$, // 計算疊加value的資料
+            filteredMinMaxValue$: d.filteredMinMaxValue$,
+            fullParams$: observer.fullParams$,
+            fullDataFormatter$: d.dataFormatter$,
+            fullChartParams$: observer.fullChartParams$,  
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridAxesReverseTransform$: d.gridAxesReverseTransform$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            isSeriesSeprate$,
+          })
+        })
+    })
+
+  return () => {
+    destroy$.next(undefined)
+    unsubscribeFnArr.forEach(fn => fn())
+  }
+})

package/src/multiGrid/plugins/MultiValueAxis.ts

@@ -1,133 +1,134 @@
-import * as d3 from 'd3'
-import {
-  Subject,
-  map,
-  distinctUntilChanged,
-  shareReplay,
-  takeUntil
-} from 'rxjs'
-import type { DefinePluginConfig } from '../../../lib/core-types'
-import {
-  defineMultiGridPlugin } from '../../../lib/core'
-import { DEFAULT_MULTI_VALUE_AXIS_PARAMS } from '../defaults'
-import { createBaseValueAxis } from '../../base/BaseValueAxis'
-import { multiGridPluginDetailObservables } from '../multiGridObservables'
-import { getClassName, getUniID } from '../../utils/orbchartsUtils'
-import { LAYER_INDEX_OF_AXIS } from '../../const'
-
-const pluginName = 'MultiValueAxis'
-
-const gridClassName = getClassName(pluginName, 'grid')
-
-const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_VALUE_AXIS_PARAMS> = {
-  name: pluginName,
-  defaultParams: DEFAULT_MULTI_VALUE_AXIS_PARAMS,
-  layerIndex: LAYER_INDEX_OF_AXIS,
-  validator: (params, { validateColumns }) => {
-    const result = validateColumns(params, {
-      gridIndexes: {
-        toBe: 'number[] | "all"',
-        test: (value: any) => {
-          return value === 'all' || (Array.isArray(value) && value.every((v: any) => typeof v === 'number'))
-        }
-      },
-      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 MultiValueAxis = defineMultiGridPlugin(pluginConfig)(({ selection, name, subject, observer }) => {
-  const destroy$ = new Subject()
-
-  const unsubscribeFnArr: (() => void)[] = []
-
-  const multiGridPluginDetail$ = multiGridPluginDetailObservables(observer)
-
-  multiGridPluginDetail$
-    .pipe(
-      takeUntil(destroy$)
-    )
-    .subscribe(data => {
-      // 每次重新計算時，清除之前的訂閱
-      unsubscribeFnArr.forEach(fn => fn())
-
-      selection.selectAll(`g.${gridClassName}`)
-        .data(data)
-        .join('g')
-        .attr('class', gridClassName)
-        .each((d, i, g) => {
-
-          const gridSelection = d3.select(g[i])
-
-          const isSeriesSeprate$ = d.dataFormatter$.pipe(
-            takeUntil(destroy$),
-            map(d => d.grid.separateSeries),
-            distinctUntilChanged(),
-            shareReplay(1)
-          )
-
-          unsubscribeFnArr[i] = createBaseValueAxis(pluginName, {
-            selection: gridSelection,
-            computedData$: d.computedData$,
-            fullParams$: observer.fullParams$,
-            fullDataFormatter$: d.dataFormatter$,
-            fullChartParams$: observer.fullChartParams$,  
-            gridAxesTransform$: d.gridAxesTransform$,
-            gridAxesReverseTransform$: d.gridAxesReverseTransform$,
-            gridAxesSize$: d.gridAxesSize$,
-            gridContainerPosition$: d.gridContainerPosition$,
-            isSeriesSeprate$,
-          })
-        })
-    })
-
-  return () => {
-    destroy$.next(undefined)
-    unsubscribeFnArr.forEach(fn => fn())
-  }
-})
+import * as d3 from 'd3'
+import {
+  Subject,
+  map,
+  distinctUntilChanged,
+  shareReplay,
+  takeUntil
+} from 'rxjs'
+import type { DefinePluginConfig } from '../../../lib/core-types'
+import {
+  defineMultiGridPlugin } from '../../../lib/core'
+import { DEFAULT_MULTI_VALUE_AXIS_PARAMS } from '../defaults'
+import { createBaseValueAxis } from '../../base/BaseValueAxis'
+import { multiGridPluginDetailObservables } from '../multiGridObservables'
+import { getClassName, getUniID } from '../../utils/orbchartsUtils'
+import { LAYER_INDEX_OF_AXIS } from '../../const'
+
+const pluginName = 'MultiValueAxis'
+
+const gridClassName = getClassName(pluginName, 'grid')
+
+const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_VALUE_AXIS_PARAMS> = {
+  name: pluginName,
+  defaultParams: DEFAULT_MULTI_VALUE_AXIS_PARAMS,
+  layerIndex: LAYER_INDEX_OF_AXIS,
+  validator: (params, { validateColumns }) => {
+    const result = validateColumns(params, {
+      gridIndexes: {
+        toBe: 'number[] | "all"',
+        test: (value: any) => {
+          return value === 'all' || (Array.isArray(value) && value.every((v: any) => typeof v === 'number'))
+        }
+      },
+      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 MultiValueAxis = defineMultiGridPlugin(pluginConfig)(({ selection, name, subject, observer }) => {
+  const destroy$ = new Subject()
+
+  const unsubscribeFnArr: (() => void)[] = []
+
+  const multiGridPluginDetail$ = multiGridPluginDetailObservables(observer)
+
+  multiGridPluginDetail$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(data => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
+
+      selection.selectAll(`g.${gridClassName}`)
+        .data(data)
+        .join('g')
+        .attr('class', gridClassName)
+        .each((d, i, g) => {
+
+          const gridSelection = d3.select(g[i])
+
+          const isSeriesSeprate$ = d.dataFormatter$.pipe(
+            takeUntil(destroy$),
+            map(d => d.separateSeries),
+            distinctUntilChanged(),
+            shareReplay(1)
+          )
+
+          unsubscribeFnArr[i] = createBaseValueAxis(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            filteredMinMaxValue$: d.filteredMinMaxValue$,
+            fullParams$: observer.fullParams$,
+            fullDataFormatter$: d.dataFormatter$,
+            fullChartParams$: observer.fullChartParams$,  
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridAxesReverseTransform$: d.gridAxesReverseTransform$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            isSeriesSeprate$,
+          })
+        })
+    })
+
+  return () => {
+    destroy$.next(undefined)
+    unsubscribeFnArr.forEach(fn => fn())
+  }
+})