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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orbcharts/plugins-basic",
-  "version": "3.0.0-alpha.46",
+  "version": "3.0.0-alpha.48",
   "description": "plugins for OrbCharts",
   "author": "Blue Planet Inc.",
   "license": "Apache-2.0",
@@ -35,7 +35,7 @@
     "vite-plugin-dts": "^3.7.3"
   },
   "dependencies": {
-    "@orbcharts/core": "^3.0.0-alpha.44",
+    "@orbcharts/core": "^3.0.0-alpha.46",
     "d3": "^7.8.5",
     "rxjs": "^7.8.1"
   }

package/src/multiGrid/plugins/MultiBarStack.ts

@@ -24,48 +24,52 @@ export const MultiBarStack = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_BAR
 
   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] = createBaseBarStack(pluginName, {
-          selection: gridSelection,
-          computedData$: d.computedData$,
-          visibleComputedData$: d.visibleComputedData$,
-          computedLayoutData$: d.computedLayoutData$,
-          visibleComputedLayoutData$: d.visibleComputedLayoutData$,
-          seriesLabels$: d.seriesLabels$,
-          SeriesDataMap$: d.SeriesDataMap$,
-          GroupDataMap$: d.GroupDataMap$,
-          fullParams$: observer.fullParams$,
-          fullDataFormatter$: d.dataFormatter$,
-          fullChartParams$: observer.fullChartParams$,
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridGraphicTransform$: d.gridGraphicTransform$,
-          gridGraphicReverseScale$: d.gridGraphicReverseScale$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridHighlight$: d.gridHighlight$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          isSeriesSeprate$,
-          event$: subject.event$ as Subject<any>,
+          unsubscribeFnArr[i] = createBaseBarStack(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            visibleComputedData$: d.visibleComputedData$,
+            computedLayoutData$: d.computedLayoutData$,
+            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            seriesLabels$: d.seriesLabels$,
+            SeriesDataMap$: d.SeriesDataMap$,
+            GroupDataMap$: d.GroupDataMap$,
+            fullParams$: observer.fullParams$,
+            fullDataFormatter$: d.dataFormatter$,
+            fullChartParams$: observer.fullChartParams$,
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridGraphicTransform$: d.gridGraphicTransform$,
+            gridGraphicReverseScale$: d.gridGraphicReverseScale$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridHighlight$: d.gridHighlight$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            isSeriesSeprate$,
+            event$: subject.event$ as Subject<any>,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)

package/src/multiGrid/plugins/MultiBars.ts

@@ -24,47 +24,51 @@ export const MultiBars = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_BARS_PA
 
   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] = createBaseBars(pluginName, {
-          selection: gridSelection,
-          computedData$: d.computedData$,
-          visibleComputedData$: d.visibleComputedData$,
-          computedLayoutData$: d.computedLayoutData$,
-          visibleComputedLayoutData$: d.visibleComputedLayoutData$,
-          seriesLabels$: d.seriesLabels$,
-          SeriesDataMap$: d.SeriesDataMap$,
-          GroupDataMap$: d.GroupDataMap$,
-          fullParams$: observer.fullParams$,
-          fullChartParams$: observer.fullChartParams$,
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridGraphicTransform$: d.gridGraphicTransform$,
-          gridGraphicReverseScale$: d.gridGraphicReverseScale$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridHighlight$: d.gridHighlight$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          isSeriesSeprate$,
-          event$: subject.event$ as Subject<any>,
+          unsubscribeFnArr[i] = createBaseBars(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            visibleComputedData$: d.visibleComputedData$,
+            computedLayoutData$: d.computedLayoutData$,
+            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            seriesLabels$: d.seriesLabels$,
+            SeriesDataMap$: d.SeriesDataMap$,
+            GroupDataMap$: d.GroupDataMap$,
+            fullParams$: observer.fullParams$,
+            fullChartParams$: observer.fullChartParams$,
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridGraphicTransform$: d.gridGraphicTransform$,
+            gridGraphicReverseScale$: d.gridGraphicReverseScale$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridHighlight$: d.gridHighlight$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            isSeriesSeprate$,
+            event$: subject.event$ as Subject<any>,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)

package/src/multiGrid/plugins/MultiBarsTriangle.ts

@@ -24,47 +24,51 @@ export const MultiBarsTriangle = defineMultiGridPlugin(pluginName, DEFAULT_MULTI
 
   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] = createBaseBarsTriangle(pluginName, {
-          selection: gridSelection,
-          computedData$: d.computedData$,
-          visibleComputedData$: d.visibleComputedData$,
-          computedLayoutData$: d.computedLayoutData$,
-          visibleComputedLayoutData$: d.visibleComputedLayoutData$,
-          seriesLabels$: d.seriesLabels$,
-          SeriesDataMap$: d.SeriesDataMap$,
-          GroupDataMap$: d.GroupDataMap$,
-          fullParams$: observer.fullParams$,
-          fullChartParams$: observer.fullChartParams$,
-          fullDataFormatter$: d.dataFormatter$,
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridGraphicTransform$: d.gridGraphicTransform$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridHighlight$: d.gridHighlight$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          isSeriesSeprate$: isSeriesSeprate$,
-          event$: subject.event$ as Subject<any>,
+          unsubscribeFnArr[i] = createBaseBarsTriangle(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            visibleComputedData$: d.visibleComputedData$,
+            computedLayoutData$: d.computedLayoutData$,
+            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            seriesLabels$: d.seriesLabels$,
+            SeriesDataMap$: d.SeriesDataMap$,
+            GroupDataMap$: d.GroupDataMap$,
+            fullParams$: observer.fullParams$,
+            fullChartParams$: observer.fullChartParams$,
+            fullDataFormatter$: d.dataFormatter$,
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridGraphicTransform$: d.gridGraphicTransform$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridHighlight$: d.gridHighlight$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            isSeriesSeprate$: isSeriesSeprate$,
+            event$: subject.event$ as Subject<any>,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)

package/src/multiGrid/plugins/MultiDots.ts

@@ -1,5 +1,6 @@
 import * as d3 from 'd3'
 import {
+  takeUntil,
   Subject } from 'rxjs'
 import {
   defineMultiGridPlugin } from '@orbcharts/core'
@@ -19,39 +20,43 @@ export const MultiDots = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_DOTS_PA
 
   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) => {
+
+          const gridSelection = d3.select(g[i])
 
-    selection.selectAll(`g.${gridClassName}`)
-      .data(data)
-      .join('g')
-      .attr('class', gridClassName)
-      .each((d, i, g) => {
-
-        const gridSelection = d3.select(g[i])
-
-        unsubscribeFnArr[i] = createBaseDots(pluginName, {
-          selection: gridSelection,
-          computedData$: d.computedData$,
-          visibleComputedData$: d.visibleComputedData$,
-          computedLayoutData$: d.computedLayoutData$,
-          visibleComputedLayoutData$: d.visibleComputedLayoutData$,
-          seriesLabels$: d.seriesLabels$,
-          SeriesDataMap$: d.SeriesDataMap$,
-          GroupDataMap$: d.GroupDataMap$,
-          fullParams$: observer.fullParams$,
-          fullChartParams$: observer.fullChartParams$,
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridGraphicTransform$: d.gridGraphicTransform$,
-          gridGraphicReverseScale$: d.gridGraphicReverseScale$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridHighlight$: d.gridHighlight$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          event$: subject.event$ as Subject<any>,
+          unsubscribeFnArr[i] = createBaseDots(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            visibleComputedData$: d.visibleComputedData$,
+            computedLayoutData$: d.computedLayoutData$,
+            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            seriesLabels$: d.seriesLabels$,
+            SeriesDataMap$: d.SeriesDataMap$,
+            GroupDataMap$: d.GroupDataMap$,
+            fullParams$: observer.fullParams$,
+            fullChartParams$: observer.fullChartParams$,
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridGraphicTransform$: d.gridGraphicTransform$,
+            gridGraphicReverseScale$: d.gridGraphicReverseScale$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridHighlight$: d.gridHighlight$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            event$: subject.event$ as Subject<any>,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)

package/src/multiGrid/plugins/MultiGroupAxis.ts

@@ -24,39 +24,43 @@ export const MultiGroupAxis = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_GR
 
   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] = createBaseGroupAxis(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] = createBaseGroupAxis(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/MultiLineAreas.ts

@@ -1,5 +1,6 @@
 import * as d3 from 'd3'
 import {
+  takeUntil,
   Subject } from 'rxjs'
 import {
   defineMultiGridPlugin } from '@orbcharts/core'
@@ -20,40 +21,44 @@ export const MultiLineAreas = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_LI
 
   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) => {
+
+          const gridSelection = d3.select(g[i])
 
-    selection.selectAll(`g.${gridClassName}`)
-      .data(data)
-      .join('g')
-      .attr('class', gridClassName)
-      .each((d, i, g) => {
-
-        const gridSelection = d3.select(g[i])
-
-        unsubscribeFnArr[i] = createBaseLineAreas(pluginName, {
-          selection: gridSelection,
-          computedData$: d.computedData$,
-          computedLayoutData$: d.computedLayoutData$,
-          visibleComputedData$: d.visibleComputedData$,
-          visibleComputedLayoutData$: d.visibleComputedLayoutData$,
-          seriesLabels$: d.seriesLabels$,
-          SeriesDataMap$: d.SeriesDataMap$,
-          GroupDataMap$: d.GroupDataMap$,
-          fullDataFormatter$: d.dataFormatter$,
-          fullParams$: observer.fullParams$,
-          fullChartParams$: observer.fullChartParams$,
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridGraphicTransform$: d.gridGraphicTransform$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridHighlight$: d.gridHighlight$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          layout$: observer.layout$,
-          event$: subject.event$ as Subject<any>,
+          unsubscribeFnArr[i] = createBaseLineAreas(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            computedLayoutData$: d.computedLayoutData$,
+            visibleComputedData$: d.visibleComputedData$,
+            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            seriesLabels$: d.seriesLabels$,
+            SeriesDataMap$: d.SeriesDataMap$,
+            GroupDataMap$: d.GroupDataMap$,
+            fullDataFormatter$: d.dataFormatter$,
+            fullParams$: observer.fullParams$,
+            fullChartParams$: observer.fullChartParams$,
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridGraphicTransform$: d.gridGraphicTransform$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridHighlight$: d.gridHighlight$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            layout$: observer.layout$,
+            event$: subject.event$ as Subject<any>,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)

package/src/multiGrid/plugins/MultiLines.ts

@@ -1,5 +1,6 @@
 import * as d3 from 'd3'
 import {
+  takeUntil,
   Subject } from 'rxjs'
 import {
   defineMultiGridPlugin } from '@orbcharts/core'
@@ -20,39 +21,43 @@ export const MultiLines = defineMultiGridPlugin(pluginName, DEFAULT_MULTI_LINES_
 
   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) => {
+
+          const gridSelection = d3.select(g[i])
 
-    selection.selectAll(`g.${gridClassName}`)
-      .data(data)
-      .join('g')
-      .attr('class', gridClassName)
-      .each((d, i, g) => {
-
-        const gridSelection = d3.select(g[i])
-
-        unsubscribeFnArr[i] = createBaseLines(pluginName, {
-          selection: gridSelection,
-          computedData$: d.computedData$,
-          computedLayoutData$: d.computedLayoutData$,
-          visibleComputedData$: d.visibleComputedData$,
-          visibleComputedLayoutData$: d.visibleComputedLayoutData$,
-          seriesLabels$: d.seriesLabels$,
-          SeriesDataMap$: d.SeriesDataMap$,
-          GroupDataMap$: d.GroupDataMap$,
-          fullDataFormatter$: d.dataFormatter$,
-          fullParams$: observer.fullParams$,
-          fullChartParams$: observer.fullChartParams$,
-          gridAxesTransform$: d.gridAxesTransform$,
-          gridGraphicTransform$: d.gridGraphicTransform$,
-          gridAxesSize$: d.gridAxesSize$,
-          gridHighlight$: d.gridHighlight$,
-          gridContainerPosition$: d.gridContainerPosition$,
-          event$: subject.event$ as Subject<any>,
+          unsubscribeFnArr[i] = createBaseLines(pluginName, {
+            selection: gridSelection,
+            computedData$: d.computedData$,
+            computedLayoutData$: d.computedLayoutData$,
+            visibleComputedData$: d.visibleComputedData$,
+            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            seriesLabels$: d.seriesLabels$,
+            SeriesDataMap$: d.SeriesDataMap$,
+            GroupDataMap$: d.GroupDataMap$,
+            fullDataFormatter$: d.dataFormatter$,
+            fullParams$: observer.fullParams$,
+            fullChartParams$: observer.fullChartParams$,
+            gridAxesTransform$: d.gridAxesTransform$,
+            gridGraphicTransform$: d.gridGraphicTransform$,
+            gridAxesSize$: d.gridAxesSize$,
+            gridHighlight$: d.gridHighlight$,
+            gridContainerPosition$: d.gridContainerPosition$,
+            event$: subject.event$ as Subject<any>,
+          })
         })
-      })
-  })
+    })
 
   return () => {
     destroy$.next(undefined)