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

package/ChartsGrid/ChartsHorizontalGrid.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useTicks } from "../hooks/useTicks.js";
-import { GridLine } from "./styledCommonents.js";
+import { GridLine } from "./styledComponents.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @ignore - internal component.
@@ -23,7 +23,7 @@ export function ChartsGridHorizontal(props) {
   });
   return /*#__PURE__*/_jsx(React.Fragment, {
     children: yTicks.map(({
-      formattedValue,
+      value,
       offset
     }) => /*#__PURE__*/_jsx(GridLine, {
       y1: offset,
@@ -31,6 +31,6 @@ export function ChartsGridHorizontal(props) {
       x1: drawingArea.left,
       x2: drawingArea.left + drawingArea.width,
       className: classes.horizontalLine
-    }, `horizontal-${formattedValue}`))
+    }, `horizontal-${value}`))
   });
 }

package/ChartsGrid/ChartsVerticalGrid.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
-import { DrawingArea } from '../context/DrawingProvider';
+import { DrawingAreaState } from '../context/DrawingAreaProvider';
 import { AxisDefaultized, ChartsXAxisProps, ScaleName } from '../models/axis';
 import { ChartsGridClasses } from './chartsGridClasses';
 interface ChartsGridVerticalProps {
     axis: AxisDefaultized<ScaleName, any, ChartsXAxisProps>;
-    drawingArea: DrawingArea;
+    drawingArea: DrawingAreaState;
     classes: Partial<ChartsGridClasses>;
 }
 /**

package/ChartsGrid/ChartsVerticalGrid.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { useTicks } from "../hooks/useTicks.js";
-import { GridLine } from "./styledCommonents.js";
+import { GridLine } from "./styledComponents.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @ignore - internal component.
@@ -23,7 +23,7 @@ export function ChartsGridVertical(props) {
   });
   return /*#__PURE__*/_jsx(React.Fragment, {
     children: xTicks.map(({
-      formattedValue,
+      value,
       offset
     }) => /*#__PURE__*/_jsx(GridLine, {
       y1: drawingArea.top,
@@ -31,6 +31,6 @@ export function ChartsGridVertical(props) {
       x1: offset,
       x2: offset,
       className: classes.verticalLine
-    }, `vertical-${formattedValue}`))
+    }, `vertical-${value}`))
   });
 }

package/ChartsLegend/LegendPerItem.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { DefaultizedProps } from '@mui/x-internals/types';
-import { DrawingArea } from '../context/DrawingProvider';
+import { DrawingAreaState } from '../context/DrawingAreaProvider';
 import { ChartsTextStyle } from '../ChartsText';
 import { CardinalDirections } from '../models/layout';
 import { LegendItemParams } from './chartsLegend.types';
