Merge branch 'master' into refactor-css-breaking-change

LukasTy · web-flow · commit f72a7979778c · 2025-04-10T18:21:42.000+03:00
diff --git a/packages/x-charts/src/context/context.types.ts b/packages/x-charts/src/context/context.types.ts
diff --git a/packages/x-charts/src/internals/index.ts b/packages/x-charts/src/internals/index.ts
@@ -51,8 +51,6 @@ export * from './consumeThemeProps';
 export * from './defaultizeMargin';
 
 // contexts
-
-export type * from '../context/context.types';
 export { getAxisExtremum } from './plugins/featurePlugins/useChartCartesianAxis/getAxisExtremum';
 export * from '../context/ChartProvider';
 
diff --git a/packages/x-charts/src/internals/isCartesian.ts b/packages/x-charts/src/internals/isCartesian.ts
@@ -1,21 +1,6 @@
-import {
-  ChartSeriesType,
-  CartesianChartSeriesType,
-  ChartSeriesDefaultized,
-} from '../models/seriesType/config';
+import { CartesianChartSeriesType } from '../models/seriesType/config';
 import { cartesianSeriesTypes } from './configInit';
 
 export function isCartesianSeriesType(seriesType: string): seriesType is CartesianChartSeriesType {
   return cartesianSeriesTypes.getTypes().has(seriesType as CartesianChartSeriesType);
 }
-
-export function isCartesianSeries(
-  series: ChartSeriesDefaultized<ChartSeriesType> & { getColor: (dataIndex: number) => string },
-): series is ChartSeriesDefaultized<CartesianChartSeriesType> & {
-  getColor: (dataIndex: number) => string;
-};
-export function isCartesianSeries(
-  series: ChartSeriesDefaultized<ChartSeriesType>,
-): series is ChartSeriesDefaultized<CartesianChartSeriesType> {
-  return isCartesianSeriesType(series.type);
-}
diff --git a/packages/x-charts/src/internals/isPolar.ts b/packages/x-charts/src/internals/isPolar.ts
@@ -1,21 +1,6 @@
-import {
-  ChartSeriesType,
-  PolarChartSeriesType,
-  ChartSeriesDefaultized,
-} from '../models/seriesType/config';
+import { PolarChartSeriesType } from '../models/seriesType/config';
 import { polarSeriesTypes } from './configInit';
 
 export function isPolarSeriesType(seriesType: string): seriesType is PolarChartSeriesType {
   return polarSeriesTypes.getTypes().has(seriesType as PolarChartSeriesType);
 }
-
-export function isPolarSeries(
-  series: ChartSeriesDefaultized<ChartSeriesType> & { getColor: (dataIndex: number) => string },
-): series is ChartSeriesDefaultized<PolarChartSeriesType> & {
-  getColor: (dataIndex: number) => string;
-};
-export function isPolarSeries(
-  series: ChartSeriesDefaultized<ChartSeriesType>,
-): series is ChartSeriesDefaultized<PolarChartSeriesType> {
-  return isPolarSeriesType(series.type);
-}
diff --git a/packages/x-charts/src/internals/plugins/allPlugins.ts b/packages/x-charts/src/internals/plugins/allPlugins.ts
@@ -9,10 +9,9 @@ import {
   useChartInteraction,
   UseChartInteractionSignature,
 } from './featurePlugins/useChartInteraction';
-import { useChartPolarAxis, UseChartPolarAxisSignature } from './featurePlugins/useChartPolarAxis';
+import { UseChartPolarAxisSignature } from './featurePlugins/useChartPolarAxis';
 import { useChartVoronoi, UseChartVoronoiSignature } from './featurePlugins/useChartVoronoi';
 import { useChartZAxis, UseChartZAxisSignature } from './featurePlugins/useChartZAxis';
