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

package/modern/ChartsTooltip/DefaultChartsItemTooltipContent.js

@@ -0,0 +1,92 @@
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import clsx from 'clsx';
+import { ChartsTooltipTable, ChartsTooltipCell, ChartsTooltipMark, ChartsTooltipPaper, ChartsTooltipRow } from './ChartsTooltipTable';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+function DefaultChartsItemTooltipContent(props) {
+  const {
+    series,
+    itemData,
+    sx,
+    classes
+  } = props;
+  if (itemData.dataIndex === undefined) {
+    return null;
+  }
+  const {
+    displayedLabel,
+    color
+  } = series.type === 'pie' ? {
+    color: series.data[itemData.dataIndex].color,
+    displayedLabel: series.data[itemData.dataIndex].label
+  } : {
+    color: series.color,
+    displayedLabel: series.label
+  };
+
+  // TODO: Manage to let TS understand series.data and series.valueFormatter are coherent
+  // @ts-ignore
+  const formattedValue = series.valueFormatter(series.data[itemData.dataIndex]);
+  return /*#__PURE__*/_jsx(ChartsTooltipPaper, {
+    sx: sx,
+    className: classes.root,
+    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, {
+              ownerState: {
+                color
+              },
+              className: classes.mark
+            })
+          }), /*#__PURE__*/_jsx(ChartsTooltipCell, {
+            className: clsx(classes.labelCell, classes.cell),
+            children: displayedLabel
+          }), /*#__PURE__*/_jsx(ChartsTooltipCell, {
+            className: clsx(classes.valueCell, classes.cell),
+            children: formattedValue
+          })]
+        })
+      })
+    })
+  });
+}
+process.env.NODE_ENV !== "production" ? DefaultChartsItemTooltipContent.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * Override or extend the styles applied to the component.
+   */
+  classes: PropTypes.object.isRequired,
+  /**
+   * The data used to identify the triggered item.
+   */
+  itemData: PropTypes.shape({
+    dataIndex: PropTypes.number,
+    seriesId: PropTypes.string.isRequired,
+    type: PropTypes.oneOf(['bar', 'line', 'pie', 'scatter']).isRequired
+  }).isRequired,
+  /**
+   * The series linked to the triggered axis.
+   */
+  series: PropTypes.shape({
+    color: PropTypes.string,
+    data: PropTypes.arrayOf(PropTypes.number).isRequired,
+    highlightScope: PropTypes.shape({
+      faded: PropTypes.oneOf(['global', 'none', 'series']),
+      highlighted: PropTypes.oneOf(['item', 'none', 'series'])
+    }),
+    id: PropTypes.string.isRequired,
+    type: PropTypes.oneOf(['bar', 'line', 'pie', 'scatter']).isRequired,
+    valueFormatter: PropTypes.func.isRequired
+  }).isRequired,
+  sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object])
+} : void 0;
+export { DefaultChartsItemTooltipContent };

package/modern/ChartsTooltip/index.js

@@ -1,2 +1,6 @@
 export * from './ChartsTooltip';
-export * from './chartsTooltipClasses';
+export * from './chartsTooltipClasses';
+export * from './ChartsAxisTooltipContent';
+export * from './ChartsItemTooltipContent';
+export * from './DefaultChartsAxisTooltipContent';
+export * from './DefaultChartsItemTooltipContent';

package/modern/ChartsYAxis/ChartsYAxis.js