@@ -9,7 +9,7 @@ import { ChartsLegendClasses } from './chartsLegendClasses';
 export type ChartsLegendRootOwnerState = {
     position: AnchorPosition;
     direction: Direction;
-    drawingArea: DrawingArea;
+    drawingArea: DrawingAreaState;
     offsetX?: number;
     offsetY?: number;
     seriesNumber: number;

package/ChartsLegend/chartsLegendClasses.js

@@ -1,4 +1,5 @@
-import { unstable_generateUtilityClass as generateUtilityClass, unstable_generateUtilityClasses as generateUtilityClasses } from '@mui/utils';
+import generateUtilityClass from '@mui/utils/generateUtilityClass';
+import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
 export function getLegendUtilityClass(slot) {
   return generateUtilityClass('MuiChartsLegend', slot);
 }

package/ChartsOnAxisClickHandler/ChartsOnAxisClickHandler.js

@@ -2,10 +2,10 @@
 
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { InteractionContext } from "../context/InteractionProvider.js";
 import { useSeries } from "../hooks/useSeries.js";
 import { useSvgRef } from "../hooks/index.js";
 import { useCartesianContext } from "../context/CartesianProvider/index.js";
+import { useStore } from "../internals/store/useStore.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 function ChartsOnAxisClickHandler(props) {
   const {
@@ -13,9 +13,7 @@ function ChartsOnAxisClickHandler(props) {
   } = props;
   const svgRef = useSvgRef();
   const series = useSeries();
-  const {
-    axis
-  } = React.useContext(InteractionContext);
+  const store = useStore();
   const {
     xAxisIds,
     xAxis,
@@ -29,9 +27,13 @@ function ChartsOnAxisClickHandler(props) {
     }
     const handleMouseClick = event => {
       event.preventDefault();
-      const isXaxis = axis.x && axis.x.index !== -1;
+      const {
+        x: axisX,
+        y: axisY
+      } = store.value.interaction.axis;
+      const isXaxis = axisX && axisX.index !== -1;
       const USED_AXIS_ID = isXaxis ? xAxisIds[0] : yAxisIds[0];
-      const dataIndex = isXaxis ? axis.x && axis.x.index : axis.y && axis.y.index;
+      const dataIndex = isXaxis ? axisX && axisX.index : axisY && axisY.index;
       if (dataIndex == null) {
         return;
       }
@@ -58,7 +60,7 @@ function ChartsOnAxisClickHandler(props) {
     return () => {
       element.removeEventListener('click', handleMouseClick);
     };
-  }, [axis.x, axis.y, onAxisClick, series, svgRef, xAxis, xAxisIds, yAxis, yAxisIds]);
+  }, [onAxisClick, series, store, svgRef, xAxis, xAxisIds, yAxis, yAxisIds]);
 
   // eslint-disable-next-line react/jsx-no-useless-fragment
   return /*#__PURE__*/_jsx(React.Fragment, {});

package/ChartsSurface/ChartsSurface.d.ts

@@ -1,21 +1,6 @@
 import { SxProps, Theme } from '@mui/material/styles';
 import * as React from 'react';
-type ViewBox = {
-    x?: number;
-    y?: number;
-    width?: number;
-    height?: number;
-};
 export interface ChartsSurfaceProps {
-    /**
-     * The width of the chart in px.
-     */
-    width: number;
-    /**
-     * The height of the chart in px.
-     */
-    height: number;
-    viewBox?: ViewBox;
     className?: string;
     title?: string;
     desc?: string;
@@ -28,5 +13,19 @@ export interface ChartsSurfaceProps {
      */
     disableAxisListener?: boolean;
 }
+/**
+ * It provides the drawing area for the chart elements.
+ * It is the root `<svg>` of all the chart elements.
+ *
+ * It also provides the `title` and `desc` elements for the chart.
+ *
+ * Demos:
+ *
+ * - [Composition](http://localhost:3001/x/react-charts/composition/)
+ *
+ * API:
+ *
+ * - [ChartsSurface API](https://mui.com/x/api/charts/charts-surface/)
+ */
 declare const ChartsSurface: React.ForwardRefExoticComponent<ChartsSurfaceProps & React.RefAttributes<SVGSVGElement>>;
 export { ChartsSurface };

package/ChartsSurface/ChartsSurface.js

@@ -2,55 +2,102 @@
 
 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, useSvgRef } from "../hooks/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'
-})(() => ({
+})(({
+  ownerState
+}) => ({
+  width: ownerState.width ?? '100%',
+  height: ownerState.height ?? '100%',
+  display: 'flex',
+  position: 'relative',
+  flexGrow: 1,
+  flexDirection: 'column',
+  alignItems: 'center',
+  justifyContent: 'center',
+  overflow: 'hidden',
   // This prevents default touch actions when using the svg on mobile devices.
   // For example, prevent page scroll & zoom.
   touchAction: 'none'
 }));
+
+/**
+ * It provides the drawing area for the chart elements.
+ * It is the root `<svg>` of all the chart elements.
+ *
+ * It also provides the `title` and `desc` elements for the chart.
+ *
+ * Demos:
+ *
+ * - [Composition](http://localhost:3001/x/react-charts/composition/)
+ *
+ * API:
+ *
+ * - [ChartsSurface API](https://mui.com/x/api/charts/charts-surface/)
+ */
 const ChartsSurface = /*#__PURE__*/React.forwardRef(function ChartsSurface(inProps, ref) {
-  const props = useThemeProps({
+  const {
+    width,
+    height,
+    left,
+    right,
+    top,
+    bottom
+  } = useDrawingArea();
+  const {
+    hasIntrinsicSize,
+    svgRef: containerRef,
+    inHeight,
+    inWidth
+  } = useSize();
+  const svgRef = useSvgRef();
+  const handleRef = useForkRef(containerRef, svgRef, 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({
+    ownerState: {
+      width: inWidth,
+      height: inHeight
+    },
     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 +114,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/ChartsTooltip/ChartTooltip.types.d.ts

@@ -0,0 +1,15 @@
+import { ChartsTooltipProps } from './ChartsTooltip';
+export interface ChartsTooltipSlots {
+    /**
+     * Custom component for the tooltip popper.
+     * @default ChartsTooltipRoot
+     */
+    tooltip?: React.ElementType<ChartsTooltipProps>;
+}
+export interface ChartsTooltipSlotProps {
+    /**
+     * Custom component for the tooltip popper.
+     * @default ChartsTooltipRoot
+     */
+    tooltip?: Partial<ChartsTooltipProps>;
+}

package/ChartsTooltip/ChartTooltip.types.js

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

package/ChartsTooltip/ChartsAxisTooltipContent.d.ts

@@ -1,47 +1,15 @@
 import * as React from 'react';
 import { SxProps, Theme } from '@mui/material/styles';
-import { AxisInteractionData } from '../context/InteractionProvider';
-import { ChartSeriesDefaultized, ChartSeriesType } from '../models/seriesType/config';
-import { AxisDefaultized } from '../models/axis';
 import { ChartsTooltipClasses } from './chartsTooltipClasses';
-type ChartSeriesDefaultizedWithColorGetter = ChartSeriesDefaultized<ChartSeriesType> & {
-    getColor: (dataIndex: number) => string;
-};
-export type ChartsAxisContentProps = {
-    /**
-     * Data identifying the triggered axis.
-     */
-    axisData: AxisInteractionData;
-    /**
-     * The series linked to the triggered axis.
-     */
-    series: ChartSeriesDefaultizedWithColorGetter[];
-    /**
-     * The properties of the triggered axis.
-     */
-    axis: AxisDefaultized;
-    /**
-     * The index of the data item triggered.
-     */
-    dataIndex?: null | number;
-    /**
-     * The value associated to the current mouse position.
-     */
-    axisValue: string | number | Date | null;
+export interface ChartsAxisTooltipContentProps {
     /**
      * Override or extend the styles applied to the component.
      */
-    classes: ChartsTooltipClasses;
-    sx?: SxProps<Theme>;
-};
-/**
- * @ignore - internal component.
- */
-declare function ChartsAxisTooltipContent(props: {
-    axisData: AxisInteractionData;
-    content?: React.ElementType<ChartsAxisContentProps>;
-    contentProps?: Partial<ChartsAxisContentProps>;
+    classes?: Partial<ChartsTooltipClasses>;
     sx?: SxProps<Theme>;
-    classes: ChartsAxisContentProps['classes'];
-}): React.JSX.Element;
+}
+declare function ChartsAxisTooltipContent(props: ChartsAxisTooltipContentProps): React.JSX.Element | null;
+declare namespace ChartsAxisTooltipContent {
+    var propTypes: any;
+}
 export { ChartsAxisTooltipContent };

package/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;
-        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
+  } = 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/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 };