@orbcharts/core 3.0.0-beta.1 → 3.0.0-beta.11

package/src/utils/index.ts

@@ -1,5 +1,5 @@
 export * from './commonUtils'
-export * from './d3Utils'
+export * from './d3Scale'
 export * from './gridObservables'
 export * from './multiGridObservables'
 // export * from './multiValueObservables'

package/src/utils/multiGridObservables.ts

@@ -23,7 +23,7 @@ import type {
   DataFormatterGrid,
   DataFormatterMultiGridContainer,
   EventMultiGrid,
-  GridContainerPosition,
+  ContainerPositionScaled,
   HighlightTarget,
   Layout,
   TransformData } from '../../lib/core-types'
@@ -32,18 +32,22 @@ import {
   seriesDataMapObservable,
   groupDataMapObservable } from './observables'
 import {
-  gridAxesTransformObservable,
-  gridGraphicTransformObservable,
-  gridGraphicReverseScaleObservable,
-  gridAxesReverseTransformObservable,
+  gridComputedLayoutDataObservable,
   gridAxesSizeObservable,
   gridSeriesLabelsObservable,
-  gridComputedLayoutDataObservable,
   gridVisibleComputedDataObservable,
   gridVisibleComputedLayoutDataObservable,
   // isSeriesSeprateObservable,
-  computedStackedDataObservables } from './gridObservables'
-import { DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT } from '../defaults'
+  gridContainerPositionObservable,
+  computedStackedDataObservables,
+  groupScaleDomainValueObservable,
+  filteredMinMaxValueObservable,
+  gridAxesTransformObservable,
+  gridAxesReverseTransformObservable,
+  gridGraphicTransformObservable,
+  gridGraphicReverseScaleObservable,
+} from './gridObservables'
+import { DEFAULT_DATA_FORMATTER_MULTI_GRID_GRID } from '../defaults'
 import { calcGridContainerLayout } from './orbchartsUtils'
 
 // 每一個grid計算出來的所有Observable
@@ -91,7 +95,7 @@ export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData
       // 每次重新計算時，清除之前的訂閱
       destroy$.next(undefined)
 
-      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT
+      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DEFAULT_DATA_FORMATTER_MULTI_GRID_GRID
 
       return data.computedData.map((gridComputedData, gridIndex) => {
 
@@ -100,9 +104,9 @@ export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData
         const gridDataFormatter: DataFormatterGrid = {
           type: 'grid',
           visibleFilter: data.fullDataFormatter.visibleFilter as any,
-          grid: {
-            ...grid
-          },
+          // grid: {
+            ...grid,
+          // },
           container: {
             ...data.fullDataFormatter.container
           }
@@ -133,7 +137,7 @@ export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData
         // )
 
         const isSeriesSeprate$ = gridDataFormatter$.pipe(
-          map(d => d.grid.separateSeries),
+          map(d => d.separateSeries),
           distinctUntilChanged(),
           shareReplay(1)
         )
@@ -143,36 +147,7 @@ export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData
           shareReplay(1)
         )
         
-        const gridAxesTransform$ = gridAxesTransformObservable({
-          fullDataFormatter$: gridDataFormatter$,
-          layout$: layout$
-        }).pipe(
-          takeUntil(destroy$),
-          shareReplay(1)
-        )
-    
-        
-        const gridAxesReverseTransform$ = gridAxesReverseTransformObservable({
-          gridAxesTransform$
-        }).pipe(
-          takeUntil(destroy$),
-          shareReplay(1)
-        )
         
-        const gridGraphicTransform$ = gridGraphicTransformObservable({
-          computedData$: gridComputedData$,
-          fullDataFormatter$: gridDataFormatter$,
-          layout$: layout$
-        }).pipe(
-          takeUntil(destroy$),
-          shareReplay(1)
-        )
-    
-        const gridGraphicReverseScale$ = gridGraphicReverseScaleObservable({
-          gridContainerPosition$: gridContainerPosition$,
-          gridAxesTransform$: gridAxesTransform$,
-          gridGraphicTransform$: gridGraphicTransform$,
-        })
     
         const gridAxesSize$ = gridAxesSizeObservable({
           fullDataFormatter$: gridDataFormatter$,
@@ -248,13 +223,58 @@ export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData
           shareReplay(1)
         )
 
+        const groupScaleDomainValue$ = groupScaleDomainValueObservable({
+          computedData$: gridComputedData$,
+          fullDataFormatter$: gridDataFormatter$,
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+
+        const filteredMinMaxValue$ = filteredMinMaxValueObservable({
+          computedData$: gridComputedData$,
+          groupScaleDomainValue$: groupScaleDomainValue$,
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+
+        const gridAxesTransform$ = gridAxesTransformObservable({
+          fullDataFormatter$: gridDataFormatter$,
+          layout$: layout$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        
+        const gridAxesReverseTransform$ = gridAxesReverseTransformObservable({
+          gridAxesTransform$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+        
+        const gridGraphicTransform$ = gridGraphicTransformObservable({
+          computedData$: gridComputedData$,
+          groupScaleDomainValue$: groupScaleDomainValue$,
+          filteredMinMaxValue$: filteredMinMaxValue$,
+          fullDataFormatter$: gridDataFormatter$,
+          layout$: layout$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const gridGraphicReverseScale$ = gridGraphicReverseScaleObservable({
+          gridContainerPosition$: gridContainerPosition$,
+          gridAxesTransform$: gridAxesTransform$,
+          gridGraphicTransform$: gridGraphicTransform$,
+        })
+
         return {
           isSeriesSeprate$,
           gridContainerPosition$,
-          gridAxesTransform$,
-          gridAxesReverseTransform$,
-          gridGraphicTransform$,
-          gridGraphicReverseScale$,
           gridAxesSize$,
           gridHighlight$: allGridHighlight$,
           seriesLabels$,
@@ -265,7 +285,13 @@ export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData
           computedLayoutData$,
           visibleComputedData$,
           visibleComputedLayoutData$,
-          computedStackedData$
+          computedStackedData$,
+          groupScaleDomainValue$,
+          filteredMinMaxValue$,
+          gridAxesTransform$,
+          gridAxesReverseTransform$,
+          gridGraphicTransform$,
+          gridGraphicReverseScale$,
         }
       })
     })
@@ -278,7 +304,7 @@ export const multiGridContainerObservable = ({ computedData$, fullDataFormatter$
   computedData$: Observable<ComputedDataTypeMap<'multiGrid'>>
   fullDataFormatter$: Observable<DataFormatterTypeMap<'multiGrid'>>
   layout$: Observable<Layout>
-}): Observable<GridContainerPosition[][]> => {
+}): Observable<ContainerPositionScaled[][]> => {
 
   return combineLatest({
     computedData: computedData$,
@@ -288,7 +314,7 @@ export const multiGridContainerObservable = ({ computedData$, fullDataFormatter$
     switchMap(async (d) => d),
     map(data => {
 
-      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT
+      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DEFAULT_DATA_FORMATTER_MULTI_GRID_GRID
       const slotAmount = data.computedData.reduce((acc, gridData, gridIndex) => {
         const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
         const gridSlotAmount = grid.separateSeries