@mui/x-charts 8.0.0-alpha.12 → 8.0.0-alpha.14

package/BarChart/BarChart.d.ts

@@ -18,7 +18,7 @@ export interface BarChartProps extends Omit<ChartContainerProps<'bar', BarChartP
    * The series to display in the bar chart.
    * An array of [[BarSeriesType]] objects.
    */
-  series: MakeOptional<BarSeriesType, 'type'>[];
+  series: Readonly<MakeOptional<BarSeriesType, 'type'>[]>;
   /**
    * Option to display a cartesian grid in the background.
    */

package/BarChart/BarChart.js

@@ -99,12 +99,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    * Defines the border radius of the bar element.
    */
   borderRadius: _propTypes.default.number,
-  /**
-   * Indicate which axis to display the bottom of the charts.
-   * Can be a string (the id of the axis) or an object `ChartsXAxisProps`.
-   * @default xAxisIds[0] The id of the first provided axis
-   */
-  bottomAxis: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   children: _propTypes.default.node,
   className: _propTypes.default.string,
   /**
@@ -156,12 +150,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    * @default 'vertical'
    */
   layout: _propTypes.default.oneOf(['horizontal', 'vertical']),
-  /**
-   * Indicate which axis to display the left of the charts.
-   * Can be a string (the id of the axis) or an object `ChartsYAxisProps`.
-   * @default yAxisIds[0] The id of the first provided axis
-   */
-  leftAxis: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   /**
    * If `true`, a loading overlay is displayed.
    * @default false
@@ -170,14 +158,15 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
   /**
    * The margin between the SVG and the drawing area.
    * It's used for leaving some space for extra information such as the x- and y-axis or legend.
-   * Accepts an object with the optional properties: `top`, `bottom`, `left`, and `right`.
+   *
+   * Accepts a `number` to be used on all sides or an object with the optional properties: `top`, `bottom`, `left`, and `right`.
    */
-  margin: _propTypes.default.shape({
+  margin: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.shape({
     bottom: _propTypes.default.number,
     left: _propTypes.default.number,
     right: _propTypes.default.number,
     top: _propTypes.default.number
-  }),
+  })]),
   /**
    * The function called for onClick events.
    * The second argument contains information about all line/bar elements at the current mouse position.
@@ -197,12 +186,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    * @param {BarItemIdentifier} barItemIdentifier The bar item identifier.
    */
   onItemClick: _propTypes.default.func,
-  /**
-   * Indicate which axis to display the right of the charts.
-   * Can be a string (the id of the axis) or an object `ChartsYAxisProps`.
-   * @default null
-   */
-  rightAxis: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   /**
    * The series to display in the bar chart.
    * An array of [[BarSeriesType]] objects.
@@ -226,12 +209,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
   sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
   theme: _propTypes.default.oneOf(['dark', 'light']),
   title: _propTypes.default.string,
-  /**
-   * Indicate which axis to display the top of the charts.
-   * Can be a string (the id of the axis) or an object `ChartsXAxisProps`.
-   * @default null
-   */
-  topAxis: _propTypes.default.oneOfType([_propTypes.default.object, _propTypes.default.string]),
   /**
    * The width of the chart in px. If not defined, it takes the width of the parent element.
    */
