@mui/x-charts 9.0.0-alpha.2 → 9.0.0-alpha.3

package/ChartsTooltip/useAxesTooltip.js

@@ -9,7 +9,6 @@ var _useSeries = require("../hooks/useSeries");
 var _useColorProcessor = require("../internals/plugins/corePlugins/useChartSeries/useColorProcessor");
 var _useStore = require("../internals/store/useStore");
 var _getLabel = require("../internals/getLabel");
-var _isCartesian = require("../internals/isCartesian");
 var _utils = require("./utils");
 var _useAxis = require("../hooks/useAxis");
 var _useZAxis = require("../hooks/useZAxis");
@@ -17,6 +16,7 @@ var _useChartCartesianAxis = require("../internals/plugins/featurePlugins/useCha
 var _useChartPolarInteraction = require("../internals/plugins/featurePlugins/useChartPolarAxis/useChartPolarInteraction.selectors");
 var _isPolar = require("../internals/isPolar");
 var _useChartVisibilityManager = require("../internals/plugins/featurePlugins/useChartVisibilityManager/useChartVisibilityManager.selectors");
+var _composition = require("../models/seriesType/composition");
 function defaultAxisTooltipConfig(axis, dataIndex, axisDirection) {
   const axisValue = axis.data?.[dataIndex] ?? null;
   const axisFormatter = axis.valueFormatter ?? (v => axis.scaleType === 'utc' ? (0, _utils.utcFormatter)(v) : v.toLocaleString());
@@ -93,7 +93,7 @@ function useAxesTooltip(params) {
       tooltipAxes.push(defaultAxisTooltipConfig(rotationAxis[axisId], dataIndex, 'rotation'));
     });
   }
-  Object.keys(series).filter(_isCartesian.isCartesianSeriesType).forEach(seriesType => {
+  Object.keys(series).filter(seriesType => _composition.composableCartesianSeriesTypes.has(seriesType)).forEach(seriesType => {
     const seriesOfType = series[seriesType];
     if (!seriesOfType) {
       return [];
@@ -132,7 +132,8 @@ function useAxesTooltip(params) {
           value,
           formattedValue,
           formattedLabel,
-          markType: seriesToAdd.labelMarkType
+          markType: seriesToAdd.labelMarkType,
+          markShape: 'showMark' in seriesToAdd && seriesToAdd.showMark ? seriesToAdd.shape ?? 'circle' : undefined
         });
       }
     });
@@ -176,7 +177,8 @@ function useAxesTooltip(params) {
           value,
           formattedValue,
           formattedLabel,
-          markType: seriesToAdd.labelMarkType
+          markType: seriesToAdd.labelMarkType,
+          markShape: 'showMark' in seriesToAdd && seriesToAdd.showMark ? 'circle' : undefined
         });
       }
     });

package/ChartsTooltip/useAxesTooltip.mjs

@@ -4,7 +4,6 @@ import { useSeries } from "../hooks/useSeries.mjs";
 import { useColorProcessor } from "../internals/plugins/corePlugins/useChartSeries/useColorProcessor.mjs";
 import { useStore } from "../internals/store/useStore.mjs";
 import { getLabel } from "../internals/getLabel.mjs";
-import { isCartesianSeriesType } from "../internals/isCartesian.mjs";
 import { utcFormatter } from "./utils.mjs";
 import { useRotationAxes, useRotationAxis, useXAxes, useXAxis, useYAxes, useYAxis } from "../hooks/useAxis.mjs";
 import { useZAxes } from "../hooks/useZAxis.mjs";
@@ -12,6 +11,7 @@ import { selectorChartsInteractionTooltipXAxes, selectorChartsInteractionTooltip
 import { selectorChartsInteractionTooltipRotationAxes } from "../internals/plugins/featurePlugins/useChartPolarAxis/useChartPolarInteraction.selectors.mjs";
 import { isPolarSeriesType } from "../internals/isPolar.mjs";
 import { selectorIsItemVisibleGetter } from "../internals/plugins/featurePlugins/useChartVisibilityManager/useChartVisibilityManager.selectors.mjs";
+import { composableCartesianSeriesTypes } from "../models/seriesType/composition.mjs";
 function defaultAxisTooltipConfig(axis, dataIndex, axisDirection) {
   const axisValue = axis.data?.[dataIndex] ?? null;
   const axisFormatter = axis.valueFormatter ?? (v => axis.scaleType === 'utc' ? utcFormatter(v) : v.toLocaleString());
@@ -88,7 +88,7 @@ export function useAxesTooltip(params) {
       tooltipAxes.push(defaultAxisTooltipConfig(rotationAxis[axisId], dataIndex, 'rotation'));
     });
   }
