@mui/x-charts 8.0.0-alpha.1 → 8.0.0-alpha.10

package/internals/store/useCharts.d.ts

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { ChartStore } from '../plugins/utils/ChartStore';
+import { ChartAnyPluginSignature, ChartInstance, ChartPublicAPI, ConvertSignaturesIntoPlugins } from '../plugins/models';
+import { UseChartBaseProps } from './useCharts.types';
+import { UseChartInteractionState } from '../plugins/featurePlugins/useChartInteraction/useChartInteraction.types';
+import { ChartSeriesType } from '../../models/seriesType/config';
+import { ChartSeriesConfig } from '../plugins/models/seriesConfig';
+export declare function useChartApiInitialization<T>(inputApiRef: React.RefObject<T | undefined> | undefined): T;
+export declare function useCharts<TSeriesType extends ChartSeriesType, TSignatures extends readonly ChartAnyPluginSignature[]>(inPlugins: ConvertSignaturesIntoPlugins<TSignatures>, props: Partial<UseChartBaseProps<TSignatures>>, seriesConfig: ChartSeriesConfig<TSeriesType>): {
+    contextValue: {
+        store: ChartStore<readonly [import("..").UseChartIdSignature, import("..").UseChartDimensionsSignature, import("..").UseChartSeriesSignature, ...TSignatures]> & UseChartInteractionState;
+        publicAPI: ChartPublicAPI<TSignatures>;
+        instance: ChartInstance<TSignatures>;
+        svgRef: React.RefObject<SVGSVGElement | null>;
+    };
+};

package/internals/store/useCharts.js

@@ -0,0 +1,83 @@
+import * as React from 'react';
+import useId from '@mui/utils/useId';
+import { ChartStore } from "../plugins/utils/ChartStore.js";
+import { CHART_CORE_PLUGINS } from "../plugins/corePlugins/index.js";
+import { extractPluginParamsFromProps } from "./extractPluginParamsFromProps.js";
+import { useChartModels } from "./useChartModels.js";
+export function useChartApiInitialization(inputApiRef) {
+  const fallbackPublicApiRef = React.useRef({});
+  if (inputApiRef) {
+    if (inputApiRef.current == null) {
+      // eslint-disable-next-line react-compiler/react-compiler
+      inputApiRef.current = {};
+    }
+    return inputApiRef.current;
+  }
+  return fallbackPublicApiRef.current;
+}
+let globalId = 0;
+export function useCharts(inPlugins, props, seriesConfig) {
+  const chartId = useId();
+  const plugins = React.useMemo(() => [...CHART_CORE_PLUGINS, ...inPlugins], [inPlugins]);
+  const pluginParams = extractPluginParamsFromProps({
+    plugins,
+    props
+  });
+  pluginParams.id = pluginParams.id ?? chartId;
+  const models = useChartModels(plugins, pluginParams);
+  const instanceRef = React.useRef({});
+  const instance = instanceRef.current;
+  const publicAPI = useChartApiInitialization(props.apiRef);
+  const innerSvgRef = React.useRef(null);
+  const storeRef = React.useRef(null);
+  if (storeRef.current == null) {
+    // eslint-disable-next-line react-compiler/react-compiler
+    globalId += 1;
+    const initialState = {
+      // TODO remove when the interaction moves to plugin
+      interaction: {
+        item: null,
+        axis: {
+          x: null,
+          y: null
+        }
+      },
+      cacheKey: {
+        id: globalId
+      }
+    };
+    plugins.forEach(plugin => {
+      if (plugin.getInitialState) {
+        Object.assign(initialState, plugin.getInitialState(pluginParams, initialState, seriesConfig));
+      }
+    });
+    storeRef.current = new ChartStore(initialState);
+  }
+  const runPlugin = plugin => {
+    const pluginResponse = plugin({
+      instance,
+      params: pluginParams,
+      plugins: plugins,
+      store: storeRef.current,
+      svgRef: innerSvgRef,
+      seriesConfig,
+      models
+    });
+    if (pluginResponse.publicAPI) {
+      Object.assign(publicAPI, pluginResponse.publicAPI);
+    }
+    if (pluginResponse.instance) {
+      Object.assign(instance, pluginResponse.instance);
+    }
+  };
+  plugins.forEach(runPlugin);
+  const contextValue = React.useMemo(() => ({
+    store: storeRef.current,
+    publicAPI,
+    instance,
+    svgRef: innerSvgRef
+  }), [instance, publicAPI]);
+  return {
+    contextValue
+  };
+}