@@ -74,6 +74,8 @@ function ChartsYAxis(inProps) {
     tickFontSize,
     label,
     labelFontSize,
+    labelStyle,
+    tickLabelStyle,
     tickSize: tickSizeProp,
     valueFormatter,
     slots,
@@ -108,11 +110,11 @@ function ChartsYAxis(inProps) {
     elementType: TickLabel,
     externalSlotProps: slotProps?.axisTickLabel,
     additionalProps: {
-      style: {
+      style: _extends({
         fontSize: tickFontSize,
         textAnchor: position === 'right' ? 'start' : 'end',
         dominantBaseline: 'central'
-      },
+      }, tickLabelStyle),
       className: classes.tickLabel
     },
     ownerState: {}
@@ -121,12 +123,12 @@ function ChartsYAxis(inProps) {
     elementType: Label,
     externalSlotProps: slotProps?.axisLabel,
     additionalProps: {
-      style: {
+      style: _extends({
         fontSize: labelFontSize,
         angle: positionSign * 90,
         textAnchor: 'middle',
         dominantBaseline: 'auto'
-      }
+      }, labelStyle)
     },
     ownerState: {}
   });

package/modern/LineChart/extremums.js

@@ -6,6 +6,18 @@ export const getExtremumX = params => {
   const maxX = Math.max(...(axis.data ?? []));
   return [minX, maxX];
 };
+function getSeriesExtremums(getValues, stackedData) {
+  if (stackedData.length === 0) {
+    return [null, null];
+  }
+  return stackedData.reduce((seriesAcc, stackedValue) => {
+    const [base, value] = getValues(stackedValue);
+    if (seriesAcc[0] === null) {
+      return [Math.min(base, value), Math.max(base, value)];
+    }
+    return [Math.min(base, value, seriesAcc[0]), Math.max(base, value, seriesAcc[1])];
+  }, getValues(stackedData[0]));
+}
 export const getExtremumY = params => {
   const {
     series,
@@ -13,16 +25,21 @@ export const getExtremumY = params => {
     isDefaultAxis
   } = params;
   return Object.keys(series).filter(seriesId => series[seriesId].yAxisKey === axis.id || isDefaultAxis && series[seriesId].yAxisKey === undefined).reduce((acc, seriesId) => {
-    const isArea = series[seriesId].area !== undefined;
-    const getValues = isArea ? d => d : d => [d[1], d[1]]; // Id area should go from bottom to top, without area should only consider the top
+    const {
+      area,
+      stackedData
+    } = series[seriesId];
+    const isArea = area !== undefined;
+    const getValues = isArea ? d => d : d => [d[1], d[1]]; // Since this series is not used to display an area, we do not consider the base (the d[0]).
 
-    const [seriesMin, seriesMax] = series[seriesId].stackedData.reduce((seriesAcc, stackedValue) => {
-      const [base, value] = getValues(stackedValue);
-      return [Math.min(base, value, seriesAcc[0]), Math.max(base, value, seriesAcc[1])];
-    }, getValues(series[seriesId].stackedData[0]));
-    if (acc[0] === null || acc[1] === null) {
-      return [seriesMin, seriesMax];
+    const seriesExtremums = getSeriesExtremums(getValues, stackedData);
+    if (acc[0] === null) {
+      return seriesExtremums;
+    }
+    if (seriesExtremums[0] === null) {
+      return acc;
     }
+    const [seriesMin, seriesMax] = seriesExtremums;
     return [Math.min(seriesMin, acc[0]), Math.max(seriesMax, acc[1])];
   }, [null, null]);
 };

package/modern/LineChart/index.js

@@ -1,8 +1,8 @@
+export * from './LineChart';
 export * from './LinePlot';
 export * from './AreaPlot';
 export * from './MarkPlot';
 export * from './LineHighlightPlot';
-export * from './LineChart';
 export * from './AreaElement';
 export * from './LineElement';
 export * from './MarkElement';

package/modern/PieChart/PieArc.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 const _excluded = ["id", "dataIndex", "classes", "color", "highlightScope", "onClick", "isFaded", "isHighlighted", "startAngle", "endAngle", "paddingAngle", "innerRadius", "outerRadius", "cornerRadius"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { arc as d3Arc } from 'd3-shape';
 import { animated, to } from '@react-spring/web';
 import composeClasses from '@mui/utils/composeClasses';
@@ -37,7 +38,7 @@ const PieArcRoot = styled(animated.path, {
   strokeWidth: 1,
   strokeLinejoin: 'round'
 }));
-export default function PieArc(props) {
+function PieArc(props) {
   const {
       id,
       dataIndex,
@@ -82,4 +83,19 @@ export default function PieArc(props) {
     seriesId: id,
     dataIndex
   })));
-}
+}
+process.env.NODE_ENV !== "production" ? PieArc.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  classes: PropTypes.object,
+  dataIndex: PropTypes.number.isRequired,
+  highlightScope: PropTypes.shape({
+    faded: PropTypes.oneOf(['global', 'none', 'series']),
+    highlighted: PropTypes.oneOf(['item', 'none', 'series'])
+  }),
+  isFaded: PropTypes.bool.isRequired,
+  isHighlighted: PropTypes.bool.isRequired
+} : void 0;
+export { PieArc };