@@ -242,6 +219,7 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    * An array of [[AxisConfig]] objects.
    */
   xAxis: _propTypes.default.arrayOf(_propTypes.default.shape({
+    axis: _propTypes.default.oneOf(['x']),
     classes: _propTypes.default.object,
     colorMap: _propTypes.default.oneOfType([_propTypes.default.shape({
       colors: _propTypes.default.arrayOf(_propTypes.default.string).isRequired,
@@ -264,13 +242,15 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     disableTicks: _propTypes.default.bool,
     domainLimit: _propTypes.default.oneOfType([_propTypes.default.oneOf(['nice', 'strict']), _propTypes.default.func]),
     fill: _propTypes.default.string,
+    height: _propTypes.default.number,
     hideTooltip: _propTypes.default.bool,
     id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
     label: _propTypes.default.string,
     labelStyle: _propTypes.default.object,
     max: _propTypes.default.oneOfType([_propTypes.default.instanceOf(Date), _propTypes.default.number]),
     min: _propTypes.default.oneOfType([_propTypes.default.instanceOf(Date), _propTypes.default.number]),
-    position: _propTypes.default.oneOf(['bottom', 'top']),
+    offset: _propTypes.default.number,
+    position: _propTypes.default.oneOf(['bottom', 'none', 'top']),
     reverse: _propTypes.default.bool,
     scaleType: _propTypes.default.oneOf(['band', 'linear', 'log', 'point', 'pow', 'sqrt', 'time', 'utc']),
     slotProps: _propTypes.default.object,
@@ -279,6 +259,7 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     sx: _propTypes.default.oneOfType([_propTypes.default.arrayOf(_propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object, _propTypes.default.bool])), _propTypes.default.func, _propTypes.default.object]),
     tickInterval: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.array, _propTypes.default.func]),
     tickLabelInterval: _propTypes.default.oneOfType([_propTypes.default.oneOf(['auto']), _propTypes.default.func]),
+    tickLabelMinGap: _propTypes.default.number,
     tickLabelPlacement: _propTypes.default.oneOf(['middle', 'tick']),
     tickLabelStyle: _propTypes.default.object,
     tickMaxStep: _propTypes.default.number,
@@ -294,6 +275,7 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    * An array of [[AxisConfig]] objects.
    */
   yAxis: _propTypes.default.arrayOf(_propTypes.default.shape({
+    axis: _propTypes.default.oneOf(['y']),
     classes: _propTypes.default.object,
     colorMap: _propTypes.default.oneOfType([_propTypes.default.shape({
       colors: _propTypes.default.arrayOf(_propTypes.default.string).isRequired,
@@ -322,7 +304,8 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     labelStyle: _propTypes.default.object,
     max: _propTypes.default.oneOfType([_propTypes.default.instanceOf(Date), _propTypes.default.number]),
     min: _propTypes.default.oneOfType([_propTypes.default.instanceOf(Date), _propTypes.default.number]),
-    position: _propTypes.default.oneOf(['left', 'right']),
+    offset: _propTypes.default.number,
+    position: _propTypes.default.oneOf(['left', 'none', 'right']),
     reverse: _propTypes.default.bool,
     scaleType: _propTypes.default.oneOf(['band', 'linear', 'log', 'point', 'pow', 'sqrt', 'time', 'utc']),
     slotProps: _propTypes.default.object,
@@ -338,6 +321,7 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     tickNumber: _propTypes.default.number,
     tickPlacement: _propTypes.default.oneOf(['end', 'extremities', 'middle', 'start']),
     tickSize: _propTypes.default.number,
-    valueFormatter: _propTypes.default.func
+    valueFormatter: _propTypes.default.func,
+    width: _propTypes.default.number
   }))
 } : void 0;

package/BarChart/BarPlot.js

@@ -86,7 +86,7 @@ const useAggregatedData = () => {
       const xAxisConfig = xAxis[xAxisId];
       const yAxisConfig = yAxis[yAxisId];
       const verticalLayout = series[seriesId].layout === 'vertical';
-      (0, _checkScaleErrors.checkScaleErrors)(verticalLayout, seriesId, xAxisId, xAxis, yAxisId, yAxis);
+      (0, _checkScaleErrors.checkScaleErrors)(verticalLayout, seriesId, series[seriesId], xAxisId, xAxis, yAxisId, yAxis);
       const baseScaleConfig = verticalLayout ? xAxisConfig : yAxisConfig;
       const xScale = xAxisConfig.scale;
       const yScale = yAxisConfig.scale;
@@ -102,9 +102,12 @@ const useAggregatedData = () => {
       });
       const barOffset = groupIndex * (barWidth + offset);
       const {
-        stackedData
+        stackedData,
+        data: currentSeriesData,
+        layout
       } = series[seriesId];
-      return stackedData.map((values, dataIndex) => {
+      return baseScaleConfig.data.map((baseValue, dataIndex) => {
+        const values = stackedData[dataIndex];
         const valueCoordinates = values.map(v => verticalLayout ? yScale(v) : xScale(v));
         const minValueCoord = Math.round(Math.min(...valueCoordinates));
         const maxValueCoord = Math.round(Math.max(...valueCoordinates));
@@ -112,15 +115,15 @@ const useAggregatedData = () => {
         const result = {
           seriesId,
           dataIndex,
-          layout: series[seriesId].layout,
-          x: verticalLayout ? xScale(xAxis[xAxisId].data?.[dataIndex]) + barOffset : minValueCoord,
-          y: verticalLayout ? minValueCoord : yScale(yAxis[yAxisId].data?.[dataIndex]) + barOffset,
+          layout,
+          x: verticalLayout ? xScale(baseValue) + barOffset : minValueCoord,
+          y: verticalLayout ? minValueCoord : yScale(baseValue) + barOffset,
           xOrigin: xScale(0),
           yOrigin: yScale(0),
           height: verticalLayout ? maxValueCoord - minValueCoord : barWidth,
           width: verticalLayout ? barWidth : maxValueCoord - minValueCoord,
           color: colorGetter(dataIndex),
-          value: series[seriesId].data[dataIndex],
+          value: currentSeriesData[dataIndex],
           maskId: `${chartId}_${stackId || seriesId}_${groupIndex}_${dataIndex}`
         };
         if (result.x > xMax || result.x + result.width < xMin || result.y > yMax || result.y + result.height < yMin) {

package/BarChart/checkScaleErrors.d.ts

@@ -1,6 +1,9 @@
 import { AxisDefaultized, AxisId } from "../models/axis.js";
+import { DefaultizedBarSeriesType } from "../models/seriesType/bar.js";
 import { SeriesId } from "../models/seriesType/common.js";
-export declare function checkScaleErrors(verticalLayout: boolean, seriesId: SeriesId, xAxisId: AxisId, xAxis: {
+export declare function checkScaleErrors(verticalLayout: boolean, seriesId: SeriesId, series: DefaultizedBarSeriesType & {
+  stackedData: [number, number][];
+}, xAxisId: AxisId, xAxis: {
   [axisId: AxisId]: AxisDefaultized;
 }, yAxisId: AxisId, yAxis: {
   [axisId: AxisId]: AxisDefaultized;

package/BarChart/checkScaleErrors.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkScaleErrors = checkScaleErrors;
+var _warning = require("@mui/x-internals/warning");
 var _constants = require("../constants");
 var _axis = require("../models/axis");
 const getAxisMessage = (axisDirection, axisId) => {
@@ -12,7 +13,7 @@ const getAxisMessage = (axisDirection, axisId) => {
   const axisDefaultKey = axisDirection === 'x' ? _constants.DEFAULT_X_AXIS_KEY : _constants.DEFAULT_Y_AXIS_KEY;
   return axisId === axisDefaultKey ? `The first \`${axisIdName}\`` : `The ${axisName} with id "${axisId}"`;
 };
-function checkScaleErrors(verticalLayout, seriesId, xAxisId, xAxis, yAxisId, yAxis) {
+function checkScaleErrors(verticalLayout, seriesId, series, xAxisId, xAxis, yAxisId, yAxis) {
   const xAxisConfig = xAxis[xAxisId];
   const yAxisConfig = yAxis[yAxisId];
   const discreteAxisConfig = verticalLayout ? xAxisConfig : yAxisConfig;
@@ -30,4 +31,9 @@ function checkScaleErrors(verticalLayout, seriesId, xAxisId, xAxis, yAxisId, yAx
   if ((0, _axis.isBandScaleConfig)(continuousAxisConfig) || (0, _axis.isPointScaleConfig)(continuousAxisConfig)) {
     throw new Error(`MUI X: ${getAxisMessage(continuousAxisDirection, continuousAxisId)} should be a continuous type to display the bar series of id "${seriesId}".`);
   }
+  if (process.env.NODE_ENV !== 'production') {
+    if (discreteAxisConfig.data.length < series.stackedData.length) {
+      (0, _warning.warnOnce)([`MUI X: ${getAxisMessage(discreteAxisDirection, discreteAxisId)} has less data (${discreteAxisConfig.data.length} values) than the bar series of id "${seriesId}" (${series.stackedData.length} values).`, 'The axis data should have at least the same length than the series using it.'], 'error');
+    }
+  }
 }

package/BarChart/seriesConfig/extremums.d.ts

@@ -1,3 +1,3 @@
-import { CartesianExtremumGetter } from "../../internals/plugins/models/seriesConfig/extremumGetter.types.js";
+import { CartesianExtremumGetter } from "../../internals/plugins/models/seriesConfig/index.js";
 export declare const getExtremumX: CartesianExtremumGetter<'bar'>;
 export declare const getExtremumY: CartesianExtremumGetter<'bar'>;

package/BarChart/seriesConfig/getSeriesWithDefaultValues.d.ts

@@ -0,0 +1,3 @@
+import type { GetSeriesWithDefaultValues } from '../../internals/plugins/models/seriesConfig';
+declare const getSeriesWithDefaultValues: GetSeriesWithDefaultValues<'bar'>;
+export default getSeriesWithDefaultValues;

package/{internals/defaultizeColor.js → BarChart/seriesConfig/getSeriesWithDefaultValues.js}

@@ -4,17 +4,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultizeColor = defaultizeColor;
+exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-function defaultizeColor(series, seriesIndex, colors) {
-  if (series.type === 'pie') {
-    return (0, _extends2.default)({}, series, {
-      data: series.data.map((d, index) => (0, _extends2.default)({
-        color: colors[index % colors.length]
-      }, d))
-    });
-  }
+const getSeriesWithDefaultValues = (seriesData, seriesIndex, colors) => {
   return (0, _extends2.default)({
+    id: seriesData.id ?? `auto-generated-id-${seriesIndex}`,
     color: colors[seriesIndex % colors.length]
-  }, series);
-}
+  }, seriesData);
+};
+var _default = exports.default = getSeriesWithDefaultValues;

package/BarChart/seriesConfig/index.js

@@ -10,11 +10,13 @@ var _seriesProcessor = _interopRequireDefault(require("./seriesProcessor"));
 var _legend = _interopRequireDefault(require("./legend"));
 var _getColor = _interopRequireDefault(require("./getColor"));
 var _tooltip = _interopRequireDefault(require("./tooltip"));
+var _getSeriesWithDefaultValues = _interopRequireDefault(require("./getSeriesWithDefaultValues"));
 const seriesConfig = exports.seriesConfig = {
   seriesProcessor: _seriesProcessor.default,
   colorProcessor: _getColor.default,
   legendGetter: _legend.default,
   tooltipGetter: _tooltip.default,
   xExtremumGetter: _extremums.getExtremumX,
-  yExtremumGetter: _extremums.getExtremumY
+  yExtremumGetter: _extremums.getExtremumY,
+  getSeriesWithDefaultValues: _getSeriesWithDefaultValues.default
 };

package/BarChart/useBarChartProps.js

@@ -10,9 +10,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var _useId = _interopRequireDefault(require("@mui/utils/useId"));
 var _constants = require("../constants");
-var _calculateMargins = require("../internals/calculateMargins");
 var _BarChart = require("./BarChart.plugins");
-const _excluded = ["xAxis", "yAxis", "series", "width", "height", "margin", "colors", "dataset", "sx", "axisHighlight", "grid", "topAxis", "leftAxis", "rightAxis", "bottomAxis", "children", "slots", "slotProps", "skipAnimation", "loading", "layout", "onItemClick", "highlightedItem", "onHighlightChange", "borderRadius", "barLabel", "className", "hideLegend"];
+const _excluded = ["xAxis", "yAxis", "series", "width", "height", "margin", "colors", "dataset", "sx", "axisHighlight", "grid", "children", "slots", "slotProps", "skipAnimation", "loading", "layout", "onItemClick", "highlightedItem", "onHighlightChange", "borderRadius", "barLabel", "className", "hideLegend"];
 /**
  * A helper function that extracts BarChartProps from the input props
  * and returns an object with props for the children components of BarChart.
@@ -33,10 +32,6 @@ const useBarChartProps = props => {
       sx,
       axisHighlight,
       grid,
-      topAxis,
-      leftAxis,
-      rightAxis,
-      bottomAxis,
       children,
       slots,
       slotProps,
@@ -48,8 +43,7 @@ const useBarChartProps = props => {
       onHighlightChange,
       borderRadius,
       barLabel,
-      className,
-      hideLegend
+      className
     } = props,
     rest = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const id = (0, _useId.default)();
@@ -69,12 +63,7 @@ const useBarChartProps = props => {
     })),
     width,
     height,
-    margin: (0, _calculateMargins.calculateMargins)({
-      margin,
-      hideLegend,
-      slotProps,
-      series
-    }),
+    margin,
     colors,
     dataset,
     xAxis: xAxis ?? (hasHorizontalSeries ? undefined : [(0, _extends2.default)({
@@ -113,10 +102,6 @@ const useBarChartProps = props => {
     loading
   };
   const chartsAxisProps = {
-    topAxis,
-    leftAxis,
-    rightAxis,
-    bottomAxis,
     slots,
     slotProps
   };