@mui/x-charts 8.0.0-alpha.7 → 8.0.0-alpha.9

package/modern/ChartDataProvider/ChartDataProvider.js

@@ -0,0 +1,108 @@
+'use client';
+
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import PropTypes from 'prop-types';
+import { useChartDataProviderProps } from "./useChartDataProviderProps.js";
+import { AnimationProvider } from "../context/AnimationProvider/index.js";
+import { HighlightedProvider } from "../context/HighlightedProvider/index.js";
+import { ChartProvider } from "../context/ChartProvider/index.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * Orchestrates the data providers for the chart components and hooks.
+ *
+ * Use this component if you have custom HTML components that need to access the chart data.
+ *
+ * Demos:
+ *
+ * - [Composition](https://mui.com/x/api/charts/composition/)
+ *
+ * API:
+ *
+ * - [ChartDataProvider API](https://mui.com/x/api/charts/chart-data-provider/)
+ *
+ * @example
+ * ```jsx
+ * <ChartDataProvider
+ *   series={[{ label: "Label", type: "bar", data: [10, 20] }]}
+ *   xAxis={[{ data: ["A", "B"], scaleType: "band", id: "x-axis" }]}
+ * >
+ *   <ChartsSurface>
+ *      <BarPlot />
+ *      <ChartsXAxis position="bottom" axisId="x-axis" />
+ *   </ChartsSurface>
+ *   {'Custom Legend Component'}
+ * </ChartDataProvider>
+ * ```
+ */
+function ChartDataProvider(props) {
+  const {
+    children,
+    highlightedProviderProps,
+    animationProviderProps,
+    chartProviderProps
+  } = useChartDataProviderProps(props);
+  return /*#__PURE__*/_jsx(ChartProvider, _extends({}, chartProviderProps, {
+    children: /*#__PURE__*/_jsx(HighlightedProvider, _extends({}, highlightedProviderProps, {
+      children: /*#__PURE__*/_jsx(AnimationProvider, _extends({}, animationProviderProps, {
+        children: children
+      }))
+    }))
+  }));
+}
+process.env.NODE_ENV !== "production" ? ChartDataProvider.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "pnpm proptypes"  |
+  // ----------------------------------------------------------------------
+  apiRef: PropTypes.any,
+  children: PropTypes.node,
+  /**
+   * Color palette used to colorize multiple series.
+   * @default blueberryTwilightPalette
+   */
+  colors: PropTypes.any,
+  dataset: PropTypes.any,
+  /**
+   * The height of the chart in px. If not defined, it takes the height of the parent element.
+   */
+  height: PropTypes.any,
+  /**
+   * The item currently highlighted. Turns highlighting into a controlled prop.
+   */
+  highlightedItem: PropTypes.any,
+  /**
+   * 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.any,
+  /**
+   * 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`.
+   */
+  margin: PropTypes.any,
+  /**
+   * The callback fired when the highlighted item changes.
+   *
+   * @param {HighlightItemData | null} highlightedItem  The newly highlighted item.
+   */
+  onHighlightChange: PropTypes.any,
+  /**
+   * The array of series to display.
+   * Each type of series has its own specificity.
+   * Please refer to the appropriate docs page to learn more about it.
+   */
+  series: PropTypes.any,
+  /**
+   * If `true`, animations are skipped.
+   * If unset or `false`, the animations respects the user's `prefers-reduced-motion` setting.
+   */
+  skipAnimation: PropTypes.any,
+  theme: PropTypes.any,
+  /**
+   * The width of the chart in px. If not defined, it takes the width of the parent element.
+   */
+  width: PropTypes.any
+} : void 0;
+export { ChartDataProvider };

package/modern/ChartDataProvider/useChartDataProviderProps.js

@@ -0,0 +1,52 @@
+'use client';
+
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
+const _excluded = ["apiRef", "width", "height", "series", "margin", "colors", "dataset", "highlightedItem", "onHighlightChange", "children", "skipAnimation", "plugins", "seriesConfig"];
+import { useTheme } from '@mui/material/styles';
+export const useChartDataProviderProps = props => {
+  const {
+      apiRef,
+      width,
+      height,
+      series,
+      margin,
+      colors,
+      dataset,
+      highlightedItem,
+      onHighlightChange,
+      children,
+      skipAnimation,
+      plugins,
+      seriesConfig
+    } = props,
+    other = _objectWithoutPropertiesLoose(props, _excluded);
+  const theme = useTheme();
+  const chartProviderProps = {
+    plugins,
+    seriesConfig,
+    pluginParams: _extends({
+      apiRef,
+      width,
+      height,
+      margin,
+      dataset,
+      series,
+      colors,
+      theme: theme.palette.mode
+    }, other)
+  };
+  const animationProviderProps = {
+    skipAnimation
+  };
+  const highlightedProviderProps = {
+    highlightedItem,
+    onHighlightChange
+  };
+  return {
+    children,
+    highlightedProviderProps,
+    animationProviderProps,
+    chartProviderProps
+  };
+};

package/modern/ChartsAxis/ChartsAxis.js

@@ -3,9 +3,9 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import { ChartsXAxis } from "../ChartsXAxis/index.js";
 import { ChartsYAxis } from "../ChartsYAxis/index.js";
+import { useXAxes, useYAxes } from "../hooks/index.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const getAxisId = (propsValue, defaultAxisId) => {
   if (propsValue == null) {
@@ -46,10 +46,12 @@ function ChartsAxis(props) {
   } = props;
   const {
     xAxis,
-    xAxisIds,
+    xAxisIds
+  } = useXAxes();
+  const {
     yAxis,
     yAxisIds
-  } = useCartesianContext();
+  } = useYAxes();
   const leftId = getAxisId(leftAxis === undefined ? yAxisIds[0] : leftAxis, yAxisIds[0]);
   const bottomId = getAxisId(bottomAxis === undefined ? xAxisIds[0] : bottomAxis, xAxisIds[0]);
   const topId = getAxisId(topAxis, xAxisIds[0]);

package/modern/ChartsGrid/ChartsGrid.js

@@ -7,12 +7,12 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import composeClasses from '@mui/utils/composeClasses';
 import { useThemeProps } from '@mui/material/styles';
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
 import { getChartsGridUtilityClass } from "./chartsGridClasses.js";
 import { useDrawingArea } from "../hooks/useDrawingArea.js";
 import { GridRoot } from "./styledComponents.js";
 import { ChartsGridVertical } from "./ChartsVerticalGrid.js";
 import { ChartsGridHorizontal } from "./ChartsHorizontalGrid.js";
+import { useXAxes, useYAxes } from "../hooks/useAxis.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ({
   classes
@@ -46,10 +46,12 @@ function ChartsGrid(inProps) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const {
     xAxis,
-    xAxisIds,
+    xAxisIds
+  } = useXAxes();
+  const {
     yAxis,
     yAxisIds
-  } = useCartesianContext();
+  } = useYAxes();
   const classes = useUtilityClasses(props);
   const horizontalAxis = yAxis[yAxisIds[0]];
   const verticalAxis = xAxis[xAxisIds[0]];
