@orbcharts/core 3.0.3 → 3.0.5

package/src/relationship/relationshipObservables.ts

@@ -1,85 +1,85 @@
-import {
-  combineLatest,
-  distinctUntilChanged,
-  filter,
-  map,
-  merge,
-  takeUntil,
-  shareReplay,
-  switchMap,
-  Subject,
-  Observable } from 'rxjs'
-import type {
-  ChartParams,
-  ComputedDataRelationship,
-  ComputedDataTypeMap,
-  ComputedNode,
-  ComputedEdge,
-  DataFormatterTree } from '../../lib/core-types'
-
-
-export const categoryLabelsObservable = (
-  CategoryNodeMap$: Observable<Map<string, ComputedNode[]>>,
-  CategoryEdgeMap$: Observable<Map<string, ComputedEdge[]>>
-): Observable<string[]> => {
-  return combineLatest({
-    CategoryNodeMap: CategoryNodeMap$,
-    CategoryEdgeMap: CategoryEdgeMap$
-  }).pipe(
-    switchMap(async d => d),
-    map(data => {
-      return [...Array.from(data.CategoryNodeMap.keys()), ...Array.from(data.CategoryEdgeMap.keys())]
-    }),
-    distinctUntilChanged((a, b) => {
-      return JSON.stringify(a).length === JSON.stringify(b).length
-    }),
-  )
-}
-
-export const NodeMapObservable = (computedData$: Observable<ComputedDataRelationship>) => {
-  return computedData$.pipe(
-    map(data => {
-      const nodeMap = new Map<string, ComputedNode>()
-      data.nodes.forEach(node => {
-        nodeMap.set(node.id, node)
-      })
-      return nodeMap
-    }),
-  )
-}
-
-export const EdgeMapObservable = (computedData$: Observable<ComputedDataRelationship>) => {
-  return computedData$.pipe(
-    map(data => {
-      const edgeMap = new Map<string, ComputedEdge>()
-      data.edges.forEach(edge => {
-        edgeMap.set(edge.id, edge)
-      })
-      return edgeMap
-    }),
-  )
-}
-
-// 所有可見的節點
-export const relationshipVisibleComputedDataObservable = ({ computedData$, NodeMap$ }: {
-  computedData$: Observable<ComputedDataRelationship>
-  NodeMap$: Observable<Map<string, ComputedNode>>
-}) => {
-  return combineLatest({
-    computedData: computedData$,
-    NodeMap: NodeMap$
-  }).pipe(
-    switchMap(async d => d),
-    map(data => {
-      return {
-        nodes: data.computedData.nodes.filter(node => node.visible),
-        edges: data.computedData.edges
-          .filter(edge => edge.visible)
-          // 依照節點是否存在篩選
-          .filter(edge => {
-            return data.NodeMap.has(edge.startNode.id) && data.NodeMap.has(edge.endNode.id)
-          })
-      }
-    })
-  )
+import {
+  combineLatest,
+  distinctUntilChanged,
+  filter,
+  map,
+  merge,
+  takeUntil,
+  shareReplay,
+  switchMap,
+  Subject,
+  Observable } from 'rxjs'
+import type {
+  ChartParams,
+  ComputedDataRelationship,
+  ComputedDataTypeMap,
+  ComputedNode,
+  ComputedEdge,
+  DataFormatterTree } from '../../lib/core-types'
+
+
+export const categoryLabelsObservable = (
+  CategoryNodeMap$: Observable<Map<string, ComputedNode[]>>,
+  CategoryEdgeMap$: Observable<Map<string, ComputedEdge[]>>
+): Observable<string[]> => {
+  return combineLatest({
+    CategoryNodeMap: CategoryNodeMap$,
+    CategoryEdgeMap: CategoryEdgeMap$
+  }).pipe(
+    switchMap(async d => d),
+    map(data => {
+      return [...Array.from(data.CategoryNodeMap.keys()), ...Array.from(data.CategoryEdgeMap.keys())]
+    }),
+    distinctUntilChanged((a, b) => {
+      return JSON.stringify(a) === JSON.stringify(b)
+    }),
+  )
+}
+
+export const NodeMapObservable = (computedData$: Observable<ComputedDataRelationship>) => {
+  return computedData$.pipe(
+    map(data => {
+      const nodeMap = new Map<string, ComputedNode>()
+      data.nodes.forEach(node => {
+        nodeMap.set(node.id, node)
+      })
+      return nodeMap
+    }),
+  )
+}
+
+export const EdgeMapObservable = (computedData$: Observable<ComputedDataRelationship>) => {
+  return computedData$.pipe(
+    map(data => {
+      const edgeMap = new Map<string, ComputedEdge>()
+      data.edges.forEach(edge => {
+        edgeMap.set(edge.id, edge)
+      })
+      return edgeMap
+    }),
+  )
+}
+
+// 所有可見的節點
+export const relationshipVisibleComputedDataObservable = ({ computedData$, NodeMap$ }: {
+  computedData$: Observable<ComputedDataRelationship>
+  NodeMap$: Observable<Map<string, ComputedNode>>
+}) => {
+  return combineLatest({
+    computedData: computedData$,
+    NodeMap: NodeMap$
+  }).pipe(
+    switchMap(async d => d),
+    map(data => {
+      return {
+        nodes: data.computedData.nodes.filter(node => node.visible),
+        edges: data.computedData.edges
+          .filter(edge => edge.visible)
+          // 依照節點是否存在篩選
+          .filter(edge => {
+            return data.NodeMap.has(edge.startNode.id) && data.NodeMap.has(edge.endNode.id)
+          })
+      }
+    })
+  )
 }

package/src/series/computedDataFn.ts

@@ -1,88 +1,88 @@
-import type { DataSeries, DataSeriesDatum, ComputedDataFn, ComputedDatumSeries } from '../../lib/core-types'
-import { formatValueToLabel, createDefaultDatumId, createDefaultSeriesLabel, seriesColorPredicate } from '../utils/orbchartsUtils'
-
-export const computedDataFn: ComputedDataFn<'series'> = (context) => {
-  const { data = [], dataFormatter, chartParams } = context
-  if (!data.length) {
-    return []
-  }
-
-  let computedDataSeries: ComputedDatumSeries[][] = []
-  
-  try {
-
-    const createComputedDatumSeries = (seriesData: number | DataSeriesDatum, seriesIndex: number, itemIndex: number, currentIndex: number): ComputedDatumSeries => {
-      const defaultId = createDefaultDatumId(dataFormatter.type, seriesIndex, itemIndex)
-      const seriesLabel = dataFormatter.seriesLabels[seriesIndex] || createDefaultSeriesLabel('series', seriesIndex)
-      const color = seriesColorPredicate(seriesIndex, chartParams)
-      if (typeof seriesData === 'number') {
-        return {
-          id: defaultId,
-          index: currentIndex,
-          seq: 0, // 先給預設值
-          label: defaultId,
-          description: '',
-          data: {},
-          value: seriesData,
-          seriesIndex: seriesIndex,
-          seriesLabel,
-          color,
-          visible: true // 先給預設值
-        }
-      } else {
-        return {
-          id: seriesData.id ? seriesData.id : defaultId,
-          index: currentIndex,
-          seq: 0, // 先給預設值
-          label: seriesData.label ? seriesData.label : defaultId,
-          description: seriesData.description,
-          data: seriesData.data ?? {},
-          value: seriesData.value,
-          seriesIndex: seriesIndex,
-          seriesLabel,
-          color,
-          visible: true // 先給預設值
-        }
-      }
-    }
-    
-    computedDataSeries = data
-      .map((seriesData, seriesIndex) => {
-        if (Array.isArray(seriesData)) {
-          return seriesData.map((item, itemIndex) => 
-            createComputedDatumSeries(item, seriesIndex, itemIndex, computedDataSeries.length + itemIndex)
-          )
-        } else {
-          return createComputedDatumSeries(seriesData, seriesIndex, 0, computedDataSeries.length)
-        }
-      })
-      // 攤為一維陣列
-      .flat()
-      // 排序後給 seq
-      .sort(dataFormatter.sort ?? undefined)
-      .map((datum, index) => {
-        datum.seq = index
-        return datum
-      })
-      .map(datum => {
-        datum.visible = dataFormatter.visibleFilter(datum, context)
-        return datum
-      })
-      // 恢復原排序
-      .sort((a, b) => a.index - b.index)
-      // 依seriesIndex分組（二維陣列）
-      .reduce((acc, datum) => {
-        if (!acc[datum.seriesIndex]) {
-          acc[datum.seriesIndex] = []
-        }
-        acc[datum.seriesIndex].push(datum)
-        return acc
-      }, [])
-
-  } catch (e) {
-    // console.error(e)
-    throw Error(e)
-  }
-  
-  return computedDataSeries
-}
+import type { DataSeries, DataSeriesDatum, ComputedDataFn, ComputedDatumSeries } from '../../lib/core-types'
+import { formatValueToLabel, createDefaultDatumId, createDefaultSeriesLabel, seriesColorPredicate } from '../utils/orbchartsUtils'
+
+export const computedDataFn: ComputedDataFn<'series'> = (context) => {
+  const { data = [], dataFormatter, chartParams } = context
+  if (!data.length) {
+    return []
+  }
+
+  let computedDataSeries: ComputedDatumSeries[][] = []
+  
+  try {
+
+    const createComputedDatumSeries = (seriesData: number | DataSeriesDatum, seriesIndex: number, itemIndex: number, currentIndex: number): ComputedDatumSeries => {
+      const defaultId = createDefaultDatumId(dataFormatter.type, seriesIndex, itemIndex)
+      const seriesLabel = dataFormatter.seriesLabels[seriesIndex] || createDefaultSeriesLabel('series', seriesIndex)
+      const color = seriesColorPredicate(seriesIndex, chartParams)
+      if (typeof seriesData === 'number') {
+        return {
+          id: defaultId,
+          index: currentIndex,
+          seq: 0, // 先給預設值
+          label: defaultId,
+          description: '',
+          data: {},
+          value: seriesData,
+          seriesIndex: seriesIndex,
+          seriesLabel,
+          color,
+          visible: true // 先給預設值
+        }
+      } else {
+        return {
+          id: seriesData.id ? seriesData.id : defaultId,
+          index: currentIndex,
+          seq: 0, // 先給預設值
+          label: seriesData.label ? seriesData.label : defaultId,
+          description: seriesData.description,
+          data: seriesData.data ?? {},
+          value: seriesData.value,
+          seriesIndex: seriesIndex,
+          seriesLabel,
+          color,
+          visible: true // 先給預設值
+        }
+      }
+    }
+    
+    computedDataSeries = data
+      .map((seriesData, seriesIndex) => {
+        if (Array.isArray(seriesData)) {
+          return seriesData.map((item, itemIndex) => 
+            createComputedDatumSeries(item, seriesIndex, itemIndex, computedDataSeries.length + itemIndex)
+          )
+        } else {
+          return createComputedDatumSeries(seriesData, seriesIndex, 0, computedDataSeries.length)
+        }
+      })
+      // 攤為一維陣列
+      .flat()
+      // 排序後給 seq
+      .sort(dataFormatter.sort ?? undefined)
+      .map((datum, index) => {
+        datum.seq = index
+        return datum
+      })
+      .map(datum => {
+        datum.visible = dataFormatter.visibleFilter(datum, context)
+        return datum
+      })
+      // 恢復原排序
+      .sort((a, b) => a.index - b.index)
+      // 依seriesIndex分組（二維陣列）
+      .reduce((acc, datum) => {
+        if (!acc[datum.seriesIndex]) {
+          acc[datum.seriesIndex] = []
+        }
+        acc[datum.seriesIndex].push(datum)
+        return acc
+      }, [])
+
+  } catch (e) {
+    // console.error(e)
+    throw Error(e)
+  }
+  
+  return computedDataSeries
+}

package/src/series/contextObserverCallback.ts

@@ -1,107 +1,132 @@
-import { map, shareReplay } from 'rxjs'
-import type { ContextObserverCallback } from '../../lib/core-types'
-import {
-  seriesDataMapObservable,
-  groupDataMapObservable } from '../utils/observables'
-import { highlightObservable, textSizePxObservable } from '../utils/observables'
-
-import {
-  separateSeriesObservable,
-  seriesVisibleComputedDataObservable,
-  seriesComputedSortedDataObservable,
-  seriesLabelsObservable,
-  seriesContainerPositionObservable,
-  seriesContainerPositionMapObservable
-} from './seriesObservables'
-
-export const contextObserverCallback: ContextObserverCallback<'series'> = ({ subject, observer }) => {
-
-  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
-    shareReplay(1)
-  )
-
-  const separateSeries$ = separateSeriesObservable({
-    fullDataFormatter$: observer.fullDataFormatter$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const visibleComputedData$ = seriesVisibleComputedDataObservable({
-    computedData$: observer.computedData$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const computedSortedData$ = seriesComputedSortedDataObservable({
-    computedData$: observer.computedData$,
-    fullDataFormatter$: observer.fullDataFormatter$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const visibleComputedSortedData$ = seriesVisibleComputedDataObservable({
-    computedData$: computedSortedData$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const datumList$ = observer.computedData$.pipe(
-    map(d => d.flat())
-  ).pipe(
-    shareReplay(1)
-  )
-
-  const seriesHighlight$ = highlightObservable({
-    datumList$,
-    fullChartParams$: observer.fullChartParams$,
-    event$: subject.event$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const seriesLabels$ = seriesLabelsObservable({
-    computedData$: observer.computedData$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const SeriesDataMap$ = seriesDataMapObservable({
-    datumList$
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const seriesContainerPosition$ = seriesContainerPositionObservable({
-    computedData$: observer.computedData$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    layout$: observer.layout$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  const SeriesContainerPositionMap$ = seriesContainerPositionMapObservable({
-    seriesContainerPosition$: seriesContainerPosition$,
-    seriesLabels$: seriesLabels$,
-    separateSeries$: separateSeries$,
-  }).pipe(
-    shareReplay(1)
-  )
-
-  return {
-    fullParams$: observer.fullParams$,
-    fullChartParams$: observer.fullChartParams$,
-    fullDataFormatter$: observer.fullDataFormatter$,
-    computedData$: observer.computedData$,
-    layout$: observer.layout$,
-    textSizePx$,
-    visibleComputedData$,
-    visibleComputedSortedData$,
-    separateSeries$,
-    computedSortedData$,
-    seriesHighlight$,
-    seriesLabels$,
-    SeriesDataMap$,
-    seriesContainerPosition$,
-    SeriesContainerPositionMap$,
-  }
-}
+import { map, share, shareReplay } from 'rxjs'
+import type { ContextObserverCallback } from '../../lib/core-types'
+import {
+  seriesDataMapObservable,
+  groupDataMapObservable } from '../utils/observables'
+import { highlightObservable, textSizePxObservable } from '../utils/observables'
+
+import {
+  datumLabelsObservable,
+  separateSeriesObservable,
+  separateLabelObservable,
+  sumSeriesObservable,
+  seriesVisibleComputedDataObservable,
+  seriesComputedSortedDataObservable,
+  seriesLabelsObservable,
+  seriesContainerPositionObservable,
+  datumContainerPositionMapObservable
+} from './seriesObservables'
+
+export const contextObserverCallback: ContextObserverCallback<'series'> = ({ subject, observer }) => {
+
+  const textSizePx$ = textSizePxObservable(observer.fullChartParams$).pipe(
+    shareReplay(1)
+  )
+
+  const datumLabels$ = datumLabelsObservable({
+    computedData$: observer.computedData$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const separateSeries$ = separateSeriesObservable({
+    fullDataFormatter$: observer.fullDataFormatter$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const separateLabel$ = separateLabelObservable({
+    fullDataFormatter$: observer.fullDataFormatter$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const sumSeries$ = sumSeriesObservable({
+    fullDataFormatter$: observer.fullDataFormatter$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  // const visibleComputedData$ = seriesVisibleComputedDataObservable({
+  //   computedData$: observer.computedData$,
+  // }).pipe(
+  //   shareReplay(1)
+  // )
+
+  const computedSortedData$ = seriesComputedSortedDataObservable({
+    computedData$: observer.computedData$,
+    separateSeries$: separateSeries$,
+    separateLabel$: separateLabel$,
+    sumSeries$: sumSeries$,
+    datumLabels$: datumLabels$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const visibleComputedSortedData$ = seriesVisibleComputedDataObservable({
+    computedData$: computedSortedData$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const datumList$ = observer.computedData$.pipe(
+    map(d => d.flat())
+  ).pipe(
+    shareReplay(1)
+  )
+
+  const seriesHighlight$ = highlightObservable({
+    datumList$,
+    fullChartParams$: observer.fullChartParams$,
+    event$: subject.event$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const seriesLabels$ = seriesLabelsObservable({
+    computedData$: observer.computedData$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const SeriesDataMap$ = seriesDataMapObservable({
+    datumList$
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const seriesContainerPosition$ = seriesContainerPositionObservable({
+    computedSortedData$: computedSortedData$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    layout$: observer.layout$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  const DatumContainerPositionMap$ = datumContainerPositionMapObservable({
+    seriesContainerPosition$: seriesContainerPosition$,
+    computedSortedData$: computedSortedData$,
+  }).pipe(
+    shareReplay(1)
+  )
+
+  return {
+    fullParams$: observer.fullParams$,
+    fullChartParams$: observer.fullChartParams$,
+    fullDataFormatter$: observer.fullDataFormatter$,
+    computedData$: observer.computedData$,
+    layout$: observer.layout$,
+    textSizePx$,
+    // visibleComputedData$,
+    visibleComputedSortedData$,
+    separateSeries$,
+    separateLabel$,
+    sumSeries$,
+    computedSortedData$,
+    seriesHighlight$,
+    seriesLabels$,
+    SeriesDataMap$,
+    seriesContainerPosition$,
+    DatumContainerPositionMap$,
+  }
+}