-  Object.keys(series).filter(isCartesianSeriesType).forEach(seriesType => {
+  Object.keys(series).filter(seriesType => composableCartesianSeriesTypes.has(seriesType)).forEach(seriesType => {
     const seriesOfType = series[seriesType];
     if (!seriesOfType) {
       return [];
@@ -127,7 +127,8 @@ export function useAxesTooltip(params) {
           value,
           formattedValue,
           formattedLabel,
-          markType: seriesToAdd.labelMarkType
+          markType: seriesToAdd.labelMarkType,
+          markShape: 'showMark' in seriesToAdd && seriesToAdd.showMark ? seriesToAdd.shape ?? 'circle' : undefined
         });
       }
     });
@@ -171,7 +172,8 @@ export function useAxesTooltip(params) {
           value,
           formattedValue,
           formattedLabel,
-          markType: seriesToAdd.labelMarkType
+          markType: seriesToAdd.labelMarkType,
+          markShape: 'showMark' in seriesToAdd && seriesToAdd.showMark ? 'circle' : undefined
         });
       }
     });

package/ChartsTooltip/useItemTooltip.d.mts

@@ -1,14 +1,16 @@
 import { type ChartSeriesType } from "../models/seriesType/config.mjs";
 import { type ItemTooltip, type ItemTooltipWithMultipleValues } from "../internals/plugins/corePlugins/useChartSeriesConfig/index.mjs";
-export type UseItemTooltipReturnValue<T extends ChartSeriesType> = ItemTooltip<T>;
+export type UseItemTooltipReturnValue<SeriesType extends ChartSeriesType> = SeriesType extends 'heatmap' ? Omit<ItemTooltip<SeriesType>, 'value'> & {
+  value: number | null;
+} : ItemTooltip<SeriesType>;
 export type UseRadarItemTooltipReturnValue = ItemTooltipWithMultipleValues<'radar'>;
-export declare function useInternalItemTooltip<T extends ChartSeriesType>(): (T extends 'radar' ? ItemTooltipWithMultipleValues<T> : ItemTooltip<T>) | null;
+export declare function useInternalItemTooltip<SeriesType extends ChartSeriesType>(): (SeriesType extends 'radar' ? ItemTooltipWithMultipleValues<SeriesType> : UseItemTooltipReturnValue<SeriesType>) | null;
 /**
  * Returns a config object when the tooltip contains a single item to display.
  * Some specific charts like radar need more complex structure. Use specific hook like `useRadarItemTooltip` for them.
  * @returns The tooltip item config
  */
-export declare const useItemTooltip: <T extends Exclude<ChartSeriesType, "radar">>() => UseItemTooltipReturnValue<T> | null;
+export declare const useItemTooltip: <SeriesType extends Exclude<ChartSeriesType, "radar">>() => UseItemTooltipReturnValue<SeriesType> | null;
 /**
  * Contains an object per value with their content and the label of the associated metric.
  * @returns The tooltip item configs

package/ChartsTooltip/useItemTooltip.d.ts

@@ -1,14 +1,16 @@
 import { type ChartSeriesType } from "../models/seriesType/config.js";
 import { type ItemTooltip, type ItemTooltipWithMultipleValues } from "../internals/plugins/corePlugins/useChartSeriesConfig/index.js";
-export type UseItemTooltipReturnValue<T extends ChartSeriesType> = ItemTooltip<T>;
+export type UseItemTooltipReturnValue<SeriesType extends ChartSeriesType> = SeriesType extends 'heatmap' ? Omit<ItemTooltip<SeriesType>, 'value'> & {
+  value: number | null;
+} : ItemTooltip<SeriesType>;
 export type UseRadarItemTooltipReturnValue = ItemTooltipWithMultipleValues<'radar'>;
-export declare function useInternalItemTooltip<T extends ChartSeriesType>(): (T extends 'radar' ? ItemTooltipWithMultipleValues<T> : ItemTooltip<T>) | null;
+export declare function useInternalItemTooltip<SeriesType extends ChartSeriesType>(): (SeriesType extends 'radar' ? ItemTooltipWithMultipleValues<SeriesType> : UseItemTooltipReturnValue<SeriesType>) | null;
 /**
  * Returns a config object when the tooltip contains a single item to display.
  * Some specific charts like radar need more complex structure. Use specific hook like `useRadarItemTooltip` for them.
  * @returns The tooltip item config
  */
-export declare const useItemTooltip: <T extends Exclude<ChartSeriesType, "radar">>() => UseItemTooltipReturnValue<T> | null;
+export declare const useItemTooltip: <SeriesType extends Exclude<ChartSeriesType, "radar">>() => UseItemTooltipReturnValue<SeriesType> | null;
 /**
  * Contains an object per value with their content and the label of the associated metric.
  * @returns The tooltip item configs