@orbcharts/plugins-basic 3.0.0-alpha.46 → 3.0.0-alpha.48

package/src/multiGrid/plugins/MultiValueAxis.ts

@@ -24,39 +24,43 @@ export const MultiValueAxis = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_VA
 
   const multiGridPlugin$ = multiGridPluginObservables(observer)
 
-  multiGridPlugin$.subscribe(data => {
-    // 每次重新計算時，清除之前的訂閱
-    unsubscribeFnArr.forEach(fn => fn())
+  multiGridPlugin$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(data => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
 
-    selection.selectAll(`g.${gridClassName}`)
-      .data(data)
-      .join('g')
-      .attr('class', gridClassName)
-      .each((d, i, g) => {
+      selection.selectAll(`g.${gridClassName}`)
+        .data(data)
+        .join('g')
+        .attr('class', gridClassName)
+        .each((d, i, g) => {
 
-        const gridSelection = d3.select(g[i])
+          const gridSelection = d3.select(g[i])
 
-        const isSeriesSeprate$ = d.dataFormatter$.pipe(
-          takeUntil(destroy$),
-          map(d => d.grid.separateSeries),
-          distinctUntilChanged(),
-          shareReplay(1)
-        )
+          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$,
+          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)

package/src/multiGrid/plugins/OverlappingValueAxes.ts

@@ -123,44 +123,48 @@ export const OverlappingValueAxes = defineMultiGridPlugin(pluginName, DEFAULT_OV
     })
   )
 
-  multiGridPlugin$.subscribe(data => {
-    // 每次重新計算時，清除之前的訂閱
-    unsubscribeFnArr.forEach(fn => fn())
+  multiGridPlugin$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(data => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
 
-    selection.selectAll(`g.${gridClassName}`)
-      .data(data)
-      .join('g')
-      .attr('class', gridClassName)
-      .each((d, i, g) => {
-        if (i > 1) {
-          return
-        }
+      selection.selectAll(`g.${gridClassName}`)
+        .data(data)
+        .join('g')
+        .attr('class', gridClassName)
+        .each((d, i, g) => {
+          if (i > 1) {
+            return
+          }
 
-        const gridSelection = d3.select(g[i])
+          const gridSelection = d3.select(g[i])
 
-        const isSeriesSeprate$ = d.dataFormatter$.pipe(
-          takeUntil(destroy$),
-          map(d => d.grid.separateSeries),
-          distinctUntilChanged(),
-          shareReplay(1)
-        )
+          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$.pipe(
-            map(fullParams => i === 0 ? fullParams.firstAxis : fullParams.secondAxis)
-          ),
-          fullDataFormatter$: d.dataFormatter$,
-          fullChartParams$: observer.fullChartParams$,  
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridAxesReverseTransform$: d.gridAxesReverseTransform$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          isSeriesSeprate$,
+          unsubscribeFnArr[i] = createBaseValueAxis(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            fullParams$: observer.fullParams$.pipe(
+              map(fullParams => i === 0 ? fullParams.firstAxis : fullParams.secondAxis)
+            ),
+            fullDataFormatter$: d.dataFormatter$,
+            fullChartParams$: observer.fullChartParams$,  
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridAxesReverseTransform$: d.gridAxesReverseTransform$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            isSeriesSeprate$,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)

package/src/series/plugins/Pie.ts

@@ -38,6 +38,7 @@ function makeTweenPieRenderDataFn ({ enter, exit, data, lastTweenData, fullParam
 }): (t: number) => PieDatum[] {
   // 無更新資料項目則只計算資料變化 (新資料 * t + 舊資料 * (1 - t))
   if (!enter.size() && !exit.size()) {
+    // console.log('case1')
     return (t: number) => {
       const tweenData: PieDatum[] = data.map((_d, _i) => {
         const lastDatum = lastTweenData[_i] ?? {
@@ -62,6 +63,7 @@ function makeTweenPieRenderDataFn ({ enter, exit, data, lastTweenData, fullParam
     }
   // 有更新資料則重新繪圖
   } else {
+    // console.log('case2')
     return (t: number) => {
       return makePieRenderData(
         data,
@@ -282,12 +284,12 @@ function createEachPie (pluginName: string, context: {
     ).subscribe(data => {
       context.containerSelection.interrupt('graphicMove')
       // console.log('graphic', data)
-      let update: d3.Selection<SVGPathElement, PieDatum, any, any> = context.containerSelection
+      const update: d3.Selection<SVGPathElement, PieDatum, any, any> = context.containerSelection
         .selectAll<SVGPathElement, PieDatum>('path')
         .data(data.pieData, d => d.id)
-      let enter = update.enter()
-      let exit = update.exit()
-      
+      const enter = update.enter()
+      const exit = update.exit()
+
       const makeTweenPieRenderData = makeTweenPieRenderDataFn({
         enter,
         exit,
@@ -296,11 +298,11 @@ function createEachPie (pluginName: string, context: {
         fullParams: data.fullParams
       })
   
-      // -- enter資料使用補間動畫 --
-      enter
+      // -- 使用補間動畫 --
+      context.containerSelection
         .transition('graphicMove')
         .duration(data.fullChartParams.transitionDuration)
-        .ease(getD3TransitionEase(data.fullChartParams.transitionEase))
+        // .ease(getD3TransitionEase(data.fullChartParams.transitionEase))
         .tween('move', (self, t) => {
           return (t) => {
             tweenData = makeTweenPieRenderData(t)
@@ -312,18 +314,20 @@ function createEachPie (pluginName: string, context: {
               pathClassName
             })
   
-            context.event$.next({
-              type: 'series',
-              pluginName,
-              eventName: 'transitionMove',
-              event: undefined,
-              highlightTarget: data.highlightTarget,
-              datum: null,
-              series: [],
-              seriesIndex: -1,
-              seriesLabel: '',
-              data: data.computedData
-            })
+            // @Q@ 想盡量減清效能負擔所以取消掉
+            // context.event$.next({
+            //   type: 'series',
+            //   pluginName,
+            //   eventName: 'transitionMove',
+            //   event: undefined,
+            //   highlightTarget: data.highlightTarget,
+            //   datum: null,
+            //   series: [],
+            //   seriesIndex: -1,
+            //   seriesLabel: '',
+            //   data: data.computedData
+            // })
+
             // const callbackData = makeEnterDurationCallbackData(data.computedData, )
             // enterDurationCallback(callbackData, t)
           }
@@ -392,7 +396,22 @@ function createEachPie (pluginName: string, context: {
         subscriber.next(pathSelection)
       }
     })
-  })
+  }).pipe(
+    shareReplay(1)
+  )
+
+  // pathSelection$.subscribe(data => {
+  //   console.log('pathSelection', data)
+  // })
+  // context.SeriesDataMap$.subscribe(data => {
+  //   console.log('SeriesDataMap', data)
+  // })
+  // context.computedData$.subscribe(data => {
+  //   console.log('computedData', data)
+  // })
+  // highlightTarget$.subscribe(data => {
+  //   console.log('highlightTarget', data)
+  // })
 
   combineLatest({
     pathSelection: pathSelection$,
@@ -509,45 +528,46 @@ export const Pie = defineSeriesPlugin(pluginName, DEFAULT_PIE_PARAMS)(({ selecti
 
   const unsubscribeFnArr: (() => void)[] = []
 
-  // @Q@ 在seriesCenterSelection$之後才訂閱會造成fullParams$訂閱不到最初次的值，還需找時間研究先workaround
-  observer.fullParams$.subscribe()
-
-  seriesCenterSelection$.subscribe(seriesCenterSelection => {
-    // 每次重新計算時，清除之前的訂閱
-    unsubscribeFnArr.forEach(fn => fn())
-
-    // observer.fullParams$.subscribe(data => {
-    //   console.log('observer.fullParams$', data)
-    // })
-
-    seriesCenterSelection.each((d, containerIndex, g) => { 
-      // console.log('containerIndex', containerIndex)
-      const containerSelection = d3.select(g[containerIndex])
-
-      const containerComputedLayoutData$ = observer.computedLayoutData$.pipe(
-        takeUntil(destroy$),
-        map(data => data[containerIndex] ?? data[0])
-      )
-
-      const containerPosition$ = observer.seriesContainerPosition$.pipe(
-        takeUntil(destroy$),
-        map(data => data[containerIndex] ?? data[0])
-      )
+  seriesCenterSelection$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(seriesCenterSelection => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
+
+      // observer.fullParams$.subscribe(data => {
+      //   console.log('observer.fullParams$', data)
+      // })
+
+      seriesCenterSelection.each((d, containerIndex, g) => { 
+        // console.log('containerIndex', containerIndex)
+        const containerSelection = d3.select(g[containerIndex])
+
+        const containerComputedLayoutData$ = observer.computedLayoutData$.pipe(
+          takeUntil(destroy$),
+          map(data => data[containerIndex] ?? data[0])
+        )
+
+        const containerPosition$ = observer.seriesContainerPosition$.pipe(
+          takeUntil(destroy$),
+          map(data => data[containerIndex] ?? data[0])
+        )
+
+        unsubscribeFnArr[containerIndex] = createEachPie(pluginName, {
+          containerSelection: containerSelection,
+          computedData$: observer.computedData$,
+          containerComputedLayoutData$: containerComputedLayoutData$,
+          SeriesDataMap$: observer.SeriesDataMap$,
+          fullParams$: observer.fullParams$,
+          fullChartParams$: observer.fullChartParams$,
+          seriesHighlight$: observer.seriesHighlight$,
+          seriesContainerPosition$: containerPosition$,
+          event$: subject.event$,
+        })
 
-      unsubscribeFnArr[containerIndex] = createEachPie(pluginName, {
-        containerSelection: containerSelection,
-        computedData$: observer.computedData$,
-        containerComputedLayoutData$: containerComputedLayoutData$,
-        SeriesDataMap$: observer.SeriesDataMap$,
-        fullParams$: observer.fullParams$,
-        fullChartParams$: observer.fullChartParams$,
-        seriesHighlight$: observer.seriesHighlight$,
-        seriesContainerPosition$: containerPosition$,
-        event$: subject.event$,
       })
-
     })
-  })
 
   return () => {
     destroy$.next(undefined)

package/src/series/plugins/PieEventTexts.ts

@@ -218,38 +218,42 @@ export const PieEventTexts = defineSeriesPlugin(pluginName, DEFAULT_PIE_EVENT_TE
 
   const unsubscribeFnArr: (() => void)[] = []
 
-  seriesCenterSelection$.subscribe(seriesCenterSelection => {
-    // 每次重新計算時，清除之前的訂閱
-    unsubscribeFnArr.forEach(fn => fn())
+  seriesCenterSelection$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(seriesCenterSelection => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
 
-    seriesCenterSelection.each((d, containerIndex, g) => { 
-      
-      const containerSelection = d3.select(g[containerIndex])
+      seriesCenterSelection.each((d, containerIndex, g) => { 
+        
+        const containerSelection = d3.select(g[containerIndex])
 
-      const containerComputedLayoutData$ = observer.computedLayoutData$.pipe(
-        takeUntil(destroy$),
-        map(data => data[containerIndex] ?? data[0])
-      )
+        const containerComputedLayoutData$ = observer.computedLayoutData$.pipe(
+          takeUntil(destroy$),
+          map(data => data[containerIndex] ?? data[0])
+        )
 
-      const containerPosition$ = observer.seriesContainerPosition$.pipe(
-        takeUntil(destroy$),
-        map(data => data[containerIndex] ?? data[0])
-      )
+        const containerPosition$ = observer.seriesContainerPosition$.pipe(
+          takeUntil(destroy$),
+          map(data => data[containerIndex] ?? data[0])
+        )
 
-      unsubscribeFnArr[containerIndex] = createEachPieEventTexts(pluginName, {
-        containerSelection: containerSelection,
-        computedData$: observer.computedData$,
-        containerComputedLayoutData$: containerComputedLayoutData$,
-        SeriesDataMap$: observer.SeriesDataMap$,
-        fullParams$: observer.fullParams$,
-        fullChartParams$: observer.fullChartParams$,
-        seriesHighlight$: observer.seriesHighlight$,
-        seriesContainerPosition$: containerPosition$,
-        event$: subject.event$,
-      })
+        unsubscribeFnArr[containerIndex] = createEachPieEventTexts(pluginName, {
+          containerSelection: containerSelection,
+          computedData$: observer.computedData$,
+          containerComputedLayoutData$: containerComputedLayoutData$,
+          SeriesDataMap$: observer.SeriesDataMap$,
+          fullParams$: observer.fullParams$,
+          fullChartParams$: observer.fullChartParams$,
+          seriesHighlight$: observer.seriesHighlight$,
+          seriesContainerPosition$: containerPosition$,
+          event$: subject.event$,
+        })
 
+      })
     })
-  })
 
   return () => {
     destroy$.next(undefined)

package/src/series/plugins/PieLabels.ts

@@ -296,38 +296,42 @@ export const PieLabels = defineSeriesPlugin(pluginName, DEFAULT_PIE_LABELS_PARAM
 
   const unsubscribeFnArr: (() => void)[] = []
 
-  seriesCenterSelection$.subscribe(seriesCenterSelection => {
-    // 每次重新計算時，清除之前的訂閱
-    unsubscribeFnArr.forEach(fn => fn())
-
-    seriesCenterSelection.each((d, containerIndex, g) => { 
-      
-      const containerSelection = d3.select(g[containerIndex])
-
-      const containerComputedLayoutData$ = observer.computedLayoutData$.pipe(
-        takeUntil(destroy$),
-        map(data => data[containerIndex] ?? data[0])
-      )
-
-      const containerPosition$ = observer.seriesContainerPosition$.pipe(
-        takeUntil(destroy$),
-        map(data => data[containerIndex] ?? data[0])
-      )
-
-      unsubscribeFnArr[containerIndex] = createEachPieLabel(pluginName, {
-        containerSelection: containerSelection,
-        // computedData$: observer.computedData$,
-        containerComputedLayoutData$: containerComputedLayoutData$,
-        // SeriesDataMap$: observer.SeriesDataMap$,
-        fullParams$: observer.fullParams$,
-        fullChartParams$: observer.fullChartParams$,
-        seriesHighlight$: observer.seriesHighlight$,
-        seriesContainerPosition$: containerPosition$,
-        event$: subject.event$,
-      })
+  seriesCenterSelection$
+    .pipe(
+      takeUntil(destroy$)
+    )
+    .subscribe(seriesCenterSelection => {
+      // 每次重新計算時，清除之前的訂閱
+      unsubscribeFnArr.forEach(fn => fn())
+
+      seriesCenterSelection.each((d, containerIndex, g) => { 
+        
+        const containerSelection = d3.select(g[containerIndex])
+
+        const containerComputedLayoutData$ = observer.computedLayoutData$.pipe(
+          takeUntil(destroy$),
+          map(data => data[containerIndex] ?? data[0])
+        )
+
+        const containerPosition$ = observer.seriesContainerPosition$.pipe(
+          takeUntil(destroy$),
+          map(data => data[containerIndex] ?? data[0])
+        )
+
+        unsubscribeFnArr[containerIndex] = createEachPieLabel(pluginName, {
+          containerSelection: containerSelection,
+          // computedData$: observer.computedData$,
+          containerComputedLayoutData$: containerComputedLayoutData$,
+          // SeriesDataMap$: observer.SeriesDataMap$,
+          fullParams$: observer.fullParams$,
+          fullChartParams$: observer.fullChartParams$,
+          seriesHighlight$: observer.seriesHighlight$,
+          seriesContainerPosition$: containerPosition$,
+          event$: subject.event$,
+        })
 
+      })
     })
-  })
 
   return () => {
     destroy$.next(undefined)