[charts] Harmonize charts TS

packages/x-charts/src/ChartsTooltip/ChartsAxisTooltipContent.tsx

@@ -9,7 +9,7 @@ import { ChartSeriesDefaultized, ChartSeriesType } from '../models/seriesType/co
 import { AxisDefaultized } from '../models/axis';
 import { ChartsTooltipClasses } from './chartsTooltipClasses';
 import { DefaultChartsAxisTooltipContent } from './DefaultChartsAxisTooltipContent';
-import { isCartesianSeriesType } from './utils';
+import { isCartesianSeriesType } from '../internals/isCaterisan';
 import colorGetter from '../internals/colorGetter';
 import { ZAxisContext } from '../context/ZAxisContextProvider';
 

packages/x-charts/src/ChartsTooltip/DefaultChartsAxisTooltipContent.tsx

@@ -10,8 +10,9 @@ import {
   ChartsTooltipRow,
 } from './ChartsTooltipTable';
 import type { ChartsAxisContentProps } from './ChartsAxisTooltipContent';
-import { isCartesianSeries, utcFormatter } from './utils';
+import { utcFormatter } from './utils';
 import { getLabel } from '../internals/getLabel';
+import { isCartesianSeries } from '../internals/isCaterisan';
 
 function DefaultChartsAxisTooltipContent(props: ChartsAxisContentProps) {
   const { series, axis, dataIndex, axisValue, sx, classes } = props;

packages/x-charts/src/ChartsTooltip/utils.tsx

@@ -1,11 +1,7 @@
 import * as React from 'react';
 import { AxisInteractionData, ItemInteractionData } from '../context/InteractionProvider';
 import { SvgContext } from '../context/DrawingProvider';
-import {
-  CartesianChartSeriesType,
-  ChartSeriesDefaultized,
-  ChartSeriesType,
-} from '../models/seriesType/config';
+import { ChartSeriesType } from '../models/seriesType/config';
 
 export function generateVirtualElement(mousePosition: { x: number; y: number } | null) {
   if (mousePosition === null) {
@@ -95,21 +91,6 @@ export function getTooltipHasData(
   return hasAxisXData || hasAxisYData;
 }
 
-export function isCartesianSeriesType(seriesType: string): seriesType is CartesianChartSeriesType {
-  return ['bar', 'line', 'scatter'].includes(seriesType);
-}
-
-export function isCartesianSeries(
-  series: ChartSeriesDefaultized<ChartSeriesType> & { getColor: (dataIndex: number) => string },
-): series is ChartSeriesDefaultized<CartesianChartSeriesType> & {
-  getColor: (dataIndex: number) => string;
-};
-export function isCartesianSeries(
-  series: ChartSeriesDefaultized<ChartSeriesType>,
-): series is ChartSeriesDefaultized<CartesianChartSeriesType> {
-  return isCartesianSeriesType(series.type);
-}
-
 export function utcFormatter(v: string | number | Date): string {
   if (v instanceof Date) {
     return v.toUTCString();

packages/x-charts/src/internals/configInit.ts

@@ -0,0 +1,28 @@
+import { ChartSeriesType } from '../models/seriesType/config';
+
+let instance: undefined | Set<ChartSeriesType>;
+
+class CartesianSeriesTypes {
+  types: Set<ChartSeriesType> = new Set();
+
+  constructor() {
+    if (instance) {
+      throw new Error('You can only create one instance!');
+    }
+    instance = this.types;
+  }
+
+  addType(value: ChartSeriesType) {
+    this.types.add(value);
+  }
+
+  getTypes() {
+    return this.types;
+  }
+}
+
+export const cartesianSeriesTypes = new CartesianSeriesTypes();
+
+cartesianSeriesTypes.addType('bar');
+cartesianSeriesTypes.addType('line');
+cartesianSeriesTypes.addType('scatter');

packages/x-charts/src/internals/index.ts

@@ -0,0 +1 @@
+export * from './configInit';

packages/x-charts/src/internals/isCaterisan.ts

@@ -0,0 +1,21 @@
+import {
+  ChartSeriesType,
+  CartesianChartSeriesType,
+  ChartSeriesDefaultized,
+} from '../models/seriesType/config';
+import { cartesianSeriesTypes } from './configInit';
+
+export function isCartesianSeriesType(seriesType: string): seriesType is CartesianChartSeriesType {
+  return cartesianSeriesTypes.getTypes().has(seriesType as ChartSeriesType);
+}
+
+export function isCartesianSeries(
+  series: ChartSeriesDefaultized<ChartSeriesType> & { getColor: (dataIndex: number) => string },
+): series is ChartSeriesDefaultized<CartesianChartSeriesType> & {
+  getColor: (dataIndex: number) => string;
+};
+export function isCartesianSeries(
+  series: ChartSeriesDefaultized<ChartSeriesType>,
+): series is ChartSeriesDefaultized<CartesianChartSeriesType> {
+  return isCartesianSeriesType(series.type);
+}

packages/x-charts/src/models/seriesType/config.ts

@@ -59,10 +59,6 @@ export type CartesianChartSeriesType = keyof Pick<
   }[ChartSeriesType]
 >;
 
-export function isCartesianSeriesType(seriesType: string): seriesType is CartesianChartSeriesType {
-  return ['bar', 'line', 'scatter', 'heatmap'].includes(seriesType);
-}
-
 export type StackableChartSeriesType = keyof Pick<
   ChartsSeriesConfig,
   {