@orbcharts/plugins-basic 3.0.0-beta.4 → 3.0.0-beta.5

package/src/multiValue/plugins/XYZoom.ts

@@ -0,0 +1,300 @@
+import * as d3 from 'd3'
+import {
+  Observable,
+  combineLatest,
+  switchMap,
+  distinctUntilChanged,
+  first,
+  map, 
+  takeUntil,
+  debounceTime,
+  Subject } from 'rxjs'
+import type { DefinePluginConfig } from '../../../lib/core-types'
+import type { DataFormatterMultiValue } from '../../../lib/core-types'
+import {
+  defineMultiValuePlugin, createValueToAxisScale } from '../../../lib/core'
+import { DEFAULT_X_Y_ZOOM_PARAMS } from '../defaults'
+import { getClassName, getUniID } from '../../utils/orbchartsUtils'
+import { LAYER_INDEX_OF_ROOT } from '../../const'
+
+const pluginName = 'XYZoom'
+const rectClassName = getClassName(pluginName, 'rect')
+
+const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_X_Y_ZOOM_PARAMS> = {
+  name: pluginName,
+  defaultParams: DEFAULT_X_Y_ZOOM_PARAMS,
+  layerIndex: LAYER_INDEX_OF_ROOT,
+  validator: (params, { validateColumns }) => {
+    return {
+      status: 'success',
+      columnName: '',
+      expectToBe: ''
+    }
+  }
+}
+
+export const XYZoom = defineMultiValuePlugin(pluginConfig)(({ selection, rootSelection, name, observer, subject }) => {
+
+  const destroy$ = new Subject()
+
+  // const rootRectSelection: d3.Selection<SVGRectElement, any, any, any> = rootSelection
+  //   .append('rect')
+  //   .classed(rectClassName, true)
+  //   .attr('opacity', 0)
+
+  // 紀錄zoom最後一次的transform
+  let lastTransform = {
+    k: 1,
+    x: 0,
+    y: 0
+  }
+  // let lastDomain: [number, number] = [0, 0]
+
+  // observer.layout$.pipe(
+  //   takeUntil(destroy$),
+  // ).subscribe(d => {
+  //   rootRectSelection
+  //     .attr('width', d.width)
+  //     .attr('height', d.height)
+  //     .attr('x', d.left)
+  //     .attr('y', d.top)
+  // })
+
+  // const groupMax$ = observer.computedData$.pipe(
+  //   map(d => d[0] ? d[0].length - 1 : 0),
+  //   distinctUntilChanged()
+  // )
+
+  // const fullDataFormatterEvent$: Subject<DataFormatterMultiValue> = new Subject()
+  // fullDataFormatterEvent$
+  //   .pipe(
+  //     takeUntil(destroy$),
+  //     debounceTime(50)
+  //   )
+  //   .subscribe(fullDataFormatter => {
+  //     store.fullDataFormatter$.next(fullDataFormatter)
+  //   })
+
+  const initXAxis$ = observer.fullDataFormatter$.pipe(
+    map(d => d.xAxis),
+    // 只用第一次資料來計算scale才不會造成每次變動都受到影響
+    first()
+  )
+
+  const initYAxis$ = observer.fullDataFormatter$.pipe(
+    map(d => d.yAxis),
+    // 只用第一次資料來計算scale才不會造成每次變動都受到影響
+    first()
+  )
+
+
+  // const groupScale$ = combineLatest({
+  //   initXAxis: initXAxis$,
+  //   fullDataFormatter: observer.fullDataFormatter$,
+  //   groupMax: groupMax$,
+  //   layout: observer.layout$,
+  //   // axisSize: observer.gridAxesSize$
+  // }).pipe(
+  //   takeUntil(destroy$),
+  //   switchMap(async (d) => d),
+  //   map(data => {
+  //     // const groupMin = 0
+  //     const groupScaleDomainMin = data.initXAxis.scaleDomain[0] - data.initXAxis.scalePadding
+  //     const groupScaleDomainMax = data.initXAxis.scaleDomain[1] === 'max'
+  //       ? data.groupMax + data.initXAxis.scalePadding
+  //       : data.initXAxis.scaleDomain[1] as number + data.initXAxis.scalePadding
+
+  //     const groupScale: d3.ScaleLinear<number, number> = createValueToAxisScale({
+  //       maxValue: data.groupMax,
+  //       minValue: 0,
+  //       axisWidth: data.layout.width,
+  //       scaleDomain: [groupScaleDomainMin, groupScaleDomainMax],
+  //       scaleRange: [0, 1]
+  //     })
+
+  //     return groupScale
+  //   })
+  // )
+  const initXScale$: Observable<d3.ScaleLinear<number, number>> = new Observable(subscriber => {
+    combineLatest({
+      initXAxis: initXAxis$,
+      layout: observer.layout$,
+      minMaxXY: observer.minMaxXY$
+    }).pipe(
+      takeUntil(destroy$),
+      switchMap(async (d) => d),
+    ).subscribe(data => {
+    
+      const xScale: d3.ScaleLinear<number, number> = createValueToAxisScale({
+        maxValue: data.minMaxXY.maxX,
+        minValue: data.minMaxXY.minX,
+        axisWidth: data.layout.width,
+        scaleDomain: data.initXAxis.scaleDomain,
+        scaleRange: data.initXAxis.scaleRange,
+      })
+
+      subscriber.next(xScale)
+    })
+  })
+
+  const initYScale$: Observable<d3.ScaleLinear<number, number>> = new Observable(subscriber => {
+    combineLatest({
+      initYAxis: initYAxis$,
+      layout: observer.layout$,
+      minMaxXY: observer.minMaxXY$
+    }).pipe(
+      takeUntil(destroy$),
+      switchMap(async (d) => d),
+    ).subscribe(data => {
+    
+      const yScale: d3.ScaleLinear<number, number> = createValueToAxisScale({
+        maxValue: data.minMaxXY.maxY,
+        minValue: data.minMaxXY.minY,
+        axisWidth: data.layout.height,
+        scaleDomain: data.initYAxis.scaleDomain,
+        scaleRange: data.initYAxis.scaleRange,
+        reverse: true
+      })
+
+      subscriber.next(yScale)
+    })
+  })
+
+  const minMaxScaleDomain$ = combineLatest({
+    initXAxis: initXAxis$,
+    initYAxis: initYAxis$,
+    minMaxXY: observer.minMaxXY$
+  }).pipe(
+    takeUntil(destroy$),
+    switchMap(async (d) => d),
+    map(data => {
+      let minX = data.minMaxXY.minX
+      let maxX = data.minMaxXY.maxX
+      let minY = data.minMaxXY.minY
+      let maxY = data.minMaxXY.maxY
+
+      // 原始設定為auto時要額外判斷
+      if (data.initXAxis.scaleDomain[0] === 'auto' && minX > 0) {
+        minX = 0
+      }
+      if (data.initXAxis.scaleDomain[1] === 'auto' && maxX < 0) {
+        maxX = 0
+      }
+      if (data.initYAxis.scaleDomain[0] === 'auto' && minY > 0) {
+        minY = 0
+      }
+      if (data.initYAxis.scaleDomain[1] === 'auto' && maxY < 0) {
+        maxY = 0
+      }
+
+      return {
+        minX,
+        maxX,
+        minY,
+        maxY
+      }
+    }),
+  )
+
+  combineLatest({
+    initXScale: initXScale$,
+    // initXAxis: initXAxis$,
+    // fullDataFormatter: fullDataFormatter$.pipe(first()), // 只用第一次資料來計算scale才不會造成每次變動都受到影響
+    fullDataFormatter: observer.fullDataFormatter$,
+    // groupMax: groupMax$,
+    // minMaxXY: observer.minMaxXY$,
+    minMaxScaleDomain: minMaxScaleDomain$,
+    // layout: observer.layout$,
+    // axisSize: observer.gridAxesSize$
+  }).pipe(
+    takeUntil(destroy$),
+    switchMap(async (d) => d),
+  ).subscribe(data => {
+    // const groupMin = 0
+
+    const shadowScale = data.initXScale.copy()
+
+    const zoom = d3.zoom()
+      // .scaleExtent([1, data.groupMaxIndex])
+      // .translateExtent([[0, 0], [data.layout.rootWidth, data.layout.rootWidth]])
+      .on("zoom", function zoomed(event) {
+        // debugger
+        // console.log('event', event)
+        const t = event.transform;
+
+        // if (event.sourceEvent.type === 'mousemove') {
+        //   // 當進行平移時，反向計算 x 軸
+        //   const dx = event.transform.x - currentTransform.x; // 本次平移增量
+        //   const reversedX = currentTransform.x - dx;         // 反向累積平移
+        //   // 更新變換狀態
+        //   currentTransform = d3.zoomIdentity
+        //     .translate(reversedX, event.transform.y)
+        //     .scale(event.transform.k);
+        // } else {
+        //   // 縮放操作：只更新縮放比例
+        //   currentTransform = d3.zoomIdentity
+        //     .translate(currentTransform.x, currentTransform.y)
+        //     .scale(event.transform.k);
+        // }
+        // console.log('currentTransform', currentTransform)
+
+        // console.log('t.x', t.x)
+        const mapGroupindex = (d: number) => {
+          const n = Math.round(d)
+          return Math.min(data.minMaxScaleDomain.maxX, Math.max(data.minMaxScaleDomain.minX, n));
+        }
+        
+        const zoomedDomain = t.rescaleX(shadowScale)
+          .domain()
+          .map(mapGroupindex)
+
+
+        // domain超過極限值
+        if (zoomedDomain[0] <= data.minMaxScaleDomain.minX && zoomedDomain[1] >= data.minMaxScaleDomain.maxX) {
+          // 繼續縮小
+          if (t.k < lastTransform.k) {
+            // 維持前一次的transform
+            t.k = lastTransform.k
+            t.x = lastTransform.x
+            t.y = lastTransform.y
+          }
+        // domain間距小於1
+        } else if ((zoomedDomain[1] - zoomedDomain[0]) <= 1) {
+          // 繼續放大
+          if (t.k > lastTransform.k) {
+            // 維持前一次的transform
+            t.k = lastTransform.k
+            t.x = lastTransform.x
+            t.y = lastTransform.y
+          }
+        }
+
+        // 紀錄transform
+        lastTransform.k = t.k
+        lastTransform.x = t.x
+        lastTransform.y = t.y
+
+        // console.log(zoomedDomain)
+        const newDataFormatter: DataFormatterMultiValue = {
+          ...data.fullDataFormatter,
+          xAxis: {
+            ...data.fullDataFormatter.xAxis,
+            scaleDomain: zoomedDomain
+          }
+        }
+        subject.dataFormatter$.next(newDataFormatter)
+      })
+
+    // 傳入外層selection
+    // subject.selection.call(zoom as any)
+    rootSelection.call(zoom)
+
+  })
+  
+  return () => {
+    destroy$.next(undefined)
+    // rootRectSelection.remove()
+    
+    rootSelection.call(d3.zoom().on('zoom', null))
+  }
+})