package/modern/PieChart/PieArcLabel.js

@@ -2,9 +2,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
 const _excluded = ["id", "classes", "color", "startAngle", "endAngle", "paddingAngle", "innerRadius", "outerRadius", "cornerRadius", "formattedArcLabel", "isHighlighted", "isFaded", "style"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { animated, to } from '@react-spring/web';
 import { arc as d3Arc } from 'd3-shape';
-import PropTypes from 'prop-types';
 import composeClasses from '@mui/utils/composeClasses';
 import generateUtilityClass from '@mui/utils/generateUtilityClass';
 import { styled } from '@mui/material/styles';
@@ -57,7 +57,7 @@ const getLabelPosition = (formattedArcLabel, variable) => (startAngle, endAngle,
   }
   return y;
 };
-export default function PieArcLabel(props) {
+function PieArcLabel(props) {
   const {
       id,
       classes: innerClasses,
@@ -98,12 +98,8 @@ process.env.NODE_ENV !== "production" ? PieArcLabel.propTypes = {
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
   classes: PropTypes.object,
-  cornerRadius: PropTypes.number,
-  dataIndex: PropTypes.number.isRequired,
-  highlightScope: PropTypes.shape({
-    faded: PropTypes.oneOf(['global', 'none', 'series']),
-    highlighted: PropTypes.oneOf(['item', 'none', 'series'])
-  }),
-  innerRadius: PropTypes.number,
-  outerRadius: PropTypes.number.isRequired
-} : void 0;
+  formattedArcLabel: PropTypes.string,
+  isFaded: PropTypes.bool.isRequired,
+  isHighlighted: PropTypes.bool.isRequired
+} : void 0;
+export { PieArcLabel };

package/modern/PieChart/PieArcLabelPlot.js

@@ -3,10 +3,11 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["slots", "slotProps", "innerRadius", "outerRadius", "cornerRadius", "paddingAngle", "id", "highlightScope", "highlighted", "faded", "data", "arcLabel", "arcLabelMinAngle", "skipAnimation"],
   _excluded2 = ["startAngle", "endAngle", "paddingAngle", "innerRadius", "outerRadius", "cornerRadius"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { useTransition } from '@react-spring/web';
 import { defaultLabelTransitionConfig } from './dataTransform/transition';
 import { useTransformData } from './dataTransform/useTransformData';
-import PieArcLabel from './PieArcLabel';
+import { PieArcLabel } from './PieArcLabel';
 import { jsx as _jsx } from "react/jsx-runtime";
 const RATIO = 180 / Math.PI;
 function getItemLabel(arcLabel, arcLabelMinAngle, item) {
@@ -22,7 +23,7 @@ function getItemLabel(arcLabel, arcLabelMinAngle, item) {
   }
   return arcLabel(item);
 }
-export function PieArcLabelPlot(props) {
+function PieArcLabelPlot(props) {
   const {
       slots,
       slotProps,
@@ -87,4 +88,92 @@ export function PieArcLabelPlot(props) {
       }, slotProps?.pieArcLabel));
     })
   }));
