@mui/x-charts 8.0.0-alpha.0 → 8.0.0-alpha.10

package/ChartsTooltip/ChartsAxisTooltipContent.js

@@ -1,80 +1,96 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
+'use client';
+
 import * as React from 'react';
-import useSlotProps from '@mui/utils/useSlotProps';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
-import { DefaultChartsAxisTooltipContent } from "./DefaultChartsAxisTooltipContent.js";
-import { ZAxisContext } from "../context/ZAxisContextProvider.js";
-import { useColorProcessor } from "../context/PluginProvider/useColorProcessor.js";
-import { isCartesianSeriesType } from "../internals/isCartesian.js";
-import { useSeries } from "../hooks/useSeries.js";
-import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * @ignore - internal component.
- */
+import PropTypes from 'prop-types';
+import Typography from '@mui/material/Typography';
+import clsx from 'clsx';
+import { useUtilityClasses } from "./chartsTooltipClasses.js";
+import { ChartsTooltipCell, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
+import { useAxisTooltip } from "./useAxisTooltip.js";
+import { useXAxis, useYAxis } from "../hooks/index.js";
+import { ChartsLabelMark } from "../ChartsLabel/ChartsLabelMark.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function ChartsAxisTooltipContent(props) {
   const {
-    content,
-    contentProps,
-    axisData,
-    sx,
-    classes
+    classes: propClasses,
+    sx
   } = props;
-  const isXaxis = axisData.x && axisData.x.index !== -1;
-  const dataIndex = isXaxis ? axisData.x && axisData.x.index : axisData.y && axisData.y.index;
-  const axisValue = isXaxis ? axisData.x && axisData.x.value : axisData.y && axisData.y.value;
+  const tooltipData = useAxisTooltip();
+  const xAxis = useXAxis();
+  const yAxis = useYAxis();
+  const classes = useUtilityClasses(propClasses);
+  if (tooltipData === null) {
+    return null;
+  }
   const {
-    xAxisIds,
-    xAxis,
-    yAxisIds,
-    yAxis
-  } = useCartesianContext();
-  const {
-    zAxisIds,
-    zAxis
-  } = React.useContext(ZAxisContext);
-  const series = useSeries();
-  const colorProcessors = useColorProcessor();
-  const USED_AXIS_ID = isXaxis ? xAxisIds[0] : yAxisIds[0];
-  const relevantSeries = React.useMemo(() => {
-    const rep = [];
-    Object.keys(series).filter(isCartesianSeriesType).forEach(seriesType => {
-      series[seriesType].seriesOrder.forEach(seriesId => {
-        const item = series[seriesType].series[seriesId];
-        const providedXAxisId = item.xAxisId;
-        const providedYAxisId = item.yAxisId;
-        const axisKey = isXaxis ? providedXAxisId : providedYAxisId;
-        if (axisKey === undefined || axisKey === USED_AXIS_ID) {
-          const seriesToAdd = series[seriesType].series[seriesId];
-          const xAxisId = providedXAxisId ?? xAxisIds[0];
-          const yAxisId = providedYAxisId ?? yAxisIds[0];
-          const zAxisId = seriesToAdd.zAxisId ?? zAxisIds[0];
-          const getColor = colorProcessors[seriesType]?.(seriesToAdd, xAxis[xAxisId], yAxis[yAxisId], zAxisId && zAxis[zAxisId]) ?? (() => '');
-          rep.push(_extends({}, seriesToAdd, {
-            getColor
-          }));
-        }
-      });
-    });
-    return rep;
-  }, [USED_AXIS_ID, colorProcessors, isXaxis, series, xAxis, xAxisIds, yAxis, yAxisIds, zAxis, zAxisIds]);
-  const relevantAxis = React.useMemo(() => {
-    return isXaxis ? xAxis[USED_AXIS_ID] : yAxis[USED_AXIS_ID];
-  }, [USED_AXIS_ID, isXaxis, xAxis, yAxis]);
-  const Content = content ?? DefaultChartsAxisTooltipContent;
-  const chartTooltipContentProps = useSlotProps({
-    elementType: Content,
-    externalSlotProps: contentProps,
-    additionalProps: {
-      axisData,
-      series: relevantSeries,
-      axis: relevantAxis,
-      dataIndex,
-      axisValue,
-      sx,
-      classes
-    },
-    ownerState: {}
+    axisDirection,
+    axisValue,
+    axisFormattedValue,
+    seriesItems
+  } = tooltipData;
+  const axis = axisDirection === 'x' ? xAxis : yAxis;
+  return /*#__PURE__*/_jsx(ChartsTooltipPaper, {
+    sx: sx,
+    className: classes.paper,
+    children: /*#__PURE__*/_jsxs(ChartsTooltipTable, {
+      className: classes.table,
+      children: [axisValue != null && !axis.hideTooltip && /*#__PURE__*/_jsx("thead", {
+        children: /*#__PURE__*/_jsx(ChartsTooltipRow, {
+          className: classes.row,
+          children: /*#__PURE__*/_jsx(ChartsTooltipCell, {
+            colSpan: 3,
+            className: clsx(classes.cell, classes.axisValueCell),
+            children: /*#__PURE__*/_jsx(Typography, {
+              children: axisFormattedValue
+            })
+          })
+        })
+      }), /*#__PURE__*/_jsx("tbody", {
+        children: seriesItems.map(({
+          seriesId,
+          color,
+          formattedValue,
+          formattedLabel,
+          markType
+        }) => {
+          if (formattedValue == null) {
+            return null;
+          }
+          return /*#__PURE__*/_jsxs(ChartsTooltipRow, {
+            className: classes.row,
+            children: [/*#__PURE__*/_jsx(ChartsTooltipCell, {
+              className: clsx(classes.markCell, classes.cell),
+              children: color && /*#__PURE__*/_jsx(ChartsLabelMark, {
+                type: markType,
+                color: color,
+                className: classes.mark
+              })
+            }), /*#__PURE__*/_jsx(ChartsTooltipCell, {
+              className: clsx(classes.labelCell, classes.cell),
+              children: formattedLabel ? /*#__PURE__*/_jsx(Typography, {
+                children: formattedLabel
+              }) : null
+            }), /*#__PURE__*/_jsx(ChartsTooltipCell, {
+              className: clsx(classes.valueCell, classes.cell),
+              children: /*#__PURE__*/_jsx(Typography, {
+                children: formattedValue
+              })
+            })]
+          }, seriesId);
+        })
+      })]
+    })
   });
-  return /*#__PURE__*/_jsx(Content, _extends({}, chartTooltipContentProps));
 }
+process.env.NODE_ENV !== "production" ? ChartsAxisTooltipContent.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "pnpm proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * Override or extend the styles applied to the component.
+   */
+  classes: PropTypes.object,
+  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
+} : void 0;
 export { ChartsAxisTooltipContent };