@@ -57,11 +59,13 @@ function ChartsGrid(inProps) {
     className: classes.root,
     children: [vertical && /*#__PURE__*/_jsx(ChartsGridVertical, {
       axis: verticalAxis,
-      drawingArea: drawingArea,
+      start: drawingArea.top,
+      end: drawingArea.height + drawingArea.top,
       classes: classes
     }), horizontal && /*#__PURE__*/_jsx(ChartsGridHorizontal, {
       axis: horizontalAxis,
-      drawingArea: drawingArea,
+      start: drawingArea.left,
+      end: drawingArea.width + drawingArea.left,
       classes: classes
     })]
   }));

package/modern/ChartsGrid/ChartsHorizontalGrid.js

@@ -8,7 +8,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export function ChartsGridHorizontal(props) {
   const {
     axis,
-    drawingArea,
+    start,
+    end,
     classes
   } = props;
   const {
@@ -28,8 +29,8 @@ export function ChartsGridHorizontal(props) {
     }) => /*#__PURE__*/_jsx(GridLine, {
       y1: offset,
       y2: offset,
-      x1: drawingArea.left,
-      x2: drawingArea.left + drawingArea.width,
+      x1: start,
+      x2: end,
       className: classes.horizontalLine
     }, `horizontal-${value}`))
   });