-}
+}
+process.env.NODE_ENV !== "production" ? PieArcLabelPlot.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The label displayed into the arc.
+   */
+  arcLabel: PropTypes.oneOfType([PropTypes.oneOf(['formattedValue', 'label', 'value']), PropTypes.func]),
+  /**
+   * The minimal angle required to display the arc label.
+   */
+  arcLabelMinAngle: PropTypes.number,
+  /**
+   * The radius applied to arc corners (similar to border radius).
+   * @default 0
+   */
+  cornerRadius: PropTypes.number,
+  data: PropTypes.arrayOf(PropTypes.shape({
+    color: PropTypes.string.isRequired,
+    endAngle: PropTypes.number.isRequired,
+    formattedValue: PropTypes.string.isRequired,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+    index: PropTypes.number.isRequired,
+    label: PropTypes.string,
+    padAngle: PropTypes.number.isRequired,
+    startAngle: PropTypes.number.isRequired,
+    value: PropTypes.number.isRequired
+  })).isRequired,
+  /**
+   * Override the arc attibutes when it is faded.
+   */
+  faded: PropTypes.shape({
+    additionalRadius: PropTypes.number,
+    color: PropTypes.string,
+    cornerRadius: PropTypes.number,
+    innerRadius: PropTypes.number,
+    outerRadius: PropTypes.number,
+    paddingAngle: PropTypes.number
+  }),
+  /**
+   * Override the arc attibutes when it is highlighted.
+   */
+  highlighted: PropTypes.shape({
+    additionalRadius: PropTypes.number,
+    color: PropTypes.string,
+    cornerRadius: PropTypes.number,
+    innerRadius: PropTypes.number,
+    outerRadius: PropTypes.number,
+    paddingAngle: PropTypes.number
+  }),
+  highlightScope: PropTypes.shape({
+    faded: PropTypes.oneOf(['global', 'none', 'series']),
+    highlighted: PropTypes.oneOf(['item', 'none', 'series'])
+  }),
+  id: PropTypes.string.isRequired,
+  /**
+   * The radius between circle center and the begining of the arc.
+   * @default 0
+   */
+  innerRadius: PropTypes.number,
+  /**
+   * The radius between circle center and the end of the arc.
+   * @default R_max The maximal radius that fit into the drawing area.
+   */
+  outerRadius: PropTypes.number.isRequired,
+  /**
+   * The padding angle (deg) between two arcs.
+   * @default 0
+   */
+  paddingAngle: PropTypes.number,
+  /**
+   * If `true`, animations are skiped.
+   * @default false
+   */
+  skipAnimation: PropTypes.bool,
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object
+} : void 0;
+export { PieArcLabelPlot };

package/modern/PieChart/PieArcPlot.js

@@ -3,12 +3,13 @@ import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWith
 const _excluded = ["slots", "slotProps", "innerRadius", "outerRadius", "cornerRadius", "paddingAngle", "id", "highlightScope", "highlighted", "faded", "data", "onClick", "skipAnimation"],
   _excluded2 = ["startAngle", "endAngle", "paddingAngle", "innerRadius", "outerRadius", "cornerRadius"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { useTransition } from '@react-spring/web';
-import PieArc from './PieArc';
+import { PieArc } from './PieArc';
 import { defaultTransitionConfig } from './dataTransform/transition';
 import { useTransformData } from './dataTransform/useTransformData';
 import { jsx as _jsx } from "react/jsx-runtime";
-export function PieArcPlot(props) {
+function PieArcPlot(props) {
   const {
       slots,
       slotProps,
@@ -80,4 +81,91 @@ export function PieArcPlot(props) {
       }, slotProps?.pieArc));
     })
   }));
