@orbcharts/plugins-basic 3.0.0-beta.8 → 3.0.0

package/src/multiGrid/plugins/MultiGridLegend.ts

@@ -88,18 +88,28 @@ export const MultiGridLegend = defineMultiGridPlugin(pluginConfig)(({ selection,
   
   const destroy$ = new Subject()
 
+  // const seriesLabels$ = observer.multiGridEachDetail$.pipe(
+  //   takeUntil(destroy$),
+  //   map(multiGrid => {
+  //     const seriesLabelsObservableArr = multiGrid.map((grid, gridIndex) => {
+  //       return grid.SeriesDataMap$.pipe(
+  //         // grid內的seriesLabels
+  //         map(seriesDataMap => Array.from(seriesDataMap.keys()))
+  //       )
+  //     })
+  //     return seriesLabelsObservableArr
+  //   }),
+  //   switchMap(seriesLabelsObservableArr => combineLatest(seriesLabelsObservableArr)),
+  //   map(data => data.flat())
+  // )
+
   const seriesLabels$ = observer.multiGridEachDetail$.pipe(
-    takeUntil(destroy$),
-    map(multiGrid => {
-      const seriesLabelsObservableArr = multiGrid.map((grid, gridIndex) => {
-        return grid.SeriesDataMap$.pipe(
-          // grid內的seriesLabels
-          map(seriesDataMap => Array.from(seriesDataMap.keys()))
-        )
-      })
-      return seriesLabelsObservableArr
+    map(multiGridEachDetail => multiGridEachDetail.map(grid => grid.seriesLabels$)),
+    switchMap(d => {
+      return combineLatest(d).pipe(
+        switchMap(async d => d),
+      )
     }),
-    switchMap(seriesLabelsObservableArr => combineLatest(seriesLabelsObservableArr)),
     map(data => data.flat())
   )
 

package/src/multiGrid/plugins/MultiLineAreas.ts

@@ -79,9 +79,9 @@ export const MultiLineAreas = defineMultiGridPlugin(pluginConfig)(({ selection,
           unsubscribeFnArr[i] = createBaseLineAreas(pluginName, {
             selection: gridSelection,
             computedData$: d.computedData$,
-            computedLayoutData$: d.computedLayoutData$,
+            computedAxesData$: d.computedAxesData$,
             visibleComputedData$: d.visibleComputedData$,
-            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            visibleComputedAxesData$: d.visibleComputedAxesData$,
             seriesLabels$: d.seriesLabels$,
             SeriesDataMap$: d.SeriesDataMap$,
             GroupDataMap$: d.GroupDataMap$,
@@ -91,7 +91,7 @@ export const MultiLineAreas = defineMultiGridPlugin(pluginConfig)(({ selection,
             gridAxesTransform$: d.gridAxesTransform$,
             gridGraphicTransform$: d.gridGraphicTransform$,
             gridAxesSize$: d.gridAxesSize$,
-            gridHighlight$: d.gridHighlight$,
+            gridHighlight$: observer.multiGridHighlight$,
             gridContainerPosition$: d.gridContainerPosition$,
             allContainerPosition$: allContainerPosition$,
             layout$: observer.layout$,

package/src/multiGrid/plugins/MultiLines.ts

@@ -73,9 +73,9 @@ export const MultiLines = defineMultiGridPlugin(pluginConfig)(({ selection, root
           unsubscribeFnArr[i] = createBaseLines(pluginName, {
             selection: gridSelection,
             computedData$: d.computedData$,
-            computedLayoutData$: d.computedLayoutData$,
+            computedAxesData$: d.computedAxesData$,
             visibleComputedData$: d.visibleComputedData$,
-            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            visibleComputedAxesData$: d.visibleComputedAxesData$,
             seriesLabels$: d.seriesLabels$,
             SeriesDataMap$: d.SeriesDataMap$,
             GroupDataMap$: d.GroupDataMap$,
@@ -85,7 +85,7 @@ export const MultiLines = defineMultiGridPlugin(pluginConfig)(({ selection, root
             gridAxesTransform$: d.gridAxesTransform$,
             gridGraphicTransform$: d.gridGraphicTransform$,
             gridAxesSize$: d.gridAxesSize$,
-            gridHighlight$: d.gridHighlight$,
+            gridHighlight$: observer.multiGridHighlight$,
             gridContainerPosition$: d.gridContainerPosition$,
             allContainerPosition$,
             layout$: observer.layout$,

package/src/multiGrid/plugins/{MultiStackedBar.ts → MultiStackedBars.ts}

@@ -9,19 +9,19 @@ import {
 import type { DefinePluginConfig } from '../../../lib/core-types'
 import {
   defineMultiGridPlugin } from '../../../lib/core'
-import { DEFAULT_MULTI_STACKED_BAR_PARAMS } from '../defaults'
-import { createBaseStackedBar } from '../../base/BaseStackedBar'
+import { DEFAULT_MULTI_STACKED_BARS_PARAMS } from '../defaults'
+import { createBaseStackedBars } from '../../base/BaseStackedBars'
 import { multiGridPluginDetailObservables } from '../multiGridObservables'
 import { getClassName, getUniID } from '../../utils/orbchartsUtils'
 import { LAYER_INDEX_OF_GRAPHIC } from '../../const'
 
-const pluginName = 'MultiStackedBar'
+const pluginName = 'MultiStackedBars'
 
 const gridClassName = getClassName(pluginName, 'grid')
 
-const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_STACKED_BAR_PARAMS> = {
+const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_STACKED_BARS_PARAMS> = {
   name: pluginName,
-  defaultParams: DEFAULT_MULTI_STACKED_BAR_PARAMS,
+  defaultParams: DEFAULT_MULTI_STACKED_BARS_PARAMS,
   layerIndex: LAYER_INDEX_OF_GRAPHIC,
   validator: (params, { validateColumns }) => {
     const result = validateColumns(params, {
@@ -45,7 +45,7 @@ const pluginConfig: DefinePluginConfig<typeof pluginName, typeof DEFAULT_MULTI_S
   }
 }
 
-export const MultiStackedBar = defineMultiGridPlugin(pluginConfig)(({ selection, name, subject, observer }) => {
+export const MultiStackedBars = defineMultiGridPlugin(pluginConfig)(({ selection, name, subject, observer }) => {
   const destroy$ = new Subject()
 
   const unsubscribeFnArr: (() => void)[] = []
@@ -75,12 +75,12 @@ export const MultiStackedBar = defineMultiGridPlugin(pluginConfig)(({ selection,
             shareReplay(1)
           )
 
-          unsubscribeFnArr[i] = createBaseStackedBar(pluginName, {
+          unsubscribeFnArr[i] = createBaseStackedBars(pluginName, {
             selection: gridSelection,
             computedData$: d.computedData$,
             visibleComputedData$: d.visibleComputedData$,
-            computedLayoutData$: d.computedLayoutData$,
-            visibleComputedLayoutData$: d.visibleComputedLayoutData$,
+            computedAxesData$: d.computedAxesData$,
+            visibleComputedAxesData$: d.visibleComputedAxesData$,
             seriesLabels$: d.seriesLabels$,
             SeriesDataMap$: d.SeriesDataMap$,
             GroupDataMap$: d.GroupDataMap$,
@@ -91,7 +91,7 @@ export const MultiStackedBar = defineMultiGridPlugin(pluginConfig)(({ selection,
             gridGraphicTransform$: d.gridGraphicTransform$,
             gridGraphicReverseScale$: d.gridGraphicReverseScale$,
             gridAxesSize$: d.gridAxesSize$,
-            gridHighlight$: d.gridHighlight$,
+            gridHighlight$: observer.multiGridHighlight$,
             gridContainerPosition$: d.gridContainerPosition$,
             isSeriesSeprate$,
             event$: subject.event$ as Subject<any>,

package/src/multiGrid/plugins/OverlappingStackedValueAxes.ts

@@ -19,6 +19,7 @@ import { createBaseValueAxis } from '../../base/BaseValueAxis'
 import { multiGridPluginDetailObservables } from '../multiGridObservables'
 import { getClassName, getUniID } from '../../utils/orbchartsUtils'
 import { gridAxesTransformObservable, gridAxesReverseTransformObservable, gridContainerPositionObservable } from '../../../lib/core'
+// import { gridAxesTransformObservable, gridAxesReverseTransformObservable, gridContainerPositionObservable } from '@orbcharts/core/src'
 import { LAYER_INDEX_OF_AXIS } from '../../const'
 
 const pluginName = 'OverlappingStackedValueAxes'

package/src/multiValue/defaults.ts

@@ -1,11 +1,16 @@
+import type { ComputedDataTypeMap } from '../../lib/core-types'
 import type {
   MultiValueLegendParams,
   MultiValueTooltipParams,
+  RacingBarsParams,
+  RacingCounterTextsParams,
+  RacingValueAxisParams,
   ScatterParams,
   ScatterBubblesParams,
+  XAxisParams,
   XYAuxParams,
   XYAxesParams,
-  XYZoomParams
+  XZoomParams
 } from '../../lib/plugins-basic-types'
 
 
@@ -35,6 +40,7 @@ export const DEFAULT_MULTI_VALUE_TOOLTIP_PARAMS: MultiValueTooltipParams = {
   renderFn: (eventData, { styles, utils }) => {
     const hasCategoryLabel = eventData.categoryLabel === '' ? false : true
     const hasDatumLabel = eventData.datum.label.slice(0, 11) === 'multiValue_' ? false : true
+    const valueText = eventData.datum._visibleValue.map(d => utils.toCurrency(d))
     const bulletWidth = styles.textSizePx * 0.7
     const offset = (styles.textSizePx / 2) - (bulletWidth / 2)
     const categorySvg = hasCategoryLabel
@@ -47,7 +53,7 @@ export const DEFAULT_MULTI_VALUE_TOOLTIP_PARAMS: MultiValueTooltipParams = {
       ? `<tspan>${eventData.datum.label}</tspan>  `
       : ''
     const datumSvg = `<text font-size="${styles.textSizePx}" dominant-baseline="hanging" fill="${styles.textColor}">
-    ${datumLabelSvg}<tspan font-weight="bold">${eventData.datum.value}</tspan>
+    ${datumLabelSvg}<tspan font-weight="bold">${valueText}</tspan>
   </text>`
 
     return `${categorySvg}
@@ -59,6 +65,7 @@ export const DEFAULT_MULTI_VALUE_TOOLTIP_PARAMS: MultiValueTooltipParams = {
 DEFAULT_MULTI_VALUE_TOOLTIP_PARAMS.renderFn.toString = () => `(eventData, { styles, utils }) => {
     const hasCategoryLabel = eventData.categoryLabel === '' ? false : true
     const hasDatumLabel = eventData.datum.label.slice(0, 11) === 'multiValue_' ? false : true
+    const valueText = eventData.datum._visibleValue.map(d => utils.toCurrency(d))
     const bulletWidth = styles.textSizePx * 0.7
     const offset = (styles.textSizePx / 2) - (bulletWidth / 2)
     const categorySvg = hasCategoryLabel
@@ -71,7 +78,7 @@ DEFAULT_MULTI_VALUE_TOOLTIP_PARAMS.renderFn.toString = () => `(eventData, { styl
       ? \`<tspan>\${eventData.datum.label}</tspan>  \`
       : ''
     const datumSvg = \`<text font-size="\${styles.textSizePx}" dominant-baseline="hanging" fill="\${styles.textColor}">
-    \${datumLabelSvg}<tspan font-weight="bold">\${eventData.datum.value}</tspan>
+    \${datumLabelSvg}<tspan font-weight="bold">\${valueText}</tspan>
   </text>\`
 
     return \`\${categorySvg}
@@ -80,6 +87,132 @@ DEFAULT_MULTI_VALUE_TOOLTIP_PARAMS.renderFn.toString = () => `(eventData, { styl
   </g>\`
 }`
 
+// export const DEFAULT_RANKING_AXIS_PARAMS: RacingAxisParams = {
+//   labelOffset: [0, 0],
+//   labelColorType: 'primary',
+//   axisLineVisible: false,
+//   axisLineColorType: 'primary',
+//   // ticks: null,
+//   // tickFormat: v => v,
+//   tickLineVisible: true,
+//   tickPadding: 20,
+//   // tickFullLine: true,
+//   // tickFullLineDasharray: 'none',
+//   tickColorType: 'secondary',
+//   tickTextRotate: 0,
+//   tickTextColorType: 'primary'
+// }
+
+export const DEFAULT_RACING_BARS_PARAMS: RacingBarsParams = {
+  bar: {
+    barWidth: 0,
+    barPadding: 8,
+    barRadius: false,
+  },
+  barLabel: {
+    position: 'inside',
+    padding: 20,
+    rotate: 0,
+    colorType: 'labelContrast'
+  },
+  valueLabel: {
+    padding: 20,
+    colorType: 'primary',
+    // format: num => {
+    //   if (num === null || Number.isNaN(num) == true) {
+    //     return num || 0
+    //   }
+    //   const parts = num.toString().split('.')
+    //   parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    //   return parts.join('.')
+    // }
+    format: v => v
+  },
+  axisLabel: {
+    offset: [0, 0],
+    colorType: 'primary'
+  },
+  // rankingAmount: 'auto'
+  rankingAmount: 10,
+  autorun: false,
+  loop: false
+}
+// DEFAULT_RACING_BARS_PARAMS.valueLabel.format.toString = () => `num => {
+//     if (num === null || Number.isNaN(num) == true) {
+//       return num || 0
+//     }
+//     const parts = num.toString().split('.')
+//     parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+//     return parts.join('.')
+//   }
+// }`
+DEFAULT_RACING_BARS_PARAMS.valueLabel.format.toString = () => `v => v`
+
+export const DEFAULT_RACING_COUNTER_TEXTS_PARAMS: RacingCounterTextsParams = {
+  renderFn: (valueLabel: string, valueIndex: number, data: ComputedDataTypeMap<'multiValue'>) => {
+    return valueLabel
+  },
+  textAttrs: [
+    {
+      "transform": "translate(0, 0)"
+    }
+  ],
+  textStyles: [
+    {
+      "font-weight": "bold",
+      "text-anchor": "end",
+      "pointer-events": "none",
+      "dominant-baseline": "auto",
+      "font-size": 64,
+      "fill": "#bebebe"
+    },
+    {
+      "text-anchor": "end",
+      "pointer-events": "none",
+      "dominant-baseline": "auto",
+      "font-size": 24,
+      "fill": "#bebebe"
+    },
+  ],
+  paddingRight: 0,
+  paddingBottom: 0
+}
+DEFAULT_RACING_COUNTER_TEXTS_PARAMS.renderFn.toString = () => `(valueLabel, valueIndex, data) => {
+  return valueLabel
+}`
+
+export const DEFAULT_RACING_VALUE_AXIS_PARAMS: RacingValueAxisParams = {
+  labelOffset: [0, 0],
+  labelColorType: 'primary',
+  axisLineVisible: false,
+  axisLineColorType: 'secondary',
+  ticks: null,
+  // tickFormat: ',.0f',
+  // tickFormat: v => v,
+  tickFormat: num => {
+    if (num === null || Number.isNaN(num) == true) {
+      return num || 0
+    }
+    const parts = num.toString().split('.')
+    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    return parts.join('.')
+  },
+  tickLineVisible: true,
+  tickPadding: 20,
+  tickFullLine: true,
+  tickFullLineDasharray: 'none',
+  tickColorType: 'secondary',
+  tickTextColorType: 'primary'
+}
+DEFAULT_RACING_VALUE_AXIS_PARAMS.tickFormat.toString = () => `num => {
+  if (num === null || Number.isNaN(num) == true) {
+    return num || 0
+  }
+  const parts = num.toString().split('.')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return parts.join('.')
+}`
+
 export const DEFAULT_SCATTER_PARAMS: ScatterParams = {
   radius: 5,
   fillColorType: 'label',
@@ -97,6 +230,38 @@ export const DEFAULT_SCATTER_BUBBLES_PARAMS: ScatterBubblesParams = {
   sizeAdjust: 0.5
 }
 
+export const DEFAULT_X_AXIS_PARAMS: XAxisParams = {
+  labelOffset: [0, 0],
+  labelColorType: 'primary',
+  axisLineVisible: false,
+  axisLineColorType: 'secondary',
+  ticks: null,
+  // tickFormat: ',.0f',
+  // tickFormat: v => v,
+  tickFormat: num => {
+    if (num === null || Number.isNaN(num) == true) {
+      return num || 0
+    }
+    const parts = num.toString().split('.')
+    parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+    return parts.join('.')
+  },
+  tickLineVisible: true,
+  tickPadding: 20,
+  tickFullLine: true,
+  tickFullLineDasharray: 'none',
+  tickColorType: 'secondary',
+  tickTextColorType: 'primary'
+}
+DEFAULT_X_AXIS_PARAMS.tickFormat.toString = () => `num => {
+  if (num === null || Number.isNaN(num) == true) {
+    return num || 0
+  }
+  const parts = num.toString().split('.')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return parts.join('.')
+}`
+
 export const DEFAULT_X_Y_AUX_PARAMS: XYAuxParams = {
   xAxis: {
     showLine: true,
@@ -106,7 +271,25 @@ export const DEFAULT_X_Y_AUX_PARAMS: XYAuxParams = {
     labelColorType: 'primary',
     labelTextColorType: 'background',
     // labelTextFormat: text => text,
-    labelTextFormat: (value: number) => String(Math.round(value)),
+    // labelTextFormat: (value: number) => String(Math.round(value)),
+    labelTextFormat: num => {
+      if (num === null || Number.isNaN(num) == true) {
+        return num || 0
+      }
+      const absNum = Math.abs(num)
+      if (absNum > 0 && absNum < 1) {
+        const strNum = num.toString()
+        const match = strNum.match(/0\.(0*)([1-9])/)
+        if (match) {
+            const precision = match[1].length + 1
+            return num.toFixed(precision)
+        }
+        return num.toString()
+      }
+      const parts = num.toString().split('.')
+      parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+      return parts[0]
+    },
     labelPadding: 20,
     // labelRotate: 0
   },
@@ -118,13 +301,65 @@ export const DEFAULT_X_Y_AUX_PARAMS: XYAuxParams = {
     labelColorType: 'primary',
     labelTextColorType: 'background',
     // labelTextFormat: text => text,
-    labelTextFormat: (value: number) => String(Math.round(value)),
+    // labelTextFormat: (value: number) => String(Math.round(value)),
+    labelTextFormat: num => {
+      if (num === null || Number.isNaN(num) == true) {
+        return num || 0
+      }
+      const absNum = Math.abs(num)
+      if (absNum > 0 && absNum < 1) {
+        const strNum = num.toString()
+        const match = strNum.match(/0\.(0*)([1-9])/)
+        if (match) {
+            const precision = match[1].length + 1
+            return num.toFixed(precision)
+        }
+        return num.toString()
+      }
+      const parts = num.toString().split('.')
+      parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+      return parts[0]
+    },
     labelPadding: 20,
     // labelRotate: 0
   }
 }
-DEFAULT_X_Y_AUX_PARAMS.xAxis.labelTextFormat.toString = () => `(value: number) => String(Math.round(value))`
-DEFAULT_X_Y_AUX_PARAMS.yAxis.labelTextFormat.toString = () => `(value: number) => String(Math.round(value))`
+DEFAULT_X_Y_AUX_PARAMS.xAxis.labelTextFormat.toString = () => `num => {
+  if (num === null || Number.isNaN(num) == true) {
+    return num || 0
+  }
+  const absNum = Math.abs(num)
+  if (absNum > 0 && absNum < 1) {
+    const strNum = num.toString()
+    const match = strNum.match(/0\.(0*)([1-9])/)
+    if (match) {
+        const precision = match[1].length + 1
+        return num.toFixed(precision)
+    }
+    return num.toString()
+  }
+  const parts = num.toString().split('.')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return parts[0]
+}`
+DEFAULT_X_Y_AUX_PARAMS.yAxis.labelTextFormat.toString = () => `num => {
+  if (num === null || Number.isNaN(num) == true) {
+    return num || 0
+  }
+  const absNum = Math.abs(num)
+  if (absNum > 0 && absNum < 1) {
+    const strNum = num.toString()
+    const match = strNum.match(/0\.(0*)([1-9])/)
+    if (match) {
+        const precision = match[1].length + 1
+        return num.toFixed(precision)
+    }
+    return num.toString()
+  }
+  const parts = num.toString().split('.')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return parts[0]
+}`
 
 
 export const DEFAULT_X_Y_AXES_PARAMS: XYAxesParams = {
@@ -135,7 +370,15 @@ export const DEFAULT_X_Y_AXES_PARAMS: XYAxesParams = {
     axisLineColorType: 'primary',
     ticks: null,
     // tickFormat: ',.0f',
-    tickFormat: v => v,
+    // tickFormat: v => v,
+    tickFormat: num => {
+      if (num === null || Number.isNaN(num) == true) {
+        return num || 0
+      }
+      const parts = num.toString().split('.')
+      parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+      return parts.join('.')
+    },
     tickLineVisible: true,
     tickPadding: 20,
     tickFullLine: true,
@@ -150,7 +393,15 @@ export const DEFAULT_X_Y_AXES_PARAMS: XYAxesParams = {
     axisLineColorType: 'primary',
     ticks: null,
     // tickFormat: ',.0f',
-    tickFormat: v => v,
+    // tickFormat: v => v,
+    tickFormat: num => {
+      if (num === null || Number.isNaN(num) == true) {
+        return num || 0
+      }
+      const parts = num.toString().split('.')
+      parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+      return parts.join('.')
+    },
     tickLineVisible: true,
     tickPadding: 20,
     tickFullLine: true,
@@ -159,9 +410,23 @@ export const DEFAULT_X_Y_AXES_PARAMS: XYAxesParams = {
     tickTextColorType: 'primary'
   }
 }
-DEFAULT_X_Y_AXES_PARAMS.xAxis.tickFormat.toString = () => `v => v`
-DEFAULT_X_Y_AXES_PARAMS.yAxis.tickFormat.toString = () => `v => v`
+DEFAULT_X_Y_AXES_PARAMS.xAxis.tickFormat.toString = () => `num => {
+  if (num === null || Number.isNaN(num) == true) {
+    return num || 0
+  }
+  const parts = num.toString().split('.')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return parts.join('.')
+}`
+DEFAULT_X_Y_AXES_PARAMS.yAxis.tickFormat.toString = () => `num => {
+  if (num === null || Number.isNaN(num) == true) {
+    return num || 0
+  }
+  const parts = num.toString().split('.')
+  parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',')
+  return parts.join('.')
+}`
 
-export const DEFAULT_X_Y_ZOOM_PARAMS: XYZoomParams = {
+export const DEFAULT_X_ZOOM_PARAMS: XZoomParams = {
 
 }

package/src/multiValue/index.ts

@@ -2,8 +2,12 @@ export * from './defaults'
 // export * from './types'
 export { MultiValueLegend } from './plugins/MultiValueLegend'
 export { MultiValueTooltip } from './plugins/MultiValueTooltip'
+export { RacingBars } from './plugins/RacingBars'
+export { RacingCounterTexts } from './plugins/RacingCounterTexts'
+export { RacingValueAxis } from './plugins/RacingValueAxis'
 export { Scatter } from './plugins/Scatter'
 export { ScatterBubbles } from './plugins/ScatterBubbles'
+export { XAxis } from './plugins/XAxis'
 export { XYAux } from './plugins/XYAux'
 export { XYAxes } from './plugins/XYAxes'
-export { XYZoom } from './plugins/XYZoom'
+export { XZoom } from './plugins/XZoom'