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

package/models/axis.d.ts

@@ -1,6 +1,8 @@
 import type { ScaleBand, ScaleLogarithmic, ScalePower, ScaleTime, ScaleLinear, ScalePoint } from 'd3-scale';
 import { ChartsAxisClasses } from '../ChartsAxis/axisClasses';
 import type { TickParams } from '../hooks/useTicks';
+export type D3Scale = ScaleBand<any> | ScaleLogarithmic<any, any> | ScalePoint<any> | ScalePower<any, any> | ScaleTime<any, any> | ScaleLinear<any, any>;
+export type D3ContinuouseScale = ScaleLogarithmic<any, any> | ScalePower<any, any> | ScaleTime<any, any> | ScaleLinear<any, any>;
 export interface ChartsAxisProps {
     /**
      * Id of the axis to render.
@@ -68,51 +70,62 @@ interface AxisScaleConfig {
     band: {
         scaleType: 'band';
         scale: ScaleBand<any>;
-        ticksNumber: number;
+        /**
+         * The ratio between the space allocated for padding between two categories and the category width.
+         * 0 means no gap, and 1 no data.
+         * @default 0.1
+         */
+        categoryGapRatio: number;
+        /**
+         * The ratio between the width of a bar, and the gap between two bars.
+         * 0 means no gap, and 1 no bar.
+         * @default 0
+         */
+        barGapRatio: number;
     };
     point: {
         scaleType: 'point';
         scale: ScalePoint<any>;
-        ticksNumber: number;
     };
     log: {
         scaleType: 'log';
         scale: ScaleLogarithmic<any, any>;
-        ticksNumber: number;
     };
     pow: {
         scaleType: 'pow';
         scale: ScalePower<any, any>;
-        ticksNumber: number;
     };
     sqrt: {
         scaleType: 'sqrt';
         scale: ScalePower<any, any>;
-        ticksNumber: number;
     };
     time: {
         scaleType: 'time';
         scale: ScaleTime<any, any>;
-        ticksNumber: number;
     };
     utc: {
         scaleType: 'utc';
         scale: ScaleTime<any, any>;
-        ticksNumber: number;
     };
     linear: {
         scaleType: 'linear';
         scale: ScaleLinear<any, any>;
-        ticksNumber: number;
     };
 }
-export type AxisConfig<S = ScaleName, V = any> = {
+export type AxisConfig<S extends ScaleName = ScaleName, V = any> = {
     id: string;
-    scaleType?: S;
     min?: number;
     max?: number;
     data?: V[];
     valueFormatter?: (value: V) => string;
-} & Partial<ChartsXAxisProps | ChartsYAxisProps> & TickParams;
-export type AxisDefaultized<S extends ScaleName = ScaleName, V = any> = Omit<AxisConfig<S, V>, 'scaleType'> & AxisScaleConfig[S];
+} & Partial<ChartsXAxisProps | ChartsYAxisProps> & Partial<Omit<AxisScaleConfig[S], 'scale'>> & TickParams;
+export type AxisDefaultized<S extends ScaleName = ScaleName, V = any> = Omit<AxisConfig<S, V>, 'scaleType'> & AxisScaleConfig[S] & {
+    ticksNumber: number;
+};
+export declare function isBandScaleConfig(scaleConfig: AxisConfig<ScaleName>): scaleConfig is AxisConfig<'band'> & {
+    scaleType: 'band';
+};
+export declare function isPointScaleConfig(scaleConfig: AxisConfig<ScaleName>): scaleConfig is AxisConfig<'point'> & {
+    scaleType: 'point';
+};
 export {};

package/models/axis.js

@@ -2,4 +2,12 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+exports.isBandScaleConfig = isBandScaleConfig;
+exports.isPointScaleConfig = isPointScaleConfig;
+function isBandScaleConfig(scaleConfig) {
+  return scaleConfig.scaleType === 'band';
+}
+function isPointScaleConfig(scaleConfig) {
+  return scaleConfig.scaleType === 'point';
+}

package/models/seriesType/pie.d.ts