-import { ConvertSignaturesIntoPlugins } from './models/helpers';
 
 export type AllPluginSignatures<TSeries extends ChartSeriesType = ChartSeriesType> = [
   UseChartZAxisSignature,
@@ -23,30 +22,6 @@ export type AllPluginSignatures<TSeries extends ChartSeriesType = ChartSeriesTyp
   UseChartVoronoiSignature,
 ];
 
-export type AllPluginsType<TSeries extends ChartSeriesType = ChartSeriesType> =
-  ConvertSignaturesIntoPlugins<AllPluginSignatures<TSeries>>;
-
-export const ALL_PLUGINS = [
-  useChartZAxis,
-  useChartCartesianAxis,
-  useChartPolarAxis,
-  useChartInteraction,
-  useChartHighlight,
-  useChartVoronoi,
-];
-
-export type DefaultPluginSignatures<TSeries extends ChartSeriesType = ChartSeriesType> = [
-  UseChartZAxisSignature,
-  UseChartCartesianAxisSignature<TSeries>,
-  UseChartPolarAxisSignature,
-  UseChartInteractionSignature,
-  UseChartHighlightSignature,
-  UseChartVoronoiSignature,
-];
-
-export type DefaultPluginsType<TSeries extends ChartSeriesType = ChartSeriesType> =
-  ConvertSignaturesIntoPlugins<DefaultPluginSignatures<TSeries>>;
-
 export const DEFAULT_PLUGINS = [
   useChartZAxis,
   useChartCartesianAxis,
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/useChartCartesianAxis.types.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/useChartCartesianAxis.types.ts
@@ -80,14 +80,11 @@ export type ExtremumFilter = (
   dataIndex: number,
 ) => boolean;
 
-export interface UseChartCartesianAxisInstance {}
-
 export type UseChartCartesianAxisSignature<SeriesType extends ChartSeriesType = ChartSeriesType> =
   ChartPluginSignature<{
     params: UseChartCartesianAxisParameters;
     defaultizedParams: UseChartCartesianAxisDefaultizedParameters;
     state: UseChartCartesianAxisState;
-    // instance: UseChartCartesianAxisInstance;
     dependencies: [UseChartSeriesSignature<SeriesType>];
     optionalDependencies: [UseChartInteractionSignature];
   }>;
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/useChartCartesianInteraction.selectors.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/useChartCartesianInteraction.selectors.ts
@@ -9,7 +9,6 @@ import { selectorChartXAxis, selectorChartYAxis } from './useChartCartesianAxisR
 import { ComputeResult } from './computeAxisValue';
 
 const optionalGetAxisId = (_: unknown, id?: AxisId) => id;
-const optionalGetAxisIds = (_: unknown, ids: AxisId[]) => ids;
 
 /**
  * Get interaction indexes
@@ -32,21 +31,11 @@ export const selectorChartsInteractionXAxisIndex = createSelector(
   (value, axes, id) => (value === null ? null : indexGetter(value, axes, id)),
 );
 
-export const selectorChartsInteractionXAxisIndexes = createSelector(
-  [selectorChartsInteractionPointerX, selectorChartXAxis, optionalGetAxisIds],
-  (value, axes, ids) => (value === null ? null : indexGetter(value, axes, ids)),
-);
-
 export const selectorChartsInteractionYAxisIndex = createSelector(
   [selectorChartsInteractionPointerY, selectorChartYAxis, optionalGetAxisId],
   (value, axes, id) => (value === null ? null : indexGetter(value, axes, id)),
 );
 
-export const selectorChartsInteractionYAxisIndexes = createSelector(
-  [selectorChartsInteractionPointerY, selectorChartYAxis, optionalGetAxisIds],
-  (value, axes, ids) => (value === null ? null : indexGetter(value, axes, ids)),
-);
-
 /**
  * Get interaction values
  */
@@ -77,15 +66,6 @@ function valueGetter(
       )
     : getAxisValue(axes.axis[ids], value, indexes as number);
 }
