@mui/x-charts 8.0.0-beta.2 → 8.0.0-beta.3

package/LineChart/CircleMarkElement.js

@@ -12,7 +12,7 @@ var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runt
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styles = require("@mui/material/styles");
-var _web = require("@react-spring/web");
+var _animation = require("../internals/animation/animation");
 var _useInteractionItemProps = require("../hooks/useInteractionItemProps");
 var _useItemHighlighted = require("../hooks/useItemHighlighted");
 var _markElementClasses = require("./markElementClasses");
@@ -21,6 +21,14 @@ var _useChartCartesianAxis = require("../internals/plugins/featurePlugins/useCha
 var _useStore = require("../internals/store/useStore");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["x", "y", "id", "classes", "color", "dataIndex", "onClick", "skipAnimation"];
+const Circle = (0, _styles.styled)('circle')({
+  [`&.${_markElementClasses.markElementClasses.animate}`]: {
+    transitionDuration: `${_animation.ANIMATION_DURATION_MS}ms`,
+    transitionProperty: 'cx, cy',
+    transitionTimingFunction: _animation.ANIMATION_TIMING_FUNCTION
+  }
+});
+
 /**
  * The line mark element that only render circle for performance improvement.
  *
@@ -58,33 +66,19 @@ function CircleMarkElement(props) {
     seriesId: id
   });
   const store = (0, _useStore.useStore)();
-  const xAxisIdentifier = (0, _useSelector.useSelector)(store, _useChartCartesianAxis.selectorChartsInteractionXAxis);
-  const cx = (0, _web.useSpringValue)(x, {
-    immediate: skipAnimation
-  });
-  const cy = (0, _web.useSpringValue)(y, {
-    immediate: skipAnimation
-  });
-  React.useEffect(() => {
-    cy.start(y, {
-      immediate: skipAnimation
-    });
-    cx.start(x, {
-      immediate: skipAnimation
-    });
-  }, [cy, y, cx, x, skipAnimation]);
+  const xAxisInteractionIndex = (0, _useSelector.useSelector)(store, _useChartCartesianAxis.selectorChartsInteractionXAxisIndex);
   const ownerState = {
     id,
     classes: innerClasses,
-    isHighlighted: xAxisIdentifier?.index === dataIndex || isHighlighted,
+    isHighlighted: xAxisInteractionIndex === dataIndex || isHighlighted,
     isFaded,
-    color
+    color,
+    skipAnimation
   };
   const classes = (0, _markElementClasses.useUtilityClasses)(ownerState);
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_web.animated.circle, (0, _extends2.default)({}, other, {
-    // @ts-expect-error
-    cx: cx,
-    cy: cy,
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(Circle, (0, _extends2.default)({}, other, {
+    cx: x,
+    cy: y,
     r: 5,
     fill: (theme.vars || theme).palette.background.paper,
     stroke: color,

package/LineChart/LineChart.js

@@ -245,6 +245,7 @@ process.env.NODE_ENV !== "production" ? LineChart.propTypes = {
     height: _propTypes.default.number,
     hideTooltip: _propTypes.default.bool,
     id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+    ignoreTooltip: _propTypes.default.bool,
     label: _propTypes.default.string,
     labelStyle: _propTypes.default.object,
     max: _propTypes.default.oneOfType([_propTypes.default.instanceOf(Date), _propTypes.default.number]),
@@ -300,6 +301,7 @@ process.env.NODE_ENV !== "production" ? LineChart.propTypes = {
     fill: _propTypes.default.string,
     hideTooltip: _propTypes.default.bool,
     id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]),
+    ignoreTooltip: _propTypes.default.bool,
     label: _propTypes.default.string,
     labelStyle: _propTypes.default.object,
     max: _propTypes.default.oneOfType([_propTypes.default.instanceOf(Date), _propTypes.default.number]),

package/LineChart/LineHighlightPlot.js

@@ -52,9 +52,8 @@ function LineHighlightPlot(props) {
     instance
   } = (0, _ChartProvider.useChartContext)();
   const store = (0, _useStore.useStore)();
-  const xAxisIdentifier = (0, _useSelector.useSelector)(store, _useChartCartesianAxis.selectorChartsInteractionXAxis);
-  const highlightedIndex = xAxisIdentifier?.index;
-  if (highlightedIndex === undefined) {
+  const highlightedIndex = (0, _useSelector.useSelector)(store, _useChartCartesianAxis.selectorChartsInteractionXAxisIndex);
+  if (highlightedIndex === null) {
     return null;
   }
   if (seriesData === undefined) {

package/LineChart/MarkElement.js

@@ -13,17 +13,17 @@ var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styles = require("@mui/material/styles");
 var _d3Shape = require("@mui/x-charts-vendor/d3-shape");
-var _web = require("@react-spring/web");
+var _animation = require("../internals/animation/animation");
 var _getSymbol = require("../internals/getSymbol");
 var _useInteractionItemProps = require("../hooks/useInteractionItemProps");
 var _useItemHighlighted = require("../hooks/useItemHighlighted");
-var _markElementClasses = require("./markElementClasses");
 var _useChartCartesianAxis = require("../internals/plugins/featurePlugins/useChartCartesianAxis");
+var _markElementClasses = require("./markElementClasses");
 var _useSelector = require("../internals/store/useSelector");
 var _useStore = require("../internals/store/useStore");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["x", "y", "id", "classes", "color", "shape", "dataIndex", "onClick", "skipAnimation"];
-const MarkElementPath = (0, _styles.styled)(_web.animated.path, {
+const MarkElementPath = (0, _styles.styled)('path', {
   name: 'MuiMarkElement',
   slot: 'Root',
   overridesResolver: (_, styles) => styles.root
@@ -33,7 +33,12 @@ const MarkElementPath = (0, _styles.styled)(_web.animated.path, {
 }) => ({
   fill: (theme.vars || theme).palette.background.paper,
   stroke: ownerState.color,
-  strokeWidth: 2
+  strokeWidth: 2,
+  [`&.${_markElementClasses.markElementClasses.animate}`]: {
+    transitionDuration: `${_animation.ANIMATION_DURATION_MS}ms`,
+    transitionProperty: 'transform, transform-origin',
+    transitionTimingFunction: _animation.ANIMATION_TIMING_FUNCTION
+  }
 }));
 /**
  * Demos:
@@ -70,37 +75,22 @@ function MarkElement(props) {
     seriesId: id
   });
   const store = (0, _useStore.useStore)();
-  const xAxisIdentifier = (0, _useSelector.useSelector)(store, _useChartCartesianAxis.selectorChartsInteractionXAxis);
-  const cx = (0, _web.useSpringValue)(x, {
-    immediate: skipAnimation
-  });
-  const cy = (0, _web.useSpringValue)(y, {
-    immediate: skipAnimation
-  });
-  React.useEffect(() => {
-    cy.start(y, {
-      immediate: skipAnimation
-    });
-    cx.start(x, {
-      immediate: skipAnimation
-    });
-  }, [cy, y, cx, x, skipAnimation]);
+  const xAxisInteractionIndex = (0, _useSelector.useSelector)(store, _useChartCartesianAxis.selectorChartsInteractionXAxisIndex);
   const ownerState = {
     id,
     classes: innerClasses,
-    isHighlighted: xAxisIdentifier?.index === dataIndex || isHighlighted,
+    isHighlighted: xAxisInteractionIndex === dataIndex || isHighlighted,
     isFaded,
-    color
+    color,
+    skipAnimation
   };
   const classes = (0, _markElementClasses.useUtilityClasses)(ownerState);
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(MarkElementPath, (0, _extends2.default)({}, other, {
     style: {
-      transform: (0, _web.to)([cx, cy], (pX, pY) => `translate(${pX}px, ${pY}px)`),
-      transformOrigin: (0, _web.to)([cx, cy], (pX, pY) => `${pX}px ${pY}px`)
+      transform: `translate(${x}px, ${y}px)`,
+      transformOrigin: `${x}px ${y}px`
     },
-    ownerState: ownerState
-    // @ts-expect-error
-    ,
+    ownerState: ownerState,
     className: classes.root,
     d: (0, _d3Shape.symbol)(_d3Shape.symbolsFill[(0, _getSymbol.getSymbol)(shape)])(),
     onClick: onClick,
@@ -124,7 +114,6 @@ process.env.NODE_ENV !== "production" ? MarkElement.propTypes = {
   shape: _propTypes.default.oneOf(['circle', 'cross', 'diamond', 'square', 'star', 'triangle', 'wye']).isRequired,
   /**
    * If `true`, animations are skipped.
-   * @default false
    */
   skipAnimation: _propTypes.default.bool
 } : void 0;

