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

package/modern/ResponsiveChartContainer/index.js

@@ -1,43 +1,109 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["width", "height"];
 import * as React from 'react';
-import { ResizeObserver } from '@juggle/resize-observer';
+import useEnhancedEffect from '@mui/utils/useEnhancedEffect';
+import ownerWindow from '@mui/utils/ownerWindow';
+import { styled } from '@mui/material/styles';
 import { ChartContainer } from '../ChartContainer';
 import { jsx as _jsx } from "react/jsx-runtime";
 const useChartDimensions = (inWidth, inHeight) => {
-  const ref = React.useRef(null);
+  const rootRef = React.useRef(null);
+  const displayError = React.useRef(false);
   const [width, setWidth] = React.useState(0);
   const [height, setHeight] = React.useState(0);
+
+  // Adaptation of the `computeSizeAndPublishResizeEvent` from the grid.
+  const computeSize = React.useCallback(() => {
+    const mainEl = rootRef?.current;
+    if (!mainEl) {
+      return;
+    }
+    const win = ownerWindow(mainEl);
+    const computedStyle = win.getComputedStyle(mainEl);
+    const newHeight = parseFloat(computedStyle.height) || 0;
+    const newWidth = parseFloat(computedStyle.width) || 0;
+    setWidth(newWidth);
+    setHeight(newHeight);
+  }, []);
   React.useEffect(() => {
-    const element = ref.current;
-    if (element === null || inHeight !== undefined && inWidth !== undefined) {
+    // Ensure the error detection occurs after the first rendering.
+    displayError.current = true;
+  }, []);
+  useEnhancedEffect(() => {
+    if (inWidth !== undefined && inHeight !== undefined) {
       return () => {};
     }
-    const resizeObserver = new ResizeObserver(entries => {
-      if (Array.isArray(entries) && entries.length) {
-        const entry = entries[0];
-        if (inWidth === undefined) {
-          setWidth(entry.contentRect.width);
-        }
-        if (inHeight === undefined) {
-          setHeight(entry.contentRect.height);
-        }
-      }
+    computeSize();
+    const elementToObserve = rootRef.current;
+    if (typeof ResizeObserver === 'undefined') {
+      return () => {};
+    }
+    let animationFrame;
+    const observer = new ResizeObserver(() => {
+      // See https://github.com/mui/mui-x/issues/8733
+      animationFrame = window.requestAnimationFrame(() => {
+        computeSize();
+      });
     });
-    resizeObserver.observe(element);
-    return () => resizeObserver.disconnect();
-  }, [height, inHeight, inWidth, width]);
-  return [ref, inWidth ?? width, inHeight ?? height];
+    if (elementToObserve) {
+      observer.observe(elementToObserve);
+    }
+    return () => {
+      if (animationFrame) {
+        window.cancelAnimationFrame(animationFrame);
+      }
+      if (elementToObserve) {
+        observer.unobserve(elementToObserve);
+      }
+    };
+  }, [computeSize, inHeight, inWidth]);
+  if (process.env.NODE_ENV !== 'production') {
+    if (displayError.current && inWidth === undefined && width === 0) {
+      console.error(`MUI: Charts does not have \`width\` prop, and its container has no \`width\` defined.`);
+      displayError.current = false;
+    }
+    if (displayError.current && inHeight === undefined && height === 0) {
+      console.error(`MUI: Charts does not have \`height\` prop, and its container has no \`height\` defined.`);
+      displayError.current = false;
+    }
+  }
+  return [rootRef, inWidth ?? width, inHeight ?? height];
 };
+const ResizableContainer = styled('div', {
+  name: 'MuiResponsiveChart',
+  slot: 'Container'
+})(({
+  ownerState
+}) => ({
+  width: ownerState.width ?? '100%',
+  height: ownerState.height ?? '100%',
+  display: 'flex',
+  position: 'relative',
+  flexGrow: 1,
+  flexDirection: 'column',
+  alignItems: 'center',
+  justifyContent: 'center',
+  overflow: 'hidden',
+  '&>svg': {
+    width: '100%',
+    height: '100%'
+  }
+}));
 export function ResponsiveChartContainer(props) {
-  const [containerRef, width, height] = useChartDimensions(props.width, props.height);
-  return /*#__PURE__*/_jsx("div", {
+  const {
+      width: propsWidth,
+      height: propsHeight
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
+  const [containerRef, width, height] = useChartDimensions(propsWidth, propsHeight);
+  return /*#__PURE__*/_jsx(ResizableContainer, {
     ref: containerRef,
-    style: {
-      width: props.width ?? '100%',
-      height: props.height ?? '100%',
-      padding: 0
+    ownerState: {
+      width: props.width,
+      height: props.height
     },
-    children: /*#__PURE__*/_jsx(ChartContainer, _extends({}, props, {
+    children: /*#__PURE__*/_jsx(ChartContainer, _extends({}, other, {
       width: width,
       height: height
     }))

package/modern/ScatterChart/Scatter.js

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

package/modern/ScatterChart/ScatterChart.js

@@ -62,7 +62,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     y: PropTypes.oneOf(['line', 'none'])
   }),
   /**
-   * Indicate which axis to display the the bottom of the charts.
+   * 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
    */
@@ -89,7 +89,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   disableAxisListener: PropTypes.bool,
   height: PropTypes.number,
   /**
-   * Indicate which axis to display the the left of the charts.
+   * 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
    */
@@ -109,6 +109,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   legend: PropTypes.shape({
     classes: PropTypes.object,
     direction: PropTypes.oneOf(['column', 'row']),
+    hidden: PropTypes.bool,
     itemWidth: PropTypes.number,
     markSize: PropTypes.number,
     offset: PropTypes.shape({
@@ -128,7 +129,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     top: PropTypes.number
   }),
   /**
-   * Indicate which axis to display the the right of the charts.
+   * 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
    */
@@ -173,7 +174,7 @@ process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
     trigger: PropTypes.oneOf(['axis', 'item', 'none'])
   }),
   /**
-   * Indicate which axis to display the the top of the charts.
+   * 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
    */

package/modern/ScatterChart/legend.js

@@ -0,0 +1,13 @@
+const legendGetter = params => {
+  const {
+    seriesOrder,
+    series
+  } = params;
+  const data = seriesOrder.map(seriesId => ({
+    color: series[seriesId].color,
+    label: series[seriesId].label,
+    id: seriesId
+  }));
+  return data.filter(item => item.label !== undefined);
+};
+export default legendGetter;

package/modern/context/SeriesContextProvider.js

@@ -4,6 +4,7 @@ import { useTheme } from '@mui/material/styles';
 import barSeriesFormatter from '../BarChart/formatter';
 import scatterSeriesFormatter from '../ScatterChart/formatter';
 import lineSeriesFormatter from '../LineChart/formatter';
+import pieSeriesFormatter from '../PieChart/formatter';
 import { defaultizeColor } from '../internals/defaultizeColor';
 import { blueberryTwilightPalette } from '../colorPalettes';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -11,8 +12,17 @@ export const SeriesContext = /*#__PURE__*/React.createContext({});
 const seriesTypeFormatter = {
   bar: barSeriesFormatter,
   scatter: scatterSeriesFormatter,
-  line: lineSeriesFormatter
+  line: lineSeriesFormatter,
+  pie: pieSeriesFormatter
 };
+/**
+ * This methods is the interface between what the developper is providing and what compoenents receives
+ * To simplify the components behaviors, it groups series by type, such that LinePlots props are not updated if soe line data are modified
+ * It also add defaultized values such as the ids, colors
+ * @param series The array of series provided by devs
+ * @param colors The color palette used to defaultize series colors
+ * @returns An object structuring all the series by type.
+ */
 const formatSeries = (series, colors) => {
   // Group series by type
   const seriesGroups = {};

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-charts v6.0.0-alpha.0
+ * @mui/x-charts v6.0.0-alpha.2
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -17,6 +17,7 @@ export * from './ChartsTooltip';
 export * from './ChartsAxisHighlight';
 export * from './BarChart';
 export * from './LineChart';
+export * from './PieChart';
 export * from './ScatterChart';
 export * from './ChartContainer';
 export * from './ResponsiveChartContainer';

package/modern/internals/defaultizeColor.js

@@ -1,6 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 const DEFAULT_COLORS = ['#1f77b4', '#ff7f0e', '#2ca02c', '#d62728', '#9467bd', '#8c564b', '#e377c2', '#7f7f7f', '#bcbd22', '#17becf'];
 export function defaultizeColor(series, seriesIndex, colors = DEFAULT_COLORS) {
+  if (series.type === 'pie') {
+    return _extends({}, series, {
+      data: series.data.map((d, index) => _extends({
+        color: colors[index % colors.length]
+      }, d))
+    });
+  }
   return _extends({
     color: colors[seriesIndex % colors.length]
   }, series);

package/modern/models/seriesType/index.js

@@ -1,12 +1,5 @@
-// import { PieSeriesType } from './pie';
-
-// | PieSeriesType;
-
-// | PieSeriesType;
-
-// | PieSeriesType
-
 export * from './line';
 export * from './bar';
 export * from './scatter';
+export * from './pie';
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "6.0.0-alpha.0",
+  "version": "6.0.0-alpha.2",
   "description": "The community edition of the charts components (MUI X).",
   "author": "MUI Team",
   "main": "./index.js",
@@ -28,12 +28,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.22.5",
-    "@juggle/resize-observer": "^3.4.0",
     "@types/d3-color": "^3.1.0",
     "@types/d3-scale": "^4.0.3",
     "@types/d3-shape": "^3.1.1",
     "clsx": "^1.2.1",
-    "d3-array": "^3.2.4",
     "d3-color": "^3.1.0",
     "d3-scale": "^4.0.2",
     "d3-shape": "^3.2.0",