@mui/x-charts 8.9.2 → 8.10.1

package/internals/plugins/featurePlugins/useChartCartesianAxis/createAxisFilterMapper.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createAxisFilterMapper = createAxisFilterMapper;
+exports.createContinuousScaleGetAxisFilter = createContinuousScaleGetAxisFilter;
+exports.createDiscreteScaleGetAxisFilter = createDiscreteScaleGetAxisFilter;
 exports.createGetAxisFilters = void 0;
 var _isDefined = require("../../../isDefined");
 var _getAxisExtremum = require("./getAxisExtremum");
@@ -25,32 +27,41 @@ function createAxisFilterMapper({
       // No zoom, or zoom with all data visible
       return null;
     }
-    let extremums = [];
     const scaleType = axis.scaleType;
     if (scaleType === 'point' || scaleType === 'band') {
-      extremums = [0, (axis.data?.length ?? 1) - 1];
-    } else {
-      extremums = (0, _getAxisExtremum.getAxisExtremum)(axis, direction, seriesConfig, axisIndex, formattedSeries);
+      return createDiscreteScaleGetAxisFilter(axis.data, zoom.start, zoom.end, direction);
     }
-    let min;
-    let max;
-    const continuousScaleType = !scaleType || scaleType === 'band' || scaleType === 'point' ? 'linear' : scaleType;
-    [min, max] = (0, _getScale.getScale)(continuousScaleType, extremums, [0, 100]).nice().domain();
-    min = min instanceof Date ? min.getTime() : min;
-    max = max instanceof Date ? max.getTime() : max;
-    const minVal = min + zoom.start * (max - min) / 100;
-    const maxVal = min + zoom.end * (max - min) / 100;
-    return (value, dataIndex) => {
-      const val = value[direction] ?? axis.data?.[dataIndex];
-      if (val == null) {
-        // If the value does not exist because of missing data point, or out of range index, we just ignore.
-        return true;
-      }
-      if (axis.scaleType === 'point' || axis.scaleType === 'band' || typeof val === 'string') {
-        return dataIndex >= minVal && dataIndex <= maxVal;
-      }
-      return val >= minVal && val <= maxVal;
-    };
+    return createContinuousScaleGetAxisFilter(scaleType, (0, _getAxisExtremum.getAxisExtremum)(axis, direction, seriesConfig, axisIndex, formattedSeries), zoom.start, zoom.end, direction, axis.data);
+  };
+}
+function createDiscreteScaleGetAxisFilter(axisData, zoomStart, zoomEnd, direction) {
+  const maxIndex = axisData?.length ?? 0;
+  const minVal = Math.floor(zoomStart * maxIndex / 100);
+  const maxVal = Math.ceil(zoomEnd * maxIndex / 100);
+  return function filterAxis(value, dataIndex) {
+    const val = value[direction] ?? axisData?.[dataIndex];
+    if (val == null) {
+      // If the value does not exist because of missing data point, or out of range index, we just ignore.
+      return true;
+    }
+    return dataIndex >= minVal && dataIndex < maxVal;
+  };
+}
+function createContinuousScaleGetAxisFilter(scaleType, extrema, zoomStart, zoomEnd, direction, axisData) {
+  let min;
+  let max;
+  [min, max] = (0, _getScale.getScale)(scaleType ?? 'linear', extrema, [0, 100]).nice().domain();
+  min = min instanceof Date ? min.getTime() : min;
+  max = max instanceof Date ? max.getTime() : max;
+  const minVal = min + zoomStart * (max - min) / 100;
+  const maxVal = min + zoomEnd * (max - min) / 100;
+  return function filterAxis(value, dataIndex) {
+    const val = value[direction] ?? axisData?.[dataIndex];
+    if (val == null) {
+      // If the value does not exist because of missing data point, or out of range index, we just ignore.
+      return true;
+    }
+    return val >= minVal && val <= maxVal;
   };
 }
 const createGetAxisFilters = filters => ({

package/internals/plugins/featurePlugins/useChartCartesianAxis/getAxisExtremum.d.ts

@@ -3,4 +3,4 @@ import { CartesianChartSeriesType } from "../../../../models/seriesType/config.j
 import { ChartSeriesConfig } from "../../models/seriesConfig/index.js";
 import { ProcessedSeries } from "../../corePlugins/useChartSeries/useChartSeries.types.js";
 import { GetZoomAxisFilters } from "./zoom.types.js";
-export declare const getAxisExtremum: <T extends CartesianChartSeriesType>(axis: AxisConfig, axisDirection: "x" | "y", seriesConfig: ChartSeriesConfig<T>, axisIndex: number, formattedSeries: ProcessedSeries<T>, getFilters?: GetZoomAxisFilters) => number[];
+export declare const getAxisExtremum: <T extends CartesianChartSeriesType>(axis: AxisConfig, axisDirection: "x" | "y", seriesConfig: ChartSeriesConfig<T>, axisIndex: number, formattedSeries: ProcessedSeries<T>, getFilters?: GetZoomAxisFilters) => [number, number];

package/internals/plugins/featurePlugins/useChartCartesianAxis/getAxisValue.d.ts

@@ -8,4 +8,4 @@ export declare function getAxisIndex(axisConfig: ComputedAxis, pointerValue: num
  * For a pointer coordinate, this function returns the value associated.
  * Returns `null` if the coordinate has no value associated.
  */
-export declare function getAxisValue(axisConfig: ComputedAxis, pointerValue: number, dataIndex: number): number | Date | null;
+export declare function getAxisValue(axisConfig: ComputedAxis, pointerValue: number, dataIndex: number | null): number | Date | null;

package/internals/plugins/featurePlugins/useChartCartesianAxis/getAxisValue.js

@@ -59,13 +59,12 @@ function getAxisValue(axisConfig, pointerValue, dataIndex) {
     data: axisData
   } = axisConfig;
   if (!(0, _isBandScale.isBandScale)(scale)) {
-    const value = scale.invert(pointerValue);
-    if (dataIndex < 0) {
-      return value;
+    if (dataIndex === null) {
+      return scale.invert(pointerValue);
     }
     return axisData[dataIndex];
   }
-  if (dataIndex < 0 || dataIndex >= axisData.length) {
+  if (dataIndex === null || dataIndex < 0 || dataIndex >= axisData.length) {
     return null;
   }
   return axisData[dataIndex];

package/internals/plugins/featurePlugins/useChartCartesianAxis/useChartCartesianInteraction.selectors.js

@@ -44,13 +44,13 @@ function valueGetter(value, axes, indexes, ids = axes.axisIds[0]) {
   return Array.isArray(ids) ? ids.map((id, axisIndex) => (0, _getAxisValue.getAxisValue)(axes.axis[id], value, indexes[axisIndex])) : (0, _getAxisValue.getAxisValue)(axes.axis[ids], value, indexes);
 }
 const selectorChartsInteractionXAxisValue = exports.selectorChartsInteractionXAxisValue = (0, _selectors.createSelector)([_useChartInteraction.selectorChartsInteractionPointerX, _useChartCartesianAxisRendering.selectorChartXAxis, selectorChartsInteractionXAxisIndex, optionalGetAxisId], (x, xAxes, xIndex, id) => {
-  if (x === null || xIndex === null || xAxes.axisIds.length === 0) {
+  if (x === null || xAxes.axisIds.length === 0) {
     return null;
   }
   return valueGetter(x, xAxes, xIndex, id);
 });
 const selectorChartsInteractionYAxisValue = exports.selectorChartsInteractionYAxisValue = (0, _selectors.createSelector)([_useChartInteraction.selectorChartsInteractionPointerY, _useChartCartesianAxisRendering.selectorChartYAxis, selectorChartsInteractionYAxisIndex, optionalGetAxisId], (y, yAxes, yIndex, id) => {
-  if (y === null || yIndex === null || yAxes.axisIds.length === 0) {
+  if (y === null || yAxes.axisIds.length === 0) {
     return null;
   }
   return valueGetter(y, yAxes, yIndex, id);

package/internals/plugins/utils/ChartStore.js

@@ -6,26 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.ChartStore = void 0;
 class ChartStore {
   constructor(value) {
-    this.value = void 0;
-    this.listeners = void 0;
-    this.subscribe = fn => {
-      this.listeners.add(fn);
-      return () => {
-        this.listeners.delete(fn);
-      };
-    };
-    this.getSnapshot = () => {
-      return this.value;
-    };
-    this.update = updater => {
-      const newState = updater(this.value);
-      if (newState !== this.value) {
-        this.value = newState;
-        this.listeners.forEach(l => l(newState));
-      }
-    };
     this.value = value;
     this.listeners = new Set();
   }
+  subscribe = fn => {
+    this.listeners.add(fn);
+    return () => {
+      this.listeners.delete(fn);
+    };
+  };
+  getSnapshot = () => {
+    return this.value;
+  };
+  update = updater => {
+    const newState = updater(this.value);
+    if (newState !== this.value) {
+      this.value = newState;
+      this.listeners.forEach(l => l(newState));
+    }
+  };
 }
 exports.ChartStore = ChartStore;

package/models/axis.d.ts

@@ -180,6 +180,50 @@ export interface ChartsRadiusAxisProps extends ChartsAxisProps {
 }
 export type ScaleName = keyof AxisScaleConfig;
 export type ContinuousScaleName = 'linear' | 'log' | 'symlog' | 'pow' | 'sqrt' | 'time' | 'utc';
+export type AxisGroup = {
+  /**
+   * The function used to return the value for this group.
+   *
+   * @param {any} value The value of the axis item.
+   * @param {number} dataIndex  The index of the data item.
+   * @returns {string | number | Date} The value that will be used to group the axis items.
+   */
+  getValue: (value: any, dataIndex: number) => string | number | Date;
+  /**
+   * The size of the tick in pixels.
+   * @default 6
+   */
+  tickSize?: number;
+  /**
+   * The style applied to ticks text.
+   */
+  tickLabelStyle?: ChartsTextProps['style'];
+};
+export type AxisGroups = {
+  /**
+   * Each group will have a label that is the stringified value of the group.
+   *
+   * @example
+   * If the axis is grouped by day, month and year.
+   *
+   * ```tsx
+   * [
+   *   { getValue: getDate },
+   *   { getValue: getMonth },
+   *   { getValue: getFullYear }
+   * ]
+   * ```
+   *
+   * Then the axis will have three rows, one for each group.
+   *
+   * ```bash
+   * | 31   | 1    | 2    |
+   * | Jan  | Feb         |
+   * | 2021               |
+   * ```
+   */
+  groups?: AxisGroup[];
+};
 export interface AxisScaleConfig {
   band: {
     scaleType: 'band';
@@ -197,12 +241,12 @@ export interface AxisScaleConfig {
      */
     barGapRatio: number;
     colorMap?: OrdinalColorConfig | ContinuousColorConfig | PiecewiseColorConfig;
-  } & Pick<TickParams, 'tickPlacement' | 'tickLabelPlacement'>;
+  } & AxisGroups & Pick<TickParams, 'tickPlacement' | 'tickLabelPlacement'>;
   point: {
     scaleType: 'point';
     scale: ScalePoint<number | Date | string>;
     colorMap?: OrdinalColorConfig | ContinuousColorConfig | PiecewiseColorConfig;
-  };
+  } & AxisGroups;
   log: {
     scaleType: 'log';
     scale: ScaleLogarithmic<number, number>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mui/x-charts",
-  "version": "8.9.2",
+  "version": "8.10.1",
   "author": "MUI Team",
   "description": "The community edition of MUI X Charts components.",
   "main": "./index.js",
@@ -29,15 +29,15 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.28.2",
-    "@mui/utils": "^7.2.0",
+    "@mui/utils": "^7.3.1",
     "bezier-easing": "^2.1.0",
     "clsx": "^2.1.1",
     "prop-types": "^15.8.1",
     "reselect": "^5.1.1",
     "use-sync-external-store": "^1.5.0",
     "@mui/x-charts-vendor": "8.6.0",
-    "@mui/x-internal-gestures": "0.2.2",
-    "@mui/x-internals": "8.9.2"
+    "@mui/x-internals": "8.10.0",
+    "@mui/x-internal-gestures": "0.2.4"
   },
   "peerDependencies": {
     "@emotion/react": "^11.9.0",
@@ -58,32 +58,30 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "private": false,
-  "module": "./esm/index.js",
+  "type": "commonjs",
+  "types": "./index.d.ts",
   "exports": {
     "./package.json": "./package.json",
     ".": {
-      "require": {
-        "types": "./index.d.ts",
-        "default": "./index.js"
-      },
       "import": {
         "types": "./esm/index.d.ts",
         "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./index.d.ts",
+        "default": "./index.js"
       }
     },
     "./*": {
-      "require": {
-        "types": "./*/index.d.ts",
-        "default": "./*/index.js"
-      },
       "import": {
         "types": "./esm/*/index.d.ts",
         "default": "./esm/*/index.js"
+      },
+      "require": {
+        "types": "./*/index.d.ts",
+        "default": "./*/index.js"
       }
     },
-    "./esm": null,
-    "./modern": null
-  },
-  "types": "./index.d.ts"
+    "./esm": null
+  }
 }

package/tests/web-components.js

@@ -16,12 +16,10 @@ function reactToWebComponent(ReactComponent, options, renderer) {
     static get observedAttributes() {
       return [];
     }
+    [connectedSymbol] = true;
+    [propsSymbol] = {};
     constructor() {
       super();
-      this[connectedSymbol] = true;
-      this[contextSymbol] = void 0;
-      this[propsSymbol] = {};
-      this.container = void 0;
       if (options.shadow) {
         this.container = this.attachShadow({
           mode: options.shadow