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

package/src/multiGrid/multiGridObservables.ts

@@ -1,286 +1,351 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  of,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable, 
-  combineLatestAll} from 'rxjs'
-import type {
-  AxisPosition,
-  ChartType,
-  ChartParams,
-  ComputedDataTypeMap,
-  ComputedDataGrid,
-  DataTypeMap,
-  DataFormatterTypeMap,
-  DataFormatterGrid,
-  DataFormatterMultiGridContainer,
-  EventMultiGrid,
-  HighlightTarget,
-  Layout,
-  TransformData } from '../types'
-import type { ContextObserverGridDetail } from '../types'
-import {
-  highlightObservable,
-  seriesDataMapObservable,
-  groupDataMapObservable } from '../utils/observables'
-import {
-  gridAxesTransformObservable,
-  gridGraphicTransformObservable,
-  gridGraphicReverseScaleObservable,
-  gridAxesReverseTransformObservable,
-  gridAxesSizeObservable,
-  existSeriesLabelsObservable,
-  gridVisibleComputedDataObservable,
-  isSeriesPositionSeprateObservable,
-  gridContainerObservable } from '../grid/gridObservables'
-import { DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT } from '../defaults'
-import { calcGridContainerPosition } from '../utils/orbchartsUtils'
-
-// 每一個grid計算出來的所有Observable
-export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData$, layout$, fullChartParams$, event$ }: {
-  fullDataFormatter$: Observable<DataFormatterTypeMap<'multiGrid'>>
-  computedData$: Observable<ComputedDataTypeMap<'multiGrid'>>
-  layout$: Observable<Layout>
-  fullChartParams$: Observable<ChartParams>
-  event$: Subject<EventMultiGrid>
-}) => {
-
-  // 建立Observables
-  function detailObservables ({ gridDataFormatter$, gridComputedData$, layout$, fullChartParams$, event$ }: {
-    // fullDataFormatter$: Observable<DataFormatterTypeMap<'multiGrid'>>
-    // computedData$: Observable<ComputedDataTypeMap<'multiGrid'>>
-    gridDataFormatter$: Observable<DataFormatterGrid>
-    gridComputedData$: Observable<ComputedDataGrid>
-    layout$: Observable<Layout>
-    fullChartParams$: Observable<ChartParams>
-    event$: Subject<EventMultiGrid>
-  }): ContextObserverGridDetail {
-    
-    const isSeriesPositionSeprate$ = isSeriesPositionSeprateObservable({
-      computedData$: gridComputedData$,
-      fullDataFormatter$: gridDataFormatter$,
-    }).pipe(
-      shareReplay(1)
-    )
-  
-    const gridContainer$ = gridContainerObservable({
-      computedData$: gridComputedData$,
-      fullDataFormatter$: gridDataFormatter$,
-      fullChartParams$,
-      layout$
-    }).pipe(
-      shareReplay(1)
-    )
-    
-    const gridAxesTransform$ = gridAxesTransformObservable({
-      fullDataFormatter$: gridDataFormatter$,
-      layout$: layout$
-    }).pipe(
-      shareReplay(1)
-    )
-
-    
-    const gridAxesReverseTransform$ = gridAxesReverseTransformObservable({
-      gridAxesTransform$
-    }).pipe(
-      shareReplay(1)
-    )
-    
-    const gridGraphicTransform$ = gridGraphicTransformObservable({
-      computedData$: gridComputedData$,
-      fullDataFormatter$: gridDataFormatter$,
-      layout$: layout$
-    }).pipe(
-      shareReplay(1)
-    )
-
-    const gridGraphicReverseScale$ = gridGraphicReverseScaleObservable({
-      gridContainer$: gridContainer$,
-      gridAxesTransform$: gridAxesTransform$,
-      gridGraphicTransform$: gridGraphicTransform$,
-    })
-
-    const gridAxesSize$ = gridAxesSizeObservable({
-      fullDataFormatter$: gridDataFormatter$,
-      layout$: layout$
-    }).pipe(
-      shareReplay(1)
-    )
-
-    const datumList$ = gridComputedData$.pipe(
-      map(d => d.flat())
-    ).pipe(
-      shareReplay(1)
-    )
-
-    const gridHighlight$ = highlightObservable({
-      datumList$,
-      fullChartParams$: fullChartParams$,
-      event$: event$
-    }).pipe(
-      shareReplay(1)
-    )
-
-    const existSeriesLabels$ = existSeriesLabelsObservable({
-      computedData$: gridComputedData$,
-    })
-
-    const SeriesDataMap$ = seriesDataMapObservable({
-      datumList$: datumList$
-    }).pipe(
-      shareReplay(1)
-    )
-
-    const GroupDataMap$ = groupDataMapObservable({
-      datumList$: datumList$
-    }).pipe(
-      shareReplay(1)
-    )
-
-    const visibleComputedData$ = gridVisibleComputedDataObservable({
-      computedData$: gridComputedData$,
-    }).pipe(
-      shareReplay(1)
-    )
-
-
-    return {
-      isSeriesPositionSeprate$,
-      gridContainer$,
-      gridAxesTransform$,
-      gridAxesReverseTransform$,
-      gridGraphicTransform$,
-      gridGraphicReverseScale$,
-      gridAxesSize$,
-      gridHighlight$,
-      existSeriesLabels$,
-      SeriesDataMap$,
-      GroupDataMap$,
-      visibleComputedData$,
-    }
-  }
-
-  const destroy$ = new Subject()
-
-  return combineLatest({
-    fullDataFormatter: fullDataFormatter$,
-    computedData: computedData$,
-  }).pipe(
-    switchMap(async (d) => d),
-    // distinctUntilChanged((a, b) => {
-    //   // 只有當computedData的長度改變時，才重新計算
-    //   return a.computedData.length === b.computedData.length
-    // }),
-    map(data => {
-      // 每次重新計算時，清除之前的訂閱
-      destroy$.next(undefined)
-
-      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT
-
-      return data.computedData.map((gridComputedData, gridIndex) => {
-
-        // -- 取得該grid的data和dataFormatter
-        const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
-        const gridDataFormatter: DataFormatterGrid = {
-          type: 'grid',
-          grid: {
-            ...grid
-          },
-          container: {
-            ...data.fullDataFormatter.container
-          }
-        }
-        const gridDataFormatter$ = of(gridDataFormatter).pipe(
-          takeUntil(destroy$),
-          shareReplay(1)
-        )
-        const gridComputedData$ = of(gridComputedData).pipe(
-          takeUntil(destroy$),
-          shareReplay(1)
-        )
-
-        // -- 建立Observables --
-        return detailObservables ({
-          gridDataFormatter$,
-          gridComputedData$,
-          layout$,
-          fullChartParams$,
-          event$
-        })
-      })
-    })
-  )
-}
-
-
-// 所有container位置（對應series）
-export const multiGridContainerObservable = ({ computedData$, fullDataFormatter$, fullChartParams$, layout$ }: {
-  computedData$: Observable<ComputedDataTypeMap<'multiGrid'>>
-  fullDataFormatter$: Observable<DataFormatterTypeMap<'multiGrid'>>
-  fullChartParams$: Observable<ChartParams>
-  layout$: Observable<Layout>
-}) => {
-
-  const multiGridContainer$ = combineLatest({
-    computedData: computedData$,
-    fullDataFormatter: fullDataFormatter$,
-    fullChartParams: fullChartParams$,
-    layout: layout$,
-  }).pipe(
-    switchMap(async (d) => d),
-    map(data => {
-
-      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT
-      
-      const boxArr = data.computedData.map((gridData, gridIndex) => {
-        const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
-        
-        // 有設定series定位
-        const hasSeriesPosition = grid.seriesSlotIndexes && grid.seriesSlotIndexes.length === gridData.length
-          ? true
-          : false
-        
-        if (hasSeriesPosition) {
-          // -- 依seriesSlotIndexes計算 --
-          return gridData.map((seriesData, seriesIndex) => {
-            const columnIndex = grid.seriesSlotIndexes[seriesIndex] % data.fullDataFormatter.container.columnAmount
-            const rowIndex = Math.floor(grid.seriesSlotIndexes[seriesIndex] / data.fullDataFormatter.container.columnAmount)
-            const { translate, scale } = calcGridContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
-            return {
-              slotIndex: grid.seriesSlotIndexes[seriesIndex],
-              rowIndex,
-              columnIndex,
-              translate,
-              scale,
-            }
-          })
-        } else {
-          // -- 依grid的slotIndex計算 --
-          const columnIndex = grid.slotIndex % data.fullDataFormatter.container.columnAmount
-          const rowIndex = Math.floor(grid.slotIndex / data.fullDataFormatter.container.columnAmount)
-          return gridData.map((seriesData, seriesIndex) => {
-            const { translate, scale } = calcGridContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
-            return {
-              slotIndex: grid.slotIndex,
-              rowIndex,
-              columnIndex,
-              translate,
-              scale,
-            }
-          })
-        }
-
-      })
-      return boxArr
-    }),
-  )
-
-  return multiGridContainer$
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  of,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable, 
+  combineLatestAll} from 'rxjs'
+import type {
+  AxisPosition,
+  ChartType,
+  ChartParams,
+  ComputedDataTypeMap,
+  ComputedDataGrid,
+  DataTypeMap,
+  DataFormatterTypeMap,
+  DataFormatterGrid,
+  DataFormatterMultiGridContainer,
+  EventMultiGrid,
+  HighlightTarget,
+  Layout,
+  TransformData } from '../types'
+import type { ContextObserverGridDetail, ContextObserverMultiGridDetail, GridContainerPosition } from '../types'
+import {
+  highlightObservable,
+  seriesDataMapObservable,
+  groupDataMapObservable } from '../utils/observables'
+import {
+  gridAxesTransformObservable,
+  gridGraphicTransformObservable,
+  gridGraphicReverseScaleObservable,
+  gridAxesReverseTransformObservable,
+  gridAxesSizeObservable,
+  seriesLabelsObservable,
+  gridComputedLayoutDataObservable,
+  gridVisibleComputedDataObservable,
+  gridVisibleComputedLayoutDataObservable,
+  // isSeriesSeprateObservable,
+  gridContainerPositionObservable } from '../grid/gridObservables'
+import { DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT } from '../defaults'
+import { calcGridContainerLayout } from '../utils/orbchartsUtils'
+
+// 每一個grid計算出來的所有Observable
+export const multiGridEachDetailObservable = ({ fullDataFormatter$, computedData$, layout$, fullChartParams$, event$ }: {
+  fullDataFormatter$: Observable<DataFormatterTypeMap<'multiGrid'>>
+  computedData$: Observable<ComputedDataTypeMap<'multiGrid'>>
+  layout$: Observable<Layout>
+  fullChartParams$: Observable<ChartParams>
+  event$: Subject<EventMultiGrid>
+}): Observable<ContextObserverMultiGridDetail[]> => {
+
+  const destroy$ = new Subject()
+
+  // highlight全部grid
+  const allGridHighlight$ = highlightObservable({
+    datumList$: computedData$.pipe(
+      map(d => d.flat().flat()),
+      shareReplay(1)
+    ),
+    fullChartParams$: fullChartParams$,
+    event$: event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const multiGridContainer$ = multiGridContainerObservable({
+    computedData$: computedData$,
+    fullDataFormatter$: fullDataFormatter$,
+    layout$: layout$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  return combineLatest({
+    fullDataFormatter: fullDataFormatter$,
+    computedData: computedData$,
+    multiGridContainer: multiGridContainer$
+  }).pipe(
+    switchMap(async (d) => d),
+    // distinctUntilChanged((a, b) => {
+    //   // 只有當computedData的長度改變時，才重新計算
+    //   return a.computedData.length === b.computedData.length
+    // }),
+    map(data => {
+      // 每次重新計算時，清除之前的訂閱
+      destroy$.next(undefined)
+
+      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT
+
+      return data.computedData.map((gridComputedData, gridIndex) => {
+
+        // -- 取得該grid的data和dataFormatter
+        const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
+        const gridDataFormatter: DataFormatterGrid = {
+          type: 'grid',
+          visibleFilter: data.fullDataFormatter.visibleFilter as any,
+          grid: {
+            ...grid
+          },
+          container: {
+            ...data.fullDataFormatter.container
+          }
+        }
+        const gridDataFormatter$ = of(gridDataFormatter).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+        const gridComputedData$ = of(gridComputedData).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+
+        // const isSeriesSeprate$ = isSeriesSeprateObservable({
+        //   computedData$: gridComputedData$,
+        //   fullDataFormatter$: gridDataFormatter$,
+        // }).pipe(
+        //   takeUntil(destroy$),
+        //   shareReplay(1)
+        // )
+      
+        // const gridContainerPosition$ = gridContainerPositionObservable({
+        //   computedData$: gridComputedData$,
+        //   fullDataFormatter$: gridDataFormatter$,
+        //   layout$
+        // }).pipe(
+        //   shareReplay(1)
+        // )
+
+        const gridContainerPosition$ = of(data.multiGridContainer[gridIndex]).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$,
+          fullDataFormatter$: gridDataFormatter$,
+          layout$: layout$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const gridGraphicReverseScale$ = gridGraphicReverseScaleObservable({
+          gridContainerPosition$: gridContainerPosition$,
+          gridAxesTransform$: gridAxesTransform$,
+          gridGraphicTransform$: gridGraphicTransform$,
+        })
+    
+        const gridAxesSize$ = gridAxesSizeObservable({
+          fullDataFormatter$: gridDataFormatter$,
+          layout$: layout$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const datumList$ = gridComputedData$.pipe(
+          map(d => d.flat())
+        ).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        // const gridHighlight$ = highlightObservable({
+        //   datumList$,
+        //   fullChartParams$: fullChartParams$,
+        //   event$: event$
+        // }).pipe(
+        //   shareReplay(1)
+        // )
+    
+        const seriesLabels$ = seriesLabelsObservable({
+          computedData$: gridComputedData$,
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const SeriesDataMap$ = seriesDataMapObservable({
+          datumList$: datumList$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const GroupDataMap$ = groupDataMapObservable({
+          datumList$: datumList$
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const visibleComputedData$ = gridVisibleComputedDataObservable({
+          computedData$: gridComputedData$,
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const computedLayoutData$ = gridComputedLayoutDataObservable({
+          computedData$: gridComputedData$,
+          fullDataFormatter$: gridDataFormatter$,
+          layout$: layout$,
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+    
+        const visibleComputedLayoutData$ = gridVisibleComputedLayoutDataObservable({
+          computedLayoutData$: computedLayoutData$,
+        }).pipe(
+          takeUntil(destroy$),
+          shareReplay(1)
+        )
+
+        return <ContextObserverMultiGridDetail>{
+          gridContainerPosition$,
+          gridAxesTransform$,
+          gridAxesReverseTransform$,
+          gridGraphicTransform$,
+          gridGraphicReverseScale$,
+          gridAxesSize$,
+          gridHighlight$: allGridHighlight$,
+          seriesLabels$,
+          SeriesDataMap$,
+          GroupDataMap$,
+          dataFormatter$: gridDataFormatter$,
+          computedData$: gridComputedData$,
+          computedLayoutData$,
+          visibleComputedData$,
+          visibleComputedLayoutData$,
+          // isSeriesSeprate$
+        }
+      })
+    })
+  )
+}
+
+
+// 所有container位置（對應series）
+export const multiGridContainerObservable = ({ computedData$, fullDataFormatter$, layout$ }: {
+  computedData$: Observable<ComputedDataTypeMap<'multiGrid'>>
+  fullDataFormatter$: Observable<DataFormatterTypeMap<'multiGrid'>>
+  layout$: Observable<Layout>
+}): Observable<GridContainerPosition[][]> => {
+
+  return combineLatest({
+    computedData: computedData$,
+    fullDataFormatter: fullDataFormatter$,
+    layout: layout$,
+  }).pipe(
+    switchMap(async (d) => d),
+    map(data => {
+
+      const defaultGrid = data.fullDataFormatter.gridList[0] ?? DATA_FORMATTER_MULTI_GRID_GRID_DEFAULT
+      const slotAmount = data.computedData.reduce((acc, gridData, gridIndex) => {
+        const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
+        const gridSlotAmount = grid.separateSeries
+          ? gridData.length
+          : data.fullDataFormatter.separateGrid
+            ? 1
+            : 0 // 如果grid和series都不分開，則slotAmount不增加（在相同的slot）
+        return acc + gridSlotAmount
+      }, 0) || 1
+
+      const gridContainerLayout = calcGridContainerLayout(data.layout, data.fullDataFormatter.container, slotAmount)
+
+      let accGridSlotIndex = 0
+      const gridContainerPositionArr = data.computedData.map((gridData, gridIndex) => {
+        const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
+        const seriesContainerArr = gridData.map((seriesData, seriesIndex) => {
+          const container = gridContainerLayout[accGridSlotIndex]
+          if (grid.separateSeries) {
+            accGridSlotIndex += 1
+          }
+          return container
+        })
+        if (!grid.separateSeries && data.fullDataFormatter.separateGrid) {
+          accGridSlotIndex += 1
+        }
+        return seriesContainerArr
+      })
+
+      // let accGridSlotIndex = 0
+
+      // const gridContainerPositionArr = data.computedData.map((gridData, gridIndex) => {
+      //   const grid = data.fullDataFormatter.gridList[gridIndex] ?? defaultGrid
+        
+      //   if (grid.separateSeries) {
+      //     // -- 依seriesSlotIndexes計算 --
+      //     const seriesContainerArr = gridData.map((seriesData, seriesIndex) => {
+      //       const currentSlotIndex = accGridSlotIndex + seriesIndex
+      //       const columnIndex = currentSlotIndex % data.fullDataFormatter.container.columnAmount
+      //       const rowIndex = Math.floor(currentSlotIndex / data.fullDataFormatter.container.columnAmount)
+      //       const { translate, scale } = calcGridContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
+      //       return {
+      //         slotIndex: currentSlotIndex,
+      //         rowIndex,
+      //         columnIndex,
+      //         translate,
+      //         scale,
+      //       }
+      //     })
+      //     accGridSlotIndex += seriesContainerArr.length
+      //     return seriesContainerArr
+      //   } else {
+      //     // -- 依grid的slotIndex計算 --
+      //     const columnIndex = accGridSlotIndex % data.fullDataFormatter.container.columnAmount
+      //     const rowIndex = Math.floor(accGridSlotIndex / data.fullDataFormatter.container.columnAmount)
+      //     const seriesContainerArr = gridData.map((seriesData, seriesIndex) => {
+      //       const { translate, scale } = calcGridContainerPosition(data.layout, data.fullDataFormatter.container, rowIndex, columnIndex)
+      //       return {
+      //         slotIndex: accGridSlotIndex,
+      //         rowIndex,
+      //         columnIndex,
+      //         translate,
+      //         scale,
+      //       }
+      //     })
+      //     if (data.fullDataFormatter.separateGrid) {
+      //       accGridSlotIndex += 1
+      //     }
+      //     return seriesContainerArr
+      //   }
+      // })
+
+      return gridContainerPositionArr
+    }),
+  )
 }