@orbcharts/plugins-basic 3.0.0-alpha.49 → 3.0.0-alpha.51

package/src/noneData/plugins/Tooltip.ts

@@ -1,311 +1,311 @@
-import * as d3 from 'd3'
-import {
-  combineLatest,
-  map,
-  merge,
-  filter,
-  switchMap,
-  first,
-  iif,
-  takeUntil,
-  Subject, 
-  Observable,
-  distinctUntilChanged } from 'rxjs'
-import type {
-  EventTypeMap, PluginConstructor, ChartType } from '@orbcharts/core'
-import { defineNoneDataPlugin } from '@orbcharts/core'
-import { getSvgGElementSize, appendSvg } from '../../utils/d3Utils'
-import { getColor, getClassName } from '../../utils/orbchartsUtils'
-import { TOOLTIP_PARAMS } from '../defaults'
-import { textSizePxObservable } from '@orbcharts/core'
-
-interface TooltipStyle {
-  backgroundColor: string
-  backgroundOpacity: number
-  strokeColor: string
-  offset: [number, number]
-  padding: number
-  textColor: string
-  textSize: number | string // chartParams上的設定
-  textSizePx: number
-}
-
-const pluginName = 'Tooltip'
-const gClassName = getClassName(pluginName, 'g')
-const boxClassName = getClassName(pluginName, 'box')
-
-function textToSvg (textArr: string[], textStyle: TooltipStyle) {
-  const lineHeight = textStyle.textSizePx * 1.5
-  return textArr
-    .filter(d => d != '')
-    .map((text, i) => {
-      const top = i * lineHeight
-      return `<text font-size="${textStyle.textSize}" fill="${textStyle.textColor}" x="0" y="${top}" style="dominant-baseline:text-before-edge">${text}</text>`
-    })
-    .join()
-}
-
-function renderTooltip ({ rootSelection, pluginName, rootWidth, rootHeight, svgString, tooltipStyle, event  }: {
-  rootSelection: d3.Selection<any, unknown, any, unknown>
-  pluginName: string
-  rootWidth: number
-  rootHeight: number
-  svgString: string
-  tooltipStyle: TooltipStyle
-  event: MouseEvent
-}) {
-  // if (!svgString) {
-  //   return
-  // }
-  // const rootSelection = d3.select('svg.bpcharts__root')
-  // console.log('tooltip', { selection, rootWidth, rootHeight, svgString, event  })
-  rootSelection.interrupt('fadeout')
-  const radius = 5
-
-  // data（svg string無值則為空陣列）
-  const contentData = svgString ? [svgString] : []
-  const styleData = svgString ? [tooltipStyle] : []
-  // tooltipG <g>
-  const tooltipG = rootSelection
-    .selectAll<SVGGElement, string>(`g.${gClassName}`)
-    .data(contentData)
-    .join(
-      enter => {
-        return enter
-          .append('g')
-          .classed(gClassName, true)
-          .attr('pointer-events', 'none')
-      },
-      update => {
-        return update
-      },
-      exit => {
-        return exit
-          // .transition('fadeout')
-          // .duration(0)
-          // .delay(500)
-          .style('opacity', 0)
-          .remove()
-      }
-    )
-    .attr('transform', () => `translate(${event.offsetX}, ${event.offsetY})`)
-
-  // tooltipBox <g><g>
-  const tooltipBox = tooltipG
-    .selectAll<SVGGElement, string>(`g.${boxClassName}`)
-    .data(styleData)
-    .join(
-      enter => {
-        return enter
-          .append('g')
-          .classed(getClassName(pluginName, 'box'), true)
-      },
-    )
-
-  // rect <g><g><rect>
-  const rect = tooltipBox
-    .selectAll<SVGRectElement, string>('rect')
-    .data(styleData)
-    .join(
-      enter => {
-        return enter
-          .append('rect')
-          .attr('rx', radius)
-          .attr('ry', radius)
-      }
-    )
-    .attr('fill', d => d.backgroundColor)
-    .attr('stroke', d => d.strokeColor)
-    .attr('opacity', d => d.backgroundOpacity)
-
-  // text <g><g><g>
-  const contentG = tooltipBox
-    .selectAll<SVGGElement, string>('g')
-    .data(contentData)
-    .join(
-      enter => {
-        return enter
-          .append('g')
-          .classed(getClassName(pluginName, 'content'), true)
-          .attr('transform', () => `translate(${tooltipStyle.padding}, ${tooltipStyle.padding})`)
-      }
-    )
-  // 使用字串加入svg
-  if (contentData.length) {
-    appendSvg(contentG, contentData[0])
-  }
-  const contentSize = (contentG?.node()) ? getSvgGElementSize(contentG!) : { width: 0, height: 0 }
-
-  // rect size
-  rect
-    .attr('width', contentSize.width + tooltipStyle.padding * 2)
-    .attr('height', contentSize.height + tooltipStyle.padding * 2)
-
-  // -- tooltipG --
-  // 取得tooltip <g>的尺寸
-  const tooltipSize = (tooltipBox?.node()) ? getSvgGElementSize(tooltipBox!) : { width: 0, height: 0 }
-  // const minX = 0
-  const maxX = rootWidth - tooltipSize.width
-  // const minY = 0
-  const maxY = rootHeight - tooltipSize.height
-
-  // -- 相對游標位置的offset --
-  const offsetX = (event.offsetX + tooltipStyle.offset[0]) > maxX ? maxX - event.offsetX : tooltipStyle.offset[0]
-  const offsetY = (event.offsetY + tooltipStyle.offset[1]) > maxY ? maxY - event.offsetY : tooltipStyle.offset[1]
-  tooltipBox.attr('transform', d => `translate(${offsetX}, ${offsetY})`)
-  tooltipBox.attr('transform', d => `translate(${offsetX}, ${offsetY})`)
-
-
-
-  // const minX = containerSize.x
-  // const maxX = containerSize.x + containerSize.width - tooltipSize.width
-  // const minY = containerSize.y
-  // const maxY = containerSize.y + containerSize.height - tooltipSize.height
-  
-
-    // .style('position', 'absolute')
-    // .style('z-index', 10000)
-    // .style('left', (d) => {
-    //   const x = d.x + this.fullParams.offsetX! - containerSize.x
-    //   if (x < minX) {
-    //     return `${minX}px`
-    //   } else if (x > maxX) {
-    //     return `${maxX}px`
-    //   }
-    //   return `${x}px`
-    // })
-    // .style('top', (d) => {
-    //   const y = d.y + this.fullParams.offsetY! - containerSize.y
-    //   if (y < minY) {
-    //     return `${minY}px`
-    //   } else if (y > maxY) {
-    //     return `${maxY}px`
-    //   }
-    //   return `${y}px`
-    // })
-    // .html((d) => d.contentHtml)
-  
-
-}
-
-export const Tooltip: PluginConstructor<any, string, any> = defineNoneDataPlugin(pluginName, TOOLTIP_PARAMS)(({ selection, rootSelection, name, chartType, observer, subject }) => {
-  const destroy$ = new Subject()
-
-  // 事件觸發
-  const eventMouseover$: Observable<EventTypeMap<any>> = subject.event$.pipe(
-    takeUntil(destroy$),
-    filter(d => d.eventName === 'mouseover' || d.eventName === 'mousemove'),
-    // distinctUntilChanged((prev, current) => prev.eventName === current.eventName)
-    // map(d => d as EventTypeMap<typeof chartType>)
-  )
-  const eventMouseout$: Observable<EventTypeMap<any>> = subject.event$.pipe(
-    takeUntil(destroy$),
-    filter(d => d.eventName === 'mouseout'),
-    // distinctUntilChanged((prev, current) => prev.eventName === current.eventName)
-    // map(d => d as EventTypeMap<typeof chartType>)
-  )
-
-  const textSizePx$ = textSizePxObservable(observer.fullChartParams$)
-
-  const tooltipStyle$: Observable<TooltipStyle> = combineLatest({
-    fullChartParams: observer.fullChartParams$,
-    fullParams: observer.fullParams$,
-    textSizePx: textSizePx$
-  }).pipe(
-    takeUntil(destroy$),
-    switchMap(async d => d),
-    map(data => {
-      return {
-        backgroundColor: getColor(data.fullParams.backgroundColorType, data.fullChartParams),
-        backgroundOpacity: data.fullParams.backgroundOpacity,
-        strokeColor: getColor(data.fullParams.strokeColorType, data.fullChartParams),
-        offset: data.fullParams.offset,
-        padding: data.fullParams.padding,
-        textSize: data.fullChartParams.styles.textSize,
-        textSizePx: data.textSizePx,
-        textColor: getColor(data.fullParams.textColorType, data.fullChartParams),
-      }
-    })
-  )
-
-  const contentRenderFn$: Observable<((eventData: EventTypeMap<any>) => string)> = combineLatest({
-    fullParams: observer.fullParams$,
-    tooltipStyle: tooltipStyle$
-  }).pipe(
-    takeUntil(destroy$),
-    switchMap(async d => d),
-    map(d => {
-      if (d.fullParams.svgRenderFn) {
-        return d.fullParams.svgRenderFn
-      }
-      // 將textRenderFn回傳的資料使用<text>包裝起來
-      return (eventData: EventTypeMap<any>) => {
-        const textArr = d.fullParams.textRenderFn(eventData as any)
-        return textToSvg(textArr, d.tooltipStyle)
-      }
-    })
-  )
-
-  const mouseoverTooltipSvg$ = combineLatest({
-    event: eventMouseover$,
-    contentRenderFn: contentRenderFn$
-  }).pipe(
-    takeUntil(destroy$),
-    switchMap(async d => d),
-    map(d => d.contentRenderFn(d.event))
-  )
-
-  const mouseoutTooltipSvg$ = eventMouseout$.pipe(
-    takeUntil(destroy$),
-    map(d => '')
-  )
-
-  const event$ = merge(eventMouseover$, eventMouseout$)
-    .pipe(
-      takeUntil(destroy$),
-      // filter(d => {
-      //   return (d.eventName === 'mouseover' || d.eventName === 'mousemove' || d.eventName === 'mouseout')
-      //     && d.event != undefined
-      // }),
-      map(d => d.event!),
-    )
-
-  combineLatest({
-    svgString: merge(mouseoverTooltipSvg$, mouseoutTooltipSvg$),
-    event: event$,
-    layout: observer.layout$,
-    tooltipStyle: tooltipStyle$,
-  }).pipe(
-    takeUntil(destroy$),
-    switchMap(async d => d),
-  ).subscribe(data => {
-    // console.log('svgString', data.svgString)
-    renderTooltip({
-      rootSelection,
-      pluginName: name,
-      rootWidth: data.layout.rootWidth,
-      rootHeight: data.layout.rootHeight,
-      svgString: data.svgString,
-      tooltipStyle: data.tooltipStyle,
-      event: data.event
-    })
-  })
-
-
-
-  // const chartType$ = eventMouseover$.pipe(
-  //   takeUntil(destroy$),
-  //   map(d => d.type),
-  //   distinctUntilChanged()
-  // )
-  
-  
-  // eventMouseover$.subscribe(event => {
-    
-  // })
-  
-
-  return function unsubscribe () {
-    destroy$.next(undefined)
-  }
+import * as d3 from 'd3'
+import {
+  combineLatest,
+  map,
+  merge,
+  filter,
+  switchMap,
+  first,
+  iif,
+  takeUntil,
+  Subject, 
+  Observable,
+  distinctUntilChanged } from 'rxjs'
+import type {
+  EventTypeMap, PluginConstructor, ChartType } from '@orbcharts/core'
+import { defineNoneDataPlugin } from '@orbcharts/core'
+import { getSvgGElementSize, appendSvg } from '../../utils/d3Utils'
+import { getColor, getClassName } from '../../utils/orbchartsUtils'
+import { TOOLTIP_PARAMS } from '../defaults'
+import { textSizePxObservable } from '@orbcharts/core'
+
+interface TooltipStyle {
+  backgroundColor: string
+  backgroundOpacity: number
+  strokeColor: string
+  offset: [number, number]
+  padding: number
+  textColor: string
+  textSize: number | string // chartParams上的設定
+  textSizePx: number
+}
+
+const pluginName = 'Tooltip'
+const gClassName = getClassName(pluginName, 'g')
+const boxClassName = getClassName(pluginName, 'box')
+
+function textToSvg (textArr: string[], textStyle: TooltipStyle) {
+  const lineHeight = textStyle.textSizePx * 1.5
+  return textArr
+    .filter(d => d != '')
+    .map((text, i) => {
+      const top = i * lineHeight
+      return `<text font-size="${textStyle.textSize}" fill="${textStyle.textColor}" x="0" y="${top}" style="dominant-baseline:text-before-edge">${text}</text>`
+    })
+    .join()
+}
+
+function renderTooltip ({ rootSelection, pluginName, rootWidth, rootHeight, svgString, tooltipStyle, event  }: {
+  rootSelection: d3.Selection<any, unknown, any, unknown>
+  pluginName: string
+  rootWidth: number
+  rootHeight: number
+  svgString: string
+  tooltipStyle: TooltipStyle
+  event: MouseEvent
+}) {
+  // if (!svgString) {
+  //   return
+  // }
+  // const rootSelection = d3.select('svg.bpcharts__root')
+  // console.log('tooltip', { selection, rootWidth, rootHeight, svgString, event  })
+  rootSelection.interrupt('fadeout')
+  const radius = 5
+
+  // data（svg string無值則為空陣列）
+  const contentData = svgString ? [svgString] : []
+  const styleData = svgString ? [tooltipStyle] : []
+  // tooltipG <g>
+  const tooltipG = rootSelection
+    .selectAll<SVGGElement, string>(`g.${gClassName}`)
+    .data(contentData)
+    .join(
+      enter => {
+        return enter
+          .append('g')
+          .classed(gClassName, true)
+          .attr('pointer-events', 'none')
+      },
+      update => {
+        return update
+      },
+      exit => {
+        return exit
+          // .transition('fadeout')
+          // .duration(0)
+          // .delay(500)
+          .style('opacity', 0)
+          .remove()
+      }
+    )
+    .attr('transform', () => `translate(${event.offsetX}, ${event.offsetY})`)
+
+  // tooltipBox <g><g>
+  const tooltipBox = tooltipG
+    .selectAll<SVGGElement, string>(`g.${boxClassName}`)
+    .data(styleData)
+    .join(
+      enter => {
+        return enter
+          .append('g')
+          .classed(getClassName(pluginName, 'box'), true)
+      },
+    )
+
+  // rect <g><g><rect>
+  const rect = tooltipBox
+    .selectAll<SVGRectElement, string>('rect')
+    .data(styleData)
+    .join(
+      enter => {
+        return enter
+          .append('rect')
+          .attr('rx', radius)
+          .attr('ry', radius)
+      }
+    )
+    .attr('fill', d => d.backgroundColor)
+    .attr('stroke', d => d.strokeColor)
+    .attr('opacity', d => d.backgroundOpacity)
+
+  // text <g><g><g>
+  const contentG = tooltipBox
+    .selectAll<SVGGElement, string>('g')
+    .data(contentData)
+    .join(
+      enter => {
+        return enter
+          .append('g')
+          .classed(getClassName(pluginName, 'content'), true)
+          .attr('transform', () => `translate(${tooltipStyle.padding}, ${tooltipStyle.padding})`)
+      }
+    )
+  // 使用字串加入svg
+  if (contentData.length) {
+    appendSvg(contentG, contentData[0])
+  }
+  const contentSize = (contentG?.node()) ? getSvgGElementSize(contentG!) : { width: 0, height: 0 }
+
+  // rect size
+  rect
+    .attr('width', contentSize.width + tooltipStyle.padding * 2)
+    .attr('height', contentSize.height + tooltipStyle.padding * 2)
+
+  // -- tooltipG --
+  // 取得tooltip <g>的尺寸
+  const tooltipSize = (tooltipBox?.node()) ? getSvgGElementSize(tooltipBox!) : { width: 0, height: 0 }
+  // const minX = 0
+  const maxX = rootWidth - tooltipSize.width
+  // const minY = 0
+  const maxY = rootHeight - tooltipSize.height
+
+  // -- 相對游標位置的offset --
+  const offsetX = (event.offsetX + tooltipStyle.offset[0]) > maxX ? maxX - event.offsetX : tooltipStyle.offset[0]
+  const offsetY = (event.offsetY + tooltipStyle.offset[1]) > maxY ? maxY - event.offsetY : tooltipStyle.offset[1]
+  tooltipBox.attr('transform', d => `translate(${offsetX}, ${offsetY})`)
+  tooltipBox.attr('transform', d => `translate(${offsetX}, ${offsetY})`)
+
+
+
+  // const minX = containerSize.x
+  // const maxX = containerSize.x + containerSize.width - tooltipSize.width
+  // const minY = containerSize.y
+  // const maxY = containerSize.y + containerSize.height - tooltipSize.height
+  
+
+    // .style('position', 'absolute')
+    // .style('z-index', 10000)
+    // .style('left', (d) => {
+    //   const x = d.x + this.fullParams.offsetX! - containerSize.x
+    //   if (x < minX) {
+    //     return `${minX}px`
+    //   } else if (x > maxX) {
+    //     return `${maxX}px`
+    //   }
+    //   return `${x}px`
+    // })
+    // .style('top', (d) => {
+    //   const y = d.y + this.fullParams.offsetY! - containerSize.y
+    //   if (y < minY) {
+    //     return `${minY}px`
+    //   } else if (y > maxY) {
+    //     return `${maxY}px`
+    //   }
+    //   return `${y}px`
+    // })
+    // .html((d) => d.contentHtml)
+  
+
+}
+
+export const Tooltip: PluginConstructor<any, string, any> = defineNoneDataPlugin(pluginName, TOOLTIP_PARAMS)(({ selection, rootSelection, name, chartType, observer, subject }) => {
+  const destroy$ = new Subject()
+
+  // 事件觸發
+  const eventMouseover$: Observable<EventTypeMap<any>> = subject.event$.pipe(
+    takeUntil(destroy$),
+    filter(d => d.eventName === 'mouseover' || d.eventName === 'mousemove'),
+    // distinctUntilChanged((prev, current) => prev.eventName === current.eventName)
+    // map(d => d as EventTypeMap<typeof chartType>)
+  )
+  const eventMouseout$: Observable<EventTypeMap<any>> = subject.event$.pipe(
+    takeUntil(destroy$),
+    filter(d => d.eventName === 'mouseout'),
+    // distinctUntilChanged((prev, current) => prev.eventName === current.eventName)
+    // map(d => d as EventTypeMap<typeof chartType>)
+  )
+
+  const textSizePx$ = textSizePxObservable(observer.fullChartParams$)
+
+  const tooltipStyle$: Observable<TooltipStyle> = combineLatest({
+    fullChartParams: observer.fullChartParams$,
+    fullParams: observer.fullParams$,
+    textSizePx: textSizePx$
+  }).pipe(
+    takeUntil(destroy$),
+    switchMap(async d => d),
+    map(data => {
+      return {
+        backgroundColor: getColor(data.fullParams.backgroundColorType, data.fullChartParams),
+        backgroundOpacity: data.fullParams.backgroundOpacity,
+        strokeColor: getColor(data.fullParams.strokeColorType, data.fullChartParams),
+        offset: data.fullParams.offset,
+        padding: data.fullParams.padding,
+        textSize: data.fullChartParams.styles.textSize,
+        textSizePx: data.textSizePx,
+        textColor: getColor(data.fullParams.textColorType, data.fullChartParams),
+      }
+    })
+  )
+
+  const contentRenderFn$: Observable<((eventData: EventTypeMap<any>) => string)> = combineLatest({
+    fullParams: observer.fullParams$,
+    tooltipStyle: tooltipStyle$
+  }).pipe(
+    takeUntil(destroy$),
+    switchMap(async d => d),
+    map(d => {
+      if (d.fullParams.svgRenderFn) {
+        return d.fullParams.svgRenderFn
+      }
+      // 將textRenderFn回傳的資料使用<text>包裝起來
+      return (eventData: EventTypeMap<any>) => {
+        const textArr = d.fullParams.textRenderFn(eventData as any)
+        return textToSvg(textArr, d.tooltipStyle)
+      }
+    })
+  )
+
+  const mouseoverTooltipSvg$ = combineLatest({
+    event: eventMouseover$,
+    contentRenderFn: contentRenderFn$
+  }).pipe(
+    takeUntil(destroy$),
+    switchMap(async d => d),
+    map(d => d.contentRenderFn(d.event))
+  )
+
+  const mouseoutTooltipSvg$ = eventMouseout$.pipe(
+    takeUntil(destroy$),
+    map(d => '')
+  )
+
+  const event$ = merge(eventMouseover$, eventMouseout$)
+    .pipe(
+      takeUntil(destroy$),
+      // filter(d => {
+      //   return (d.eventName === 'mouseover' || d.eventName === 'mousemove' || d.eventName === 'mouseout')
+      //     && d.event != undefined
+      // }),
+      map(d => d.event!),
+    )
+
+  combineLatest({
+    svgString: merge(mouseoverTooltipSvg$, mouseoutTooltipSvg$),
+    event: event$,
+    layout: observer.layout$,
+    tooltipStyle: tooltipStyle$,
+  }).pipe(
+    takeUntil(destroy$),
+    switchMap(async d => d),
+  ).subscribe(data => {
+    // console.log('svgString', data.svgString)
+    renderTooltip({
+      rootSelection,
+      pluginName: name,
+      rootWidth: data.layout.rootWidth,
+      rootHeight: data.layout.rootHeight,
+      svgString: data.svgString,
+      tooltipStyle: data.tooltipStyle,
+      event: data.event
+    })
+  })
+
+
+
+  // const chartType$ = eventMouseover$.pipe(
+  //   takeUntil(destroy$),
+  //   map(d => d.type),
+  //   distinctUntilChanged()
+  // )
+  
+  
+  // eventMouseover$.subscribe(event => {
+    
+  // })
+  
+
+  return function unsubscribe () {
+    destroy$.next(undefined)
+  }
 })

package/src/noneData/types.ts

@@ -1,26 +1,26 @@
-import type { ColorType, ChartType, EventTypeMap, EventBase } from '@orbcharts/core'
-
-export interface ContainerPluginParams {
-  header: {
-    height: number
-    text: string[]
-    textStyle: string[]
-  }
-  footer: {
-    height: number
-    text: string[]
-    textStyle: string[]
-  }
-}
-
-export type TooltipParams = {
-  backgroundColorType: ColorType
-  backgroundOpacity: number
-  strokeColorType: ColorType
-  textColorType: ColorType
-  offset: [number, number]
-  padding: number
-  textRenderFn: <T extends ChartType> (eventData: EventTypeMap<T>) => string[]
-  svgRenderFn: (<T extends ChartType> (eventData: EventTypeMap<T>) => string) | null
-}
-
+import type { ColorType, ChartType, EventTypeMap, EventBase } from '@orbcharts/core'
+
+export interface ContainerPluginParams {
+  header: {
+    height: number
+    text: string[]
+    textStyle: string[]
+  }
+  footer: {
+    height: number
+    text: string[]
+    textStyle: string[]
+  }
+}
+
+export type TooltipParams = {
+  backgroundColorType: ColorType
+  backgroundOpacity: number
+  strokeColorType: ColorType
+  textColorType: ColorType
+  offset: [number, number]
+  padding: number
+  textRenderFn: <T extends ChartType> (eventData: EventTypeMap<T>) => string[]
+  svgRenderFn: (<T extends ChartType> (eventData: EventTypeMap<T>) => string) | null
+}
+