package/ChartsTooltip/ChartsItemTooltipContent.d.ts

@@ -1,38 +1,15 @@
 import * as React from 'react';
 import { SxProps, Theme } from '@mui/material/styles';
-import { ItemInteractionData } from '../context/InteractionProvider';
-import { ChartSeriesDefaultized, ChartSeriesType } from '../models/seriesType/config';
 import { ChartsTooltipClasses } from './chartsTooltipClasses';
-export interface ChartsItemContentProps<T extends ChartSeriesType> {
-    /**
-     * The data used to identify the triggered item.
-     */
-    itemData: ItemInteractionData<T>;
-    /**
-     * The series linked to the triggered item.
-     */
-    series: ChartSeriesDefaultized<T>;
+export interface ChartsItemTooltipContentProps {
     /**
      * Override or extend the styles applied to the component.
      */
-    classes: ChartsTooltipClasses;
-    /**
-     * Get the color of the item with index `dataIndex`.
-     * @param {number} dataIndex The data index of the item.
-     * @returns {string} The color to display.
-     */
-    getColor: (dataIndex: number) => string;
+    classes?: Partial<ChartsTooltipClasses>;
     sx?: SxProps<Theme>;
 }
-export interface ChartsItemTooltipContentProps<T extends ChartSeriesType> {
-    itemData: ItemInteractionData<T>;
-    content?: React.ElementType<ChartsItemContentProps<T>>;
-    contentProps?: Partial<ChartsItemContentProps<T>>;
-    sx?: SxProps<Theme>;
-    classes: ChartsItemContentProps<T>['classes'];
+declare function ChartsItemTooltipContent(props: ChartsItemTooltipContentProps): React.JSX.Element | null;
+declare namespace ChartsItemTooltipContent {
+    var propTypes: any;
 }
-/**
- * @ignore - internal component.
- */
-declare function ChartsItemTooltipContent<T extends ChartSeriesType>(props: ChartsItemTooltipContentProps<T>): React.JSX.Element;
 export { ChartsItemTooltipContent };

package/ChartsTooltip/ChartsItemTooltipContent.js

@@ -1,52 +1,65 @@
-import _extends from "@babel/runtime/helpers/esm/extends";
+'use client';
+
 import * as React from 'react';
-import useSlotProps from '@mui/utils/useSlotProps';
-import { DefaultChartsItemTooltipContent } from "./DefaultChartsItemTooltipContent.js";
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
-import { ZAxisContext } from "../context/ZAxisContextProvider.js";
-import { useColorProcessor } from "../context/PluginProvider/useColorProcessor.js";
-import { useSeries } from "../hooks/useSeries.js";
-import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * @ignore - internal component.
- */
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import { useUtilityClasses } from "./chartsTooltipClasses.js";
+import { useItemTooltip } from "./useItemTooltip.js";
+import { ChartsTooltipCell, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
+import { ChartsLabelMark } from "../ChartsLabel/ChartsLabelMark.js";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function ChartsItemTooltipContent(props) {
   const {
-    content,
-    itemData,
-    sx,
-    classes,
-    contentProps
+    classes: propClasses,
+    sx
   } = props;
-  const series = useSeries()[itemData.type].series[itemData.seriesId];
+  const tooltipData = useItemTooltip();
+  const classes = useUtilityClasses(propClasses);
+  if (!tooltipData) {
+    return null;
+  }
   const {
-    xAxis,
-    yAxis,
-    xAxisIds,
-    yAxisIds
-  } = useCartesianContext();
-  const {
-    zAxis,
-    zAxisIds
-  } = React.useContext(ZAxisContext);
-  const colorProcessors = useColorProcessor();
-  const xAxisId = series.xAxisId ?? xAxisIds[0];
-  const yAxisId = series.yAxisId ?? yAxisIds[0];
-  const zAxisId = series.zAxisId ?? zAxisIds[0];
-  const getColor = colorProcessors[series.type]?.(series, xAxisId && xAxis[xAxisId], yAxisId && yAxis[yAxisId], zAxisId && zAxis[zAxisId]) ?? (() => '');
-  const Content = content ?? DefaultChartsItemTooltipContent;
-  const chartTooltipContentProps = useSlotProps({
-    elementType: Content,
-    externalSlotProps: contentProps,
-    additionalProps: {
-      itemData,
-      series,
-      sx,
-      classes,
-      getColor
-    },
-    ownerState: {}
+    color,
+    label,
+    formattedValue,
+    markType
+  } = tooltipData;
+  return /*#__PURE__*/_jsx(ChartsTooltipPaper, {
+    sx: sx,
+    className: classes.paper,
+    children: /*#__PURE__*/_jsx(ChartsTooltipTable, {
+      className: classes.table,
+      children: /*#__PURE__*/_jsx("tbody", {
+        children: /*#__PURE__*/_jsxs(ChartsTooltipRow, {
+          className: classes.row,
+          children: [/*#__PURE__*/_jsx(ChartsTooltipCell, {
+            className: clsx(classes.markCell, classes.cell),
+            children: /*#__PURE__*/_jsx(ChartsLabelMark, {
+              type: markType,
+              color: color,
+              className: classes.mark
+            })
+          }), /*#__PURE__*/_jsx(ChartsTooltipCell, {
+            className: clsx(classes.labelCell, classes.cell),
+            children: label
+          }), /*#__PURE__*/_jsx(ChartsTooltipCell, {
+            className: clsx(classes.valueCell, classes.cell),
+            children: formattedValue
+          })]
+        })
+      })
+    })
   });
-  return /*#__PURE__*/_jsx(Content, _extends({}, chartTooltipContentProps));
 }
+process.env.NODE_ENV !== "production" ? ChartsItemTooltipContent.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "pnpm proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * Override or extend the styles applied to the component.
+   */
+  classes: PropTypes.object,
+  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
+} : void 0;
 export { ChartsItemTooltipContent };

package/ChartsTooltip/ChartsTooltip.d.ts

@@ -1,72 +1,6 @@
 import * as React from 'react';
-import { SxProps, Theme } from '@mui/material/styles';
-import { PopperProps as BasePopperProps } from '@mui/material/Popper';
-import { TriggerOptions } from './utils';
-import { ChartSeriesType } from '../models/seriesType/config';
-import { ChartsItemContentProps } from './ChartsItemTooltipContent';
-import { ChartsAxisContentProps } from './ChartsAxisTooltipContent';
-import { ChartsTooltipClasses } from './chartsTooltipClasses';
-export type PopperProps = BasePopperProps & {
-    /**
-     * The system prop that allows defining system overrides as well as additional CSS styles.
-     */
-    sx?: SxProps<Theme>;
-};
-export interface ChartsTooltipSlots<T extends ChartSeriesType> {
-    /**
-     * Custom component for the tooltip popper.
-     * @default ChartsTooltipRoot
-     */
-    popper?: React.ElementType<PopperProps>;
-    /**
-     * Custom component for displaying tooltip content when triggered by axis event.
-     * @default DefaultChartsAxisTooltipContent
-     */
-    axisContent?: React.ElementType<ChartsAxisContentProps>;
-    /**
-     * Custom component for displaying tooltip content when triggered by item event.
-     * @default DefaultChartsItemTooltipContent
-     */
-    itemContent?: React.ElementType<ChartsItemContentProps<T>>;
-}
-export interface ChartsTooltipSlotProps<T extends ChartSeriesType> {
-    popper?: Partial<PopperProps>;
-    axisContent?: Partial<ChartsAxisContentProps>;
-    itemContent?: Partial<ChartsItemContentProps<T>>;
-}
-export interface ChartsTooltipProps<T extends ChartSeriesType> {
-    /**
-     * Select the kind of tooltip to display
-     * - 'item': Shows data about the item below the mouse.
-     * - 'axis': Shows values associated with the hovered x value
-     * - 'none': Does not display tooltip
-     * @default 'axis'
-     */
-    trigger?: TriggerOptions;
-    /**
-     * Component to override the tooltip content when trigger is set to 'item'.
-     * @deprecated Use slots.itemContent instead
-     */
-    itemContent?: React.ElementType<ChartsItemContentProps<any>>;
-    /**
-     * Component to override the tooltip content when trigger is set to 'axis'.
-     * @deprecated Use slots.axisContent instead
-     */
-    axisContent?: React.ElementType<ChartsAxisContentProps>;
-    /**
-     * Override or extend the styles applied to the component.
-     */
-    classes?: Partial<ChartsTooltipClasses>;
-    /**
-     * Overridable component slots.
-     * @default {}
-     */
-    slots?: ChartsTooltipSlots<T>;
-    /**
-     * The props used for each component slot.
-     * @default {}
-     */
-    slotProps?: ChartsTooltipSlotProps<T>;
+import { ChartsTooltipContainerProps } from './ChartsTooltipContainer';
+export interface ChartsTooltipProps extends Omit<ChartsTooltipContainerProps, 'children'> {
 }
 /**
  * Demos:
@@ -77,7 +11,7 @@ export interface ChartsTooltipProps<T extends ChartSeriesType> {
  *
  * - [ChartsTooltip API](https://mui.com/x/api/charts/charts-tool-tip/)
  */
-declare function ChartsTooltip<T extends ChartSeriesType>(inProps: ChartsTooltipProps<T>): React.JSX.Element | null;
+declare function ChartsTooltip(props: ChartsTooltipProps): React.JSX.Element;
 declare namespace ChartsTooltip {
     var propTypes: any;
 }