package/LineChart/MarkPlot.js

@@ -171,7 +171,6 @@ process.env.NODE_ENV !== "production" ? MarkPlot.propTypes = {
   onItemClick: _propTypes.default.func,
   /**
    * If `true`, animations are skipped.
-   * @default false
    */
   skipAnimation: _propTypes.default.bool,
   /**

package/LineChart/markElementClasses.d.ts

@@ -6,6 +6,8 @@ export interface MarkElementClasses {
   highlighted: string;
   /** Styles applied to the root element when faded. */
   faded: string;
+  /** Styles applied to the root element when animation is not skipped. */
+  animate: string;
 }
 export type MarkElementClassKey = keyof MarkElementClasses;
 export interface MarkElementOwnerState {
@@ -14,6 +16,7 @@ export interface MarkElementOwnerState {
   isFaded: boolean;
   isHighlighted: boolean;
   classes?: Partial<MarkElementClasses>;
+  skipAnimation?: boolean;
 }
 export declare function getMarkElementUtilityClass(slot: string): string;
 export declare const markElementClasses: MarkElementClasses;

package/LineChart/markElementClasses.js

@@ -12,16 +12,17 @@ var _generateUtilityClasses = _interopRequireDefault(require("@mui/utils/generat
 function getMarkElementUtilityClass(slot) {
   return (0, _generateUtilityClass.default)('MuiMarkElement', slot);
 }
-const markElementClasses = exports.markElementClasses = (0, _generateUtilityClasses.default)('MuiMarkElement', ['root', 'highlighted', 'faded']);
+const markElementClasses = exports.markElementClasses = (0, _generateUtilityClasses.default)('MuiMarkElement', ['root', 'highlighted', 'faded', 'animate']);
 const useUtilityClasses = ownerState => {
   const {
     classes,
     id,
     isFaded,
-    isHighlighted
+    isHighlighted,
+    skipAnimation
   } = ownerState;
   const slots = {
-    root: ['root', `series-${id}`, isHighlighted && 'highlighted', isFaded && 'faded']
+    root: ['root', `series-${id}`, isHighlighted && 'highlighted', isFaded && 'faded', skipAnimation ? undefined : 'animate']
   };
   return (0, _composeClasses.default)(slots, getMarkElementUtilityClass, classes);
 };

package/LineChart/seriesConfig/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,13 +10,14 @@ var _extremums = require("./extremums");
 var _seriesProcessor = _interopRequireDefault(require("./seriesProcessor"));
 var _getColor = _interopRequireDefault(require("./getColor"));
 var _legend = _interopRequireDefault(require("./legend"));
-var _tooltip = _interopRequireDefault(require("./tooltip"));
+var _tooltip = _interopRequireWildcard(require("./tooltip"));
 var _getSeriesWithDefaultValues = _interopRequireDefault(require("./getSeriesWithDefaultValues"));
 const seriesConfig = exports.seriesConfig = {
   colorProcessor: _getColor.default,
   seriesProcessor: _seriesProcessor.default,
   legendGetter: _legend.default,
   tooltipGetter: _tooltip.default,
+  axisTooltipGetter: _tooltip.axisTooltipGetter,
   xExtremumGetter: _extremums.getExtremumX,
   yExtremumGetter: _extremums.getExtremumY,
   getSeriesWithDefaultValues: _getSeriesWithDefaultValues.default

package/LineChart/seriesConfig/tooltip.d.ts

@@ -1,3 +1,4 @@
-import type { TooltipGetter } from '../../internals/plugins/models';
+import type { AxisTooltipGetter, TooltipGetter } from '../../internals/plugins/models';
 declare const tooltipGetter: TooltipGetter<'line'>;
+export declare const axisTooltipGetter: AxisTooltipGetter<'line', 'x' | 'y'>;
 export default tooltipGetter;

package/LineChart/seriesConfig/tooltip.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.axisTooltipGetter = void 0;
 var _getLabel = require("../../internals/getLabel");
 const tooltipGetter = params => {
   const {
@@ -28,4 +28,11 @@ const tooltipGetter = params => {
     markType: series.labelMarkType
   };
 };
+const axisTooltipGetter = series => {
+  return Object.values(series).map(s => ({
+    direction: 'x',
+    axisId: s.xAxisId
+  }));
+};
+exports.axisTooltipGetter = axisTooltipGetter;
 var _default = exports.default = tooltipGetter;

package/PieChart/PieArc.d.ts

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { SpringValue } from '@react-spring/web';
 import { PieItemId } from "../models/index.js";
 export interface PieArcClasses {
   /** Styles applied to the root element. */
@@ -21,16 +20,25 @@ interface PieArcOwnerState {
 export declare function getPieArcUtilityClass(slot: string): string;
 export declare const pieArcClasses: PieArcClasses;
 export type PieArcProps = Omit<React.SVGProps<SVGPathElement>, 'ref' | 'id'> & PieArcOwnerState & {
-  cornerRadius: SpringValue<number>;
-  endAngle: SpringValue<number>;
-  innerRadius: SpringValue<number>;
+  cornerRadius: number;
+  endAngle: number;
+  innerRadius: number;
   onClick?: (event: React.MouseEvent<SVGPathElement, MouseEvent>) => void;
-  outerRadius: SpringValue<number>;
-  paddingAngle: SpringValue<number>;
-  startAngle: SpringValue<number>;
+  outerRadius: number;
+  paddingAngle: number;
+  startAngle: number;
+  /** @default false */
+  skipAnimation: boolean;
 };
-declare function PieArc(props: PieArcProps): React.JSX.Element;
-declare namespace PieArc {
-  var propTypes: any;
-}
+declare const PieArc: React.ForwardRefExoticComponent<Omit<React.SVGProps<SVGPathElement>, "ref" | "id"> & PieArcOwnerState & {
+  cornerRadius: number;
+  endAngle: number;
+  innerRadius: number;
+  onClick?: (event: React.MouseEvent<SVGPathElement, MouseEvent>) => void;
+  outerRadius: number;
+  paddingAngle: number;
+  startAngle: number;
+  /** @default false */
+  skipAnimation: boolean;
+} & React.RefAttributes<SVGPathElement>>;
 export { PieArc };

package/PieChart/PieArc.js

@@ -6,22 +6,22 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PieArc = PieArc;
+exports.PieArc = void 0;
 exports.getPieArcUtilityClass = getPieArcUtilityClass;
 exports.pieArcClasses = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutPropertiesLoose2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutPropertiesLoose"));
 var React = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _d3Shape = require("@mui/x-charts-vendor/d3-shape");
-var _web = require("@react-spring/web");
 var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
 var _generateUtilityClass = _interopRequireDefault(require("@mui/utils/generateUtilityClass"));
 var _styles = require("@mui/material/styles");
 var _generateUtilityClasses = _interopRequireDefault(require("@mui/utils/generateUtilityClasses"));
+var _hooks = require("../hooks");
+var _animation = require("../internals/animation/animation");
 var _useInteractionItemProps = require("../hooks/useInteractionItemProps");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["classes", "color", "cornerRadius", "dataIndex", "endAngle", "id", "innerRadius", "isFaded", "isHighlighted", "onClick", "outerRadius", "paddingAngle", "startAngle"];
+const _excluded = ["classes", "color", "dataIndex", "id", "isFaded", "isHighlighted", "onClick", "cornerRadius", "startAngle", "endAngle", "innerRadius", "outerRadius", "paddingAngle", "skipAnimation"];
 function getPieArcUtilityClass(slot) {
   return (0, _generateUtilityClass.default)('MuiPieArc', slot);
 }
@@ -39,7 +39,7 @@ const useUtilityClasses = ownerState => {
   };
   return (0, _composeClasses.default)(slots, getPieArcUtilityClass, classes);
 };
-const PieArcRoot = (0, _styles.styled)(_web.animated.path, {
+const PieArcRoot = (0, _styles.styled)('path', {
   name: 'MuiPieArc',
   slot: 'Root',
   overridesResolver: (_, styles) => styles.arc
@@ -48,23 +48,26 @@ const PieArcRoot = (0, _styles.styled)(_web.animated.path, {
 }) => ({
   // Got to move stroke to an element prop instead of style.
   stroke: (theme.vars || theme).palette.background.paper,
-  transition: 'opacity 0.2s ease-in, fill 0.2s ease-in, filter 0.2s ease-in'
+  transitionProperty: 'opacity, fill, filter',
+  transitionDuration: `${_animation.ANIMATION_DURATION_MS}ms`,
+  transitionTimingFunction: _animation.ANIMATION_TIMING_FUNCTION
 }));
-function PieArc(props) {
+const PieArc = exports.PieArc = /*#__PURE__*/React.forwardRef(function PieArc(props, ref) {
   const {
       classes: innerClasses,
       color,
-      cornerRadius,
       dataIndex,
-      endAngle,
       id,
-      innerRadius,
       isFaded,
       isHighlighted,
       onClick,
+      cornerRadius,
+      startAngle,
+      endAngle,
+      innerRadius,
       outerRadius,
       paddingAngle,
-      startAngle
+      skipAnimation
     } = props,
     other = (0, _objectWithoutPropertiesLoose2.default)(props, _excluded);
   const ownerState = {
@@ -81,17 +84,17 @@ function PieArc(props) {
     seriesId: id,
     dataIndex
   });
+  const animatedProps = (0, _hooks.useAnimatePieArc)({
+    cornerRadius,
+    startAngle,
+    endAngle,
+    innerRadius,
+    outerRadius,
+    paddingAngle,
+    skipAnimation,
+    ref
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(PieArcRoot, (0, _extends2.default)({
-    d: (0, _web.to)([startAngle, endAngle, paddingAngle, innerRadius, outerRadius, cornerRadius], (sA, eA, pA, iR, oR, cR) => (0, _d3Shape.arc)().cornerRadius(cR)({
-      padAngle: pA,
-      startAngle: sA,
-      endAngle: eA,
-      innerRadius: iR,
-      outerRadius: oR
-    })),
-    visibility: (0, _web.to)([startAngle, endAngle], (sA, eA) => sA === eA ? 'hidden' : 'visible')
-    // @ts-expect-error
-    ,
     onClick: onClick,
     cursor: onClick ? 'pointer' : 'unset',
     ownerState: ownerState,
@@ -101,16 +104,26 @@ function PieArc(props) {
     filter: ownerState.isHighlighted ? 'brightness(120%)' : 'none',
     strokeWidth: 1,
     strokeLinejoin: "round"
-  }, other, interactionProps));
-}
+  }, other, interactionProps, animatedProps));
+});
 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 "pnpm proptypes"  |
   // ----------------------------------------------------------------------
   classes: _propTypes.default.object,
+  cornerRadius: _propTypes.default.number.isRequired,
   dataIndex: _propTypes.default.number.isRequired,
+  endAngle: _propTypes.default.number.isRequired,
   id: _propTypes.default.oneOfType([_propTypes.default.number, _propTypes.default.string]).isRequired,
+  innerRadius: _propTypes.default.number.isRequired,
   isFaded: _propTypes.default.bool.isRequired,
-  isHighlighted: _propTypes.default.bool.isRequired
+  isHighlighted: _propTypes.default.bool.isRequired,
+  outerRadius: _propTypes.default.number.isRequired,
+  paddingAngle: _propTypes.default.number.isRequired,
+  /**
+   * @default false
+   */
+  skipAnimation: _propTypes.default.bool.isRequired,
+  startAngle: _propTypes.default.number.isRequired
 } : void 0;

package/PieChart/PieArcLabel.d.ts

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import { SpringValue } from '@react-spring/web';
 import { PieItemId } from "../models/seriesType/pie.js";
 export interface PieArcLabelClasses {
   /** Styles applied to the root element. */
@@ -8,6 +7,8 @@ export interface PieArcLabelClasses {
   highlighted: string;
   /** Styles applied to the root element when faded. */
   faded: string;
+  /** Styles applied to the root element when animation is not skipped. */
+  animate: string;
 }
 export type PieArcLabelClassKey = keyof PieArcLabelClasses;
 interface PieArcLabelOwnerState {
@@ -15,23 +16,31 @@ interface PieArcLabelOwnerState {
   color: string;
   isFaded: boolean;
   isHighlighted: boolean;
+  skipAnimation: boolean;
   classes?: Partial<PieArcLabelClasses>;
 }
 export declare function getPieArcLabelUtilityClass(slot: string): string;
 export declare const pieArcLabelClasses: PieArcLabelClasses;
 export type PieArcLabelProps = PieArcLabelOwnerState & Omit<React.SVGProps<SVGTextElement>, 'ref' | 'color' | 'id'> & {
-  startAngle: SpringValue<number>;
-  endAngle: SpringValue<number>;
-  innerRadius: SpringValue<number>;
-  outerRadius: SpringValue<number>;
-  arcLabelRadius: SpringValue<number>;
-  cornerRadius: SpringValue<number>;
-  paddingAngle: SpringValue<number>;
-} & {
+  startAngle: number;
+  endAngle: number;
+  innerRadius: number;
+  outerRadius: number;
+  arcLabelRadius: number;
+  cornerRadius: number;
+  paddingAngle: number;
+  skipAnimation: boolean;
   formattedArcLabel?: string | null;
 };
-declare function PieArcLabel(props: PieArcLabelProps): React.JSX.Element;
-declare namespace PieArcLabel {
-  var propTypes: any;
-}
+declare const PieArcLabel: React.ForwardRefExoticComponent<PieArcLabelOwnerState & Omit<React.SVGProps<SVGTextElement>, "ref" | "color" | "id"> & {
+  startAngle: number;
+  endAngle: number;
+  innerRadius: number;
+  outerRadius: number;
+  arcLabelRadius: number;
+  cornerRadius: number;
+  paddingAngle: number;
+  skipAnimation: boolean;
+  formattedArcLabel?: string | null;
+} & React.RefAttributes<SVGTextElement>>;
 export { PieArcLabel };