-}
+}
+process.env.NODE_ENV !== "production" ? PieArcPlot.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The radius applied to arc corners (similar to border radius).
+   * @default 0
+   */
+  cornerRadius: PropTypes.number,
+  data: PropTypes.arrayOf(PropTypes.shape({
+    color: PropTypes.string.isRequired,
+    endAngle: PropTypes.number.isRequired,
+    formattedValue: PropTypes.string.isRequired,
+    id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+    index: PropTypes.number.isRequired,
+    label: PropTypes.string,
+    padAngle: PropTypes.number.isRequired,
+    startAngle: PropTypes.number.isRequired,
+    value: PropTypes.number.isRequired
+  })).isRequired,
+  /**
+   * Override the arc attibutes when it is faded.
+   */
+  faded: PropTypes.shape({
+    additionalRadius: PropTypes.number,
+    color: PropTypes.string,
+    cornerRadius: PropTypes.number,
+    innerRadius: PropTypes.number,
+    outerRadius: PropTypes.number,
+    paddingAngle: PropTypes.number
+  }),
+  /**
+   * Override the arc attibutes when it is highlighted.
+   */
+  highlighted: PropTypes.shape({
+    additionalRadius: PropTypes.number,
+    color: PropTypes.string,
+    cornerRadius: PropTypes.number,
+    innerRadius: PropTypes.number,
+    outerRadius: PropTypes.number,
+    paddingAngle: PropTypes.number
+  }),
+  highlightScope: PropTypes.shape({
+    faded: PropTypes.oneOf(['global', 'none', 'series']),
+    highlighted: PropTypes.oneOf(['item', 'none', 'series'])
+  }),
+  id: PropTypes.string.isRequired,
+  /**
+   * The radius between circle center and the begining of the arc.
+   * @default 0
+   */
+  innerRadius: PropTypes.number,
+  /**
+   * Callback fired when a pie item is clicked.
+   * @param {React.MouseEvent<SVGPathElement, MouseEvent>} event The event source of the callback.
+   * @param {PieItemIdentifier} pieItemIdentifier The pie item identifier.
+   * @param {DefaultizedPieValueType} item The pie item.
+   */
+  onClick: PropTypes.func,
+  /**
+   * The radius between circle center and the end of the arc.
+   * @default R_max The maximal radius that fit into the drawing area.
+   */
+  outerRadius: PropTypes.number.isRequired,
+  /**
+   * The padding angle (deg) between two arcs.
+   * @default 0
+   */
+  paddingAngle: PropTypes.number,
+  /**
+   * If `true`, animations are skiped.
+   * @default false
+   */
+  skipAnimation: PropTypes.bool,
+  /**
+   * The props used for each component slot.
+   * @default {}
+   */
+  slotProps: PropTypes.object,
+  /**
+   * Overridable component slots.
+   * @default {}
+   */
+  slots: PropTypes.object
+} : void 0;
+export { PieArcPlot };

package/modern/PieChart/index.js

@@ -1,4 +1,6 @@
-export * from './PiePlot';
 export * from './PieChart';
+export * from './PiePlot';
+export * from './PieArcPlot';
+export * from './PieArcLabelPlot';
 export * from './PieArc';
 export * from './PieArcLabel';

package/modern/ScatterChart/Scatter.js

@@ -78,7 +78,7 @@ process.env.NODE_ENV !== "production" ? Scatter.propTypes = {
   color: PropTypes.string.isRequired,
   markerSize: PropTypes.number.isRequired,
   series: PropTypes.shape({
-    color: PropTypes.string,
+    color: PropTypes.string.isRequired,
     data: PropTypes.arrayOf(PropTypes.shape({
       id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
       x: PropTypes.number.isRequired,

package/modern/ScatterChart/index.js

@@ -1,3 +1,3 @@
-export * from './ScatterPlot';
 export * from './ScatterChart';
+export * from './ScatterPlot';
 export * from './Scatter';

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-charts v7.0.0-alpha.2
+ * @mui/x-charts v7.0.0-alpha.3
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the

package/modern/internals/defaultizeValueFormatter.js

@@ -2,9 +2,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 function defaultizeValueFormatter(series, defaultValueFormatter) {
   const defaultizedSeries = {};
   Object.keys(series).forEach(seriesId => {
-    defaultizedSeries[seriesId] = _extends({
-      valueFormatter: defaultValueFormatter
-    }, series[seriesId]);
+    defaultizedSeries[seriesId] = _extends({}, series[seriesId], {
+      valueFormatter: series[seriesId].valueFormatter ?? defaultValueFormatter
+    });
   });
   return defaultizedSeries;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "7.0.0-alpha.2",
+  "version": "7.0.0-alpha.3",
   "description": "The community edition of the charts components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -30,6 +30,7 @@
   "dependencies": {
     "@babel/runtime": "^7.23.4",
     "@mui/base": "^5.0.0-beta.24",
+    "@mui/system": "^5.14.18",
     "@react-spring/rafz": "^9.7.3",
     "@react-spring/web": "^9.7.3",
     "clsx": "^2.0.0",
@@ -42,7 +43,6 @@
     "@emotion/react": "^11.9.0",
     "@emotion/styled": "^11.8.1",
     "@mui/material": "^5.4.1",
-    "@mui/system": "^5.4.1",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0"
   },