-export const selectorChartsInteractionXAxisValues = createSelector(
-  [
-    selectorChartsInteractionPointerX,
-    selectorChartXAxis,
-    selectorChartsInteractionXAxisIndexes,
-    optionalGetAxisIds,
-  ],
-  (value, axes, indexes, ids) => (value === null ? null : valueGetter(value, axes, indexes!, ids)),
-);
 
 export const selectorChartsInteractionXAxisValue = createSelector(
   [
@@ -102,16 +82,6 @@ export const selectorChartsInteractionXAxisValue = createSelector(
   },
 );
 
-export const selectorChartsInteractionYAxisValues = createSelector(
-  [
-    selectorChartsInteractionPointerY,
-    selectorChartYAxis,
-    selectorChartsInteractionYAxisIndexes,
-    optionalGetAxisIds,
-  ],
-  (value, axes, indexes, ids) => (value === null ? null : valueGetter(value, axes, indexes!, ids)),
-);
-
 export const selectorChartsInteractionYAxisValue = createSelector(
   [
     selectorChartsInteractionPointerY,
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/zoom.types.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartCartesianAxis/zoom.types.ts
@@ -70,7 +70,7 @@ export interface ZoomOptions {
    *
    * @default 'keep'
    */
-  filterMode?: 'discard' | 'keep';
+  filterMode?: ZoomFilterMode;
 }
 
 export type ZoomAxisFilters = Record<AxisId, ExtremumFilter>;
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartPolarAxis/getAxisIndex.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartPolarAxis/getAxisIndex.ts
@@ -29,20 +29,3 @@ export function getAxisIndex(axisConfig: PolarAxisDefaultized, pointerValue: num
 
   return reverse ? axisData!.length - 1 - dataIndex : dataIndex;
 }
-
-/**
- * For a pointer coordinate, this function returns the value and dataIndex associated.
- * Returns `null` if the coordinate is outside of values.
- */
-export function getAxisValue(
-  axisConfig: PolarAxisDefaultized,
-  pointerValue: number,
-): number | null {
-  const dataIndex = getAxisIndex(axisConfig, pointerValue);
-
-  if (dataIndex < 0) {
-    return null;
-  }
-
-  return axisConfig.data?.[dataIndex];
-}
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartPolarAxis/useChartPolarAxis.types.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartPolarAxis/useChartPolarAxis.types.ts
@@ -2,13 +2,11 @@ import { ChartPluginSignature } from '../../models';
 import { ChartSeriesType, DatasetType } from '../../../../models/seriesType/config';
 import {
   ScaleName,
-  AxisId,
   AxisConfig,
   ChartsRotationAxisProps,
   ChartsRadiusAxisProps,
 } from '../../../../models/axis';
 import { UseChartSeriesSignature } from '../../corePlugins/useChartSeries';
-import { DefaultizedAxisConfig } from '../useChartCartesianAxis';
 import { UseChartInteractionSignature } from '../useChartInteraction';
 
 export interface UseChartPolarAxisInstance {
@@ -35,25 +33,6 @@ export interface UseChartPolarAxisInstance {
   svg2rotation: (x: number, y: number) => number;
 }
 
-export type PolarAxisState = {
-  /**
-   * Mapping from rotation-axis key to scaling configuration.
-   */
-  rotationAxis: DefaultizedAxisConfig<ChartsRotationAxisProps>;
-  /**
-   * Mapping from radius-axis key to scaling configuration.
-   */
-  radiusAxis: DefaultizedAxisConfig<ChartsRadiusAxisProps>;
-  /**
-   * The rotation-axes IDs sorted by order they were provided.
-   */
-  rotationAxisIds: AxisId[];
-  /**
-   * The radius-axes IDs sorted by order they were provided.
-   */
-  radiusAxisIds: AxisId[];
-};
-
 export interface UseChartPolarAxisParameters {
   /**
    * The configuration of the rotation-axes.
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartPolarAxis/useChartPolarInteraction.selectors.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartPolarAxis/useChartPolarInteraction.selectors.ts
@@ -4,7 +4,7 @@ import {
   selectorChartsInteractionPointerY,
 } from '../useChartInteraction/useChartInteraction.selectors';
 import { generateSvg2rotation } from './coordinateTransformation';
-import { getAxisIndex } from './getAxisValue';
+import { getAxisIndex } from './getAxisIndex';
 import { selectorChartPolarCenter, selectorChartRotationAxis } from './useChartPolarAxis.selectors';
 
 export const selectorChartsInteractionRotationAxisIndex = createSelector(
diff --git a/packages/x-charts/src/internals/plugins/featurePlugins/useChartZAxis/useChartZAxis.types.ts b/packages/x-charts/src/internals/plugins/featurePlugins/useChartZAxis/useChartZAxis.types.ts
@@ -34,8 +34,6 @@ export interface UseChartZAxisState {
   };
 }
 
-export interface UseChartZAxisInstance {}
-
 export type UseChartZAxisSignature = ChartPluginSignature<{
   params: UseChartZAxisParameters;
   defaultizedParams: UseChartZAxisDefaultizedParameters;
diff --git a/packages/x-charts/src/internals/plugins/models/seriesConfig/polarExtremumGetter.types.ts b/packages/x-charts/src/internals/plugins/models/seriesConfig/polarExtremumGetter.types.ts
@@ -17,8 +17,3 @@ export type PolarExtremumGetterResult = [number, number];
 export type PolarExtremumGetter<TSeriesType extends PolarChartSeriesType> = (
   params: PolarExtremumGetterParams<TSeriesType>,
 ) => PolarExtremumGetterResult;
-
-export type PolarExtremumFilter = (
-  value: { x: number | Date | string | null; y: number | Date | string | null },
-  dataIndex: number,
-) => boolean;
diff --git a/packages/x-charts/src/models/seriesType/common.ts b/packages/x-charts/src/models/seriesType/common.ts
@@ -67,5 +67,3 @@ export type StackableSeriesType = {
    */
   stackOrder?: StackOrderType;
 };
-
-export type DefaultizedCartesianSeriesType = Required<CartesianSeriesType>;
diff --git a/packages/x-charts/src/models/seriesType/index.ts b/packages/x-charts/src/models/seriesType/index.ts
@@ -11,13 +11,25 @@ import {
 type AllSeriesType<T extends ChartSeriesType = ChartSeriesType> =
   ChartsSeriesConfig[T]['seriesProp'];
 
+/**
+ * @deprecated We do not use this type in v8. If it's useful for you use case, please open an issue explaining why.
+ * Otherwise, it will be removed in next major.
+ */
 type CartesianSeriesType = AllSeriesType<CartesianChartSeriesType>;
 
 type DefaultizedSeriesType<T extends ChartSeriesType = ChartSeriesType> =
   ChartsSeriesConfig[T]['series'];
 
+/**
+ * @deprecated We do not use this type in v8. If it's useful for you use case, please open an issue explaining why.
+ * Otherwise, it will be removed in next major.
+ */
 type DefaultizedCartesianSeriesType = DefaultizedSeriesType<CartesianChartSeriesType>;
 
+/**
+ * @deprecated We do not use this type in v8. If it's useful for you use case, please open an issue explaining why.
+ * Otherwise, it will be removed in next major.
+ */
 type StackableSeriesType = DefaultizedSeriesType<StackableChartSeriesType>;
 
 // item identifier
@@ -32,20 +44,28 @@ export * from './pie';
 export * from './radar';
 export type {
   AllSeriesType,
-  CartesianSeriesType,
   DefaultizedSeriesType,
+  CartesianSeriesType,
   DefaultizedCartesianSeriesType,
   StackableSeriesType,
 };
 
 // Helpers
 
+/**
+ * @deprecated We do not use this function in v8. If it's useful for you use case, please open an issue explaining why.
+ * Otherwise, it will be removed in next major.
+ */
 export function isDefaultizedBarSeries(
   series: DefaultizedSeriesType,
 ): series is DefaultizedBarSeriesType {
   return series.type === 'bar';
 }
 
+/**
+ * @deprecated We do not use this function in v8. If it's useful for you use case, please open an issue explaining why.
+ * Otherwise, it will be removed in next major.
+ */
 export function isBarSeries(series: AllSeriesType): series is BarSeriesType {
   return series.type === 'bar';
 }
diff --git a/packages/x-data-grid-premium/src/tests/dataSourceAggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/dataSourceAggregation.DataGridPremium.test.tsx
@@ -104,9 +104,7 @@ describeSkipIf(isJSDOM)('<DataGridPremium /> - Data source aggregation', () => {
       expect(fetchRowsSpy.callCount).to.be.greaterThan(0);
     });
     await user.click(within(getColumnHeaderCell(0)).getByLabelText('id column menu'));
-    await waitFor(async () => {
-      expect(await screen.findByLabelText('Aggregation')).not.to.equal(null);
-    });
+    await screen.findByLabelText('Aggregation');
   });
 
   it('should not show aggregation option in the column menu when no aggregation function is defined', async () => {
diff --git a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/DesktopDateTimeRangePicker.tsx b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/DesktopDateTimeRangePicker.tsx
@@ -53,7 +53,6 @@ const rendererInterceptor = function RendererInterceptor(
 
   const finalProps = {
     ...otherProps,
-    focusedView: null,
     sx: [
       {
         [`&.${multiSectionDigitalClockClasses.root}`]: {
diff --git a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx
@@ -54,6 +54,29 @@ describe('<DesktopDateTimeRangePicker />', () => {
       const sectionsContainer = getFieldSectionsContainer();
       expectFieldValueV7(sectionsContainer, '04/11/2022 02:15 PM – MM/DD/YYYY hh:mm aa');
     });
+
+    it('should cycle focused views among the visible step after selection', () => {
+      render(<DesktopDateTimeRangePicker />);
+
+      openPicker({ type: 'date-time-range', initialFocus: 'start', fieldType: 'single-input' });
+
+      const day = screen.getByRole('gridcell', { name: '10' });
+      expect(day).toHaveFocus();
+      fireEvent.click(day);
+
+      const hours = screen.getByRole('option', { name: '12 hours' });
+      expect(hours).toHaveFocus();
+      fireEvent.click(hours);
+
+      const minutes = screen.getByRole('option', { name: '0 minutes' });
+      expect(minutes).toHaveFocus();
+      fireEvent.click(minutes);
+
+      const meridiem = screen.getByRole('option', { name: 'AM' });
+      expect(meridiem).toHaveFocus();
+      const sectionsContainer = getFieldSectionsContainer();
+      expectFieldValueV7(sectionsContainer, '01/10/2018 12:00 AM – MM/DD/YYYY hh:mm aa');
+    });
   });
 
   describe('disabled dates', () => {
diff --git a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/MobileDateTimeRangePicker.tsx b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/MobileDateTimeRangePicker.tsx
@@ -57,7 +57,6 @@ const rendererInterceptor = function RendererInterceptor(
 
   const finalProps = {
     ...otherRendererProps,
-    focusedView: null,
     sx: [
       {
         width: DIALOG_WIDTH,
diff --git a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/MobileDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/MobileDateTimeRangePicker.test.tsx
diff --git a/packages/x-date-pickers/src/internals/hooks/useField/useFieldV7TextField.ts b/packages/x-date-pickers/src/internals/hooks/useField/useFieldV7TextField.ts
diff --git a/test/utils/pickers/describePicker/describePicker.tsx b/test/utils/pickers/describePicker/describePicker.tsx

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ export interface ZoomOptions {`
`70`	`70`	`*`
`71`	`71`	`* @default 'keep'`
`72`	`72`	`*/`
`73`		`- filterMode?: 'discard' \| 'keep';`
	`73`	`+ filterMode?: ZoomFilterMode;`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`export type ZoomAxisFilters = Record<AxisId, ExtremumFilter>;`