@mui/x-charts 7.22.3 → 8.0.0-alpha.1

package/modern/ChartsSurface/ChartsSurface.js

@@ -2,13 +2,18 @@
 
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["children", "width", "height", "viewBox", "disableAxisListener", "className", "title", "desc"];
+const _excluded = ["children", "disableAxisListener", "className", "title", "desc"];
 import { styled, useThemeProps } from '@mui/material/styles';
 import PropTypes from 'prop-types';
 import * as React from 'react';
+import useForkRef from '@mui/utils/useForkRef';
 import { useAxisEvents } from "../hooks/useAxisEvents.js";
+import { ChartsAxesGradients } from "../internals/components/ChartsAxesGradients/index.js";
+import { useDrawingArea } from "../hooks/index.js";
+import { useSurfaceRef } from "../context/SvgRefProvider/index.js";
+import { useSize } from "../context/SizeProvider/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const ChartChartsSurfaceStyles = styled('svg', {
+const ChartsSurfaceStyles = styled('svg', {
   name: 'MuiChartsSurface',
   slot: 'Root'
 })(() => ({
@@ -17,40 +22,50 @@ const ChartChartsSurfaceStyles = styled('svg', {
   touchAction: 'none'
 }));
 const ChartsSurface = /*#__PURE__*/React.forwardRef(function ChartsSurface(inProps, ref) {
-  const props = useThemeProps({
+  const {
+    width,
+    height,
+    left,
+    right,
+    top,
+    bottom
+  } = useDrawingArea();
+  const {
+    hasIntrinsicSize
+  } = useSize();
+  const surfaceRef = useSurfaceRef();
+  const handleRef = useForkRef(surfaceRef, ref);
+  const themeProps = useThemeProps({
     props: inProps,
     name: 'MuiChartsSurface'
   });
   const {
       children,
-      width,
-      height,
-      viewBox,
       disableAxisListener = false,
       className,
       title,
       desc
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
-  const svgView = _extends({
-    width,
-    height,
+    } = themeProps,
+    other = _objectWithoutPropertiesLoose(themeProps, _excluded);
+  const svgWidth = width + left + right;
+  const svgHeight = height + top + bottom;
+  const svgView = {
+    width: svgWidth,
+    height: svgHeight,
     x: 0,
     y: 0
-  }, viewBox);
+  };
   useAxisEvents(disableAxisListener);
-  return /*#__PURE__*/_jsxs(ChartChartsSurfaceStyles, _extends({
-    width: width,
-    height: height,
+  return /*#__PURE__*/_jsxs(ChartsSurfaceStyles, _extends({
     viewBox: `${svgView.x} ${svgView.y} ${svgView.width} ${svgView.height}`,
-    ref: ref,
     className: className
   }, other, {
-    children: [/*#__PURE__*/_jsx("title", {
+    ref: handleRef,
+    children: [title && /*#__PURE__*/_jsx("title", {
       children: title
-    }), /*#__PURE__*/_jsx("desc", {
+    }), desc && /*#__PURE__*/_jsx("desc", {
       children: desc
-    }), children]
+    }), /*#__PURE__*/_jsx(ChartsAxesGradients, {}), hasIntrinsicSize && children]
   }));
 });
 process.env.NODE_ENV !== "production" ? ChartsSurface.propTypes = {
@@ -67,21 +82,7 @@ process.env.NODE_ENV !== "production" ? ChartsSurface.propTypes = {
    * @default false
    */
   disableAxisListener: PropTypes.bool,
-  /**
-   * The height of the chart in px.
-   */
-  height: PropTypes.number.isRequired,
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-  title: PropTypes.string,
-  viewBox: PropTypes.shape({
-    height: PropTypes.number,
-    width: PropTypes.number,
-    x: PropTypes.number,
-    y: PropTypes.number
-  }),
-  /**
-   * The width of the chart in px.
-   */
-  width: PropTypes.number.isRequired
+  title: PropTypes.string
 } : void 0;
 export { ChartsSurface };

package/modern/ChartsTooltip/ChartTooltip.types.js

@@ -0,0 +1 @@
+export {};

package/modern/ChartsTooltip/ChartsAxisTooltipContent.js

@@ -1,80 +1,91 @@
-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, ChartsTooltipMark, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
+import { useAxisTooltip } from "./useAxisTooltip.js";
+import { useXAxis, useYAxis } from "../hooks/index.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 tootlipData = useAxisTooltip();
+  const xAxis = useXAxis();
+  const yAxis = useYAxis();
+  const classes = useUtilityClasses(propClasses);
+  if (tootlipData === 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 ?? item.xAxisKey;
-        const providedYAxisId = item.yAxisId ?? item.yAxisKey;
-        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 ?? seriesToAdd.zAxisKey ?? 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
+  } = tootlipData;
+  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, {
+          children: /*#__PURE__*/_jsx(ChartsTooltipCell, {
+            colSpan: 3,
+            children: /*#__PURE__*/_jsx(Typography, {
+              children: axisFormattedValue
+            })
+          })
+        })
+      }), /*#__PURE__*/_jsx("tbody", {
+        children: seriesItems.map(({
+          seriesId,
+          color,
+          formattedValue,
+          formattedLabel
+        }) => {
+          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(ChartsTooltipMark, {
+                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/modern/ChartsTooltip/ChartsItemTooltipContent.js

@@ -1,52 +1,62 @@
-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, ChartsTooltipMark, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.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 ?? series.xAxisKey ?? xAxisIds[0];
-  const yAxisId = series.yAxisId ?? series.yAxisKey ?? yAxisIds[0];
-  const zAxisId = series.zAxisId ?? series.zAxisKey ?? 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
+  } = 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(ChartsTooltipMark, {
+              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 };