package/internals/store/useCharts.types.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import { ChartAnyPluginSignature, ChartPublicAPI } from '../plugins/models';
+export interface UseChartBaseProps<TSignatures extends readonly ChartAnyPluginSignature[]> {
+    apiRef?: React.RefObject<ChartPublicAPI<TSignatures> | undefined>;
+}

package/internals/store/useCharts.types.js

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

package/internals/store/useSelector.d.ts

@@ -0,0 +1,4 @@
+import { ChartAnyPluginSignature, ChartState } from '../plugins/models';
+import { ChartsSelector } from '../plugins/utils/selectors';
+import { ChartStore } from '../plugins/utils/ChartStore';
+export declare const useSelector: <TSignatures extends readonly ChartAnyPluginSignature[], TArgs, TValue>(store: ChartStore<TSignatures>, selector: ChartsSelector<ChartState<TSignatures>, TArgs, TValue>, args?: TArgs, equals?: (a: TValue, b: TValue) => boolean) => TValue;

package/internals/store/useStore.d.ts

@@ -0,0 +1,9 @@
+import { ChartStore } from '../plugins/utils/ChartStore';
+import { UseChartInteractionSignature } from '../plugins/featurePlugins/useChartInteraction';
+import { UseChartHighlightSignature } from '../plugins/featurePlugins/useChartHighlight';
+import { ChartAnyPluginSignature } from '../plugins/models';
+export declare function useStore<TSignatures extends ChartAnyPluginSignature[] = []>(): ChartStore<[
+    ...TSignatures,
+    UseChartInteractionSignature,
+    UseChartHighlightSignature
+]>;

package/internals/store/useStore.js

@@ -0,0 +1,9 @@
+import { useChartContext } from "../../context/ChartProvider/index.js";
+// This hook should be removed because user and us should not interact with the store directly, but with public/private APIs
+export function useStore() {
+  const context = useChartContext();
+  if (!context) {
+    throw new Error(['MUI X: Could not find the charts context.', 'It looks like you rendered your component outside of a ChartsContainer parent component.'].join('\n'));
+  }
+  return context.store;
+}

package/models/axis.d.ts

@@ -1,5 +1,5 @@
 import type { ScaleBand, ScaleLogarithmic, ScalePower, ScaleTime, ScaleLinear, ScalePoint, ScaleOrdinal, ScaleSequential, ScaleThreshold } from '@mui/x-charts-vendor/d3-scale';
-import { SxProps } from '@mui/system';
+import { SxProps } from '@mui/system/styleFunctionSx';
 import { ChartsAxisClasses } from '../ChartsAxis/axisClasses';
 import type { TickParams } from '../hooks/useTicks';
 import { ChartsTextProps } from '../ChartsText';