@@ -70,7 +70,7 @@ export interface PieSeriesType<Tdata = PieValueType> extends CommonSeriesType<Td
     highlighted?: {
         /**
          * Value added to the default `outerRadius`.
-         * Can be negative. ANd is ignored if you provide a `highlighted.outerRadius` value.
+         * Can be negative. It is ignored if you provide a `highlighted.outerRadius` value.
          */
         additionalRadius?: number;
         innerRadius?: number;
@@ -83,7 +83,7 @@ export interface PieSeriesType<Tdata = PieValueType> extends CommonSeriesType<Td
     faded?: {
         /**
          * Value added to the default `outerRadius`.
-         * Can be negative. ANd is ignored if you provide a `faded.outerRadius` value.
+         * Can be negative. It is ignored if you provide a `faded.outerRadius` value.
          */
         additionalRadius?: number;
         innerRadius?: number;

package/modern/BarChart/BarChart.js

@@ -12,7 +12,7 @@ import { ChartsAxisHighlight } from '../ChartsAxisHighlight';
 import { ChartsClipPath } from '../ChartsClipPath';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-function BarChart(props) {
+const BarChart = /*#__PURE__*/React.forwardRef(function BarChart(props, ref) {
   const {
     xAxis,
     yAxis,
@@ -34,6 +34,7 @@ function BarChart(props) {
   const id = useId();
   const clipPathId = `${id}-clip-path`;
   return /*#__PURE__*/_jsxs(ResponsiveChartContainer, {
+    ref: ref,
     series: series.map(s => _extends({
       type: 'bar'
     }, s)),
@@ -65,7 +66,7 @@ function BarChart(props) {
       id: clipPathId
     }), children]
   });
-}
+});
 process.env.NODE_ENV !== "production" ? BarChart.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |

package/modern/BarChart/BarPlot.js

@@ -1,9 +1,37 @@
 import * as React from 'react';
 import { SeriesContext } from '../context/SeriesContextProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
-import { isBandScale } from '../hooks/useScale';
 import { BarElement } from './BarElement';
+import { isBandScaleConfig } from '../models/axis';
+
+/**
+ * Solution of the equations
+ * W = barWidth * N + offset * (N-1)
+ * offset / (offset + barWidth) = r
+ * @param bandWidth The width available to place bars.
+ * @param numberOfGroups The number of bars to place in that space.
+ * @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 } from "react/jsx-runtime";
+function getBandSize({
+  bandWidth: W,
+  numberOfGroups: N,
+  gapRatio: r
+}) {
+  if (r === 0) {
+    return {
+      barWidth: W / N,
+      offset: 0
+    };
+  }
+  const barWidth = W / (N + (N - 1) * r);
+  const offset = r * barWidth;
+  return {
+    barWidth,
+    offset
+  };
+}
 export function BarPlot() {
   const seriesData = React.useContext(SeriesContext).bar;
   const axisData = React.useContext(CartesianContext);
@@ -29,19 +57,27 @@ export function BarPlot() {
       return groupIds.flatMap(seriesId => {
         const xAxisKey = series[seriesId].xAxisKey ?? defaultXAxisId;
         const yAxisKey = series[seriesId].yAxisKey ?? defaultYAxisId;
-        const xScale = xAxis[xAxisKey].scale;
-        const yScale = yAxis[yAxisKey].scale;
-        if (!isBandScale(xScale)) {
-          throw new Error(`Axis with id "${xAxisKey}" shoud be of type "band" to display the bar series ${stackingGroups}`);
+        const xAxisConfig = xAxis[xAxisKey];
+        const yAxisConfig = yAxis[yAxisKey];
+        if (!isBandScaleConfig(xAxisConfig)) {
+          throw new Error(`Axis with id "${xAxisKey}" shoud be of type "band" to display the bar series of id "${seriesId}"`);
         }
         if (xAxis[xAxisKey].data === undefined) {
           throw new Error(`Axis with id "${xAxisKey}" shoud have data property`);
         }
+        const xScale = xAxisConfig.scale;
+        const yScale = yAxisConfig.scale;
 
         // Currently assuming all bars are vertical
         const bandWidth = xScale.bandwidth();
-        const barWidth = 0.9 * bandWidth / stackingGroups.length;
-        const offset = 0.05 * bandWidth;
+        const {
+          barWidth,
+          offset
+        } = getBandSize({
+          bandWidth,
+          numberOfGroups: stackingGroups.length,
+          gapRatio: xAxisConfig.barGapRatio
+        });
 
         // @ts-ignore TODO: fix when adding a correct API for customisation
         const {
@@ -54,7 +90,7 @@ export function BarPlot() {
           return /*#__PURE__*/_jsx(BarElement, {
             id: seriesId,
             dataIndex: dataIndex,
-            x: xScale(xAxis[xAxisKey].data?.[dataIndex]) + groupIndex * barWidth + offset,
+            x: xScale(xAxis[xAxisKey].data?.[dataIndex]) + groupIndex * (barWidth + offset),
             y: yScale(value),
             height: yScale(baseline) - yScale(value),
             width: barWidth,

package/modern/ChartContainer/index.js

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import useForkRef from '@mui/utils/useForkRef';
 import { DrawingProvider } from '../context/DrawingProvider';
 import { SeriesContextProvider } from '../context/SeriesContextProvider';
 import { InteractionProvider } from '../context/InteractionProvider';
@@ -6,7 +7,7 @@ import { ChartsSurface } from '../ChartsSurface';
 import { CartesianContextProvider } from '../context/CartesianContextProvider';
 import { HighlightProvider } from '../context/HighlightProvider';
 import { jsx as _jsx } from "react/jsx-runtime";
-export function ChartContainer(props) {
+export const ChartContainer = /*#__PURE__*/React.forwardRef(function ChartContainer(props, ref) {
   const {
     width,
     height,
@@ -21,12 +22,13 @@ export function ChartContainer(props) {
     disableAxisListener,
     children
   } = props;
-  const ref = React.useRef(null);
+  const svgRef = React.useRef(null);
+  const handleRef = useForkRef(ref, svgRef);
   return /*#__PURE__*/_jsx(DrawingProvider, {
     width: width,
     height: height,
     margin: margin,
-    svgRef: ref,
+    svgRef: svgRef,
     children: /*#__PURE__*/_jsx(SeriesContextProvider, {
       series: series,
       colors: colors,
@@ -38,7 +40,7 @@ export function ChartContainer(props) {
             children: /*#__PURE__*/_jsx(ChartsSurface, {
               width: width,
               height: height,
-              ref: ref,
+              ref: handleRef,
               sx: sx,
               title: title,
               desc: desc,
@@ -50,4 +52,4 @@ export function ChartContainer(props) {
       })
     })
   });
-}
+});

package/modern/ChartsAxisHighlight/ChartsAxisHighlight.js

@@ -2,7 +2,8 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import { InteractionContext } from '../context/InteractionProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
-import { getValueToPositionMapper, isBandScale } from '../hooks/useScale';
+import { getValueToPositionMapper } from '../hooks/useScale';
+import { isBandScale } from '../internals/isBandScale';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 function ChartsAxisHighlight(props) {
@@ -26,7 +27,7 @@ function ChartsAxisHighlight(props) {
   const getXPosition = getValueToPositionMapper(xScale);
   return /*#__PURE__*/_jsxs(React.Fragment, {
     children: [xAxisHighlight === 'band' && axis.x !== null && isBandScale(xScale) && /*#__PURE__*/_jsx("path", {
-      d: `M ${xScale(axis.x.value)} ${yScale.range()[0]} L ${xScale(axis.x.value) + xScale.bandwidth()} ${yScale.range()[0]} L ${xScale(axis.x.value) + xScale.bandwidth()} ${yScale.range()[1]} L ${xScale(axis.x.value)} ${yScale.range()[1]} Z`,
+      d: `M ${xScale(axis.x.value) - (xScale.step() - xScale.bandwidth()) / 2} ${yScale.range()[0]} l ${xScale.step()} 0 l 0 ${yScale.range()[1] - yScale.range()[0]} l ${-xScale.step()} 0 Z`,
       fill: "gray",
       fillOpacity: 0.1,
       style: {

package/modern/LineChart/LineChart.js

@@ -14,7 +14,7 @@ import { ChartsAxisHighlight } from '../ChartsAxisHighlight';
 import { ChartsClipPath } from '../ChartsClipPath';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-function LineChart(props) {
+const LineChart = /*#__PURE__*/React.forwardRef(function LineChart(props, ref) {
   const {
     xAxis,
     yAxis,
@@ -38,6 +38,7 @@ function LineChart(props) {
   const id = useId();
   const clipPathId = `${id}-clip-path`;
   return /*#__PURE__*/_jsxs(ResponsiveChartContainer, {
+    ref: ref,
     series: series.map(s => _extends({
       type: 'line'
     }, s)),
@@ -67,7 +68,7 @@ function LineChart(props) {
       id: clipPathId
     }), children]
   });
-}
+});
 process.env.NODE_ENV !== "production" ? LineChart.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |

package/modern/ResponsiveChartContainer/index.js

@@ -90,22 +90,23 @@ const ResizableContainer = styled('div', {
     height: '100%'
   }
 }));
-export function ResponsiveChartContainer(props) {
+export const ResponsiveChartContainer = /*#__PURE__*/React.forwardRef(function ResponsiveChartContainer(props, ref) {
   const {
-      width: propsWidth,
-      height: propsHeight
+      width: inWidth,
+      height: inHeight
     } = props,
     other = _objectWithoutPropertiesLoose(props, _excluded);
-  const [containerRef, width, height] = useChartDimensions(propsWidth, propsHeight);
+  const [containerRef, width, height] = useChartDimensions(inWidth, inHeight);
   return /*#__PURE__*/_jsx(ResizableContainer, {
     ref: containerRef,
     ownerState: {
-      width: props.width,
-      height: props.height
+      width: inWidth,
+      height: inHeight
     },
     children: /*#__PURE__*/_jsx(ChartContainer, _extends({}, other, {
       width: width,
-      height: height
+      height: height,
+      ref: ref
     }))
   });
-}
+});

package/modern/ScatterChart/ScatterChart.js

@@ -9,7 +9,7 @@ import { ChartsLegend } from '../ChartsLegend';
 import { ChartsAxisHighlight } from '../ChartsAxisHighlight';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-function ScatterChart(props) {
+const ScatterChart = /*#__PURE__*/React.forwardRef(function ScatterChart(props, ref) {
   const {
     xAxis,
     yAxis,
@@ -29,6 +29,7 @@ function ScatterChart(props) {
     children
   } = props;
   return /*#__PURE__*/_jsxs(ResponsiveChartContainer, {
+    ref: ref,
     series: series.map(s => _extends({
       type: 'scatter'
     }, s)),
@@ -51,7 +52,7 @@ function ScatterChart(props) {
       trigger: "item"
     }, tooltip)), children]
   });
-}
+});
 process.env.NODE_ENV !== "production" ? ScatterChart.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |

package/modern/context/CartesianContextProvider.js

@@ -5,12 +5,15 @@ import PropTypes from 'prop-types';
 import { getExtremumX as getBarExtremumX, getExtremumY as getBarExtremumY } from '../BarChart/extremums';
 import { getExtremumX as getScatterExtremumX, getExtremumY as getScatterExtremumY } from '../ScatterChart/extremums';
 import { getExtremumX as getLineExtremumX, getExtremumY as getLineExtremumY } from '../LineChart/extremums';
-import { getScale } from '../hooks/useScale';
+import { isBandScaleConfig, isPointScaleConfig } from '../models/axis';
+import { getScale } from '../internals/getScale';
 import { DrawingContext } from './DrawingProvider';
 import { SeriesContext } from './SeriesContextProvider';
 import { DEFAULT_X_AXIS_KEY, DEFAULT_Y_AXIS_KEY } from '../constants';
 import { getTicksNumber } from '../hooks/useTicks';
 import { jsx as _jsx } from "react/jsx-runtime";
+const DEFAULT_CATEGORY_GAP_RATIO = 0.1;
+
 // TODO: those might be better placed in a distinct file
 const xExtremumGetters = {
   bar: getBarExtremumX,
@@ -71,24 +74,28 @@ function CartesianContextProvider({
     allXAxis.forEach((axis, axisIndex) => {
       const isDefaultAxis = axisIndex === 0;
       const [minData, maxData] = getAxisExtremum(axis, xExtremumGetters, isDefaultAxis);
-      const scaleType = axis.scaleType ?? 'linear';
       const range = [drawingArea.left, drawingArea.left + drawingArea.width];
-      if (scaleType === 'band') {
-        completedXAxis[axis.id] = _extends({}, axis, {
-          scaleType,
-          scale: scaleBand(axis.data, range),
+      if (isBandScaleConfig(axis)) {
+        const categoryGapRatio = axis.categoryGapRatio ?? DEFAULT_CATEGORY_GAP_RATIO;
+        completedXAxis[axis.id] = _extends({
+          categoryGapRatio,
+          barGapRatio: 0
+        }, axis, {
+          scale: scaleBand(axis.data, range).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
           ticksNumber: axis.data.length
         });
-        return;
       }
-      if (scaleType === 'point') {
+      if (isPointScaleConfig(axis)) {
         completedXAxis[axis.id] = _extends({}, axis, {
-          scaleType,
           scale: scalePoint(axis.data, range),
           ticksNumber: axis.data.length
         });
+      }
+      if (axis.scaleType === 'band' || axis.scaleType === 'point') {
+        // Could be merged with the two previous "if conditions" but then TS does not get that `axis.scaleType` can't be `band` or `point`.
         return;
       }
+      const scaleType = axis.scaleType ?? 'linear';
       const extremums = [axis.min ?? minData, axis.max ?? maxData];
       const ticksNumber = getTicksNumber(_extends({}, axis, {
         range
@@ -115,23 +122,27 @@ function CartesianContextProvider({
       const isDefaultAxis = axisIndex === 0;
       const [minData, maxData] = getAxisExtremum(axis, yExtremumGetters, isDefaultAxis);
       const range = [drawingArea.top + drawingArea.height, drawingArea.top];
-      const scaleType = axis.scaleType ?? 'linear';
-      if (scaleType === 'band') {
-        completedYAxis[axis.id] = _extends({}, axis, {
-          scaleType,
-          scale: scaleBand(axis.data, range),
+      if (isBandScaleConfig(axis)) {
+        const categoryGapRatio = axis.categoryGapRatio ?? DEFAULT_CATEGORY_GAP_RATIO;
+        completedXAxis[axis.id] = _extends({
+          categoryGapRatio,
+          barGapRatio: 0
+        }, axis, {
+          scale: scaleBand(axis.data, range).paddingInner(categoryGapRatio).paddingOuter(categoryGapRatio / 2),
           ticksNumber: axis.data.length
         });
-        return;
       }
-      if (scaleType === 'point') {
-        completedYAxis[axis.id] = _extends({}, axis, {
-          scaleType,
+      if (isPointScaleConfig(axis)) {
+        completedXAxis[axis.id] = _extends({}, axis, {
           scale: scalePoint(axis.data, range),
           ticksNumber: axis.data.length
         });
+      }
+      if (axis.scaleType === 'band' || axis.scaleType === 'point') {
+        // Could be merged with the two previous "if conditions" but then TS does not get that `axis.scaleType` can't be `band` or `point`.
         return;
       }
+      const scaleType = axis.scaleType ?? 'linear';
       const extremums = [axis.min ?? minData, axis.max ?? maxData];
       const ticksNumber = getTicksNumber(_extends({}, axis, {
         range

package/modern/context/SeriesContextProvider.js

@@ -16,8 +16,8 @@ const seriesTypeFormatter = {
   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
+ * This methods is the interface between what the developer is providing and what components receives
+ * To simplify the components behaviors, it groups series by type, such that LinePlots props are not updated if some 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

package/modern/hooks/index.js

@@ -0,0 +1,2 @@
+export * from './useDrawingArea';
+export * from './useScale';

package/modern/hooks/useAxisEvents.js

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { InteractionContext } from '../context/InteractionProvider';
 import { CartesianContext } from '../context/CartesianContextProvider';
 import { SVGContext, DrawingContext } from '../context/DrawingProvider';
-import { isBandScale } from './useScale';
+import { isBandScale } from '../internals/isBandScale';
 export const useAxisEvents = disableAxisListener => {
   const svgRef = React.useContext(SVGContext);
   const {
@@ -109,12 +109,17 @@ export const useAxisEvents = disableAxisListener => {
       });
     };
     const handleMouseMove = event => {
+      // Get mouse coordinate in global SVG space
+      const pt = svgRef.current.createSVGPoint();
+      pt.x = event.clientX;
+      pt.y = event.clientY;
+      const svgPt = pt.matrixTransform(svgRef.current.getScreenCTM().inverse());
       mousePosition.current = {
-        x: event.offsetX,
-        y: event.offsetY
+        x: svgPt.x,
+        y: svgPt.y
       };
-      const outsideX = event.offsetX < left || event.offsetX > left + width;
-      const outsideY = event.offsetY < top || event.offsetY > top + height;
+      const outsideX = svgPt.x < left || svgPt.x > left + width;
+      const outsideY = svgPt.y < top || svgPt.y > top + height;
       if (outsideX || outsideY) {
         dispatch({
           type: 'updateAxis',
@@ -125,8 +130,8 @@ export const useAxisEvents = disableAxisListener => {
         });
         return;
       }
-      const newStateX = getUpdateX(event.offsetX);
-      const newStateY = getUpdateY(event.offsetY);
+      const newStateX = getUpdateX(svgPt.x);
+      const newStateY = getUpdateY(svgPt.y);
       dispatch({
         type: 'updateAxis',
         data: {

package/modern/hooks/useDrawingArea.js

@@ -0,0 +1,16 @@
+import * as React from 'react';
+import { DrawingContext } from '../context/DrawingProvider';
+export function useDrawingArea() {
+  const {
+    left,
+    top,
+    width,
+    height
+  } = React.useContext(DrawingContext);
+  return React.useMemo(() => ({
+    left,
+    top,
+    width,
+    height
+  }), [height, left, top, width]);
+}

package/modern/hooks/useScale.js

@@ -1,24 +1,6 @@
-import { scaleLog, scalePow, scaleSqrt, scaleTime, scaleUtc, scaleLinear } from 'd3-scale';
-export function getScale(scaleType, domain, range) {
-  switch (scaleType) {
-    case 'log':
-      return scaleLog(domain, range);
-    case 'pow':
-      return scalePow(domain, range);
-    case 'sqrt':
-      return scaleSqrt(domain, range);
-    case 'time':
-      return scaleTime(domain, range);
-    case 'utc':
-      return scaleUtc(domain, range);
-    default:
-      return scaleLinear(domain, range);
-  }
-}
-export function isBandScale(scale) {
-  return scale.bandwidth !== undefined;
-}
-
+import * as React from 'react';
+import { CartesianContext } from '../context/CartesianContextProvider';
+import { isBandScale } from '../internals/isBandScale';
 /**
  * For a given scale return a function that map value to their position.
  * Usefull when dealing with specific scale such as band.
@@ -30,4 +12,20 @@ export function getValueToPositionMapper(scale) {
     return value => scale(value) + scale.bandwidth() / 2;
   }
   return value => scale(value);
+}
+export function useXScale(identifier) {
+  const {
+    xAxis,
+    xAxisIds
+  } = React.useContext(CartesianContext);
+  const id = typeof identifier === 'string' ? identifier : xAxisIds[identifier ?? 0];
+  return xAxis[id].scale;
+}
+export function useYScale(identifier) {
+  const {
+    yAxis,
+    yAxisIds
+  } = React.useContext(CartesianContext);
+  const id = typeof identifier === 'string' ? identifier : yAxisIds[identifier ?? 0];
+  return yAxis[id].scale;
 }

package/modern/hooks/useTicks.js

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { isBandScale } from './useScale';
+import { isBandScale } from '../internals/isBandScale';
 export function getTicksNumber(params) {
   const {
     maxTicks = 999,
@@ -20,15 +20,25 @@ function useTicks(options) {
     // band scale
     if (isBandScale(scale)) {
       const domain = scale.domain();
-      return [...domain.map(value => ({
+      if (scale.bandwidth() > 0) {
+        // scale type = 'band'
+        return [...domain.map((value, index) => ({
+          formattedValue: valueFormatter?.(value) ?? value,
+          offset: index === 0 ? scale.range()[0] : scale(value) - (scale.step() - scale.bandwidth()) / 2,
+          labelOffset: scale.step() / 2
+        })), {
+          formattedValue: undefined,
+          offset: scale.range()[1],
+          labelOffset: 0
+        }];
+      }
+
+      // scale type = 'point'
+      return domain.map(value => ({
         formattedValue: valueFormatter?.(value) ?? value,
-        offset: scale(value) ?? 0,
-        labelOffset: scale.bandwidth() / 2
-      })), ...(scale.bandwidth() > 0 ? [{
-        formattedValue: undefined,
-        offset: scale.range()[1],
+        offset: scale(value),
         labelOffset: 0
-      }] : [])];
+      }));
     }
     return scale.ticks(ticksNumber).map(value => ({
       formattedValue: valueFormatter?.(value) ?? scale.tickFormat(ticksNumber)(value),

package/modern/index.js

@@ -1,5 +1,5 @@
 /**
- * @mui/x-charts v6.0.0-alpha.2
+ * @mui/x-charts v6.0.0-alpha.3
  *
  * @license MIT
  * This source code is licensed under the MIT license found in the
@@ -7,6 +7,7 @@
  */
 export * from './constants';
 export * from './context';
+export * from './hooks';
 export * from './colorPalettes';
 export * from './models';
 export * from './ChartsClipPath';

package/modern/internals/getScale.js

@@ -0,0 +1,17 @@
+import { scaleLog, scalePow, scaleSqrt, scaleTime, scaleUtc, scaleLinear } from 'd3-scale';
+export function getScale(scaleType, domain, range) {
+  switch (scaleType) {
+    case 'log':
+      return scaleLog(domain, range);
+    case 'pow':
+      return scalePow(domain, range);
+    case 'sqrt':
+      return scaleSqrt(domain, range);
+    case 'time':
+      return scaleTime(domain, range);
+    case 'utc':
+      return scaleUtc(domain, range);
+    default:
+      return scaleLinear(domain, range);
+  }
+}