package/src/noneData/defaults.ts

@@ -1,103 +1,103 @@
-import type { ContainerPluginParams, TooltipParams } from '../../lib/plugins-basic-types'
-import type { EventTypeMap, EventBaseSeriesValue, EventBaseGridValue, EventBaseCategoryValue } from '../../lib/core-types'
-
-export const CONTAINER_PLUGIN_PARAMS: ContainerPluginParams = {
-  header: {
-    height: 36,
-    text: [],
-    textStyle: []
-  },
-  footer: {
-    height: 0,
-    text: [],
-    textStyle: []
-  }
-}
-
-export const TOOLTIP_PARAMS: TooltipParams = {
-  backgroundColorType: 'background',
-  strokeColorType: 'primary',
-  backgroundOpacity: 0.8,
-  textColorType: 'primary',
-  offset: [20, 5],
-  padding: 10,
-  textRenderFn: (eventData) => {
-    if (eventData.highlightTarget === 'datum' && eventData.datum) {
-      return [`${(eventData as EventTypeMap<'series'>).datum.label}: ${(eventData as EventTypeMap<'series'>).datum.value}`]
-    } else if (eventData.highlightTarget === 'series') {
-      const label = (eventData as EventBaseSeriesValue).seriesLabel
-      const valueArr = (eventData as EventBaseSeriesValue).series
-        .filter(d => d.visible == true)
-        .map(d => {
-          return d.value
-        })
-      const value = valueArr.length > 5
-        ? valueArr.slice(0, 5).join(',') + '...'
-        : valueArr.join(',')
-      return [label, value]
-    } else if (eventData.highlightTarget === 'group') {
-      const label = (eventData as EventBaseGridValue<'grid'>).groupLabel
-      const valueArr = (eventData as EventBaseGridValue<'grid'>).series
-        .filter(d => d.visible == true)
-        .map(d => {
-          return d.value
-        })
-      const value = valueArr.length > 5
-        ? valueArr.slice(0, 5).join(',') + '...'
-        : valueArr.join(',')
-      return [label, value]
-    } else if (eventData.highlightTarget === 'category') {
-      const label = (eventData as EventBaseCategoryValue<any>).categoryLabel
-      const valueArr = (eventData as EventBaseCategoryValue<'multiValue'>).category
-        .filter(d => d.visible == true)
-        .map(d => {
-          return d.value
-        })
-      const value = valueArr.length > 5
-        ? valueArr.slice(0, 5).join(',') + '...'
-        : valueArr.join(',')
-      return [label, value]
-    }
-    return []
-  },
-  svgRenderFn: null
-}
-TOOLTIP_PARAMS.textRenderFn.toString = () => `(eventData) => {
-  if (eventData.highlightTarget === 'datum' && eventData.datum) {
-    return [\`\${eventData.datum.label}: \${eventData.datum.value}\`]
-  } else if (eventData.highlightTarget === 'series') {
-    const label = (eventData as EventBaseSeriesValue<any, any>).seriesLabel
-    const valueArr = (eventData as EventBaseSeriesValue<any, any>).series
-      .filter(d => d.visible == true)
-      .map(d => {
-        return d.value
-      })
-    const value = valueArr.length > 5
-      ? valueArr.slice(0, 5).join(',') + '...'
-      : valueArr.join(',')
-    return [label, value]
-  } else if (eventData.highlightTarget === 'group') {
-    const label = (eventData as EventBaseGridValue<any, any>).groupLabel
-    const valueArr = (eventData as EventBaseGridValue<any, any>).series
-      .filter(d => d.visible == true)
-      .map(d => {
-        return d.value
-      })
-    const value = valueArr.length > 5
-      ? valueArr.slice(0, 5).join(',') + '...'
-      : valueArr.join(',')
-    return [label, value]
-  } else if (eventData.highlightTarget === 'category') {
-    const label = (eventData as EventBaseCategoryValue<any, any>).categoryLabel
-    const valueArr = (eventData as EventBaseCategoryValue<any, any>).category
-      .filter(d => d.visible == true)
-      .map(d => {
-        return d.value
-      })
-    const value = valueArr.length > 5
-      ? valueArr.slice(0, 5).join(',') + '...'
-      : valueArr.join(',')
-    return [label, value]
-  }
-  return []
+import type { ContainerPluginParams, TooltipParams } from '../../lib/plugins-basic-types'
+import type { EventTypeMap, EventBaseSeriesValue, EventBaseGridValue, EventBaseCategoryValue } from '../../lib/core-types'
+
+export const CONTAINER_PLUGIN_PARAMS: ContainerPluginParams = {
+  header: {
+    height: 36,
+    text: [],
+    textStyle: []
+  },
+  footer: {
+    height: 0,
+    text: [],
+    textStyle: []
+  }
+}
+
+export const TOOLTIP_PARAMS: TooltipParams = {
+  backgroundColorType: 'background',
+  strokeColorType: 'primary',
+  backgroundOpacity: 0.8,
+  textColorType: 'primary',
+  offset: [20, 5],
+  padding: 10,
+  textRenderFn: (eventData) => {
+    if (eventData.highlightTarget === 'datum' && eventData.datum) {
+      return [`${(eventData as EventTypeMap<'series'>).datum.label}: ${(eventData as EventTypeMap<'series'>).datum.value}`]
+    } else if (eventData.highlightTarget === 'series') {
+      const label = (eventData as EventBaseSeriesValue).seriesLabel
+      const valueArr = (eventData as EventBaseSeriesValue).series
+        .filter(d => d.visible == true)
+        .map(d => {
+          return d.value
+        })
+      const value = valueArr.length > 5
+        ? valueArr.slice(0, 5).join(',') + '...'
+        : valueArr.join(',')
+      return [label, value]
+    } else if (eventData.highlightTarget === 'group') {
+      const label = (eventData as EventBaseGridValue<'grid'>).groupLabel
+      const valueArr = (eventData as EventBaseGridValue<'grid'>).series
+        .filter(d => d.visible == true)
+        .map(d => {
+          return d.value
+        })
+      const value = valueArr.length > 5
+        ? valueArr.slice(0, 5).join(',') + '...'
+        : valueArr.join(',')
+      return [label, value]
+    } else if (eventData.highlightTarget === 'category') {
+      const label = (eventData as EventBaseCategoryValue<any>).categoryLabel
+      const valueArr = (eventData as EventBaseCategoryValue<'multiValue'>).category
+        .filter(d => d.visible == true)
+        .map(d => {
+          return d.value
+        })
+      const value = valueArr.length > 5
+        ? valueArr.slice(0, 5).join(',') + '...'
+        : valueArr.join(',')
+      return [label, value]
+    }
+    return []
+  },
+  svgRenderFn: null
+}
+TOOLTIP_PARAMS.textRenderFn.toString = () => `(eventData) => {
+  if (eventData.highlightTarget === 'datum' && eventData.datum) {
+    return [\`\${eventData.datum.label}: \${eventData.datum.value}\`]
+  } else if (eventData.highlightTarget === 'series') {
+    const label = (eventData as EventBaseSeriesValue<any, any>).seriesLabel
+    const valueArr = (eventData as EventBaseSeriesValue<any, any>).series
+      .filter(d => d.visible == true)
+      .map(d => {
+        return d.value
+      })
+    const value = valueArr.length > 5
+      ? valueArr.slice(0, 5).join(',') + '...'
+      : valueArr.join(',')
+    return [label, value]
+  } else if (eventData.highlightTarget === 'group') {
+    const label = (eventData as EventBaseGridValue<any, any>).groupLabel
+    const valueArr = (eventData as EventBaseGridValue<any, any>).series
+      .filter(d => d.visible == true)
+      .map(d => {
+        return d.value
+      })
+    const value = valueArr.length > 5
+      ? valueArr.slice(0, 5).join(',') + '...'
+      : valueArr.join(',')
+    return [label, value]
+  } else if (eventData.highlightTarget === 'category') {
+    const label = (eventData as EventBaseCategoryValue<any, any>).categoryLabel
+    const valueArr = (eventData as EventBaseCategoryValue<any, any>).category
+      .filter(d => d.visible == true)
+      .map(d => {
+        return d.value
+      })
+    const value = valueArr.length > 5
+      ? valueArr.slice(0, 5).join(',') + '...'
+      : valueArr.join(',')
+    return [label, value]
+  }
+  return []
 }`

package/src/noneData/index.ts

@@ -1,4 +1,4 @@
-export * from './defaults'
-// export * from './types'
-// export { Container } from './plugins/Container'
+export * from './defaults'
+// export * from './types'
+// export { Container } from './plugins/Container'
 // export { Tooltip } from './plugins/Tooltip'

package/src/noneData/plugins/Container.ts

@@ -1,28 +1,28 @@
-import * as d3 from 'd3'
-import type { DefinePluginConfig } from '../../../lib/core-types'
-import {
-  defineNoneDataPlugin } from '../../../lib/core'
-import { CONTAINER_PLUGIN_PARAMS } from '../defaults'
-import { LAYER_INDEX_OF_BG } from '../../const'
-
-const pluginName = 'Container'
-
-const pluginConfig: DefinePluginConfig<typeof pluginName, typeof CONTAINER_PLUGIN_PARAMS> = {
-  name: pluginName,
-  defaultParams: CONTAINER_PLUGIN_PARAMS,
-  layerIndex: LAYER_INDEX_OF_BG,
-  validator: (params, { validateColumns }) => {
-    return {
-      status: 'success',
-      columnName: '',
-      expectToBe: '',
-    }
-  }
-}
-
-export const Container = defineNoneDataPlugin(pluginConfig)(({ selection }) => {
-  
-  return function unsubscribe () {
-    
-  }
+import * as d3 from 'd3'
+import type { DefinePluginConfig } from '../../../lib/core-types'
+import {
+  defineNoneDataPlugin } from '../../../lib/core'
+import { CONTAINER_PLUGIN_PARAMS } from '../defaults'
+import { LAYER_INDEX_OF_BG } from '../../const'
+
+const pluginName = 'Container'
+
+const pluginConfig: DefinePluginConfig<typeof pluginName, typeof CONTAINER_PLUGIN_PARAMS> = {
+  name: pluginName,
+  defaultParams: CONTAINER_PLUGIN_PARAMS,
+  layerIndex: LAYER_INDEX_OF_BG,
+  validator: (params, { validateColumns }) => {
+    return {
+      status: 'success',
+      columnName: '',
+      expectToBe: '',
+    }
+  }
+}
+
+export const Container = defineNoneDataPlugin(pluginConfig)(({ selection }) => {
+  
+  return function unsubscribe () {
+    
+  }
 })