@@ -58,12 +58,6 @@ export interface ChartsAxisProps extends TickParams {
      * @default 'currentColor'
      */
     fill?: string;
-    /**
-     * The font size of the axis ticks text.
-     * @default 12
-     * @deprecated Consider using `tickLabelStyle.fontSize` instead.
-     */
-    tickFontSize?: number;
     /**
      * The style applied to ticks text.
      */
@@ -83,12 +77,6 @@ export interface ChartsAxisProps extends TickParams {
      * The label of the axis.
      */
     label?: string;
-    /**
-     * The font size of the axis label.
-     * @default 14
-     * @deprecated Consider using `labelStyle.fontSize` instead.
-     */
-    labelFontSize?: number;
     /**
      * The stroke color of the axis line.
      * @default 'currentColor'

package/models/curve.d.ts

@@ -0,0 +1,6 @@
+/**
+ * The type of curve to use for the line.
+ * Read more about curves at
+ * [line interpolation](https://mui.com/x/react-charts/lines/#interpolation).
+ */
+export type CurveType = 'catmullRom' | 'linear' | 'monotoneX' | 'monotoneY' | 'natural' | 'step' | 'stepBefore' | 'stepAfter' | 'bumpY' | 'bumpX';

package/models/curve.js

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

package/models/index.d.ts

@@ -3,3 +3,5 @@ export * from './layout';
 export * from './stacking';
 export type { AxisConfig, ChartsYAxisProps, ChartsXAxisProps, ScaleName, ContinuousScaleName, } from './axis';
 export type { PropsFromSlot } from '@mui/x-internals/slots';
+export type { Position } from './position';
+export type { CurveType } from './curve';

package/models/layout.d.ts

@@ -1,3 +1,4 @@
+import { ChartMargin } from '../internals/plugins/corePlugins/useChartDimensions/useChartDimensions.types';
 export interface CardinalDirections<T> {
     top?: T;
     bottom?: T;
@@ -13,5 +14,5 @@ export type LayoutConfig = {
      * Accepts an object with the optional properties: `top`, `bottom`, `left`, and `right`.
      * @default object Depends on the charts type.
      */
-    margin?: Partial<CardinalDirections<number>>;
+    margin?: Partial<ChartMargin>;
 };

package/models/position.d.ts

@@ -0,0 +1,10 @@
+export type Position = {
+    /**
+     * The vertical position.
+     */
+    vertical?: 'top' | 'middle' | 'bottom';
+    /**
+     * The horizontal position.
+     */
+    horizontal?: 'start' | 'center' | 'end';
+};

package/models/position.js

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

package/models/seriesType/common.d.ts

@@ -1,4 +1,5 @@
-import type { HighlightScope } from '../../context';
+import type { ChartsLabelMarkProps } from '../../ChartsLabel';
+import { HighlightScope } from '../../internals/plugins/featurePlugins/useChartHighlight/highlightConfig.types';
 import type { StackOffsetType, StackOrderType } from '../stacking';
 export type SeriesId = number | string;
 export type SeriesValueFormatterContext = {
@@ -22,6 +23,12 @@ export type CommonSeriesType<TValue> = {
      * The scope to apply when the series is highlighted.
      */
     highlightScope?: Partial<HighlightScope>;
+    /**
+     * Defines the mark type for the series.
+     *
+     * There is a default mark type for each series type.
+     */
+    labelMarkType?: ChartsLabelMarkProps['type'];
 };
 export type CommonDefaultizedProps = 'id' | 'valueFormatter' | 'data';
 export type CartesianSeriesType = {

package/models/seriesType/line.d.ts

@@ -1,7 +1,7 @@
 import { DefaultizedProps } from '@mui/x-internals/types';
 import type { StackOffsetType } from '../stacking';
 import { CartesianSeriesType, CommonDefaultizedProps, CommonSeriesType, SeriesId, StackableSeriesType } from './common';
-export type CurveType = 'catmullRom' | 'linear' | 'monotoneX' | 'monotoneY' | 'natural' | 'step' | 'stepBefore' | 'stepAfter';
+import { CurveType } from '../curve';
 export interface ShowMarkParams<AxisValue = number | Date> {
     /**
      * The item index.
@@ -46,12 +46,23 @@ export interface LineSeriesType extends CommonSeriesType<number | null>, Cartesi
      * @default 'monotoneX'
      */
     curve?: CurveType;
+    /**
+     * If `true`, step curve starts and end at the first and last point.
+     * By default the line is extended to fill the space before and after.
+     */
+    strictStepCurve?: boolean;
     /**
      * Define which items of the series should display a mark.
      * If can be a boolean that applies to all items.
      * Or a callback that gets some item properties and returns true if the item should be displayed.
      */
     showMark?: boolean | ((params: ShowMarkParams) => boolean);
+    /**
+     * The shape of the mark elements.
+     * Using 'circle' renders a `<circle />` element, while all other options render a `<path />` instead. The path causes a small decrease in performance.
+     * @default 'circle'
+     */
+    shape?: 'circle' | 'cross' | 'diamond' | 'square' | 'star' | 'triangle' | 'wye';
     /**
      * Do not render the line highlight item if set to `true`.
      * @default false

package/models/seriesType/pie.d.ts

@@ -1,18 +1,24 @@
 import { PieArcDatum as D3PieArcDatum } from '@mui/x-charts-vendor/d3-shape';
 import { DefaultizedProps } from '@mui/x-internals/types';
 import { CommonDefaultizedProps, CommonSeriesType, SeriesId } from './common';
+import type { ChartsLabelMarkProps } from '../../ChartsLabel';
 export type PieItemId = string | number;
 export type PieValueType = {
     /**
      * A unique identifier of the pie slice.
      */
-    id: PieItemId;
+    id?: PieItemId;
     value: number;
     /**
      * The label to display on the tooltip, arc, or the legend. It can be a string or a function.
      */
     label?: string | ((location: 'tooltip' | 'legend' | 'arc') => string);
     color?: string;
+    /**
+     * Defines the mark type for the pie item.
+     * @default 'circle'
+     */
+    labelMarkType?: ChartsLabelMarkProps['type'];
 };
 export type DefaultizedPieValueType = PieValueType & Omit<D3PieArcDatum<any>, 'data'> & {
     color: string;

package/models/seriesType/scatter.d.ts

@@ -7,9 +7,9 @@ export type ScatterValueType = {
     /**
      * A unique identifier for the scatter point
      */
-    id: string | number;
+    id?: string | number;
 };
-export interface ScatterSeriesType extends CommonSeriesType<ScatterValueType>, CartesianSeriesType {
+export interface ScatterSeriesType extends CommonSeriesType<ScatterValueType | null>, CartesianSeriesType {
     type: 'scatter';
     data?: ScatterValueType[];
     markerSize?: number;
@@ -48,7 +48,7 @@ export interface ScatterSeriesType extends CommonSeriesType<ScatterValueType>, C
         /**
          * The key used to retrieve data from the dataset for the id.
          */
-        id: string;
+        id?: string;
     };
 }
 /**

package/modern/BarChart/AnimatedBarElement.js

@@ -15,6 +15,7 @@ export function AnimatedBarElement(props) {
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
   return /*#__PURE__*/_jsx(animated.rect, _extends({}, other, {
+    // @ts-expect-error
     filter: ownerState.isHighlighted ? 'brightness(120%)' : undefined,
     opacity: ownerState.isFaded ? 0.3 : 1
   }));

package/modern/BarChart/BarChart.js

@@ -5,7 +5,6 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useThemeProps } from '@mui/material/styles';
 import { BarPlot } from "./BarPlot.js";
-import { ChartContainer } from "../ChartContainer/index.js";
 import { ChartsAxis } from "../ChartsAxis/index.js";
 import { ChartsTooltip } from "../ChartsTooltip/index.js";
 import { ChartsLegend } from "../ChartsLegend/index.js";
@@ -15,6 +14,10 @@ import { ChartsGrid } from "../ChartsGrid/index.js";
 import { ChartsOnAxisClickHandler } from "../ChartsOnAxisClickHandler/index.js";
 import { ChartsOverlay } from "../ChartsOverlay/ChartsOverlay.js";
 import { useBarChartProps } from "./useBarChartProps.js";
+import { ChartDataProvider } from "../ChartDataProvider/index.js";
+import { ChartsSurface } from "../ChartsSurface/index.js";
+import { useChartContainerProps } from "../ChartContainer/useChartContainerProps.js";
+import { ChartsWrapper } from "../internals/components/ChartsWrapper/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Demos:
@@ -33,6 +36,7 @@ const BarChart = /*#__PURE__*/React.forwardRef(function BarChart(inProps, ref) {
     name: 'MuiBarChart'
   });
   const {
+    chartsWrapperProps,
     chartContainerProps,
     barPlotProps,
     axisClickHandlerProps,
@@ -45,13 +49,19 @@ const BarChart = /*#__PURE__*/React.forwardRef(function BarChart(inProps, ref) {
     legendProps,
     children
   } = useBarChartProps(props);
+  const {
+    chartDataProviderProps,
+    chartsSurfaceProps
+  } = useChartContainerProps(chartContainerProps, ref);
   const Tooltip = props.slots?.tooltip ?? ChartsTooltip;
-  return /*#__PURE__*/_jsxs(ChartContainer, _extends({
-    ref: ref
-  }, chartContainerProps, {
-    children: [props.onAxisClick && /*#__PURE__*/_jsx(ChartsOnAxisClickHandler, _extends({}, axisClickHandlerProps)), /*#__PURE__*/_jsx(ChartsGrid, _extends({}, gridProps)), /*#__PURE__*/_jsxs("g", _extends({}, clipPathGroupProps, {
-      children: [/*#__PURE__*/_jsx(BarPlot, _extends({}, barPlotProps)), /*#__PURE__*/_jsx(ChartsOverlay, _extends({}, overlayProps)), /*#__PURE__*/_jsx(ChartsAxisHighlight, _extends({}, axisHighlightProps))]
-    })), /*#__PURE__*/_jsx(ChartsAxis, _extends({}, chartsAxisProps)), !props.hideLegend && /*#__PURE__*/_jsx(ChartsLegend, _extends({}, legendProps)), !props.loading && /*#__PURE__*/_jsx(Tooltip, _extends({}, props.slotProps?.tooltip)), /*#__PURE__*/_jsx(ChartsClipPath, _extends({}, clipPathProps)), children]
+  return /*#__PURE__*/_jsx(ChartDataProvider, _extends({}, chartDataProviderProps, {
+    children: /*#__PURE__*/_jsxs(ChartsWrapper, _extends({}, chartsWrapperProps, {
+      children: [!props.hideLegend && /*#__PURE__*/_jsx(ChartsLegend, _extends({}, legendProps)), /*#__PURE__*/_jsxs(ChartsSurface, _extends({}, chartsSurfaceProps, {
+        children: [props.onAxisClick && /*#__PURE__*/_jsx(ChartsOnAxisClickHandler, _extends({}, axisClickHandlerProps)), /*#__PURE__*/_jsx(ChartsGrid, _extends({}, gridProps)), /*#__PURE__*/_jsxs("g", _extends({}, clipPathGroupProps, {
+          children: [/*#__PURE__*/_jsx(BarPlot, _extends({}, barPlotProps)), /*#__PURE__*/_jsx(ChartsOverlay, _extends({}, overlayProps)), /*#__PURE__*/_jsx(ChartsAxisHighlight, _extends({}, axisHighlightProps))]
+        })), /*#__PURE__*/_jsx(ChartsAxis, _extends({}, chartsAxisProps)), !props.loading && /*#__PURE__*/_jsx(Tooltip, _extends({}, props.slotProps?.tooltip)), /*#__PURE__*/_jsx(ChartsClipPath, _extends({}, clipPathProps)), children]
+      }))]
+    }))
   }));
 });
 process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
@@ -59,6 +69,9 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "pnpm proptypes"  |
   // ----------------------------------------------------------------------
+  apiRef: PropTypes.shape({
+    current: PropTypes.object
+  }),
   /**
    * The configuration of axes highlight.
    * Default is set to 'band' in the bar direction.
@@ -121,12 +134,18 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    */
   hideLegend: PropTypes.bool,
   /**
-   * The item currently highlighted. Turns highlighting into a controlled prop.
+   * The highlighted item.
+   * Used when the highlight is controlled.
    */
   highlightedItem: PropTypes.shape({
     dataIndex: PropTypes.number,
-    seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+    seriesId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired
   }),
+  /**
+   * This prop is used to help implement the accessibility logic.
+   * If you don't provide this prop. It falls back to a randomly generated id.
+   */
+  id: PropTypes.string,
   /**
    * The direction of the bar elements.
    * @default 'vertical'
@@ -147,7 +166,6 @@ 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`.
-   * @default object Depends on the charts type.
    */
   margin: PropTypes.shape({
     bottom: PropTypes.number,
@@ -201,6 +219,7 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
    */
   slots: PropTypes.object,
   sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
+  theme: PropTypes.oneOf(['dark', 'light']),
   title: PropTypes.string,
   /**
    * Indicate which axis to display the top of the charts.
@@ -243,7 +262,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     hideTooltip: PropTypes.bool,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     label: PropTypes.string,
-    labelFontSize: PropTypes.number,
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
@@ -254,7 +272,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     slots: PropTypes.object,
     stroke: PropTypes.string,
     sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-    tickFontSize: PropTypes.number,
     tickInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.array, PropTypes.func]),
     tickLabelInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.func]),
     tickLabelPlacement: PropTypes.oneOf(['middle', 'tick']),
@@ -297,7 +314,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     hideTooltip: PropTypes.bool,
     id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
     label: PropTypes.string,
-    labelFontSize: PropTypes.number,
     labelStyle: PropTypes.object,
     max: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
     min: PropTypes.oneOfType([PropTypes.instanceOf(Date), PropTypes.number]),
@@ -308,7 +324,6 @@ process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
     slots: PropTypes.object,
     stroke: PropTypes.string,
     sx: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.func, PropTypes.object, PropTypes.bool])), PropTypes.func, PropTypes.object]),
-    tickFontSize: PropTypes.number,
     tickInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.array, PropTypes.func]),
     tickLabelInterval: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.func]),
     tickLabelPlacement: PropTypes.oneOf(['middle', 'tick']),

package/modern/BarChart/BarElement.js

@@ -10,7 +10,7 @@ import useSlotProps from '@mui/utils/useSlotProps';
 import generateUtilityClass from '@mui/utils/generateUtilityClass';
 import generateUtilityClasses from '@mui/utils/generateUtilityClasses';
 import { useInteractionItemProps } from "../hooks/useInteractionItemProps.js";
-import { useItemHighlighted } from "../context/index.js";
+import { useItemHighlighted } from "../hooks/useItemHighlighted.js";
 import { AnimatedBarElement } from "./AnimatedBarElement.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function getBarElementUtilityClass(slot) {

package/modern/BarChart/BarLabel/BarLabelItem.js

@@ -8,7 +8,7 @@ import PropTypes from 'prop-types';
 import { useUtilityClasses } from "./barLabelClasses.js";
 import { getBarLabel } from "./getBarLabel.js";
 import { BarLabel } from "./BarLabel.js";
-import { useItemHighlighted } from "../../context/index.js";
+import { useItemHighlighted } from "../../hooks/useItemHighlighted.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 /**
  * @ignore - internal component.

package/modern/BarChart/BarLabel/BarLabelPlot.js

@@ -46,7 +46,7 @@ function BarLabelPlot(props) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const barLabelTransition = useTransition(bars, {
     keys: bar => `${bar.seriesId}-${bar.dataIndex}`,
-    from: leaveStyle,
+    from: skipAnimation ? undefined : leaveStyle,
     leave: null,
     enter: enterStyle,
     update: enterStyle,

package/modern/BarChart/BarPlot.js

@@ -7,16 +7,15 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useTransition } from '@react-spring/web';
 import { styled } from '@mui/material/styles';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import { BarElement, barElementClasses } from "./BarElement.js";
 import getColor from "./getColor.js";
-import { useChartId, useDrawingArea } from "../hooks/index.js";
+import { useChartId, useDrawingArea, useXAxes, useYAxes } from "../hooks/index.js";
 import { BarClipPath } from "./BarClipPath.js";
 import { BarLabelPlot } from "./BarLabel/BarLabelPlot.js";
 import { checkScaleErrors } from "./checkScaleErrors.js";
 import { useBarSeries } from "../hooks/useSeries.js";
 import { useSkipAnimation } from "../context/AnimationProvider/index.js";
-
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * Solution of the equations
  * W = barWidth * N + offset * (N-1)
@@ -26,7 +25,6 @@ import { useSkipAnimation } from "../context/AnimationProvider/index.js";
  * @param gapRatio The ratio of the gap between bars over the bar width.
  * @returns The bar width and the offset between bars.
  */
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function getBandSize({
   bandWidth: W,
   numberOfGroups: N,
@@ -51,7 +49,6 @@ const useAggregatedData = () => {
     stackingGroups: [],
     seriesOrder: []
   };
-  const axisData = useCartesianContext();
   const drawingArea = useDrawingArea();
   const chartId = useChartId();
   const {
@@ -60,10 +57,12 @@ const useAggregatedData = () => {
   } = seriesData;
   const {
     xAxis,
+    xAxisIds
+  } = useXAxes();
+  const {
     yAxis,
-    xAxisIds,
     yAxisIds
-  } = axisData;
+  } = useYAxes();
   const defaultXAxisId = xAxisIds[0];
   const defaultYAxisId = yAxisIds[0];
   const masks = {};
@@ -217,7 +216,7 @@ function BarPlot(props) {
   const withoutBorderRadius = !borderRadius || borderRadius <= 0;
   const transition = useTransition(completedData, {
     keys: bar => `${bar.seriesId}-${bar.dataIndex}`,
-    from: leaveStyle,
+    from: skipAnimation ? undefined : leaveStyle,
     leave: leaveStyle,
     enter: enterStyle,
     update: enterStyle,
@@ -225,7 +224,7 @@ function BarPlot(props) {
   });
   const maskTransition = useTransition(withoutBorderRadius ? [] : masksData, {
     keys: v => v.id,
-    from: leaveStyle,
+    from: skipAnimation ? undefined : leaveStyle,
     leave: leaveStyle,
     enter: enterStyle,
     update: enterStyle,

package/modern/BarChart/formatter.js

@@ -45,7 +45,8 @@ const formatter = (params, dataset) => {
     ids.forEach((id, index) => {
       const dataKey = series[id].dataKey;
       completedSeries[id] = _extends({
-        layout: 'vertical'
+        layout: 'vertical',
+        labelMarkType: 'square'
       }, series[id], {
         data: dataKey ? dataset.map(data => {
           const value = data[dataKey];

package/modern/BarChart/legend.js

@@ -10,6 +10,7 @@ const legendGetter = params => {
       return acc;
     }
     acc.push({
+      markType: series[seriesId].labelMarkType,
       id: seriesId,
       seriesId,
       color: series[seriesId].color,

package/modern/BarChart/plugin.js

@@ -1,10 +1,13 @@
 import { getExtremumX, getExtremumY } from "./extremums.js";
 import formatter from "./formatter.js";
+import legendGetter from "./legend.js";
 import getColor from "./getColor.js";
+import tooltipGetter from "./tooltip.js";
 export const plugin = {
-  seriesType: 'bar',
-  seriesFormatter: formatter,
+  seriesProcessor: formatter,
   colorProcessor: getColor,
+  legendGetter,
+  tooltipGetter,
   xExtremumGetter: getExtremumX,
   yExtremumGetter: getExtremumY
 };

package/modern/BarChart/tooltip.js

@@ -0,0 +1,25 @@
+import { getLabel } from "../internals/getLabel.js";
+const tooltipGetter = params => {
+  const {
+    series,
+    getColor,
+    identifier
+  } = params;
+  if (!identifier || identifier.dataIndex === undefined) {
+    return null;
+  }
+  const label = getLabel(series.label, 'tooltip');
+  const value = series.data[identifier.dataIndex];
+  const formattedValue = series.valueFormatter(value, {
+    dataIndex: identifier.dataIndex
+  });
+  return {
+    identifier,
+    color: getColor(identifier.dataIndex),
+    label,
+    value,
+    formattedValue,
+    markType: series.labelMarkType
+  };
+};
+export default tooltipGetter;