package/modern/ChartsGrid/ChartsVerticalGrid.js

@@ -8,7 +8,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export function ChartsGridVertical(props) {
   const {
     axis,
-    drawingArea,
+    start,
+    end,
     classes
   } = props;
   const {
@@ -26,8 +27,8 @@ export function ChartsGridVertical(props) {
       value,
       offset
     }) => /*#__PURE__*/_jsx(GridLine, {
-      y1: drawingArea.top,
-      y2: drawingArea.top + drawingArea.height,
+      y1: start,
+      y2: end,
       x1: offset,
       x2: offset,
       className: classes.verticalLine

package/modern/ChartsLabel/ChartsLabelGradient.js

@@ -7,20 +7,16 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
 import clsx from 'clsx';
+import { useRtl } from '@mui/system/RtlProvider';
 import { useUtilityClasses, labelGradientClasses } from "./labelGradientClasses.js";
 import { consumeThemeProps } from "../internals/consumeThemeProps.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-const getRotation = (direction, reverse, rotate) => {
-  if (!rotate && reverse) {
-    return direction === 'vertical' ? 90 : 180;
+const getRotation = (direction, reverse, rotate, isRtl) => {
+  const angle = (direction === 'vertical' ? -90 : 0) + (rotate ? 90 : 0) + (reverse ? 180 : 0);
+  if (isRtl && direction !== 'vertical') {
+    return angle + 180;
   }
-  if (rotate && !reverse) {
-    return direction === 'vertical' ? 0 : 90;
-  }
-  if (rotate && reverse) {
-    return direction === 'vertical' ? 180 : -90;
-  }
-  return direction === 'vertical' ? -90 : 0;
+  return angle;
 };
 const Root = styled('div', {
   name: 'MuiChartsLabelGradient',
@@ -29,7 +25,7 @@ const Root = styled('div', {
 })(({
   ownerState
 }) => {
-  const rotation = getRotation(ownerState.direction, ownerState.reverse, ownerState.rotate);
+  const rotation = getRotation(ownerState.direction, ownerState.reverse, ownerState.rotate, ownerState.isRtl);
   return {
     display: 'flex',
     alignItems: 'center',
@@ -79,9 +75,12 @@ const ChartsLabelGradient = consumeThemeProps('MuiChartsLabelGradient', {
       className
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
+  const isRtl = useRtl();
   return /*#__PURE__*/_jsx(Root, _extends({
     className: clsx(classes?.root, className),
-    ownerState: props,
+    ownerState: _extends({}, props, {
+      isRtl
+    }),
     "aria-hidden": "true",
     ref: ref
   }, other, {

package/modern/ChartsLegend/ContinuousColorLegend.js

@@ -12,7 +12,7 @@ import { ChartsLabel } from "../ChartsLabel/ChartsLabel.js";
 import { ChartsLabelGradient } from "../ChartsLabel/ChartsLabelGradient.js";
 import { consumeThemeProps } from "../internals/consumeThemeProps.js";
 import { continuousColorLegendClasses, useUtilityClasses } from "./continuousColorLegendClasses.js";
-import { useChartGradientObjectBound } from "../internals/components/ChartsAxesGradients/index.js";
+import { useChartGradientIdObjectBoundBuilder } from "../hooks/useChartGradientId.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const templateAreas = reverse => {
   const startLabel = reverse ? 'max-label' : 'min-label';
@@ -146,7 +146,7 @@ const ContinuousColorLegend = consumeThemeProps('MuiContinuousColorLegend', {
       thickness
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const generateGradientId = useChartGradientObjectBound();
+  const generateGradientId = useChartGradientIdObjectBoundBuilder();
   const axisItem = useAxis({
     axisDirection,
     axisId
@@ -195,7 +195,7 @@ const ContinuousColorLegend = consumeThemeProps('MuiContinuousColorLegend', {
         rotate: rotateGradient,
         reverse: reverse,
         thickness: thickness,
-        gradientId: gradientId ?? generateGradientId(axisItem.id, axisDirection)
+        gradientId: gradientId ?? generateGradientId(axisItem.id)
       })
     }), reverse ? minComponent : maxComponent]
   }));

package/modern/ChartsLegend/useAxis.js

@@ -1,7 +1,7 @@
 'use client';
 
-import { useCartesianContext } from "../context/CartesianProvider/useCartesianContext.js";
-import { useZAxis } from "../hooks/useZAxis.js";
+import { useZAxes } from "../hooks/useZAxis.js";
+import { useXAxes, useYAxes } from "../hooks/useAxis.js";
 /**
  * Helper to select an axis definition according to its direction and id.
  */
@@ -11,14 +11,16 @@ export function useAxis({
 }) {
   const {
     xAxis,
-    xAxisIds,
+    xAxisIds
+  } = useXAxes();
+  const {
     yAxis,
     yAxisIds
-  } = useCartesianContext();
+  } = useYAxes();
   const {
     zAxis,
     zAxisIds
-  } = useZAxis();
+  } = useZAxes();
   switch (axisDirection) {
     case 'x':
       {

package/modern/ChartsOnAxisClickHandler/ChartsOnAxisClickHandler.js

@@ -3,8 +3,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { useSeries } from "../hooks/useSeries.js";
-import { useSvgRef } from "../hooks/index.js";
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
+import { useSvgRef, useXAxes, useYAxes } from "../hooks/index.js";
 import { useStore } from "../internals/store/useStore.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 function ChartsOnAxisClickHandler(props) {
@@ -15,11 +14,13 @@ function ChartsOnAxisClickHandler(props) {
   const series = useSeries();
   const store = useStore();
   const {
-    xAxisIds,
     xAxis,
-    yAxisIds,
-    yAxis
-  } = useCartesianContext();
+    xAxisIds
+  } = useXAxes();
+  const {
+    yAxis,
+    yAxisIds
+  } = useYAxes();
   React.useEffect(() => {
     const element = svgRef.current;
     if (element === null || !onAxisClick) {

package/modern/ChartsSurface/ChartsSurface.js

@@ -9,8 +9,10 @@ import * as React from 'react';
 import useForkRef from '@mui/utils/useForkRef';
 import { useAxisEvents } from "../hooks/useAxisEvents.js";
 import { ChartsAxesGradients } from "../internals/components/ChartsAxesGradients/index.js";
-import { useDrawingArea, useSvgRef } from "../hooks/index.js";
-import { useSize } from "../context/SizeProvider/index.js";
+import { useSvgRef } from "../hooks/useSvgRef.js";
+import { useSelector } from "../internals/store/useSelector.js";
+import { useStore } from "../internals/store/useStore.js";
+import { selectorChartContainerSize, selectorChartPropsSize } from "../internals/plugins/corePlugins/useChartDimensions/useChartDimensions.selectors.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ChartsSurfaceStyles = styled('svg', {
   name: 'MuiChartsSurface',
@@ -39,29 +41,24 @@ const ChartsSurfaceStyles = styled('svg', {
  *
  * Demos:
  *
- * - [Composition](http://localhost:3001/x/react-charts/composition/)
+ * - [Composition](https://mui.com/x/api/charts/composition/)
  *
  * API:
  *
  * - [ChartsSurface API](https://mui.com/x/api/charts/charts-surface/)
  */
 const ChartsSurface = /*#__PURE__*/React.forwardRef(function ChartsSurface(inProps, ref) {
+  const store = useStore();
   const {
-    width,
-    height,
-    left,
-    right,
-    top,
-    bottom
-  } = useDrawingArea();
+    width: svgWidth,
+    height: svgHeight
+  } = useSelector(store, selectorChartContainerSize);
   const {
-    hasIntrinsicSize,
-    svgRef: containerRef,
-    inHeight,
-    inWidth
-  } = useSize();
+    width: propsWidth,
+    height: propsHeight
+  } = useSelector(store, selectorChartPropsSize);
   const svgRef = useSvgRef();
-  const handleRef = useForkRef(containerRef, svgRef, ref);
+  const handleRef = useForkRef(svgRef, ref);
   const themeProps = useThemeProps({
     props: inProps,
     name: 'MuiChartsSurface'
@@ -74,21 +71,14 @@ const ChartsSurface = /*#__PURE__*/React.forwardRef(function ChartsSurface(inPro
       desc
     } = themeProps,
     other = _objectWithoutPropertiesLoose(themeProps, _excluded);
-  const svgWidth = width + left + right;
-  const svgHeight = height + top + bottom;
-  const svgView = {
-    width: svgWidth,
-    height: svgHeight,
-    x: 0,
-    y: 0
-  };
+  const hasIntrinsicSize = svgHeight > 0 && svgWidth > 0;
   useAxisEvents(disableAxisListener);
   return /*#__PURE__*/_jsxs(ChartsSurfaceStyles, _extends({
     ownerState: {
-      width: inWidth,
-      height: inHeight
+      width: propsWidth,
+      height: propsHeight
     },
-    viewBox: `${svgView.x} ${svgView.y} ${svgView.width} ${svgView.height}`,
+    viewBox: `${0} ${0} ${svgWidth} ${svgHeight}`,
     className: className
   }, other, {
     ref: handleRef,

package/modern/ChartsTooltip/ChartsAxisTooltipContent.js

@@ -5,9 +5,10 @@ import PropTypes from 'prop-types';
 import Typography from '@mui/material/Typography';
 import clsx from 'clsx';
 import { useUtilityClasses } from "./chartsTooltipClasses.js";
-import { ChartsTooltipCell, ChartsTooltipMark, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
+import { ChartsTooltipCell, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
 import { useAxisTooltip } from "./useAxisTooltip.js";
 import { useXAxis, useYAxis } from "../hooks/index.js";
+import { ChartsLabelMark } from "../ChartsLabel/ChartsLabelMark.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function ChartsAxisTooltipContent(props) {
   const {
@@ -49,7 +50,8 @@ function ChartsAxisTooltipContent(props) {
           seriesId,
           color,
           formattedValue,
-          formattedLabel
+          formattedLabel,
+          markType
         }) => {
           if (formattedValue == null) {
             return null;
@@ -58,7 +60,8 @@ function ChartsAxisTooltipContent(props) {
             className: classes.row,
             children: [/*#__PURE__*/_jsx(ChartsTooltipCell, {
               className: clsx(classes.markCell, classes.cell),
-              children: color && /*#__PURE__*/_jsx(ChartsTooltipMark, {
+              children: color && /*#__PURE__*/_jsx(ChartsLabelMark, {
+                type: markType,
                 color: color,
                 className: classes.mark
               })

package/modern/ChartsTooltip/ChartsItemTooltipContent.js

@@ -5,7 +5,8 @@ import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { useUtilityClasses } from "./chartsTooltipClasses.js";
 import { useItemTooltip } from "./useItemTooltip.js";
-import { ChartsTooltipCell, ChartsTooltipMark, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
+import { ChartsTooltipCell, ChartsTooltipPaper, ChartsTooltipRow, ChartsTooltipTable } from "./ChartsTooltipTable.js";
+import { ChartsLabelMark } from "../ChartsLabel/ChartsLabelMark.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function ChartsItemTooltipContent(props) {
   const {
@@ -20,7 +21,8 @@ function ChartsItemTooltipContent(props) {
   const {
     color,
     label,
-    formattedValue
+    formattedValue,
+    markType
   } = tooltipData;
   return /*#__PURE__*/_jsx(ChartsTooltipPaper, {
     sx: sx,
@@ -32,7 +34,8 @@ function ChartsItemTooltipContent(props) {
           className: classes.row,
           children: [/*#__PURE__*/_jsx(ChartsTooltipCell, {
             className: clsx(classes.markCell, classes.cell),
-            children: /*#__PURE__*/_jsx(ChartsTooltipMark, {
+            children: /*#__PURE__*/_jsx(ChartsLabelMark, {
+              type: markType,
               color: color,
               className: classes.mark
             })

package/modern/ChartsTooltip/ChartsTooltipTable.js

@@ -1,5 +1,4 @@
 import { styled } from '@mui/material/styles';
-import { shouldForwardProp } from '@mui/system/createStyled';
 import { chartsTooltipClasses } from "./chartsTooltipClasses.js";
 
 /**
@@ -83,23 +82,4 @@ export const ChartsTooltipCell = styled('td', {
   'td:last-of-type&': {
     paddingRight: theme.spacing(1.5)
   }
-}));
-
-/**
- * @ignore - internal component.
- */
-export const ChartsTooltipMark = styled('div', {
-  name: 'MuiChartsTooltip',
-  slot: 'Mark',
-  overridesResolver: (props, styles) => styles.mark,
-  shouldForwardProp: prop => shouldForwardProp(prop) && prop !== 'color'
-})(({
-  theme,
-  color
-}) => ({
-  width: theme.spacing(1),
-  height: theme.spacing(1),
-  borderRadius: '50%',
-  background: color,
-  boxSizing: 'content-box'
 }));

package/modern/ChartsTooltip/useAxisTooltip.js

@@ -1,15 +1,14 @@
 'use client';
 
 import { useSeries } from "../hooks/useSeries.js";
-import { useCartesianContext } from "../context/CartesianProvider/index.js";
-import { useColorProcessor } from "../context/PluginProvider/useColorProcessor.js";
+import { useColorProcessor } from "../internals/plugins/corePlugins/useChartSeries/useColorProcessor.js";
 import { useStore } from "../internals/store/useStore.js";
 import { useSelector } from "../internals/store/useSelector.js";
 import { getLabel } from "../internals/getLabel.js";
 import { isCartesianSeriesType } from "../internals/isCartesian.js";
 import { utcFormatter } from "./utils.js";
-import { useXAxis, useYAxis } from "../hooks/useAxis.js";
-import { useZAxis } from "../hooks/useZAxis.js";
+import { useXAxes, useXAxis, useYAxes, useYAxis } from "../hooks/useAxis.js";
+import { useZAxes } from "../hooks/useZAxis.js";
 import { selectorChartsInteractionXAxis, selectorChartsInteractionYAxis } from "../internals/plugins/featurePlugins/useChartInteraction/index.js";
 export function useAxisTooltip() {
   const defaultXAxis = useXAxis();
@@ -19,13 +18,15 @@ export function useAxisTooltip() {
   const axisData = useSelector(store, xAxisHasData ? selectorChartsInteractionXAxis : selectorChartsInteractionYAxis);
   const series = useSeries();
   const {
-    xAxis,
+    xAxis
+  } = useXAxes();
+  const {
     yAxis
-  } = useCartesianContext();
+  } = useYAxes();
   const {
     zAxis,
     zAxisIds
-  } = useZAxis();
+  } = useZAxes();
   const colorProcessors = useColorProcessor();
   if (axisData === null) {
     return null;
@@ -63,12 +64,15 @@ export function useAxisTooltip() {
           color,
           value,
           formattedValue,
-          formattedLabel
+          formattedLabel,
+          markType: seriesToAdd.labelMarkType
         };
       }
       return undefined;
     });
-  }).filter(item => item != null);
+  }).filter(function truthy(item) {
+    return Boolean(item);
+  });
   const axisFormatter = usedAxis.valueFormatter ?? (v => usedAxis.scaleType === 'utc' ? utcFormatter(v) : v.toLocaleString());
   const axisFormattedValue = axisFormatter(axisValue, {
     location: 'tooltip'