From b11d9878c90cf7b20cfc064dd2a7542a379f3acb Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 8 Aug 2024 22:31:05 +0200 Subject: [PATCH 01/96] add @mui/material@^6 to peer dependencies --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-generator/package.json | 4 ++-- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- pnpm-lock.yaml | 22 ++++++++++----------- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 28536720a38f..4e12b1de46ee 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -53,7 +53,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 53f5cfd7e522..0536ca309bc6 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -51,7 +51,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index 8c06b4881ce7..baa12985eb09 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -46,8 +46,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/icons-material": "^5.4.1", - "@mui/material": "^5.15.14", + "@mui/icons-material": "^5.4.1 || ^6", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 28bae5ce97c4..77429e7bd77d 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -59,7 +59,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 50eabac5b185..f7c2398014d0 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 0edac7b73dd4..4ee1c7f6a82e 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -58,7 +58,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index eb4b3ea06b02..1d0e895ce4db 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -54,7 +54,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 5ab3558e3928..cf81fe989d74 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -56,7 +56,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 08f04e13a2ab..d768ef990b4b 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -56,7 +56,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index ac6b7cb2367b..6776432a56c7 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -55,7 +55,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14", + "@mui/material": "^5.15.14 || ^6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2cc5fc96bbb6..55d3e46ba071 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -715,7 +715,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -777,7 +777,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -959,7 +959,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -1015,10 +1015,10 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/icons-material': - specifier: ^5.4.1 + specifier: ^5.4.1 || ^6 version: 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/x-data-grid-premium': specifier: workspace:* @@ -1056,7 +1056,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -1124,7 +1124,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -1183,7 +1183,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -1266,7 +1266,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -1383,7 +1383,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 @@ -1436,7 +1436,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.15.14 + specifier: ^5.15.14 || ^6 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 From e6456ffaab9ce78f1ff86922dd289bddaccdea84 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 8 Aug 2024 22:35:33 +0200 Subject: [PATCH 02/96] log @mui/material version in tests --- .../ResponsiveChartContainerPro.test.tsx | 5 +++++ packages/x-charts/src/BarChart/BarChart.test.tsx | 4 ++++ .../src/tests/aggregation.DataGridPremium.test.tsx | 4 ++++ .../src/tests/accessibility.DataGridPro.test.tsx | 4 ++++ packages/x-data-grid/src/tests/cells.DataGrid.test.tsx | 4 ++++ .../src/DateRangeCalendar/DateRangeCalendar.test.tsx | 5 +++++ .../src/tests/fieldKeyboardInteraction.test.tsx | 5 +++++ .../src/RichTreeViewPro/RichTreeViewPro.test.tsx | 5 +++++ packages/x-tree-view/src/TreeItem/TreeItem.test.tsx | 5 +++++ 9 files changed, 41 insertions(+) diff --git a/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx b/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx index 4d5e4565a271..8e3c0739b544 100644 --- a/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx +++ b/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx @@ -4,6 +4,11 @@ import { createRenderer, screen, waitFor } from '@mui/internal-test-utils'; import { LicenseInfo } from '@mui/x-license'; import { sharedLicenseStatuses } from '@mui/x-license/useLicenseVerifier/useLicenseVerifier'; import { ResponsiveChartContainerPro } from './ResponsiveChartContainerPro'; +// eslint-disable-next-line import/order +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-charts-pro: @mui/material version`, packageJson.version); describe(' - License', () => { const { render } = createRenderer(); diff --git a/packages/x-charts/src/BarChart/BarChart.test.tsx b/packages/x-charts/src/BarChart/BarChart.test.tsx index 7f9dffa98069..ebac34d18545 100644 --- a/packages/x-charts/src/BarChart/BarChart.test.tsx +++ b/packages/x-charts/src/BarChart/BarChart.test.tsx @@ -1,6 +1,10 @@ import * as React from 'react'; import { createRenderer, describeConformance } from '@mui/internal-test-utils'; import { BarChart } from '@mui/x-charts/BarChart'; +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-charts: @mui/material version`, packageJson.version); describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx index 43f054c2635c..b5d115a7d73f 100644 --- a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx +++ b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx @@ -21,6 +21,10 @@ import { useGridApiRef, GridColDef, } from '@mui/x-data-grid-premium'; +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-data-grid-premium: @mui/material version`, packageJson.version); const isJSDOM = /jsdom/.test(window.navigator.userAgent); diff --git a/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx b/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx index 474026c577d0..4effb50d60c8 100644 --- a/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx +++ b/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx @@ -4,6 +4,10 @@ import axe from 'axe-core'; import { DataGridPro } from '@mui/x-data-grid-pro'; import { useBasicDemoData } from '@mui/x-data-grid-generator'; import { createRenderer } from '@mui/internal-test-utils'; +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-data-grid-pro: @mui/material version`, packageJson.version); function logViolations(violations: any) { if (violations.length !== 0) { diff --git a/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx b/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx index 91eec8720b13..50de92691dd1 100644 --- a/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx @@ -5,6 +5,10 @@ import { expect } from 'chai'; import { DataGrid, GridValueFormatter } from '@mui/x-data-grid'; import { getCell } from 'test/utils/helperFn'; import { getBasicGridData } from '@mui/x-data-grid-generator'; +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-data-grid: @mui/material version`, packageJson.version); const isJSDOM = /jsdom/.test(window.navigator.userAgent); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 1836534d0282..4cc25b92a554 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -22,6 +22,11 @@ import { import { DateRangePickerDay } from '@mui/x-date-pickers-pro/DateRangePickerDay'; import { describeConformance } from 'test/utils/describeConformance'; import { RangePosition } from '../models'; +// eslint-disable-next-line import/order +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-date-pickers-pro: @mui/material version`, packageJson.version); const getPickerDay = (name: string, picker = 'January 2018') => getByRole(screen.getByRole('grid', { name: picker }), 'gridcell', { name }); diff --git a/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx b/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx index f9a7fc614478..da99cfaf941b 100644 --- a/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx +++ b/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx @@ -15,6 +15,11 @@ import { getDateSectionConfigFromFormatToken, cleanLeadingZeros, } from '../internals/hooks/useField/useField.utils'; +// eslint-disable-next-line import/order +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-date-pickers: @mui/material version`, packageJson.version); const testDate = '2018-05-15T09:35:10'; diff --git a/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx b/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx index b7cd60d885da..67cd554d7c94 100644 --- a/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx +++ b/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx @@ -5,6 +5,11 @@ import { richTreeViewProClasses as classes, } from '@mui/x-tree-view-pro/RichTreeViewPro'; import { describeConformance } from 'test/utils/describeConformance'; +// eslint-disable-next-line import/order +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-tree-view-pro: @mui/material version`, packageJson.version); describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx index d85f3e7aa395..8b4635b3323e 100644 --- a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx +++ b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx @@ -7,6 +7,11 @@ import { TreeViewContext } from '@mui/x-tree-view/internals/TreeViewProvider/Tre import { describeConformance } from 'test/utils/describeConformance'; import { describeTreeView } from 'test/utils/tree-view/describeTreeView'; import { getFakeContextValue } from 'test/utils/tree-view/fakeContextValue'; +// eslint-disable-next-line import/order +import packageJson from '@mui/material/package.json'; + +// eslint-disable-next-line no-console +console.log(`@mui/x-tree-view: @mui/material version`, packageJson.version); describeTreeView<[]>('TreeItem component', ({ render, treeItemComponentName }) => { describe('ContentComponent / ContentProps props (TreeItem only)', () => { From b521dceca9b2f22f19db10236b945d31ac39282c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 8 Aug 2024 22:43:38 +0200 Subject: [PATCH 03/96] temp: add @mui/material@next to dev deps --- packages/x-charts-pro/package.json | 1 + packages/x-charts/package.json | 1 + packages/x-data-grid-generator/package.json | 1 + packages/x-data-grid-premium/package.json | 1 + packages/x-data-grid-pro/package.json | 1 + packages/x-data-grid/package.json | 1 + packages/x-date-pickers-pro/package.json | 1 + packages/x-date-pickers/package.json | 1 + packages/x-tree-view-pro/package.json | 1 + packages/x-tree-view/package.json | 1 + pnpm-lock.yaml | 213 +++++++++++++++++--- 11 files changed, 192 insertions(+), 31 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 4e12b1de46ee..dbf7c1ab893a 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -66,6 +66,7 @@ } }, "devDependencies": { + "@mui/material": "next", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 0536ca309bc6..1da7acd642ca 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -65,6 +65,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index baa12985eb09..24382656efe7 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -40,6 +40,7 @@ "lru-cache": "^10.4.3" }, "devDependencies": { + "@mui/material": "next", "@types/chance": "^1.1.6", "rimraf": "^5.0.9" }, diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 77429e7bd77d..bc2b80e93c6f 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -73,6 +73,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", "rimraf": "^5.0.9" diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index f7c2398014d0..1e8bbef9b033 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -71,6 +71,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 4ee1c7f6a82e..50eeb4f501eb 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -73,6 +73,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.7", "@mui/joy": "^5.0.0-beta.48", + "@mui/material": "next", "@mui/types": "^7.2.15", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 1d0e895ce4db..82c390ea141f 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -96,6 +96,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@types/luxon": "^3.4.2", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index cf81fe989d74..e708282c4294 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -98,6 +98,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@types/luxon": "^3.4.2", "@types/moment-hijri": "^2.1.4", "@types/moment-jalaali": "^0.7.9", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index d768ef990b4b..e5cdbc15c207 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -70,6 +70,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 6776432a56c7..17547b9df3f7 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -69,6 +69,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.7", + "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 55d3e46ba071..c32a0e4216cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -714,9 +714,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -748,6 +745,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -776,9 +776,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -813,6 +810,9 @@ importers: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1(react@18.3.1) devDependencies: + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -958,9 +958,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -992,6 +989,9 @@ importers: '@mui/joy': specifier: ^5.0.0-beta.48 version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': specifier: ^7.2.15 version: 7.2.15(@types/react@18.3.3) @@ -1016,10 +1016,7 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/icons-material': specifier: ^5.4.1 || ^6 - version: 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.16.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/x-data-grid-premium': specifier: workspace:* version: link:../x-data-grid-premium/build @@ -1036,6 +1033,9 @@ importers: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1 devDependencies: + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/chance': specifier: ^1.1.6 version: 1.1.6 @@ -1055,9 +1055,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1101,6 +1098,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1123,9 +1123,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1163,6 +1160,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1182,9 +1182,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1213,6 +1210,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1265,9 +1265,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1305,6 +1302,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1382,9 +1382,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1416,6 +1413,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1435,9 +1435,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1475,6 +1472,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.7 version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -2953,6 +2953,9 @@ packages: '@mui/core-downloads-tracker@5.16.5': resolution: {integrity: sha512-ziFn1oPm6VjvHQcdGcAO+fXvOQEgieIj0BuSqcltFU+JXIxjPdVYNTdn2HU7/Ak5Gabk6k2u7+9PV7oZ6JT5sA==} + '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': + resolution: {integrity: sha512-doh3M3U7HUGSBIWGe1yvesSbfDguMRjP0N09ogWSBM2hovXAlgULhMgcRTepAZLLwfRxFII0bCohq6B9NqoKuw==} + '@mui/docs@6.0.0-beta.4': resolution: {integrity: sha512-zQ/0CPWRmNBDYwLE10FrBm4wnLUCm5200ZsyqFowcHr2Utajmlsby4BIkhjlZ7/XurQr2SW67bA+VIWT+GKvDQ==} engines: {node: '>=14.0.0'} @@ -3066,6 +3069,26 @@ packages: '@types/react': optional: true + '@mui/material@6.0.0-beta.5': + resolution: {integrity: sha512-oLcMVOpn8nPQJcOjFo106Wlw2lsAjlNkTzrONZMFFZyAQ1cUY7kUE36Fy9bu/QQuUGmUqQdeEWsPuGLnLjTbKA==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@emotion/react': ^11.5.0 + '@emotion/styled': ^11.3.0 + '@mui/material-pigment-css': ^6.0.0-beta.5 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@emotion/react': + optional: true + '@emotion/styled': + optional: true + '@mui/material-pigment-css': + optional: true + '@types/react': + optional: true + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579': resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579} version: 6.0.0-beta.4 @@ -3081,6 +3104,16 @@ packages: '@types/react': optional: true + '@mui/private-theming@6.0.0-beta.5': + resolution: {integrity: sha512-QW9x6JbSZIZeNHk7HGTOhKnSBB5QnxZU51g89H7EsbGqv60oSlARQ14tmQjVkR3D5bpspptgVzIR09eayY+JRA==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@mui/styled-engine@5.16.4': resolution: {integrity: sha512-0+mnkf+UiAmTVB8PZFqOhqf729Yh0Cxq29/5cA3VAyDVTRIUUQ8FXQhiAhUIbijFmM72rY80ahFPXIm4WDbzcA==} engines: {node: '>=12.0.0'} @@ -3094,6 +3127,19 @@ packages: '@emotion/styled': optional: true + '@mui/styled-engine@6.0.0-beta.5': + resolution: {integrity: sha512-VIIMVHaDXf/d9kRlO+o0ORJSgZpeRbq77lhkI2UHTbGnbO3QDGMpyb+yrrjLzIIho2ItsgHala08EM23VF/yrA==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@emotion/react': ^11.4.1 + '@emotion/styled': ^11.3.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@emotion/react': + optional: true + '@emotion/styled': + optional: true + '@mui/styles@5.16.5': resolution: {integrity: sha512-E6h6Qd1FNsKozeBQCVpfSngxgigkP5+N8IKiD97ItKaEvaCmYg4/akLVj57Y9tj9OloZxqL8IQS80hw5zF19PA==} engines: {node: '>=12.0.0'} @@ -3120,6 +3166,22 @@ packages: '@types/react': optional: true + '@mui/system@6.0.0-beta.5': + resolution: {integrity: sha512-Z33nU1rCfhqK568ieTdDpPfRXUM+cNBlloiJ0GPVz5YZs2N/wxLCwOFPUDVmudJbwxYvTI64D76cfBosz5ytkQ==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@emotion/react': ^11.5.0 + '@emotion/styled': ^11.3.0 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@emotion/react': + optional: true + '@emotion/styled': + optional: true + '@types/react': + optional: true + '@mui/types@7.2.15': resolution: {integrity: sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q==} peerDependencies: @@ -3138,6 +3200,16 @@ packages: '@types/react': optional: true + '@mui/utils@6.0.0-beta.5': + resolution: {integrity: sha512-QidRa70STALSsTTeeJ7ddyyVbEAK3cVOK350L8tAJLzag79XzNE+lSpU4+UnIna9ftuI9sIJHVxZK6wVw7ATug==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@netlify/functions@2.8.1': resolution: {integrity: sha512-+6wtYdoz0yE06dSa9XkP47tw5zm6g13QMeCwM3MmHx1vn8hzwFa51JtmfraprdkL7amvb7gaNM+OOhQU1h6T8A==} engines: {node: '>=14.0.0'} @@ -11762,6 +11834,8 @@ snapshots: '@mui/core-downloads-tracker@5.16.5': {} + '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': {} + '@mui/docs@6.0.0-beta.4(v73oylu5qs3cavoyvfoft6xvce)': dependencies: '@babel/runtime': 7.25.0 @@ -11789,6 +11863,14 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 + '@mui/icons-material@5.16.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.3 + '@mui/internal-docs-utils@1.0.9': dependencies: rimraf: 5.0.10 @@ -11915,6 +11997,27 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 + '@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/core-downloads-tracker': 6.0.0-dev.240424162023-9968b4889d + '@mui/system': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/types': 7.2.15(@types/react@18.3.3) + '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@popperjs/core': 2.11.8 + '@types/react-transition-group': 4.4.10 + clsx: 2.1.1 + csstype: 3.1.3 + prop-types: 15.8.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-is: 18.3.1 + react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + optionalDependencies: + '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@types/react': 18.3.3 + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579(encoding@0.1.13)': dependencies: '@googleapis/sheets': 8.0.0(encoding@0.1.13) @@ -11938,6 +12041,15 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 + '@mui/private-theming@6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + prop-types: 15.8.1 + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.3 + '@mui/styled-engine@5.16.4(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 @@ -11949,6 +12061,17 @@ snapshots: '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/styled-engine@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@emotion/cache': 11.13.1 + csstype: 3.1.3 + prop-types: 15.8.1 + react: 18.3.1 + optionalDependencies: + '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/styles@5.16.5(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 @@ -11988,6 +12111,22 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 + '@mui/system@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/private-theming': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@mui/styled-engine': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) + '@mui/types': 7.2.15(@types/react@18.3.3) + '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + clsx: 2.1.1 + csstype: 3.1.3 + prop-types: 15.8.1 + react: 18.3.1 + optionalDependencies: + '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@types/react': 18.3.3 + '@mui/types@7.2.15(@types/react@18.3.3)': optionalDependencies: '@types/react': 18.3.3 @@ -12004,6 +12143,18 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 + '@mui/utils@6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/types': 7.2.15(@types/react@18.3.3) + '@types/prop-types': 15.7.12 + clsx: 2.1.1 + prop-types: 15.8.1 + react: 18.3.1 + react-is: 18.3.1 + optionalDependencies: + '@types/react': 18.3.3 + '@netlify/functions@2.8.1': dependencies: '@netlify/serverless-functions-api': 1.19.1 From c30d0b5e8c19a3b936df1202eaedaa2a10b626fb Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 9 Aug 2024 00:18:54 +0200 Subject: [PATCH 04/96] fix matchMedia stub --- test/utils/pickers/misc.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/utils/pickers/misc.ts b/test/utils/pickers/misc.ts index 9e189dc2c8dc..ecbcab7ded50 100644 --- a/test/utils/pickers/misc.ts +++ b/test/utils/pickers/misc.ts @@ -6,8 +6,8 @@ import { OpenPickerParams } from './openPicker'; export const stubMatchMedia = (matches = true) => sinon.stub().returns({ matches, - addListener: () => {}, - removeListener: () => {}, + addEventListener: () => {}, + removeEventListener: () => {}, }); const getChangeCountForComponentFamily = (componentFamily: PickerComponentFamily) => { From fb128013cf489e1a00e83d9e78add4e57c75a0fb Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 9 Aug 2024 00:19:10 +0200 Subject: [PATCH 05/96] fix failing test --- packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 4cfe95e32b9c..28321565d292 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -545,7 +545,7 @@ describe(' - Row selection', () => { fireEvent.keyDown(cell, { key: 'ArrowLeft' }); fireEvent.keyDown(getCell(1, 0).querySelector('input')!, { key: 'ArrowUp' }); clock.runToLast(); // Wait for transition - expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1); + expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(0); }); }); }); From 29c5ec4390980a4664aeca6dedcbce5f3db44060 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 9 Aug 2024 13:34:32 +0200 Subject: [PATCH 06/96] temp: use monorepo version from the PR https://github.com/mui/material-ui/pull/43240 --- package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index a4c83f09445d..35130703e454 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@mui/internal-markdown": "^1.0.9", "@mui/internal-test-utils": "^1.0.7", "@mui/material": "^5.16.5", - "@mui/monorepo": "github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579", + "@mui/monorepo": "github:mui/material-ui#225876f7a56cacd0e91d7a4f07040d59ea69a10d", "@mui/utils": "^5.16.5", "@next/eslint-plugin-next": "14.2.5", "@octokit/plugin-retry": "^7.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c32a0e4216cf..ea56ad3dbd97 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,8 +96,8 @@ importers: specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/monorepo': - specifier: github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579 - version: https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579(encoding@0.1.13) + specifier: github:mui/material-ui#225876f7a56cacd0e91d7a4f07040d59ea69a10d + version: https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d(encoding@0.1.13) '@mui/utils': specifier: ^5.16.5 version: 5.16.5(@types/react@18.3.3)(react@18.3.1) @@ -3089,10 +3089,10 @@ packages: '@types/react': optional: true - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579': - resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579} - version: 6.0.0-beta.4 - engines: {pnpm: 9.5.0} + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d': + resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d} + version: 6.0.0-beta.5 + engines: {pnpm: 9.6.0} '@mui/private-theming@5.16.5': resolution: {integrity: sha512-CSLg0YkpDqg0aXOxtjo3oTMd3XWMxvNb5d0v4AYVqwOltU8q6GvnZjhWyCLjGSCrcgfwm6/VDjaKLPlR14wxIA==} @@ -6495,8 +6495,8 @@ packages: resolution: {integrity: sha512-4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw==} engines: {node: '>=14'} - google-auth-library@9.12.0: - resolution: {integrity: sha512-5pWjpxJMNJ5UTuhK7QPD5KFPsbosWkX4ajMDeZwXllTtwwqeiIzPWbHIddkLBkkn0mUPboTmukT5rd30Ec9igQ==} + google-auth-library@9.13.0: + resolution: {integrity: sha512-p9Y03Uzp/Igcs36zAaB0XTSwZ8Y0/tpYiz5KIde5By+H9DCVUSYtDWZu6aFXsWTqENMb8BD/pDT3hR8NVrPkfA==} engines: {node: '>=14'} googleapis-common@7.0.1: @@ -12018,13 +12018,13 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579(encoding@0.1.13)': + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d(encoding@0.1.13)': dependencies: '@googleapis/sheets': 8.0.0(encoding@0.1.13) '@netlify/functions': 2.8.1 '@slack/bolt': 3.19.0 execa: 9.3.0 - google-auth-library: 9.12.0(encoding@0.1.13) + google-auth-library: 9.13.0(encoding@0.1.13) transitivePeerDependencies: - bufferutil - debug @@ -16122,7 +16122,7 @@ snapshots: transitivePeerDependencies: - supports-color - google-auth-library@9.12.0(encoding@0.1.13): + google-auth-library@9.13.0(encoding@0.1.13): dependencies: base64-js: 1.5.1 ecdsa-sig-formatter: 1.0.11 @@ -16138,7 +16138,7 @@ snapshots: dependencies: extend: 3.0.2 gaxios: 6.1.1(encoding@0.1.13) - google-auth-library: 9.12.0(encoding@0.1.13) + google-auth-library: 9.13.0(encoding@0.1.13) qs: 6.11.2 url-template: 2.0.8 uuid: 9.0.1 From 1e4d2c13476e8993d152da5d4311c06716af1564 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 9 Aug 2024 15:00:28 +0200 Subject: [PATCH 07/96] Revert "temp: use monorepo version from the PR" This reverts commit 29c5ec4390980a4664aeca6dedcbce5f3db44060. --- package.json | 2 +- pnpm-lock.yaml | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 35130703e454..a4c83f09445d 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "@mui/internal-markdown": "^1.0.9", "@mui/internal-test-utils": "^1.0.7", "@mui/material": "^5.16.5", - "@mui/monorepo": "github:mui/material-ui#225876f7a56cacd0e91d7a4f07040d59ea69a10d", + "@mui/monorepo": "github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579", "@mui/utils": "^5.16.5", "@next/eslint-plugin-next": "14.2.5", "@octokit/plugin-retry": "^7.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ea56ad3dbd97..c32a0e4216cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -96,8 +96,8 @@ importers: specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/monorepo': - specifier: github:mui/material-ui#225876f7a56cacd0e91d7a4f07040d59ea69a10d - version: https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d(encoding@0.1.13) + specifier: github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579 + version: https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579(encoding@0.1.13) '@mui/utils': specifier: ^5.16.5 version: 5.16.5(@types/react@18.3.3)(react@18.3.1) @@ -3089,10 +3089,10 @@ packages: '@types/react': optional: true - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d': - resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d} - version: 6.0.0-beta.5 - engines: {pnpm: 9.6.0} + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579': + resolution: {tarball: https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579} + version: 6.0.0-beta.4 + engines: {pnpm: 9.5.0} '@mui/private-theming@5.16.5': resolution: {integrity: sha512-CSLg0YkpDqg0aXOxtjo3oTMd3XWMxvNb5d0v4AYVqwOltU8q6GvnZjhWyCLjGSCrcgfwm6/VDjaKLPlR14wxIA==} @@ -6495,8 +6495,8 @@ packages: resolution: {integrity: sha512-4kKdWXTtgQ4biIo7hZA396HT062nDVVHPjQcurNZ3o/voYN+o5FUC5kOwuORbpExp3XbTJ3SU7iRipiIhQtovw==} engines: {node: '>=14'} - google-auth-library@9.13.0: - resolution: {integrity: sha512-p9Y03Uzp/Igcs36zAaB0XTSwZ8Y0/tpYiz5KIde5By+H9DCVUSYtDWZu6aFXsWTqENMb8BD/pDT3hR8NVrPkfA==} + google-auth-library@9.12.0: + resolution: {integrity: sha512-5pWjpxJMNJ5UTuhK7QPD5KFPsbosWkX4ajMDeZwXllTtwwqeiIzPWbHIddkLBkkn0mUPboTmukT5rd30Ec9igQ==} engines: {node: '>=14'} googleapis-common@7.0.1: @@ -12018,13 +12018,13 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/225876f7a56cacd0e91d7a4f07040d59ea69a10d(encoding@0.1.13)': + '@mui/monorepo@https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579(encoding@0.1.13)': dependencies: '@googleapis/sheets': 8.0.0(encoding@0.1.13) '@netlify/functions': 2.8.1 '@slack/bolt': 3.19.0 execa: 9.3.0 - google-auth-library: 9.13.0(encoding@0.1.13) + google-auth-library: 9.12.0(encoding@0.1.13) transitivePeerDependencies: - bufferutil - debug @@ -16122,7 +16122,7 @@ snapshots: transitivePeerDependencies: - supports-color - google-auth-library@9.13.0(encoding@0.1.13): + google-auth-library@9.12.0(encoding@0.1.13): dependencies: base64-js: 1.5.1 ecdsa-sig-formatter: 1.0.11 @@ -16138,7 +16138,7 @@ snapshots: dependencies: extend: 3.0.2 gaxios: 6.1.1(encoding@0.1.13) - google-auth-library: 9.13.0(encoding@0.1.13) + google-auth-library: 9.12.0(encoding@0.1.13) qs: 6.11.2 url-template: 2.0.8 uuid: 9.0.1 From b198bcb29f23cab12966840ef42d5bdcb72aa4f1 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 9 Aug 2024 15:02:48 +0200 Subject: [PATCH 08/96] temp: use test utils from a PR https://github.com/mui/material-ui/pull/43240 --- package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-internals/package.json | 2 +- packages/x-license/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- pnpm-lock.yaml | 202 ++++++++++++++++------ 12 files changed, 156 insertions(+), 68 deletions(-) diff --git a/package.json b/package.json index a4c83f09445d..c586c1b728e6 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "@emotion/styled": "^11.13.0", "@mui/icons-material": "^5.16.5", "@mui/internal-markdown": "^1.0.9", - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "^5.16.5", "@mui/monorepo": "github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579", "@mui/utils": "^5.16.5", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 1da7acd642ca..a5c0e45f5bc4 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -64,7 +64,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index bc2b80e93c6f..8b25a3cfc50d 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -72,7 +72,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 1e8bbef9b033..0c2ef01fc288 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -70,7 +70,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 50eeb4f501eb..57cd073de5d3 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -71,7 +71,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/joy": "^5.0.0-beta.48", "@mui/material": "next", "@mui/types": "^7.2.15", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 82c390ea141f..4a084c726527 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -95,7 +95,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@types/luxon": "^3.4.2", "@types/prop-types": "^15.7.12", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index e708282c4294..0896a724eb70 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -97,7 +97,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@types/luxon": "^3.4.2", "@types/moment-hijri": "^2.1.4", diff --git a/packages/x-internals/package.json b/packages/x-internals/package.json index 7386b4a7795d..9ce3d25e4f6e 100644 --- a/packages/x-internals/package.json +++ b/packages/x-internals/package.json @@ -48,7 +48,7 @@ "react": "^17.0.0 || ^18.0.0" }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "rimraf": "^5.0.9" }, "engines": { diff --git a/packages/x-license/package.json b/packages/x-license/package.json index 2684ce59039b..50fd4f06fada 100644 --- a/packages/x-license/package.json +++ b/packages/x-license/package.json @@ -41,7 +41,7 @@ "react": "^17.0.0 || ^18.0.0" }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "rimraf": "^5.0.9" }, "engines": { diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index e5cdbc15c207..b42f49f09e6b 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -69,7 +69,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 17547b9df3f7..c3a0d52276f0 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -68,7 +68,7 @@ } }, "devDependencies": { - "@mui/internal-test-utils": "^1.0.7", + "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.9" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c32a0e4216cf..6b29fedcfbdd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -90,8 +90,8 @@ importers: specifier: ^1.0.9 version: 1.0.9 '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: ^5.16.5 version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -743,8 +743,8 @@ importers: version: 18.3.1(react@18.3.1) devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -984,8 +984,8 @@ importers: version: 4.1.8 devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/joy': specifier: ^5.0.0-beta.48 version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1096,8 +1096,8 @@ importers: version: 4.1.8 devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1158,8 +1158,8 @@ importers: version: 4.1.8 devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1208,8 +1208,8 @@ importers: version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1300,8 +1300,8 @@ importers: version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1344,8 +1344,8 @@ importers: version: 18.3.1 devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rimraf: specifier: ^5.0.9 version: 5.0.10 @@ -1364,8 +1364,8 @@ importers: version: 18.3.1 devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) rimraf: specifier: ^5.0.9 version: 5.0.10 @@ -1411,8 +1411,8 @@ importers: version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1470,8 +1470,8 @@ importers: version: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) devDependencies: '@mui/internal-test-utils': - specifier: ^1.0.7 - version: 1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils + version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -2429,6 +2429,9 @@ packages: '@bundled-es-modules/statuses@1.0.1': resolution: {integrity: sha512-yn7BklA5acgcBr+7w064fGV+SGIFySjCKpqjcWgBAIfrAkY+4GQTJJHQMeT3V/sgz23VTEVV8TtOmkvJAhFVfg==} + '@bundled-es-modules/tough-cookie@0.1.6': + resolution: {integrity: sha512-dvMHbL464C0zI+Yqxbz6kZ5TOEp7GLW+pry/RWndAR8MJQAXZ2rPmIs8tziTZjeIyhSNZgZbCePtfSbdWqStJw==} + '@codspeed/core@3.1.1': resolution: {integrity: sha512-ONhERVDAtkm0nc+FYPivDozoMOlNUP2BWRBFDJYATGA18Iap5Kd2mZ1/Lwz54RB5+g+3YDOpsvotHa4hd3Q+7Q==} @@ -2871,20 +2874,20 @@ packages: cpu: [x64] os: [win32] - '@inquirer/confirm@3.1.17': - resolution: {integrity: sha512-qCpt/AABzPynz8tr69VDvhcjwmzAryipWXtW8Vi6m651da4H/d0Bdn55LkxXD7Rp2gfgxvxzTdb66AhIA8gzBA==} + '@inquirer/confirm@3.1.22': + resolution: {integrity: sha512-gsAKIOWBm2Q87CDfs9fEo7wJT3fwWIJfnDGMn9Qy74gBnNFOACDNfhUzovubbJjWnKLGBln7/NcSmZwj5DuEXg==} engines: {node: '>=18'} - '@inquirer/core@9.0.5': - resolution: {integrity: sha512-QWG41I7vn62O9stYKg/juKXt1PEbr/4ZZCPb4KgXDQGwgA9M5NBTQ7FnOvT1ridbxkm/wTxLCNraUs7y47pIRQ==} + '@inquirer/core@9.0.10': + resolution: {integrity: sha512-TdESOKSVwf6+YWDz8GhS6nKscwzkIyakEzCLJ5Vh6O3Co2ClhCJ0A4MG909MUWfaWdpJm7DE45ii51/2Kat9tA==} engines: {node: '>=18'} '@inquirer/figures@1.0.5': resolution: {integrity: sha512-79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==} engines: {node: '>=18'} - '@inquirer/type@1.5.1': - resolution: {integrity: sha512-m3YgGQlKNS0BM+8AFiJkCsTqHEFCWn6s/Rqye3mYwvqY6LdfUv12eSwbsgNzrYyrLXiy7IrrjDLPysaSBwEfhw==} + '@inquirer/type@1.5.2': + resolution: {integrity: sha512-w9qFkumYDCNyDZmNQjf/n6qQuvQ4dMC3BJesY4oF+yr0CxR5vxujflAVeIcS6U336uzi9GM0kAfZlLrZ9UTkpA==} engines: {node: '>=18'} '@isaacs/cliui@8.0.2': @@ -2924,6 +2927,9 @@ packages: '@jridgewell/sourcemap-codec@1.4.15': resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} + '@jridgewell/sourcemap-codec@1.5.0': + resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} + '@jridgewell/trace-mapping@0.3.25': resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} @@ -2931,10 +2937,6 @@ packages: resolution: {integrity: sha512-ch81CgU5pBNOiUCQx44F/ZtN4DxxJjUQtuytYRBFWJSHAJ+XPJtiC/yQ9zjr1I1yaUlmNYYblkopoOyziOdJ1w==} engines: {node: '>=18.0.0'} - '@mswjs/cookies@1.1.1': - resolution: {integrity: sha512-W68qOHEjx1iD+4VjQudlx26CPIoxmIAtK4ZCexU0/UJBG6jYhcuyzKJx+Iw8uhBIGd9eba64XgWVgo20it1qwA==} - engines: {node: '>=18'} - '@mswjs/interceptors@0.29.1': resolution: {integrity: sha512-3rDakgJZ77+RiQUuSK69t1F0m8BQKA8Vh5DCS5V0DWvNY67zob2JhhQrhCO0AKLGINTRSFd1tBaHcJTkhefoSw==} engines: {node: '>=18'} @@ -2993,8 +2995,9 @@ packages: '@mui/internal-scripts@1.0.15': resolution: {integrity: sha512-sNEUPh5cEuJN20kC0N1kJdSfEw4ZZXuKP1Hsz8QWgKPQtlcmvRS30LGdNzHb9sS8dcFPqhITn+W2GAIxPCjuoA==} - '@mui/internal-test-utils@1.0.7': - resolution: {integrity: sha512-KrPhm8QLYui8LCsuzV6VUDrfs6qIsqr96HTohEMUMnIApGdVOW2lxK4DAa6nwdOx0VW813OSgpcllFUW2jiUDw==} + '@mui/internal-test-utils@https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils': + resolution: {tarball: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils} + version: 1.0.7 peerDependencies: react: ^18.2.0 react-dom: ^18.2.0 @@ -4227,6 +4230,9 @@ packages: '@types/stylis@4.2.6': resolution: {integrity: sha512-4nebF2ZJGzQk0ka0O6+FZUWceyFv4vWq/0dXBMmrSeAwzOuOd/GxE5Pa64d/ndeNLG73dXoBsRzvtsVsYUv6Uw==} + '@types/tough-cookie@4.0.5': + resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} + '@types/tsscmp@1.0.2': resolution: {integrity: sha512-cy7BRSU8GYYgxjcx0Py+8lo5MthuDhlyu076KUcYzVNXL23luYgRHkMG2fIFEc6neckeh/ntP82mw+U4QjZq+g==} @@ -5047,6 +5053,10 @@ packages: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} engines: {node: '>= 8.10.0'} + chokidar@3.6.0: + resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} + engines: {node: '>= 8.10.0'} + chownr@2.0.0: resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==} engines: {node: '>=10'} @@ -5544,6 +5554,15 @@ packages: supports-color: optional: true + debug@4.3.6: + resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + decamelize-keys@1.1.1: resolution: {integrity: sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==} engines: {node: '>=0.10.0'} @@ -7542,6 +7561,9 @@ packages: magic-string@0.30.10: resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} + magic-string@0.30.11: + resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} + make-array@1.0.5: resolution: {integrity: sha512-sgK2SAzxT19rWU+qxKUcn6PAh/swiIiz2F8C2cZjLc1z4iwYIfdoihqFIDQ8BDzAGtWPYJ6Sr13K1j/DXynDLA==} engines: {node: '>=0.10.0'} @@ -7779,6 +7801,11 @@ packages: engines: {node: '>= 14.0.0'} hasBin: true + mocha@10.7.3: + resolution: {integrity: sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==} + engines: {node: '>= 14.0.0'} + hasBin: true + modify-values@1.0.1: resolution: {integrity: sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==} engines: {node: '>=0.10.0'} @@ -7812,8 +7839,8 @@ packages: ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - msw@2.3.2: - resolution: {integrity: sha512-vDn6d6a50vxPE+HnaKQfpmZ4SVXlOjF97yD5FJcUT3v2/uZ65qvTYNL25yOmnrfCNWZ4wtAS7EbtXxygMug2Tw==} + msw@2.3.5: + resolution: {integrity: sha512-+GUI4gX5YC5Bv33epBrD+BGdmDvBg2XGruiWnI3GbIbRmMMBeZ5gs3mJ51OWSGHgJKztZ8AtZeYMMNMVrje2/Q==} engines: {node: '>=18'} hasBin: true peerDependencies: @@ -8352,6 +8379,9 @@ packages: path-to-regexp@6.2.1: resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} + path-to-regexp@6.2.2: + resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==} + path-type@3.0.0: resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==} engines: {node: '>=4'} @@ -9606,8 +9636,8 @@ packages: resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} engines: {node: '>=12.20'} - type-fest@4.23.0: - resolution: {integrity: sha512-ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==} + type-fest@4.24.0: + resolution: {integrity: sha512-spAaHzc6qre0TlZQQ2aA/nGMe+2Z/wyGk5Z+Ru2VUfdNwT6kWO6TjevOlpebsATEG1EIQ2sOiDszud3lO5mt/Q==} engines: {node: '>=16'} type-is@1.6.18: @@ -11256,6 +11286,12 @@ snapshots: statuses: 2.0.1 optional: true + '@bundled-es-modules/tough-cookie@0.1.6': + dependencies: + '@types/tough-cookie': 4.0.5 + tough-cookie: 4.1.4 + optional: true + '@codspeed/core@3.1.1': dependencies: axios: 1.7.2(debug@4.3.5) @@ -11644,16 +11680,16 @@ snapshots: '@img/sharp-win32-x64@0.33.4': optional: true - '@inquirer/confirm@3.1.17': + '@inquirer/confirm@3.1.22': dependencies: - '@inquirer/core': 9.0.5 - '@inquirer/type': 1.5.1 + '@inquirer/core': 9.0.10 + '@inquirer/type': 1.5.2 optional: true - '@inquirer/core@9.0.5': + '@inquirer/core@9.0.10': dependencies: '@inquirer/figures': 1.0.5 - '@inquirer/type': 1.5.1 + '@inquirer/type': 1.5.2 '@types/mute-stream': 0.0.4 '@types/node': 18.19.42 '@types/wrap-ansi': 3.0.0 @@ -11670,7 +11706,7 @@ snapshots: '@inquirer/figures@1.0.5': optional: true - '@inquirer/type@1.5.1': + '@inquirer/type@1.5.2': dependencies: mute-stream: 1.0.0 optional: true @@ -11717,6 +11753,9 @@ snapshots: '@jridgewell/sourcemap-codec@1.4.15': {} + '@jridgewell/sourcemap-codec@1.5.0': + optional: true + '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.1 @@ -11805,9 +11844,6 @@ snapshots: - supports-color - typescript - '@mswjs/cookies@1.1.1': - optional: true - '@mswjs/interceptors@0.29.1': dependencies: '@open-draft/deferred-promise': 2.2.0 @@ -11898,7 +11934,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@mui/internal-test-utils@1.0.7(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/internal-test-utils@https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) @@ -11916,7 +11952,7 @@ snapshots: fs-extra: 11.2.0 jsdom: 24.1.1 lodash: 4.17.21 - mocha: 10.7.0 + mocha: 10.7.3 playwright: 1.46.0 prop-types: 15.8.1 react: 18.3.1 @@ -13293,6 +13329,9 @@ snapshots: '@types/stylis@4.2.6': {} + '@types/tough-cookie@4.0.5': + optional: true + '@types/tsscmp@1.0.2': {} '@types/unist@2.0.10': {} @@ -13427,8 +13466,8 @@ snapshots: '@testing-library/dom': 10.4.0 '@testing-library/user-event': 14.5.2(@testing-library/dom@10.4.0) '@vitest/utils': 2.0.4 - magic-string: 0.30.10 - msw: 2.3.2(typescript@5.5.4) + magic-string: 0.30.11 + msw: 2.3.5(typescript@5.5.4) sirv: 2.0.4 vitest: 2.0.4(@types/node@18.19.42)(@vitest/browser@2.0.4)(@vitest/ui@2.0.5)(jsdom@24.1.1)(terser@5.27.0) ws: 8.18.0 @@ -14330,6 +14369,18 @@ snapshots: optionalDependencies: fsevents: 2.3.3 + chokidar@3.6.0: + dependencies: + anymatch: 3.1.3 + braces: 3.0.3 + glob-parent: 5.1.2 + is-binary-path: 2.1.0 + is-glob: 4.0.3 + normalize-path: 3.0.0 + readdirp: 3.6.0 + optionalDependencies: + fsevents: 2.3.3 + chownr@2.0.0: {} chrome-trace-event@1.0.3: {} @@ -14863,6 +14914,12 @@ snapshots: optionalDependencies: supports-color: 8.1.1 + debug@4.3.6(supports-color@8.1.1): + dependencies: + ms: 2.1.2 + optionalDependencies: + supports-color: 8.1.1 + decamelize-keys@1.1.1: dependencies: decamelize: 1.2.0 @@ -17348,6 +17405,11 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + magic-string@0.30.11: + dependencies: + '@jridgewell/sourcemap-codec': 1.5.0 + optional: true + make-array@1.0.5: {} make-dir@2.1.0: @@ -17614,6 +17676,29 @@ snapshots: yargs-parser: 20.2.9 yargs-unparser: 2.0.0 + mocha@10.7.3: + dependencies: + ansi-colors: 4.1.3 + browser-stdout: 1.3.1 + chokidar: 3.6.0 + debug: 4.3.6(supports-color@8.1.1) + diff: 5.2.0 + escape-string-regexp: 4.0.0 + find-up: 5.0.0 + glob: 8.1.0 + he: 1.2.0 + js-yaml: 4.1.0 + log-symbols: 4.1.0 + minimatch: 5.1.6 + ms: 2.1.3 + serialize-javascript: 6.0.2 + strip-json-comments: 3.1.1 + supports-color: 8.1.1 + workerpool: 6.5.1 + yargs: 16.2.0 + yargs-parser: 20.2.9 + yargs-unparser: 2.0.0 + modify-values@1.0.1: {} moment-hijri@2.30.0: @@ -17643,12 +17728,12 @@ snapshots: ms@2.1.3: {} - msw@2.3.2(typescript@5.5.4): + msw@2.3.5(typescript@5.5.4): dependencies: '@bundled-es-modules/cookie': 2.0.0 '@bundled-es-modules/statuses': 1.0.1 - '@inquirer/confirm': 3.1.17 - '@mswjs/cookies': 1.1.1 + '@bundled-es-modules/tough-cookie': 0.1.6 + '@inquirer/confirm': 3.1.22 '@mswjs/interceptors': 0.29.1 '@open-draft/until': 2.1.0 '@types/cookie': 0.6.0 @@ -17658,9 +17743,9 @@ snapshots: headers-polyfill: 4.0.3 is-node-process: 1.2.0 outvariant: 1.4.3 - path-to-regexp: 6.2.1 + path-to-regexp: 6.2.2 strict-event-emitter: 0.5.1 - type-fest: 4.23.0 + type-fest: 4.24.0 yargs: 17.7.2 optionalDependencies: typescript: 5.5.4 @@ -18324,6 +18409,9 @@ snapshots: path-to-regexp@6.2.1: {} + path-to-regexp@6.2.2: + optional: true + path-type@3.0.0: dependencies: pify: 3.0.0 @@ -19681,7 +19769,7 @@ snapshots: type-fest@2.19.0: {} - type-fest@4.23.0: + type-fest@4.24.0: optional: true type-is@1.6.18: From 7e4e8c72119a201a9f8869fd723497e8d3754214 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 9 Aug 2024 15:13:33 +0200 Subject: [PATCH 09/96] pnpm dedupe --- pnpm-lock.yaml | 179 ++++++++++++++----------------------------------- 1 file changed, 50 insertions(+), 129 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b29fedcfbdd..23865b513596 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -325,7 +325,7 @@ importers: version: 0.13.0 mocha: specifier: ^10.7.0 - version: 10.7.0 + version: 10.7.3 moment: specifier: ^2.30.1 version: 2.30.1 @@ -2924,9 +2924,6 @@ packages: '@jridgewell/source-map@0.3.5': resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} - '@jridgewell/sourcemap-codec@1.4.15': - resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - '@jridgewell/sourcemap-codec@1.5.0': resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==} @@ -5049,10 +5046,6 @@ packages: resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==} engines: {node: '>= 16'} - chokidar@3.5.3: - resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} - engines: {node: '>= 8.10.0'} - chokidar@3.6.0: resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} engines: {node: '>= 8.10.0'} @@ -5545,15 +5538,6 @@ packages: supports-color: optional: true - debug@4.3.5: - resolution: {integrity: sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - debug@4.3.6: resolution: {integrity: sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==} engines: {node: '>=6.0'} @@ -7558,9 +7542,6 @@ packages: resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==} hasBin: true - magic-string@0.30.10: - resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==} - magic-string@0.30.11: resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} @@ -7796,11 +7777,6 @@ packages: engines: {node: '>=10'} hasBin: true - mocha@10.7.0: - resolution: {integrity: sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==} - engines: {node: '>= 14.0.0'} - hasBin: true - mocha@10.7.3: resolution: {integrity: sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==} engines: {node: '>= 14.0.0'} @@ -8376,9 +8352,6 @@ packages: path-to-regexp@2.2.1: resolution: {integrity: sha512-gu9bD6Ta5bwGrrU8muHzVOBFFREpp2iRkVfhBJahwJ6p6Xw20SjT0MxLnwkjOibQmGSYhiUnf2FLe7k+jcFmGQ==} - path-to-regexp@6.2.1: - resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==} - path-to-regexp@6.2.2: resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==} @@ -10324,9 +10297,9 @@ snapshots: '@argos-ci/core@2.4.0': dependencies: '@argos-ci/util': 2.1.0 - axios: 1.7.2(debug@4.3.5) + axios: 1.7.2(debug@4.3.6) convict: 6.2.4 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) fast-glob: 3.3.2 sharp: 0.33.4 tmp: 0.2.3 @@ -10347,7 +10320,7 @@ snapshots: slash: 2.0.0 optionalDependencies: '@nicolo-ribaudo/chokidar-2': 2.1.8-no-fsevents.3 - chokidar: 3.5.3 + chokidar: 3.6.0 '@babel/code-frame@7.24.7': dependencies: @@ -10369,7 +10342,7 @@ snapshots: '@babel/traverse': 7.25.2 '@babel/types': 7.25.2 convert-source-map: 2.0.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.1 @@ -10429,7 +10402,7 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-compilation-targets': 7.25.2 '@babel/helper-plugin-utils': 7.24.8 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) lodash.debounce: 4.0.8 resolve: 1.22.8 transitivePeerDependencies: @@ -11263,7 +11236,7 @@ snapshots: '@babel/parser': 7.25.0 '@babel/template': 7.25.0 '@babel/types': 7.25.2 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -11294,7 +11267,7 @@ snapshots: '@codspeed/core@3.1.1': dependencies: - axios: 1.7.2(debug@4.3.5) + axios: 1.7.2(debug@4.3.6) find-up: 6.3.0 form-data: 4.0.0 node-gyp-build: 4.8.1 @@ -11517,7 +11490,7 @@ snapshots: '@eslint/eslintrc@2.1.4': dependencies: ajv: 6.12.6 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) espree: 9.6.1 globals: 13.24.0 ignore: 5.3.1 @@ -11594,7 +11567,7 @@ snapshots: '@humanwhocodes/config-array@0.11.14': dependencies: '@humanwhocodes/object-schema': 2.0.2 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -11739,7 +11712,7 @@ snapshots: '@jridgewell/gen-mapping@0.3.5': dependencies: '@jridgewell/set-array': 1.2.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 '@jridgewell/trace-mapping': 0.3.25 '@jridgewell/resolve-uri@3.1.1': {} @@ -11751,15 +11724,12 @@ snapshots: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 - '@jridgewell/sourcemap-codec@1.4.15': {} - - '@jridgewell/sourcemap-codec@1.5.0': - optional: true + '@jridgewell/sourcemap-codec@1.5.0': {} '@jridgewell/trace-mapping@0.3.25': dependencies: '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/sourcemap-codec': 1.5.0 '@lerna/create@8.1.7(@swc/core@1.6.13)(babel-plugin-macros@3.1.0)(encoding@0.1.13)(typescript@5.5.4)': dependencies: @@ -12898,9 +12868,9 @@ snapshots: '@types/express': 4.17.21 '@types/promise.allsettled': 1.0.6 '@types/tsscmp': 1.0.2 - axios: 1.7.2(debug@4.3.5) + axios: 1.7.2(debug@4.3.6) express: 4.18.2 - path-to-regexp: 6.2.1 + path-to-regexp: 6.2.2 please-upgrade-node: 3.2.0 promise.allsettled: 1.0.7 raw-body: 2.5.2 @@ -12955,7 +12925,7 @@ snapshots: '@slack/types': 2.11.0 '@types/is-stream': 1.1.0 '@types/node': 18.19.42 - axios: 1.7.2(debug@4.3.5) + axios: 1.7.2(debug@4.3.6) eventemitter3: 3.1.2 form-data: 2.5.1 is-electron: 2.2.2 @@ -13384,7 +13354,7 @@ snapshots: '@typescript-eslint/types': 7.16.1 '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.5.4) '@typescript-eslint/visitor-keys': 7.16.1 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) eslint: 8.57.0 optionalDependencies: typescript: 5.5.4 @@ -13400,7 +13370,7 @@ snapshots: dependencies: '@typescript-eslint/typescript-estree': 7.16.1(typescript@5.5.4) '@typescript-eslint/utils': 7.16.1(eslint@8.57.0)(typescript@5.5.4) - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.5.4) optionalDependencies: @@ -13414,7 +13384,7 @@ snapshots: dependencies: '@typescript-eslint/types': 7.16.1 '@typescript-eslint/visitor-keys': 7.16.1 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 minimatch: 9.0.4 @@ -13500,7 +13470,7 @@ snapshots: '@vitest/snapshot@2.0.4': dependencies: '@vitest/pretty-format': 2.0.4 - magic-string: 0.30.10 + magic-string: 0.30.11 pathe: 1.1.2 '@vitest/spy@2.0.4': @@ -13672,13 +13642,13 @@ snapshots: agent-base@6.0.2: dependencies: - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color agent-base@7.1.0: dependencies: - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -13981,9 +13951,9 @@ snapshots: axe-core@4.9.1: {} - axios@1.7.2(debug@4.3.5): + axios@1.7.2(debug@4.3.6): dependencies: - follow-redirects: 1.15.6(debug@4.3.5) + follow-redirects: 1.15.6(debug@4.3.6) form-data: 4.0.0 proxy-from-env: 1.1.0 transitivePeerDependencies: @@ -14357,18 +14327,6 @@ snapshots: check-error@2.1.1: {} - chokidar@3.5.3: - dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - chokidar@3.6.0: dependencies: anymatch: 3.1.3 @@ -14820,7 +14778,7 @@ snapshots: chalk: 2.4.2 commander: 2.20.3 core-js: 3.35.1 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) fast-json-patch: 3.1.1 get-stdin: 6.0.0 http-proxy-agent: 5.0.0 @@ -14908,12 +14866,6 @@ snapshots: dependencies: ms: 2.1.3 - debug@4.3.5(supports-color@8.1.1): - dependencies: - ms: 2.1.2 - optionalDependencies: - supports-color: 8.1.1 - debug@4.3.6(supports-color@8.1.1): dependencies: ms: 2.1.2 @@ -15125,7 +15077,7 @@ snapshots: base64id: 2.0.0 cookie: 0.4.2 cors: 2.8.5 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) engine.io-parser: 5.2.1 ws: 8.11.0 transitivePeerDependencies: @@ -15429,7 +15381,7 @@ snapshots: '@es-joy/jsdoccomment': 0.46.0 are-docs-informative: 0.0.2 comment-parser: 1.4.1 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) escape-string-regexp: 4.0.0 eslint: 8.57.0 esquery: 1.6.0 @@ -15547,7 +15499,7 @@ snapshots: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.2 @@ -15882,9 +15834,9 @@ snapshots: flow-parser@0.227.0: {} - follow-redirects@1.15.6(debug@4.3.5): + follow-redirects@1.15.6(debug@4.3.6): optionalDependencies: - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) for-each@0.3.3: dependencies: @@ -16354,21 +16306,21 @@ snapshots: dependencies: '@tootallnate/once': 2.0.0 agent-base: 6.0.2 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color http-proxy-agent@7.0.2: dependencies: agent-base: 7.1.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color http-proxy@1.18.1: dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.6(debug@4.3.5) + follow-redirects: 1.15.6(debug@4.3.6) requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -16376,14 +16328,14 @@ snapshots: https-proxy-agent@5.0.1: dependencies: agent-base: 6.0.2 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color https-proxy-agent@7.0.5: dependencies: agent-base: 7.1.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -16720,7 +16672,7 @@ snapshots: istanbul-lib-source-maps@4.0.1: dependencies: - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) istanbul-lib-coverage: 3.2.2 source-map: 0.6.1 transitivePeerDependencies: @@ -17054,7 +17006,7 @@ snapshots: '@colors/colors': 1.5.0 body-parser: 1.20.2 braces: 3.0.3 - chokidar: 3.5.3 + chokidar: 3.6.0 connect: 3.7.0 di: 0.0.1 dom-serialize: 2.2.1 @@ -17357,7 +17309,7 @@ snapshots: log4js@6.9.1: dependencies: date-format: 4.0.14 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) flatted: 3.3.1 rfdc: 1.3.1 streamroller: 3.1.5 @@ -17401,14 +17353,9 @@ snapshots: lz-string@1.5.0: {} - magic-string@0.30.10: - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 - magic-string@0.30.11: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 - optional: true make-array@1.0.5: {} @@ -17539,7 +17486,7 @@ snapshots: micromark@2.11.4: dependencies: - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) parse-entities: 2.0.0 transitivePeerDependencies: - supports-color @@ -17653,29 +17600,6 @@ snapshots: mkdirp@1.0.4: {} - mocha@10.7.0: - dependencies: - ansi-colors: 4.1.3 - browser-stdout: 1.3.1 - chokidar: 3.5.3 - debug: 4.3.5(supports-color@8.1.1) - diff: 5.2.0 - escape-string-regexp: 4.0.0 - find-up: 5.0.0 - glob: 8.1.0 - he: 1.2.0 - js-yaml: 4.1.0 - log-symbols: 4.1.0 - minimatch: 5.1.6 - ms: 2.1.3 - serialize-javascript: 6.0.2 - strip-json-comments: 3.1.1 - supports-color: 8.1.1 - workerpool: 6.5.1 - yargs: 16.2.0 - yargs-parser: 20.2.9 - yargs-unparser: 2.0.0 - mocha@10.7.3: dependencies: ansi-colors: 4.1.3 @@ -17817,7 +17741,7 @@ snapshots: '@sinonjs/fake-timers': 11.2.2 '@sinonjs/text-encoding': 0.7.2 just-extend: 6.2.0 - path-to-regexp: 6.2.1 + path-to-regexp: 6.2.2 no-case@3.0.4: dependencies: @@ -17967,7 +17891,7 @@ snapshots: '@yarnpkg/lockfile': 1.1.0 '@yarnpkg/parsers': 3.0.0-rc.46 '@zkochan/js-yaml': 0.0.6 - axios: 1.7.2(debug@4.3.5) + axios: 1.7.2(debug@4.3.6) chalk: 4.1.2 cli-cursor: 3.1.0 cli-spinners: 2.6.1 @@ -18407,10 +18331,7 @@ snapshots: path-to-regexp@2.2.1: {} - path-to-regexp@6.2.1: {} - - path-to-regexp@6.2.2: - optional: true + path-to-regexp@6.2.2: {} path-type@3.0.0: dependencies: @@ -19265,7 +19186,7 @@ snapshots: socket.io-parser@4.2.4: dependencies: '@socket.io/component-emitter': 3.1.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -19274,7 +19195,7 @@ snapshots: accepts: 1.3.8 base64id: 2.0.0 cors: 2.8.5 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) engine.io: 6.5.4 socket.io-adapter: 2.5.2 socket.io-parser: 4.2.4 @@ -19286,7 +19207,7 @@ snapshots: socks-proxy-agent@8.0.2: dependencies: agent-base: 7.1.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) socks: 2.7.1 transitivePeerDependencies: - supports-color @@ -19380,7 +19301,7 @@ snapshots: streamroller@3.1.5: dependencies: date-format: 4.0.14 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) fs-extra: 8.1.0 transitivePeerDependencies: - supports-color @@ -19736,7 +19657,7 @@ snapshots: tuf-js@2.2.0: dependencies: '@tufjs/models': 2.0.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) make-fetch-happen: 13.0.0 transitivePeerDependencies: - supports-color @@ -19992,7 +19913,7 @@ snapshots: vite-node@2.0.4(@types/node@18.19.42)(terser@5.27.0): dependencies: cac: 6.7.14 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) pathe: 1.1.2 tinyrainbow: 1.2.0 vite: 5.3.4(@types/node@18.19.42)(terser@5.27.0) @@ -20026,9 +19947,9 @@ snapshots: '@vitest/spy': 2.0.4 '@vitest/utils': 2.0.4 chai: 5.1.1 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) execa: 8.0.1 - magic-string: 0.30.10 + magic-string: 0.30.11 pathe: 1.1.2 std-env: 3.7.0 tinybench: 2.8.0 From 080e02cb6f1fa9d954a913824383f9fc43425b4f Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 12 Aug 2024 17:58:51 +0200 Subject: [PATCH 10/96] fix test --- packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 28321565d292..263368caf528 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -545,7 +545,9 @@ describe(' - Row selection', () => { fireEvent.keyDown(cell, { key: 'ArrowLeft' }); fireEvent.keyDown(getCell(1, 0).querySelector('input')!, { key: 'ArrowUp' }); clock.runToLast(); // Wait for transition - expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(0); + waitFor(() => + expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1), + ); }); }); }); From 38a27b4d6a479baa2afbb84ab3babd4a3d069276 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 12 Aug 2024 20:31:48 +0200 Subject: [PATCH 11/96] lint --- .../x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx | 1 - packages/x-tree-view/src/TreeItem/TreeItem.test.tsx | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx b/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx index 67cd554d7c94..14c38065e571 100644 --- a/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx +++ b/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx @@ -5,7 +5,6 @@ import { richTreeViewProClasses as classes, } from '@mui/x-tree-view-pro/RichTreeViewPro'; import { describeConformance } from 'test/utils/describeConformance'; -// eslint-disable-next-line import/order import packageJson from '@mui/material/package.json'; // eslint-disable-next-line no-console diff --git a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx index 8b4635b3323e..66637d608d71 100644 --- a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx +++ b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx @@ -7,7 +7,6 @@ import { TreeViewContext } from '@mui/x-tree-view/internals/TreeViewProvider/Tre import { describeConformance } from 'test/utils/describeConformance'; import { describeTreeView } from 'test/utils/tree-view/describeTreeView'; import { getFakeContextValue } from 'test/utils/tree-view/fakeContextValue'; -// eslint-disable-next-line import/order import packageJson from '@mui/material/package.json'; // eslint-disable-next-line no-console From f1ca4a52bd250c6489aa29abb0f1441e714ffd63 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 12 Aug 2024 21:05:09 +0200 Subject: [PATCH 12/96] use material ui v6 in the docs --- docs/package.json | 10 +++---- pnpm-lock.yaml | 73 +++++++++++++++++++++++++++++------------------ 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/docs/package.json b/docs/package.json index 92f5045e333c..c9d65367dc13 100644 --- a/docs/package.json +++ b/docs/package.json @@ -28,14 +28,14 @@ "@emotion/server": "^11.11.0", "@emotion/styled": "^11.13.0", "@mui/docs": "6.0.0-beta.4", - "@mui/icons-material": "^5.16.5", + "@mui/icons-material": "next", "@mui/joy": "^5.0.0-beta.48", "@mui/lab": "^5.0.0-alpha.173", - "@mui/material": "^5.16.5", + "@mui/material": "next", "@mui/material-nextjs": "^5.16.4", - "@mui/styles": "^5.16.5", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/styles": "next", + "@mui/system": "next", + "@mui/utils": "next", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", "@mui/x-data-grid": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2a82bfccdd22..519e98b60b63 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -424,31 +424,31 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/docs': specifier: 6.0.0-beta.4 - version: 6.0.0-beta.4(v73oylu5qs3cavoyvfoft6xvce) + version: 6.0.0-beta.4(p7ppuzx3pu2n4nbsou62h6oen4) '@mui/icons-material': - specifier: ^5.16.5 - version: 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/joy': specifier: ^5.0.0-beta.48 version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/lab': specifier: ^5.0.0-alpha.173 - version: 5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material-nextjs': specifier: ^5.16.4 - version: 5.16.4(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 5.16.4(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@mui/styles': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../packages/x-charts/build @@ -2984,6 +2984,17 @@ packages: '@types/react': optional: true + '@mui/icons-material@6.0.0-beta.5': + resolution: {integrity: sha512-LWE6+lH2wAxbV9dD9gvgQJyyuUVxkSJUiPRzkJVl9Dds2A+AlCKzgeSmaHPEmagglYkMI/RIMMG34gAJBzSsHw==} + engines: {node: '>=14.0.0'} + peerDependencies: + '@mui/material': 6.0.0-beta.5 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + '@mui/internal-docs-utils@1.0.9': resolution: {integrity: sha512-ml62NikMdZEimDhJGMtyGVilhLjK8AkiruojJ8OCArj8qsw0pUCr1L/2Xo7GLEg4K5EI3/vdITUU0RBKBwDl/g==} @@ -3141,9 +3152,9 @@ packages: '@emotion/styled': optional: true - '@mui/styles@5.16.5': - resolution: {integrity: sha512-E6h6Qd1FNsKozeBQCVpfSngxgigkP5+N8IKiD97ItKaEvaCmYg4/akLVj57Y9tj9OloZxqL8IQS80hw5zF19PA==} - engines: {node: '>=12.0.0'} + '@mui/styles@6.0.0-beta.5': + resolution: {integrity: sha512-1K+Rb5V6OPl1Yb+hj8iltKliYnx1W2Zasfw6u84OED7XHGHLkOPE400HDrLqqb+65etrPZFsBMwk3uqTR+GCyg==} + engines: {node: '>=14.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 react: ^17.0.0 @@ -11843,14 +11854,14 @@ snapshots: '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': {} - '@mui/docs@6.0.0-beta.4(v73oylu5qs3cavoyvfoft6xvce)': + '@mui/docs@6.0.0-beta.4(p7ppuzx3pu2n4nbsou62h6oen4)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/icons-material': 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/icons-material': 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': 1.0.9 - '@mui/material': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) chai: 5.1.1 clipboard-copy: 4.0.1 clsx: 2.1.1 @@ -11878,6 +11889,14 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 + '@mui/icons-material@6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.3 + '@mui/internal-docs-utils@1.0.9': dependencies: rimraf: 5.0.10 @@ -11955,11 +11974,11 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/material': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) @@ -11972,10 +11991,10 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/material-nextjs@5.16.4(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@mui/material-nextjs@5.16.4(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/material': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -12079,13 +12098,13 @@ snapshots: '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/styles@5.16.5(@types/react@18.3.3)(react@18.3.1)': + '@mui/styles@6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@emotion/hash': 0.9.2 - '@mui/private-theming': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/private-theming': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 hoist-non-react-statics: 3.3.2 From 4a907234c7016109b8108029454f77326fcd1bb6 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 13 Aug 2024 14:00:24 +0200 Subject: [PATCH 13/96] bump material in the root package.json --- package.json | 6 +++--- pnpm-lock.yaml | 20 ++++++-------------- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index c7305d54bf0f..0b5918fd1778 100644 --- a/package.json +++ b/package.json @@ -88,12 +88,12 @@ "@emotion/cache": "^11.13.1", "@emotion/react": "^11.13.0", "@emotion/styled": "^11.13.0", - "@mui/icons-material": "^5.16.5", + "@mui/icons-material": "next", "@mui/internal-markdown": "^1.0.9", "@mui/internal-test-utils": "https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils", - "@mui/material": "^5.16.5", + "@mui/material": "next", "@mui/monorepo": "github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579", - "@mui/utils": "^5.16.5", + "@mui/utils": "next", "@next/eslint-plugin-next": "14.2.5", "@octokit/plugin-retry": "^7.1.1", "@octokit/rest": "^21.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 519e98b60b63..b5c86eba3926 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,8 +84,8 @@ importers: specifier: ^11.13.0 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/icons-material': - specifier: ^5.16.5 - version: 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': specifier: ^1.0.9 version: 1.0.9 @@ -93,14 +93,14 @@ importers: specifier: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/monorepo': specifier: github:mui/material-ui#4a82b6b0e0395db8fa0a0d49b6b76de4516b1579 version: https://codeload.github.com/mui/material-ui/tar.gz/4a82b6b0e0395db8fa0a0d49b6b76de4516b1579(encoding@0.1.13) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@next/eslint-plugin-next': specifier: 14.2.5 version: 14.2.5 @@ -11873,14 +11873,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/icons-material@5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/material': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.3 - '@mui/icons-material@5.16.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 From 5fb0be8be83c0214c7439745e4394377a0404f3c Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 13 Aug 2024 17:23:27 +0300 Subject: [PATCH 14/96] proptypes --- .../SingleInputDateRangeField/SingleInputDateRangeField.tsx | 4 ++++ .../SingleInputDateTimeRangeField.tsx | 4 ++++ .../SingleInputTimeRangeField/SingleInputTimeRangeField.tsx | 4 ++++ packages/x-date-pickers/src/DateField/DateField.tsx | 4 ++++ packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx | 4 ++++ packages/x-date-pickers/src/TimeField/TimeField.tsx | 4 ++++ 6 files changed, 24 insertions(+) diff --git a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx index edc1e5b91b69..47aaa7d7b767 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx @@ -149,6 +149,7 @@ SingleInputDateRangeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. + * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -175,10 +176,12 @@ SingleInputDateRangeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. + * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. + * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -186,6 +189,7 @@ SingleInputDateRangeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. + * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx index 57d0a57f3a91..d126a4410187 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx @@ -159,6 +159,7 @@ SingleInputDateTimeRangeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. + * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -185,10 +186,12 @@ SingleInputDateTimeRangeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. + * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. + * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -196,6 +199,7 @@ SingleInputDateTimeRangeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. + * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx index cd37622a001e..7edf4640c435 100644 --- a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx @@ -159,6 +159,7 @@ SingleInputTimeRangeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. + * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -185,10 +186,12 @@ SingleInputTimeRangeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. + * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. + * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -196,6 +199,7 @@ SingleInputTimeRangeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. + * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers/src/DateField/DateField.tsx b/packages/x-date-pickers/src/DateField/DateField.tsx index 5f707a99d31a..17719505b213 100644 --- a/packages/x-date-pickers/src/DateField/DateField.tsx +++ b/packages/x-date-pickers/src/DateField/DateField.tsx @@ -141,6 +141,7 @@ DateField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. + * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -167,10 +168,12 @@ DateField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. + * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. + * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -178,6 +181,7 @@ DateField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. + * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx b/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx index 44db7bb3fb50..38fcae53aa68 100644 --- a/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx +++ b/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx @@ -151,6 +151,7 @@ DateTimeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. + * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -177,10 +178,12 @@ DateTimeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. + * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. + * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -188,6 +191,7 @@ DateTimeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. + * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers/src/TimeField/TimeField.tsx b/packages/x-date-pickers/src/TimeField/TimeField.tsx index 10d4918133ed..f48fa2a3bd95 100644 --- a/packages/x-date-pickers/src/TimeField/TimeField.tsx +++ b/packages/x-date-pickers/src/TimeField/TimeField.tsx @@ -151,6 +151,7 @@ TimeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. + * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -177,10 +178,12 @@ TimeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. + * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. + * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -188,6 +191,7 @@ TimeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. + * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** From 9c9bece12f6866cf5fd7731d8bf2fc3e01cb38f6 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 13 Aug 2024 17:23:49 +0300 Subject: [PATCH 15/96] Propagate `slots` and `slotProps` to fields --- packages/x-date-pickers/src/hooks/useClearableField.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/x-date-pickers/src/hooks/useClearableField.tsx b/packages/x-date-pickers/src/hooks/useClearableField.tsx index 52e3838e15b3..5c2832fcf506 100644 --- a/packages/x-date-pickers/src/hooks/useClearableField.tsx +++ b/packages/x-date-pickers/src/hooks/useClearableField.tsx @@ -76,6 +76,8 @@ export const useClearableField = ( return { ...other, + slots, + slotProps, InputProps: { ...InputProps, endAdornment: ( From ff76fa7de233e53c8cbd65d9659b19969ad88c96 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 14 Aug 2024 11:48:34 +0300 Subject: [PATCH 16/96] Bumo remaining dev material deps to v6 --- docs/package.json | 2 +- pnpm-lock.yaml | 58 ++++++++--------------------------------------- test/package.json | 2 +- 3 files changed, 12 insertions(+), 50 deletions(-) diff --git a/docs/package.json b/docs/package.json index c9d65367dc13..c014df766563 100644 --- a/docs/package.json +++ b/docs/package.json @@ -32,7 +32,7 @@ "@mui/joy": "^5.0.0-beta.48", "@mui/lab": "^5.0.0-alpha.173", "@mui/material": "next", - "@mui/material-nextjs": "^5.16.4", + "@mui/material-nextjs": "next", "@mui/styles": "next", "@mui/system": "next", "@mui/utils": "next", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b5c86eba3926..427cb492bcbf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -438,8 +438,8 @@ importers: specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material-nextjs': - specifier: ^5.16.4 - version: 5.16.4(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + specifier: next + version: 6.0.0-beta.4(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@mui/styles': specifier: next version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) @@ -1495,8 +1495,8 @@ importers: specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: next + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../packages/x-charts/build @@ -3046,13 +3046,13 @@ packages: '@types/react': optional: true - '@mui/material-nextjs@5.16.4': - resolution: {integrity: sha512-m2fY/bdfvpUXkjv2k5cwqd42FJZ8QRuZ1MoWt6RW480yIVi4ZRFpccBnJjiC4rXIeslmd/jizHi65Hbz/L/AKQ==} - engines: {node: '>=12.0.0'} + '@mui/material-nextjs@6.0.0-beta.4': + resolution: {integrity: sha512-GSI/tX32T5iYtqjpbt0AbSMWvRX0yLdyCIYt8AB5HOHNYXlP7kDd+9INhReTbjdg8ZJqWeH87mxzKQ3/gbStGg==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/cache': ^11.11.0 + '@emotion/react': ^11.11.4 '@emotion/server': ^11.11.0 - '@mui/material': ^5.0.0 '@types/react': ^17.0.0 || ^18.0.0 next: ^13.0.0 || ^14.0.0 react: ^17.0.0 || ^18.0.0 @@ -3064,23 +3064,6 @@ packages: '@types/react': optional: true - '@mui/material@5.16.5': - resolution: {integrity: sha512-eQrjjg4JeczXvh/+8yvJkxWIiKNHVptB/AqpsKfZBWp5mUD5U3VsjODMuUl1K2BSq0omV3CiO/mQmWSSMKSmaA==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@emotion/react': ^11.5.0 - '@emotion/styled': ^11.3.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@emotion/react': - optional: true - '@emotion/styled': - optional: true - '@types/react': - optional: true - '@mui/material@6.0.0-beta.5': resolution: {integrity: sha512-oLcMVOpn8nPQJcOjFo106Wlw2lsAjlNkTzrONZMFFZyAQ1cUY7kUE36Fy9bu/QQuUGmUqQdeEWsPuGLnLjTbKA==} engines: {node: '>=12.0.0'} @@ -11983,10 +11966,10 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/material-nextjs@5.16.4(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@mui/material-nextjs@6.0.0-beta.4(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) next: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -11994,27 +11977,6 @@ snapshots: '@emotion/server': 11.11.0 '@types/react': 18.3.3 - '@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/core-downloads-tracker': 5.16.5 - '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) - '@popperjs/core': 2.11.8 - '@types/react-transition-group': 4.4.10 - clsx: 2.1.1 - csstype: 3.1.3 - prop-types: 15.8.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-is: 18.3.1 - react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - optionalDependencies: - '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@types/react': 18.3.3 - '@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 diff --git a/test/package.json b/test/package.json index 8ea4fd7beb8d..9af4a7b2c2f8 100644 --- a/test/package.json +++ b/test/package.json @@ -9,7 +9,7 @@ "@babel/runtime": "^7.25.0", "@emotion/cache": "^11.13.1", "@emotion/react": "^11.13.0", - "@mui/material": "^5.16.5", + "@mui/material": "next", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", "@mui/x-date-pickers": "workspace:*", From 13299eb7f3d76674c7c2ffa857e30bdad4c5ab7e Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 14 Aug 2024 16:35:18 +0300 Subject: [PATCH 17/96] Fix import --- docs/data/data-grid/joy-ui/GridJoyUISlots.js | 2 +- docs/data/data-grid/joy-ui/GridJoyUISlots.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.js b/docs/data/data-grid/joy-ui/GridJoyUISlots.js index 7d88bad69902..9e2810ef675f 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.js +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.js @@ -3,7 +3,7 @@ import Box from '@mui/material/Box'; import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { - experimental_extendTheme as materialExtendTheme, + extendTheme as materialExtendTheme, Experimental_CssVarsProvider as MaterialCssVarsProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx index 8bcd13834ceb..a52acd7c41dc 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx @@ -3,7 +3,7 @@ import Box from '@mui/material/Box'; import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { - experimental_extendTheme as materialExtendTheme, + extendTheme as materialExtendTheme, Experimental_CssVarsProvider as MaterialCssVarsProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; From 0e7395bfe7628b6dd651f0b692ae941b7a02c85a Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 14 Aug 2024 16:56:41 +0300 Subject: [PATCH 18/96] docs:api --- docs/pages/x/api/date-pickers/date-field.json | 24 +++++++++++++++---- .../x/api/date-pickers/date-time-field.json | 24 +++++++++++++++---- .../single-input-date-range-field.json | 24 +++++++++++++++---- .../single-input-date-time-range-field.json | 24 +++++++++++++++---- .../single-input-time-range-field.json | 24 +++++++++++++++---- docs/pages/x/api/date-pickers/time-field.json | 24 +++++++++++++++---- 6 files changed, 120 insertions(+), 24 deletions(-) diff --git a/docs/pages/x/api/date-pickers/date-field.json b/docs/pages/x/api/date-pickers/date-field.json index 6aa1c3a910ad..86a0a40da319 100644 --- a/docs/pages/x/api/date-pickers/date-field.json +++ b/docs/pages/x/api/date-pickers/date-field.json @@ -19,14 +19,30 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { "type": { "name": "object" } }, + "FormHelperTextProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { "type": { "name": "object" } }, - "inputProps": { "type": { "name": "object" } }, - "InputProps": { "type": { "name": "object" } }, + "InputLabelProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "inputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "InputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/date-time-field.json b/docs/pages/x/api/date-pickers/date-time-field.json index 28e462156626..fd351264e7bb 100644 --- a/docs/pages/x/api/date-pickers/date-time-field.json +++ b/docs/pages/x/api/date-pickers/date-time-field.json @@ -21,14 +21,30 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { "type": { "name": "object" } }, + "FormHelperTextProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { "type": { "name": "object" } }, - "inputProps": { "type": { "name": "object" } }, - "InputProps": { "type": { "name": "object" } }, + "InputLabelProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "inputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "InputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/single-input-date-range-field.json b/docs/pages/x/api/date-pickers/single-input-date-range-field.json index d029a9c08222..ed1d88747ddb 100644 --- a/docs/pages/x/api/date-pickers/single-input-date-range-field.json +++ b/docs/pages/x/api/date-pickers/single-input-date-range-field.json @@ -20,14 +20,30 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { "type": { "name": "object" } }, + "FormHelperTextProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { "type": { "name": "object" } }, - "inputProps": { "type": { "name": "object" } }, - "InputProps": { "type": { "name": "object" } }, + "InputLabelProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "inputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "InputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json b/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json index dfc1fa601465..a86835c66bf3 100644 --- a/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json +++ b/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json @@ -22,14 +22,30 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { "type": { "name": "object" } }, + "FormHelperTextProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { "type": { "name": "object" } }, - "inputProps": { "type": { "name": "object" } }, - "InputProps": { "type": { "name": "object" } }, + "InputLabelProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "inputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "InputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/single-input-time-range-field.json b/docs/pages/x/api/date-pickers/single-input-time-range-field.json index 9fcb5181883d..172017d5f76f 100644 --- a/docs/pages/x/api/date-pickers/single-input-time-range-field.json +++ b/docs/pages/x/api/date-pickers/single-input-time-range-field.json @@ -22,14 +22,30 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { "type": { "name": "object" } }, + "FormHelperTextProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { "type": { "name": "object" } }, - "inputProps": { "type": { "name": "object" } }, - "InputProps": { "type": { "name": "object" } }, + "InputLabelProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "inputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "InputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/time-field.json b/docs/pages/x/api/date-pickers/time-field.json index fe2713222b37..1d66c6ab3823 100644 --- a/docs/pages/x/api/date-pickers/time-field.json +++ b/docs/pages/x/api/date-pickers/time-field.json @@ -21,14 +21,30 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { "type": { "name": "object" } }, + "FormHelperTextProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { "type": { "name": "object" } }, - "inputProps": { "type": { "name": "object" } }, - "InputProps": { "type": { "name": "object" } }, + "InputLabelProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "inputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, + "InputProps": { + "type": { "name": "object" }, + "deprecated": true, + "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." + }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { From 706969e31fb8ef69d1fe7394d86241281133fdf8 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 14 Aug 2024 17:14:54 +0300 Subject: [PATCH 19/96] Bump `system` and `utils` to v6 --- packages/x-charts-pro/package.json | 4 +- packages/x-charts/package.json | 4 +- packages/x-data-grid-generator/package.json | 1 + packages/x-data-grid-premium/package.json | 4 +- packages/x-data-grid-pro/package.json | 4 +- packages/x-data-grid/package.json | 4 +- packages/x-date-pickers-pro/package.json | 4 +- packages/x-date-pickers/package.json | 4 +- packages/x-internals/package.json | 2 +- packages/x-license/package.json | 2 +- packages/x-tree-view-pro/package.json | 4 +- packages/x-tree-view/package.json | 4 +- pnpm-lock.yaml | 105 ++++++++------------ 13 files changed, 64 insertions(+), 82 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index f5242bbe77ec..3534fb1455a2 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,8 +40,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 607fb0382193..c0d21a185f22 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,8 +40,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-charts-vendor": "workspace:*", "@react-spring/rafz": "^9.7.4", "@react-spring/web": "^9.7.4", diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index 136457598401..75b14509c626 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -40,6 +40,7 @@ "lru-cache": "^10.4.3" }, "devDependencies": { + "@mui/icons-material": "next", "@mui/material": "next", "@types/chance": "^1.1.6", "rimraf": "^5.0.10" diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 710dae323dce..986a9a629400 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,8 +44,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", "@mui/x-internals": "workspace:*", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 403dc07f54d5..9afd007432ae 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,8 +44,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 5a492fe3e75e..93fbbf9287ca 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,8 +48,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", "prop-types": "^15.8.1", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index c5fcb22712d6..780e54257c0e 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,8 +43,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-date-pickers": "workspace:*", "@mui/x-license": "workspace:*", "clsx": "^2.1.1", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 5c67fbe92bec..90b42d665b05 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,8 +46,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@types/react-transition-group": "^4.4.10", "clsx": "^2.1.1", "prop-types": "^15.8.1", diff --git a/packages/x-internals/package.json b/packages/x-internals/package.json index 46b6bfd6e4d4..c6b647e95c3a 100644 --- a/packages/x-internals/package.json +++ b/packages/x-internals/package.json @@ -42,7 +42,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/utils": "^5.16.5" + "@mui/utils": "^6.0.0-beta.5" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" diff --git a/packages/x-license/package.json b/packages/x-license/package.json index 9e4efaeb5001..d26fd9ee4c54 100644 --- a/packages/x-license/package.json +++ b/packages/x-license/package.json @@ -35,7 +35,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/utils": "^5.16.5" + "@mui/utils": "^6.0.0-beta.5" }, "peerDependencies": { "react": "^17.0.0 || ^18.0.0" diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index ee228c2b4054..cca2f47be071 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,8 +44,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", "@mui/x-tree-view": "workspace:*", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 0ad6c497556f..8139906258d8 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,8 +44,8 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.5", - "@mui/utils": "^5.16.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.10", "clsx": "^2.1.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index aa883558cbde..d8c4b015f25e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -715,11 +715,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts-vendor': specifier: workspace:* version: link:../x-charts-vendor @@ -777,11 +777,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../x-charts/build @@ -959,11 +959,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-internals': specifier: workspace:* version: link:../x-internals/build @@ -1014,9 +1014,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/icons-material': - specifier: ^5.4.1 || ^6 - version: 5.16.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/x-data-grid-premium': specifier: workspace:* version: link:../x-data-grid-premium/build @@ -1033,6 +1030,9 @@ importers: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1 devDependencies: + '@mui/icons-material': + specifier: next + version: 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': specifier: next version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1056,11 +1056,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-data-grid': specifier: workspace:* version: link:../x-data-grid/build @@ -1124,11 +1124,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-data-grid': specifier: workspace:* version: link:../x-data-grid/build @@ -1183,11 +1183,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@types/react-transition-group': specifier: ^4.4.10 version: 4.4.10 @@ -1266,11 +1266,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-date-pickers': specifier: workspace:* version: link:../x-date-pickers/build @@ -1337,8 +1337,8 @@ importers: specifier: ^7.25.0 version: 7.25.0 '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) react: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1 @@ -1357,8 +1357,8 @@ importers: specifier: ^7.25.0 version: 7.25.0 '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) react: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1 @@ -1383,11 +1383,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-internals': specifier: workspace:* version: link:../x-internals/build @@ -1436,11 +1436,11 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.5 - version: 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: ^5.16.5 - version: 5.16.5(@types/react@18.3.3)(react@18.3.1) + specifier: ^6.0.0-beta.5 + version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) '@mui/x-internals': specifier: workspace:* version: link:../x-internals/build @@ -2973,17 +2973,6 @@ packages: '@types/react': optional: true - '@mui/icons-material@5.16.5': - resolution: {integrity: sha512-bn88xxU/J9UV0s6+eutq7o3TTOrOlbCX+KshFb8kxgIxJZZfYz3JbAXVMivvoMF4Md6jCVUzM9HEkf4Ajab4tw==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@mui/material': ^5.0.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@mui/icons-material@6.0.0-beta.5': resolution: {integrity: sha512-LWE6+lH2wAxbV9dD9gvgQJyyuUVxkSJUiPRzkJVl9Dds2A+AlCKzgeSmaHPEmagglYkMI/RIMMG34gAJBzSsHw==} engines: {node: '>=14.0.0'} @@ -11856,14 +11845,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/icons-material@5.16.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.3 - '@mui/icons-material@6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 From 3ea45dfc62fd7c7dbc23e20f0dcfdc6769fd18f0 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 14 Aug 2024 17:28:36 +0300 Subject: [PATCH 20/96] Use stable `CssVarsProvider` --- docs/data/data-grid/joy-ui/GridJoyUISlots.js | 2 +- docs/data/data-grid/joy-ui/GridJoyUISlots.tsx | 2 +- docs/data/date-pickers/custom-field/JoyV6Field.js | 2 +- docs/data/date-pickers/custom-field/JoyV6Field.tsx | 2 +- .../data/date-pickers/custom-field/JoyV6MultiInputRangeField.js | 2 +- .../date-pickers/custom-field/JoyV6MultiInputRangeField.tsx | 2 +- .../date-pickers/custom-field/JoyV6SingleInputRangeField.js | 2 +- .../date-pickers/custom-field/JoyV6SingleInputRangeField.tsx | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.js b/docs/data/data-grid/joy-ui/GridJoyUISlots.js index 9e2810ef675f..f1281b22436d 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.js +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.js @@ -4,7 +4,7 @@ import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { extendTheme as materialExtendTheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx index a52acd7c41dc..879682a28b5a 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx @@ -4,7 +4,7 @@ import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { extendTheme as materialExtendTheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; diff --git a/docs/data/date-pickers/custom-field/JoyV6Field.js b/docs/data/date-pickers/custom-field/JoyV6Field.js index 29f4e14ce291..a9880ff6ac51 100644 --- a/docs/data/date-pickers/custom-field/JoyV6Field.js +++ b/docs/data/date-pickers/custom-field/JoyV6Field.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import { extendTheme as extendJoyTheme, diff --git a/docs/data/date-pickers/custom-field/JoyV6Field.tsx b/docs/data/date-pickers/custom-field/JoyV6Field.tsx index 05c311984ebf..9f4cfc8747de 100644 --- a/docs/data/date-pickers/custom-field/JoyV6Field.tsx +++ b/docs/data/date-pickers/custom-field/JoyV6Field.tsx @@ -3,7 +3,7 @@ import { Dayjs } from 'dayjs'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import { extendTheme as extendJoyTheme, diff --git a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js index e4f82d1581bb..e7b89f1e9317 100644 --- a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js +++ b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx index 175c0a3d04bb..98cee18adddd 100644 --- a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx +++ b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx @@ -3,7 +3,7 @@ import { Dayjs } from 'dayjs'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js index 9ac5abf64465..e1256f06af74 100644 --- a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js +++ b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx index 832a7b515624..679614cf0e67 100644 --- a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx +++ b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx @@ -3,7 +3,7 @@ import { Dayjs } from 'dayjs'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { From 52753e9edaf84375983eb294d66815575bea105b Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 14 Aug 2024 17:32:17 +0300 Subject: [PATCH 21/96] Use stable grid and working API --- docs/src/modules/components/ChartFeaturesGrid.js | 4 ++-- docs/src/modules/components/InstallationGrid.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/modules/components/ChartFeaturesGrid.js b/docs/src/modules/components/ChartFeaturesGrid.js index ecff879e95c2..e6e5f25781ea 100644 --- a/docs/src/modules/components/ChartFeaturesGrid.js +++ b/docs/src/modules/components/ChartFeaturesGrid.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import Grid from '@mui/material/Unstable_Grid2'; +import Grid from '@mui/material/Grid2'; import { InfoCard } from '@mui/docs/InfoCard'; import LineAxisRoundedIcon from '@mui/icons-material/LineAxisRounded'; import DashboardCustomizeRoundedIcon from '@mui/icons-material/DashboardCustomizeRounded'; @@ -45,7 +45,7 @@ export default function ChartFeaturesGrid() { return ( {content.map(({ icon, title, link }) => ( - + ))} diff --git a/docs/src/modules/components/InstallationGrid.js b/docs/src/modules/components/InstallationGrid.js index a5dcda305945..d71686454614 100644 --- a/docs/src/modules/components/InstallationGrid.js +++ b/docs/src/modules/components/InstallationGrid.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import Grid from '@mui/material/Unstable_Grid2'; +import Grid from '@mui/material/Grid2'; import { InfoCard } from '@mui/docs/InfoCard'; import AccountTreeRounded from '@mui/icons-material/AccountTreeRounded'; import PivotTableChartRoundedIcon from '@mui/icons-material/PivotTableChartRounded'; @@ -38,7 +38,7 @@ export default function InstallationGrid() { return ( {content.map(({ icon, title, description, link }) => ( - + Date: Mon, 19 Aug 2024 14:45:26 +0200 Subject: [PATCH 22/96] fix failing test --- .../src/tests/aggregation.DataGridPremium.test.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx index b5d115a7d73f..719451557aea 100644 --- a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx +++ b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx @@ -6,6 +6,7 @@ import { within, act, fireEvent, + waitFor, } from '@mui/internal-test-utils'; import { expect } from 'chai'; import { getCell, getColumnHeaderCell, getColumnValues } from 'test/utils/helperFn'; @@ -185,7 +186,9 @@ describe(' - Aggregation', () => { setProps({ columns: [column] }); fireEvent.doubleClick(cell); - expect(cell.querySelector('input')).to.equal(null); + waitFor(() => { + expect(cell.querySelector('input')).to.equal(null); + }); }); }); }); From 1ef093ef5e4d8d8ce95f29ddb6f9218ce2386f94 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 19 Aug 2024 16:04:30 +0300 Subject: [PATCH 23/96] dedupe --- pnpm-lock.yaml | 213 +++++++++++++++++++++++++------------------------ 1 file changed, 110 insertions(+), 103 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d8c4b015f25e..4cd54ab082cc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -85,7 +85,7 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/icons-material': specifier: next - version: 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': specifier: ^1.0.9 version: 1.0.9 @@ -94,13 +94,13 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/monorepo': specifier: github:mui/material-ui#0acfe665034fdf4578156ebaf4372713cf23bce4 version: https://codeload.github.com/mui/material-ui/tar.gz/0acfe665034fdf4578156ebaf4372713cf23bce4(encoding@0.1.13) '@mui/utils': specifier: next - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@next/eslint-plugin-next': specifier: 14.2.5 version: 14.2.5 @@ -424,31 +424,31 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/docs': specifier: 6.0.0-beta.4 - version: 6.0.0-beta.4(p7ppuzx3pu2n4nbsou62h6oen4) + version: 6.0.0-beta.4(cg4muev7c47jvvi4rw2b3ogawq) '@mui/icons-material': specifier: next - version: 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/joy': specifier: ^5.0.0-beta.48 version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/lab': specifier: ^5.0.0-alpha.173 - version: 5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material-nextjs': specifier: next - version: 6.0.0-beta.4(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@mui/styles': specifier: next - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: next - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../packages/x-charts/build @@ -716,10 +716,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts-vendor': specifier: workspace:* version: link:../x-charts-vendor @@ -747,7 +747,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -778,10 +778,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../x-charts/build @@ -812,7 +812,7 @@ importers: devDependencies: '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -960,10 +960,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-internals': specifier: workspace:* version: link:../x-internals/build @@ -991,7 +991,7 @@ importers: version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': specifier: ^7.2.15 version: 7.2.15(@types/react@18.3.3) @@ -1032,10 +1032,10 @@ importers: devDependencies: '@mui/icons-material': specifier: next - version: 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/chance': specifier: ^1.1.6 version: 1.1.6 @@ -1057,10 +1057,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-data-grid': specifier: workspace:* version: link:../x-data-grid/build @@ -1100,7 +1100,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1125,10 +1125,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-data-grid': specifier: workspace:* version: link:../x-data-grid/build @@ -1162,7 +1162,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1184,10 +1184,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@types/react-transition-group': specifier: ^4.4.10 version: 4.4.10 @@ -1212,7 +1212,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1267,10 +1267,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-date-pickers': specifier: workspace:* version: link:../x-date-pickers/build @@ -1304,7 +1304,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1338,7 +1338,7 @@ importers: version: 7.25.0 '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) react: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1 @@ -1358,7 +1358,7 @@ importers: version: 7.25.0 '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) react: specifier: ^17.0.0 || ^18.0.0 version: 18.3.1 @@ -1384,10 +1384,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-internals': specifier: workspace:* version: link:../x-internals/build @@ -1415,7 +1415,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1437,10 +1437,10 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^6.0.0-beta.5 - version: 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-internals': specifier: workspace:* version: link:../x-internals/build @@ -1474,7 +1474,7 @@ importers: version: https://pkg.csb.dev/mui/material-ui/commit/225876f7/@mui/internal-test-utils(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1496,7 +1496,7 @@ importers: version: 11.13.0(@types/react@18.3.3)(react@18.3.1) '@mui/material': specifier: next - version: 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../packages/x-charts/build @@ -2973,13 +2973,13 @@ packages: '@types/react': optional: true - '@mui/icons-material@6.0.0-beta.5': - resolution: {integrity: sha512-LWE6+lH2wAxbV9dD9gvgQJyyuUVxkSJUiPRzkJVl9Dds2A+AlCKzgeSmaHPEmagglYkMI/RIMMG34gAJBzSsHw==} + '@mui/icons-material@6.0.0-beta.6': + resolution: {integrity: sha512-XtP8W/Hd5FAQ1VdrE6KN6DqPe4AdnCn0lp+AQGa6gnH/4dZsIwNsmKapfVt7NHAhrbDSKnx9cPXAAT2NXPyaJg==} engines: {node: '>=14.0.0'} peerDependencies: - '@mui/material': 6.0.0-beta.5 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@mui/material': 6.0.0-beta.6 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -3035,16 +3035,16 @@ packages: '@types/react': optional: true - '@mui/material-nextjs@6.0.0-beta.4': - resolution: {integrity: sha512-GSI/tX32T5iYtqjpbt0AbSMWvRX0yLdyCIYt8AB5HOHNYXlP7kDd+9INhReTbjdg8ZJqWeH87mxzKQ3/gbStGg==} + '@mui/material-nextjs@6.0.0-beta.6': + resolution: {integrity: sha512-ZH8f0gaDwv17ckaCsuGxU16+G1qohPN+MPRFUY9JxT+oF+xVKcmDsgJgkUAFueWqGhR2782EtMYeD20bgimb6w==} engines: {node: '>=14.0.0'} peerDependencies: '@emotion/cache': ^11.11.0 '@emotion/react': ^11.11.4 '@emotion/server': ^11.11.0 - '@types/react': ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 next: ^13.0.0 || ^14.0.0 - react: ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/cache': optional: true @@ -3053,16 +3053,16 @@ packages: '@types/react': optional: true - '@mui/material@6.0.0-beta.5': - resolution: {integrity: sha512-oLcMVOpn8nPQJcOjFo106Wlw2lsAjlNkTzrONZMFFZyAQ1cUY7kUE36Fy9bu/QQuUGmUqQdeEWsPuGLnLjTbKA==} - engines: {node: '>=12.0.0'} + '@mui/material@6.0.0-beta.6': + resolution: {integrity: sha512-1wLFBXsoq8yGBRNDzqsQPYMEvtDel7MhUWAZtPCbsTSiYTJ2dPmf1byk/pEmX1y/3cVBHVdEgF9joXfTlnqc4g==} + engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/material-pigment-css': ^6.0.0-beta.5 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 + '@mui/material-pigment-css': ^6.0.0-beta.6 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 + react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true @@ -3088,12 +3088,12 @@ packages: '@types/react': optional: true - '@mui/private-theming@6.0.0-beta.5': - resolution: {integrity: sha512-QW9x6JbSZIZeNHk7HGTOhKnSBB5QnxZU51g89H7EsbGqv60oSlARQ14tmQjVkR3D5bpspptgVzIR09eayY+JRA==} + '@mui/private-theming@6.0.0-beta.6': + resolution: {integrity: sha512-D31JP0rXgprbFrk52xNUlQb9XTIH2gXO+u2ak7f5V3eWHTz3/IdIq8TLU+qR9EYm+JnwLWMoxoFaPvNo1HbxmQ==} engines: {node: '>=14.0.0'} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -3111,25 +3111,25 @@ packages: '@emotion/styled': optional: true - '@mui/styled-engine@6.0.0-beta.5': - resolution: {integrity: sha512-VIIMVHaDXf/d9kRlO+o0ORJSgZpeRbq77lhkI2UHTbGnbO3QDGMpyb+yrrjLzIIho2ItsgHala08EM23VF/yrA==} + '@mui/styled-engine@6.0.0-beta.6': + resolution: {integrity: sha512-YtFsWjog8K3YSbfj60p0ZuY2gJhW+f7zNkcPziZidv4VsC1OnJpxtdPTmfSBXN/fT61k/7QfGiW7fFV26FQFPA==} engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.4.1 '@emotion/styled': ^11.3.0 - react: ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true '@emotion/styled': optional: true - '@mui/styles@6.0.0-beta.5': - resolution: {integrity: sha512-1K+Rb5V6OPl1Yb+hj8iltKliYnx1W2Zasfw6u84OED7XHGHLkOPE400HDrLqqb+65etrPZFsBMwk3uqTR+GCyg==} + '@mui/styles@6.0.0-beta.6': + resolution: {integrity: sha512-Vta4qcnfXD5fQbBgEHM8VAq8NOSErBU5n9V7yXqz76h6XnYYGsidtTle4ZsFZVVBHnbesKP0uH60V5l1PKuFrw==} engines: {node: '>=14.0.0'} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -3150,14 +3150,14 @@ packages: '@types/react': optional: true - '@mui/system@6.0.0-beta.5': - resolution: {integrity: sha512-Z33nU1rCfhqK568ieTdDpPfRXUM+cNBlloiJ0GPVz5YZs2N/wxLCwOFPUDVmudJbwxYvTI64D76cfBosz5ytkQ==} + '@mui/system@6.0.0-beta.6': + resolution: {integrity: sha512-WkY0oy2jL4zkTosE8q+vDfFIP1gVORFL658WnPf5vnsDawxqALVdtBvHgTBatM1X5OKZ9K+PX9hg1++K0spsxQ==} engines: {node: '>=14.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@emotion/react': optional: true @@ -3184,12 +3184,12 @@ packages: '@types/react': optional: true - '@mui/utils@6.0.0-beta.5': - resolution: {integrity: sha512-QidRa70STALSsTTeeJ7ddyyVbEAK3cVOK350L8tAJLzag79XzNE+lSpU4+UnIna9ftuI9sIJHVxZK6wVw7ATug==} - engines: {node: '>=12.0.0'} + '@mui/utils@6.0.0-beta.6': + resolution: {integrity: sha512-HsEDqZ/4K8zWkSiT2816pNUeoLj91l5w4XkYAIuz8//dKeSz67XfYZgZsc9OMferz/cYOflqBbCPxl2A5vWHeQ==} + engines: {node: '>=14.0.0'} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 + '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 || ^19.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -4181,6 +4181,9 @@ packages: '@types/react-transition-group@4.4.10': resolution: {integrity: sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==} + '@types/react-transition-group@4.4.11': + resolution: {integrity: sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==} + '@types/react@18.3.3': resolution: {integrity: sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==} @@ -11826,14 +11829,14 @@ snapshots: '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': {} - '@mui/docs@6.0.0-beta.4(p7ppuzx3pu2n4nbsou62h6oen4)': + '@mui/docs@6.0.0-beta.4(cg4muev7c47jvvi4rw2b3ogawq)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/icons-material': 6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/icons-material': 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': 1.0.9 - '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) chai: 5.1.1 clipboard-copy: 4.0.1 clsx: 2.1.1 @@ -11845,10 +11848,10 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/icons-material@6.0.0-beta.5(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + '@mui/icons-material@6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 @@ -11930,11 +11933,11 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/material': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) @@ -11947,7 +11950,7 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/material-nextjs@6.0.0-beta.4(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@mui/material-nextjs@6.0.0-beta.6(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) @@ -11958,15 +11961,15 @@ snapshots: '@emotion/server': 11.11.0 '@types/react': 18.3.3 - '@mui/material@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/core-downloads-tracker': 6.0.0-dev.240424162023-9968b4889d - '@mui/system': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@popperjs/core': 2.11.8 - '@types/react-transition-group': 4.4.10 + '@types/react-transition-group': 4.4.11 clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -12002,10 +12005,10 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/private-theming@6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1)': + '@mui/private-theming@6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 optionalDependencies: @@ -12022,7 +12025,7 @@ snapshots: '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/styled-engine@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': + '@mui/styled-engine@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@emotion/cache': 11.13.1 @@ -12033,13 +12036,13 @@ snapshots: '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/styles@6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1)': + '@mui/styles@6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@emotion/hash': 0.9.2 - '@mui/private-theming': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@mui/private-theming': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 hoist-non-react-statics: 3.3.2 @@ -12072,13 +12075,13 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/system@6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + '@mui/system@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/private-theming': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) - '@mui/styled-engine': 6.0.0-beta.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) + '@mui/private-theming': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) + '@mui/styled-engine': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -12104,7 +12107,7 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/utils@6.0.0-beta.5(@types/react@18.3.3)(react@18.3.1)': + '@mui/utils@6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/types': 7.2.15(@types/react@18.3.3) @@ -13221,6 +13224,10 @@ snapshots: dependencies: '@types/react': 18.3.3 + '@types/react-transition-group@4.4.11': + dependencies: + '@types/react': 18.3.3 + '@types/react@18.3.3': dependencies: '@types/prop-types': 15.7.12 From 6d8c54e16f2eb5e5d38c5311bb6e165b6e97a204 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 19 Aug 2024 16:42:21 +0300 Subject: [PATCH 24/96] dedupe --- pnpm-lock.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 73bd066ccedc..7dfbd472a40f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -424,7 +424,7 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/docs': specifier: 6.0.0-beta.6 - version: 6.0.0-beta.6(v73oylu5qs3cavoyvfoft6xvce) + version: 6.0.0-beta.6(cg4muev7c47jvvi4rw2b3ogawq) '@mui/icons-material': specifier: next version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -2953,6 +2953,9 @@ packages: '@mui/core-downloads-tracker@5.16.5': resolution: {integrity: sha512-ziFn1oPm6VjvHQcdGcAO+fXvOQEgieIj0BuSqcltFU+JXIxjPdVYNTdn2HU7/Ak5Gabk6k2u7+9PV7oZ6JT5sA==} + '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': + resolution: {integrity: sha512-doh3M3U7HUGSBIWGe1yvesSbfDguMRjP0N09ogWSBM2hovXAlgULhMgcRTepAZLLwfRxFII0bCohq6B9NqoKuw==} + '@mui/docs@6.0.0-beta.6': resolution: {integrity: sha512-q5v8dqbtI8eWzjMv/AcASSI2PGMPq/nF8Z4gzi2S+jjFcAH/4MoknhQUReLxGW+6DaCuPfSNDtcvxIjQ9mrJ3A==} engines: {node: '>=14.0.0'} @@ -11804,14 +11807,16 @@ snapshots: '@mui/core-downloads-tracker@5.16.5': {} - '@mui/docs@6.0.0-beta.6(v73oylu5qs3cavoyvfoft6xvce)': + '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': {} + + '@mui/docs@6.0.0-beta.6(cg4muev7c47jvvi4rw2b3ogawq)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/icons-material': 5.16.5(@mui/material@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/icons-material': 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': 1.0.10 - '@mui/material': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) chai: 5.1.1 clipboard-copy: 4.0.1 clsx: 2.1.1 From f3b885ba8f5a0d3b332a4094018a5a9ab67a7b07 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 19 Aug 2024 16:24:51 +0200 Subject: [PATCH 25/96] use waitFor where necessary only --- .../src/tests/aggregation.DataGridPremium.test.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx index 719451557aea..17a5ef11a394 100644 --- a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx +++ b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx @@ -186,9 +186,7 @@ describe(' - Aggregation', () => { setProps({ columns: [column] }); fireEvent.doubleClick(cell); - waitFor(() => { - expect(cell.querySelector('input')).to.equal(null); - }); + expect(cell.querySelector('input')).to.equal(null); }); }); }); @@ -425,7 +423,9 @@ describe(' - Aggregation', () => { ).getByText('max'), ); - expect(getColumnValues(0)).to.deep.equal(['0', '1', '2', '3', '4', '5', '5' /* Agg */]); + waitFor(() => { + expect(getColumnValues(0)).to.deep.equal(['0', '1', '2', '3', '4', '5', '5' /* Agg */]); + }); }); }); From 5115974805722dbf8072e0ececea7508a2ea4374 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 19 Aug 2024 19:18:13 +0200 Subject: [PATCH 26/96] remove waitFor --- .../src/tests/aggregation.DataGridPremium.test.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx index 17a5ef11a394..7ec5cd7df66a 100644 --- a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx +++ b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx @@ -6,7 +6,6 @@ import { within, act, fireEvent, - waitFor, } from '@mui/internal-test-utils'; import { expect } from 'chai'; import { getCell, getColumnHeaderCell, getColumnValues } from 'test/utils/helperFn'; @@ -422,10 +421,9 @@ describe(' - Aggregation', () => { }), ).getByText('max'), ); + clock.runToLast(); - waitFor(() => { - expect(getColumnValues(0)).to.deep.equal(['0', '1', '2', '3', '4', '5', '5' /* Agg */]); - }); + expect(getColumnValues(0)).to.deep.equal(['0', '1', '2', '3', '4', '5', '5' /* Agg */]); }); }); From f8a13ab5125a8d40400d0fd18a8f30987f8fff36 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 19 Aug 2024 21:23:59 +0200 Subject: [PATCH 27/96] fix act warnings in test:unit --- .../src/tests/columnHeaders.DataGrid.test.tsx | 17 +++- .../src/tests/rowSelection.DataGrid.test.tsx | 6 +- .../DateRangeCalendar.test.tsx | 17 ++-- .../tests/DesktopDateRangePicker.test.tsx | 78 ++++++++++++------- .../describes.DesktopDateRangePicker.test.tsx | 30 +++---- .../tests/MobileDateRangePicker.test.tsx | 24 +++--- .../describeValue/describeValue.types.ts | 4 +- .../testControlledUnControlled.tsx | 8 +- .../describeValue/testPickerActionBar.tsx | 68 +++++++++------- .../testPickerOpenCloseLifeCycle.tsx | 45 ++++++----- .../pickers/describeValue/testShortcuts.tsx | 20 +++-- 11 files changed, 197 insertions(+), 120 deletions(-) diff --git a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx index 47e091416795..1a0634dece39 100644 --- a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx @@ -1,5 +1,12 @@ import * as React from 'react'; -import { createRenderer, fireEvent, screen, within, userEvent } from '@mui/internal-test-utils'; +import { + createRenderer, + fireEvent, + screen, + within, + userEvent, + act, +} from '@mui/internal-test-utils'; import { expect } from 'chai'; import { DataGrid } from '@mui/x-data-grid'; import { getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn'; @@ -123,11 +130,15 @@ describe(' - Column headers', () => { , ); - userEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); + await act(async () => { + userEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); + }); clock.runToLast(); expect(screen.queryByRole('menu')).not.to.equal(null); - userEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); + await act(async () => { + userEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); + }); clock.runToLast(); expect(screen.queryByRole('menu')).to.equal(null); }); diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 2a4e6c268268..5e6aa11d1442 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -227,14 +227,16 @@ describe(' - Row selection', () => { expect(getRow(0).querySelector('input')).to.have.property('checked', false); }); - it('should set focus on the cell when clicking the checkbox', () => { + it('should set focus on the cell when clicking the checkbox', async () => { render(); expect(getActiveCell()).to.equal(null); // simulate click const checkboxInput = getCell(0, 0).querySelector('input'); - userEvent.mousePress(checkboxInput!); + await act(async () => { + userEvent.mousePress(checkboxInput!); + }); expect(getActiveCell()).to.equal('0-0'); }); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 4cc25b92a554..4613b0afae06 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -7,6 +7,7 @@ import { getByRole, fireTouchChangedEvent, userEvent, + act, } from '@mui/internal-test-utils'; import { adapterToUse, @@ -533,7 +534,7 @@ describe('', () => { }); describe('Performance', () => { - it('should only render the new start day when selecting a start day without a previously selected start day', () => { + it('should only render the new start day when selecting a start day without a previously selected start day', async () => { const RenderCount = spy((props) => ); render( @@ -545,11 +546,13 @@ describe('', () => { ); const renderCountBeforeChange = RenderCount.callCount; - userEvent.mousePress(getPickerDay('2')); + await act(async () => { + userEvent.mousePress(getPickerDay('2')); + }); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day }); - it('should only render the day inside range when selecting the end day', () => { + it('should only render the day inside range when selecting the end day', async () => { const RenderCount = spy((props) => ); render( @@ -560,10 +563,14 @@ describe('', () => { />, ); - userEvent.mousePress(getPickerDay('2')); + await act(async () => { + userEvent.mousePress(getPickerDay('2')); + }); const renderCountBeforeChange = RenderCount.callCount; - userEvent.mousePress(getPickerDay('4')); + await act(async () => { + userEvent.mousePress(getPickerDay('4')); + }); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(6); // 2 render * 3 day }); }); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx index 6137c60421f0..f03737474bc2 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx @@ -218,7 +218,7 @@ describe('', () => { }), ); - it('should call onChange with updated start date then call onChange with updated end date, onClose and onAccept with update date range when opening from start input', () => { + it('should call onChange with updated start date then call onChange with updated end date, onClose and onAccept with update date range when opening from start input', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -243,14 +243,18 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - // Change the start date - userEvent.mousePress(getPickerDay('3')); + await act(async () => { + // Change the start date + userEvent.mousePress(getPickerDay('3')); + }); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); - // Change the end date - userEvent.mousePress(getPickerDay('5')); + await act(async () => { + // Change the end date + userEvent.mousePress(getPickerDay('5')); + }); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); @@ -261,7 +265,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onChange with updated end date, onClose and onAccept with update date range when opening from end input', () => { + it('should call onChange with updated end date, onClose and onAccept with update date range when opening from end input', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -286,8 +290,10 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - // Change the end date - userEvent.mousePress(getPickerDay('3')); + await act(async () => { + // Change the end date + userEvent.mousePress(getPickerDay('3')); + }); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); @@ -297,7 +303,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should not call onClose and onAccept when selecting the end date if props.closeOnSelect = false', () => { + it('should not call onClose and onAccept when selecting the end date if props.closeOnSelect = false', async () => { const onAccept = spy(); const onClose = spy(); const defaultValue: DateRange = [ @@ -317,14 +323,16 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'end' }); - // Change the end date - userEvent.mousePress(getPickerDay('3')); + await act(async () => { + // Change the end date + userEvent.mousePress(getPickerDay('3')); + }); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); }); - it('should call onClose and onAccept with the live value when pressing Escape', () => { + it('should call onClose and onAccept with the live value when pressing Escape', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -345,8 +353,10 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - // Change the start date (already tested) - userEvent.mousePress(getPickerDay('3')); + await act(async () => { + // Change the start date (already tested) + userEvent.mousePress(getPickerDay('3')); + }); // Dismiss the picker // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target -- don't care @@ -392,7 +402,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept with the live value when clicking outside of the picker', () => { + it('should call onClose and onAccept with the live value when clicking outside of the picker', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -416,8 +426,10 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - // Change the start date (already tested) - userEvent.mousePress(getPickerDay('3')); + await act(async () => { + // Change the start date (already tested) + userEvent.mousePress(getPickerDay('3')); + }); clock.runToLast(); // Dismiss the picker @@ -438,7 +450,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should not call onClose or onAccept when clicking outside of the picker if not opened', () => { + it('should not call onClose or onAccept when clicking outside of the picker if not opened', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -452,8 +464,10 @@ describe('', () => { />, ); - // Dismiss the picker - userEvent.mousePress(document.body); + await act(async () => { + // Dismiss the picker + userEvent.mousePress(document.body); + }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); @@ -495,7 +509,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept when blur the current field', () => { + it('should call onClose and onAccept when blur the current field', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -520,8 +534,10 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); expect(screen.getByRole('tooltip')).toBeVisible(); - // Change the start date (already tested) - userEvent.mousePress(getPickerDay('3')); + await act(async () => { + // Change the start date (already tested) + userEvent.mousePress(getPickerDay('3')); + }); clock.runToLast(); act(() => { @@ -536,7 +552,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', () => { + it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -558,8 +574,10 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - // Clear the date - userEvent.mousePress(screen.getByText(/clear/i)); + await act(async () => { + // Clear the date + userEvent.mousePress(screen.getByText(/clear/i)); + }); expect(onChange.callCount).to.equal(1); // Start date change expect(onChange.lastCall.args[0]).to.deep.equal([null, null]); expect(onAccept.callCount).to.equal(1); @@ -567,7 +585,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should not call onChange or onAccept when pressing "Clear" button with an already null value', () => { + it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -585,8 +603,10 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - // Clear the date - userEvent.mousePress(screen.getByText(/clear/i)); + await act(async () => { + // Clear the date + userEvent.mousePress(screen.getByText(/clear/i)); + }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index ff1a2bf8b2c1..d60437d85528 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, userEvent } from '@mui/internal-test-utils'; +import { act, screen, userEvent } from '@mui/internal-test-utils'; import { adapterToUse, createPickerRenderer, @@ -72,7 +72,7 @@ describe(' - Describes', () => { : 'MM/DD/YYYY'; expectFieldValueV7(endSectionsContainer, expectedEndValueStr); }, - setNewValue: ( + setNewValue: async ( value, { isOpened, applySameValue, setEndDate = false, selectSection, pressKey }, ) => { @@ -86,11 +86,13 @@ describe(' - Describes', () => { } if (isOpened) { - userEvent.mousePress( - screen.getAllByRole('gridcell', { - name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), - })[0], - ); + await act(async () => { + userEvent.mousePress( + screen.getAllByRole('gridcell', { + name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), + })[0], + ); + }); } else { selectSection('day'); pressKey(undefined, 'ArrowUp'); @@ -134,7 +136,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: ( + setNewValue: async ( value, { isOpened, applySameValue, setEndDate = false, selectSection, pressKey }, ) => { @@ -148,11 +150,13 @@ describe(' - Describes', () => { } if (isOpened) { - userEvent.mousePress( - screen.getAllByRole('gridcell', { - name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), - })[0], - ); + await act(async () => { + userEvent.mousePress( + screen.getAllByRole('gridcell', { + name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), + })[0], + ); + }); } else { selectSection('day'); pressKey(undefined, 'ArrowUp'); diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx index e27cb9084aa3..721cfe85012b 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen, userEvent, fireEvent } from '@mui/internal-test-utils'; +import { screen, userEvent, fireEvent, act } from '@mui/internal-test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { createPickerRenderer, @@ -58,7 +58,7 @@ describe('', () => { expect(screen.queryByRole('dialog')).toBeVisible(); }); - it('should call onChange with updated start date then call onChange with updated end date when opening from start input', () => { + it('should call onChange with updated start date then call onChange with updated end date when opening from start input', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -83,14 +83,18 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - // Change the start date - userEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + await act(async () => { + // Change the start date + userEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + }); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); - // Change the end date - userEvent.mousePress(screen.getByRole('gridcell', { name: '5' })); + await act(async () => { + // Change the end date + userEvent.mousePress(screen.getByRole('gridcell', { name: '5' })); + }); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); @@ -260,7 +264,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should not call onChange or onAccept when pressing "Clear" button with an already null value', () => { + it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -278,8 +282,10 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); - // Clear the date - userEvent.mousePress(screen.getByText(/clear/i)); + await act(async () => { + // Clear the date + userEvent.mousePress(screen.getByText(/clear/i)); + }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); diff --git a/test/utils/pickers/describeValue/describeValue.types.ts b/test/utils/pickers/describeValue/describeValue.types.ts index 27332ec2b719..4492ac3d53d3 100644 --- a/test/utils/pickers/describeValue/describeValue.types.ts +++ b/test/utils/pickers/describeValue/describeValue.types.ts @@ -34,13 +34,13 @@ export type DescribeValueOptions< applySameValue?: boolean; setEndDate?: boolean; }, - ) => TValue; + ) => Promise; } : { setNewValue: ( value: TValue, options: { selectSection: FieldSectionSelector; pressKey: FieldPressCharacter }, - ) => TValue; + ) => Promise; }); export type DescribeValueTestSuite = ( diff --git a/test/utils/pickers/describeValue/testControlledUnControlled.tsx b/test/utils/pickers/describeValue/testControlledUnControlled.tsx index ae4e204f8252..3f83463d9755 100644 --- a/test/utils/pickers/describeValue/testControlledUnControlled.tsx +++ b/test/utils/pickers/describeValue/testControlledUnControlled.tsx @@ -56,7 +56,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( assertRenderedValue(emptyValue); }); - it('should call onChange when updating a value defined with `props.defaultValue` and update the rendered value', () => { + it('should call onChange when updating a value defined with `props.defaultValue` and update the rendered value', async () => { const onChange = spy(); const v7Response = renderWithProps({ @@ -64,7 +64,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( defaultValue: values[0], onChange, }); - const newValue = setNewValue(values[0], { + const newValue = await setNewValue(values[0], { selectSection: v7Response.selectSection, pressKey: v7Response.pressKey, }); @@ -81,7 +81,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( } }); - it('should call onChange when updating a value defined with `props.value`', () => { + it('should call onChange when updating a value defined with `props.value`', async () => { const onChange = spy(); const useControlledElement = (props) => { @@ -100,7 +100,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( { enableAccessibleFieldDOMStructure: true, value: values[0], onChange }, { hook: useControlledElement }, ); - const newValue = setNewValue(values[0], { + const newValue = await setNewValue(values[0], { selectSection: v7Response.selectSection, pressKey: v7Response.pressKey, }); diff --git a/test/utils/pickers/describeValue/testPickerActionBar.tsx b/test/utils/pickers/describeValue/testPickerActionBar.tsx index adbb86a48967..90a4bd12c088 100644 --- a/test/utils/pickers/describeValue/testPickerActionBar.tsx +++ b/test/utils/pickers/describeValue/testPickerActionBar.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen, userEvent } from '@mui/internal-test-utils'; +import { act, screen, userEvent } from '@mui/internal-test-utils'; import { adapterToUse, getExpectedOnChangeCount, @@ -31,7 +31,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( describe('Picker action bar', () => { describe('clear action', () => { - it('should call onClose, onChange with empty value and onAccept with empty value', () => { + it('should call onClose, onChange with empty value and onAccept with empty value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -48,8 +48,10 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - // Clear the date - userEvent.mousePress(screen.getByText(/clear/i)); + await act(async () => { + // Clear the date + userEvent.mousePress(screen.getByText(/clear/i)); + }); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, emptyValue); expect(onAccept.callCount).to.equal(1); @@ -57,7 +59,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onClose.callCount).to.equal(1); }); - it('should not call onChange or onAccept if the value is already empty value', () => { + it('should not call onChange or onAccept if the value is already empty value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -74,8 +76,10 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - // Clear the date - userEvent.mousePress(screen.getByText(/clear/i)); + await act(async () => { + // Clear the date + userEvent.mousePress(screen.getByText(/clear/i)); + }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -83,7 +87,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); describe('cancel action', () => { - it('should call onClose and onChange with the initial value', () => { + it('should call onClose and onChange with the initial value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -100,10 +104,12 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); // Change the value (already tested) - setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); - // Cancel the modifications - userEvent.mousePress(screen.getByText(/cancel/i)); + await act(async () => { + // Cancel the modifications + userEvent.mousePress(screen.getByText(/cancel/i)); + }); expect(onChange.callCount).to.equal( getExpectedOnChangeCount(componentFamily, pickerParams) + 1, ); @@ -118,7 +124,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onClose.callCount).to.equal(1); }); - it('should not call onChange if no prior value modification', () => { + it('should not call onChange if no prior value modification', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -136,8 +142,10 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - // Cancel the modifications - userEvent.mousePress(screen.getByText(/cancel/i)); + await act(async () => { + // Cancel the modifications + userEvent.mousePress(screen.getByText(/cancel/i)); + }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -145,7 +153,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); describe('confirm action', () => { - it('should call onClose and onAccept with the live value', () => { + it('should call onClose and onAccept with the live value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -162,10 +170,12 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); // Change the value (already tested) - setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); - // Accept the modifications - userEvent.mousePress(screen.getByText(/ok/i)); + await act(async () => { + // Accept the modifications + userEvent.mousePress(screen.getByText(/ok/i)); + }); expect(onChange.callCount).to.equal( getExpectedOnChangeCount(componentFamily, pickerParams), ); // The accepted value as already been committed, don't call onChange again @@ -173,7 +183,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onClose.callCount).to.equal(1); }); - it('should call onChange, onClose and onAccept when validating the default value', () => { + it('should call onChange, onClose and onAccept when validating the default value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -191,14 +201,16 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - // Accept the modifications - userEvent.mousePress(screen.getByText(/ok/i)); + await act(async () => { + // Accept the modifications + userEvent.mousePress(screen.getByText(/ok/i)); + }); expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); }); - it('should call onClose but not onAccept when validating an already validated value', () => { + it('should call onClose but not onAccept when validating an already validated value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -216,8 +228,10 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - // Accept the modifications - userEvent.mousePress(screen.getByText(/ok/i)); + await act(async () => { + // Accept the modifications + userEvent.mousePress(screen.getByText(/ok/i)); + }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -225,7 +239,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); describe('today action', () => { - it("should call onClose, onChange with today's value and onAccept with today's value", () => { + it("should call onClose, onChange with today's value and onAccept with today's value", async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -242,7 +256,9 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - userEvent.mousePress(screen.getByText(/today/i)); + await act(async () => { + userEvent.mousePress(screen.getByText(/today/i)); + }); let startOfToday: any; if (pickerParams.type === 'date') { diff --git a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx index b38b5a9d2bd3..c14ae14abe0a 100644 --- a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx +++ b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx @@ -46,7 +46,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onOpen.callCount).to.equal(0); }); - it('should call onChange, onClose (if desktop) and onAccept (if desktop) when selecting a value', () => { + it('should call onChange, onClose (if desktop) and onAccept (if desktop) when selecting a value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -68,10 +68,10 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); // Change the value - let newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + let newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); if (isRangeType) { - newValue = setNewValue(newValue, { + newValue = await setNewValue(newValue, { isOpened: true, setEndDate: true, selectSection, @@ -87,7 +87,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(pickerParams.variant === 'mobile' ? 0 : 1); }); - it('should not select input content after closing on mobile', () => { + it('should not select input content after closing on mobile', async () => { if (pickerParams.variant !== 'mobile') { return; } @@ -98,12 +98,12 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value - setNewValue(values[0], { selectSection, pressKey }); + await setNewValue(values[0], { selectSection, pressKey }); const fieldRoot = getFieldInputRoot(); expect(fieldRoot.scrollLeft).to.be.equal(0); }); - it('should call onChange, onClose and onAccept when selecting a value and `props.closeOnSelect` is true', () => { + it('should call onChange, onClose and onAccept when selecting a value and `props.closeOnSelect` is true', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -126,10 +126,10 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); // Change the value - let newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + let newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); if (isRangeType) { - newValue = setNewValue(newValue, { + newValue = await setNewValue(newValue, { isOpened: true, setEndDate: true, selectSection, @@ -145,7 +145,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(1); }); - it('should not call onChange or onAccept when selecting the same value', () => { + it('should not call onChange or onAccept when selecting the same value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -164,9 +164,14 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (same value) - setNewValue(values[0], { isOpened: true, applySameValue: true, selectSection, pressKey }); + await setNewValue(values[0], { + isOpened: true, + applySameValue: true, + selectSection, + pressKey, + }); if (isRangeType) { - setNewValue(values[0], { + await setNewValue(values[0], { isOpened: true, applySameValue: true, setEndDate: true, @@ -180,7 +185,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(1); }); - it('should not call onClose or onAccept when selecting a date and `props.closeOnSelect` is false', function test() { + it('should not call onClose or onAccept when selecting a date and `props.closeOnSelect` is false', async function test() { // increase the timeout of this test as it tends to sometimes fail on CI with `DesktopDateTimeRangePicker` or `MobileDateTimeRangePicker` this.timeout(10000); const onChange = spy(); @@ -201,11 +206,11 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value - let newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + let newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); const initialChangeCount = getExpectedOnChangeCount(componentFamily, pickerParams); expect(onChange.callCount).to.equal(initialChangeCount); if (isRangeType) { - newValue = setNewValue(newValue, { + newValue = await setNewValue(newValue, { isOpened: true, setEndDate: true, selectSection, @@ -221,14 +226,14 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); // Change the value - let newValueBis = setNewValue(newValue, { isOpened: true, selectSection, pressKey }); + let newValueBis = await setNewValue(newValue, { isOpened: true, selectSection, pressKey }); if (isRangeType) { expect(onChange.callCount).to.equal( initialChangeCount + getExpectedOnChangeCount(componentFamily, pickerParams) * 2 - (pickerParams.type === 'date-time-range' ? 1 : 0), ); - newValueBis = setNewValue(newValueBis, { + newValueBis = await setNewValue(newValueBis, { isOpened: true, setEndDate: true, selectSection, @@ -250,7 +255,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); }); - it('should call onClose and onAccept with the live value when pressing Escape', () => { + it('should call onClose and onAccept with the live value when pressing Escape', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -269,7 +274,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (already tested) - const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + const newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker userEvent.keyPress(document.activeElement!, { key: 'Escape' }); @@ -314,7 +319,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept with the live value when clicking outside of the picker', function test() { + it('should call onClose and onAccept with the live value when clicking outside of the picker', async function test() { // TODO: Fix this test and enable it on mobile and date-range if (pickerParams.variant === 'mobile' || isRangeType) { this.skip(); @@ -338,7 +343,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (already tested) - const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + const newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker userEvent.mousePress(document.body); diff --git a/test/utils/pickers/describeValue/testShortcuts.tsx b/test/utils/pickers/describeValue/testShortcuts.tsx index bd7617b6dd98..42440675bf85 100644 --- a/test/utils/pickers/describeValue/testShortcuts.tsx +++ b/test/utils/pickers/describeValue/testShortcuts.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; import { expectPickerChangeHandlerValue } from 'test/utils/pickers'; -import { userEvent, screen } from '@mui/internal-test-utils'; +import { userEvent, screen, act } from '@mui/internal-test-utils'; import { DescribeValueTestSuite } from './describeValue.types'; export const testShortcuts: DescribeValueTestSuite = (ElementToTest, options) => { @@ -21,7 +21,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe } describe('Picker shortcuts', () => { - it('should call onClose, onChange and onAccept when picking a shortcut without explicit changeImportance', () => { + it('should call onClose, onChange and onAccept when picking a shortcut without explicit changeImportance', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -49,7 +49,9 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - userEvent.mousePress(shortcut); + await act(async () => { + userEvent.mousePress(shortcut); + }); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); @@ -58,7 +60,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onChange when picking a shortcut with changeImportance="accept"', () => { + it('should call onClose and onChange when picking a shortcut with changeImportance="accept"', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -87,7 +89,9 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - userEvent.mousePress(shortcut); + await act(async () => { + userEvent.mousePress(shortcut); + }); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); @@ -96,7 +100,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onChange when picking a shortcut with changeImportance="set"', () => { + it('should call onClose and onChange when picking a shortcut with changeImportance="set"', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -125,7 +129,9 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - userEvent.mousePress(shortcut); + await act(async () => { + userEvent.mousePress(shortcut); + }); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); From c14d7f7e447f6caa7b4826e1403438492bef326e Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 20 Aug 2024 14:15:46 +0300 Subject: [PATCH 28/96] Fix lock file --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5ba5a2044431..049d14be08a3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13377,7 +13377,7 @@ snapshots: dependencies: '@typescript-eslint/types': 5.62.0 '@typescript-eslint/visitor-keys': 5.62.0 - debug: 4.3.5(supports-color@8.1.1) + debug: 4.3.6(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.3 From 6ccf1b8cd6d19d5533450aff77a0e97b110989b6 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 13:34:06 +0200 Subject: [PATCH 29/96] get rid of waitFor --- .../src/tests/rowSelection.DataGrid.test.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 0c403898dd5b..b7163c5c69e0 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -529,7 +529,7 @@ describe(' - Row selection', () => { describe('ripple', () => { clock.withFakeTimers(); - it('should keep only one ripple visible when navigating between checkboxes', function test() { + it('should keep only one ripple visible when navigating between checkboxes', async function test() { if (isJSDOM) { // JSDOM doesn't fire "blur" when .focus is called in another element // FIXME Firefox doesn't show any ripple @@ -540,10 +540,10 @@ describe(' - Row selection', () => { fireUserEvent.mousePress(cell); fireEvent.keyDown(cell, { key: 'ArrowLeft' }); fireEvent.keyDown(getCell(1, 0).querySelector('input')!, { key: 'ArrowUp' }); - clock.runToLast(); // Wait for transition - waitFor(() => - expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1), - ); + await act(async () => { + clock.runToLast(); // Wait for transition + }); + expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1); }); }); }); From 683a4d7af530ad14133d321d5439e681cbee3470 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 14:35:58 +0200 Subject: [PATCH 30/96] update lockfile --- pnpm-lock.yaml | 109 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 84 insertions(+), 25 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 41af3f760f02..cfa0fe4247fa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -748,6 +748,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -1098,6 +1101,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1157,6 +1163,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1204,6 +1213,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1293,6 +1305,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1401,6 +1416,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1420,6 +1438,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/material': + specifier: ^5.15.14 || ^6 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -2932,8 +2953,8 @@ packages: '@types/react': optional: true - '@mui/core-downloads-tracker@5.16.5': - resolution: {integrity: sha512-ziFn1oPm6VjvHQcdGcAO+fXvOQEgieIj0BuSqcltFU+JXIxjPdVYNTdn2HU7/Ak5Gabk6k2u7+9PV7oZ6JT5sA==} + '@mui/core-downloads-tracker@5.16.7': + resolution: {integrity: sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==} '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': resolution: {integrity: sha512-doh3M3U7HUGSBIWGe1yvesSbfDguMRjP0N09ogWSBM2hovXAlgULhMgcRTepAZLLwfRxFII0bCohq6B9NqoKuw==} @@ -3034,6 +3055,23 @@ packages: '@types/react': optional: true + '@mui/material@5.16.7': + resolution: {integrity: sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@emotion/react': ^11.5.0 + '@emotion/styled': ^11.3.0 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@emotion/react': + optional: true + '@emotion/styled': + optional: true + '@types/react': + optional: true + '@mui/material@6.0.0-beta.6': resolution: {integrity: sha512-1wLFBXsoq8yGBRNDzqsQPYMEvtDel7MhUWAZtPCbsTSiYTJ2dPmf1byk/pEmX1y/3cVBHVdEgF9joXfTlnqc4g==} engines: {node: '>=14.0.0'} @@ -3059,8 +3097,8 @@ packages: version: 6.0.0-beta.5 engines: {pnpm: 9.6.0} - '@mui/private-theming@5.16.5': - resolution: {integrity: sha512-CSLg0YkpDqg0aXOxtjo3oTMd3XWMxvNb5d0v4AYVqwOltU8q6GvnZjhWyCLjGSCrcgfwm6/VDjaKLPlR14wxIA==} + '@mui/private-theming@5.16.6': + resolution: {integrity: sha512-rAk+Rh8Clg7Cd7shZhyt2HGTTE5wYKNSJ5sspf28Fqm/PZ69Er9o6KX25g03/FG2dfpg5GCwZh/xOojiTfm3hw==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -3079,8 +3117,8 @@ packages: '@types/react': optional: true - '@mui/styled-engine@5.16.4': - resolution: {integrity: sha512-0+mnkf+UiAmTVB8PZFqOhqf729Yh0Cxq29/5cA3VAyDVTRIUUQ8FXQhiAhUIbijFmM72rY80ahFPXIm4WDbzcA==} + '@mui/styled-engine@5.16.6': + resolution: {integrity: sha512-zaThmS67ZmtHSWToTiHslbI8jwrmITcN93LQaR2lKArbvS7Z3iLkwRoiikNWutx9MBs8Q6okKvbZq1RQYB3v7g==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.4.1 @@ -3115,8 +3153,8 @@ packages: '@types/react': optional: true - '@mui/system@5.16.5': - resolution: {integrity: sha512-uzIUGdrWddUx1HPxW4+B2o4vpgKyRxGe/8BxbfXVDPNPHX75c782TseoCnR/VyfnZJfqX87GcxDmnZEE1c031g==} + '@mui/system@5.16.7': + resolution: {integrity: sha512-Jncvs/r/d/itkxh7O7opOunTqbbSSzMTHzZkNLM+FjAOg+cYAZHrPDlYe1ZGKUYORwwb2XexlWnpZp0kZ4AHuA==} engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 @@ -3155,8 +3193,8 @@ packages: '@types/react': optional: true - '@mui/utils@5.16.5': - resolution: {integrity: sha512-CwhcA9y44XwK7k2joL3Y29mRUnoBt+gOZZdGyw7YihbEwEErJYBtDwbZwVgH68zAljGe/b+Kd5bzfl63Gi3R2A==} + '@mui/utils@5.16.6': + resolution: {integrity: sha512-tWiQqlhxAt3KENNiSRL+DIn9H5xNVK6Jjf70x3PnfQPz1MPBdh7yyIcAyVBT9xiw7hP3SomRhPR7hzBMBCjqEA==} engines: {node: '>=12.0.0'} peerDependencies: '@types/react': ^17.0.0 || ^18.0.0 @@ -11822,7 +11860,7 @@ snapshots: '@babel/runtime': 7.25.0 '@floating-ui/react-dom': 2.0.8(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) '@popperjs/core': 2.11.8 clsx: 2.1.1 prop-types: 15.8.1 @@ -11831,7 +11869,7 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/core-downloads-tracker@5.16.5': {} + '@mui/core-downloads-tracker@5.16.7': {} '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': {} @@ -11926,10 +11964,10 @@ snapshots: dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/core-downloads-tracker': 5.16.5 - '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/core-downloads-tracker': 5.16.7 + '@mui/system': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 @@ -11944,9 +11982,9 @@ snapshots: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': 5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 prop-types: 15.8.1 react: 18.3.1 @@ -11967,6 +12005,27 @@ snapshots: '@emotion/server': 11.11.0 '@types/react': 18.3.3 + '@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.0 + '@mui/core-downloads-tracker': 5.16.7 + '@mui/system': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/types': 7.2.15(@types/react@18.3.3) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) + '@popperjs/core': 2.11.8 + '@types/react-transition-group': 4.4.11 + clsx: 2.1.1 + csstype: 3.1.3 + prop-types: 15.8.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-is: 18.3.1 + react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + optionalDependencies: + '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@types/react': 18.3.3 + '@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 @@ -12002,10 +12061,10 @@ snapshots: - supports-color - utf-8-validate - '@mui/private-theming@5.16.5(@types/react@18.3.3)(react@18.3.1)': + '@mui/private-theming@5.16.6(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) prop-types: 15.8.1 react: 18.3.1 optionalDependencies: @@ -12020,7 +12079,7 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/styled-engine@5.16.4(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': + '@mui/styled-engine@5.16.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@emotion/cache': 11.13.1 @@ -12065,13 +12124,13 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/system@5.16.5(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + '@mui/system@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/private-theming': 5.16.5(@types/react@18.3.3)(react@18.3.1) - '@mui/styled-engine': 5.16.4(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) + '@mui/private-theming': 5.16.6(@types/react@18.3.3)(react@18.3.1) + '@mui/styled-engine': 5.16.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.5(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) clsx: 2.1.1 csstype: 3.1.3 prop-types: 15.8.1 @@ -12101,7 +12160,7 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/utils@5.16.5(@types/react@18.3.3)(react@18.3.1)': + '@mui/utils@5.16.6(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/types': 7.2.15(@types/react@18.3.3) From 511a9b471b1cdce609b395fcfa3a0137c7a1347c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 14:46:48 +0200 Subject: [PATCH 31/96] fix merge --- packages/x-tree-view-pro/package.json | 1 + pnpm-lock.yaml | 44 ++------------------------- 2 files changed, 4 insertions(+), 41 deletions(-) diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 0143503fd735..15164dd5e3bc 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -71,6 +71,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", + "@mui/material": "next", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cfa0fe4247fa..fe6aaa232150 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1438,9 +1438,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 || ^6 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^6.0.0-beta.5 version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1478,6 +1475,9 @@ importers: '@mui/internal-test-utils': specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': + specifier: next + version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -3055,23 +3055,6 @@ packages: '@types/react': optional: true - '@mui/material@5.16.7': - resolution: {integrity: sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==} - engines: {node: '>=12.0.0'} - peerDependencies: - '@emotion/react': ^11.5.0 - '@emotion/styled': ^11.3.0 - '@types/react': ^17.0.0 || ^18.0.0 - react: ^17.0.0 || ^18.0.0 - react-dom: ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - '@emotion/react': - optional: true - '@emotion/styled': - optional: true - '@types/react': - optional: true - '@mui/material@6.0.0-beta.6': resolution: {integrity: sha512-1wLFBXsoq8yGBRNDzqsQPYMEvtDel7MhUWAZtPCbsTSiYTJ2dPmf1byk/pEmX1y/3cVBHVdEgF9joXfTlnqc4g==} engines: {node: '>=14.0.0'} @@ -12005,27 +11988,6 @@ snapshots: '@emotion/server': 11.11.0 '@types/react': 18.3.3 - '@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/core-downloads-tracker': 5.16.7 - '@mui/system': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) - '@popperjs/core': 2.11.8 - '@types/react-transition-group': 4.4.11 - clsx: 2.1.1 - csstype: 3.1.3 - prop-types: 15.8.1 - react: 18.3.1 - react-dom: 18.3.1(react@18.3.1) - react-is: 18.3.1 - react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - optionalDependencies: - '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@types/react': 18.3.3 - '@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 From 69412ebff17719e04ab58c8eb82fba265c26fa54 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 15:12:02 +0200 Subject: [PATCH 32/96] temp: Revert "Propagate `slots` and `slotProps` to fields" This reverts commit 9c9bece12f6866cf5fd7731d8bf2fc3e01cb38f6. --- packages/x-date-pickers/src/hooks/useClearableField.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/x-date-pickers/src/hooks/useClearableField.tsx b/packages/x-date-pickers/src/hooks/useClearableField.tsx index 5c2832fcf506..52e3838e15b3 100644 --- a/packages/x-date-pickers/src/hooks/useClearableField.tsx +++ b/packages/x-date-pickers/src/hooks/useClearableField.tsx @@ -76,8 +76,6 @@ export const useClearableField = ( return { ...other, - slots, - slotProps, InputProps: { ...InputProps, endAdornment: ( From bf0c1be3e21dbc0aeeff79a4bbe319dc8e60b1ab Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 15:39:04 +0200 Subject: [PATCH 33/96] fix ts issues --- .../describes.DesktopDateRangePicker.test.tsx | 26 ++++++++----------- ...cribes.DesktopDateTimeRangePicker.test.tsx | 10 +++---- .../describes.MobileDateRangePicker.test.tsx | 4 +-- ...scribes.MobileDateTimeRangePicker.test.tsx | 14 +++++----- .../tests/describes.DateCalendar.test.tsx | 4 +-- .../describes.DesktopDatePicker.test.tsx | 4 +-- .../describes.DesktopDateTimePicker.test.tsx | 10 +++---- .../describes.DesktopTimePicker.test.tsx | 8 +++--- .../tests/describes.MobileDatePicker.test.tsx | 4 +-- .../describes.MobileDateTimePicker.test.tsx | 8 +++--- .../tests/describes.MobileTimePicker.test.tsx | 6 ++--- .../tests/describes.MonthCalendar.test.tsx | 4 +-- .../tests/describes.YearCalendar.test.tsx | 4 +-- 13 files changed, 51 insertions(+), 55 deletions(-) diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index 9957e6c8f189..572d3693b397 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { act, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { adapterToUse, createPickerRenderer, @@ -87,13 +87,11 @@ describe(' - Describes', () => { } if (isOpened) { - await act(async () => { - fireUserEvent.mousePress( - screen.getAllByRole('gridcell', { - name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), - })[0], - ); - }); + await fireUserEvent.mousePress( + screen.getAllByRole('gridcell', { + name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), + })[0], + ); } else { selectSection('day'); pressKey(undefined, 'ArrowUp'); @@ -151,13 +149,11 @@ describe(' - Describes', () => { } if (isOpened) { - await act(async () => { - fireUserEvent.mousePress( - screen.getAllByRole('gridcell', { - name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), - })[0], - ); - }); + await fireUserEvent.mousePress( + screen.getAllByRole('gridcell', { + name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), + })[0], + ); } else { selectSection('day'); pressKey(undefined, 'ArrowUp'); diff --git a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx index bd7c125ec4b4..e6267779e8b1 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx @@ -83,7 +83,7 @@ describe(' - Describes', () => { : expectedPlaceholder; expectFieldValueV7(endSectionsContainer, expectedEndValueStr); }, - setNewValue: ( + setNewValue: async ( value, { isOpened, applySameValue, setEndDate = false, selectSection, pressKey }, ) => { @@ -102,7 +102,7 @@ describe(' - Describes', () => { ]; } if (isOpened) { - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), }), @@ -113,10 +113,10 @@ describe(' - Describes', () => { hasMeridiem ? 'hours12h' : 'hours24h', ); const hoursNumber = adapterToUse.getHours(newValue[setEndDate ? 1 : 0]); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue[setEndDate ? 1 : 0])} minutes`, }), @@ -124,7 +124,7 @@ describe(' - Describes', () => { if (hasMeridiem) { // meridiem is an extra view on `DesktopDateTimeRangePicker` // we need to click it to finish selection - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index 7503ccadc73e..a975cb601e72 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -73,7 +73,7 @@ describe(' - Describes', () => { : 'MM/DD/YYYY'; expectFieldValueV7(endFieldRoot, expectedEndValueStr); }, - setNewValue: (value, { isOpened, applySameValue, setEndDate = false }) => { + setNewValue: async (value, { isOpened, applySameValue, setEndDate = false }) => { let newValue: any[]; if (applySameValue) { newValue = value; @@ -87,7 +87,7 @@ describe(' - Describes', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); } - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], diff --git a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx index 1422ba7bb233..b10ed2e9b90e 100644 --- a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx @@ -84,7 +84,7 @@ describe(' - Describes', () => { : expectedPlaceholder; expectFieldValueV7(endSectionsContainer, expectedEndValueStr); }, - setNewValue: (value, { isOpened, applySameValue, setEndDate = false }) => { + setNewValue: async (value, { isOpened, applySameValue, setEndDate = false }) => { if (!isOpened) { openPicker({ type: 'date-time-range', @@ -109,12 +109,12 @@ describe(' - Describes', () => { // if we want to set the end date, we firstly need to switch to end date "range position" if (setEndDate) { - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('button', { name: adapterToUse.format(value[1], 'shortDate') }), ); } - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), }), @@ -125,10 +125,10 @@ describe(' - Describes', () => { hasMeridiem ? 'hours12h' : 'hours24h', ); const hoursNumber = adapterToUse.getHours(newValue[setEndDate ? 1 : 0]); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue[setEndDate ? 1 : 0])} minutes`, }), @@ -136,7 +136,7 @@ describe(' - Describes', () => { if (hasMeridiem) { // meridiem is an extra view on `MobileDateTimeRangePicker` // we need to click it to finish selection - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } @@ -147,7 +147,7 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the start date view in case we'd like to repeat the selection process - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('button', { name: adapterToUse.format(newValue[0], 'shortDate') }), ); } diff --git a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx index d3ab8212f0d7..8f99389d4ca1 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx @@ -46,9 +46,9 @@ describe(' - Describes', () => { expect(selectedCells[0]).to.have.text(adapterToUse.getDate(expectedValue).toString()); } }, - setNewValue: (value) => { + setNewValue: async (value) => { const newValue = adapterToUse.addDays(value, 1); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx index 782794ba18eb..a1cdc430ad17 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx @@ -59,11 +59,11 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { isOpened, applySameValue, selectSection, pressKey }) => { + setNewValue: async (value, { isOpened, applySameValue, selectSection, pressKey }) => { const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); if (isOpened) { - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); } else { diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx index dc66bec63c58..450fb5709bb8 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx @@ -79,28 +79,28 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { isOpened, applySameValue, selectSection, pressKey }) => { + setNewValue: async (value, { isOpened, applySameValue, selectSection, pressKey }) => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); if (isOpened) { - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h'); const hoursNumber = adapterToUse.getHours(newValue); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }), ); if (hasMeridiem) { // meridiem is an extra view on `DesktopDateTimePicker` // we need to click it to finish selection - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx index 2fe4730f6fd1..827aabd8f933 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx @@ -68,7 +68,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { isOpened, applySameValue, selectSection, pressKey }) => { + setNewValue: async (value, { isOpened, applySameValue, selectSection, pressKey }) => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(value, 1), 5); @@ -77,16 +77,16 @@ describe(' - Describes', () => { const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h'); const hoursNumber = adapterToUse.getHours(newValue); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }), ); if (hasMeridiem) { // meridiem is an extra view on `DesktopTimePicker` // we need to click it to finish selection - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } diff --git a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx index b988c49e5827..8a10da9e3b6f 100644 --- a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx @@ -59,13 +59,13 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { isOpened, applySameValue }) => { + setNewValue: async (value, { isOpened, applySameValue }) => { if (!isOpened) { openPicker({ type: 'date', variant: 'mobile' }); } const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); diff --git a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx index 7db743bb1c2e..d3d736ed1842 100644 --- a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx @@ -71,7 +71,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { isOpened, applySameValue }) => { + setNewValue: async (value, { isOpened, applySameValue }) => { if (!isOpened) { openPicker({ type: 'date-time', variant: 'mobile' }); } @@ -79,7 +79,7 @@ describe(' - Describes', () => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); @@ -98,7 +98,7 @@ describe(' - Describes', () => { if (hasMeridiem) { const newHours = adapterToUse.getHours(newValue); // select appropriate meridiem - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }), ); } @@ -110,7 +110,7 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the date view in case we'd like to repeat the selection process - fireUserEvent.mousePress(screen.getByRole('tab', { name: 'pick date' })); + await fireUserEvent.mousePress(screen.getByRole('tab', { name: 'pick date' })); } return newValue; diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx index 8a694129a784..b5a9912e2823 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx @@ -69,7 +69,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { isOpened, applySameValue }) => { + setNewValue: async (value, { isOpened, applySameValue }) => { if (!isOpened) { openPicker({ type: 'time', variant: 'mobile' }); } @@ -93,7 +93,7 @@ describe(' - Describes', () => { if (hasMeridiem) { const newHours = adapterToUse.getHours(newValue); // select appropriate meridiem - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }), ); } @@ -105,7 +105,7 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the hours view in case we'd like to repeat the selection process - fireUserEvent.mousePress(screen.getByRole('button', { name: 'Open previous view' })); + await fireUserEvent.mousePress(screen.getByRole('button', { name: 'Open previous view' })); } return newValue; diff --git a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx index ef370265decd..9561befeab48 100644 --- a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx +++ b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx @@ -52,10 +52,10 @@ describe(' - Describes', () => { expect(activeMonth).to.have.attribute('aria-checked', 'true'); } }, - setNewValue: (value) => { + setNewValue: async (value) => { const newValue = adapterToUse.addMonths(value, 1); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('radio', { name: adapterToUse.format(newValue, 'month') }), ); diff --git a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx index 87eeb7fee9f4..8b429972f08b 100644 --- a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx +++ b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx @@ -50,9 +50,9 @@ describe(' - Describes', () => { expect(activeYear).to.have.attribute('aria-checked', 'true'); } }, - setNewValue: (value) => { + setNewValue: async (value) => { const newValue = adapterToUse.addYears(value, 1); - fireUserEvent.mousePress( + await fireUserEvent.mousePress( screen.getByRole('radio', { name: adapterToUse.getYear(newValue).toString() }), ); From fbbcd5562489b0d3e79ac80bfeb747c856d3b775 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 17:40:42 +0200 Subject: [PATCH 34/96] fix errors in jsdom tests --- .../describes.DesktopDateRangePicker.test.tsx | 10 +++++++--- ...describes.DesktopDateTimeRangePicker.test.tsx | 12 +++++++----- .../describes.MobileDateRangePicker.test.tsx | 6 ++++-- .../describes.MobileDateTimeRangePicker.test.tsx | 16 +++++++++------- .../tests/describes.DateCalendar.test.tsx | 6 ++++-- .../DateField/tests/describes.DateField.test.tsx | 2 +- .../tests/describes.DesktopDatePicker.test.tsx | 6 ++++-- .../describes.DesktopDateTimePicker.test.tsx | 12 +++++++----- .../tests/describes.DesktopTimePicker.test.tsx | 10 ++++++---- .../tests/describes.MobileDatePicker.test.tsx | 6 ++++-- .../describes.MobileDateTimePicker.test.tsx | 15 +++++++++++---- .../tests/describes.MobileTimePicker.test.tsx | 13 ++++++++++--- .../tests/describes.MonthCalendar.test.tsx | 6 ++++-- .../tests/MultiSectionDigitalClock.test.tsx | 8 ++++---- .../PickersActionBar/PickersActionBar.test.tsx | 14 +++++++++----- .../tests/describes.YearCalendar.test.tsx | 6 ++++-- test/utils/pickers/viewHandlers.ts | 8 +++++--- 17 files changed, 100 insertions(+), 56 deletions(-) diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index 572d3693b397..8144c4aec39e 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { adapterToUse, createPickerRenderer, @@ -87,7 +87,7 @@ describe(' - Describes', () => { } if (isOpened) { - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], @@ -97,6 +97,8 @@ describe(' - Describes', () => { pressKey(undefined, 'ArrowUp'); } + await flushMicrotasks(); + return newValue; }, })); @@ -149,7 +151,7 @@ describe(' - Describes', () => { } if (isOpened) { - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], @@ -159,6 +161,8 @@ describe(' - Describes', () => { pressKey(undefined, 'ArrowUp'); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx index e6267779e8b1..cc93bbbdf80a 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, screen } from '@mui/internal-test-utils'; +import { describeConformance, flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -102,7 +102,7 @@ describe(' - Describes', () => { ]; } if (isOpened) { - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), }), @@ -113,10 +113,10 @@ describe(' - Describes', () => { hasMeridiem ? 'hours12h' : 'hours24h', ); const hoursNumber = adapterToUse.getHours(newValue[setEndDate ? 1 : 0]); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue[setEndDate ? 1 : 0])} minutes`, }), @@ -124,7 +124,7 @@ describe(' - Describes', () => { if (hasMeridiem) { // meridiem is an extra view on `DesktopDateTimeRangePicker` // we need to click it to finish selection - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } @@ -150,6 +150,8 @@ describe(' - Describes', () => { } } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index a975cb601e72..a30bee88f692 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, fireDiscreteEvent } from '@mui/internal-test-utils'; +import { screen, fireDiscreteEvent, flushMicrotasks } from '@mui/internal-test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { adapterToUse, @@ -87,7 +87,7 @@ describe(' - Describes', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); } - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], @@ -99,6 +99,8 @@ describe(' - Describes', () => { clock.runToLast(); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx index b10ed2e9b90e..ea80010cf2ca 100644 --- a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, fireEvent, screen } from '@mui/internal-test-utils'; +import { describeConformance, fireEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -109,12 +109,12 @@ describe(' - Describes', () => { // if we want to set the end date, we firstly need to switch to end date "range position" if (setEndDate) { - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('button', { name: adapterToUse.format(value[1], 'shortDate') }), ); } - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), }), @@ -125,10 +125,10 @@ describe(' - Describes', () => { hasMeridiem ? 'hours12h' : 'hours24h', ); const hoursNumber = adapterToUse.getHours(newValue[setEndDate ? 1 : 0]); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue[setEndDate ? 1 : 0])} minutes`, }), @@ -136,7 +136,7 @@ describe(' - Describes', () => { if (hasMeridiem) { // meridiem is an extra view on `MobileDateTimeRangePicker` // we need to click it to finish selection - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } @@ -147,11 +147,13 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the start date view in case we'd like to repeat the selection process - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('button', { name: adapterToUse.format(newValue[0], 'shortDate') }), ); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx index 8f99389d4ca1..dd9dcde2c02e 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { DateCalendar, dateCalendarClasses as classes } from '@mui/x-date-pickers/DateCalendar'; import { pickersDayClasses } from '@mui/x-date-pickers/PickersDay'; import { @@ -48,10 +48,12 @@ describe(' - Describes', () => { }, setNewValue: async (value) => { const newValue = adapterToUse.addDays(value, 1); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx index 9ac060d09021..524e089dd63f 100644 --- a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx +++ b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx @@ -45,7 +45,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: (value, { selectSection, pressKey }) => { + setNewValue: async (value, { selectSection, pressKey }) => { const newValue = adapterToUse.addDays(value, 1); selectSection('day'); pressKey(undefined, 'ArrowUp'); diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx index a1cdc430ad17..f259e0941ac8 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -63,7 +63,7 @@ describe(' - Describes', () => { const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); if (isOpened) { - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); } else { @@ -71,6 +71,8 @@ describe(' - Describes', () => { pressKey(undefined, 'ArrowUp'); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx index 450fb5709bb8..b13ea63b2e39 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx @@ -1,4 +1,4 @@ -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -85,22 +85,22 @@ describe(' - Describes', () => { : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); if (isOpened) { - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h'); const hoursNumber = adapterToUse.getHours(newValue); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }), ); if (hasMeridiem) { // meridiem is an extra view on `DesktopDateTimePicker` // we need to click it to finish selection - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } @@ -126,6 +126,8 @@ describe(' - Describes', () => { } } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx index 827aabd8f933..e874d873f2ff 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -77,16 +77,16 @@ describe(' - Describes', () => { const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h'); const hoursNumber = adapterToUse.getHours(newValue); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), ); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }), ); if (hasMeridiem) { // meridiem is an extra view on `DesktopTimePicker` // we need to click it to finish selection - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), ); } @@ -109,6 +109,8 @@ describe(' - Describes', () => { } } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx index 8a10da9e3b6f..8e719af47d3f 100644 --- a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, fireEvent } from '@mui/internal-test-utils'; +import { screen, fireEvent, flushMicrotasks } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -65,7 +65,7 @@ describe(' - Describes', () => { } const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); @@ -76,6 +76,8 @@ describe(' - Describes', () => { clock.runToLast(); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx index d3d736ed1842..811c272e1c41 100644 --- a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx @@ -1,5 +1,10 @@ import * as React from 'react'; -import { screen, fireEvent, fireTouchChangedEvent } from '@mui/internal-test-utils'; +import { + screen, + fireEvent, + fireTouchChangedEvent, + flushMicrotasks, +} from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -79,7 +84,7 @@ describe(' - Describes', () => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); @@ -98,7 +103,7 @@ describe(' - Describes', () => { if (hasMeridiem) { const newHours = adapterToUse.getHours(newValue); // select appropriate meridiem - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }), ); } @@ -110,9 +115,11 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the date view in case we'd like to repeat the selection process - await fireUserEvent.mousePress(screen.getByRole('tab', { name: 'pick date' })); + fireUserEvent.mousePress(screen.getByRole('tab', { name: 'pick date' })); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx index b5a9912e2823..5ad3a9a0168d 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx @@ -1,5 +1,10 @@ import * as React from 'react'; -import { screen, fireEvent, fireTouchChangedEvent } from '@mui/internal-test-utils'; +import { + screen, + fireEvent, + fireTouchChangedEvent, + flushMicrotasks, +} from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -93,7 +98,7 @@ describe(' - Describes', () => { if (hasMeridiem) { const newHours = adapterToUse.getHours(newValue); // select appropriate meridiem - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }), ); } @@ -105,9 +110,11 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the hours view in case we'd like to repeat the selection process - await fireUserEvent.mousePress(screen.getByRole('button', { name: 'Open previous view' })); + fireUserEvent.mousePress(screen.getByRole('button', { name: 'Open previous view' })); } + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx index 9561befeab48..4446646d47b9 100644 --- a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx +++ b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -55,10 +55,12 @@ describe(' - Describes', () => { setNewValue: async (value) => { const newValue = adapterToUse.addMonths(value, 1); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('radio', { name: adapterToUse.format(newValue, 'month') }), ); + await flushMicrotasks(); + return newValue; }, })); diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx index 6229a42f0e22..ac548cd2453d 100644 --- a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx +++ b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx @@ -52,7 +52,7 @@ describe('', () => { expect(screen.getByRole('option', { name: '0 minutes' })).to.have.attribute('tabindex', '0'); }); - it('should not use `referenceDate` when a value is defined', () => { + it('should not use `referenceDate` when a value is defined', async () => { const onChange = spy(); function ControlledMultiSectionDigitalClock(props: MultiSectionDigitalClockProps) { @@ -78,7 +78,7 @@ describe('', () => { />, ); - multiSectionDigitalClockHandler.setViewValue( + await multiSectionDigitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -86,7 +86,7 @@ describe('', () => { expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 1, 15, 30)); }); - it('should not use `referenceDate` when a defaultValue is defined', () => { + it('should not use `referenceDate` when a defaultValue is defined', async () => { const onChange = spy(); render( @@ -97,7 +97,7 @@ describe('', () => { />, ); - multiSectionDigitalClockHandler.setViewValue( + await multiSectionDigitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); diff --git a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx index 465baad26cee..e5971e9f4fca 100644 --- a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx +++ b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { PickersActionBar } from '@mui/x-date-pickers/PickersActionBar'; import { createPickerRenderer } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -29,7 +29,7 @@ describe('', () => { expect(screen.queryByRole('button')).to.equal(null); }); - it('should render button for "clear" action calling the associated callback', () => { + it('should render button for "clear" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -46,10 +46,11 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/clear/i)); + await flushMicrotasks(); expect(onClear.callCount).to.equal(1); }); - it('should render button for "cancel" action calling the associated callback', () => { + it('should render button for "cancel" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -66,10 +67,11 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/cancel/i)); + await flushMicrotasks(); expect(onCancel.callCount).to.equal(1); }); - it('should render button for "accept" action calling the associated callback', () => { + it('should render button for "accept" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -86,10 +88,11 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/ok/i)); + await flushMicrotasks(); expect(onAccept.callCount).to.equal(1); }); - it('should render button for "today" action calling the associated callback', () => { + it('should render button for "today" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -106,6 +109,7 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/today/i)); + await flushMicrotasks(); expect(onSetToday.callCount).to.equal(1); }); diff --git a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx index 8b429972f08b..0b66c6a028fa 100644 --- a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx +++ b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { YearCalendar, yearCalendarClasses as classes } from '@mui/x-date-pickers/YearCalendar'; import { createPickerRenderer, @@ -52,10 +52,12 @@ describe(' - Describes', () => { }, setNewValue: async (value) => { const newValue = adapterToUse.addYears(value, 1); - await fireUserEvent.mousePress( + fireUserEvent.mousePress( screen.getByRole('radio', { name: adapterToUse.getYear(newValue).toString() }), ); + await flushMicrotasks(); + return newValue; }, })); diff --git a/test/utils/pickers/viewHandlers.ts b/test/utils/pickers/viewHandlers.ts index 2b3ab36c387f..27038ba5d6a1 100644 --- a/test/utils/pickers/viewHandlers.ts +++ b/test/utils/pickers/viewHandlers.ts @@ -1,4 +1,4 @@ -import { fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; +import { fireTouchChangedEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; import { getClockTouchEvent, formatFullTimeValue } from 'test/utils/pickers'; import { MuiPickersAdapter, TimeView } from '@mui/x-date-pickers/models'; import { formatMeridiem } from '@mui/x-date-pickers/internals'; @@ -35,15 +35,16 @@ export const timeClockHandler: ViewHandler = { }; export const digitalClockHandler: ViewHandler = { - setViewValue: (adapter, value) => { + setViewValue: async (adapter, value) => { fireUserEvent.mousePress( screen.getByRole('option', { name: formatFullTimeValue(adapter, value) }), ); + await flushMicrotasks(); }, }; export const multiSectionDigitalClockHandler: ViewHandler = { - setViewValue: (adapter, value) => { + setViewValue: async (adapter, value) => { const hasMeridiem = adapter.is12HourCycleInCurrentLocale(); const hoursLabel = parseInt(adapter.format(value, hasMeridiem ? 'hours12h' : 'hours24h'), 10); const minutesLabel = adapter.getMinutes(value).toString(); @@ -56,5 +57,6 @@ export const multiSectionDigitalClockHandler: ViewHandler = { }), ); } + await flushMicrotasks(); }, }; From 99339196510392910480da9e4df48b2521ab6d7c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 18:07:14 +0200 Subject: [PATCH 35/96] fix errors in jsdom tests --- .../tests/DesktopDateTimeRangePicker.test.tsx | 6 ++- .../tests/MobileDateRangePicker.test.tsx | 43 ++++++++++--------- .../DateCalendar/tests/DateCalendar.test.tsx | 23 ++++++---- .../tests/timezone.DateCalendar.test.tsx | 11 +++-- .../tests/DesktopDatePicker.test.tsx | 38 ++++++++++------ .../tests/DesktopDateTimePicker.test.tsx | 17 +++++--- .../tests/DesktopTimePicker.test.tsx | 14 +++--- .../tests/timezone.DigitalClock.test.tsx | 11 +++-- 8 files changed, 101 insertions(+), 62 deletions(-) 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 index e866a5140081..302dccd8243d 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -18,7 +18,7 @@ describe('', () => { }); describe('value selection', () => { - it('should allow to select range within the same day', () => { + it('should allow to select range within the same day', async () => { render(); openPicker({ type: 'date-time-range', variant: 'desktop', initialFocus: 'start' }); @@ -39,6 +39,8 @@ describe('', () => { const endSectionsContainer = getFieldSectionsContainer(1); expect(expectFieldValueV7(startSectionsContainer, '01/11/2018 04:05 PM')); expect(expectFieldValueV7(endSectionsContainer, '01/11/2018 05:10 PM')); + + await flushMicrotasks(); }); }); diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx index 6595e0c1ceea..b44d018230f5 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen, fireEvent, act } from '@mui/internal-test-utils'; +import { screen, fireEvent, flushMicrotasks } from '@mui/internal-test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { createPickerRenderer, @@ -37,7 +37,7 @@ describe('', () => { }); describe('picker state', () => { - it('should open when focusing the start input', () => { + it('should open when focusing the start input', async () => { const onOpen = spy(); render(); @@ -46,9 +46,10 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); + await flushMicrotasks(); }); - it('should open when focusing the end input', () => { + it('should open when focusing the end input', async () => { const onOpen = spy(); render(); @@ -57,6 +58,7 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); + await flushMicrotasks(); }); it('should call onChange with updated start date then call onChange with updated end date when opening from start input', async () => { @@ -84,27 +86,24 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await act(async () => { - // Change the start date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); - }); + // Change the start date + fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); - await act(async () => { - // Change the end date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '5' })); - }); + // Change the end date + fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '5' })); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); + await flushMicrotasks(); }); - it('should call onChange with updated end date when opening from end input', () => { + it('should call onChange with updated end date when opening from end input', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -136,9 +135,10 @@ describe('', () => { expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); + await flushMicrotasks(); }); - it('should call onClose and onAccept when selecting the end date if props.closeOnSelect = true', () => { + it('should call onClose and onAccept when selecting the end date if props.closeOnSelect = true', async () => { const onAccept = spy(); const onClose = spy(); const defaultValue: DateRange = [ @@ -165,9 +165,10 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should call onClose and onChange with the initial value when clicking "Cancel" button', () => { + it('should call onClose and onChange with the initial value when clicking "Cancel" button', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -199,9 +200,10 @@ describe('', () => { expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should call onClose and onAccept with the live value and onAccept with the live value when clicking the "OK"', () => { + it('should call onClose and onAccept with the live value and onAccept with the live value when clicking the "OK"', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -232,9 +234,10 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', () => { + it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -263,6 +266,7 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).to.deep.equal([null, null]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { @@ -283,13 +287,12 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); - await act(async () => { - // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); - }); + // Clear the date + fireUserEvent.mousePress(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should correctly set focused styles when input is focused', () => { diff --git a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx index 8cfd7af3ad1e..5f524503edde 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { fireEvent, screen } from '@mui/internal-test-utils'; +import { fireEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; import { DateCalendar } from '@mui/x-date-pickers/DateCalendar'; import { PickersDay } from '@mui/x-date-pickers/PickersDay'; import { createPickerRenderer, adapterToUse } from 'test/utils/pickers'; @@ -132,7 +132,7 @@ describe('', () => { }); // test: https://github.com/mui/mui-x/issues/12373 - it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', () => { + it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', async () => { const onChange = spy(); const defaultDate = adapterToUse.date('2019-01-02T11:12:13.550Z'); render(); @@ -153,6 +153,7 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('radio', { name: '2019' })); expect(onChange.lastCall.firstArg).toEqualDateTime(defaultDate); + await flushMicrotasks(); }); describe('Slot: calendarHeader', () => { @@ -182,7 +183,7 @@ describe('', () => { ).to.have.text('1'); }); - it('should use `referenceDate` when no value defined', () => { + it('should use `referenceDate` when no value defined', async () => { const onChange = spy(); render( @@ -199,9 +200,10 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 3, 2, 12, 30)); + await flushMicrotasks(); }); - it('should not use `referenceDate` when a value is defined', () => { + it('should not use `referenceDate` when a value is defined', async () => { const onChange = spy(); render( @@ -216,9 +218,10 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 2, 12, 20)); + await flushMicrotasks(); }); - it('should not use `referenceDate` when a defaultValue is defined', () => { + it('should not use `referenceDate` when a defaultValue is defined', async () => { const onChange = spy(); render( @@ -233,9 +236,10 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 2, 12, 20)); + await flushMicrotasks(); }); - it('should keep the time of the currently provided date', () => { + it('should keep the time of the currently provided date', async () => { const onChange = spy(); render( @@ -251,6 +255,7 @@ describe('', () => { expect(onChange.lastCall.firstArg).toEqualDateTime( adapterToUse.date('2018-01-02T11:11:11.111'), ); + await flushMicrotasks(); }); it('should complete weeks when showDaysOutsideCurrentMonth=true', () => { @@ -609,7 +614,7 @@ describe('', () => { }); describe('Performance', () => { - it('should only render newly selected day when selecting a day without a previously selected day', () => { + it('should only render newly selected day when selecting a day without a previously selected day', async () => { const RenderCount = spy((props) => ); render( @@ -623,9 +628,10 @@ describe('', () => { const renderCountBeforeChange = RenderCount.callCount; fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day + await flushMicrotasks(); }); - it('should only re-render previously selected day and newly selected day when selecting a day', () => { + it('should only re-render previously selected day and newly selected day when selecting a day', async () => { const RenderCount = spy((props) => ); render( @@ -640,6 +646,7 @@ describe('', () => { const renderCountBeforeChange = RenderCount.callCount; fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(4); // 2 render * 2 days + await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx index 795a3bf042af..71d5b09e35c7 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { describeAdapters } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; import { DateCalendar } from '@mui/x-date-pickers/DateCalendar'; @@ -14,7 +14,7 @@ describe(' - Timezone', () => { return; } - it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', () => { + it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', async () => { const onChange = spy(); render(); @@ -28,11 +28,12 @@ describe(' - Timezone', () => { // In a real world scenario, this should probably never occur. expect(adapter.getTimezone(actualDate)).to.equal(adapter.lib === 'dayjs' ? 'UTC' : 'system'); expect(actualDate).toEqualDateTime(expectedDate); + await flushMicrotasks(); }); TIMEZONE_TO_TEST.forEach((timezone) => { describe(`Timezone: ${timezone}`, () => { - it('should use timezone prop for onChange when no value is provided', () => { + it('should use timezone prop for onChange when no value is provided', async () => { const onChange = spy(); render(); fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '25' })); @@ -45,9 +46,10 @@ describe(' - Timezone', () => { const actualDate = onChange.lastCall.firstArg; expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); + await flushMicrotasks(); }); - it('should use value timezone for onChange when a value is provided', () => { + it('should use value timezone for onChange when a value is provided', async () => { const onChange = spy(); const value = adapter.date('2022-04-25T15:30', timezone); @@ -60,6 +62,7 @@ describe(' - Timezone', () => { const actualDate = onChange.lastCall.firstArg; expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); + await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx index 4078e7548eb3..9f347134a5d4 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { spy } from 'sinon'; import { TransitionProps } from '@mui/material/transitions'; import { inputBaseClasses } from '@mui/material/InputBase'; -import { fireEvent, screen } from '@mui/internal-test-utils'; +import { fireEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker'; import { createPickerRenderer, adapterToUse, openPicker } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -31,7 +31,7 @@ describe('', () => { expect(screen.getByLabelText('year view is open, switch to calendar view')).toBeVisible(); }); - it('should go to the first view when re-opening the picker', () => { + it('should go to the first view when re-opening the picker', async () => { const handleViewChange = spy(); render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(handleViewChange.callCount).to.equal(2); expect(handleViewChange.lastCall.firstArg).to.equal('day'); + await flushMicrotasks(); }); - it('should go to the `openTo` view when re-opening the picker', () => { + it('should go to the `openTo` view when re-opening the picker', async () => { const handleViewChange = spy(); render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(handleViewChange.callCount).to.equal(2); expect(handleViewChange.lastCall.firstArg).to.equal('month'); + await flushMicrotasks(); }); - it('should go to the relevant `view` when `views` prop changes', () => { + it('should go to the relevant `view` when `views` prop changes', async () => { const { setProps } = render( , ); @@ -97,9 +99,10 @@ describe('', () => { // should have changed the open view expect(screen.getByRole('radio', { checked: true, name: 'January' })).not.to.equal(null); + await flushMicrotasks(); }); - it('should move the focus to the newly opened views', function test() { + it('should move the focus to the newly opened views', async function test() { if (isJSDOM) { this.skip(); } @@ -110,9 +113,10 @@ describe('', () => { fireEvent.click(screen.getByText('2020')); expect(document.activeElement).to.have.text('5'); + await flushMicrotasks(); }); - it('should go to the relevant `view` when `view` prop changes', () => { + it('should go to the relevant `view` when `view` prop changes', async () => { const { setProps } = render( ', () => { // should have changed the open view expect(screen.getByRole('radio', { checked: true, name: '2018' })).not.to.equal(null); + await flushMicrotasks(); }); }); @@ -216,7 +221,7 @@ describe('', () => { }); describe('picker state', () => { - it('should open when clicking "Choose date"', () => { + it('should open when clicking "Choose date"', async () => { const onOpen = spy(); render(); @@ -225,9 +230,10 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); + await flushMicrotasks(); }); - it('should call onAccept when selecting the same date after changing the year', () => { + it('should call onAccept when selecting the same date after changing the year', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -257,11 +263,12 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2025, 0, 1)); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); describe('Month navigation', () => { - it('should not allow to navigate to previous month if props.minDate is after the last date of the previous month', () => { + it('should not allow to navigate to previous month if props.minDate is after the last date of the previous month', async () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Previous month')).to.have.attribute('disabled'); + await flushMicrotasks(); }); - it('should allow to navigate to previous month if props.minDate is the last date of the previous month', () => { + it('should allow to navigate to previous month if props.minDate is the last date of the previous month', async () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Previous month')).not.to.have.attribute('disabled'); + await flushMicrotasks(); }); - it('should not allow to navigate to next month if props.maxDate is before the last date of the next month', () => { + it('should not allow to navigate to next month if props.maxDate is before the last date of the next month', async () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Next month')).to.have.attribute('disabled'); + await flushMicrotasks(); }); - it('should allow to navigate to next month if props.maxDate is the first date of the next month', () => { + it('should allow to navigate to next month if props.maxDate is the first date of the next month', async () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Next month')).not.to.have.attribute('disabled'); + await flushMicrotasks(); }); }); @@ -350,10 +361,11 @@ describe('', () => { }); it('should throw console warning when invalid `openTo` prop is provided', () => { - expect(() => { + expect(async () => { render(); openPicker({ type: 'date', variant: 'desktop' }); + await flushMicrotasks(); }).toWarnDev('MUI X: `openTo="month"` is not a valid prop.'); }); }); diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx index fbaa72781475..42a91b1e2fbc 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { DesktopDateTimePicker } from '@mui/x-date-pickers/DesktopDateTimePicker'; import { adapterToUse, createPickerRenderer, openPicker } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -13,7 +13,7 @@ describe('', () => { }); describe('picker state', () => { - it('should open when clicking "Choose date"', () => { + it('should open when clicking "Choose date"', async () => { const onOpen = spy(); render(); @@ -22,9 +22,10 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); + await flushMicrotasks(); }); - it('should call onAccept when selecting the same date and time after changing the year', () => { + it('should call onAccept when selecting the same date and time after changing the year', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -62,10 +63,11 @@ describe('', () => { expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); - it('should allow selecting same view multiple times', () => { + it('should allow selecting same view multiple times', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -105,10 +107,11 @@ describe('', () => { expect(onChange.callCount).to.equal(8); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); describe('prop: timeSteps', () => { - it('should use "DigitalClock" view renderer, when "timeSteps.minutes" = 60', () => { + it('should use "DigitalClock" view renderer, when "timeSteps.minutes" = 60', async () => { const onChange = spy(); const onAccept = spy(); render( @@ -127,9 +130,10 @@ describe('', () => { expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 2, 3, 0, 0)); expect(onAccept.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should accept value and close picker when selecting time on "DigitalClock" view renderer', () => { + it('should accept value and close picker when selecting time on "DigitalClock" view renderer', async () => { const onChange = spy(); const onAccept = spy(); render( @@ -147,6 +151,7 @@ describe('', () => { expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 3, 0, 0)); expect(onAccept.callCount).to.equal(1); + await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx index b60fa37d20fb..bfb08c4d9f6a 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { DesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker'; import { createPickerRenderer, openPicker } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -61,7 +61,7 @@ describe('', () => { }); describe('selecting behavior', () => { - it('should call "onAccept", "onChange", and "onClose" when selecting a single option', () => { + it('should call "onAccept", "onChange", and "onClose" when selecting a single option', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -83,9 +83,10 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 9, 0)); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should call "onAccept", "onChange", and "onClose" when selecting all section', () => { + it('should call "onAccept", "onChange", and "onClose" when selecting all section', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -109,9 +110,10 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 14, 15)); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should allow out of order section selection', () => { + it('should allow out of order section selection', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -140,9 +142,10 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 14, 25)); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); - it('should finish selection when selecting only the last section', () => { + it('should finish selection when selecting only the last section', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -156,6 +159,7 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 12, 0)); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx index 070c9b9243f5..4e7dd4d7d7d7 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { DigitalClock } from '@mui/x-date-pickers/DigitalClock'; import { getDateOffset, describeAdapters } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -22,7 +22,7 @@ describe(' - Timezone', () => { return; } - it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', () => { + it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', async () => { const onChange = spy(); render(); @@ -37,11 +37,12 @@ describe(' - Timezone', () => { // In a real world scenario, this should probably never occur. expect(adapter.getTimezone(actualDate)).to.equal(adapter.lib === 'dayjs' ? 'UTC' : 'system'); expect(actualDate).toEqualDateTime(expectedDate); + await flushMicrotasks(); }); TIMEZONE_TO_TEST.forEach((timezone) => { describe(`Timezone: ${timezone}`, () => { - it('should use timezone prop for onChange when no value is provided', () => { + it('should use timezone prop for onChange when no value is provided', async () => { const onChange = spy(); render(); @@ -56,9 +57,10 @@ describe(' - Timezone', () => { const actualDate = onChange.lastCall.firstArg; expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); + await flushMicrotasks(); }); - it('should use timezone prop for rendering and value timezone for onChange when a value is provided', () => { + it('should use timezone prop for rendering and value timezone for onChange when a value is provided', async () => { const onChange = spy(); const value = adapter.date('2022-04-17T04:30', timezone); @@ -89,6 +91,7 @@ describe(' - Timezone', () => { expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); + await flushMicrotasks(); }); }); }); From 8734cc5d6ea095c17c64331966dbaa499140a418 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 18:25:22 +0200 Subject: [PATCH 36/96] fix browser tests --- .../src/DigitalClock/tests/DigitalClock.test.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx index 96fb9bd96fa6..d022207bd2d9 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx @@ -14,7 +14,7 @@ describe('', () => { const { render } = createPickerRenderer(); describe('Reference date', () => { - it('should use `referenceDate` when no value defined', () => { + it('should use `referenceDate` when no value defined', async () => { const onChange = spy(); const referenceDate = '2018-01-01T12:30:00'; @@ -33,7 +33,7 @@ describe('', () => { }), ).to.have.attribute('tabindex', '0'); - digitalClockHandler.setViewValue( + await digitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -53,7 +53,7 @@ describe('', () => { ).to.have.attribute('tabindex', '0'); }); - it('should not use `referenceDate` when a value is defined', () => { + it('should not use `referenceDate` when a value is defined', async () => { const onChange = spy(); render( @@ -64,7 +64,7 @@ describe('', () => { />, ); - digitalClockHandler.setViewValue( + await digitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -72,7 +72,7 @@ describe('', () => { expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 1, 15, 30)); }); - it('should not use `referenceDate` when a defaultValue is defined', () => { + it('should not use `referenceDate` when a defaultValue is defined', async () => { const onChange = spy(); render( @@ -83,7 +83,7 @@ describe('', () => { />, ); - digitalClockHandler.setViewValue( + await digitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); From 0df4c9264317b6dfe4cf32a980730ddddd5bfa4f Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 22:20:35 +0200 Subject: [PATCH 37/96] flush microtasks --- .../src/tests/columnHeaders.DataGrid.test.tsx | 17 +++-- .../src/tests/rowSelection.DataGrid.test.tsx | 19 +++-- .../DateRangeCalendar.test.tsx | 22 +++--- .../tests/DesktopDateRangePicker.test.tsx | 73 ++++++++----------- .../tests/describes.DateField.test.tsx | 2 +- .../PickersActionBar.test.tsx | 8 +- .../describeValue/testPickerActionBar.tsx | 56 ++++++-------- .../pickers/describeValue/testShortcuts.tsx | 17 ++--- 8 files changed, 102 insertions(+), 112 deletions(-) diff --git a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx index 048820ecb306..f5d86bdc1f5d 100644 --- a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx @@ -1,5 +1,11 @@ import * as React from 'react'; -import { createRenderer, fireEvent, screen, within, act } from '@mui/internal-test-utils'; +import { + createRenderer, + fireEvent, + screen, + within, + flushMicrotasks, +} from '@mui/internal-test-utils'; import { expect } from 'chai'; import { DataGrid } from '@mui/x-data-grid'; import { getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn'; @@ -124,17 +130,14 @@ describe(' - Column headers', () => { , ); - await act(async () => { - fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - }); + fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); clock.runToLast(); expect(screen.queryByRole('menu')).not.to.equal(null); - await act(async () => { - fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - }); + fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); clock.runToLast(); expect(screen.queryByRole('menu')).to.equal(null); + await flushMicrotasks(); }); }); diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index b7163c5c69e0..844114d9f4b4 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -1,7 +1,14 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { createRenderer, fireEvent, screen, act, waitFor } from '@mui/internal-test-utils'; +import { + createRenderer, + fireEvent, + screen, + act, + waitFor, + flushMicrotasks, +} from '@mui/internal-test-utils'; import { DataGrid, DataGridProps, @@ -228,11 +235,10 @@ describe(' - Row selection', () => { // simulate click const checkboxInput = getCell(0, 0).querySelector('input'); - await act(async () => { - fireUserEvent.mousePress(checkboxInput!); - }); + fireUserEvent.mousePress(checkboxInput!); expect(getActiveCell()).to.equal('0-0'); + await flushMicrotasks(); }); it('should select all visible rows regardless of pagination', () => { @@ -540,9 +546,8 @@ describe(' - Row selection', () => { fireUserEvent.mousePress(cell); fireEvent.keyDown(cell, { key: 'ArrowLeft' }); fireEvent.keyDown(getCell(1, 0).querySelector('input')!, { key: 'ArrowUp' }); - await act(async () => { - clock.runToLast(); // Wait for transition - }); + clock.runToLast(); // Wait for transition + await flushMicrotasks(); expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1); }); }); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 3e06128c999b..1aa3b8a2c12d 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -1,7 +1,13 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen, fireEvent, within, fireTouchChangedEvent, act } from '@mui/internal-test-utils'; +import { + screen, + fireEvent, + within, + fireTouchChangedEvent, + flushMicrotasks, +} from '@mui/internal-test-utils'; import { adapterToUse, buildPickerDragInteractions, @@ -540,10 +546,9 @@ describe('', () => { ); const renderCountBeforeChange = RenderCount.callCount; - await act(async () => { - fireUserEvent.mousePress(getPickerDay('2')); - }); + fireUserEvent.mousePress(getPickerDay('2')); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day + await flushMicrotasks(); }); it('should only render the day inside range when selecting the end day', async () => { @@ -557,15 +562,12 @@ describe('', () => { />, ); - await act(async () => { - fireUserEvent.mousePress(getPickerDay('2')); - }); + fireUserEvent.mousePress(getPickerDay('2')); const renderCountBeforeChange = RenderCount.callCount; - await act(async () => { - fireUserEvent.mousePress(getPickerDay('4')); - }); + fireUserEvent.mousePress(getPickerDay('4')); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(6); // 2 render * 3 day + await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx index 1aae963e1045..2d1678e7bbc1 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen, fireEvent, act, within } from '@mui/internal-test-utils'; +import { screen, fireEvent, act, within, flushMicrotasks } from '@mui/internal-test-utils'; import { createTheme, ThemeProvider } from '@mui/material/styles'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import { DesktopDateRangePicker } from '@mui/x-date-pickers-pro/DesktopDateRangePicker'; @@ -244,18 +244,14 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await act(async () => { - // Change the start date - fireUserEvent.mousePress(getPickerDay('3')); - }); + // Change the start date + fireUserEvent.mousePress(getPickerDay('3')); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); - await act(async () => { - // Change the end date - fireUserEvent.mousePress(getPickerDay('5')); - }); + // Change the end date + fireUserEvent.mousePress(getPickerDay('5')); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); @@ -264,6 +260,8 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); expect(onClose.callCount).to.equal(1); + + await flushMicrotasks(); }); it('should call onChange with updated end date, onClose and onAccept with update date range when opening from end input', async () => { @@ -291,10 +289,8 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await act(async () => { - // Change the end date - fireUserEvent.mousePress(getPickerDay('3')); - }); + // Change the end date + fireUserEvent.mousePress(getPickerDay('3')); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); @@ -302,6 +298,8 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); expect(onClose.callCount).to.equal(1); + + await flushMicrotasks(); }); it('should not call onClose and onAccept when selecting the end date if props.closeOnSelect = false', async () => { @@ -324,13 +322,12 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'end' }); - await act(async () => { - // Change the end date - fireUserEvent.mousePress(getPickerDay('3')); - }); + // Change the end date + fireUserEvent.mousePress(getPickerDay('3')); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); + await flushMicrotasks(); }); it('should call onClose and onAccept with the live value when pressing Escape', async () => { @@ -354,10 +351,8 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - await act(async () => { - // Change the start date (already tested) - fireUserEvent.mousePress(getPickerDay('3')); - }); + // Change the start date (already tested) + fireUserEvent.mousePress(getPickerDay('3')); // Dismiss the picker // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target -- don't care @@ -367,6 +362,7 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should call onClose when clicking outside of the picker without prior change', () => { @@ -427,10 +423,8 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - await act(async () => { - // Change the start date (already tested) - fireUserEvent.mousePress(getPickerDay('3')); - }); + // Change the start date (already tested) + fireUserEvent.mousePress(getPickerDay('3')); clock.runToLast(); // Dismiss the picker @@ -449,6 +443,7 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should not call onClose or onAccept when clicking outside of the picker if not opened', async () => { @@ -465,13 +460,12 @@ describe('', () => { />, ); - await act(async () => { - // Dismiss the picker - fireUserEvent.mousePress(document.body); - }); + // Dismiss the picker + fireUserEvent.mousePress(document.body); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); + await flushMicrotasks(); }); it('should call onClose when blur the current field without prior change', function test() { @@ -535,10 +529,8 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); expect(screen.getByRole('tooltip')).toBeVisible(); - await act(async () => { - // Change the start date (already tested) - fireUserEvent.mousePress(getPickerDay('3')); - }); + // Change the start date (already tested) + fireUserEvent.mousePress(getPickerDay('3')); clock.runToLast(); act(() => { @@ -551,6 +543,7 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', async () => { @@ -575,15 +568,14 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - await act(async () => { - // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); - }); + // Clear the date + fireUserEvent.mousePress(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(1); // Start date change expect(onChange.lastCall.args[0]).to.deep.equal([null, null]); expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).to.deep.equal([null, null]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { @@ -604,13 +596,12 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); - await act(async () => { - // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); - }); + // Clear the date + fireUserEvent.mousePress(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); // TODO: Write test diff --git a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx index 524e089dd63f..9ac060d09021 100644 --- a/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx +++ b/packages/x-date-pickers/src/DateField/tests/describes.DateField.test.tsx @@ -45,7 +45,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { selectSection, pressKey }) => { + setNewValue: (value, { selectSection, pressKey }) => { const newValue = adapterToUse.addDays(value, 1); selectSection('day'); pressKey(undefined, 'ArrowUp'); diff --git a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx index e5971e9f4fca..bcec6ea976ae 100644 --- a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx +++ b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx @@ -46,8 +46,8 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/clear/i)); - await flushMicrotasks(); expect(onClear.callCount).to.equal(1); + await flushMicrotasks(); }); it('should render button for "cancel" action calling the associated callback', async () => { @@ -67,8 +67,8 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/cancel/i)); - await flushMicrotasks(); expect(onCancel.callCount).to.equal(1); + await flushMicrotasks(); }); it('should render button for "accept" action calling the associated callback', async () => { @@ -88,8 +88,8 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/ok/i)); - await flushMicrotasks(); expect(onAccept.callCount).to.equal(1); + await flushMicrotasks(); }); it('should render button for "today" action calling the associated callback', async () => { @@ -109,8 +109,8 @@ describe('', () => { ); fireUserEvent.mousePress(screen.getByText(/today/i)); - await flushMicrotasks(); expect(onSetToday.callCount).to.equal(1); + await flushMicrotasks(); }); it('should respect actions order', () => { diff --git a/test/utils/pickers/describeValue/testPickerActionBar.tsx b/test/utils/pickers/describeValue/testPickerActionBar.tsx index 45dcb3b9d734..2237dae0f490 100644 --- a/test/utils/pickers/describeValue/testPickerActionBar.tsx +++ b/test/utils/pickers/describeValue/testPickerActionBar.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { act, screen } from '@mui/internal-test-utils'; +import { flushMicrotasks, screen } from '@mui/internal-test-utils'; import { adapterToUse, getExpectedOnChangeCount, @@ -49,15 +49,14 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - await act(async () => { - // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); - }); + // Clear the date + fireUserEvent.mousePress(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, emptyValue); expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, emptyValue); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should not call onChange or onAccept if the value is already empty value', async () => { @@ -77,13 +76,12 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - await act(async () => { - // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); - }); + // Clear the date + fireUserEvent.mousePress(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); @@ -107,10 +105,8 @@ export const testPickerActionBar: DescribeValueTestSuite = ( // Change the value (already tested) await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); - await act(async () => { - // Cancel the modifications - fireUserEvent.mousePress(screen.getByText(/cancel/i)); - }); + // Cancel the modifications + fireUserEvent.mousePress(screen.getByText(/cancel/i)); expect(onChange.callCount).to.equal( getExpectedOnChangeCount(componentFamily, pickerParams) + 1, ); @@ -123,6 +119,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( } expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should not call onChange if no prior value modification', async () => { @@ -143,13 +140,12 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - await act(async () => { - // Cancel the modifications - fireUserEvent.mousePress(screen.getByText(/cancel/i)); - }); + // Cancel the modifications + fireUserEvent.mousePress(screen.getByText(/cancel/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); @@ -173,15 +169,14 @@ export const testPickerActionBar: DescribeValueTestSuite = ( // Change the value (already tested) await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); - await act(async () => { - // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); - }); + // Accept the modifications + fireUserEvent.mousePress(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal( getExpectedOnChangeCount(componentFamily, pickerParams), ); // The accepted value as already been committed, don't call onChange again expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should call onChange, onClose and onAccept when validating the default value', async () => { @@ -202,13 +197,12 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - await act(async () => { - // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); - }); + // Accept the modifications + fireUserEvent.mousePress(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should call onClose but not onAccept when validating an already validated value', async () => { @@ -229,13 +223,12 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - await act(async () => { - // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); - }); + // Accept the modifications + fireUserEvent.mousePress(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); @@ -257,9 +250,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - await act(async () => { - fireUserEvent.mousePress(screen.getByText(/today/i)); - }); + fireUserEvent.mousePress(screen.getByText(/today/i)); let startOfToday: any; if (pickerParams.type === 'date') { @@ -275,6 +266,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, startOfToday); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); }); }); diff --git a/test/utils/pickers/describeValue/testShortcuts.tsx b/test/utils/pickers/describeValue/testShortcuts.tsx index 8b78b270e704..9dd62466acc7 100644 --- a/test/utils/pickers/describeValue/testShortcuts.tsx +++ b/test/utils/pickers/describeValue/testShortcuts.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; import { expectPickerChangeHandlerValue } from 'test/utils/pickers'; -import { screen, act } from '@mui/internal-test-utils'; +import { screen, flushMicrotasks } from '@mui/internal-test-utils'; import { DescribeValueTestSuite } from './describeValue.types'; import { fireUserEvent } from '../../fireUserEvent'; @@ -50,15 +50,14 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - await act(async () => { - fireUserEvent.mousePress(shortcut); - }); + fireUserEvent.mousePress(shortcut); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, values[1]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should call onClose and onChange when picking a shortcut with changeImportance="accept"', async () => { @@ -90,15 +89,14 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - await act(async () => { - fireUserEvent.mousePress(shortcut); - }); + fireUserEvent.mousePress(shortcut); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, values[1]); expect(onClose.callCount).to.equal(1); + await flushMicrotasks(); }); it('should call onClose and onChange when picking a shortcut with changeImportance="set"', async () => { @@ -130,14 +128,13 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - await act(async () => { - fireUserEvent.mousePress(shortcut); - }); + fireUserEvent.mousePress(shortcut); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); + await flushMicrotasks(); }); }); }; From bb4ed819eab8bec41584e9b9a4bbeae2c6c1c39e Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Tue, 20 Aug 2024 22:20:52 +0200 Subject: [PATCH 38/96] mock deprecated methods as well --- test/utils/pickers/misc.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/utils/pickers/misc.ts b/test/utils/pickers/misc.ts index ecbcab7ded50..f5fcf9c40ee7 100644 --- a/test/utils/pickers/misc.ts +++ b/test/utils/pickers/misc.ts @@ -6,7 +6,9 @@ import { OpenPickerParams } from './openPicker'; export const stubMatchMedia = (matches = true) => sinon.stub().returns({ matches, + addListener: () => {}, addEventListener: () => {}, + removeListener: () => {}, removeEventListener: () => {}, }); From 28878a254e910657c87ae75a42584cea29590915 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 21 Aug 2024 15:37:22 +0200 Subject: [PATCH 39/96] automate @mui/material version testing --- .../ResponsiveChartContainerPro.test.tsx | 5 --- .../src/tests/materialVersion.test.tsx | 5 +++ .../x-charts/src/BarChart/BarChart.test.tsx | 4 -- .../src/tests/materialVersion.test.tsx | 5 +++ .../aggregation.DataGridPremium.test.tsx | 4 -- .../src/tests/materialVersion.test.tsx | 5 +++ .../tests/accessibility.DataGridPro.test.tsx | 4 -- .../src/tests/materialVersion.test.tsx | 5 +++ .../src/tests/cells.DataGrid.test.tsx | 4 -- .../src/tests/materialVersion.test.tsx | 5 +++ .../DateRangeCalendar.test.tsx | 5 --- .../src/tests/materialVersion.test.tsx | 5 +++ .../tests/fieldKeyboardInteraction.test.tsx | 5 --- .../src/tests/materialVersion.test.tsx | 5 +++ .../RichTreeViewPro/RichTreeViewPro.test.tsx | 4 -- .../src/tests/materialVersion.test.tsx | 5 +++ .../src/TreeItem/TreeItem.test.tsx | 4 -- .../src/tests/materialVersion.test.tsx | 5 +++ pnpm-lock.yaml | 6 +++ test/karma.conf.js | 1 + test/package.json | 2 + test/utils/checkMaterialVersion.ts | 43 +++++++++++++++++++ 22 files changed, 97 insertions(+), 39 deletions(-) create mode 100644 packages/x-charts-pro/src/tests/materialVersion.test.tsx create mode 100644 packages/x-charts/src/tests/materialVersion.test.tsx create mode 100644 packages/x-data-grid-premium/src/tests/materialVersion.test.tsx create mode 100644 packages/x-data-grid-pro/src/tests/materialVersion.test.tsx create mode 100644 packages/x-data-grid/src/tests/materialVersion.test.tsx create mode 100644 packages/x-date-pickers-pro/src/tests/materialVersion.test.tsx create mode 100644 packages/x-date-pickers/src/tests/materialVersion.test.tsx create mode 100644 packages/x-tree-view-pro/src/tests/materialVersion.test.tsx create mode 100644 packages/x-tree-view/src/tests/materialVersion.test.tsx create mode 100644 test/utils/checkMaterialVersion.ts diff --git a/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx b/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx index da271ac76229..569724f5829d 100644 --- a/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx +++ b/packages/x-charts-pro/src/ResponsiveChartContainerPro/ResponsiveChartContainerPro.test.tsx @@ -4,11 +4,6 @@ import { createRenderer, screen } from '@mui/internal-test-utils'; import { LicenseInfo } from '@mui/x-license'; import { sharedLicenseStatuses } from '@mui/x-license/useLicenseVerifier/useLicenseVerifier'; import { ResponsiveChartContainerPro } from './ResponsiveChartContainerPro'; -// eslint-disable-next-line import/order -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-charts-pro: @mui/material version`, packageJson.version); describe(' - License', () => { const { render } = createRenderer(); diff --git a/packages/x-charts-pro/src/tests/materialVersion.test.tsx b/packages/x-charts-pro/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-charts-pro/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-charts/src/BarChart/BarChart.test.tsx b/packages/x-charts/src/BarChart/BarChart.test.tsx index ebac34d18545..7f9dffa98069 100644 --- a/packages/x-charts/src/BarChart/BarChart.test.tsx +++ b/packages/x-charts/src/BarChart/BarChart.test.tsx @@ -1,10 +1,6 @@ import * as React from 'react'; import { createRenderer, describeConformance } from '@mui/internal-test-utils'; import { BarChart } from '@mui/x-charts/BarChart'; -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-charts: @mui/material version`, packageJson.version); describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-charts/src/tests/materialVersion.test.tsx b/packages/x-charts/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-charts/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx index ee22d9c65f08..a397d549e037 100644 --- a/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx +++ b/packages/x-data-grid-premium/src/tests/aggregation.DataGridPremium.test.tsx @@ -15,10 +15,6 @@ import { useGridApiRef, GridColDef, } from '@mui/x-data-grid-premium'; -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-data-grid-premium: @mui/material version`, packageJson.version); const isJSDOM = /jsdom/.test(window.navigator.userAgent); diff --git a/packages/x-data-grid-premium/src/tests/materialVersion.test.tsx b/packages/x-data-grid-premium/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-data-grid-premium/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx b/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx index 4effb50d60c8..474026c577d0 100644 --- a/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx +++ b/packages/x-data-grid-pro/src/tests/accessibility.DataGridPro.test.tsx @@ -4,10 +4,6 @@ import axe from 'axe-core'; import { DataGridPro } from '@mui/x-data-grid-pro'; import { useBasicDemoData } from '@mui/x-data-grid-generator'; import { createRenderer } from '@mui/internal-test-utils'; -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-data-grid-pro: @mui/material version`, packageJson.version); function logViolations(violations: any) { if (violations.length !== 0) { diff --git a/packages/x-data-grid-pro/src/tests/materialVersion.test.tsx b/packages/x-data-grid-pro/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-data-grid-pro/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx b/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx index e40b52ade105..61c3a5b0f72d 100644 --- a/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/cells.DataGrid.test.tsx @@ -6,10 +6,6 @@ import { DataGrid, GridValueFormatter } from '@mui/x-data-grid'; import { getCell } from 'test/utils/helperFn'; import { fireUserEvent } from 'test/utils/fireUserEvent'; import { getBasicGridData } from '@mui/x-data-grid-generator'; -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-data-grid: @mui/material version`, packageJson.version); const isJSDOM = /jsdom/.test(window.navigator.userAgent); diff --git a/packages/x-data-grid/src/tests/materialVersion.test.tsx b/packages/x-data-grid/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-data-grid/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 1aa3b8a2c12d..319681f3728a 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -23,11 +23,6 @@ import { DateRangePickerDay } from '@mui/x-date-pickers-pro/DateRangePickerDay'; import { describeConformance } from 'test/utils/describeConformance'; import { fireUserEvent } from 'test/utils/fireUserEvent'; import { RangePosition } from '../models'; -// eslint-disable-next-line import/order -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-date-pickers-pro: @mui/material version`, packageJson.version); const getPickerDay = (name: string, picker = 'January 2018') => within(screen.getByRole('grid', { name: picker })).getByRole('gridcell', { name }); diff --git a/packages/x-date-pickers-pro/src/tests/materialVersion.test.tsx b/packages/x-date-pickers-pro/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-date-pickers-pro/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx b/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx index 29a1a9809e06..3d7436f158ea 100644 --- a/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx +++ b/packages/x-date-pickers/src/tests/fieldKeyboardInteraction.test.tsx @@ -15,11 +15,6 @@ import { getDateSectionConfigFromFormatToken, cleanLeadingZeros, } from '../internals/hooks/useField/useField.utils'; -// eslint-disable-next-line import/order -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-date-pickers: @mui/material version`, packageJson.version); const testDate = '2018-05-15T09:35:10'; diff --git a/packages/x-date-pickers/src/tests/materialVersion.test.tsx b/packages/x-date-pickers/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-date-pickers/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx b/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx index 14c38065e571..b7cd60d885da 100644 --- a/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx +++ b/packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.test.tsx @@ -5,10 +5,6 @@ import { richTreeViewProClasses as classes, } from '@mui/x-tree-view-pro/RichTreeViewPro'; import { describeConformance } from 'test/utils/describeConformance'; -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-tree-view-pro: @mui/material version`, packageJson.version); describe('', () => { const { render } = createRenderer(); diff --git a/packages/x-tree-view-pro/src/tests/materialVersion.test.tsx b/packages/x-tree-view-pro/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-tree-view-pro/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx index 30b288954c8a..f893aec46d2a 100644 --- a/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx +++ b/packages/x-tree-view/src/TreeItem/TreeItem.test.tsx @@ -7,10 +7,6 @@ import { TreeViewContext } from '@mui/x-tree-view/internals/TreeViewProvider/Tre import { describeConformance } from 'test/utils/describeConformance'; import { describeTreeView } from 'test/utils/tree-view/describeTreeView'; import { getFakeContextValue } from 'test/utils/tree-view/fakeContextValue'; -import packageJson from '@mui/material/package.json'; - -// eslint-disable-next-line no-console -console.log(`@mui/x-tree-view: @mui/material version`, packageJson.version); describeTreeView<[]>('TreeItem component', ({ render, treeItemComponentName }) => { describe('ContentComponent / ContentProps props (TreeItem only)', () => { diff --git a/packages/x-tree-view/src/tests/materialVersion.test.tsx b/packages/x-tree-view/src/tests/materialVersion.test.tsx new file mode 100644 index 000000000000..dc0c0a7e6ee0 --- /dev/null +++ b/packages/x-tree-view/src/tests/materialVersion.test.tsx @@ -0,0 +1,5 @@ +import materialPackageJson from '@mui/material/package.json'; +import { checkMaterialVersion } from 'test/utils/checkMaterialVersion'; +import packageJson from '../../package.json'; + +checkMaterialVersion({ packageJson, materialPackageJson }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index dc7e9d413787..f8231b470b3c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1545,6 +1545,9 @@ importers: '@types/react': specifier: ^18.3.3 version: 18.3.3 + '@types/semver': + specifier: ^7.5.8 + version: 7.5.8 chai: specifier: ^4.5.0 version: 4.5.0 @@ -1569,6 +1572,9 @@ importers: react-router-dom: specifier: ^6.25.1 version: 6.25.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + semver: + specifier: ^7.6.3 + version: 7.6.3 stylis: specifier: ^4.3.2 version: 4.3.2 diff --git a/test/karma.conf.js b/test/karma.conf.js index 3da8db12d540..87070fd88d44 100644 --- a/test/karma.conf.js +++ b/test/karma.conf.js @@ -80,6 +80,7 @@ module.exports = function setKarmaConfig(config) { fs: false, // Some tests import fs, stream: require.resolve('stream-browserify'), // util > inherits breaks with `false` path: false, + child_process: false, }, }, }, diff --git a/test/package.json b/test/package.json index 8656bc6e8579..ab90a583a1bb 100644 --- a/test/package.json +++ b/test/package.json @@ -25,6 +25,7 @@ "@types/moment-jalaali": "^0.7.9", "@types/prop-types": "^15.7.12", "@types/react": "^18.3.3", + "@types/semver": "^7.5.8", "chai": "^4.5.0", "dayjs": "^1.11.11", "moment": "^2.30.1", @@ -33,6 +34,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-router-dom": "^6.25.1", + "semver": "^7.6.3", "stylis": "^4.3.2", "stylis-plugin-rtl": "^2.1.1" } diff --git a/test/utils/checkMaterialVersion.ts b/test/utils/checkMaterialVersion.ts new file mode 100644 index 000000000000..9ebaa81b7d6c --- /dev/null +++ b/test/utils/checkMaterialVersion.ts @@ -0,0 +1,43 @@ +import { expect } from 'chai'; +import semver from 'semver'; +import childProcess from 'child_process'; + +type PackageJson = { + name: string; + version: string; +}; + +const isJSDOM = /jsdom/.test(window.navigator.userAgent); + +export function checkMaterialVersion({ + packageJson, + materialPackageJson, +}: { + packageJson: PackageJson & { devDependencies: { '@mui/material': string } }; + materialPackageJson: PackageJson; +}) { + if (!isJSDOM) { + return undefined; + } + + const expectedVersion = packageJson.devDependencies['@mui/material']; + + const versions = childProcess.execSync(`npm dist-tag ls ${'@mui/material'} ${expectedVersion}`, { + encoding: 'utf8', + }); + const tagMapping = versions + .split('\n') + .find((mapping) => { + return mapping.startsWith(`${expectedVersion}: `); + }) + ?.split(': ')[1]; + + const version = tagMapping ?? expectedVersion; + + return it(`${packageJson.name} should resolve proper @mui/material version`, () => { + expect(semver.satisfies(materialPackageJson.version, version)).to.equal( + true, + `Expected @mui/material ${version}, but found ${materialPackageJson.version}`, + ); + }); +} From 5f387e69da8d5ca12e2bde8bbc48ff23e05c4e41 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 21 Aug 2024 17:13:23 +0200 Subject: [PATCH 40/96] use @mui/material v5 --- docs/package.json | 12 +- package.json | 6 +- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-generator/package.json | 4 +- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- pnpm-lock.yaml | 152 ++++++++++---------- test/package.json | 2 +- 14 files changed, 93 insertions(+), 101 deletions(-) diff --git a/docs/package.json b/docs/package.json index d82db92c520f..3b3972f48bbb 100644 --- a/docs/package.json +++ b/docs/package.json @@ -28,14 +28,14 @@ "@emotion/server": "^11.11.0", "@emotion/styled": "^11.13.0", "@mui/docs": "6.0.0-beta.6", - "@mui/icons-material": "next", + "@mui/icons-material": "^5.16.5", "@mui/joy": "^5.0.0-beta.48", "@mui/lab": "^5.0.0-alpha.173", - "@mui/material": "next", - "@mui/material-nextjs": "next", - "@mui/styles": "next", - "@mui/system": "next", - "@mui/utils": "next", + "@mui/material": "^5.16.5", + "@mui/material-nextjs": "^5.16.4", + "@mui/styles": "^6.0.0-beta.5", + "@mui/system": "^6.0.0-beta.5", + "@mui/utils": "^6.0.0-beta.5", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", "@mui/x-data-grid": "workspace:*", diff --git a/package.json b/package.json index 29808d3a74dd..091b95f7c6e7 100644 --- a/package.json +++ b/package.json @@ -88,12 +88,12 @@ "@emotion/cache": "^11.13.1", "@emotion/react": "^11.13.0", "@emotion/styled": "^11.13.0", - "@mui/icons-material": "next", + "@mui/icons-material": "^5.16.5", "@mui/internal-markdown": "^1.0.10", "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@mui/monorepo": "github:mui/material-ui#0acfe665034fdf4578156ebaf4372713cf23bce4", - "@mui/utils": "next", + "@mui/utils": "^5.16.5", "@next/eslint-plugin-next": "14.2.5", "@octokit/plugin-retry": "^7.1.1", "@octokit/rest": "^21.0.2", diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 8a8e192b5c49..ceb1ec425b2b 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -66,7 +66,7 @@ } }, "devDependencies": { - "@mui/material": "next", + "@mui/material": "^5.16.5", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 57db9f87a179..8e7847c095d7 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -65,7 +65,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index 95ddf235a792..bd14d2ccd10f 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -40,8 +40,8 @@ "lru-cache": "^10.4.3" }, "devDependencies": { - "@mui/icons-material": "next", - "@mui/material": "next", + "@mui/icons-material": "^5.16.5", + "@mui/material": "^5.16.5", "@types/chance": "^1.1.6", "rimraf": "^5.0.10" }, diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 96a2d92e587d..13bd4a396f67 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -73,7 +73,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", "rimraf": "^5.0.10" diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 6e2789785315..f12bcca99f2f 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -71,7 +71,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index ae2a8c28eb3f..d4038f475aea 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -73,7 +73,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/joy": "^5.0.0-beta.48", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@mui/types": "^7.2.15", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 182b8baed76c..b899ee207ba6 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -96,7 +96,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@types/luxon": "^3.4.2", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 467ca6bf5883..a6df865b7aa8 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -98,7 +98,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@types/luxon": "^3.4.2", "@types/moment-hijri": "^2.1.4", "@types/moment-jalaali": "^0.7.9", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 15164dd5e3bc..47c7e28fcdb2 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -71,7 +71,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 7e00b7916c3b..b39bd4adcaa4 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -69,7 +69,7 @@ }, "devDependencies": { "@mui/internal-test-utils": "^1.0.8", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f8231b470b3c..73ec16a765ee 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -84,8 +84,8 @@ importers: specifier: ^11.13.0 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/icons-material': - specifier: next - version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': specifier: ^1.0.10 version: 1.0.10 @@ -93,14 +93,14 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/monorepo': specifier: github:mui/material-ui#0acfe665034fdf4578156ebaf4372713cf23bce4 version: https://codeload.github.com/mui/material-ui/tar.gz/0acfe665034fdf4578156ebaf4372713cf23bce4(encoding@0.1.13) '@mui/utils': - specifier: next - version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.6(@types/react@18.3.3)(react@18.3.1) '@next/eslint-plugin-next': specifier: 14.2.5 version: 14.2.5 @@ -427,30 +427,30 @@ importers: version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/docs': specifier: 6.0.0-beta.6 - version: 6.0.0-beta.6(cg4muev7c47jvvi4rw2b3ogawq) + version: 6.0.0-beta.6(wtxcwqnembv2vrduiqenlqa7ra) '@mui/icons-material': - specifier: next - version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/joy': specifier: ^5.0.0-beta.48 version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/lab': specifier: ^5.0.0-alpha.173 - version: 5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material-nextjs': - specifier: next - version: 6.0.0-beta.6(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) + specifier: ^5.16.4 + version: 5.16.6(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1) '@mui/styles': - specifier: next + specifier: ^6.0.0-beta.5 version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: next + specifier: ^6.0.0-beta.5 version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': - specifier: next + specifier: ^6.0.0-beta.5 version: 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) '@mui/x-charts': specifier: workspace:* @@ -749,8 +749,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -814,8 +814,8 @@ importers: version: 18.3.1(react@18.3.1) devDependencies: '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -993,8 +993,8 @@ importers: specifier: ^5.0.0-beta.48 version: 5.0.0-beta.48(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/types': specifier: ^7.2.15 version: 7.2.15(@types/react@18.3.3) @@ -1034,11 +1034,11 @@ importers: version: 18.3.1 devDependencies: '@mui/icons-material': - specifier: next - version: 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/chance': specifier: ^1.1.6 version: 1.1.6 @@ -1102,8 +1102,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1164,8 +1164,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1214,8 +1214,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1306,8 +1306,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1417,8 +1417,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1476,8 +1476,8 @@ importers: specifier: ^1.0.8 version: 1.0.8(@babel/core@7.25.2)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1498,8 +1498,8 @@ importers: specifier: ^11.13.0 version: 11.13.0(@types/react@18.3.3)(react@18.3.1) '@mui/material': - specifier: next - version: 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: ^5.16.5 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/x-charts': specifier: workspace:* version: link:../packages/x-charts/build @@ -2962,9 +2962,6 @@ packages: '@mui/core-downloads-tracker@5.16.7': resolution: {integrity: sha512-RtsCt4Geed2/v74sbihWzzRs+HsIQCfclHeORh5Ynu2fS4icIKozcSubwuG7vtzq2uW3fOR1zITSP84TNt2GoQ==} - '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': - resolution: {integrity: sha512-doh3M3U7HUGSBIWGe1yvesSbfDguMRjP0N09ogWSBM2hovXAlgULhMgcRTepAZLLwfRxFII0bCohq6B9NqoKuw==} - '@mui/docs@6.0.0-beta.6': resolution: {integrity: sha512-q5v8dqbtI8eWzjMv/AcASSI2PGMPq/nF8Z4gzi2S+jjFcAH/4MoknhQUReLxGW+6DaCuPfSNDtcvxIjQ9mrJ3A==} engines: {node: '>=14.0.0'} @@ -2982,13 +2979,13 @@ packages: '@types/react': optional: true - '@mui/icons-material@6.0.0-beta.6': - resolution: {integrity: sha512-XtP8W/Hd5FAQ1VdrE6KN6DqPe4AdnCn0lp+AQGa6gnH/4dZsIwNsmKapfVt7NHAhrbDSKnx9cPXAAT2NXPyaJg==} - engines: {node: '>=14.0.0'} + '@mui/icons-material@5.16.7': + resolution: {integrity: sha512-UrGwDJCXEszbDI7yV047BYU5A28eGJ79keTCP4cc74WyncuVrnurlmIRxaHL8YK+LI1Kzq+/JM52IAkNnv4u+Q==} + engines: {node: '>=12.0.0'} peerDependencies: - '@mui/material': 6.0.0-beta.6 - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 + '@mui/material': ^5.0.0 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -3043,16 +3040,16 @@ packages: '@types/react': optional: true - '@mui/material-nextjs@6.0.0-beta.6': - resolution: {integrity: sha512-ZH8f0gaDwv17ckaCsuGxU16+G1qohPN+MPRFUY9JxT+oF+xVKcmDsgJgkUAFueWqGhR2782EtMYeD20bgimb6w==} - engines: {node: '>=14.0.0'} + '@mui/material-nextjs@5.16.6': + resolution: {integrity: sha512-Y64ybP5Pmy+GCUcu3SuMnc25CqFwBQkRn6XNXyhvc1mhR48Iq0oFKjoO5ncqfhm58OwPClIRW2tecP/PTdGNJw==} + engines: {node: '>=12.0.0'} peerDependencies: '@emotion/cache': ^11.11.0 - '@emotion/react': ^11.11.4 '@emotion/server': ^11.11.0 - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 + '@mui/material': ^5.0.0 + '@types/react': ^17.0.0 || ^18.0.0 next: ^13.0.0 || ^14.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 + react: ^17.0.0 || ^18.0.0 peerDependenciesMeta: '@emotion/cache': optional: true @@ -3061,23 +3058,20 @@ packages: '@types/react': optional: true - '@mui/material@6.0.0-beta.6': - resolution: {integrity: sha512-1wLFBXsoq8yGBRNDzqsQPYMEvtDel7MhUWAZtPCbsTSiYTJ2dPmf1byk/pEmX1y/3cVBHVdEgF9joXfTlnqc4g==} - engines: {node: '>=14.0.0'} + '@mui/material@5.16.7': + resolution: {integrity: sha512-cwwVQxBhK60OIOqZOVLFt55t01zmarKJiJUWbk0+8s/Ix5IaUzAShqlJchxsIQ4mSrWqgcKCCXKtIlG5H+/Jmg==} + engines: {node: '>=12.0.0'} peerDependencies: '@emotion/react': ^11.5.0 '@emotion/styled': ^11.3.0 - '@mui/material-pigment-css': ^6.0.0-beta.6 - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 - react-dom: ^17.0.0 || ^18.0.0 || ^19.0.0 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 + react-dom: ^17.0.0 || ^18.0.0 peerDependenciesMeta: '@emotion/react': optional: true '@emotion/styled': optional: true - '@mui/material-pigment-css': - optional: true '@types/react': optional: true @@ -11860,15 +11854,13 @@ snapshots: '@mui/core-downloads-tracker@5.16.7': {} - '@mui/core-downloads-tracker@6.0.0-dev.240424162023-9968b4889d': {} - - '@mui/docs@6.0.0-beta.6(cg4muev7c47jvvi4rw2b3ogawq)': + '@mui/docs@6.0.0-beta.6(wtxcwqnembv2vrduiqenlqa7ra)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/icons-material': 6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/icons-material': 5.16.7(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/internal-markdown': 1.0.10 - '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) chai: 5.1.1 clipboard-copy: 4.0.1 @@ -11881,10 +11873,10 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/icons-material@6.0.0-beta.6(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': + '@mui/icons-material@5.16.7(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: '@types/react': 18.3.3 @@ -11966,11 +11958,11 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/lab@5.0.0-alpha.173(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@mui/base': 5.0.0-beta.40(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/material': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/material': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -11983,10 +11975,10 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/material-nextjs@6.0.0-beta.6(@emotion/cache@11.13.1)(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/server@11.11.0)(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': + '@mui/material-nextjs@5.16.6(@emotion/cache@11.13.1)(@emotion/server@11.11.0)(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(next@14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) + '@mui/material': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) next: 14.2.5(@babel/core@7.25.2)(@opentelemetry/api@1.8.0)(@playwright/test@1.44.1)(babel-plugin-macros@3.1.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react: 18.3.1 optionalDependencies: @@ -11994,13 +11986,13 @@ snapshots: '@emotion/server': 11.11.0 '@types/react': 18.3.3 - '@mui/material@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + '@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 - '@mui/core-downloads-tracker': 6.0.0-dev.240424162023-9968b4889d - '@mui/system': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/core-downloads-tracker': 5.16.7 + '@mui/system': 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) + '@mui/utils': 5.16.6(@types/react@18.3.3)(react@18.3.1) '@popperjs/core': 2.11.8 '@types/react-transition-group': 4.4.11 clsx: 2.1.1 diff --git a/test/package.json b/test/package.json index ab90a583a1bb..0490947834d7 100644 --- a/test/package.json +++ b/test/package.json @@ -9,7 +9,7 @@ "@babel/runtime": "^7.25.0", "@emotion/cache": "^11.13.1", "@emotion/react": "^11.13.0", - "@mui/material": "next", + "@mui/material": "^5.16.5", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", "@mui/x-date-pickers": "workspace:*", From c63a240d27f360097202254a3375b58f050cbbaf Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 21 Aug 2024 17:16:52 +0200 Subject: [PATCH 41/96] use v5 imports --- docs/data/data-grid/joy-ui/GridJoyUISlots.js | 4 ++-- docs/data/data-grid/joy-ui/GridJoyUISlots.tsx | 4 ++-- docs/data/date-pickers/custom-field/JoyV6Field.js | 2 +- docs/data/date-pickers/custom-field/JoyV6Field.tsx | 2 +- .../date-pickers/custom-field/JoyV6MultiInputRangeField.js | 2 +- .../date-pickers/custom-field/JoyV6MultiInputRangeField.tsx | 2 +- .../date-pickers/custom-field/JoyV6SingleInputRangeField.js | 2 +- .../date-pickers/custom-field/JoyV6SingleInputRangeField.tsx | 2 +- docs/src/modules/components/ChartFeaturesGrid.js | 2 +- docs/src/modules/components/InstallationGrid.js | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.js b/docs/data/data-grid/joy-ui/GridJoyUISlots.js index f1281b22436d..7d88bad69902 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.js +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.js @@ -3,8 +3,8 @@ import Box from '@mui/material/Box'; import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { - extendTheme as materialExtendTheme, - CssVarsProvider as MaterialCssVarsProvider, + experimental_extendTheme as materialExtendTheme, + Experimental_CssVarsProvider as MaterialCssVarsProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx index 879682a28b5a..8bcd13834ceb 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx @@ -3,8 +3,8 @@ import Box from '@mui/material/Box'; import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { - extendTheme as materialExtendTheme, - CssVarsProvider as MaterialCssVarsProvider, + experimental_extendTheme as materialExtendTheme, + Experimental_CssVarsProvider as MaterialCssVarsProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; diff --git a/docs/data/date-pickers/custom-field/JoyV6Field.js b/docs/data/date-pickers/custom-field/JoyV6Field.js index a9880ff6ac51..29f4e14ce291 100644 --- a/docs/data/date-pickers/custom-field/JoyV6Field.js +++ b/docs/data/date-pickers/custom-field/JoyV6Field.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - CssVarsProvider as MaterialCssVarsProvider, + Experimental_CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import { extendTheme as extendJoyTheme, diff --git a/docs/data/date-pickers/custom-field/JoyV6Field.tsx b/docs/data/date-pickers/custom-field/JoyV6Field.tsx index 9f4cfc8747de..05c311984ebf 100644 --- a/docs/data/date-pickers/custom-field/JoyV6Field.tsx +++ b/docs/data/date-pickers/custom-field/JoyV6Field.tsx @@ -3,7 +3,7 @@ import { Dayjs } from 'dayjs'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - CssVarsProvider as MaterialCssVarsProvider, + Experimental_CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import { extendTheme as extendJoyTheme, diff --git a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js index e7b89f1e9317..e4f82d1581bb 100644 --- a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js +++ b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - CssVarsProvider as MaterialCssVarsProvider, + Experimental_CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx index 98cee18adddd..175c0a3d04bb 100644 --- a/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx +++ b/docs/data/date-pickers/custom-field/JoyV6MultiInputRangeField.tsx @@ -3,7 +3,7 @@ import { Dayjs } from 'dayjs'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - CssVarsProvider as MaterialCssVarsProvider, + Experimental_CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js index e1256f06af74..9ac5abf64465 100644 --- a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js +++ b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.js @@ -3,7 +3,7 @@ import * as React from 'react'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - CssVarsProvider as MaterialCssVarsProvider, + Experimental_CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx index 679614cf0e67..832a7b515624 100644 --- a/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx +++ b/docs/data/date-pickers/custom-field/JoyV6SingleInputRangeField.tsx @@ -3,7 +3,7 @@ import { Dayjs } from 'dayjs'; import { useTheme as useMaterialTheme, useColorScheme as useMaterialColorScheme, - CssVarsProvider as MaterialCssVarsProvider, + Experimental_CssVarsProvider as MaterialCssVarsProvider, } from '@mui/material/styles'; import useSlotProps from '@mui/utils/useSlotProps'; import { diff --git a/docs/src/modules/components/ChartFeaturesGrid.js b/docs/src/modules/components/ChartFeaturesGrid.js index e6e5f25781ea..5d7cc26b75ba 100644 --- a/docs/src/modules/components/ChartFeaturesGrid.js +++ b/docs/src/modules/components/ChartFeaturesGrid.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import Grid from '@mui/material/Grid2'; +import Grid from '@mui/material/Unstable_Grid2'; import { InfoCard } from '@mui/docs/InfoCard'; import LineAxisRoundedIcon from '@mui/icons-material/LineAxisRounded'; import DashboardCustomizeRoundedIcon from '@mui/icons-material/DashboardCustomizeRounded'; diff --git a/docs/src/modules/components/InstallationGrid.js b/docs/src/modules/components/InstallationGrid.js index d71686454614..58a737685290 100644 --- a/docs/src/modules/components/InstallationGrid.js +++ b/docs/src/modules/components/InstallationGrid.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import Grid from '@mui/material/Grid2'; +import Grid from '@mui/material/Unstable_Grid2'; import { InfoCard } from '@mui/docs/InfoCard'; import AccountTreeRounded from '@mui/icons-material/AccountTreeRounded'; import PivotTableChartRoundedIcon from '@mui/icons-material/PivotTableChartRounded'; From d43e7212ef71a99b253070a92f0d3a9cb77d08c3 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 21 Aug 2024 18:44:28 +0200 Subject: [PATCH 42/96] update lockfile --- pnpm-lock.yaml | 124 +------------------------------------------------ 1 file changed, 2 insertions(+), 122 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8b70420cb83c..045d7a9a7e18 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -717,9 +717,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -782,9 +779,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -967,9 +961,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1026,12 +1017,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/icons-material': - specifier: ^5.4.1 - version: 5.16.7(@mui/material@5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/x-data-grid-premium': specifier: workspace:* version: link:../x-data-grid-premium/build @@ -1073,9 +1058,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1144,9 +1126,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1206,9 +1185,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1292,9 +1268,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1412,9 +1385,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -1468,9 +1438,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/material': - specifier: ^5.15.14 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@mui/system': specifier: ^5.16.7 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) @@ -3140,21 +3107,8 @@ packages: resolution: {integrity: sha512-FfXhHP/2MlqH+vLs2tIHMeCChmqSRgkOALVNLKkPrDsvtoq5J8OraOutCn1scpvRjr9mO8ZhW6jKx2t/vUDxtQ==} engines: {node: '>=12.0.0'} peerDependencies: - '@emotion/react': ^11.4.1 - '@emotion/styled': ^11.3.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - '@emotion/react': - optional: true - '@emotion/styled': - optional: true - - '@mui/styles@6.0.0-beta.6': - resolution: {integrity: sha512-Vta4qcnfXD5fQbBgEHM8VAq8NOSErBU5n9V7yXqz76h6XnYYGsidtTle4ZsFZVVBHnbesKP0uH60V5l1PKuFrw==} - engines: {node: '>=14.0.0'} - peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 + '@types/react': ^17.0.0 || ^18.0.0 + react: ^17.0.0 peerDependenciesMeta: '@types/react': optional: true @@ -3175,22 +3129,6 @@ packages: '@types/react': optional: true - '@mui/system@6.0.0-beta.6': - resolution: {integrity: sha512-WkY0oy2jL4zkTosE8q+vDfFIP1gVORFL658WnPf5vnsDawxqALVdtBvHgTBatM1X5OKZ9K+PX9hg1++K0spsxQ==} - engines: {node: '>=14.0.0'} - peerDependencies: - '@emotion/react': ^11.5.0 - '@emotion/styled': ^11.3.0 - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - '@emotion/react': - optional: true - '@emotion/styled': - optional: true - '@types/react': - optional: true - '@mui/types@7.2.15': resolution: {integrity: sha512-nbo7yPhtKJkdf9kcVOF8JZHPZTmqXjJ/tI0bdWgHg5tp9AnIN4Y7f7wm9T+0SyGYJk76+GYZ8Q5XaTYAsUHN0Q==} peerDependencies: @@ -3209,16 +3147,6 @@ packages: '@types/react': optional: true - '@mui/utils@6.0.0-beta.6': - resolution: {integrity: sha512-HsEDqZ/4K8zWkSiT2816pNUeoLj91l5w4XkYAIuz8//dKeSz67XfYZgZsc9OMferz/cYOflqBbCPxl2A5vWHeQ==} - engines: {node: '>=14.0.0'} - peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 || ^19.0.0 - react: ^17.0.0 || ^18.0.0 || ^19.0.0 - peerDependenciesMeta: - '@types/react': - optional: true - '@netlify/functions@2.8.1': resolution: {integrity: sha512-+6wtYdoz0yE06dSa9XkP47tw5zm6g13QMeCwM3MmHx1vn8hzwFa51JtmfraprdkL7amvb7gaNM+OOhQU1h6T8A==} engines: {node: '>=14.0.0'} @@ -12057,15 +11985,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/styled-engine@5.16.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) - prop-types: 15.8.1 - react: 18.3.1 - optionalDependencies: - '@types/react': 18.3.3 - '@mui/styled-engine@5.16.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 @@ -12078,17 +11997,6 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/styles@5.16.7(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@emotion/cache': 11.13.1 - csstype: 3.1.3 - prop-types: 15.8.1 - react: 18.3.1 - optionalDependencies: - '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - - '@mui/styles@6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1)': dependencies: '@babel/runtime': 7.25.0 '@emotion/hash': 0.9.2 @@ -12127,22 +12035,6 @@ snapshots: '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/react': 18.3.3 - '@mui/system@6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/private-theming': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) - '@mui/styled-engine': 6.0.0-beta.6(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(react@18.3.1) - '@mui/types': 7.2.15(@types/react@18.3.3) - '@mui/utils': 6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1) - clsx: 2.1.1 - csstype: 3.1.3 - prop-types: 15.8.1 - react: 18.3.1 - optionalDependencies: - '@emotion/react': 11.13.0(@types/react@18.3.3)(react@18.3.1) - '@emotion/styled': 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@types/react': 18.3.3 - '@mui/types@7.2.15(@types/react@18.3.3)': optionalDependencies: '@types/react': 18.3.3 @@ -12159,18 +12051,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.3 - '@mui/utils@6.0.0-beta.6(@types/react@18.3.3)(react@18.3.1)': - dependencies: - '@babel/runtime': 7.25.0 - '@mui/types': 7.2.15(@types/react@18.3.3) - '@types/prop-types': 15.7.12 - clsx: 2.1.1 - prop-types: 15.8.1 - react: 18.3.1 - react-is: 18.3.1 - optionalDependencies: - '@types/react': 18.3.3 - '@netlify/functions@2.8.1': dependencies: '@netlify/serverless-functions-api': 1.19.1 From bf972342fe956e5e4604df514155e5721989e308 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 21 Aug 2024 20:06:55 +0300 Subject: [PATCH 43/96] proptypes --- .../SingleInputDateRangeField/SingleInputDateRangeField.tsx | 4 ---- .../SingleInputDateTimeRangeField.tsx | 4 ---- .../SingleInputTimeRangeField/SingleInputTimeRangeField.tsx | 4 ---- packages/x-date-pickers/src/DateField/DateField.tsx | 4 ---- packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx | 4 ---- packages/x-date-pickers/src/TimeField/TimeField.tsx | 4 ---- 6 files changed, 24 deletions(-) diff --git a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx index 47aaa7d7b767..edc1e5b91b69 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateRangeField/SingleInputDateRangeField.tsx @@ -149,7 +149,6 @@ SingleInputDateRangeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. - * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -176,12 +175,10 @@ SingleInputDateRangeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. - * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. - * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -189,7 +186,6 @@ SingleInputDateRangeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. - * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx index d126a4410187..57d0a57f3a91 100644 --- a/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputDateTimeRangeField/SingleInputDateTimeRangeField.tsx @@ -159,7 +159,6 @@ SingleInputDateTimeRangeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. - * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -186,12 +185,10 @@ SingleInputDateTimeRangeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. - * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. - * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -199,7 +196,6 @@ SingleInputDateTimeRangeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. - * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx index 7edf4640c435..cd37622a001e 100644 --- a/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx +++ b/packages/x-date-pickers-pro/src/SingleInputTimeRangeField/SingleInputTimeRangeField.tsx @@ -159,7 +159,6 @@ SingleInputTimeRangeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. - * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -186,12 +185,10 @@ SingleInputTimeRangeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. - * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. - * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -199,7 +196,6 @@ SingleInputTimeRangeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. - * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers/src/DateField/DateField.tsx b/packages/x-date-pickers/src/DateField/DateField.tsx index 17719505b213..5f707a99d31a 100644 --- a/packages/x-date-pickers/src/DateField/DateField.tsx +++ b/packages/x-date-pickers/src/DateField/DateField.tsx @@ -141,7 +141,6 @@ DateField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. - * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -168,12 +167,10 @@ DateField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. - * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. - * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -181,7 +178,6 @@ DateField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. - * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx b/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx index 38fcae53aa68..44db7bb3fb50 100644 --- a/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx +++ b/packages/x-date-pickers/src/DateTimeField/DateTimeField.tsx @@ -151,7 +151,6 @@ DateTimeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. - * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -178,12 +177,10 @@ DateTimeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. - * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. - * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -191,7 +188,6 @@ DateTimeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. - * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** diff --git a/packages/x-date-pickers/src/TimeField/TimeField.tsx b/packages/x-date-pickers/src/TimeField/TimeField.tsx index f48fa2a3bd95..10d4918133ed 100644 --- a/packages/x-date-pickers/src/TimeField/TimeField.tsx +++ b/packages/x-date-pickers/src/TimeField/TimeField.tsx @@ -151,7 +151,6 @@ TimeField.propTypes = { formatDensity: PropTypes.oneOf(['dense', 'spacious']), /** * Props applied to the [`FormHelperText`](/material-ui/api/form-helper-text/) element. - * @deprecated Use `slotProps.formHelperText` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ FormHelperTextProps: PropTypes.object, /** @@ -178,12 +177,10 @@ TimeField.propTypes = { /** * Props applied to the [`InputLabel`](/material-ui/api/input-label/) element. * Pointer events like `onClick` are enabled if and only if `shrink` is `true`. - * @deprecated Use `slotProps.inputLabel` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputLabelProps: PropTypes.object, /** * [Attributes](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input#Attributes) applied to the `input` element. - * @deprecated Use `slotProps.htmlInput` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ inputProps: PropTypes.object, /** @@ -191,7 +188,6 @@ TimeField.propTypes = { * It will be a [`FilledInput`](/material-ui/api/filled-input/), * [`OutlinedInput`](/material-ui/api/outlined-input/) or [`Input`](/material-ui/api/input/) * component depending on the `variant` prop value. - * @deprecated Use `slotProps.input` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details. */ InputProps: PropTypes.object, /** From 32ef7c5df93feb6215fec9d86649b9d9d5fee5ae Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 21 Aug 2024 20:09:14 +0300 Subject: [PATCH 44/96] docs:api --- docs/pages/x/api/date-pickers/date-field.json | 24 ++++--------------- .../x/api/date-pickers/date-time-field.json | 24 ++++--------------- .../single-input-date-range-field.json | 24 ++++--------------- .../single-input-date-time-range-field.json | 24 ++++--------------- .../single-input-time-range-field.json | 24 ++++--------------- docs/pages/x/api/date-pickers/time-field.json | 24 ++++--------------- 6 files changed, 24 insertions(+), 120 deletions(-) diff --git a/docs/pages/x/api/date-pickers/date-field.json b/docs/pages/x/api/date-pickers/date-field.json index 86a0a40da319..6aa1c3a910ad 100644 --- a/docs/pages/x/api/date-pickers/date-field.json +++ b/docs/pages/x/api/date-pickers/date-field.json @@ -19,30 +19,14 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "FormHelperTextProps": { "type": { "name": "object" } }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "inputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "InputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "InputLabelProps": { "type": { "name": "object" } }, + "inputProps": { "type": { "name": "object" } }, + "InputProps": { "type": { "name": "object" } }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/date-time-field.json b/docs/pages/x/api/date-pickers/date-time-field.json index fd351264e7bb..28e462156626 100644 --- a/docs/pages/x/api/date-pickers/date-time-field.json +++ b/docs/pages/x/api/date-pickers/date-time-field.json @@ -21,30 +21,14 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "FormHelperTextProps": { "type": { "name": "object" } }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "inputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "InputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "InputLabelProps": { "type": { "name": "object" } }, + "inputProps": { "type": { "name": "object" } }, + "InputProps": { "type": { "name": "object" } }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/single-input-date-range-field.json b/docs/pages/x/api/date-pickers/single-input-date-range-field.json index ed1d88747ddb..d029a9c08222 100644 --- a/docs/pages/x/api/date-pickers/single-input-date-range-field.json +++ b/docs/pages/x/api/date-pickers/single-input-date-range-field.json @@ -20,30 +20,14 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "FormHelperTextProps": { "type": { "name": "object" } }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "inputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "InputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "InputLabelProps": { "type": { "name": "object" } }, + "inputProps": { "type": { "name": "object" } }, + "InputProps": { "type": { "name": "object" } }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json b/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json index a86835c66bf3..dfc1fa601465 100644 --- a/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json +++ b/docs/pages/x/api/date-pickers/single-input-date-time-range-field.json @@ -22,30 +22,14 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "FormHelperTextProps": { "type": { "name": "object" } }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "inputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "InputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "InputLabelProps": { "type": { "name": "object" } }, + "inputProps": { "type": { "name": "object" } }, + "InputProps": { "type": { "name": "object" } }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/single-input-time-range-field.json b/docs/pages/x/api/date-pickers/single-input-time-range-field.json index 172017d5f76f..9fcb5181883d 100644 --- a/docs/pages/x/api/date-pickers/single-input-time-range-field.json +++ b/docs/pages/x/api/date-pickers/single-input-time-range-field.json @@ -22,30 +22,14 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "FormHelperTextProps": { "type": { "name": "object" } }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "inputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "InputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "InputLabelProps": { "type": { "name": "object" } }, + "inputProps": { "type": { "name": "object" } }, + "InputProps": { "type": { "name": "object" } }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { diff --git a/docs/pages/x/api/date-pickers/time-field.json b/docs/pages/x/api/date-pickers/time-field.json index 1d66c6ab3823..fe2713222b37 100644 --- a/docs/pages/x/api/date-pickers/time-field.json +++ b/docs/pages/x/api/date-pickers/time-field.json @@ -21,30 +21,14 @@ "type": { "name": "enum", "description": "'dense'
| 'spacious'" }, "default": "\"dense\"" }, - "FormHelperTextProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.formHelperText instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "FormHelperTextProps": { "type": { "name": "object" } }, "fullWidth": { "type": { "name": "bool" }, "default": "false" }, "helperText": { "type": { "name": "node" } }, "hiddenLabel": { "type": { "name": "bool" }, "default": "false" }, "id": { "type": { "name": "string" } }, - "InputLabelProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.inputLabel instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "inputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.htmlInput instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, - "InputProps": { - "type": { "name": "object" }, - "deprecated": true, - "deprecationInfo": "Use slotProps.input instead. This prop will be removed in v7. See Migrating from deprecated APIs for more details." - }, + "InputLabelProps": { "type": { "name": "object" } }, + "inputProps": { "type": { "name": "object" } }, + "InputProps": { "type": { "name": "object" } }, "inputRef": { "type": { "name": "custom", "description": "ref" } }, "label": { "type": { "name": "node" } }, "margin": { From 88fefcdc060bc89c0358b01fcbfd8a80835facb0 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 21 Aug 2024 20:22:41 +0300 Subject: [PATCH 45/96] Use `>=` v6 specifier --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-generator/package.json | 4 ++-- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 976c7fe531ef..0d34ba6e31ff 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -53,7 +53,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index f9ce38b60a34..466ea56e2788 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -51,7 +51,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index bd14d2ccd10f..b604d818d18e 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -48,8 +48,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/icons-material": "^5.4.1 || ^6", - "@mui/material": "^5.15.14 || ^6", + "@mui/icons-material": "^5.4.1 || >=6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 4ea2787b7aaf..59528f102fe4 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -59,7 +59,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 006abe47a177..9d82c3e9dda2 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 200a861708e2..3767dd7529df 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -58,7 +58,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index cf9b93237dbb..2d77707336fe 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -54,7 +54,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 369b994ec6e0..e3d888419bff 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -56,7 +56,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 339dc5735e99..b9b911626948 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 3ee64bec1d2a..b26b62df3ef2 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -55,7 +55,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6", + "@mui/material": "^5.15.14 || >=6", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, From 8455ec7ce6c0ea8175123c6337fe714ab212d64a Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 21 Aug 2024 20:48:29 +0300 Subject: [PATCH 46/96] Use more specific v6 `^` version specifier --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-generator/package.json | 4 ++-- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 0d34ba6e31ff..f29fdfcbc574 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -53,7 +53,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 466ea56e2788..22a2f3a990ab 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -51,7 +51,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index b604d818d18e..1378a8801d1e 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -48,8 +48,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/icons-material": "^5.4.1 || >=6", - "@mui/material": "^5.15.14 || >=6", + "@mui/icons-material": "^5.4.1 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 59528f102fe4..4dedc9748f2d 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -59,7 +59,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 9d82c3e9dda2..1f017f5c973c 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 3767dd7529df..268c5fe4efa6 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -58,7 +58,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 2d77707336fe..cb54d5bca9f2 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -54,7 +54,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index e3d888419bff..b81549159440 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -56,7 +56,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index b9b911626948..fb34cba792d8 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index b26b62df3ef2..d47163b8dad8 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -55,7 +55,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || >=6", + "@mui/material": "^5.15.14 || ^6.0.0-beta.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, From 9f509d4002dfb47c182b7432c28cc5028213049c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 21 Aug 2024 23:50:54 +0200 Subject: [PATCH 47/96] update supported version range for @mui/material peer dep --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-generator/package.json | 4 ++-- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index f29fdfcbc574..054fb306b4df 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -53,7 +53,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 22a2f3a990ab..f882a137ada8 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -51,7 +51,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index 1378a8801d1e..ec22d3a2934c 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -48,8 +48,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/icons-material": "^5.4.1 || ^6.0.0-beta.0", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/icons-material": "^5.4.1 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 4dedc9748f2d..99f81500bc11 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -59,7 +59,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 1f017f5c973c..45a678e97d28 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 268c5fe4efa6..ee9f475a5830 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -58,7 +58,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index cb54d5bca9f2..2f2528b261fe 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -54,7 +54,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index b81549159440..771031872aad 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -56,7 +56,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index fb34cba792d8..e8f6281d4cb0 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -57,7 +57,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index d47163b8dad8..e39a9e292a93 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -55,7 +55,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.0", + "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, From 65ba268873e642fdce63d1f98fb15c416646c5d4 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 00:09:35 +0200 Subject: [PATCH 48/96] add use-material-ui-v6 script --- package.json | 1 + scripts/material-ui-v6.patch | 190 +++++++++++++++++++++++++++++++++++ scripts/useMaterialUIv6.mjs | 11 ++ 3 files changed, 202 insertions(+) create mode 100644 scripts/material-ui-v6.patch create mode 100644 scripts/useMaterialUIv6.mjs diff --git a/package.json b/package.json index a6aacfe942cd..c6205682ff76 100644 --- a/package.json +++ b/package.json @@ -55,6 +55,7 @@ "typescript": "lerna run --no-bail --parallel typescript", "typescript:ci": "lerna run --concurrency 1 --no-bail --no-sort typescript", "use-react-version": "node scripts/useReactVersion.mjs", + "use-material-ui-v6": "node scripts/useMaterialUIv6.mjs", "build:codesandbox": "lerna run --concurrency 3 --no-private --scope \"@mui/*\" build", "install:codesandbox": "pnpm install --no-frozen-lockfile", "release:changelog": "node scripts/releaseChangelog.mjs", diff --git a/scripts/material-ui-v6.patch b/scripts/material-ui-v6.patch new file mode 100644 index 000000000000..57fda1a1a0d1 --- /dev/null +++ b/scripts/material-ui-v6.patch @@ -0,0 +1,190 @@ +diff --git a/docs/package.json b/docs/package.json +index d779100d9a..1b7d072164 100644 +--- a/docs/package.json ++++ b/docs/package.json +@@ -28,14 +28,14 @@ + "@emotion/server": "^11.11.0", + "@emotion/styled": "^11.13.0", + "@mui/docs": "6.0.0-beta.6", +- "@mui/icons-material": "^5.16.7", ++ "@mui/icons-material": "next", + "@mui/joy": "^5.0.0-beta.48", + "@mui/lab": "^5.0.0-alpha.173", +- "@mui/material": "^5.16.7", +- "@mui/material-nextjs": "^5.16.6", +- "@mui/styles": "^5.16.7", +- "@mui/system": "^5.16.7", +- "@mui/utils": "^5.16.6", ++ "@mui/material": "next", ++ "@mui/material-nextjs": "next", ++ "@mui/styles": "next", ++ "@mui/system": "next", ++ "@mui/utils": "next", + "@mui/x-charts": "workspace:*", + "@mui/x-charts-vendor": "workspace:*", + "@mui/x-data-grid": "workspace:*", +diff --git a/package.json b/package.json +index a6aacfe942..a9e920990e 100644 +--- a/package.json ++++ b/package.json +@@ -88,12 +88,12 @@ + "@emotion/cache": "^11.13.1", + "@emotion/react": "^11.13.0", + "@emotion/styled": "^11.13.0", +- "@mui/icons-material": "^5.16.7", ++ "@mui/icons-material": "next", + "@mui/internal-markdown": "^1.0.10", + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.7", ++ "@mui/material": "next", + "@mui/monorepo": "github:mui/material-ui#0acfe665034fdf4578156ebaf4372713cf23bce4", +- "@mui/utils": "^5.16.6", ++ "@mui/utils": "next", + "@next/eslint-plugin-next": "14.2.5", + "@octokit/plugin-retry": "^7.1.1", + "@octokit/rest": "^21.0.2", +diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json +index f29fdfcbc5..ed204e689f 100644 +--- a/packages/x-charts-pro/package.json ++++ b/packages/x-charts-pro/package.json +@@ -66,7 +66,7 @@ + } + }, + "devDependencies": { +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@react-spring/core": "^9.7.4", + "@react-spring/shared": "^9.7.4", + "@types/prop-types": "^15.7.12", +diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json +index 22a2f3a990..a5df8948ac 100644 +--- a/packages/x-charts/package.json ++++ b/packages/x-charts/package.json +@@ -65,7 +65,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@react-spring/core": "^9.7.4", + "@react-spring/shared": "^9.7.4", + "@types/prop-types": "^15.7.12", +diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json +index 1378a8801d..c7449032e2 100644 +--- a/packages/x-data-grid-generator/package.json ++++ b/packages/x-data-grid-generator/package.json +@@ -40,8 +40,8 @@ + "lru-cache": "^10.4.3" + }, + "devDependencies": { +- "@mui/icons-material": "^5.16.5", +- "@mui/material": "^5.16.5", ++ "@mui/icons-material": "next", ++ "@mui/material": "next", + "@types/chance": "^1.1.6", + "rimraf": "^5.0.10" + }, +diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json +index 4dedc9748f..05306b7a17 100644 +--- a/packages/x-data-grid-premium/package.json ++++ b/packages/x-data-grid-premium/package.json +@@ -73,7 +73,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@types/prop-types": "^15.7.12", + "date-fns": "^2.30.0", + "rimraf": "^5.0.10" +diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json +index 1f017f5c97..ab827949a1 100644 +--- a/packages/x-data-grid-pro/package.json ++++ b/packages/x-data-grid-pro/package.json +@@ -71,7 +71,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@types/prop-types": "^15.7.12", + "rimraf": "^5.0.10" + }, +diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json +index 268c5fe4ef..b1d4badeb8 100644 +--- a/packages/x-data-grid/package.json ++++ b/packages/x-data-grid/package.json +@@ -73,7 +73,7 @@ + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", + "@mui/joy": "^5.0.0-beta.48", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@mui/types": "^7.2.15", + "@types/prop-types": "^15.7.12", + "rimraf": "^5.0.10" +diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json +index cb54d5bca9..8d20fb4fc3 100644 +--- a/packages/x-date-pickers-pro/package.json ++++ b/packages/x-date-pickers-pro/package.json +@@ -96,7 +96,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@types/luxon": "^3.4.2", + "@types/prop-types": "^15.7.12", + "date-fns": "^2.30.0", +diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json +index b815491594..127d4c20a8 100644 +--- a/packages/x-date-pickers/package.json ++++ b/packages/x-date-pickers/package.json +@@ -98,7 +98,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@types/luxon": "^3.4.2", + "@types/moment-hijri": "^2.1.4", + "@types/moment-jalaali": "^0.7.9", +diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json +index fb34cba792..6267e1a8aa 100644 +--- a/packages/x-tree-view-pro/package.json ++++ b/packages/x-tree-view-pro/package.json +@@ -71,7 +71,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@types/prop-types": "^15.7.12", + "rimraf": "^5.0.10" + }, +diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json +index d47163b8da..91760dc790 100644 +--- a/packages/x-tree-view/package.json ++++ b/packages/x-tree-view/package.json +@@ -69,7 +69,7 @@ + }, + "devDependencies": { + "@mui/internal-test-utils": "^1.0.8", +- "@mui/material": "^5.16.5", ++ "@mui/material": "next", + "@types/prop-types": "^15.7.12", + "rimraf": "^5.0.10" + }, +diff --git a/test/package.json b/test/package.json +index d0c46845ff..ab90a583a1 100644 +--- a/test/package.json ++++ b/test/package.json +@@ -9,7 +9,7 @@ + "@babel/runtime": "^7.25.0", + "@emotion/cache": "^11.13.1", + "@emotion/react": "^11.13.0", +- "@mui/material": "^5.16.7", ++ "@mui/material": "next", + "@mui/x-data-grid": "workspace:*", + "@mui/x-data-grid-pro": "workspace:*", + "@mui/x-date-pickers": "workspace:*", diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs new file mode 100644 index 000000000000..dc019cbfd392 --- /dev/null +++ b/scripts/useMaterialUIv6.mjs @@ -0,0 +1,11 @@ +import childProcess from 'child_process'; + +childProcess.spawnSync('git', ['apply', 'scripts/material-ui-v6.patch'], { + shell: true, + stdio: ['inherit', 'inherit', 'inherit'], +}); + +childProcess.spawnSync('pnpm', ['install'], { + shell: true, + stdio: ['inherit', 'inherit', 'inherit'], +}); From 9c6b41d24d7dfa72dc94ab7b89132283b02cf1e3 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 00:09:49 +0200 Subject: [PATCH 49/96] add material-ui-v6 workflow --- .circleci/config.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 53f9f97eed6c..36c0879f0e8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,10 @@ parameters: description: The version of react to be used type: string default: stable + material-ui-version: + description: The version of @mui/material to use + type: string + default: stable workflow: description: The name of the workflow to run type: string @@ -99,6 +103,14 @@ commands: # log a patch for maintainers who want to check out this change git --no-pager diff HEAD + - when: + condition: + equal: [next, << parameters.material-ui-version >>] + steps: + - run: + name: Install @mui/material@next + command: pnpm use-material-ui-v6 + - when: condition: << parameters.browsers >> steps: @@ -383,3 +395,22 @@ workflows: <<: *default-context react-version: next name: test_e2e-react@next + material-ui-v6: + equal: [material-ui-v6, << pipeline.parameters.workflow >>] + jobs: + - test_unit: + <<: *default-context + material-ui-version: next + name: test_unit-@mui/material@next + - test_browser: + <<: *default-context + material-ui-version: next + name: test_browser-@mui/material@next + - test_regressions: + <<: *default-context + material-ui-version: next + name: test_regressions-@mui/material@next + - test_e2e: + <<: *default-context + material-ui-version: next + name: test_e2e-@mui/material@next From cbf3d263744393fe930e10ec51307f4710bd4447 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 00:19:53 +0200 Subject: [PATCH 50/96] fix workflow --- .circleci/config.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36c0879f0e8a..3e5dfe7b62d3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,10 +9,6 @@ parameters: description: The version of react to be used type: string default: stable - material-ui-version: - description: The version of @mui/material to use - type: string - default: stable workflow: description: The name of the workflow to run type: string @@ -28,6 +24,10 @@ default-job: &default-job description: The version of react to be used type: string default: << pipeline.parameters.react-version >> + material-ui-version: + description: The version of @mui/material to use + type: string + default: << pipeline.parameters.material-ui-version >> e2e-base-url: description: The base url for running end-to-end test type: string @@ -61,6 +61,10 @@ commands: type: boolean default: false description: 'Set to true if you intend to any browser (for example with playwright).' + material-ui-version: + description: The version of @mui/material to use + type: string + default: stable steps: - when: @@ -395,8 +399,10 @@ workflows: <<: *default-context react-version: next name: test_e2e-react@next + material-ui-v6: - equal: [material-ui-v6, << pipeline.parameters.workflow >>] + when: + equal: [material-ui-v6, << pipeline.parameters.workflow >>] jobs: - test_unit: <<: *default-context From 52004b474115a20b92041500f8471464db4cb341 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 00:48:07 +0200 Subject: [PATCH 51/96] try to fix skipped step --- .circleci/config.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3e5dfe7b62d3..4f8a2f0869dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,10 +24,6 @@ default-job: &default-job description: The version of react to be used type: string default: << pipeline.parameters.react-version >> - material-ui-version: - description: The version of @mui/material to use - type: string - default: << pipeline.parameters.material-ui-version >> e2e-base-url: description: The base url for running end-to-end test type: string @@ -61,10 +57,6 @@ commands: type: boolean default: false description: 'Set to true if you intend to any browser (for example with playwright).' - material-ui-version: - description: The version of @mui/material to use - type: string - default: stable steps: - when: @@ -109,7 +101,7 @@ commands: - when: condition: - equal: [next, << parameters.material-ui-version >>] + equal: [material-ui-v6, << pipeline.parameters.workflow >>] steps: - run: name: Install @mui/material@next @@ -406,17 +398,13 @@ workflows: jobs: - test_unit: <<: *default-context - material-ui-version: next name: test_unit-@mui/material@next - test_browser: <<: *default-context - material-ui-version: next name: test_browser-@mui/material@next - test_regressions: <<: *default-context - material-ui-version: next name: test_regressions-@mui/material@next - test_e2e: <<: *default-context - material-ui-version: next name: test_e2e-@mui/material@next From 03793d122cd9a0214a7c71abbc856b9cf0823259 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 01:38:37 +0200 Subject: [PATCH 52/96] exit with proper code --- scripts/useMaterialUIv6.mjs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index dc019cbfd392..4f72aa20e1f8 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -1,11 +1,15 @@ import childProcess from 'child_process'; -childProcess.spawnSync('git', ['apply', 'scripts/material-ui-v6.patch'], { +const gitApply = childProcess.spawnSync('git', ['apply', 'scripts/material-ui-v6.patch'], { shell: true, stdio: ['inherit', 'inherit', 'inherit'], }); +if (gitApply.status !== 0) { + process.exit(gitApply.status); +} -childProcess.spawnSync('pnpm', ['install'], { +const pnpmInstall = childProcess.spawnSync('pnpm', ['install'], { shell: true, stdio: ['inherit', 'inherit', 'inherit'], }); +process.exit(pnpmInstall.status); From ec08b527bc64d590b84d08fd3c04855e4004cae5 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 01:38:48 +0200 Subject: [PATCH 53/96] --no-frozen-lockfile --- scripts/useMaterialUIv6.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index 4f72aa20e1f8..8e8cac3c0136 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -8,7 +8,7 @@ if (gitApply.status !== 0) { process.exit(gitApply.status); } -const pnpmInstall = childProcess.spawnSync('pnpm', ['install'], { +const pnpmInstall = childProcess.spawnSync('pnpm', ['install', '--no-frozen-lockfile'], { shell: true, stdio: ['inherit', 'inherit', 'inherit'], }); From 3ce39eae0b9fcbf8186276ec9a2000792b8a6295 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 01:39:17 +0200 Subject: [PATCH 54/96] fix jobs names apparently you can't have slash there --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f8a2f0869dc..2aedb1dd104a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -398,13 +398,13 @@ workflows: jobs: - test_unit: <<: *default-context - name: test_unit-@mui/material@next + name: test_unit-material@next - test_browser: <<: *default-context - name: test_browser-@mui/material@next + name: test_browser-material@next - test_regressions: <<: *default-context - name: test_regressions-@mui/material@next + name: test_regressions-material@next - test_e2e: <<: *default-context - name: test_e2e-@mui/material@next + name: test_e2e-material@next From 4663687d4c1c8d69d0d712d457caaaa1b7afa73c Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 22 Aug 2024 11:58:13 +0300 Subject: [PATCH 55/96] Avoid using `Grid2` because of unstable behavior between v6 and v5 --- docs/src/modules/components/ChartFeaturesGrid.js | 4 ++-- docs/src/modules/components/InstallationGrid.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/src/modules/components/ChartFeaturesGrid.js b/docs/src/modules/components/ChartFeaturesGrid.js index 5d7cc26b75ba..36af272ba23c 100644 --- a/docs/src/modules/components/ChartFeaturesGrid.js +++ b/docs/src/modules/components/ChartFeaturesGrid.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import Grid from '@mui/material/Unstable_Grid2'; +import Grid from '@mui/material/Grid'; import { InfoCard } from '@mui/docs/InfoCard'; import LineAxisRoundedIcon from '@mui/icons-material/LineAxisRounded'; import DashboardCustomizeRoundedIcon from '@mui/icons-material/DashboardCustomizeRounded'; @@ -45,7 +45,7 @@ export default function ChartFeaturesGrid() { return ( {content.map(({ icon, title, link }) => ( - + ))} diff --git a/docs/src/modules/components/InstallationGrid.js b/docs/src/modules/components/InstallationGrid.js index 58a737685290..a917df909e2a 100644 --- a/docs/src/modules/components/InstallationGrid.js +++ b/docs/src/modules/components/InstallationGrid.js @@ -1,5 +1,5 @@ import * as React from 'react'; -import Grid from '@mui/material/Unstable_Grid2'; +import Grid from '@mui/material/Grid'; import { InfoCard } from '@mui/docs/InfoCard'; import AccountTreeRounded from '@mui/icons-material/AccountTreeRounded'; import PivotTableChartRoundedIcon from '@mui/icons-material/PivotTableChartRounded'; @@ -38,7 +38,7 @@ export default function InstallationGrid() { return ( {content.map(({ icon, title, description, link }) => ( - + Date: Thu, 22 Aug 2024 15:28:32 +0200 Subject: [PATCH 56/96] remove unnecessary from the readme --- test/README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/test/README.md b/test/README.md index f2cf5858e304..8dc7d9603680 100644 --- a/test/README.md +++ b/test/README.md @@ -2,17 +2,15 @@ ## Testing multiple versions of React -You can check integration of different versions of React (for example different [release channels](https://react.dev/community/versioning-policy) or PRs to React) by running the following commands: +You can check integration of different versions of React (for example different [release channels](https://react.dev/community/versioning-policy) or PRs to React) by running the following command: -1. `pnpm use-react-version `. +`pnpm use-react-version `. - Possible values for `version`: +Possible values for `version`: - - default: `stable` (minimum supported React version) - - a tag on npm, for example `next`, `experimental` or `latest` - - an older version, for example `^17.0.0` - -2. `pnpm install` +- default: `stable` (minimum supported React version) +- a tag on npm, for example `next`, `experimental` or `latest` +- an older version, for example `^17.0.0` ### CI From 33b61ac679517caefada6bd77690956fc8cfbf1a Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 15:35:24 +0200 Subject: [PATCH 57/96] update readme --- test/README.md | 26 +++++++++++++++++++++++++- test/circleci-workflow.png | Bin 0 -> 40490 bytes 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 test/circleci-workflow.png diff --git a/test/README.md b/test/README.md index 8dc7d9603680..516b1d4c60eb 100644 --- a/test/README.md +++ b/test/README.md @@ -4,7 +4,7 @@ You can check integration of different versions of React (for example different [release channels](https://react.dev/community/versioning-policy) or PRs to React) by running the following command: -`pnpm use-react-version `. +`pnpm use-react-version ` Possible values for `version`: @@ -42,3 +42,27 @@ curl --request POST \ --header 'Circle-Token: $CIRCLE_TOKEN' \ --data-raw '{"branch":"pull/24289/head","parameters":{"react-version":"next"}}' ``` + +## Testing multiple versions of Material UI + +Currently, we use `@mui/material` v5 in the MUI X repo and all tests are run against it. +But MUI X packages are compatible with v5 and v6. +You can run the tests against `@mui/material` v6 by running the following command: + +`pnpm use-material-ui-v6` + +### CI + +There's a `material-ui-v6` workflow in our CircleCI pipeline that you can trigger in CircleCI on the PR you want to test: + +1. Go to https://app.circleci.com/pipelines/github/mui/mui-x?branch=pull/PR_NUMBER and replace `PR_NUMBER` with the PR number you want to test. +2. Click `Trigger Pipeline` button. +3. Expand `Add parameters (optional)` and add the following parameter: + + | Parameter type | Name | Value | + | :------------- | :--------- | :--------------- | + | `string` | `workflow` | `material-ui-v6` | + +4. Click `Trigger Pipeline` button. + +![CircleCI workflow](./circleci-workflow.png) diff --git a/test/circleci-workflow.png b/test/circleci-workflow.png new file mode 100644 index 0000000000000000000000000000000000000000..de549e5eef462be7883674ae50802b25d19febc9 GIT binary patch literal 40490 zcmd42XH-*B7d9A*kWiB#NEHGJz4u-&0YVQ|KtKef2+~E0R73Awkrt#0h=_C*Y0?D* zL^?{ZQltvX#P|KaS!>psS@Zq))|&Z|tb0${d!K#wK6l?IPvWo!TGSNG6d(|YS{s8l z27$F_44w%efxHGb@kc#+0@k3{rmSH zKYonI;~gCx*Vfj!xVV~{nm&E{w6n8gYiny^Ve$F%=i1uZ(a}+7XXllb6?1d*rKP3! z@893Odp9N~MoUYJl9Fg1+S=MkF_roGc|SkDhK7d0 z!NJAF#oxbwcXoEh#l_Lm(&pyo78DeWjg2KGCGG9)Wo2bmR#rwtM7)0e+Q7h|s;Vj> zA%S03#MjrirKRPjI5!*)KRrEt^ytx#A3uD2d>BO#QBhG&PEM_}2a<|1o4+o4dwVOs z?DqHfQ-yx+`SFYX$w+W;@Yl_g&#TAjJ(~(oCx7gn2e+inqD6$Q*jjN5j7k61J zSraZ3)GyQ--Z9XQ(niN8`&{}62MC8i?FBDK-ig4_L{FMTaK}T-h+I-xh}tg<--^)dUDZB(nGOn|=EMncl72TugKwk3?Jr}Y zjj_;h6BxoBh5(gw0%x}#DzvmlM07$Cj`TlQw#djR)N!e1%^6iJjJ#AZ!2E|njfY*4 z=pq|lvmq-eX5VHC=cZ+HoE-#``Z zK;gHKPqi6iv+mI3@(#dX1TBTviCxz7z5!j;@WLI zIB?zC`E}(&KM`liEg839voM*N9xE;_tFM{{esqYvu~l+20Ykz9{goIH+E!ofR+KqQ zJ_yQxt$M5vfu(nonsJRF0MLojO?ou4))f9;NZLo7K3m?^! z9}SN$xKVD2Q~4+U1}}+`ie*pkm%q}HhPfJ zSdEed6vszz#77SrU+$HtSNcWO&1_7jxy3UG%9bTvqRKRlS+2O({08g=AbN2zNdcLSh2LdExd1)sC6C%*r%(~`Vf zg?n(cD@@gbV_na(P9I&cAFnXS%;+b~-~hhOz{dJ8hmi8dr`IHQ_mclOG9}O~vL4s4 z&~-jN{c4m{@qk$ZclzD}Tk)nbDlqyQ<-8gY|9iY{GmN~J7W(QKlazS&zQ}LnfsZhv zHxQMBlFWeB6D6tsSnlW%Mj%iQV^{mP=k%S(n>;Q<;gO2%npA&G-5yFnlkAJ#Op%b4~U(d#_T(z0Y-?!rvk7ilq1R zbX_{fTJJYB7rN&_x8H3RByF>HL=VOF9X9zQ=|>8_fdt*SNc5J~FCzq-LasK(E$Ln^h zA?~8z6p;RWq3y!ib@**4lQd%#M72ya?lmrfce*vWhHbP3thU(xBf$E~!R%eONAai& z(bgie-cGu-KHyFNZ#Q7?xA)vLoKtm)i=n~ESJ~)C>DV6o>79EDX{n*}-VnKD-{Irg zlPR8iGvTtDv%JSzkOSq`se7f;`t|+t5ZCb+dtCU#qkhu;f?FU?CWhp3p+*-ZWUn zDj6(N5t#!XN;|v5E03b`bShX0VRoAb!Elk!NXVn*yhBeo1-?vHg?*Jnl}d3K`w`8- zy(C%qn3cR+2LUuaB9B0F3%8FNI>GIUG}k0Q?6T2i9-iMUii*paVxwz3W_%Wq`A5?C zB^uxIk~)6q=-v^Wf_6(QkfG7NwT=xnu_7mCGywJgkJY6yGeQx}kO7M8GmS0@d7gR} zpf}H7poox7U*;XT5p3i{lY5-_MgvQb+?;}kyBo>w%&QRfI*L1Hg1{Y39)!h#(DNGi zd|b18%bF@7cD)VGogw|kde>ZuIMO715|$5}gk}V8oL^c`iZ(PVTzZRVK)=$5Q~h{{ ziFN4<5N(LU5)w}^O{H8(%AqR$jxeHsyf0h-R-*wx+e5XX-|!!g6vJB$FcHdKdYZX~I+m&}}-x)7_w*tM7y zkGi?`a0zrp)N+oY`rbi8>VkeY3!_&wxC6Z4*b+hH91BhS{{N3ATZ#Q`NqwSrvRJ4O zx?+Q~k*??_Cyo`yf4*23LfG5n4DOLlvhR4f&vBC}JfR+b{F) zvN{nf)1&u@qJMME)8R(#dvS?^NVf!;Kt`H%Uv~c(Fp%o(b+o$C8J~UU`r1@jC~1^&~ujk-Qt}4H0EP;tq2JRKTkAG(U66A!M$T!eze9ZJ+ zBzJt%v<*dDik~~mMBGi1uocOhA%F&=- zeJ~BlKc5FWcyxIGjFo6fWMo)M2VS!3xC%gyEzOC?rS|3=F=;TAb;q3PK{7tvb7GBg z@BzciAjTrNaps>hbBI**wGKh;3b}D|^%Ye+S7wYFGV|?zftKgZx1+mKt<$Fu$3*ml zBz@)NSU@tq=ouQp2N=LR9FR1q1+IK)h>Kyy3Ly43Om-6HXznbV3svPmH$20)!++zkyoZbe4U6J z>WE{3k-P!SqYYqf{q4a@P+?NHZB?OMni{_be0&=SK%(_2n~xO3J%?>*(kIv+JRh?W z*so*Tx<{+zh(CrenF!DPVk$74{)VEzVDw}m_Ti&N#00pKy0_%Yj(Sg`-)3e=00YEB z_EnXYuMjs(y;pO~bI)WhZOya@;W$`FE4%^@pF?w`nUc4#-FgHP&4$uuv+Bl@>t21* z)%wKo`JbVDuQ?IM8ok{1aAdcF5{TKPM>tUQ21ZQpF6WK@THMOU#M^#qlb)m9CwGGs z7Nq3_Gd%Djn7*+%HY$^4=YX5BZ!;aPCmZI7Bz;eUm{SN8YiD5vXa??*F%0!8$W*bm z_mLsvWC->!&56IuN-eF?ABM-zVZesYDIv+Y_~KY@&x)FC|9=~vc_R(VJU%wUp-X3s zMDJ45pwJV6KXiWYR7A3^ydNPcAHNNO{g_*oShTutbwjz_;pp3L&w25h-bZw6R2vde z?5E+K+*s~)W^IXogd!zx16kBOykCjqFbupK`I)hxgO9@uaC}CA@DV_$-|x_X9N4{d zfFzx(KeUxLBe+87H3FaKTbzL|YhQ0dWpi~DSf-c89h1A8?<{r-#; zAL8bjSEmzkgJnAQGdx}L=C`ef(XD=|J@OE_CIIjmz}?AC6=JIV5hv4lsx*ml(W4xU zwJVl@qb3qH#Imt!EHv3D$HjofBwXio9+>1`EYoema|1bfZGbwC4ov|hhPS?f+};?- z%lg0s=THMWz}6=FOHrIsZoW3LB>^e;jw(?A5lQJRGxwhhA-WT5smWP6aHfGXtV%cmm`N~xSRHswyH68xKa*b`$syP zm&PWW1K$LJ959)_iTd~a$e*?ah8bgS1=!5yAd#P-NetSl&@k}Eha{Bp6f3Qqiy`D| z{kqqc;WKyIS6f}FU)rf!Z%=0qU-WI zuE-CPoE${54%Ot&t9yNo)SZ^7nX>Ir{d~Wij#xD8x&-A?=DH5UlHv zx<#a|U6Sph1qwQsLzvSN8#zkA#TDPf&_L%>C#f0(_gVY^9Z}W)h{Hci5W4; z`tOHuioeE2EGE5^Vgj?-{wNH%Kb9t<{Yn3(^Y`q>ER<^jqiVOc`#u@^Y$oCax63Ww zBTm1*_QCWzb-#Jhxf#Ur6B7j|vXSCKtlT;Q8>V4TH9s+{Liy%&jjw__rBsv0oykHS|4~2wnpEsPp&J)Q7zA|uYi5eVp!|5a62gL!f#GifVi|f zyx8)p)W6^2=YeKu3;$9ojQ*A$24g$TrKk>st(oWiTMn142B3HZlXuXu7QpwQU_ zc@!Y^Vz2KU({^i_;N8*Q{pGq)OGw`~_Io-(|-by)Y|toi;` z>J#Y<=t>7P%4tP?j+?|G48D0gS%rn30bQ<5k5G);*N>EP)E_Yj%n={3=alPP_07@f%~|^eQNm@T4+KkoU(7QgXhC6q+%RvAIy@x zm;JZl8AwRP^D+Ia4CC!b%NN(k0|V|l`S^qmJZ1PR_Am8#T;asu7M+atG#|cxoZw2X z$^2XU#(im?^>UNRzrGa4gd7-7#a&+=5E<(KC~T(@_;1!erSIWuN(&=fs;pGb%g(&Z zZDRAx8w78FKZ^2PwT9ELe!@cduHN2?>4A}|Qjrd}pO?Egle2#?lbL6Vburk_@O^SO z5$qjVn8!lpfR3fRT$!_Dp|E-8|&oSD46?7~QjJQn)7XU|mulm2qwmko}Cwj*K8bcpa-I08moGkbP4-r;e?%90fgCSsm|u^QldwlquO2-PP+ zKv&$T#XBRpSZI-&O~em0Z?VTjB0msLcAOMLhY$CEAzuk5;+)_D++v{|03F(e8b*wE zi3Gnw0O4SLC|(K;w%wT()9q4a48N;P(}GuT{7%mwpe-c3e&bBQChwgkl$hd=_YAX3 zgDYpw>zts#LcY{pmP1<~IVc{4#*o8^RdK{n1REL*f>EgA{0J^W^MYVw1ho49egLmV zUp@--SLTT{8WW?5v%aTbYS1J8{9P7^1GqsDz>BV^SJGjMvYZkzbOismjVcA}8Z5`u z)%jB>i7;#?HZ}PNtnLp#Q^cF3U?M0Fu;8q6JxcqjIWF(?nPHHz4VhM-6pPC4fKUA` ze9HqtQq@Fo%Z};5h=@y0LVgKKTE)iNW; z!5;!`Vl*oF9{tcuJ1S{KvLYr_j?`PHj7ONGxIFAjXh17@SODqMtT&g!pr zr;HLte+=C>v(>_ZtTk}(SE&;+y;~1eaWv|_)0V>}`a-}-IGAWtG;E9kzdh$OVxufU zp**edWI_6_D3w56v5rNj%wQ2VB94vEIh5#QT~2=R?RuRIbJs0TmNja^Il_T(e;}+7`>eP(^8q+x8qk8TK$ z@}aDBq1-c?H`E1poC@N5Js$9-Z0Nvz4eBzD>V$1CWE^O}!?YFTG@i$ir=E|ue&vUP z1(A4HN+z|ZcpN9fN{U{?o1dlN*qMF@-uy1ZyaARzkGW9Y*sfguo-T4r2Ye4X>{e+O z2`|S`45Yo!vWBKPnx5uhz#UiNxJ>spDE;kE9q-oxUlq z=Xe~PvX}8A$&0+u`=!*vD*BvWkOCinE|G<^*_4M}v&Zn(|rqsox5D>^3e;DJcRG9RYb_Sc zy3P%Ks)fFeN z#_x0CUTx=ydziwnRShe2sp$1fR?mZ6A{YkHXio>?W62QG?Pw)X{_i4i$ z`E31_gSLs;mbz5MN^!qjMmZ)^<75!%)KB(D^sU&HcE#qSoTFk=dMJ)!M$UtN_^^5^Kwq z>I%H3`p)+FoEt(dBT@Pga7H%?k(zGVQH z_jfoMZ5eE=YhjO83xWKonLBQ!5IMVvJi;(7e8nh8AiFb6rtET0NT7Fv{5kf&p(b9` zJ|)jssx*R_J&}H;Iy;ks`jmg0)4C%A`l?3TGkbKLnKsTzoA--VxWqdiEcwa zs!>z4R1B_BR5#czrR1pGr97E2AC-=M-g$$1I%_`UOaWdg*TwF$N4}Vaqp~EeAjb}+ zLjMG1Qr>sOHARpU7penwGLdb@0PMG>tZz!#8B;?C3FM`)?E*iZ$Ni>^E)d5+>Z5s* z{0r5s4RjHk0V|^t{Oz5nsaennZdlkn3WEWHTd~f;0h(>6dKDMJyeemgx)neW6U3}d zIP>+`7d=6b_PLwJl67K(tbwu>cMik^t7jPbe5696b|2;6F8GXe;p``5{W%M~ z^N@qn<{EJXZT?eiQC5B`H0ce@JodfkOPO(aB{ZxGM8wL2e>)4(u#>eyOKd)hkh^&!tME_FxcA>x_z~+I7A_BO!Ix4p*Pi}a6&H;Db%K2OP~$2x{w%mR3vwjh`fRfvcS(HE=BA;9c$Mt9 zr`v}e$bo*Hvjtblr+Y)rJCt?XCTg10eD1)l==(akeIf`*B?LAOZ@qkmP2|olAd~BL z46!1(rk@3MbQv;#_}jm0`$I+=-^?xTK9N-VVh)IrA!H~GS}A$bsKT5DjT||Qv)%in z1_u^}s$ql>PrwDJ+&4+liIs8H5J>Q8j()prx@xZjxQv|Z!+%GoHQ(@ivi5NyxcS+p zAmseoScM!0Y(6R*@hcGCxm2Aw)X#(TW4=_;jqNuH71*lzATd=<@PU>NxUv?mzZ8cP zv;s!i)@%B|0*sJTN7f6nr}OnV#~ZKLwKvXX;aZ+21y@dHVY3BH@Iy+pZ*%EG`f$JL zNsH36EO_0ag?C_ZNQtHExHlxQKX*TwLc_C?R2)wBssg z&pUVxfu#F~#$!x@?(${#o~J?!8yu^ZCfTH@bz=|9t`M(HQ*jIPk{eAX*jU_UMh{Wh zT-`}1ba6jk9`HAGWp~laTj53cevUajk7YWNc@SNbw zbRiLKz#Z*}0*O2PQB7{y(Dj1dmkyrIMN_k@!ew_M2Sok|c#v;`+Uv+bckUI3US%FX zr6Tul4Ucx$1(esOo6GbdE+|jw=x4?b58qAyxePlbC3ti_S)#;nnr@!U{8sb0%3xqm7 z4dLEo?w50(6PvvVIq_2w??>K>S{xZ1=}~*lX$o{@pg%n&CquqPk9Dv;S!9e8&~r&1 z@_KvY=lkZZ=1yAH&&0@XTF8UR08?=ICd$$D$(x_#N=$DQuReY(^S<<8JrY)oETm(O zmG~M#k}d{oX~5@o+Ch{$Id$tBn#L>t-sHsBCv0m&b3yHT5{UU-%)YhzgjfcW^42e@ z=p6Rrs9*X4iUm*iwL>Eztk}vioJ-;4E)_i23domi%*9Q_>=}jQ(i4WhUO(^#=?Npm z%iUfEDw8*44b4{CXrwP!!9yuhV%{!44siZjON3HrlCjg*P92?q7w;LxEaf;LyTiKb zAFV-4sN1QcAOrO(h5H_Pf>~VpF05fe+`tdMnM8JHX4#@{Kkt&%(G@scqnlKRH(6L= z`WI1cDHL?|X;-$`JtOz1=!tNiN)32!Vb)5*OJO*g2D4S{aRZ{H*<$tS2!@GGsOmzY z`F&Q(xutJi<4^@czV>KJS^Ub2g5cjje%Jr{CL{^BtXDX`V91S7;=ubbK+Xfbdhb`` zXci`TG;yq;4tU)_ueI=dku9s=%1yXS*>TjbBHRE`f2M>E#&I^*^2_}^oUCMxU8#IB zF-X)HaP+8gwRrKWYRoqI$;K`_rcW5VV4@rA%ysXj=W@+f5H|!eFmlt<87SdG)yK2m z-l~oU%Yhj$>oyeN>J@J8tSYbV2s zPHKZ{Lv!%^BjuK@kvDTvlgaq5fxZs{-x(Z`q(R^;s7a?9NRWxRDI8aZum%!qif{4@ zfk1Z{|J#BElz&Uuae&(7Nj-=l`syhJ>QLBp)e{yn!b@)C%w@*OAR|`?+lxT+sL{e6 z+|Q@j7zh#fbx}MG9kCv-9l*v-`V`xalh*@_;=>^ipF-^bBDyV6L_3a{d*Ut-4!NdR z(S-xiQT#to^ul**%FAulHmzFG#iH`_0k5M;lu%x zOBew35n0cL2q$8I6E}0=*&swzwFGk3GJ&U+i34pAm|eyM0vCbOg&}acZo-K<2qdnc z|E-;|DIes^h(I7a#+Aim!5xowQV@YN_MMm01weiTbvXoE2xf^uh(-w}*%C}5 zkj>r`IAsLO0tl87$Y%Qlmf3$N+U?AC#FvO(*Ss5A*KDWOLdkD}PjtZ9p3+TRs7xU5 zk+Ct~ZLOM@T)$n>BI3oc08$~mgM%(bI7vZga>{IY{G)XFw|9s^-$$F!71Yl)bBCA- zbg*`EXLO%`@%7JE4`5rpZ*G7gnOBx99|#0Z6wsi2 zy!wh6N!?N4B(iy*!CqN!%;hT*1ZookbQ3$OlfLLGXZ}9IdchLJu?k_TG*8AuFC1#T3Fqs!nmC+oC|J{FAzV!B@RT8r26( z4(}nLa5~P3r=R)B-qvdNy==~5eZxu)I=hcEZfe~U1@@c}N?DgXoPN)Qg2No-Xh8c* z_MLZePO}H^z?<-0zBGbQkp%@+|N#Spg;x#uX{|gg%^YLT;tcgzqG%uCTDSO@3fBMhw zoO@0&De%2ZA1wS* z$K-)UI*_{<@b>HWvgK7P{l(zUte3%Dxjt@zEct|HO+680mjK&(*I}y@IQgNa|DzT! zyPv1QA0g6qbFR$f(0qzVXF(+=DS6T`D?_T0cjs|rL|6vAPm4;PhsUowTA=SEU?No} z7_r?y^vak3fdyRN#@)ck z2-sXH8iND%ILyHYoc{>Gh%1cHf7x9V8rku4r<|nNH?ebGQ44XSmMZ!RZiM?6|Gmd9 zma`GY-a>mc1ACe-1W1LSA&sRb6-*?lj|1_d2!uw_o1CO7)9)N62ykC`G4VBV4Li4{ zg`QOIBJr%B-?`3cT0%K_8r#*9%+%sGoBnSz-{v+19mnhXi9{6fU3~K2CXGOpsfQ&T~$q63eFzaqmlja7cy2XyxJbt4< z6Yj2#8)#>E0IJitwC*9mn$w(ZEGuCEs3hU3RgukLQa+ey9}6=Hna*M{BOEOivHkBS zo|CmClYD=}IUM-xHTGB^9Da>+qVX4fB^e#af&*yCe~p!5BX5Vp?$1tBm~qX3B%i^U z1x!ECad!Rqux)$zaQ*^Ml%533t->B#WUYoM9=|F0yZM4>?6X$ID+Lxhi<#LsDGkTH zO=K8RHiTQSMb{6;tFA8%tV1vaY$n&^kIAUUqEvh4_^+4etH%W} zXGuXLyzv^Zr`%pM4AY{poV?~%FU?I&i+xqWUywG06CHYL+ylL)?-7eS8n(_;$s zxo|h3lMac#@IeE&GU>R64>Y~GJi(D1(hTW)q38XT{|1^;%h!hP<>6e47QOBmU^bex z1cjmN8%A^5w1n060OEf&AP6b8OeZL`su1& zf51X)YVgXTK96Vw=ZSOJXf+qqmk&W-{x>?Yik&0Q}b5sswwyD#e+=|D_ z(lgwZ`_$K;W~$xYFfypvx2Y_6V3GLk?d8Rsm_@Ud?jJ! zlC-rk(1^rOoA7JTA|>ido?=PE)%g%f4r|%;;Xmt|bt;^hK{X|~qA6ayJCS6389ebL52n@#A`f$wPP6jGp(IqlXt~cAOy5?gdYf9&eu9-O9EZ#>Zc^H!RIX@Ye7m z=m#sg{jU9rpijfWSvn4(c`52pYr0lXxcyTd-V>~>CaE!?U3m~&iGiF;k|(Wxnxf@H zXjZ|0>o6@oMN{TB%t{T7slMD{X1q>#opS`DUFPmN?a+f&7!v7jSJ?+e+wzgA0kmKxS_rsY6cwE)ewGi<$YDD$pCazTZj>z_^b2a zKTn=O&ix|~PxX=Y>XOR8wu4%#Dl^mEFB1e#;1poUX+M+dw&O_%gdIedND!&*?=%x^pttA8-|Moo(%F!s zHH`ZnE3RoVH9pw+wI^upP3EZPiaaDl$cIdr!XcARkKm8QUZ3Bd*-^I@_2SY(LPa!! zArHQOgk>(h(Q^{PYnZ29LQ9h}yLB62c;@iOyZ6Yx8w=&h+dVNHrr(Z-c##s;|2tpk*y z<6hx3SFbbIZp7(r!5${P!jZlY9MP@Oc0!AFq9l5q=ZQm%fm}thhQMZ6O{Gl~j9eC* zIUy=IDDO;Ucm9?eFM*ffLv+~r{?*)%+Xs(r{lZ~^wYe-D@WE$1(FnN4poG+f^e5Nd z*BjMhnm$1u1w~KkZcyK&dSf4@wQ0c?I@n*B2Ho@Bhi*F(xM)xAtN9RP-79g)^)!*M zbpjX<<&0!)UIs_;`_u^$iSi2IHD2K05_x(iq18BOcQQ!=PgOBauSEbNbg*Cg5*My< z(**LsSb||DZFC%OV9$jxn9rt=>RQakRcB1=y0CsnGAGf1t}~-DCnw!ILuJ>w;ZYep zR?BcZj84T2_1`9y7VgX*DS{8X)H(sC%v7dFC_EJ{`Df(yGyxucxK)`G)!%AdWJ=FR z5!hHdj=0$KK}xRJWb!}xk9w2B9Zf~z>TdbH4k7Auk559AV0%rn7gc0~Pq=?x95 z^#28`0*%^EKbV|J$S)i&-n(}?7lG3ZV3f%iy`Cbik6I~ps&3%Lzpxp`1QcR+kSpud z9u42Qq)-#l|Foz~U!XA2N9nx8)%P!B|Z%Kg9U~Rk4{uQK9>7lF@uN83}o@>)}7*-SzAq zyAP!}_aZO}&3ZtALex~^BgJwR@&0x_UhyXy4xx$~ENWKWHt@qa zq3&_cCIWRQD#nDcVIfma@c3W*XACGwb*3+^K*3K14#c2iV@&TowY(?o@4ge8>BARR zyv@_{NQPob7RTay1lyZ4Q!8`oayQvUKxZ;xyad|V`9UB6_PNCyzkYMs0HXg(_I_rn zo)jTdcXs}6=MS}9&FW)Z(!uhMyIJ3VfYPd)1PI%qsm#{|)W}uLkX7=X%+uyST~m8 zO>O*lZu}>em36)`45pGTduQYJJyb7!}kLpI@9Qn|_ z@GoJs!K7R_3X8pMTE1*~( zV#y;h_PRNXP}#-G@gh!jV~56_%D~Ry%&GAB^OtEA<5{U`>gQU_fsG4ggdAXcW;{o6 z;>;CG&x;S{KrD)WJ$Ppeq?vW4W;2TU;wku(P8+5A(7I>F zRj<~-se|QH()TzeusyZThB77=NAuO*MX;r$AZnC_Gct|ZOl=`dJ55W)vA}D|uu@!^ z?j1e^V0vANzZ7=mfX|O!9_@?IE+`|a9J6tAQ;2m+LIoqJ3TY6)-!Aw3;f23md2OWr zY9zgM`h^RDQ=F6eMcohg+uu3fnTg$-wZ-z`M`o27p$w-WO`Ze^_A1yI*)A%fc?4(! ztNnG@Td;zYb%ByqZgdKmYm%4n>QQ#>bGpvQ(nIWd6I!u}#T8T}n_jm^L+-pwdJ_m* z_Za)Od-ZN+iu~+X;wk8i1Na3)-12Vuc;#$*+frPd-WGS1{_R2B9KSF0djj~g8m>m~ z;63%Ch#!`IB*ef{*zx_o76!@i4bpoIqJtv-aMjm+{88#8g?DH3W_;=QjfGfwew(=` z9>8^rF1LzKmr&@TaegUSk(Z`H^Ve@Hy>LgR{Y{=2&vWcQbc3y)@<*C}1s1GOHbxd6^jYdhtLxBc;?1fonyFwWoS zK6?I-Blp)>kptK>uw}M=*4d7!y)N;;?hsr_uGy0l6M!yoJeYuKfocC2FaNx`)hkK(=P=ci%XbA)^VCmOf&T%vL5Ti~ z&ml?wi_E1%|BJ~Hkj4L^asTfFl0LlM)^>m_pZQL#EOJDh89$c$Y5r)SVaX$KPp4c4{eaXXZIbd`yV0{gXWFG42BM9G$8`%E1OMqdT<1U`(mNPvQ4D7q zywX4ke*ag3BH=;kTBxGa2<6(jkzVDrn)vg{RLdW@*{##7G~B}3A8&rKty2+`g7v>X zJumxILc<22A-%>cOIR)ibg;M9Pa|#K!bFCpov>Zb2n*$Fmi%ec&x3C_e9oay32v5Z zQ~hTo{Z`tjVXWR$3}&0;FZbC7mR-z0O(Br46SvPiR;vrFFEG(;R)r!PGS zdHuO_MLTz}p9?1<{)K|>f0tBpquf-*e%%at{aO$v{NWt_L)hsvo1fD4=PVL8TD^fmJhF*k&@b3E=qkF6^RCH!4YM- zZka}6tU>PZt?sIKV$S4g&J~E*bYvO^V)+FFiBpVE zIP^z3etwaIC5{ELIDKg|w|joy>ss}=Lk3oaGqaoxTV_Bb0Dl`dO(guZseRB{qDpnN z?laXsCt7|l!XO<}f~yX2fjm4TcI><-SW5T-)I;G}MqE^%s+ORMI$*yyEbaUP>Bp3i zo|bLn9l!TfrIKc&vRFU+^K1>Sem>JRcPnR<%xg79#*yJe6>yw}aXKw>|4AOcXv(}R zs1Cr-OWXv@CciMihi}B&m@mqo+&UvWdnsc7SWeXxffxIJCK67luRSx+-AKnTPE5@x zO&Sa2zx|3Q&%*ZFt9(DXz&M*2)m0-|-+`LH(e}5O)v3$;wY1|{l0?hWmnM`wpTpiZ zl;YoCn;~j`Zb%Xh)K&9-6RgXT=Oz!>tDfDo1=V0Cv3B&OqwTK~Glt`eAFt=%&a9x( zFak+kd4{`~8F{2{d!PeOA1VHsBst1o9KCZ{f6JFbv|ik|l=lTaiT&HW@z&o&Pt@TD zH$hzNKx@SHPt<`TOL8CI-N?6^>|mTKhxfLN1!oag>|Xl# zq(1U6Dt2mzY|!u9Lsd(vjVdAXKVRG}d8W@gYE(cp>qO#1ys6#3ucNhX+OhFbVde?3 zMu-;HE-OiLLpZNaT>qgiFIX?bmrD6p8mHuO&)r*Cu z_lT|{ph3K`Nr|f3yyT?^WVbyZ6;Gl(zF~rG$pIsrbKRS!0@X0I7sfPbahSh!yST08@jB3;Pz{lI(@DB zFK_*iY#4PL7+0q39>`o;mN8Yj^PZ^4Bf(Cx`@ zIMGU4L7HxA?d#kRTA$+oc7`{cwl@KOIiYrJvfKurCf^9**%C8Kag&<+;ts-yZRxy{ zc;A2Lj$j}Lq9m|DbJSX08Afcb?aVeMrQ=fQ#~p6_`8yHn_Tvk_&iGF5%`?-y=h~PZ zCCQ5>A`yv3q7E(@EXhcE^uU_1BAhAg&+UZ*JnA;TB$cJxU!`Y5%v0;ko|@ zabF!3RrmfogfK(S3|+#|El5bmp}VD}I|QUlVnCW91Sw%C2}x;0kq|^;5CmzYLqHKw zkhtUfet*BU?jLupyY9N{-hcMqXXmre+2=WX@AG*+n+31a|02O(HQJ2l!YNemBDoeC-5s4X+5!<0_2|{q<8OqXHUu!w;mO? zt#2e!@@d-fO+A#rt4uIz3izfuO!&=QiyJqf*j-)Svmeq5$o~70Ay_QEf_>qYZU&8J zjZd|!jp<&(|2nbT>&v;AO^Ne5#&p{mKq?#`*J>4=qH; zenRGRD=Aky@MP*0@B7={1tbXpj)Rsn^M?ZS>%AH(`6O`oS2(Y)fmt#_;%@df^>Chs zYpmsyJNgZ(Do)|mfkBLqX*blgxda3`3zqfl!%gBXM#{2A^%(8;zdY5a$xf+2l9@|; zK+M|_UMde@nd%Ue7dY^I0@aUcu1meY?JD<7p9|u?)#gxU^YKu=T{UMobuS0L*7I{4 z^DP1G?tF1#O3X*gMJ|5wX}WI72!PmTlE5!O_@r<+p`!qzjxA5!>hd`yF=KKR^1$r@cRkTJb3Wk}9wr�wj=4Iw$jk=8`dK>%du4UK2k>a{ zo`$SXdx7$cQ-Z>&=5+h#pdb10E*$aSuw;$oG{@&=vNt){X1 z?G1bnzYY7FfKV6v3<(_t(Ls2i*Y%a0rm}GOlyN$8e(AfehEHu?D~_MR+0s)Agbt7bD(V51;-$L zZ+`X@I$DujefnTvUWi~wv)ohN6|%#x!k#*-R?kyv%1PtBOE>*3g5w0zA*9KT%l?l* zyoeWszw6V*tgsdj_W9Te8TCkrIo%R22?5DLdX)nF%S#?K{`XjB;k=ez`!l(F1@yg7ieuV{V|O zaB+6gTl`tzqkDA$`+CRStEC|?ry@A~@sv~GQnxt&6$kBhmS6V(lIT{W2Hdf;MYD!J z9ees}lwgEV*4zl7=oOP^)t)y5bQIn{|5uWt@9{6$DPt7?6jp*Z^Wevs%B&p5Ment^ z^E}y@#>fkwX{!GO@fbnIs(hMQ3x3N&bns{#$Hk@@eR?BldFGx>hG}u%x^&9MaM_Nq zAjC`P;qxHfyl~t)dR;Eb7xF7)4#s+0Ch?w4b58(Y*?vafUp1D8|2}-)#)b&Bxm@ln zxe(KI!e<2C4;fRDpUZ@f`Q;J8*M3O_=|69K_vs#|wlmQkWTUktive&s3aj^cy?w8C zled1}KTi`YKNGx*5h<-j5;%V+en(jzvxJ!ONU#5}LnK`ghx8eEdu$uWHR<`OGC6NI zt{_ivxUW`SeNif#fb+LnppSiXAHz-sVXi)R#65?X9(@_7%}g~pbsG<<|t;mFMMUI)0tqN-5kJJ-qtPIx;H zn$uR;msaelehCe&#Qfuk+Nc#oCGPgSjW6ZcPZJ}m8W~xmFtu|WK+(&!e5<_wt)Ve1 zVG1MHf;KyQ<%cw6zFbalXprq-@VlXjQo^5)mv1wJR;8+6zp%{n?v~QR)6}AZRP#-J z(9@DRl}TJHAEWsxR#Ly*a!1*iIirr_0@&=@nf?mok-w8id+X0_ou>z7VNyO z@bA**y;efFtWczuACEm_O0@VpJT@KM->=Fk4ppPapmQ0})~h(&dRn??+&LR5c)?yq zfa2n$9WO%adsLGl3M%kR5o?b7rJfdgq`pd-@>rMz{@Cwzv8Yk9aVi-a9+SsIOkHjHBUp;17`AY z)C0230}vC#+fX_;gCD813_edhHMtw>EVL44)?z_cVHGx1sde2r0bJDh^?U>a((n(b zxIPbWJI0^iyInX&1TW2c@Cd6pE+Qa3cm!oJGWV0IKJS~;7a=H?#XE7hnVXGO08_$i zI|Z)`jTkJCmL-4XL$@<;i*`hF4r*{FF|hN9vi;eWGwCa?O6Yub19p*_iy42WQv9+ z*HQIkZS6--ES380$2LXZpCaA_$0e$VRN?ki~!5$7K3^`+v?-+6NiEY zYg_dX!4^CIztmcp(0@s_uv;tt(rH0(zWqa__5U=((3>7H4yrgi#>Z4Hf#lL|7*++A z-l8b$f%tq%a`U{WZaHS|I_`wi?k)L@b@-zxk0c@09)Zy2?BQf z^OOFahy4M{Rmw)Ht}m7f8$O zi5?iB6zeSV@L}H_mczSVS4pUd+Q-&-i=GBed(38(C!UNIw zl0@8TYx$_%jdg4_(os!aY?S#+>mP82yLNAm@rH<&2z-jKKSQAcqs8KBbO`a}k8W_F z<&COJf{G*;p>o0|+w@0~3R~2#9vO;b)$`$f0oCDm3knqD$Oq9*Q>Ut~sO;w~7-?mb zd~P7U`B|kDtMcwc|4Z-^NH7yxdMYLa6lSbO!;<2yuf+*nxJuK;K8Yci&_Xs_Zhd0t zyx@)kT%b%!robiaDy4w=fK?*5A79mcd8c-l5fu)y)?y5NElz27 z_*&QBn1}%Fi%PBUgXQN`o_65c@lJ|`wDHOuo~*EnX0O^P$GtinKV}Z?sg(j+@XOV~ zlgIf!oC5_iPvk!_pWJ3d40*{dAz}GASVMeueZ}op+^ExUH5d8Z+~UW);h{PH<`Px5r+ok}y5%U@#iJQDw=F< z8Z)+E@5>RY-0**ZanG5^B>@G9KzaPZ!W!Dx`+oZ0OnAj`zh#PhE6m*=EWmRnM2BxE z=-Sydm$NCQqpf$pJoca?&;BVDu%Q1>Y-oqt z!<7V_%HQ2Uh@)nuk`N}EGmk}bfAt!z_o{2fYqRJI0n?fe9r4d8kWZ-H&Esx-_QC%s zPLNpJC31xX&v}q`sj&HMqWj(!PFSI42P!q|t{a|Lt-KKh$dDHpm2B*kO1QM#8+9~P z;LiFmpe5x;KAa|K6S_c%Z?kXbWk&q5R*q#B{g`d;yr4hmIj(Au3NpCm9`?2eq$Z;( z-g1>&7*ip{W~)0nDK}lj*a81%DyuOT4Q7Jz9QiD51-C|PL|WNIab-5fWWFQM!a>gu z3GHpwR#1EUoH>Vh_x+K8%Q5*JNc`;P^POFWxMlC2bsigvq@j~hhbpEoylLo_$%HP` z%Gs(GCI&^rOxPPKUC%L9?mD&&J&JBOyu`J9eK$36$!A#uU6;MxSM6tUW{Y^?Ul!>9 zY!(p8nJT;DT=FB7YdwsS+R5#95vKLUmXt3OP+DR&j+~SM*~$rbeo5(W1Tv1CVC<|K zyMtemjqWF+USY~~dS6Nz@c}T~Sj-63NVgn(Gm@n~~AkZQZXQnh;JgxuQa8w^sHE#BoU#YOo9 zhX1Kj*v_Xis;?WT-lz@GdIYFJ5t~-MvZzn2?B1!K=dXiX>qS;Py1CgLiMPo;hLC2jNK2V) z)xC5cnRMT;-PmDU21~y5ip_qf{g^+H>Dez;?xH_b$vr=ncielJ2z(R+M|S%3zT)nJU=b$0S_fCXI@j?0+DA5|0 zf2;H#nJCf5L98{Zz<43=I87eOg_1%nO)I9$tP`PO#Szca^MKR>(8@ z#nccbV&ONSUIrd4yGO+C^u`OYSfN5Ud457-xB(BJuu7HTm<95PG!M?G-v{5iws&Vu z^Aum@)9uQlCfTO(HZECDjEm4-^d0SL$fOB=a5tOitrM8T%gy`C8!F#0Z4Ai>-91|jl{yV^(0m<5*Zx0etzbjl) zhUEdiUMl;PR;e^hbO^+=fzR)Q8DwWNlT9^04FmuF{44>3XWO+4c53N70WaZP{7TTT zvJy1V3AYjQw`liMg$ufr3r103G%QuXwiSBR;}9u zHJx8k&Igtv-Ygv-pAQ;@9}ufXY_z55H&CNb6t0k!{3WY2=%8M;8oFcE9ntUkv<`J? zZ2tP3(Lz|ut6rKP#pjMl&swUIEEzUZR#9@Z*5;?WpkYZ<_aC2;^U|Oo2IYkKDC5MM zk$0|&^^OeGPe?#|Q>_i0qbgox>qseX7lgW?*SJTp!RMsXTd%YVTQ66Sj;Kns+wW5r5qD=89u2t-?G3 zlEp--b}Ob%TzncAEhU%eRjj6&S?@h(XqRit1I2W+Qet_huw!@~%!E=Tc1AMR_MVEu zo?fto!~cq>#tnZWG>hknqD}~czGPyV6atKXv6!zBTHUo{U|n#98ZMN`5qg=Swnz-8 zXOs>3$#$JBRJorcp{_6TXRAg!rS3}L@Dw9fzy_npMhBb&Ucmhtf*oZtX&9UjxD&$y zJjEfSvuz&_pP`d9(?mW=0RG4Ikkx_DC(^dzrY!MBpwYHZ&5%M*C}IKQL=h$Crx9Ue z04p6y0KyErF!idPU4i7tn* z1XmWFB|z)i-ihm%JMZx5 zXW}1vQ?4;W#dVbRHfzwYdnN7b>~O}TG=ti8qCt44_Nm_UlR}LDk4(kK@Qc>F>JLF#9^w$yoYn3qa z*RfB)S^{MMH3t}gVheFoV4Z}2N^)Y0LzS>SDAC3`*K^W;Dml}Hq8=VTo0EfBt!bsB z`si>&(3g|=J{STj0ajKpl^5lE3mXNGI-;lQx1RW3mf4hvL{7@J|FL>7j;eG}*9eXj z>0IhrJg^?``SWA(ppIlpxDjavkn{_Y_QUNV!rCs!xFGyTi?$FkH9(`<=fb&oky@K{ zhr0(pAjw1ej*%^}Jev#OSDN1`nq#05na_!4%;vu4B#XYsz>u!OCbRHGf-jBx(4b5C z+$pNVHVx(ivNeG^n0>K@2=k+zHC<)%wBz4xdQ65Ng7}kFzu@oCs8N~%$GloQ!I>Jk zBt-UPt8=5oQ~QTR zEwQvnbk0He88n||N<|BPJT?eRy~Kf!I7Zao<3!v9{w!_X=-p%}M!FxU&)oFC-h6hp zNe8;DdF3J;wlo{MuLUlUnaUGY0?_F4%}R|IqfwL4*h9Q4pOy`D$-1y(I9>EronH4J zskd(#62Bd`s{?(Yj?GHhu%JE`r4{1bp_~A&uzKb!=DY)Y^T}I&KQ;?+>Du`{zAm%yht@aufh0eM zO2yk$2{?LvlsfQ!EZ*(Dne_hIcas$LliD^k#!xNl^2%Th}BmhXhs#9R;Ek4q~X z??I{kkX=L1TktX${Hgi@9M2-lfvuPM@A`wbq{>ydc{xtHoqCKmgK|Fe)#S@eMTa*b zac8Jb5;9S2AC*%Hgp4}M*CRdiV?`2h%7o9_+kd4_XdJ1cB6`%>k9UpOKk-5Y@bHE6 z=n2MZNpd)GW{AzcQ0AFnURHhFWl=y^jSNy0l%QT9KN7gA7AM14oEIZijD3G_PJ4hYo-t8SZZ}`=S>iHPm|vdU*R1LW0B%J$(dSEx>;Bx4am>BfEK%w5jIo@#lYK@4>Lvwg`BQI^8n8Q(H zS9zTs4ad9dBpQ`UcI>`8b^P7ky%2mH5{z`#%uS(8#P{i1V1>vML?!R#=Y?@Ai-VvQ z$sUJmpAtVFQp~v#>5scZHkZM^VU*C(4KGmQPrcQ|&Mbp%C-3s(Jj~sBVi%cqUjmJt z%U@iTa$%e&V)b8A-Ej9O7xdB{!gFxJ&X=Ft@uf7+xiz_rGBFGw+Wr=rDWg#NhnsN{ zWuq62P8zT!4sGU=SCN3z&#CA@tlg=;vGmtU@wWH;ZPx)&420^#EC2RpI%trHwoQ+z z(#VADx5({S!^%@4!}kHU98RO(Vc^Rk$bo9xM~}P=YbtW4He_Vz*|)jN*dnT^fR>4m zJw3vTG!woNz9yTs*uw*At|2W^IT-0^ejF#=eX4Ogv2|Q?ybenQI_vqN+?wCRr^rf= zvoz_rmDdXUws&8&uW$^h!iwI8)lNRTu4b z|MNYbu6pPBtQR0j&-iqGDH;=pm4yQI+m{z)nW(oPM2b{Jq&R88C2Ke7>zE^{@_~W3o&3ZHcw4Ml3fK_<<0i7Er`T!%AXF3 z@r}GbFjuN|gr#6#2UEu^*@aIoZ)Q`ApSK*ICFmwqow@ zrEB;3oeUoO~wK};TM0F?IM{))+t7EBD~*Q)w6>pvnJ{uyp@iGS0z z@Sh~n;__bTPxJpos+q9mb@1>=HBdgTWxX->?Ck5Wv{#icUOar6HU=5H4V8lkut!yK zp+D*?b^yQ;Iwmy~zNb3XvpZtvWdf%kq*$L(s z#COtRR{=8FO-u8B$IvE6AG})l_Tv6mCJwyxcVay*Y&$HEjwA2!zDh$*lNR=|`dSEi zjj)|e%yEcL@|e7iQXJpA{BZbL>R%aM>ycHCVQ@c9>m~s`tx9XQtMs2^Xqe2H>-+Q*0 z)r|CSIda@#%&Xv>xH&7*n&O}=jnM<5>EW!SifWZLc;yOa1)jsCS@8$+@K4l!6bCGs zDBf>j#0NR|rYsDoxwQ%rp;l?^}`6~gwmJ5 z+haNUy^6)6f(X`4W_!eg&|peG8=*|oQ9SNXA{9eMPK`vA>e<=Sb{WI0XA43Hg@Rw6ALz5S_JMx z*^P^ToS%ChtV=vH6dhRTtWNnpEdR&H1WGKjw5D+Pm&=<^wK`Mk^UH&>^7qziuend8 zMsy=+X-I!u_Q%*tCD)Vx@@P%WAb&&sMyS6BE|txxRi!s#rUWm|G?C4$W-Aj_a*Daj z$kNJ@azQ%)uKaTvX$V_ER-8NfD3z)}#y zF(5Q*utm&1%?LELOfU;~Yf1+4J5JjrGoH}x`kROi=>l0-gP8K~zr+0fv;XGKSbv<0 zvGaS04U@enbwmUr4+EKM72DS_%K;6#7rXQ19O*7fHV;iPjGD*&(z# z8oTt}$%UotAWUpnFy@NdqsC6mu(_MtQKUj8^jk&U$jG(f>jE%#GjMWAZ=Fz}mTcbs zW``Oaz~*1{!+OZua<|dzEZsX+{|+!A$^39qb}KxsXr|`C^0O~Wk=>A z+v^3H^diAcfjPUd>g21~Ka0#j9e7M~ZQ-rrXN+BK^J6~~Xbk2k7RAC2j$lAu>p(}y zfH_4laG=O74R#_#fLjUC-&nGlkSx=;kXshE^HgfTxsz^ED2+MjwLw4 z?5itycb{)qP_$xg(B5dD{HK|YN5~4%R z{KPHZ6;Zm00>@gRco2*u)ou1v&=y)cl1f*4-smb}x38ZbdoRohS7=LX#QN`j+je)h zX*LVV3T&5TLg=UsoBn2XL~8{I0mUCw7DYQeU-doz5?CSz%K@8z7gv09X)`;y(lfdu z%(&R>ARz_dq+y&672(!A`Y_G3OifA)3Pd7mzB-V#g_2pIFZU^(WboTW9}%4i0=oC( z2LyDg57f9DVaNvAj%Z>Ml9pIp0R7k(cTY>>#2gkk&y35g6_B^Z8*~ zjsAM#wS-_Vtk0r7GWT{lnB#-n4pxO~Ag6U(DG=YDm$f2dThbd~q3&IBRE9?v_CN{S zbZZPHn&NIH+Xf#$4EK_C`c2634}MWG>tdqndlAz0Sujm1!UAv1_m^=5HlyG@(!6&) ztv=*1&GF?63er5MbnsYa&utieqzJg~fj*mm7x5;BzwCMI*^GM|;3N`Ppc^>JVrbRz z5&U$WzoMji_rh3RcAsy)C>bT0%SQKBim;K_ko6Jk3eHJ_S%KaM6B0Nth%U%ZY50du3Ymf6IvxB$VWCK@>H)4KR2`|>Lcu& zU=@)URav=jgg7mK%r)H!mNeEhXHn$X66}}ZgFpVYCMMaeJIm-k!spL)lIgTq(3DYd z?S$k0j%Kz)`Gbq-x`*@!x^F@(@x{N>b4&n#cMzt|l7gOe@VK zr_#J3wb^SExlza%kNIX_TeJ;;wae@-$6THnB`0HaUh+}vnyjPU7jJ*8-Y2Leh!6vk z$i6y1!IY>k?&pjb*K&*h8pt3UuZ#xwLi~g?Dl$;hBcz`DEvLtzj|1R@viM z?mwXJO^q(%rlAWZkF1U;5-0RC)R9YeQKRFFp>hEA7;}5rx`Jk>YIJADJtd~^vM{2b zCZyYOs3sS~xl+1O|AyY|<|Vwa-{v2G>bhEpED$ydrV28#h~~vhX;cqTxoWb*kH}&9 zEvvbydObnW4`!ch51bP~P3vWMvTT}QF?*BC2X+h=BBKuvAKs68>i?iP-X`?H%g2o@ z6=iJYJm8a*r4V<;FDl@jgrOnwI=Z+mv^N#@zi?1mtk`geouZEaRy!(?E`KqsmK|juf$FZ%!WLbKV8E;1a6_J4H1$?pvlFV_c^M=uzU$31hHSk&1m$ zqn|jEUPzjk;Sk!;zfLS+(xY$gGE<)mRPx+3$qp*-NWIJpK}3?E<;xqOdoK;@Eiul4 z>(rYq?#1%JGEv+F721@V`0%?;D_x+g&o9{pp{WM*WdGDx;GYIetSuI#$;S#+%=xU& zw^v{Nc`Eyh@HR5L+%-S+oQfG8AUVePvYEmlLI)F zS;_Usj)XsuyC`L+ztYh7L~%PB6*-uuc~SJ0F7lDvv)pWCO#&I^?%0AHEz zt>P0QqWO01MTQr*Ex(Z~||L6E~lzsK&?hth`7%Ee>U*}f@n#_1DIkN8hr{TOo~*9>qh zRr1%IkJUJTN&?6dO5ZZr$<}Ui)RMUDHXlhr*$oOnl$OCN-Vu-|?P)A6W}DMnar)Qr zP|}FZ&@tUHHT57KQz!b7i>Shz0t|VSzCUPnZ|zm^$;bhdXHCk_3CI-)tPyb!FTvA4T84>r%E)F zk)?F>lsZ2RA~{kqLJB23v{>ZM4%7K9Vz!ofoG(RQ@AlQ8dklf|#{lt%I$*iR)r-gL!mR@5%~qH`Z3og70hRmzmhCzPZ$-LzC_>c7`_^UxQ_%Ix}J~ zh*?h>A*x*20={RD0L|X|z^`e3vT~Q#FYe0oY^-pd#Ij_2d9i~U-qN8HRKj2|!)L^H z5#-3j{vtldQp1YDVXh}^yL2SO*-_m?Q1`m<1tO&f;9Fn)mIJ-#mU_){nVVRuneP{G zOC0k#A#uxHDq_G(PhLp9WC66kD_%5!Nh|XvWpNEQ=aIR73s2-t-k5oewOi)Q z#gyC5IxBs$EO^c}`mrG!W)a5}!jg?7=0b=PQrx6r#QC2iQL0URUZZ~d7=iZLM)ckB z$AMP6Z2le0;@|`4m@VCO45cXT_$PT0pr&Mr^=n#d#D~$~4bJinQSW|#1ag{ix4sYD z6CK*wgBL_Z;8mZWyyg7+bER5jMG8iWf0!pP{)w6@_dE$tr%nTv>JE)r#uSPW$Rd2K zl)IUTks5tRBU!f;UtSm^REcdnDR7sKGN!l2@3cRqbA&HA6nS6Zlfy`0CslB5=Kc*( zML3$#WC>z;5;QQuyRhJ$P|E_)$E?~aB8|zzMxHh|0e^32dhehoh?j@L;c>b4w+Y9+I_4;i-0y{?TRZJ?@`jMOVKl zcq5RaL}RAFRH6#Q;YTK3dbv6*9sF3d*z1)~n1P8@eYhDa1Fv#(hBUh3!{!?gDD5u= z*G5umVm48nfnuG8duHFCEavnM`_IJ$o<9`@@}KyJhdtsXg-S^QHBl$aD^rO$3?A4A z@1U??6Lgyp=Qb6f{s=QEeePVs^bmPM_a&1Dj%4Vu{;FaNY+8M7?cR9%%AE&6c}~Ll zit077et-qieyPKHEZ%_P3jLRfcqP*r$IcLWa+P+`~20ubGEpidh`x+^oI7~w??b*;+g z0_NjR+_8^?;vvDam087mu9*v*-##|9zzoN-ZyEnmZnNcnj4Zr}d2TR0r^b%`1KFCp~&P z?@vg_Dl03hOfrw`j%An416V&(eV*%nYVo5utH@>-;Sa>3jqBLcVf2NIkAEEfG+wyd zRQXt-4PHNa?>?Qbs_|h6Q(6Jp1QYwTXIhs1-d+?u~{Uze8h>*~d}4 z>8Y4QZEfA9#)?lL)v8|qgz+9-+ij=mu!8%!lLTq6NE0$_+v3^c8NNhEmwbs*c{bnC zr4!!2_^3c)G7Ksu2jqImUS8gSU%xzkJ>(^ioL8)3LZ+o-&K>Gb1H;-c(*Aes z?q$f^`XwvfFcRQ^Wtt4YL0*T3hu&Pz@81Len~5HLAO&uX)t3e?2z`e9ZP&^Rnlug;`2=#H=_P&?@>{#NnW?moFyl!j~3UxG^*pp6p#==0`VFOb|EN{9-)mOTYO$-=0rbcVDx5bLl=^pn$Gb#CUx5Z-3Rfs0!mGSg5>%!@(BQ+PG<7V{T^o zg1)o$CldCY(1saU@PM35Xy1@2y1sm~>jhSOd(_R8S#HY-K3A+F$W9Rw(p${K_uooN z#$3AX%zTqW9&eYf`WhYH((Olj$Akp0K9`$hXJxP|6YL6b4huc>e4MT(mIF8gSDqEtl}@#Mq<@>FyWMSM**}W_r+&tH+}$3I zMxDH62cIjr4&ev75kK<{sKzz>_yxo!>VZ?`?4ZC5a9nxw5cfWCK}IRVbh9@6H69t8 zC;eDz|8Sp5$g<9VrI&_jt#tgO#k;F84j)-?fT@wV%+#@)b;>bO0<{)>8VMWzvpK(Q z5T9j&)X-c%d2f=KY`sQp-F-^^y7|=rFyPSs*pZ>nt zp6_v0?*cCojE1nT2QUL4sfD%~C-7YF0uu`g$m8U>!DHucL^hXU|TR2vT zQp%_hwfTkKw#h4P*WXh3=%%jA`zz^xHabNw=rhZsuun%pJz(@h0}i>m>GavogP_Ra zJcY!Co9IfWzR-JTx<{N_QZeXw(Y?j4YN7*sRp<$Cm;s3}Rm5m13L$Mzc{AFhmwK08Az3~dK@Jo=q4BhvXz6*;87@eJXPAOg)OCsG-Q`tC#h!cJ z#j&bMgO1)u3Cu^%?{lB@Ty6C|VI~Yap1#eq3IW#HjQxI8<5fuyIe{iZq4|VRIwWdx zlwBKi1^zsj;~w;ly-^g5xa|u1BDgaWB}Ild0d+3B^?-}!xpM@tnTn*9t8PvIJ}czi z>3a>R4!dLivVLmtN@IA4i5-8MeG z6GoE6MOAUY(t}&eHBxcB>V6Yzy%goGAma^$61J1YjW0=kt}eZK;IPcN?3>G%Kw2lW zavCxAvumTDDfbUCk@c<-WFAi!)+GY$2PajGKE>qRXmao4!!*aoZtsD&ke7@F6Iy~G_Sf4OLJCnGBP2nTzVeypgV$c;oa|<99ww!lUWK9J5^RpV>5PbD30Cw>ttlaJGT&)8u zNP!k?D{qUs#q_(lv3KUd9bp&>g>+X3W8IPeb}>81Gsz$^Y7k^h2aAoup5{@^j*mUI z7DI`H%_pY;R%d5N^We&y?XRlZu_VQ;GK6_^vNeBI$1Q(rw!AM$;8y;%mN)S}mTJjA z6O5AxPSmHu!J-SLG_cX=n` zKGE&Lqb^`lubI(mE>&uv=P-90Pg|tl5s5!}6!_|3hHi%%1iKh&6&V!+v7YoVGnKKB z;M>uXy0!yjAA)_EBPlB}jRv;57Jq&`=llFfGtq zEGsbXFpL?!5DY^^rG0v0G6Y3Lwe_)y(mYFoDyYp7Yp=Xu#DXVZ?10D00$K4fe-WJ_ z4`H}FJTkzx8WwsPN`zfrX=8otiEK50v6z0?dQJYqGbOR?%DjJxnHm4rXwrW$pZ~%< zLB@aan;TdX=l_jrf}4YGWOVy|Xon`mcQWWR9Gf$%Qs*(EaEkt(m@thDsem16TLpV( zi2>Yu(YCg$bzdJGYkijAuEY?4d$m|H3rePZZ!(dnPvXz$j5`Z$>s+@AV+CHdQYYRfIoIQZx!&LgO#mcU9v*BFWt^{9$Z}loK?+hEXv%d7i z-QZsOAI)8PI8|NSKgw_r&PHT*22)a~3`ZGu$2^@7QRWgdBvYIWY2%m=NrX5k9v+fJ z#;2$#Lxju}%1}rs5#Dv4=Y79FzweLly1wf>f2_UNUh7`>I(w~kueI*I?)&#rKHqAS z#^UgV)9a`*iwULQ*>mxPzQeW-QmW>l5JF6*x_`J1dEzWOTbMK3+a7sNKukLR*xLXs zE?^I#wCT2|9bVn&hR3--=9hI#oK^Mb4*lIKz}Q7dylE_hbeOl!fX62)Co5w%`~SNwCth}V&P#Z)iiJA(|kxRk&HT2TKty; z|KKQkV5#lYQYcPgYt@_Yw^25aUBk9Qc4WiFMevL)8-RY;4Wbs zca2&%kdw7**Q_M{VS%*vhXfk6(p?~NL_xaUv_aDARiPU^kDGZ&E^mTLr*1QfW$lun zV`TS~4~QOECyJ?#9?tCWZ>+kyx~ii2M>g%Cy=mkhKdejM@1V!qF7I4CgDY@e)onLK zk)$HuZQu!dRZf2rjC~~8zMF)Hr8Fd?_>Hy>0^l(u=lE`;D%ATd1V2+Gm2QRg-ay`8(Q8V_@`>%^m>)hEa zBZV2PV$Z?&4G9ZfYOE7N3(}cf0Yy;QwKjB!5=qDo!qID#FEzfbpH5&i=%$SuT742cGoT5O96Z z>LR(X(DTP(&4-dtvT4$W`-7hcuX5HmQzW>yde$){0{G&8TJOb2R{&oBz>#^ySmUrtq@I@%{|4v9 zu$u#80C$r6c}8+9^?$loJO=#b|LvzAIQZB88$y$Tb8v_;8-#%Q!Im*UtO8MA#h5WZ z1JHpB4B_7irh|6IssBu1Za`z08z`oTPy)S*v@y&~Uvs*&K1Fck-FuW@TSOpWQ4c^6 zNdbT!a_ola4**ZZ$p{9(BLKxCGmVCzmH@a1Bg+RHQ8&gVgm4UxWoKgH=1s#W0>^fM zNcIX?2}Js;AK}R}n9D;VRoSILA{mB3SSd*-f#Qt7x`B6(03jV*wb|LhX^Cf12rq*c ziv{6X8W{%)l>!XdnK*fkz%?I1K2r*l$@R9MRaFycnF(CORo0U>OAzOgQG5_bu-(N@WO0J65h+%m&31?-PL< zNIRT=iHZy6xTP?Z6qa4F%>@)okvV61FJ?&FR^G2MwQV3FR1A$%f|Sd%!qVVjS!>9M zv*nR;%~#OJy%+8R-4T=eH&gyifpe8-5)OhgpRF|zIPBwr6z&B|F?42lfyE(se*(wf zNqo0mpsLCYP$j3$I3qv|VI|oMctIKoZ4gz$;0EnUlROAv88snL{~u*(MjjG^C?wwco83aoPW1W{&udFoh>l3Ee3st$@)R7PRI$VC&HF_a* z_f&((!%;t^<(nLMAIvi;FUI}5yY}0}`)|+M2o)TMKW)-GGr!Kg9OX+2{dwnP!@%?L ztobj)%@VdvZg?1ZwNL+Vx@3|9arU03V5&??Zo@ad7}=yAKUtMU#}NgJ^~a@w!qJ*H zZr?7K57eB-!p<9Oj3)T5=i=s|R(k>;d#_VH*pb!k;)}1DmTINc9`}eAzu&{jxjYcD zs@c^<-J;%_A`2Jl#l`_L3#`&$uKzOOY>V$pps%k{ z<;KGOhRR0S=bhvFt4keCBD+UnttPFKwfgAt)>==hew$!@SyKE@x^&mLnC0?uk%?fK zv!-LX#q0>db#QBY#Gyt-l>Q-B$yN(5wOqSZ8@haMi!%P_^`0u7$9Af=b&q#0AuW}Q zA&zBMssij1@dc6t z1smFePx>)^1cK=WUg-<%H=Xv{7Ui|1e9od2J4}C*NsB&iNW3Oyy+yN_>$dDS)r}rkE=|6dv?vaLL1js!&i?3) zDe62?GJ=ZFfGxa}m~-DPMIQWKXe1(RCKNEhLuWO;c)yeBIv$CX)_Ib8J1B#xH0Kj+ zz|$d(qPq&p{p30dCt}*TPT@+}sDshPLoB>f;miCuhxh2y#Zv}J-c9XSw&vH%7kR~A zOx+$6IaTxymnVNV}-DK)ae*Ws9)nnY)jwBmqAV?JN^Af zIOrl#c11T!FskcZX=>Gu&HCrwAiYSh_7yFi*84sUcm|K3mfvr9)XPi1K=7t==CW}M`MbZunB;C`_ z=|Oj)7v#kfIh0~I^i0Rj+HDf_#0vP$Y=YObXaRUqK)^t_CHBIP2|Ht^qP6D7>)31# zy4~cZ2D>}r$eRitPo|mv8tuvHSd7BRGrdVgu-)(*!w{nClhoukg>4fjwPMnNUYCP@ zZf(|Yxg$`pVt7&ix{@OL3=T=;r0+o$*$1V2n|ip!hCTX|V+V~FL=SNBS0J?bd) z{iaJT<%73d6EXM~eiSXJ{~}Df)<8j>X-0RI>gzNeE-3qSL&w1R16;D#$v_YmyK?)x ze#uaQXA-Pyq=l$>w79*xEfh%$&V*bLHJ@dfDB)8%U*`R1+KsUesX8n3y{V~{5-{F# z^b4Q2jV7^4^Z;@Ys%oLg@c*$k&i=&GEPDqnRdh=W)kZL^dS>}a;C!F=D(A3kW zJoG~2m%j#^OMDpRrJ2A841v zR_jooVoDQz{d%m?hK0pup_kBS(iWnl4{M*4Uo4$RA&vjMqE;H(iwUxEjjF~vv=ntJ zyT}@`+UqzX6Mg+QBi(b0oG)DSn2(DQRkhK9+LIhvy0AfB#kn89(AuNF>afvE`{K}~PH!A@ z-MSBZ&XLKYn=amub%*Zn0bdIKGZvp}Sk47}t;~0EBnRSSx|koi2CQfITVdG(&c1((lo*w} z=NZ_JMo3#7MI~BTFK`G^vVU2pGND6aeq}K_W-D#uv1UYG$da2!(C3T|dviBU%Fbq| z;o#D)B>(xB%4Jm#$QJiGXY^PQuUa z_?Ki`nx_(qsGP5j?CAc}^A(k7+iZwkkMjM_2PmA1*8JEtRr&k3*$m#*w;sTn15xRh zNQ)RIU{qhC)xgPx=>RK}mPw%&bO`A7OEQ$e$FMevg*-H+;@gV1@mxg{vgHN9O%!}6i;7l6(a}3D{e5{mamioWGo*1fi?Po5KM76$s>f?GfMS6aOeWU02AP3Xe-F>&5KG#xLoCpnnma*H504VSD!*x^ZbSCP)Y0*moIw#go8koz zS2d-;Ug1OF_oz>1fagXYS{IZSX#`YmahRSP|N9sVBs~6#gl;Fv;$ZWno(&agSX&x~ zpimd&)lW;n$^^mT)^gAn`_6;?h%yvUCD)=~?iWs(_&3owjz7x{$9z7HJhKknwLX*t zyFz<*sALjyPn2$gM9M?)jhb*_Jg9EmzpHD4j_WxB?WrKmDS8Ajdtz`EOsf$^rz08Eo*Y|e<{ymWjGtG4nv(J+@*sNU5VMR?pcE(6wE^6$ap z%jX%77cL#*inPj5+vUy7JgqaHMX>eN{mT!{z9Dws$UPY&3%iP0aXtPvuF`H6=%jcXcW ztw#)F7c$B#+R0hK!uFPL@#?k2f@T%fM=kK!l)(P@Rz7R7&c36GK3(U1=RW9=s zs4U!JRfs63!MfdOkE=0zkJ!;f3nh<7?~f3;^&&ciWXH*Z^^}1;@7ZZpkJ&kRFH9-i zQ8{5OlFxaCjcQ#Q*Fi&owkNb>Hnd|6_sLR^$ z_=Z#ycjU$v%4kR7Qw<*NjyV49^SwnZvtu&DHj#F;bXA#xa9;X@Cu`?>>cmKao{qVP z9ydMG5|kSwJ%7EQt|a9ARx$jzW)jWUoddEn!KYp6E-qR@jY@H07o;K2jNOeMDCPSL zn>z}3VwuNrr|SID)&@?{v-Vw4G*82@Ij41gjPIe=i2HM0D~1+s^-UWQ*KaTxs?B1v zP?bE8HnkqON4u|aMRv&@?@K9rhO%wyuy2gnl^Z>dQ*X zg!{eJYghmI zo}ftw>b0M&{XBz#`^|9ul7Crpjo296+cK)+HEt7r!%Pqq&yT&3C=XSA(R)rzARBal zh^J9}e#PX#)Dcj<{;X9U{S-`u*`@bgQtxCT+FG*6^L2E{1?qVv*j3rO0)4xa&a0f7 zFwJP@yYI5TOw9<_g_cxpJe4~yK&xKG3fZTSNuDztkj08~-+p?U`espT>*FbL;Ut>s zMqWZq*j&DKxMO<%T09>OzSAXUhRR(nuMG&LZTHLT))w=YqJ+pt}LDQ+3Cd zg7@vbzO2@0MdyBF^HP8PZX!+jLj2@(3fp6$_<~-8X@hwuVb7TpCo^NjukJ{i^m3QF z${>H5a;7{hQaNJd-eA-0Kb^xhva7n{vMc{4=gMhu?77@B$mq4u)o8TGJNL<-$6r7D z>GTP@`t}k5Pqmyc`*=V`?-jFl2abP@@2l>EXKmgAnajd2i){CiQ@5*j+{(izM!o*p YTlwqNav@vcA`1Krbuv65(0J}>0IRF3v literal 0 HcmV?d00001 From 5c0267c64fc5f1a5ae74bc9fe3bfdc7795d47b63 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 15:53:49 +0200 Subject: [PATCH 58/96] format --- test/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/README.md b/test/README.md index 516b1d4c60eb..1b571acc841d 100644 --- a/test/README.md +++ b/test/README.md @@ -55,14 +55,14 @@ You can run the tests against `@mui/material` v6 by running the following comman There's a `material-ui-v6` workflow in our CircleCI pipeline that you can trigger in CircleCI on the PR you want to test: -1. Go to https://app.circleci.com/pipelines/github/mui/mui-x?branch=pull/PR_NUMBER and replace `PR_NUMBER` with the PR number you want to test. -2. Click `Trigger Pipeline` button. -3. Expand `Add parameters (optional)` and add the following parameter: +1. Go to https://app.circleci.com/pipelines/github/mui/mui-x?branch=pull/PR_NUMBER and replace `PR_NUMBER` with the PR number you want to test. +2. Click `Trigger Pipeline` button. +3. Expand `Add parameters (optional)` and add the following parameter: - | Parameter type | Name | Value | - | :------------- | :--------- | :--------------- | - | `string` | `workflow` | `material-ui-v6` | + | Parameter type | Name | Value | + | :------------- | :--------- | :--------------- | + | `string` | `workflow` | `material-ui-v6` | -4. Click `Trigger Pipeline` button. +4. Click `Trigger Pipeline` button. ![CircleCI workflow](./circleci-workflow.png) From 1a9b90955d1463a8e5bd4dbc29c083c85c7c901f Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 15:59:02 +0200 Subject: [PATCH 59/96] update readme --- test/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/README.md b/test/README.md index 1b571acc841d..626b68e1b8a4 100644 --- a/test/README.md +++ b/test/README.md @@ -66,3 +66,12 @@ There's a `material-ui-v6` workflow in our CircleCI pipeline that you can trigge 4. Click `Trigger Pipeline` button. ![CircleCI workflow](./circleci-workflow.png) + +### Maintaining the `use-material-ui-v6` script + +The script is based on the `git apply` command and applies the `scripts/material-ui-v6.patch` file. +When the patch fails to apply, you need to update the patch file: + +1. Run `git apply --3way scripts/material-ui-v6.patch` and resolve the conflicts. +2. Run `git --no-pager diff --unified=0 | pbcopy`. The diff is copied to your clipboard. +3. Update the `scripts/material-ui-v6.patch` file with the copied diff. From e8ed9c9daf441283f2779747607548aea2f622b0 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 16:04:02 +0200 Subject: [PATCH 60/96] update readme --- test/README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/README.md b/test/README.md index 626b68e1b8a4..1ba44d44897b 100644 --- a/test/README.md +++ b/test/README.md @@ -73,5 +73,6 @@ The script is based on the `git apply` command and applies the `scripts/material When the patch fails to apply, you need to update the patch file: 1. Run `git apply --3way scripts/material-ui-v6.patch` and resolve the conflicts. -2. Run `git --no-pager diff --unified=0 | pbcopy`. The diff is copied to your clipboard. -3. Update the `scripts/material-ui-v6.patch` file with the copied diff. +2. Unstage the changes with `git reset`. +3. Run `git --no-pager diff --unified=0 | pbcopy`. The diff is copied to your clipboard. +4. Update the `scripts/material-ui-v6.patch` file with the copied diff. From cc54863e57dc33369415ad686be0d40db6fa1125 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 16:04:15 +0200 Subject: [PATCH 61/96] update patch --- scripts/material-ui-v6.patch | 134 +++++++---------------------------- 1 file changed, 27 insertions(+), 107 deletions(-) diff --git a/scripts/material-ui-v6.patch b/scripts/material-ui-v6.patch index 57fda1a1a0d1..b884b017f228 100644 --- a/scripts/material-ui-v6.patch +++ b/scripts/material-ui-v6.patch @@ -2,14 +2,10 @@ diff --git a/docs/package.json b/docs/package.json index d779100d9a..1b7d072164 100644 --- a/docs/package.json +++ b/docs/package.json -@@ -28,14 +28,14 @@ - "@emotion/server": "^11.11.0", - "@emotion/styled": "^11.13.0", - "@mui/docs": "6.0.0-beta.6", +@@ -31 +31 @@ - "@mui/icons-material": "^5.16.7", + "@mui/icons-material": "next", - "@mui/joy": "^5.0.0-beta.48", - "@mui/lab": "^5.0.0-alpha.173", +@@ -34,5 +34,5 @@ - "@mui/material": "^5.16.7", - "@mui/material-nextjs": "^5.16.6", - "@mui/styles": "^5.16.7", @@ -20,171 +16,95 @@ index d779100d9a..1b7d072164 100644 + "@mui/styles": "next", + "@mui/system": "next", + "@mui/utils": "next", - "@mui/x-charts": "workspace:*", - "@mui/x-charts-vendor": "workspace:*", - "@mui/x-data-grid": "workspace:*", diff --git a/package.json b/package.json -index a6aacfe942..a9e920990e 100644 +index 2ec932c356..0d7a215de0 100644 --- a/package.json +++ b/package.json -@@ -88,12 +88,12 @@ - "@emotion/cache": "^11.13.1", - "@emotion/react": "^11.13.0", - "@emotion/styled": "^11.13.0", +@@ -92 +92 @@ - "@mui/icons-material": "^5.16.7", + "@mui/icons-material": "next", - "@mui/internal-markdown": "^1.0.10", - "@mui/internal-test-utils": "^1.0.8", +@@ -95 +95 @@ - "@mui/material": "^5.16.7", + "@mui/material": "next", - "@mui/monorepo": "github:mui/material-ui#0acfe665034fdf4578156ebaf4372713cf23bce4", +@@ -97 +97 @@ - "@mui/utils": "^5.16.6", + "@mui/utils": "next", - "@next/eslint-plugin-next": "14.2.5", - "@octokit/plugin-retry": "^7.1.1", - "@octokit/rest": "^21.0.2", diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json -index f29fdfcbc5..ed204e689f 100644 +index 054fb306b4..c97ed9bd2a 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json -@@ -66,7 +66,7 @@ - } - }, - "devDependencies": { +@@ -69 +69 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@react-spring/core": "^9.7.4", - "@react-spring/shared": "^9.7.4", - "@types/prop-types": "^15.7.12", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json -index 22a2f3a990..a5df8948ac 100644 +index f882a137ad..a10202a811 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json -@@ -65,7 +65,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -68 +68 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@react-spring/core": "^9.7.4", - "@react-spring/shared": "^9.7.4", - "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json -index 1378a8801d..c7449032e2 100644 +index ec22d3a293..8ccc7a6228 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json -@@ -40,8 +40,8 @@ - "lru-cache": "^10.4.3" - }, - "devDependencies": { +@@ -43,2 +43,2 @@ - "@mui/icons-material": "^5.16.5", - "@mui/material": "^5.16.5", + "@mui/icons-material": "next", + "@mui/material": "next", - "@types/chance": "^1.1.6", - "rimraf": "^5.0.10" - }, diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json -index 4dedc9748f..05306b7a17 100644 +index 99f81500bc..9fe5f8b778 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json -@@ -73,7 +73,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -76 +76 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@types/prop-types": "^15.7.12", - "date-fns": "^2.30.0", - "rimraf": "^5.0.10" diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json -index 1f017f5c97..ab827949a1 100644 +index 45a678e97d..ac69bf70bd 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json -@@ -71,7 +71,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -74 +74 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@types/prop-types": "^15.7.12", - "rimraf": "^5.0.10" - }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json -index 268c5fe4ef..b1d4badeb8 100644 +index ee9f475a58..cd180bfb5f 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json -@@ -73,7 +73,7 @@ - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", - "@mui/joy": "^5.0.0-beta.48", +@@ -76 +76 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@mui/types": "^7.2.15", - "@types/prop-types": "^15.7.12", - "rimraf": "^5.0.10" diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json -index cb54d5bca9..8d20fb4fc3 100644 +index 2f2528b261..402b06f2c1 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json -@@ -96,7 +96,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -99 +99 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@types/luxon": "^3.4.2", - "@types/prop-types": "^15.7.12", - "date-fns": "^2.30.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json -index b815491594..127d4c20a8 100644 +index 771031872a..fa088344bd 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json -@@ -98,7 +98,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -101 +101 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@types/luxon": "^3.4.2", - "@types/moment-hijri": "^2.1.4", - "@types/moment-jalaali": "^0.7.9", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json -index fb34cba792..6267e1a8aa 100644 +index e8f6281d4c..6d3e152ce4 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json -@@ -71,7 +71,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -74 +74 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@types/prop-types": "^15.7.12", - "rimraf": "^5.0.10" - }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json -index d47163b8da..91760dc790 100644 +index e39a9e292a..a32fc8f656 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json -@@ -69,7 +69,7 @@ - }, - "devDependencies": { - "@mui/internal-test-utils": "^1.0.8", +@@ -72 +72 @@ - "@mui/material": "^5.16.5", + "@mui/material": "next", - "@types/prop-types": "^15.7.12", - "rimraf": "^5.0.10" - }, diff --git a/test/package.json b/test/package.json index d0c46845ff..ab90a583a1 100644 --- a/test/package.json +++ b/test/package.json -@@ -9,7 +9,7 @@ - "@babel/runtime": "^7.25.0", - "@emotion/cache": "^11.13.1", - "@emotion/react": "^11.13.0", +@@ -12 +12 @@ - "@mui/material": "^5.16.7", + "@mui/material": "next", - "@mui/x-data-grid": "workspace:*", - "@mui/x-data-grid-pro": "workspace:*", - "@mui/x-date-pickers": "workspace:*", From 10684a971a7c2fa509f137cff6e95d2329ca5c5f Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 16:06:52 +0200 Subject: [PATCH 62/96] fix applying 0-unified patch --- scripts/useMaterialUIv6.mjs | 12 ++++++++---- test/README.md | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index 8e8cac3c0136..80bf1cbdde88 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -1,9 +1,13 @@ import childProcess from 'child_process'; -const gitApply = childProcess.spawnSync('git', ['apply', 'scripts/material-ui-v6.patch'], { - shell: true, - stdio: ['inherit', 'inherit', 'inherit'], -}); +const gitApply = childProcess.spawnSync( + 'git', + ['apply', 'scripts/material-ui-v6.patch', '--unidiff-zero'], + { + shell: true, + stdio: ['inherit', 'inherit', 'inherit'], + }, +); if (gitApply.status !== 0) { process.exit(gitApply.status); } diff --git a/test/README.md b/test/README.md index 1ba44d44897b..2893acd61001 100644 --- a/test/README.md +++ b/test/README.md @@ -72,7 +72,7 @@ There's a `material-ui-v6` workflow in our CircleCI pipeline that you can trigge The script is based on the `git apply` command and applies the `scripts/material-ui-v6.patch` file. When the patch fails to apply, you need to update the patch file: -1. Run `git apply --3way scripts/material-ui-v6.patch` and resolve the conflicts. +1. Run `git apply --3way --unidiff-zero scripts/material-ui-v6.patch` and resolve the conflicts. 2. Unstage the changes with `git reset`. 3. Run `git --no-pager diff --unified=0 | pbcopy`. The diff is copied to your clipboard. 4. Update the `scripts/material-ui-v6.patch` file with the copied diff. From 30ba53ba1e76a08d7223d4e19020f4566836f76b Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 16:08:05 +0200 Subject: [PATCH 63/96] update readme --- test/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/README.md b/test/README.md index 2893acd61001..da944cf212f9 100644 --- a/test/README.md +++ b/test/README.md @@ -75,4 +75,5 @@ When the patch fails to apply, you need to update the patch file: 1. Run `git apply --3way --unidiff-zero scripts/material-ui-v6.patch` and resolve the conflicts. 2. Unstage the changes with `git reset`. 3. Run `git --no-pager diff --unified=0 | pbcopy`. The diff is copied to your clipboard. -4. Update the `scripts/material-ui-v6.patch` file with the copied diff. +4. Update and save the `scripts/material-ui-v6.patch` file with the copied diff. +5. Try running `pnpm use-material-ui-v6` again. If it fails, try to update the patch file again. From 8bc293bc3ceedd5a8803b0009bb8682228665840 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 18:25:58 +0200 Subject: [PATCH 64/96] ignore material ui v6 warnings --- test/regressions/index.test.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/regressions/index.test.js b/test/regressions/index.test.js index cb4971f83010..631f51427eba 100644 --- a/test/regressions/index.test.js +++ b/test/regressions/index.test.js @@ -3,6 +3,7 @@ import { expect } from 'chai'; import * as path from 'path'; import * as childProcess from 'child_process'; import { chromium } from '@playwright/test'; +import materialPackageJson from '@mui/material/package.json'; function sleep(timeoutMS) { return new Promise((resolve) => { @@ -10,6 +11,20 @@ function sleep(timeoutMS) { }); } +const isMaterialUIv6 = materialPackageJson.version.startsWith('6.'); + +const ignoredMaterialUIv6Warnings = [ + 'MUI: The `experimental_extendTheme` has been stabilized.', + 'MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.', +]; + +const isConsoleWarningIgnored = (msg) => { + if (isMaterialUIv6 && ignoredMaterialUIv6Warnings.some((warning) => msg.startsWith(warning))) { + return true; + } + return false; +}; + async function main() { const baseUrl = 'http://localhost:5001'; const screenshotDir = path.resolve(__dirname, './screenshots/chrome'); @@ -85,6 +100,9 @@ async function main() { it('should have no errors after the initial render', () => { const msg = errorConsole; errorConsole = undefined; + if (isConsoleWarningIgnored(msg)) { + return; + } expect(msg).to.equal(undefined); }); @@ -147,6 +165,9 @@ async function main() { it(`should have no errors rendering ${pathURL}`, () => { const msg = errorConsole; errorConsole = undefined; + if (isConsoleWarningIgnored(msg)) { + return; + } expect(msg).to.equal(undefined); }); }); From 983e44e4b08accc9ceef34bce7f4660a976c2f02 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 20:01:21 +0200 Subject: [PATCH 65/96] use createTheme instead of extendTheme --- docs/data/data-grid/joy-ui/GridJoyUISlots.js | 10 +++++----- docs/data/data-grid/joy-ui/GridJoyUISlots.tsx | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.js b/docs/data/data-grid/joy-ui/GridJoyUISlots.js index 7d88bad69902..35c89967fc53 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.js +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.js @@ -3,8 +3,8 @@ import Box from '@mui/material/Box'; import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { - experimental_extendTheme as materialExtendTheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + createTheme, + ThemeProvider as MaterialThemeProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; @@ -18,7 +18,7 @@ import { randomArrayItem, } from '@mui/x-data-grid-generator'; -const materialTheme = materialExtendTheme({ +const materialTheme = createTheme({ components: { MuiSvgIcon: { styleOverrides: { @@ -97,7 +97,7 @@ export default function GridJoyUISlots() { }, []); return ( - + - + ); } diff --git a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx index 8bcd13834ceb..6b1817921dcc 100644 --- a/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx +++ b/docs/data/data-grid/joy-ui/GridJoyUISlots.tsx @@ -3,8 +3,8 @@ import Box from '@mui/material/Box'; import { DataGrid, GridToolbar, GridActionsCellItem } from '@mui/x-data-grid'; import { unstable_joySlots } from '@mui/x-data-grid/joy'; import { - experimental_extendTheme as materialExtendTheme, - Experimental_CssVarsProvider as MaterialCssVarsProvider, + createTheme, + ThemeProvider as MaterialThemeProvider, THEME_ID as MATERIAL_THEME_ID, } from '@mui/material/styles'; import { CssVarsProvider as JoyCssVarsProvider } from '@mui/joy/styles'; @@ -19,7 +19,7 @@ import { } from '@mui/x-data-grid-generator'; import type {} from '@mui/material/themeCssVarsAugmentation'; -const materialTheme = materialExtendTheme({ +const materialTheme = createTheme({ components: { MuiSvgIcon: { styleOverrides: { @@ -106,7 +106,7 @@ export default function GridJoyUISlots() { }, []); return ( - + - + ); } From a7789df4aa902b57f2f9db20611179c4f9ce7071 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 20:01:56 +0200 Subject: [PATCH 66/96] add test_types job to material-ui-v6 workflow --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2aedb1dd104a..41e7604d040a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -408,3 +408,6 @@ workflows: - test_e2e: <<: *default-context name: test_e2e-material@next + - test_types: + <<: *default-context + name: test_types-material@next From 6fc6b5f8e0d633feeefb090ae8bf374ac4c2a39c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Thu, 22 Aug 2024 20:35:19 +0200 Subject: [PATCH 67/96] only diff specific folders after docs:typescript:formatted --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 41e7604d040a..72bff75bfe51 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -256,7 +256,7 @@ jobs: command: pnpm docs:typescript:formatted --disable-cache - run: name: '`pnpm docs:typescript:formatted` changes committed?' - command: git add -A && git diff --exit-code --staged + command: git add -A && git diff --exit-code --staged docs/src docs/data - run: name: Tests TypeScript definitions command: pnpm typescript:ci From 2856ca62be4dc4cf8cff5bac6ae88fa1645c9656 Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 23 Aug 2024 10:55:24 +0300 Subject: [PATCH 68/96] Make `@mui/system` a peer dep --- packages/x-charts-pro/package.json | 3 +- packages/x-charts/package.json | 3 +- packages/x-data-grid-premium/package.json | 3 +- packages/x-data-grid-pro/package.json | 3 +- packages/x-data-grid/package.json | 3 +- packages/x-date-pickers-pro/package.json | 3 +- packages/x-date-pickers/package.json | 3 +- packages/x-tree-view-pro/package.json | 3 +- packages/x-tree-view/package.json | 3 +- pnpm-lock.yaml | 54 +++++++++++------------ 10 files changed, 45 insertions(+), 36 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 054fb306b4df..e402fb83ecce 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,7 +40,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", @@ -54,6 +53,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -67,6 +67,7 @@ }, "devDependencies": { "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index f882a137ada8..d46def007f86 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,7 +40,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-charts-vendor": "workspace:*", "@react-spring/rafz": "^9.7.4", @@ -52,6 +51,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -66,6 +66,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 99f81500bc11..d733b732ec13 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", @@ -60,6 +59,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -74,6 +74,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", "rimraf": "^5.0.10" diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 45a678e97d28..5deaef872954 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", @@ -58,6 +57,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -72,6 +72,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index ee9f475a5830..a45da397c92e 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,7 +48,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", @@ -59,6 +58,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -74,6 +74,7 @@ "@mui/internal-test-utils": "^1.0.8", "@mui/joy": "^5.0.0-beta.48", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@mui/types": "^7.2.15", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 2f2528b261fe..6d44ac949cf6 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,7 +43,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-date-pickers": "workspace:*", "@mui/x-license": "workspace:*", @@ -55,6 +54,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", @@ -97,6 +97,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/luxon": "^3.4.2", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 771031872aad..e128565c540e 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,7 +46,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", @@ -57,6 +56,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", @@ -99,6 +99,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/luxon": "^3.4.2", "@types/moment-hijri": "^2.1.4", "@types/moment-jalaali": "^0.7.9", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index e8f6281d4cb0..9d1fac67a723 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", @@ -58,6 +57,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -72,6 +72,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index e39a9e292a93..228ac23d0c38 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.7", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", @@ -56,6 +55,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -70,6 +70,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 517e09e1826d..e2e008b5ba2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -717,9 +717,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -751,6 +748,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -779,9 +779,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -816,6 +813,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -961,9 +961,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -995,6 +992,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': specifier: ^7.2.15 version: 7.2.15(@types/react@18.3.3) @@ -1058,9 +1058,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1104,6 +1101,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1126,9 +1126,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1166,6 +1163,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1185,9 +1185,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1216,6 +1213,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1268,9 +1268,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1308,6 +1305,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1385,9 +1385,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1419,6 +1416,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1438,9 +1438,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1478,6 +1475,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 From 4fa883efc25f1e6386697485e2e871aea2508a23 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 23 Aug 2024 12:53:54 +0200 Subject: [PATCH 69/96] update patch --- scripts/material-ui-v6.patch | 54 ++++++++++++++++++++++++------------ 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/scripts/material-ui-v6.patch b/scripts/material-ui-v6.patch index b884b017f228..8ca0b1e71355 100644 --- a/scripts/material-ui-v6.patch +++ b/scripts/material-ui-v6.patch @@ -30,19 +30,23 @@ index 2ec932c356..0d7a215de0 100644 - "@mui/utils": "^5.16.6", + "@mui/utils": "next", diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json -index 054fb306b4..c97ed9bd2a 100644 +index e402fb83ec..981fc6dcfe 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json -@@ -69 +69 @@ +@@ -69,2 +69,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json -index f882a137ad..a10202a811 100644 +index d46def007f..dfcd81483a 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json -@@ -68 +68 @@ +@@ -68,2 +68,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index ec22d3a293..8ccc7a6228 100644 --- a/packages/x-data-grid-generator/package.json @@ -53,54 +57,68 @@ index ec22d3a293..8ccc7a6228 100644 + "@mui/icons-material": "next", + "@mui/material": "next", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json -index 99f81500bc..9fe5f8b778 100644 +index d733b732ec..666e93c2f3 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json -@@ -76 +76 @@ +@@ -76,2 +76,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json -index 45a678e97d..ac69bf70bd 100644 +index 5deaef8729..8dcb555174 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json -@@ -74 +74 @@ +@@ -74,2 +74,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json -index ee9f475a58..cd180bfb5f 100644 +index a45da397c9..b4d05c223f 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json -@@ -76 +76 @@ +@@ -76,2 +76,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json -index 2f2528b261..402b06f2c1 100644 +index 6d44ac949c..8f4b611d88 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json -@@ -99 +99 @@ +@@ -99,2 +99,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json -index 771031872a..fa088344bd 100644 +index e128565c54..a0bbd27cf6 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json -@@ -101 +101 @@ +@@ -101,2 +101,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json -index e8f6281d4c..6d3e152ce4 100644 +index 9d1fac67a7..58b9005236 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json -@@ -74 +74 @@ +@@ -74,2 +74,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json -index e39a9e292a..a32fc8f656 100644 +index 228ac23d0c..fcedd1b3dd 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json -@@ -72 +72 @@ +@@ -72,2 +72,2 @@ - "@mui/material": "^5.16.5", +- "@mui/system": "^5.16.7", + "@mui/material": "next", ++ "@mui/system": "next", diff --git a/test/package.json b/test/package.json index d0c46845ff..ab90a583a1 100644 --- a/test/package.json From 30b011327f280f73c27b064cdccf66e955c90d10 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 23 Aug 2024 13:35:19 +0200 Subject: [PATCH 70/96] fix ignored warnings check --- test/regressions/index.test.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/test/regressions/index.test.js b/test/regressions/index.test.js index 631f51427eba..febd9f694baf 100644 --- a/test/regressions/index.test.js +++ b/test/regressions/index.test.js @@ -19,7 +19,11 @@ const ignoredMaterialUIv6Warnings = [ ]; const isConsoleWarningIgnored = (msg) => { - if (isMaterialUIv6 && ignoredMaterialUIv6Warnings.some((warning) => msg.startsWith(warning))) { + if ( + msg && + isMaterialUIv6 && + ignoredMaterialUIv6Warnings.some((warning) => msg.startsWith(warning)) + ) { return true; } return false; From 6262ce2ecd25dbc732707c28be90dbcf48424737 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 23 Aug 2024 14:48:07 +0200 Subject: [PATCH 71/96] use pnpm update instead of git patch --- scripts/material-ui-v6.patch | 128 ----------------------------------- scripts/useMaterialUIv6.mjs | 23 ++++--- test/README.md | 11 --- 3 files changed, 12 insertions(+), 150 deletions(-) delete mode 100644 scripts/material-ui-v6.patch diff --git a/scripts/material-ui-v6.patch b/scripts/material-ui-v6.patch deleted file mode 100644 index 8ca0b1e71355..000000000000 --- a/scripts/material-ui-v6.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff --git a/docs/package.json b/docs/package.json -index d779100d9a..1b7d072164 100644 ---- a/docs/package.json -+++ b/docs/package.json -@@ -31 +31 @@ -- "@mui/icons-material": "^5.16.7", -+ "@mui/icons-material": "next", -@@ -34,5 +34,5 @@ -- "@mui/material": "^5.16.7", -- "@mui/material-nextjs": "^5.16.6", -- "@mui/styles": "^5.16.7", -- "@mui/system": "^5.16.7", -- "@mui/utils": "^5.16.6", -+ "@mui/material": "next", -+ "@mui/material-nextjs": "next", -+ "@mui/styles": "next", -+ "@mui/system": "next", -+ "@mui/utils": "next", -diff --git a/package.json b/package.json -index 2ec932c356..0d7a215de0 100644 ---- a/package.json -+++ b/package.json -@@ -92 +92 @@ -- "@mui/icons-material": "^5.16.7", -+ "@mui/icons-material": "next", -@@ -95 +95 @@ -- "@mui/material": "^5.16.7", -+ "@mui/material": "next", -@@ -97 +97 @@ -- "@mui/utils": "^5.16.6", -+ "@mui/utils": "next", -diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json -index e402fb83ec..981fc6dcfe 100644 ---- a/packages/x-charts-pro/package.json -+++ b/packages/x-charts-pro/package.json -@@ -69,2 +69,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json -index d46def007f..dfcd81483a 100644 ---- a/packages/x-charts/package.json -+++ b/packages/x-charts/package.json -@@ -68,2 +68,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json -index ec22d3a293..8ccc7a6228 100644 ---- a/packages/x-data-grid-generator/package.json -+++ b/packages/x-data-grid-generator/package.json -@@ -43,2 +43,2 @@ -- "@mui/icons-material": "^5.16.5", -- "@mui/material": "^5.16.5", -+ "@mui/icons-material": "next", -+ "@mui/material": "next", -diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json -index d733b732ec..666e93c2f3 100644 ---- a/packages/x-data-grid-premium/package.json -+++ b/packages/x-data-grid-premium/package.json -@@ -76,2 +76,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json -index 5deaef8729..8dcb555174 100644 ---- a/packages/x-data-grid-pro/package.json -+++ b/packages/x-data-grid-pro/package.json -@@ -74,2 +74,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json -index a45da397c9..b4d05c223f 100644 ---- a/packages/x-data-grid/package.json -+++ b/packages/x-data-grid/package.json -@@ -76,2 +76,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json -index 6d44ac949c..8f4b611d88 100644 ---- a/packages/x-date-pickers-pro/package.json -+++ b/packages/x-date-pickers-pro/package.json -@@ -99,2 +99,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json -index e128565c54..a0bbd27cf6 100644 ---- a/packages/x-date-pickers/package.json -+++ b/packages/x-date-pickers/package.json -@@ -101,2 +101,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json -index 9d1fac67a7..58b9005236 100644 ---- a/packages/x-tree-view-pro/package.json -+++ b/packages/x-tree-view-pro/package.json -@@ -74,2 +74,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json -index 228ac23d0c..fcedd1b3dd 100644 ---- a/packages/x-tree-view/package.json -+++ b/packages/x-tree-view/package.json -@@ -72,2 +72,2 @@ -- "@mui/material": "^5.16.5", -- "@mui/system": "^5.16.7", -+ "@mui/material": "next", -+ "@mui/system": "next", -diff --git a/test/package.json b/test/package.json -index d0c46845ff..ab90a583a1 100644 ---- a/test/package.json -+++ b/test/package.json -@@ -12 +12 @@ -- "@mui/material": "^5.16.7", -+ "@mui/material": "next", diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index 80bf1cbdde88..3470dd692c9f 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -1,19 +1,20 @@ import childProcess from 'child_process'; -const gitApply = childProcess.spawnSync( - 'git', - ['apply', 'scripts/material-ui-v6.patch', '--unidiff-zero'], +const pnpmUpdate = childProcess.spawnSync( + 'pnpm', + [ + 'update', + '-r', + '@mui/material@next', + '@mui/system@next', + '@mui/icons-material@next', + '@mui/material-nextjs@next', + '@mui/styles@next', + ], { shell: true, stdio: ['inherit', 'inherit', 'inherit'], }, ); -if (gitApply.status !== 0) { - process.exit(gitApply.status); -} -const pnpmInstall = childProcess.spawnSync('pnpm', ['install', '--no-frozen-lockfile'], { - shell: true, - stdio: ['inherit', 'inherit', 'inherit'], -}); -process.exit(pnpmInstall.status); +process.exit(pnpmUpdate.status); diff --git a/test/README.md b/test/README.md index da944cf212f9..1b571acc841d 100644 --- a/test/README.md +++ b/test/README.md @@ -66,14 +66,3 @@ There's a `material-ui-v6` workflow in our CircleCI pipeline that you can trigge 4. Click `Trigger Pipeline` button. ![CircleCI workflow](./circleci-workflow.png) - -### Maintaining the `use-material-ui-v6` script - -The script is based on the `git apply` command and applies the `scripts/material-ui-v6.patch` file. -When the patch fails to apply, you need to update the patch file: - -1. Run `git apply --3way --unidiff-zero scripts/material-ui-v6.patch` and resolve the conflicts. -2. Unstage the changes with `git reset`. -3. Run `git --no-pager diff --unified=0 | pbcopy`. The diff is copied to your clipboard. -4. Update and save the `scripts/material-ui-v6.patch` file with the copied diff. -5. Try running `pnpm use-material-ui-v6` again. If it fails, try to update the patch file again. From e84a0168cfbe87a836ba46a4d91d24b68b27366c Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Fri, 23 Aug 2024 14:51:20 +0200 Subject: [PATCH 72/96] format test/package.json --- test/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/package.json b/test/package.json index d0c46845ff48..38dc2a64258c 100644 --- a/test/package.json +++ b/test/package.json @@ -10,13 +10,13 @@ "@emotion/cache": "^11.13.1", "@emotion/react": "^11.13.0", "@mui/material": "^5.16.7", + "@mui/x-charts": "workspace:*", + "@mui/x-charts-pro": "workspace:*", + "@mui/x-charts-vendor": "workspace:*", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", "@mui/x-date-pickers": "workspace:*", "@mui/x-date-pickers-pro": "workspace:*", - "@mui/x-charts": "workspace:*", - "@mui/x-charts-pro": "workspace:*", - "@mui/x-charts-vendor": "workspace:*", "@mui/x-license": "workspace:*", "@playwright/test": "^1.44.1", "@react-spring/web": "^9.7.4", From 0fdb1a75c339e9b2cc879cda11c7485f5cfc6906 Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 23 Aug 2024 17:53:59 +0300 Subject: [PATCH 73/96] Test `@mui/system` dependency with `||` case --- packages/x-charts-pro/package.json | 3 +- packages/x-charts/package.json | 3 +- packages/x-data-grid-premium/package.json | 3 +- packages/x-data-grid-pro/package.json | 3 +- packages/x-data-grid/package.json | 3 +- packages/x-date-pickers-pro/package.json | 3 +- packages/x-date-pickers/package.json | 3 +- packages/x-tree-view-pro/package.json | 3 +- packages/x-tree-view/package.json | 3 +- pnpm-lock.yaml | 54 +++++++++++------------ 10 files changed, 36 insertions(+), 45 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index f1a72b041316..a72eb0ce461a 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,6 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", @@ -53,7 +54,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -67,7 +67,6 @@ }, "devDependencies": { "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 80a9d9217c13..05f0c74e8e50 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,6 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-charts-vendor": "workspace:*", "@react-spring/rafz": "^9.7.4", @@ -51,7 +52,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -66,7 +66,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 34baaf886610..f212651dc952 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,6 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", @@ -59,7 +60,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -74,7 +74,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", "rimraf": "^5.0.10" diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index fdb452ab7ba5..3bf76a1ea3dd 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,6 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", @@ -57,7 +58,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -72,7 +72,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 4dd97dedac1c..f903f9a529d1 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,6 +48,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", @@ -58,7 +59,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -74,7 +74,6 @@ "@mui/internal-test-utils": "^1.0.8", "@mui/joy": "^5.0.0-beta.48", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@mui/types": "^7.2.15", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 8770ce112743..39c61495b21a 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,6 +43,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-date-pickers": "workspace:*", "@mui/x-license": "workspace:*", @@ -54,7 +55,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", @@ -97,7 +97,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@types/luxon": "^3.4.2", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index ef3105e7aaba..42f3ea3c1aec 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,6 +46,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", @@ -56,7 +57,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", @@ -99,7 +99,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@types/luxon": "^3.4.2", "@types/moment-hijri": "^2.1.4", "@types/moment-jalaali": "^0.7.9", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 65b466522830..01e4984a4bf6 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,6 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", @@ -57,7 +58,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -72,7 +72,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 92c0b960f887..47655ee6e55d 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,6 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", @@ -55,7 +56,6 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -70,7 +70,6 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", - "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e2e008b5ba2c..c65c30e16369 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -717,6 +717,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -748,9 +751,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -779,6 +779,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -813,9 +816,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -961,6 +961,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -992,9 +995,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': specifier: ^7.2.15 version: 7.2.15(@types/react@18.3.3) @@ -1058,6 +1058,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1101,9 +1104,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1126,6 +1126,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1163,9 +1166,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1185,6 +1185,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1213,9 +1216,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1268,6 +1268,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1305,9 +1308,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1385,6 +1385,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1416,9 +1419,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1438,6 +1438,9 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) + '@mui/system': + specifier: ^5.16.6 || ^6.0.0-rc.0 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1475,9 +1478,6 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) - '@mui/system': - specifier: ^5.16.7 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 From ae64e19289a8de1dce6b9ea7a8625671d953d86f Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 12:42:24 +0300 Subject: [PATCH 74/96] Test `>=` specifier --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index a72eb0ce461a..f8e0fb30c82b 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 05f0c74e8e50..a8bf118417b5 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-charts-vendor": "workspace:*", "@react-spring/rafz": "^9.7.4", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index f212651dc952..99666986ce71 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 3bf76a1ea3dd..209a9b82945e 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index f903f9a529d1..53d4afc914c0 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 39c61495b21a..342ee969cbe0 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-date-pickers": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 42f3ea3c1aec..eb671b161dfb 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,7 +46,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 01e4984a4bf6..fded35c52b4b 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 47655ee6e55d..cdd21932ca91 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", + "@mui/system": ">=5.16.6", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c65c30e16369..ee5990135f10 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -718,7 +718,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -780,7 +780,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -962,7 +962,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1059,7 +1059,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1127,7 +1127,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1186,7 +1186,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1269,7 +1269,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1386,7 +1386,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1439,7 +1439,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 + specifier: '>=5.16.6' version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 From 567b8056ff5b071dfe0a0b41b0c2766e2edf2d01 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 13:49:34 +0300 Subject: [PATCH 75/96] Revert "Test `>=` specifier" This reverts commit ae64e19289a8de1dce6b9ea7a8625671d953d86f. --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- pnpm-lock.yaml | 18 +++++++++--------- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index f8e0fb30c82b..a72eb0ce461a 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index a8bf118417b5..05f0c74e8e50 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,7 +40,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-charts-vendor": "workspace:*", "@react-spring/rafz": "^9.7.4", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 99666986ce71..f212651dc952 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 209a9b82945e..3bf76a1ea3dd 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 53d4afc914c0..f903f9a529d1 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,7 +48,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 342ee969cbe0..39c61495b21a 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,7 +43,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-date-pickers": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index eb671b161dfb..42f3ea3c1aec 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,7 +46,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index fded35c52b4b..01e4984a4bf6 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index cdd21932ca91..47655ee6e55d 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,7 +44,7 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": ">=5.16.6", + "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ee5990135f10..c65c30e16369 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -718,7 +718,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -780,7 +780,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -962,7 +962,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1059,7 +1059,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1127,7 +1127,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1186,7 +1186,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1269,7 +1269,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1386,7 +1386,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 @@ -1439,7 +1439,7 @@ importers: specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/system': - specifier: '>=5.16.6' + specifier: ^5.16.6 || ^6.0.0-rc.0 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 From 087882a657be5ff504210454c008f7b7d516f3fd Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 13:49:46 +0300 Subject: [PATCH 76/96] Revert "Test `@mui/system` dependency with `||` case" This reverts commit 0fdb1a75c339e9b2cc879cda11c7485f5cfc6906. --- packages/x-charts-pro/package.json | 3 +- packages/x-charts/package.json | 3 +- packages/x-data-grid-premium/package.json | 3 +- packages/x-data-grid-pro/package.json | 3 +- packages/x-data-grid/package.json | 3 +- packages/x-date-pickers-pro/package.json | 3 +- packages/x-date-pickers/package.json | 3 +- packages/x-tree-view-pro/package.json | 3 +- packages/x-tree-view/package.json | 3 +- pnpm-lock.yaml | 54 +++++++++++------------ 10 files changed, 45 insertions(+), 36 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index a72eb0ce461a..f1a72b041316 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -40,7 +40,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-charts": "workspace:*", "@mui/x-charts-vendor": "workspace:*", @@ -54,6 +53,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -67,6 +67,7 @@ }, "devDependencies": { "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 05f0c74e8e50..80a9d9217c13 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -40,7 +40,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-charts-vendor": "workspace:*", "@react-spring/rafz": "^9.7.4", @@ -52,6 +51,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -66,6 +66,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@react-spring/core": "^9.7.4", "@react-spring/shared": "^9.7.4", "@types/prop-types": "^15.7.12", diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index f212651dc952..34baaf886610 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-data-grid-pro": "workspace:*", @@ -60,6 +59,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -74,6 +74,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", "rimraf": "^5.0.10" diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 3bf76a1ea3dd..fdb452ab7ba5 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-data-grid": "workspace:*", "@mui/x-internals": "workspace:*", @@ -58,6 +57,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -72,6 +72,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index f903f9a529d1..4dd97dedac1c 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -48,7 +48,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "clsx": "^2.1.1", @@ -59,6 +58,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -74,6 +74,7 @@ "@mui/internal-test-utils": "^1.0.8", "@mui/joy": "^5.0.0-beta.48", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@mui/types": "^7.2.15", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 39c61495b21a..8770ce112743 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -43,7 +43,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-date-pickers": "workspace:*", "@mui/x-license": "workspace:*", @@ -55,6 +54,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", @@ -97,6 +97,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/luxon": "^3.4.2", "@types/prop-types": "^15.7.12", "date-fns": "^2.30.0", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 42f3ea3c1aec..ef3105e7aaba 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -46,7 +46,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@types/react-transition-group": "^4.4.11", "clsx": "^2.1.1", @@ -57,6 +56,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", @@ -99,6 +99,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/luxon": "^3.4.2", "@types/moment-hijri": "^2.1.4", "@types/moment-jalaali": "^0.7.9", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 01e4984a4bf6..65b466522830 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@mui/x-license": "workspace:*", @@ -58,6 +57,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -72,6 +72,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 47655ee6e55d..92c0b960f887 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -44,7 +44,6 @@ }, "dependencies": { "@babel/runtime": "^7.25.0", - "@mui/system": "^5.16.6 || ^6.0.0-rc.0", "@mui/utils": "^5.16.6", "@mui/x-internals": "workspace:*", "@types/react-transition-group": "^4.4.11", @@ -56,6 +55,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, @@ -70,6 +70,7 @@ "devDependencies": { "@mui/internal-test-utils": "^1.0.8", "@mui/material": "^5.16.5", + "@mui/system": "^5.16.7", "@types/prop-types": "^15.7.12", "rimraf": "^5.0.10" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c65c30e16369..e2e008b5ba2c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -717,9 +717,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -751,6 +748,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -779,9 +779,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -816,6 +813,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@react-spring/core': specifier: ^9.7.4 version: 9.7.4(react@18.3.1) @@ -961,9 +961,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -995,6 +992,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/types': specifier: ^7.2.15 version: 7.2.15(@types/react@18.3.3) @@ -1058,9 +1058,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1104,6 +1101,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1126,9 +1126,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1166,6 +1163,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1185,9 +1185,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1216,6 +1213,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1268,9 +1268,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1308,6 +1305,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/luxon': specifier: ^3.4.2 version: 3.4.2 @@ -1385,9 +1385,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1419,6 +1416,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 @@ -1438,9 +1438,6 @@ importers: '@emotion/styled': specifier: ^11.8.1 version: 11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) - '@mui/system': - specifier: ^5.16.6 || ^6.0.0-rc.0 - version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@mui/utils': specifier: ^5.16.6 version: 5.16.6(@types/react@18.3.3)(react@18.3.1) @@ -1478,6 +1475,9 @@ importers: '@mui/material': specifier: ^5.16.5 version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@mui/system': + specifier: ^5.16.7 + version: 5.16.7(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.13.0(@emotion/react@11.13.0(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) '@types/prop-types': specifier: ^15.7.12 version: 15.7.12 From 20b8a85ba66b6d74404029daf5845238454ff824 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 13:56:18 +0300 Subject: [PATCH 77/96] Align `@mui/system` peer dep version with `@mui/material` --- packages/x-charts-pro/package.json | 2 +- packages/x-charts/package.json | 2 +- packages/x-data-grid-premium/package.json | 2 +- packages/x-data-grid-pro/package.json | 2 +- packages/x-data-grid/package.json | 2 +- packages/x-date-pickers-pro/package.json | 2 +- packages/x-date-pickers/package.json | 2 +- packages/x-tree-view-pro/package.json | 2 +- packages/x-tree-view/package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index f1a72b041316..9721d9b9d07a 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -53,7 +53,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 80a9d9217c13..1ebdd77d6def 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -51,7 +51,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 34baaf886610..76607d2ba745 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -59,7 +59,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index fdb452ab7ba5..08fe2f575789 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -57,7 +57,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 4dd97dedac1c..65ed8dc20a5c 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -58,7 +58,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index 8770ce112743..28acda66152c 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -54,7 +54,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index ef3105e7aaba..9d04b8a277ea 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -56,7 +56,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 65b466522830..f757f34beb91 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -57,7 +57,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index 92c0b960f887..7474f55f9e8f 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -55,7 +55,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.16.7 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, From 555d8e17480c8fd47f10285b688ec08827bfd7c2 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 14:30:36 +0300 Subject: [PATCH 78/96] Don't update `@mui/system` as it's a peer dependency now --- scripts/useMaterialUIv6.mjs | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index 3470dd692c9f..8dff83b3d496 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -6,7 +6,6 @@ const pnpmUpdate = childProcess.spawnSync( 'update', '-r', '@mui/material@next', - '@mui/system@next', '@mui/icons-material@next', '@mui/material-nextjs@next', '@mui/styles@next', From af2f7f3c9808ba46f573d95eac8db9abc80042a5 Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 15:38:44 +0300 Subject: [PATCH 79/96] Try updating only what is relevant to packages (excluding `docs`) --- scripts/useMaterialUIv6.mjs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index 8dff83b3d496..a288eeb061af 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -6,9 +6,8 @@ const pnpmUpdate = childProcess.spawnSync( 'update', '-r', '@mui/material@next', + '@mui/system@next', '@mui/icons-material@next', - '@mui/material-nextjs@next', - '@mui/styles@next', ], { shell: true, From 98fcced0878cb38ef9ee376f8cf0ab3527bca79a Mon Sep 17 00:00:00 2001 From: Lukas Date: Mon, 26 Aug 2024 16:34:14 +0300 Subject: [PATCH 80/96] prettier --- scripts/useMaterialUIv6.mjs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index a288eeb061af..662dd41432aa 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -2,13 +2,7 @@ import childProcess from 'child_process'; const pnpmUpdate = childProcess.spawnSync( 'pnpm', - [ - 'update', - '-r', - '@mui/material@next', - '@mui/system@next', - '@mui/icons-material@next', - ], + ['update', '-r', '@mui/material@next', '@mui/system@next', '@mui/icons-material@next'], { shell: true, stdio: ['inherit', 'inherit', 'inherit'], From 5932ead1298dd87d93ed082eef9642db961d5b15 Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 26 Aug 2024 17:14:34 +0200 Subject: [PATCH 81/96] fix failing browser test --- .../tests/MultiSectionDigitalClock.test.tsx | 4 ++-- test/utils/pickers/viewHandlers.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx index ac548cd2453d..91331ff60d50 100644 --- a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx +++ b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx @@ -16,7 +16,7 @@ describe('', () => { const { render } = createPickerRenderer(); describe('Reference date', () => { - it('should use `referenceDate` when no value defined', () => { + it('should use `referenceDate` when no value defined', async () => { const onChange = spy(); const referenceDate = '2018-01-01T13:30:00'; @@ -36,7 +36,7 @@ describe('', () => { expect(screen.getByRole('option', { name: '30 minutes' })).to.have.attribute('tabindex', '0'); expect(screen.getByRole('option', { name: 'PM' })).to.have.attribute('tabindex', '0'); - multiSectionDigitalClockHandler.setViewValue( + await multiSectionDigitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); diff --git a/test/utils/pickers/viewHandlers.ts b/test/utils/pickers/viewHandlers.ts index 27038ba5d6a1..eabcbf9796a8 100644 --- a/test/utils/pickers/viewHandlers.ts +++ b/test/utils/pickers/viewHandlers.ts @@ -7,11 +7,11 @@ import { fireUserEvent } from '../fireUserEvent'; type TDate = any; interface ViewHandler { - setViewValue: (utils: MuiPickersAdapter, viewValue: TDate, view?: TView) => void; + setViewValue: (utils: MuiPickersAdapter, viewValue: TDate, view?: TView) => Promise; } export const timeClockHandler: ViewHandler = { - setViewValue: (adapter, value, view) => { + setViewValue: async (adapter, value, view) => { const hasMeridiem = adapter.is12HourCycleInCurrentLocale(); let valueInt; From c045f74aa0aabbccde3fc7b4be66c242a81de63f Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 26 Aug 2024 20:23:18 +0200 Subject: [PATCH 82/96] avoid visual regression with material-ui-v6 --- docs/data/data-grid/row-height/ExpandableCells.js | 2 +- docs/data/data-grid/row-height/ExpandableCells.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/data/data-grid/row-height/ExpandableCells.js b/docs/data/data-grid/row-height/ExpandableCells.js index 1a1c4d10b31d..45b22e8734c0 100644 --- a/docs/data/data-grid/row-height/ExpandableCells.js +++ b/docs/data/data-grid/row-height/ExpandableCells.js @@ -34,7 +34,7 @@ function ExpandableCell({ value }) { setExpanded(!expanded)} > {expanded ? 'view less' : 'view more'} diff --git a/docs/data/data-grid/row-height/ExpandableCells.tsx b/docs/data/data-grid/row-height/ExpandableCells.tsx index 4ac5b11fa122..7f5f0874d6d4 100644 --- a/docs/data/data-grid/row-height/ExpandableCells.tsx +++ b/docs/data/data-grid/row-height/ExpandableCells.tsx @@ -39,7 +39,7 @@ function ExpandableCell({ value }: GridRenderCellParams) { setExpanded(!expanded)} > {expanded ? 'view less' : 'view more'} From ba041e28e3bd565648f78fe7d552b9d23961dedb Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Mon, 26 Aug 2024 20:35:03 +0200 Subject: [PATCH 83/96] avoid visual regressions between v5 and v6 --- docs/data/date-pickers/custom-field/BrowserV6Field.js | 3 +++ docs/data/date-pickers/custom-field/BrowserV6Field.tsx | 3 +++ .../custom-field/BrowserV6SingleInputRangeField.js | 2 +- .../custom-field/BrowserV6SingleInputRangeField.tsx | 2 +- docs/data/date-pickers/custom-field/BrowserV7Field.js | 3 +++ docs/data/date-pickers/custom-field/BrowserV7Field.tsx | 3 +++ .../custom-field/BrowserV7SingleInputRangeField.js | 3 +++ .../custom-field/BrowserV7SingleInputRangeField.tsx | 3 +++ 8 files changed, 20 insertions(+), 2 deletions(-) diff --git a/docs/data/date-pickers/custom-field/BrowserV6Field.js b/docs/data/date-pickers/custom-field/BrowserV6Field.js index bb3952a732ce..63be3f56e884 100644 --- a/docs/data/date-pickers/custom-field/BrowserV6Field.js +++ b/docs/data/date-pickers/custom-field/BrowserV6Field.js @@ -33,6 +33,9 @@ const BrowserField = React.forwardRef((props, ref) => { { display: 'flex', alignItems: 'center', + '& .MuiInputAdornment-root': { + height: 'auto', + }, }, sx || {}, ]} diff --git a/docs/data/date-pickers/custom-field/BrowserV6Field.tsx b/docs/data/date-pickers/custom-field/BrowserV6Field.tsx index 45fa7acdec43..49138cd42863 100644 --- a/docs/data/date-pickers/custom-field/BrowserV6Field.tsx +++ b/docs/data/date-pickers/custom-field/BrowserV6Field.tsx @@ -63,6 +63,9 @@ const BrowserField = React.forwardRef( { display: 'flex', alignItems: 'center', + '& .MuiInputAdornment-root': { + height: 'auto', + }, }, sx || {}, ]} diff --git a/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.js b/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.js index 4815d50972ac..311029bbc6fa 100644 --- a/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.js +++ b/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.js @@ -63,7 +63,7 @@ const BrowserSingleInputDateRangeField = React.forwardRef((props, ref) => { textFieldProps.InputProps = { ...textFieldProps.InputProps, endAdornment: ( - + diff --git a/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.tsx b/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.tsx index 15c4e41160ae..6db84b3f6c57 100644 --- a/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.tsx +++ b/docs/data/date-pickers/custom-field/BrowserV6SingleInputRangeField.tsx @@ -118,7 +118,7 @@ const BrowserSingleInputDateRangeField = React.forwardRef( textFieldProps.InputProps = { ...textFieldProps.InputProps, endAdornment: ( - + diff --git a/docs/data/date-pickers/custom-field/BrowserV7Field.js b/docs/data/date-pickers/custom-field/BrowserV7Field.js index 2454d803bf30..78497c2f81a5 100644 --- a/docs/data/date-pickers/custom-field/BrowserV7Field.js +++ b/docs/data/date-pickers/custom-field/BrowserV7Field.js @@ -13,6 +13,9 @@ import { Unstable_PickersSectionList as PickersSectionList } from '@mui/x-date-p const BrowserFieldRoot = styled('div', { name: 'BrowserField', slot: 'Root' })({ display: 'flex', alignItems: 'center', + '& .MuiInputAdornment-root': { + height: 'auto', + }, }); const BrowserFieldContent = styled('div', { name: 'BrowserField', slot: 'Content' })( diff --git a/docs/data/date-pickers/custom-field/BrowserV7Field.tsx b/docs/data/date-pickers/custom-field/BrowserV7Field.tsx index a84e535d4340..202c6dd74e0a 100644 --- a/docs/data/date-pickers/custom-field/BrowserV7Field.tsx +++ b/docs/data/date-pickers/custom-field/BrowserV7Field.tsx @@ -21,6 +21,9 @@ import { Unstable_PickersSectionList as PickersSectionList } from '@mui/x-date-p const BrowserFieldRoot = styled('div', { name: 'BrowserField', slot: 'Root' })({ display: 'flex', alignItems: 'center', + '& .MuiInputAdornment-root': { + height: 'auto', + }, }); const BrowserFieldContent = styled('div', { name: 'BrowserField', slot: 'Content' })( diff --git a/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js b/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js index 57cc103e1c69..26c10f367f97 100644 --- a/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js +++ b/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js @@ -16,6 +16,9 @@ import { Unstable_PickersSectionList as PickersSectionList } from '@mui/x-date-p const BrowserFieldRoot = styled('div', { name: 'BrowserField', slot: 'Root' })({ display: 'flex', alignItems: 'center', + '& .MuiInputAdornment-root': { + height: 'auto', + }, }); const BrowserFieldContent = styled('div', { name: 'BrowserField', slot: 'Content' })( diff --git a/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.tsx b/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.tsx index dd04c5aae06e..5c925effbaab 100644 --- a/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.tsx +++ b/docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.tsx @@ -30,6 +30,9 @@ import { BaseSingleInputFieldProps } from '@mui/x-date-pickers/models'; const BrowserFieldRoot = styled('div', { name: 'BrowserField', slot: 'Root' })({ display: 'flex', alignItems: 'center', + '& .MuiInputAdornment-root': { + height: 'auto', + }, }); const BrowserFieldContent = styled('div', { name: 'BrowserField', slot: 'Content' })( From 442ad04357f2fb54f3fb714c25a741de79e1b371 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 15:24:11 +0300 Subject: [PATCH 84/96] Remove no longer needed version case --- packages/x-charts-pro/package.json | 4 ++-- packages/x-charts/package.json | 4 ++-- packages/x-data-grid-generator/package.json | 2 +- packages/x-data-grid-premium/package.json | 4 ++-- packages/x-data-grid-pro/package.json | 4 ++-- packages/x-data-grid/package.json | 4 ++-- packages/x-date-pickers-pro/package.json | 4 ++-- packages/x-date-pickers/package.json | 4 ++-- packages/x-tree-view-pro/package.json | 4 ++-- packages/x-tree-view/package.json | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/x-charts-pro/package.json b/packages/x-charts-pro/package.json index 955da024d3f1..d5288bfca544 100644 --- a/packages/x-charts-pro/package.json +++ b/packages/x-charts-pro/package.json @@ -52,8 +52,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json index 840636c80e10..964f66bd1937 100644 --- a/packages/x-charts/package.json +++ b/packages/x-charts/package.json @@ -50,8 +50,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index 8a6d8a5b3471..da84c96530f1 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -49,7 +49,7 @@ "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", "@mui/icons-material": "^5.4.1 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0" }, "peerDependenciesMeta": { diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json index 40200844f97b..c7cf0d310986 100644 --- a/packages/x-data-grid-premium/package.json +++ b/packages/x-data-grid-premium/package.json @@ -58,8 +58,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json index 62821ca72054..222b565c11cd 100644 --- a/packages/x-data-grid-pro/package.json +++ b/packages/x-data-grid-pro/package.json @@ -56,8 +56,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json index 568ff0bba2c8..267f51bd3afb 100644 --- a/packages/x-data-grid/package.json +++ b/packages/x-data-grid/package.json @@ -57,8 +57,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-date-pickers-pro/package.json b/packages/x-date-pickers-pro/package.json index fe5773179151..7febef59bed3 100644 --- a/packages/x-date-pickers-pro/package.json +++ b/packages/x-date-pickers-pro/package.json @@ -53,8 +53,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-date-pickers/package.json b/packages/x-date-pickers/package.json index 4fb276e0b32d..c54f351d3994 100644 --- a/packages/x-date-pickers/package.json +++ b/packages/x-date-pickers/package.json @@ -55,8 +55,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "date-fns": "^2.25.0 || ^3.2.0", "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0", "dayjs": "^1.10.7", diff --git a/packages/x-tree-view-pro/package.json b/packages/x-tree-view-pro/package.json index 2c2a5378725f..54fbbe272b14 100644 --- a/packages/x-tree-view-pro/package.json +++ b/packages/x-tree-view-pro/package.json @@ -56,8 +56,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, diff --git a/packages/x-tree-view/package.json b/packages/x-tree-view/package.json index c0739c3afcee..27f3a994dc08 100644 --- a/packages/x-tree-view/package.json +++ b/packages/x-tree-view/package.json @@ -54,8 +54,8 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/material": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", - "@mui/system": "^5.15.14 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/material": "^5.15.14 || ^6.0.0", + "@mui/system": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0", "react-dom": "^17.0.0 || ^18.0.0" }, From 9234725d21e7af84a16aaff9b677671932b46430 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 15:25:40 +0300 Subject: [PATCH 85/96] Use `6.x` in the script for material v6 --- scripts/useMaterialUIv6.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/useMaterialUIv6.mjs b/scripts/useMaterialUIv6.mjs index 662dd41432aa..d6d0c4b4966a 100644 --- a/scripts/useMaterialUIv6.mjs +++ b/scripts/useMaterialUIv6.mjs @@ -2,7 +2,7 @@ import childProcess from 'child_process'; const pnpmUpdate = childProcess.spawnSync( 'pnpm', - ['update', '-r', '@mui/material@next', '@mui/system@next', '@mui/icons-material@next'], + ['update', '-r', '@mui/material@6.x', '@mui/system@6.x', '@mui/icons-material@6.x'], { shell: true, stdio: ['inherit', 'inherit', 'inherit'], From 6e5c3972023443e9185cd8bb31b71f191f7aec35 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 15:39:24 +0300 Subject: [PATCH 86/96] dedupe --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4c0836a0acbf..9b53469c0e76 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3051,7 +3051,7 @@ packages: resolution: {integrity: sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==} engines: {node: '>=12.0.0'} peerDependencies: - '@types/react': ^17.0.0 || ^18.0.0 + '@types/react': 18.3.3 react: ^17.0.0 || ^18.0.0 react-dom: ^17.0.0 || ^18.0.0 peerDependenciesMeta: From 767d9f1b2acb9cbeb9224e53659a8ae544a7e0e9 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 16:32:05 +0300 Subject: [PATCH 87/96] Forgot this one :( --- packages/x-data-grid-generator/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x-data-grid-generator/package.json b/packages/x-data-grid-generator/package.json index da84c96530f1..856bbbed53cf 100644 --- a/packages/x-data-grid-generator/package.json +++ b/packages/x-data-grid-generator/package.json @@ -48,7 +48,7 @@ "peerDependencies": { "@emotion/react": "^11.9.0", "@emotion/styled": "^11.8.1", - "@mui/icons-material": "^5.4.1 || ^6.0.0-beta.6 || ^6.0.0", + "@mui/icons-material": "^5.4.1 || ^6.0.0", "@mui/material": "^5.15.14 || ^6.0.0", "react": "^17.0.0 || ^18.0.0" }, From 6335c8633e738aadc1d652f1b367a50964d231e2 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 17:42:07 +0300 Subject: [PATCH 88/96] Try reverting `flushMicrotasks` usage --- .../src/tests/columnHeaders.DataGrid.test.tsx | 11 +---- .../src/tests/rowSelection.DataGrid.test.tsx | 15 ++----- .../DateRangeCalendar.test.tsx | 14 ++----- .../tests/DesktopDateRangePicker.test.tsx | 33 +++++---------- .../describes.DesktopDateRangePicker.test.tsx | 10 ++--- .../tests/DesktopDateTimeRangePicker.test.tsx | 6 +-- ...cribes.DesktopDateTimeRangePicker.test.tsx | 6 +-- .../tests/MobileDateRangePicker.test.tsx | 29 +++++--------- .../describes.MobileDateRangePicker.test.tsx | 4 +- ...scribes.MobileDateTimeRangePicker.test.tsx | 6 +-- .../DateCalendar/tests/DateCalendar.test.tsx | 23 ++++------- .../tests/describes.DateCalendar.test.tsx | 6 +-- .../tests/timezone.DateCalendar.test.tsx | 11 ++--- .../tests/DesktopDatePicker.test.tsx | 38 ++++++------------ .../describes.DesktopDatePicker.test.tsx | 6 +-- .../tests/DesktopDateTimePicker.test.tsx | 17 +++----- .../describes.DesktopDateTimePicker.test.tsx | 6 +-- .../tests/DesktopTimePicker.test.tsx | 14 +++---- .../describes.DesktopTimePicker.test.tsx | 6 +-- .../tests/timezone.DigitalClock.test.tsx | 11 ++--- .../tests/describes.MobileDatePicker.test.tsx | 6 +-- .../describes.MobileDateTimePicker.test.tsx | 11 +---- .../tests/describes.MobileTimePicker.test.tsx | 11 +---- .../tests/describes.MonthCalendar.test.tsx | 6 +-- .../PickersActionBar.test.tsx | 14 +++---- .../tests/describes.YearCalendar.test.tsx | 6 +-- .../describeValue/describeValue.types.ts | 4 +- .../testControlledUnControlled.tsx | 8 ++-- .../describeValue/testPickerActionBar.tsx | 22 ++++------ .../testPickerOpenCloseLifeCycle.tsx | 40 +++++++++---------- .../pickers/describeValue/testShortcuts.tsx | 11 ++--- 31 files changed, 139 insertions(+), 272 deletions(-) diff --git a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx index f5d86bdc1f5d..ea06f6a0f0ba 100644 --- a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx @@ -1,11 +1,5 @@ import * as React from 'react'; -import { - createRenderer, - fireEvent, - screen, - within, - flushMicrotasks, -} from '@mui/internal-test-utils'; +import { createRenderer, fireEvent, screen, within } from '@mui/internal-test-utils'; import { expect } from 'chai'; import { DataGrid } from '@mui/x-data-grid'; import { getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn'; @@ -123,7 +117,7 @@ describe(' - Column headers', () => { expect(getColumnHeadersTextContent()).to.deep.equal(['id', 'brand']); }); - it('menu icon button should close column menu when already open', async () => { + it('menu icon button should close column menu when already open', () => { render(
@@ -137,7 +131,6 @@ describe(' - Column headers', () => { fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); clock.runToLast(); expect(screen.queryByRole('menu')).to.equal(null); - await flushMicrotasks(); }); }); diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 844114d9f4b4..23f1c8f406d2 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -1,14 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { - createRenderer, - fireEvent, - screen, - act, - waitFor, - flushMicrotasks, -} from '@mui/internal-test-utils'; +import { createRenderer, fireEvent, screen, act, waitFor } from '@mui/internal-test-utils'; import { DataGrid, DataGridProps, @@ -228,7 +221,7 @@ describe(' - Row selection', () => { expect(getRow(0).querySelector('input')).to.have.property('checked', false); }); - it('should set focus on the cell when clicking the checkbox', async () => { + it('should set focus on the cell when clicking the checkbox', () => { render(); expect(getActiveCell()).to.equal(null); @@ -238,7 +231,6 @@ describe(' - Row selection', () => { fireUserEvent.mousePress(checkboxInput!); expect(getActiveCell()).to.equal('0-0'); - await flushMicrotasks(); }); it('should select all visible rows regardless of pagination', () => { @@ -535,7 +527,7 @@ describe(' - Row selection', () => { describe('ripple', () => { clock.withFakeTimers(); - it('should keep only one ripple visible when navigating between checkboxes', async function test() { + it('should keep only one ripple visible when navigating between checkboxes', function test() { if (isJSDOM) { // JSDOM doesn't fire "blur" when .focus is called in another element // FIXME Firefox doesn't show any ripple @@ -547,7 +539,6 @@ describe(' - Row selection', () => { fireEvent.keyDown(cell, { key: 'ArrowLeft' }); fireEvent.keyDown(getCell(1, 0).querySelector('input')!, { key: 'ArrowUp' }); clock.runToLast(); // Wait for transition - await flushMicrotasks(); expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1); }); }); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 319681f3728a..2dc85c2aa91d 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -1,13 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { - screen, - fireEvent, - within, - fireTouchChangedEvent, - flushMicrotasks, -} from '@mui/internal-test-utils'; +import { screen, fireEvent, within, fireTouchChangedEvent } from '@mui/internal-test-utils'; import { adapterToUse, buildPickerDragInteractions, @@ -529,7 +523,7 @@ describe('', () => { }); describe('Performance', () => { - it('should only render the new start day when selecting a start day without a previously selected start day', async () => { + it('should only render the new start day when selecting a start day without a previously selected start day', () => { const RenderCount = spy((props) => ); render( @@ -543,10 +537,9 @@ describe('', () => { const renderCountBeforeChange = RenderCount.callCount; fireUserEvent.mousePress(getPickerDay('2')); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day - await flushMicrotasks(); }); - it('should only render the day inside range when selecting the end day', async () => { + it('should only render the day inside range when selecting the end day', () => { const RenderCount = spy((props) => ); render( @@ -562,7 +555,6 @@ describe('', () => { const renderCountBeforeChange = RenderCount.callCount; fireUserEvent.mousePress(getPickerDay('4')); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(6); // 2 render * 3 day - await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx index 2d1678e7bbc1..99a1cb722ce0 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen, fireEvent, act, within, flushMicrotasks } from '@mui/internal-test-utils'; +import { screen, fireEvent, act, within } from '@mui/internal-test-utils'; import { createTheme, ThemeProvider } from '@mui/material/styles'; import { LocalizationProvider } from '@mui/x-date-pickers/LocalizationProvider'; import { DesktopDateRangePicker } from '@mui/x-date-pickers-pro/DesktopDateRangePicker'; @@ -48,7 +48,7 @@ describe('', () => { expect(screen.getByText('May 2019')).toBeVisible(); }); - it(`should not crash when opening picker with invalid date value`, async () => { + it(`should not crash when opening picker with invalid date value`, () => { render( ', () => { }), ); - it('should call onChange with updated start date then call onChange with updated end date, onClose and onAccept with update date range when opening from start input', async () => { + it('should call onChange with updated start date then call onChange with updated end date, onClose and onAccept with update date range when opening from start input', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -260,11 +260,9 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); expect(onClose.callCount).to.equal(1); - - await flushMicrotasks(); }); - it('should call onChange with updated end date, onClose and onAccept with update date range when opening from end input', async () => { + it('should call onChange with updated end date, onClose and onAccept with update date range when opening from end input', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -298,11 +296,9 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); expect(onClose.callCount).to.equal(1); - - await flushMicrotasks(); }); - it('should not call onClose and onAccept when selecting the end date if props.closeOnSelect = false', async () => { + it('should not call onClose and onAccept when selecting the end date if props.closeOnSelect = false', () => { const onAccept = spy(); const onClose = spy(); const defaultValue: DateRange = [ @@ -327,10 +323,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await flushMicrotasks(); }); - it('should call onClose and onAccept with the live value when pressing Escape', async () => { + it('should call onClose and onAccept with the live value when pressing Escape', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -362,7 +357,6 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); it('should call onClose when clicking outside of the picker without prior change', () => { @@ -399,7 +393,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept with the live value when clicking outside of the picker', async () => { + it('should call onClose and onAccept with the live value when clicking outside of the picker', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -443,10 +437,9 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should not call onClose or onAccept when clicking outside of the picker if not opened', async () => { + it('should not call onClose or onAccept when clicking outside of the picker if not opened', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -465,7 +458,6 @@ describe('', () => { expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await flushMicrotasks(); }); it('should call onClose when blur the current field without prior change', function test() { @@ -504,7 +496,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept when blur the current field', async () => { + it('should call onClose and onAccept when blur the current field', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -543,10 +535,9 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', async () => { + it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -575,10 +566,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).to.deep.equal([null, null]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { + it('should not call onChange or onAccept when pressing "Clear" button with an already null value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -601,7 +591,6 @@ describe('', () => { expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); // TODO: Write test diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index 8144c4aec39e..2639cbebef6b 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { adapterToUse, createPickerRenderer, @@ -73,7 +73,7 @@ describe(' - Describes', () => { : 'MM/DD/YYYY'; expectFieldValueV7(endSectionsContainer, expectedEndValueStr); }, - setNewValue: async ( + setNewValue: ( value, { isOpened, applySameValue, setEndDate = false, selectSection, pressKey }, ) => { @@ -97,8 +97,6 @@ describe(' - Describes', () => { pressKey(undefined, 'ArrowUp'); } - await flushMicrotasks(); - return newValue; }, })); @@ -137,7 +135,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async ( + setNewValue: ( value, { isOpened, applySameValue, setEndDate = false, selectSection, pressKey }, ) => { @@ -161,8 +159,6 @@ describe(' - Describes', () => { pressKey(undefined, 'ArrowUp'); } - await flushMicrotasks(); - return newValue; }, })); 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 index 302dccd8243d..e866a5140081 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -18,7 +18,7 @@ describe('', () => { }); describe('value selection', () => { - it('should allow to select range within the same day', async () => { + it('should allow to select range within the same day', () => { render(); openPicker({ type: 'date-time-range', variant: 'desktop', initialFocus: 'start' }); @@ -39,8 +39,6 @@ describe('', () => { const endSectionsContainer = getFieldSectionsContainer(1); expect(expectFieldValueV7(startSectionsContainer, '01/11/2018 04:05 PM')); expect(expectFieldValueV7(endSectionsContainer, '01/11/2018 05:10 PM')); - - await flushMicrotasks(); }); }); diff --git a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx index cc93bbbdf80a..bd7c125ec4b4 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { describeConformance, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -83,7 +83,7 @@ describe(' - Describes', () => { : expectedPlaceholder; expectFieldValueV7(endSectionsContainer, expectedEndValueStr); }, - setNewValue: async ( + setNewValue: ( value, { isOpened, applySameValue, setEndDate = false, selectSection, pressKey }, ) => { @@ -150,8 +150,6 @@ describe(' - Describes', () => { } } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx index b44d018230f5..177cf4752e9a 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen, fireEvent, flushMicrotasks } from '@mui/internal-test-utils'; +import { screen, fireEvent } from '@mui/internal-test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { createPickerRenderer, @@ -37,7 +37,7 @@ describe('', () => { }); describe('picker state', () => { - it('should open when focusing the start input', async () => { + it('should open when focusing the start input', () => { const onOpen = spy(); render(); @@ -46,10 +46,9 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); - await flushMicrotasks(); }); - it('should open when focusing the end input', async () => { + it('should open when focusing the end input', () => { const onOpen = spy(); render(); @@ -58,10 +57,9 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); - await flushMicrotasks(); }); - it('should call onChange with updated start date then call onChange with updated end date when opening from start input', async () => { + it('should call onChange with updated start date then call onChange with updated end date when opening from start input', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -100,10 +98,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await flushMicrotasks(); }); - it('should call onChange with updated end date when opening from end input', async () => { + it('should call onChange with updated end date when opening from end input', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -135,10 +132,9 @@ describe('', () => { expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await flushMicrotasks(); }); - it('should call onClose and onAccept when selecting the end date if props.closeOnSelect = true', async () => { + it('should call onClose and onAccept when selecting the end date if props.closeOnSelect = true', () => { const onAccept = spy(); const onClose = spy(); const defaultValue: DateRange = [ @@ -165,10 +161,9 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose and onChange with the initial value when clicking "Cancel" button', async () => { + it('should call onClose and onChange with the initial value when clicking "Cancel" button', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -200,10 +195,9 @@ describe('', () => { expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose and onAccept with the live value and onAccept with the live value when clicking the "OK"', async () => { + it('should call onClose and onAccept with the live value and onAccept with the live value when clicking the "OK"', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -234,10 +228,9 @@ describe('', () => { expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onAccept.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', async () => { + it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -266,10 +259,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).to.deep.equal([null, null]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { + it('should not call onChange or onAccept when pressing "Clear" button with an already null value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -292,7 +284,6 @@ describe('', () => { expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); it('should correctly set focused styles when input is focused', () => { diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index a30bee88f692..435e4dc3c181 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, fireDiscreteEvent, flushMicrotasks } from '@mui/internal-test-utils'; +import { screen, fireDiscreteEvent } from '@mui/internal-test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { adapterToUse, @@ -99,8 +99,6 @@ describe(' - Describes', () => { clock.runToLast(); } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx index ea80010cf2ca..1422ba7bb233 100644 --- a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, fireEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { describeConformance, fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -84,7 +84,7 @@ describe(' - Describes', () => { : expectedPlaceholder; expectFieldValueV7(endSectionsContainer, expectedEndValueStr); }, - setNewValue: async (value, { isOpened, applySameValue, setEndDate = false }) => { + setNewValue: (value, { isOpened, applySameValue, setEndDate = false }) => { if (!isOpened) { openPicker({ type: 'date-time-range', @@ -152,8 +152,6 @@ describe(' - Describes', () => { ); } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx index 5f524503edde..8cfd7af3ad1e 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { fireEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { DateCalendar } from '@mui/x-date-pickers/DateCalendar'; import { PickersDay } from '@mui/x-date-pickers/PickersDay'; import { createPickerRenderer, adapterToUse } from 'test/utils/pickers'; @@ -132,7 +132,7 @@ describe('', () => { }); // test: https://github.com/mui/mui-x/issues/12373 - it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', async () => { + it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', () => { const onChange = spy(); const defaultDate = adapterToUse.date('2019-01-02T11:12:13.550Z'); render(); @@ -153,7 +153,6 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('radio', { name: '2019' })); expect(onChange.lastCall.firstArg).toEqualDateTime(defaultDate); - await flushMicrotasks(); }); describe('Slot: calendarHeader', () => { @@ -183,7 +182,7 @@ describe('', () => { ).to.have.text('1'); }); - it('should use `referenceDate` when no value defined', async () => { + it('should use `referenceDate` when no value defined', () => { const onChange = spy(); render( @@ -200,10 +199,9 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 3, 2, 12, 30)); - await flushMicrotasks(); }); - it('should not use `referenceDate` when a value is defined', async () => { + it('should not use `referenceDate` when a value is defined', () => { const onChange = spy(); render( @@ -218,10 +216,9 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 2, 12, 20)); - await flushMicrotasks(); }); - it('should not use `referenceDate` when a defaultValue is defined', async () => { + it('should not use `referenceDate` when a defaultValue is defined', () => { const onChange = spy(); render( @@ -236,10 +233,9 @@ describe('', () => { fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 2, 12, 20)); - await flushMicrotasks(); }); - it('should keep the time of the currently provided date', async () => { + it('should keep the time of the currently provided date', () => { const onChange = spy(); render( @@ -255,7 +251,6 @@ describe('', () => { expect(onChange.lastCall.firstArg).toEqualDateTime( adapterToUse.date('2018-01-02T11:11:11.111'), ); - await flushMicrotasks(); }); it('should complete weeks when showDaysOutsideCurrentMonth=true', () => { @@ -614,7 +609,7 @@ describe('', () => { }); describe('Performance', () => { - it('should only render newly selected day when selecting a day without a previously selected day', async () => { + it('should only render newly selected day when selecting a day without a previously selected day', () => { const RenderCount = spy((props) => ); render( @@ -628,10 +623,9 @@ describe('', () => { const renderCountBeforeChange = RenderCount.callCount; fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day - await flushMicrotasks(); }); - it('should only re-render previously selected day and newly selected day when selecting a day', async () => { + it('should only re-render previously selected day and newly selected day when selecting a day', () => { const RenderCount = spy((props) => ); render( @@ -646,7 +640,6 @@ describe('', () => { const renderCountBeforeChange = RenderCount.callCount; fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(4); // 2 render * 2 days - await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx index dd9dcde2c02e..d3ab8212f0d7 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { DateCalendar, dateCalendarClasses as classes } from '@mui/x-date-pickers/DateCalendar'; import { pickersDayClasses } from '@mui/x-date-pickers/PickersDay'; import { @@ -46,14 +46,12 @@ describe(' - Describes', () => { expect(selectedCells[0]).to.have.text(adapterToUse.getDate(expectedValue).toString()); } }, - setNewValue: async (value) => { + setNewValue: (value) => { const newValue = adapterToUse.addDays(value, 1); fireUserEvent.mousePress( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx index 71d5b09e35c7..795a3bf042af 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { describeAdapters } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; import { DateCalendar } from '@mui/x-date-pickers/DateCalendar'; @@ -14,7 +14,7 @@ describe(' - Timezone', () => { return; } - it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', async () => { + it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', () => { const onChange = spy(); render(); @@ -28,12 +28,11 @@ describe(' - Timezone', () => { // In a real world scenario, this should probably never occur. expect(adapter.getTimezone(actualDate)).to.equal(adapter.lib === 'dayjs' ? 'UTC' : 'system'); expect(actualDate).toEqualDateTime(expectedDate); - await flushMicrotasks(); }); TIMEZONE_TO_TEST.forEach((timezone) => { describe(`Timezone: ${timezone}`, () => { - it('should use timezone prop for onChange when no value is provided', async () => { + it('should use timezone prop for onChange when no value is provided', () => { const onChange = spy(); render(); fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '25' })); @@ -46,10 +45,9 @@ describe(' - Timezone', () => { const actualDate = onChange.lastCall.firstArg; expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); - await flushMicrotasks(); }); - it('should use value timezone for onChange when a value is provided', async () => { + it('should use value timezone for onChange when a value is provided', () => { const onChange = spy(); const value = adapter.date('2022-04-25T15:30', timezone); @@ -62,7 +60,6 @@ describe(' - Timezone', () => { const actualDate = onChange.lastCall.firstArg; expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); - await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx index 9f347134a5d4..4078e7548eb3 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx @@ -3,7 +3,7 @@ import { expect } from 'chai'; import { spy } from 'sinon'; import { TransitionProps } from '@mui/material/transitions'; import { inputBaseClasses } from '@mui/material/InputBase'; -import { fireEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker'; import { createPickerRenderer, adapterToUse, openPicker } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -31,7 +31,7 @@ describe('', () => { expect(screen.getByLabelText('year view is open, switch to calendar view')).toBeVisible(); }); - it('should go to the first view when re-opening the picker', async () => { + it('should go to the first view when re-opening the picker', () => { const handleViewChange = spy(); render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(handleViewChange.callCount).to.equal(2); expect(handleViewChange.lastCall.firstArg).to.equal('day'); - await flushMicrotasks(); }); - it('should go to the `openTo` view when re-opening the picker', async () => { + it('should go to the `openTo` view when re-opening the picker', () => { const handleViewChange = spy(); render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(handleViewChange.callCount).to.equal(2); expect(handleViewChange.lastCall.firstArg).to.equal('month'); - await flushMicrotasks(); }); - it('should go to the relevant `view` when `views` prop changes', async () => { + it('should go to the relevant `view` when `views` prop changes', () => { const { setProps } = render( , ); @@ -99,10 +97,9 @@ describe('', () => { // should have changed the open view expect(screen.getByRole('radio', { checked: true, name: 'January' })).not.to.equal(null); - await flushMicrotasks(); }); - it('should move the focus to the newly opened views', async function test() { + it('should move the focus to the newly opened views', function test() { if (isJSDOM) { this.skip(); } @@ -113,10 +110,9 @@ describe('', () => { fireEvent.click(screen.getByText('2020')); expect(document.activeElement).to.have.text('5'); - await flushMicrotasks(); }); - it('should go to the relevant `view` when `view` prop changes', async () => { + it('should go to the relevant `view` when `view` prop changes', () => { const { setProps } = render( ', () => { // should have changed the open view expect(screen.getByRole('radio', { checked: true, name: '2018' })).not.to.equal(null); - await flushMicrotasks(); }); }); @@ -221,7 +216,7 @@ describe('', () => { }); describe('picker state', () => { - it('should open when clicking "Choose date"', async () => { + it('should open when clicking "Choose date"', () => { const onOpen = spy(); render(); @@ -230,10 +225,9 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); - await flushMicrotasks(); }); - it('should call onAccept when selecting the same date after changing the year', async () => { + it('should call onAccept when selecting the same date after changing the year', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -263,12 +257,11 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2025, 0, 1)); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); describe('Month navigation', () => { - it('should not allow to navigate to previous month if props.minDate is after the last date of the previous month', async () => { + it('should not allow to navigate to previous month if props.minDate is after the last date of the previous month', () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Previous month')).to.have.attribute('disabled'); - await flushMicrotasks(); }); - it('should allow to navigate to previous month if props.minDate is the last date of the previous month', async () => { + it('should allow to navigate to previous month if props.minDate is the last date of the previous month', () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Previous month')).not.to.have.attribute('disabled'); - await flushMicrotasks(); }); - it('should not allow to navigate to next month if props.maxDate is before the last date of the next month', async () => { + it('should not allow to navigate to next month if props.maxDate is before the last date of the next month', () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Next month')).to.have.attribute('disabled'); - await flushMicrotasks(); }); - it('should allow to navigate to next month if props.maxDate is the first date of the next month', async () => { + it('should allow to navigate to next month if props.maxDate is the first date of the next month', () => { render( ', () => { openPicker({ type: 'date', variant: 'desktop' }); expect(screen.getByLabelText('Next month')).not.to.have.attribute('disabled'); - await flushMicrotasks(); }); }); @@ -361,11 +350,10 @@ describe('', () => { }); it('should throw console warning when invalid `openTo` prop is provided', () => { - expect(async () => { + expect(() => { render(); openPicker({ type: 'date', variant: 'desktop' }); - await flushMicrotasks(); }).toWarnDev('MUI X: `openTo="month"` is not a valid prop.'); }); }); diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx index f259e0941ac8..782794ba18eb 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -59,7 +59,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { isOpened, applySameValue, selectSection, pressKey }) => { + setNewValue: (value, { isOpened, applySameValue, selectSection, pressKey }) => { const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); if (isOpened) { @@ -71,8 +71,6 @@ describe(' - Describes', () => { pressKey(undefined, 'ArrowUp'); } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx index 42a91b1e2fbc..fbaa72781475 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { DesktopDateTimePicker } from '@mui/x-date-pickers/DesktopDateTimePicker'; import { adapterToUse, createPickerRenderer, openPicker } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -13,7 +13,7 @@ describe('', () => { }); describe('picker state', () => { - it('should open when clicking "Choose date"', async () => { + it('should open when clicking "Choose date"', () => { const onOpen = spy(); render(); @@ -22,10 +22,9 @@ describe('', () => { expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); - await flushMicrotasks(); }); - it('should call onAccept when selecting the same date and time after changing the year', async () => { + it('should call onAccept when selecting the same date and time after changing the year', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -63,11 +62,10 @@ describe('', () => { expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); - it('should allow selecting same view multiple times', async () => { + it('should allow selecting same view multiple times', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -107,11 +105,10 @@ describe('', () => { expect(onChange.callCount).to.equal(8); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); describe('prop: timeSteps', () => { - it('should use "DigitalClock" view renderer, when "timeSteps.minutes" = 60', async () => { + it('should use "DigitalClock" view renderer, when "timeSteps.minutes" = 60', () => { const onChange = spy(); const onAccept = spy(); render( @@ -130,10 +127,9 @@ describe('', () => { expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 2, 3, 0, 0)); expect(onAccept.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should accept value and close picker when selecting time on "DigitalClock" view renderer', async () => { + it('should accept value and close picker when selecting time on "DigitalClock" view renderer', () => { const onChange = spy(); const onAccept = spy(); render( @@ -151,7 +147,6 @@ describe('', () => { expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 3, 0, 0)); expect(onAccept.callCount).to.equal(1); - await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx index b13ea63b2e39..dc66bec63c58 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx @@ -1,4 +1,4 @@ -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -79,7 +79,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { isOpened, applySameValue, selectSection, pressKey }) => { + setNewValue: (value, { isOpened, applySameValue, selectSection, pressKey }) => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); @@ -126,8 +126,6 @@ describe(' - Describes', () => { } } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx index bfb08c4d9f6a..b60fa37d20fb 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { DesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker'; import { createPickerRenderer, openPicker } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -61,7 +61,7 @@ describe('', () => { }); describe('selecting behavior', () => { - it('should call "onAccept", "onChange", and "onClose" when selecting a single option', async () => { + it('should call "onAccept", "onChange", and "onClose" when selecting a single option', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -83,10 +83,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 9, 0)); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call "onAccept", "onChange", and "onClose" when selecting all section', async () => { + it('should call "onAccept", "onChange", and "onClose" when selecting all section', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -110,10 +109,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 14, 15)); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should allow out of order section selection', async () => { + it('should allow out of order section selection', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -142,10 +140,9 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 14, 25)); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should finish selection when selecting only the last section', async () => { + it('should finish selection when selecting only the last section', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -159,7 +156,6 @@ describe('', () => { expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 12, 0)); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx index e874d873f2ff..2fe4730f6fd1 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -68,7 +68,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { isOpened, applySameValue, selectSection, pressKey }) => { + setNewValue: (value, { isOpened, applySameValue, selectSection, pressKey }) => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(value, 1), 5); @@ -109,8 +109,6 @@ describe(' - Describes', () => { } } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx index 4e7dd4d7d7d7..070c9b9243f5 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { DigitalClock } from '@mui/x-date-pickers/DigitalClock'; import { getDateOffset, describeAdapters } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -22,7 +22,7 @@ describe(' - Timezone', () => { return; } - it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', async () => { + it('should use default timezone for rendering and onChange when no value and no timezone prop are provided', () => { const onChange = spy(); render(); @@ -37,12 +37,11 @@ describe(' - Timezone', () => { // In a real world scenario, this should probably never occur. expect(adapter.getTimezone(actualDate)).to.equal(adapter.lib === 'dayjs' ? 'UTC' : 'system'); expect(actualDate).toEqualDateTime(expectedDate); - await flushMicrotasks(); }); TIMEZONE_TO_TEST.forEach((timezone) => { describe(`Timezone: ${timezone}`, () => { - it('should use timezone prop for onChange when no value is provided', async () => { + it('should use timezone prop for onChange when no value is provided', () => { const onChange = spy(); render(); @@ -57,10 +56,9 @@ describe(' - Timezone', () => { const actualDate = onChange.lastCall.firstArg; expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); - await flushMicrotasks(); }); - it('should use timezone prop for rendering and value timezone for onChange when a value is provided', async () => { + it('should use timezone prop for rendering and value timezone for onChange when a value is provided', () => { const onChange = spy(); const value = adapter.date('2022-04-17T04:30', timezone); @@ -91,7 +89,6 @@ describe(' - Timezone', () => { expect(adapter.getTimezone(actualDate)).to.equal(timezone); expect(actualDate).toEqualDateTime(expectedDate); - await flushMicrotasks(); }); }); }); diff --git a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx index 8e719af47d3f..b988c49e5827 100644 --- a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, fireEvent, flushMicrotasks } from '@mui/internal-test-utils'; +import { screen, fireEvent } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -59,7 +59,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { isOpened, applySameValue }) => { + setNewValue: (value, { isOpened, applySameValue }) => { if (!isOpened) { openPicker({ type: 'date', variant: 'mobile' }); } @@ -76,8 +76,6 @@ describe(' - Describes', () => { clock.runToLast(); } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx index 811c272e1c41..7db743bb1c2e 100644 --- a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx @@ -1,10 +1,5 @@ import * as React from 'react'; -import { - screen, - fireEvent, - fireTouchChangedEvent, - flushMicrotasks, -} from '@mui/internal-test-utils'; +import { screen, fireEvent, fireTouchChangedEvent } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -76,7 +71,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { isOpened, applySameValue }) => { + setNewValue: (value, { isOpened, applySameValue }) => { if (!isOpened) { openPicker({ type: 'date-time', variant: 'mobile' }); } @@ -118,8 +113,6 @@ describe(' - Describes', () => { fireUserEvent.mousePress(screen.getByRole('tab', { name: 'pick date' })); } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx index 5ad3a9a0168d..8a694129a784 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx @@ -1,10 +1,5 @@ import * as React from 'react'; -import { - screen, - fireEvent, - fireTouchChangedEvent, - flushMicrotasks, -} from '@mui/internal-test-utils'; +import { screen, fireEvent, fireTouchChangedEvent } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -74,7 +69,7 @@ describe(' - Describes', () => { expectFieldValueV7(fieldRoot, expectedValueStr); }, - setNewValue: async (value, { isOpened, applySameValue }) => { + setNewValue: (value, { isOpened, applySameValue }) => { if (!isOpened) { openPicker({ type: 'time', variant: 'mobile' }); } @@ -113,8 +108,6 @@ describe(' - Describes', () => { fireUserEvent.mousePress(screen.getByRole('button', { name: 'Open previous view' })); } - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx index 4446646d47b9..ef370265decd 100644 --- a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx +++ b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -52,15 +52,13 @@ describe(' - Describes', () => { expect(activeMonth).to.have.attribute('aria-checked', 'true'); } }, - setNewValue: async (value) => { + setNewValue: (value) => { const newValue = adapterToUse.addMonths(value, 1); fireUserEvent.mousePress( screen.getByRole('radio', { name: adapterToUse.format(newValue, 'month') }), ); - await flushMicrotasks(); - return newValue; }, })); diff --git a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx index bcec6ea976ae..465baad26cee 100644 --- a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx +++ b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { PickersActionBar } from '@mui/x-date-pickers/PickersActionBar'; import { createPickerRenderer } from 'test/utils/pickers'; import { fireUserEvent } from 'test/utils/fireUserEvent'; @@ -29,7 +29,7 @@ describe('', () => { expect(screen.queryByRole('button')).to.equal(null); }); - it('should render button for "clear" action calling the associated callback', async () => { + it('should render button for "clear" action calling the associated callback', () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -47,10 +47,9 @@ describe('', () => { fireUserEvent.mousePress(screen.getByText(/clear/i)); expect(onClear.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should render button for "cancel" action calling the associated callback', async () => { + it('should render button for "cancel" action calling the associated callback', () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -68,10 +67,9 @@ describe('', () => { fireUserEvent.mousePress(screen.getByText(/cancel/i)); expect(onCancel.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should render button for "accept" action calling the associated callback', async () => { + it('should render button for "accept" action calling the associated callback', () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -89,10 +87,9 @@ describe('', () => { fireUserEvent.mousePress(screen.getByText(/ok/i)); expect(onAccept.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should render button for "today" action calling the associated callback', async () => { + it('should render button for "today" action calling the associated callback', () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); @@ -110,7 +107,6 @@ describe('', () => { fireUserEvent.mousePress(screen.getByText(/today/i)); expect(onSetToday.callCount).to.equal(1); - await flushMicrotasks(); }); it('should respect actions order', () => { diff --git a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx index 0b66c6a028fa..87eeb7fee9f4 100644 --- a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx +++ b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { YearCalendar, yearCalendarClasses as classes } from '@mui/x-date-pickers/YearCalendar'; import { createPickerRenderer, @@ -50,14 +50,12 @@ describe(' - Describes', () => { expect(activeYear).to.have.attribute('aria-checked', 'true'); } }, - setNewValue: async (value) => { + setNewValue: (value) => { const newValue = adapterToUse.addYears(value, 1); fireUserEvent.mousePress( screen.getByRole('radio', { name: adapterToUse.getYear(newValue).toString() }), ); - await flushMicrotasks(); - return newValue; }, })); diff --git a/test/utils/pickers/describeValue/describeValue.types.ts b/test/utils/pickers/describeValue/describeValue.types.ts index 4492ac3d53d3..27332ec2b719 100644 --- a/test/utils/pickers/describeValue/describeValue.types.ts +++ b/test/utils/pickers/describeValue/describeValue.types.ts @@ -34,13 +34,13 @@ export type DescribeValueOptions< applySameValue?: boolean; setEndDate?: boolean; }, - ) => Promise; + ) => TValue; } : { setNewValue: ( value: TValue, options: { selectSection: FieldSectionSelector; pressKey: FieldPressCharacter }, - ) => Promise; + ) => TValue; }); export type DescribeValueTestSuite = ( diff --git a/test/utils/pickers/describeValue/testControlledUnControlled.tsx b/test/utils/pickers/describeValue/testControlledUnControlled.tsx index 09984129a93b..e5dca22796b5 100644 --- a/test/utils/pickers/describeValue/testControlledUnControlled.tsx +++ b/test/utils/pickers/describeValue/testControlledUnControlled.tsx @@ -57,7 +57,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( assertRenderedValue(emptyValue); }); - it('should call onChange when updating a value defined with `props.defaultValue` and update the rendered value', async () => { + it('should call onChange when updating a value defined with `props.defaultValue` and update the rendered value', () => { const onChange = spy(); const v7Response = renderWithProps({ @@ -65,7 +65,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( defaultValue: values[0], onChange, }); - const newValue = await setNewValue(values[0], { + const newValue = setNewValue(values[0], { selectSection: v7Response.selectSection, pressKey: v7Response.pressKey, }); @@ -82,7 +82,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( } }); - it('should call onChange when updating a value defined with `props.value`', async () => { + it('should call onChange when updating a value defined with `props.value`', () => { const onChange = spy(); const useControlledElement = (props) => { @@ -101,7 +101,7 @@ export const testControlledUnControlled: DescribeValueTestSuite = ( { enableAccessibleFieldDOMStructure: true, value: values[0], onChange }, { hook: useControlledElement }, ); - const newValue = await setNewValue(values[0], { + const newValue = setNewValue(values[0], { selectSection: v7Response.selectSection, pressKey: v7Response.pressKey, }); diff --git a/test/utils/pickers/describeValue/testPickerActionBar.tsx b/test/utils/pickers/describeValue/testPickerActionBar.tsx index 2237dae0f490..8b50fcb4c57f 100644 --- a/test/utils/pickers/describeValue/testPickerActionBar.tsx +++ b/test/utils/pickers/describeValue/testPickerActionBar.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { adapterToUse, getExpectedOnChangeCount, @@ -32,7 +32,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( describe('Picker action bar', () => { describe('clear action', () => { - it('should call onClose, onChange with empty value and onAccept with empty value', async () => { + it('should call onClose, onChange with empty value and onAccept with empty value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -56,10 +56,9 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, emptyValue); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should not call onChange or onAccept if the value is already empty value', async () => { + it('should not call onChange or onAccept if the value is already empty value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -81,7 +80,6 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); @@ -119,10 +117,9 @@ export const testPickerActionBar: DescribeValueTestSuite = ( } expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should not call onChange if no prior value modification', async () => { + it('should not call onChange if no prior value modification', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -145,7 +142,6 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); @@ -176,10 +172,9 @@ export const testPickerActionBar: DescribeValueTestSuite = ( ); // The accepted value as already been committed, don't call onChange again expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onChange, onClose and onAccept when validating the default value', async () => { + it('should call onChange, onClose and onAccept when validating the default value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -202,10 +197,9 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose but not onAccept when validating an already validated value', async () => { + it('should call onClose but not onAccept when validating an already validated value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -228,12 +222,11 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); describe('today action', () => { - it("should call onClose, onChange with today's value and onAccept with today's value", async () => { + it("should call onClose, onChange with today's value and onAccept with today's value", () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -266,7 +259,6 @@ export const testPickerActionBar: DescribeValueTestSuite = ( expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, startOfToday); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); }); }); diff --git a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx index 8dcee577b79b..17ef4f0c408e 100644 --- a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx +++ b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx @@ -47,7 +47,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onOpen.callCount).to.equal(0); }); - it('should call onChange, onClose (if desktop) and onAccept (if desktop) when selecting a value', async () => { + it('should call onChange, onClose (if desktop) and onAccept (if desktop) when selecting a value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -69,10 +69,10 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); // Change the value - let newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + let newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); if (isRangeType) { - newValue = await setNewValue(newValue, { + newValue = setNewValue(newValue, { isOpened: true, setEndDate: true, selectSection, @@ -88,7 +88,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(pickerParams.variant === 'mobile' ? 0 : 1); }); - it('should not select input content after closing on mobile', async () => { + it('should not select input content after closing on mobile', () => { if (pickerParams.variant !== 'mobile') { return; } @@ -99,12 +99,12 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value - await setNewValue(values[0], { selectSection, pressKey }); + setNewValue(values[0], { selectSection, pressKey }); const fieldRoot = getFieldInputRoot(); expect(fieldRoot.scrollLeft).to.be.equal(0); }); - it('should call onChange, onClose and onAccept when selecting a value and `props.closeOnSelect` is true', async () => { + it('should call onChange, onClose and onAccept when selecting a value and `props.closeOnSelect` is true', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -127,10 +127,10 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); // Change the value - let newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + let newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); if (isRangeType) { - newValue = await setNewValue(newValue, { + newValue = setNewValue(newValue, { isOpened: true, setEndDate: true, selectSection, @@ -146,7 +146,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(1); }); - it('should not call onChange or onAccept when selecting the same value', async () => { + it('should not call onChange or onAccept when selecting the same value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -165,14 +165,14 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (same value) - await setNewValue(values[0], { + setNewValue(values[0], { isOpened: true, applySameValue: true, selectSection, pressKey, }); if (isRangeType) { - await setNewValue(values[0], { + setNewValue(values[0], { isOpened: true, applySameValue: true, setEndDate: true, @@ -186,7 +186,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(1); }); - it('should not call onClose or onAccept when selecting a date and `props.closeOnSelect` is false', async function test() { + it('should not call onClose or onAccept when selecting a date and `props.closeOnSelect` is false', function test() { // increase the timeout of this test as it tends to sometimes fail on CI with `DesktopDateTimeRangePicker` or `MobileDateTimeRangePicker` this.timeout(10000); const onChange = spy(); @@ -207,11 +207,11 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value - let newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + let newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); const initialChangeCount = getExpectedOnChangeCount(componentFamily, pickerParams); expect(onChange.callCount).to.equal(initialChangeCount); if (isRangeType) { - newValue = await setNewValue(newValue, { + newValue = setNewValue(newValue, { isOpened: true, setEndDate: true, selectSection, @@ -227,14 +227,14 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); // Change the value - let newValueBis = await setNewValue(newValue, { isOpened: true, selectSection, pressKey }); + let newValueBis = setNewValue(newValue, { isOpened: true, selectSection, pressKey }); if (isRangeType) { expect(onChange.callCount).to.equal( initialChangeCount + getExpectedOnChangeCount(componentFamily, pickerParams) * 2 - (pickerParams.type === 'date-time-range' ? 1 : 0), ); - newValueBis = await setNewValue(newValueBis, { + newValueBis = setNewValue(newValueBis, { isOpened: true, setEndDate: true, selectSection, @@ -256,7 +256,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(0); }); - it('should call onClose and onAccept with the live value when pressing Escape', async () => { + it('should call onClose and onAccept with the live value when pressing Escape', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -275,7 +275,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (already tested) - const newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); @@ -320,7 +320,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept with the live value when clicking outside of the picker', async function test() { + it('should call onClose and onAccept with the live value when clicking outside of the picker', function test() { // TODO: Fix this test and enable it on mobile and date-range if (pickerParams.variant === 'mobile' || isRangeType) { this.skip(); @@ -344,7 +344,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (already tested) - const newValue = await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker fireUserEvent.mousePress(document.body); diff --git a/test/utils/pickers/describeValue/testShortcuts.tsx b/test/utils/pickers/describeValue/testShortcuts.tsx index 9dd62466acc7..4e4493b442c2 100644 --- a/test/utils/pickers/describeValue/testShortcuts.tsx +++ b/test/utils/pickers/describeValue/testShortcuts.tsx @@ -2,7 +2,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; import { expectPickerChangeHandlerValue } from 'test/utils/pickers'; -import { screen, flushMicrotasks } from '@mui/internal-test-utils'; +import { screen } from '@mui/internal-test-utils'; import { DescribeValueTestSuite } from './describeValue.types'; import { fireUserEvent } from '../../fireUserEvent'; @@ -22,7 +22,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe } describe('Picker shortcuts', () => { - it('should call onClose, onChange and onAccept when picking a shortcut without explicit changeImportance', async () => { + it('should call onClose, onChange and onAccept when picking a shortcut without explicit changeImportance', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -57,10 +57,9 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, values[1]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose and onChange when picking a shortcut with changeImportance="accept"', async () => { + it('should call onClose and onChange when picking a shortcut with changeImportance="accept"', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -96,10 +95,9 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe expect(onAccept.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onAccept, values[1]); expect(onClose.callCount).to.equal(1); - await flushMicrotasks(); }); - it('should call onClose and onChange when picking a shortcut with changeImportance="set"', async () => { + it('should call onClose and onChange when picking a shortcut with changeImportance="set"', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -134,7 +132,6 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - await flushMicrotasks(); }); }); }; From b88a0aa693dfa824a888560bc6e2722c94a0086f Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 17:44:28 +0300 Subject: [PATCH 89/96] These as well --- test/utils/pickers/viewHandlers.ts | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/utils/pickers/viewHandlers.ts b/test/utils/pickers/viewHandlers.ts index eabcbf9796a8..6bb24794c807 100644 --- a/test/utils/pickers/viewHandlers.ts +++ b/test/utils/pickers/viewHandlers.ts @@ -1,4 +1,4 @@ -import { fireTouchChangedEvent, flushMicrotasks, screen } from '@mui/internal-test-utils'; +import { fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; import { getClockTouchEvent, formatFullTimeValue } from 'test/utils/pickers'; import { MuiPickersAdapter, TimeView } from '@mui/x-date-pickers/models'; import { formatMeridiem } from '@mui/x-date-pickers/internals'; @@ -7,7 +7,7 @@ import { fireUserEvent } from '../fireUserEvent'; type TDate = any; interface ViewHandler { - setViewValue: (utils: MuiPickersAdapter, viewValue: TDate, view?: TView) => Promise; + setViewValue: (utils: MuiPickersAdapter, viewValue: TDate, view?: TView) => void; } export const timeClockHandler: ViewHandler = { @@ -35,16 +35,15 @@ export const timeClockHandler: ViewHandler = { }; export const digitalClockHandler: ViewHandler = { - setViewValue: async (adapter, value) => { + setViewValue: (adapter, value) => { fireUserEvent.mousePress( screen.getByRole('option', { name: formatFullTimeValue(adapter, value) }), ); - await flushMicrotasks(); }, }; export const multiSectionDigitalClockHandler: ViewHandler = { - setViewValue: async (adapter, value) => { + setViewValue: (adapter, value) => { const hasMeridiem = adapter.is12HourCycleInCurrentLocale(); const hoursLabel = parseInt(adapter.format(value, hasMeridiem ? 'hours12h' : 'hours24h'), 10); const minutesLabel = adapter.getMinutes(value).toString(); @@ -57,6 +56,5 @@ export const multiSectionDigitalClockHandler: ViewHandler = { }), ); } - await flushMicrotasks(); }, }; From 3ef28ea5dd98cc51df7e13b6f814bf3e7de04fb5 Mon Sep 17 00:00:00 2001 From: Lukas Date: Tue, 27 Aug 2024 17:49:24 +0300 Subject: [PATCH 90/96] And a few more --- .../tests/describes.MobileDateRangePicker.test.tsx | 2 +- .../src/DigitalClock/tests/DigitalClock.test.tsx | 12 ++++++------ .../tests/MultiSectionDigitalClock.test.tsx | 12 ++++++------ .../pickers/describeValue/testPickerActionBar.tsx | 8 ++++---- .../describeValue/testPickerOpenCloseLifeCycle.tsx | 7 +------ test/utils/pickers/viewHandlers.ts | 2 +- 6 files changed, 19 insertions(+), 24 deletions(-) diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index 435e4dc3c181..7503ccadc73e 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -73,7 +73,7 @@ describe(' - Describes', () => { : 'MM/DD/YYYY'; expectFieldValueV7(endFieldRoot, expectedEndValueStr); }, - setNewValue: async (value, { isOpened, applySameValue, setEndDate = false }) => { + setNewValue: (value, { isOpened, applySameValue, setEndDate = false }) => { let newValue: any[]; if (applySameValue) { newValue = value; diff --git a/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx index d022207bd2d9..96fb9bd96fa6 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/DigitalClock.test.tsx @@ -14,7 +14,7 @@ describe('', () => { const { render } = createPickerRenderer(); describe('Reference date', () => { - it('should use `referenceDate` when no value defined', async () => { + it('should use `referenceDate` when no value defined', () => { const onChange = spy(); const referenceDate = '2018-01-01T12:30:00'; @@ -33,7 +33,7 @@ describe('', () => { }), ).to.have.attribute('tabindex', '0'); - await digitalClockHandler.setViewValue( + digitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -53,7 +53,7 @@ describe('', () => { ).to.have.attribute('tabindex', '0'); }); - it('should not use `referenceDate` when a value is defined', async () => { + it('should not use `referenceDate` when a value is defined', () => { const onChange = spy(); render( @@ -64,7 +64,7 @@ describe('', () => { />, ); - await digitalClockHandler.setViewValue( + digitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -72,7 +72,7 @@ describe('', () => { expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 1, 15, 30)); }); - it('should not use `referenceDate` when a defaultValue is defined', async () => { + it('should not use `referenceDate` when a defaultValue is defined', () => { const onChange = spy(); render( @@ -83,7 +83,7 @@ describe('', () => { />, ); - await digitalClockHandler.setViewValue( + digitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); diff --git a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx index 91331ff60d50..6229a42f0e22 100644 --- a/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx +++ b/packages/x-date-pickers/src/MultiSectionDigitalClock/tests/MultiSectionDigitalClock.test.tsx @@ -16,7 +16,7 @@ describe('', () => { const { render } = createPickerRenderer(); describe('Reference date', () => { - it('should use `referenceDate` when no value defined', async () => { + it('should use `referenceDate` when no value defined', () => { const onChange = spy(); const referenceDate = '2018-01-01T13:30:00'; @@ -36,7 +36,7 @@ describe('', () => { expect(screen.getByRole('option', { name: '30 minutes' })).to.have.attribute('tabindex', '0'); expect(screen.getByRole('option', { name: 'PM' })).to.have.attribute('tabindex', '0'); - await multiSectionDigitalClockHandler.setViewValue( + multiSectionDigitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -52,7 +52,7 @@ describe('', () => { expect(screen.getByRole('option', { name: '0 minutes' })).to.have.attribute('tabindex', '0'); }); - it('should not use `referenceDate` when a value is defined', async () => { + it('should not use `referenceDate` when a value is defined', () => { const onChange = spy(); function ControlledMultiSectionDigitalClock(props: MultiSectionDigitalClockProps) { @@ -78,7 +78,7 @@ describe('', () => { />, ); - await multiSectionDigitalClockHandler.setViewValue( + multiSectionDigitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); @@ -86,7 +86,7 @@ describe('', () => { expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 1, 15, 30)); }); - it('should not use `referenceDate` when a defaultValue is defined', async () => { + it('should not use `referenceDate` when a defaultValue is defined', () => { const onChange = spy(); render( @@ -97,7 +97,7 @@ describe('', () => { />, ); - await multiSectionDigitalClockHandler.setViewValue( + multiSectionDigitalClockHandler.setViewValue( adapterToUse, adapterToUse.setMinutes(adapterToUse.setHours(adapterToUse.date(), 15), 30), ); diff --git a/test/utils/pickers/describeValue/testPickerActionBar.tsx b/test/utils/pickers/describeValue/testPickerActionBar.tsx index 8b50fcb4c57f..850189c47294 100644 --- a/test/utils/pickers/describeValue/testPickerActionBar.tsx +++ b/test/utils/pickers/describeValue/testPickerActionBar.tsx @@ -84,7 +84,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); describe('cancel action', () => { - it('should call onClose and onChange with the initial value', async () => { + it('should call onClose and onChange with the initial value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -101,7 +101,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); // Change the value (already tested) - await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Cancel the modifications fireUserEvent.mousePress(screen.getByText(/cancel/i)); @@ -146,7 +146,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); describe('confirm action', () => { - it('should call onClose and onAccept with the live value', async () => { + it('should call onClose and onAccept with the live value', () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -163,7 +163,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( }); // Change the value (already tested) - await setNewValue(values[0], { isOpened: true, selectSection, pressKey }); + setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Accept the modifications fireUserEvent.mousePress(screen.getByText(/ok/i)); diff --git a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx index 17ef4f0c408e..d2e1d1494439 100644 --- a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx +++ b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx @@ -165,12 +165,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Change the value (same value) - setNewValue(values[0], { - isOpened: true, - applySameValue: true, - selectSection, - pressKey, - }); + setNewValue(values[0], { isOpened: true, applySameValue: true, selectSection, pressKey }); if (isRangeType) { setNewValue(values[0], { isOpened: true, diff --git a/test/utils/pickers/viewHandlers.ts b/test/utils/pickers/viewHandlers.ts index 6bb24794c807..2b3ab36c387f 100644 --- a/test/utils/pickers/viewHandlers.ts +++ b/test/utils/pickers/viewHandlers.ts @@ -11,7 +11,7 @@ interface ViewHandler { } export const timeClockHandler: ViewHandler = { - setViewValue: async (adapter, value, view) => { + setViewValue: (adapter, value, view) => { const hasMeridiem = adapter.is12HourCycleInCurrentLocale(); let valueInt; From 9d35f084c5219da043537d51c3fadab9e89e292c Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 28 Aug 2024 18:20:15 +0300 Subject: [PATCH 91/96] Fix majority of tests on @mui/material@6 --- .../src/tests/columnHeaders.DataGrid.test.tsx | 49 ++--- .../src/tests/rowSelection.DataGrid.test.tsx | 4 +- .../DateRangeCalendar.test.tsx | 7 +- .../tests/DesktopDateRangePicker.test.tsx | 21 +- .../describes.DesktopDateRangePicker.test.tsx | 7 +- .../tests/DesktopDateTimeRangePicker.test.tsx | 19 +- ...cribes.DesktopDateTimeRangePicker.test.tsx | 15 +- .../tests/MobileDateRangePicker.test.tsx | 77 ++++--- .../describes.MobileDateRangePicker.test.tsx | 5 +- ...scribes.MobileDateTimeRangePicker.test.tsx | 17 +- .../DateCalendar/tests/DateCalendar.test.tsx | 199 +++++++++--------- .../tests/describes.DateCalendar.test.tsx | 5 +- .../tests/timezone.DateCalendar.test.tsx | 9 +- .../tests/DesktopDatePicker.test.tsx | 19 +- .../describes.DesktopDatePicker.test.tsx | 5 +- .../tests/DesktopDateTimePicker.test.tsx | 70 +++--- .../describes.DesktopDateTimePicker.test.tsx | 15 +- .../tests/DesktopTimePicker.test.tsx | 79 ++++--- .../describes.DesktopTimePicker.test.tsx | 13 +- .../tests/timezone.DigitalClock.test.tsx | 9 +- .../tests/MobileDatePicker.test.tsx | 3 +- .../tests/describes.MobileDatePicker.test.tsx | 3 +- .../tests/MobileDateTimePicker.test.tsx | 11 +- .../describes.MobileDateTimePicker.test.tsx | 9 +- .../tests/MobileTimePicker.test.tsx | 27 ++- .../tests/describes.MobileTimePicker.test.tsx | 7 +- .../tests/describes.MonthCalendar.test.tsx | 7 +- .../PickersActionBar.test.tsx | 29 ++- .../tests/describes.YearCalendar.test.tsx | 5 +- .../describeValue/testPickerActionBar.tsx | 19 +- .../testPickerOpenCloseLifeCycle.tsx | 15 +- .../pickers/describeValue/testShortcuts.tsx | 9 +- test/utils/pickers/openPicker.ts | 21 +- test/utils/pickers/viewHandlers.ts | 13 +- 34 files changed, 403 insertions(+), 419 deletions(-) diff --git a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx index ea06f6a0f0ba..3746dc1550cb 100644 --- a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx @@ -1,14 +1,13 @@ import * as React from 'react'; -import { createRenderer, fireEvent, screen, within } from '@mui/internal-test-utils'; +import { createRenderer, screen, within } from '@mui/internal-test-utils'; import { expect } from 'chai'; import { DataGrid } from '@mui/x-data-grid'; import { getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; const isJSDOM = /jsdom/.test(window.navigator.userAgent); describe(' - Column headers', () => { - const { render, clock } = createRenderer({ clock: 'fake' }); + const { render } = createRenderer(); const baselineProps = { autoHeight: isJSDOM, @@ -52,8 +51,8 @@ describe(' - Column headers', () => { }); describe('Column menu', () => { - it('should allow to hide column', () => { - render( + it('should allow to hide column', async () => { + const { user } = render(
- Column headers', () => { expect(getColumnHeadersTextContent()).to.deep.equal(['id', 'brand']); - fireEvent.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - fireEvent.click(screen.getByRole('menuitem', { name: 'Hide column' })); - clock.runToLast(); + await user.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); + await user.click(screen.getByRole('menuitem', { name: 'Hide column' })); expect(getColumnHeadersTextContent()).to.deep.equal(['brand']); }); - it('should not allow to hide the only visible column', () => { - render( + it('should not allow to hide the only visible column', async () => { + const { user } = render(
- Column headers', () => { expect(getColumnHeadersTextContent()).to.deep.equal(['id']); - fireEvent.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - fireEvent.click(screen.getByRole('menuitem', { name: 'Hide column' })); - clock.runToLast(); + await user.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); + await user.click(screen.getByRole('menuitem', { name: 'Hide column' })); expect(getColumnHeadersTextContent()).to.deep.equal(['id']); }); - it('should not allow to hide the only visible column that has menu', () => { - render( + it('should not allow to hide the only visible column that has menu', async () => { + const { user } = render(
- Column headers', () => { expect(getColumnHeadersTextContent()).to.deep.equal(['id', 'brand']); - fireEvent.click(within(getColumnHeaderCell(1)).getByLabelText('Menu')); - fireEvent.click(screen.getByRole('menuitem', { name: 'Hide column' })); - clock.runToLast(); + await user.click(within(getColumnHeaderCell(1)).getByLabelText('Menu')); + await user.click(screen.getByRole('menuitem', { name: 'Hide column' })); expect(getColumnHeadersTextContent()).to.deep.equal(['id', 'brand']); }); - it('menu icon button should close column menu when already open', () => { - render( + it('menu icon button should close column menu when already open', async () => { + const { user } = render(
, ); - fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - clock.runToLast(); + await user.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); expect(screen.queryByRole('menu')).not.to.equal(null); - fireUserEvent.mousePress(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - clock.runToLast(); + await user.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); expect(screen.queryByRole('menu')).to.equal(null); }); }); - it('should display sort column menu items as per sortingOrder prop', () => { - render( + it('should display sort column menu items as per sortingOrder prop', async () => { + const { user } = render(
- Column headers', () => { ); const columnCell = getColumnHeaderCell(0); const menuIconButton = columnCell.querySelector('button[aria-label="Menu"]')!; - fireEvent.click(menuIconButton); - clock.runToLast(); + await user.click(menuIconButton); expect(screen.queryByRole('menuitem', { name: /asc/i })).not.to.equal(null); expect(screen.queryByRole('menuitem', { name: /desc/i })).not.to.equal(null); diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 23f1c8f406d2..1a2e4e3783bd 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -221,14 +221,14 @@ describe(' - Row selection', () => { expect(getRow(0).querySelector('input')).to.have.property('checked', false); }); - it('should set focus on the cell when clicking the checkbox', () => { + it('should set focus on the cell when clicking the checkbox', async () => { render(); expect(getActiveCell()).to.equal(null); // simulate click const checkboxInput = getCell(0, 0).querySelector('input'); - fireUserEvent.mousePress(checkboxInput!); + fireEvent.click(checkboxInput!); expect(getActiveCell()).to.equal('0-0'); }); diff --git a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx index 2dc85c2aa91d..6c4f54626d5a 100644 --- a/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx +++ b/packages/x-date-pickers-pro/src/DateRangeCalendar/DateRangeCalendar.test.tsx @@ -15,7 +15,6 @@ import { } from '@mui/x-date-pickers-pro/DateRangeCalendar'; import { DateRangePickerDay } from '@mui/x-date-pickers-pro/DateRangePickerDay'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; import { RangePosition } from '../models'; const getPickerDay = (name: string, picker = 'January 2018') => @@ -535,7 +534,7 @@ describe('', () => { ); const renderCountBeforeChange = RenderCount.callCount; - fireUserEvent.mousePress(getPickerDay('2')); + fireEvent.click(getPickerDay('2')); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day }); @@ -550,10 +549,10 @@ describe('', () => { />, ); - fireUserEvent.mousePress(getPickerDay('2')); + fireEvent.click(getPickerDay('2')); const renderCountBeforeChange = RenderCount.callCount; - fireUserEvent.mousePress(getPickerDay('4')); + fireEvent.click(getPickerDay('4')); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(6); // 2 render * 3 day }); }); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx index 99a1cb722ce0..8ec961707343 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/DesktopDateRangePicker.test.tsx @@ -15,7 +15,6 @@ import { getFieldSectionsContainer, getTextbox, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; const isJSDOM = /jsdom/.test(window.navigator.userAgent); @@ -245,13 +244,13 @@ describe('', () => { expect(onClose.callCount).to.equal(0); // Change the start date - fireUserEvent.mousePress(getPickerDay('3')); + fireEvent.click(getPickerDay('3')); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); // Change the end date - fireUserEvent.mousePress(getPickerDay('5')); + fireEvent.click(getPickerDay('5')); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); @@ -288,7 +287,7 @@ describe('', () => { expect(onClose.callCount).to.equal(0); // Change the end date - fireUserEvent.mousePress(getPickerDay('3')); + fireEvent.click(getPickerDay('3')); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); @@ -319,7 +318,7 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'end' }); // Change the end date - fireUserEvent.mousePress(getPickerDay('3')); + fireEvent.click(getPickerDay('3')); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); @@ -347,7 +346,7 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); // Change the start date (already tested) - fireUserEvent.mousePress(getPickerDay('3')); + fireEvent.click(getPickerDay('3')); // Dismiss the picker // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target -- don't care @@ -418,7 +417,7 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); // Change the start date (already tested) - fireUserEvent.mousePress(getPickerDay('3')); + fireEvent.click(getPickerDay('3')); clock.runToLast(); // Dismiss the picker @@ -454,7 +453,7 @@ describe('', () => { ); // Dismiss the picker - fireUserEvent.mousePress(document.body); + fireEvent.click(document.body); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); @@ -522,7 +521,7 @@ describe('', () => { expect(screen.getByRole('tooltip')).toBeVisible(); // Change the start date (already tested) - fireUserEvent.mousePress(getPickerDay('3')); + fireEvent.click(getPickerDay('3')); clock.runToLast(); act(() => { @@ -560,7 +559,7 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); + fireEvent.click(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(1); // Start date change expect(onChange.lastCall.args[0]).to.deep.equal([null, null]); expect(onAccept.callCount).to.equal(1); @@ -587,7 +586,7 @@ describe('', () => { openPicker({ type: 'date-range', variant: 'desktop', initialFocus: 'start' }); // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); + fireEvent.click(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); diff --git a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx index 2639cbebef6b..640ac3b6c5f3 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { adapterToUse, createPickerRenderer, @@ -13,7 +13,6 @@ import { import { DesktopDateRangePicker } from '@mui/x-date-pickers-pro/DesktopDateRangePicker'; import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ @@ -87,7 +86,7 @@ describe(' - Describes', () => { } if (isOpened) { - fireUserEvent.mousePress( + fireEvent.click( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], @@ -149,7 +148,7 @@ describe(' - Describes', () => { } if (isOpened) { - fireUserEvent.mousePress( + fireEvent.click( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], 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 index e866a5140081..078ffbc61c0b 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/DesktopDateTimeRangePicker.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -8,7 +8,6 @@ import { getFieldSectionsContainer, expectFieldValueV7, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; import { DesktopDateTimeRangePicker } from '../DesktopDateTimeRangePicker'; describe('', () => { @@ -24,16 +23,16 @@ describe('', () => { openPicker({ type: 'date-time-range', variant: 'desktop', initialFocus: 'start' }); // select start date range - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '11' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: '4 hours' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: '5 minutes' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: 'PM' })); + fireEvent.click(screen.getByRole('gridcell', { name: '11' })); + fireEvent.click(screen.getByRole('option', { name: '4 hours' })); + fireEvent.click(screen.getByRole('option', { name: '5 minutes' })); + fireEvent.click(screen.getByRole('option', { name: 'PM' })); // select end date range on the same day - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '11' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: '5 hours' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: '10 minutes' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: 'PM' })); + fireEvent.click(screen.getByRole('gridcell', { name: '11' })); + fireEvent.click(screen.getByRole('option', { name: '5 hours' })); + fireEvent.click(screen.getByRole('option', { name: '10 minutes' })); + fireEvent.click(screen.getByRole('option', { name: 'PM' })); const startSectionsContainer = getFieldSectionsContainer(0); const endSectionsContainer = getFieldSectionsContainer(1); diff --git a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx index bd7c125ec4b4..d9b960a96037 100644 --- a/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { describeConformance, screen } from '@mui/internal-test-utils'; +import { describeConformance, fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -9,7 +9,6 @@ import { describeRangeValidation, getFieldSectionsContainer, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; import { DesktopDateTimeRangePicker } from '../DesktopDateTimeRangePicker'; describe(' - Describes', () => { @@ -102,7 +101,7 @@ describe(' - Describes', () => { ]; } if (isOpened) { - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), }), @@ -113,10 +112,8 @@ describe(' - Describes', () => { hasMeridiem ? 'hours12h' : 'hours24h', ); const hoursNumber = adapterToUse.getHours(newValue[setEndDate ? 1 : 0]); - fireUserEvent.mousePress( - screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), - ); - fireUserEvent.mousePress( + fireEvent.click(screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` })); + fireEvent.click( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue[setEndDate ? 1 : 0])} minutes`, }), @@ -124,9 +121,7 @@ describe(' - Describes', () => { if (hasMeridiem) { // meridiem is an extra view on `DesktopDateTimeRangePicker` // we need to click it to finish selection - fireUserEvent.mousePress( - screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), - ); + fireEvent.click(screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' })); } } else { selectSection('day'); diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx index 177cf4752e9a..76383fe45d87 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/MobileDateRangePicker.test.tsx @@ -9,12 +9,11 @@ import { openPicker, getFieldSectionsContainer, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; import { DateRange } from '@mui/x-date-pickers-pro/models'; import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField'; describe('', () => { - const { render } = createPickerRenderer({ clock: 'fake' }); + const { render } = createPickerRenderer(); describe('Field slot: SingleInputDateRangeField', () => { it('should render the input with a given `name` when `SingleInputDateRangeField` is used', () => { @@ -37,29 +36,43 @@ describe('', () => { }); describe('picker state', () => { - it('should open when focusing the start input', () => { + it('should open when focusing the start input', async () => { const onOpen = spy(); - render(); + const { user } = render( + , + ); - openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); + await openPicker({ + type: 'date-range', + variant: 'mobile', + initialFocus: 'start', + click: user.click, + }); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); }); - it('should open when focusing the end input', () => { + it('should open when focusing the end input', async () => { const onOpen = spy(); - render(); + const { user } = render( + , + ); - openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'end' }); + await openPicker({ + type: 'date-range', + variant: 'mobile', + initialFocus: 'end', + click: user.click, + }); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); }); - it('should call onChange with updated start date then call onChange with updated end date when opening from start input', () => { + it('should call onChange with updated start date then call onChange with updated end date when opening from start input', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -68,7 +81,7 @@ describe('', () => { adapterToUse.date('2018-01-06'), ]; - render( + const { user } = render( ', () => { expect(onClose.callCount).to.equal(0); // Change the start date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + await user.click(screen.getByRole('gridcell', { name: '3' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); // Change the end date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '5' })); + await user.click(screen.getByRole('gridcell', { name: '5' })); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 5)); @@ -100,7 +113,7 @@ describe('', () => { expect(onClose.callCount).to.equal(0); }); - it('should call onChange with updated end date when opening from end input', () => { + it('should call onChange with updated end date when opening from end input', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -109,7 +122,7 @@ describe('', () => { adapterToUse.date('2018-01-06'), ]; - render( + const { user } = render( ', () => { expect(onClose.callCount).to.equal(0); // Change the end date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + await user.click(screen.getByRole('gridcell', { name: '3' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onChange.lastCall.args[0][1]).toEqualDateTime(new Date(2018, 0, 3)); @@ -134,7 +147,7 @@ describe('', () => { expect(onClose.callCount).to.equal(0); }); - it('should call onClose and onAccept when selecting the end date if props.closeOnSelect = true', () => { + it('should call onClose and onAccept when selecting the end date if props.closeOnSelect = true', async () => { const onAccept = spy(); const onClose = spy(); const defaultValue: DateRange = [ @@ -142,7 +155,7 @@ describe('', () => { adapterToUse.date('2018-01-06'), ]; - render( + const { user } = render( ', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'end' }); // Change the end date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + await user.click(screen.getByRole('gridcell', { name: '3' })); expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); @@ -163,7 +176,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onChange with the initial value when clicking "Cancel" button', () => { + it('should call onClose and onChange with the initial value when clicking "Cancel" button', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -172,7 +185,7 @@ describe('', () => { adapterToUse.date('2018-01-06'), ]; - render( + const { user } = render( ', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); // Change the start date (already tested) - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + await user.click(screen.getByRole('gridcell', { name: '3' })); // Cancel the modifications - fireUserEvent.mousePress(screen.getByText(/cancel/i)); + await user.click(screen.getByText(/cancel/i)); expect(onChange.callCount).to.equal(2); // Start date change + reset expect(onChange.lastCall.args[0][0]).toEqualDateTime(defaultValue[0]); expect(onChange.lastCall.args[0][1]).toEqualDateTime(defaultValue[1]); @@ -197,7 +210,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose and onAccept with the live value and onAccept with the live value when clicking the "OK"', () => { + it('should call onClose and onAccept with the live value and onAccept with the live value when clicking the "OK"', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -206,7 +219,7 @@ describe('', () => { adapterToUse.date('2018-01-06'), ]; - render( + const { user } = render( ', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); // Change the start date (already tested) - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); + await user.click(screen.getByRole('gridcell', { name: '3' })); // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); + await user.click(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal(1); // Start date change expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0][0]).toEqualDateTime(new Date(2018, 0, 3)); @@ -230,7 +243,7 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', () => { + it('should call onClose, onChange with empty value and onAccept with empty value when pressing the "Clear" button', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); @@ -239,7 +252,7 @@ describe('', () => { adapterToUse.date('2018-01-06'), ]; - render( + const { user } = render( ', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); + await user.click(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(1); // Start date change expect(onChange.lastCall.args[0]).to.deep.equal([null, null]); expect(onAccept.callCount).to.equal(1); @@ -261,12 +274,12 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should not call onChange or onAccept when pressing "Clear" button with an already null value', () => { + it('should not call onChange or onAccept when pressing "Clear" button with an already null value', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render( + const { user } = render( ', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); + await user.click(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); diff --git a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx index 7503ccadc73e..3410aec62f20 100644 --- a/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen, fireDiscreteEvent } from '@mui/internal-test-utils'; +import { screen, fireDiscreteEvent, fireEvent } from '@mui/internal-test-utils'; import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePicker'; import { adapterToUse, @@ -12,7 +12,6 @@ import { getFieldSectionsContainer, } from 'test/utils/pickers'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ @@ -87,7 +86,7 @@ describe(' - Describes', () => { openPicker({ type: 'date-range', variant: 'mobile', initialFocus: 'start' }); } - fireUserEvent.mousePress( + fireEvent.click( screen.getAllByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), })[0], diff --git a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx index 1422ba7bb233..06f204cc0cf6 100644 --- a/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx +++ b/packages/x-date-pickers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx @@ -10,7 +10,6 @@ import { getFieldSectionsContainer, openPicker, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; import { MobileDateTimeRangePicker } from '../MobileDateTimeRangePicker'; describe(' - Describes', () => { @@ -109,12 +108,12 @@ describe(' - Describes', () => { // if we want to set the end date, we firstly need to switch to end date "range position" if (setEndDate) { - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('button', { name: adapterToUse.format(value[1], 'shortDate') }), ); } - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue[setEndDate ? 1 : 0]).toString(), }), @@ -125,10 +124,8 @@ describe(' - Describes', () => { hasMeridiem ? 'hours12h' : 'hours24h', ); const hoursNumber = adapterToUse.getHours(newValue[setEndDate ? 1 : 0]); - fireUserEvent.mousePress( - screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), - ); - fireUserEvent.mousePress( + fireEvent.click(screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` })); + fireEvent.click( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue[setEndDate ? 1 : 0])} minutes`, }), @@ -136,9 +133,7 @@ describe(' - Describes', () => { if (hasMeridiem) { // meridiem is an extra view on `MobileDateTimeRangePicker` // we need to click it to finish selection - fireUserEvent.mousePress( - screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), - ); + fireEvent.click(screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' })); } // Close the picker if (!isOpened) { @@ -147,7 +142,7 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the start date view in case we'd like to repeat the selection process - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('button', { name: adapterToUse.format(newValue[0], 'shortDate') }), ); } diff --git a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx index 8cfd7af3ad1e..274e3313809b 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx @@ -1,40 +1,36 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { fireEvent, screen } from '@mui/internal-test-utils'; +import { fireEvent, screen, waitFor } from '@mui/internal-test-utils'; import { DateCalendar } from '@mui/x-date-pickers/DateCalendar'; import { PickersDay } from '@mui/x-date-pickers/PickersDay'; import { createPickerRenderer, adapterToUse } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; const isJSDOM = /jsdom/.test(window.navigator.userAgent); describe('', () => { - const { render, clock } = createPickerRenderer({ - clock: 'fake', - clockConfig: new Date('2019-01-02'), - }); + const { render } = createPickerRenderer(); - it('switches between views uncontrolled', () => { + it('switches between views uncontrolled', async () => { const handleViewChange = spy(); - render( + const { user } = render( , ); - fireEvent.click(screen.getByLabelText(/switch to year view/i)); + await user.click(screen.getByLabelText(/switch to year view/i)); expect(handleViewChange.callCount).to.equal(1); expect(screen.queryByLabelText(/switch to year view/i)).to.equal(null); expect(screen.getByLabelText('year view is open, switch to calendar view')).toBeVisible(); }); - it('should allow month and view changing, but not selection when readOnly prop is passed', () => { + it('should allow month and view changing, but not selection when readOnly prop is passed', async () => { const onChangeMock = spy(); const onMonthChangeMock = spy(); - render( + const { user } = render( ', () => { />, ); - fireEvent.click(screen.getByTitle('Previous month')); + await user.click(screen.getByTitle('Previous month')); expect(onMonthChangeMock.callCount).to.equal(1); - fireEvent.click(screen.getByTitle('Next month')); + await user.click(screen.getByTitle('Next month')); expect(onMonthChangeMock.callCount).to.equal(2); - clock.runToLast(); + await waitFor(() => expect(screen.getAllByRole('rowgroup').length).to.equal(1)); - fireEvent.click(screen.getByRole('gridcell', { name: '5' })); + await user.click(screen.getByRole('gridcell', { name: '5' })); expect(onChangeMock.callCount).to.equal(0); - fireEvent.click(screen.getByText('January 2019')); + await user.click(screen.getByText('January 2019')); expect(screen.queryByLabelText('year view is open, switch to calendar view')).toBeVisible(); }); - it('should not allow interaction when disabled prop is passed', () => { + it('should not allow interaction when disabled prop is passed', async () => { const onChangeMock = spy(); const onMonthChangeMock = spy(); - render( + const { user } = render( ', () => { />, ); - fireEvent.click(screen.getByText('January 2019')); + await user.click(screen.getByText('January 2019')); expect(screen.queryByText('January 2019')).toBeVisible(); expect(screen.queryByLabelText('year view is open, switch to calendar view')).to.equal(null); - fireEvent.click(screen.getByTitle('Previous month')); + await user.click(screen.getByTitle('Previous month')); expect(onMonthChangeMock.callCount).to.equal(0); - fireEvent.click(screen.getByTitle('Next month')); + await user.click(screen.getByTitle('Next month')); expect(onMonthChangeMock.callCount).to.equal(0); - fireEvent.click(screen.getByRole('gridcell', { name: '5' })); + await user.click(screen.getByRole('gridcell', { name: '5' })); expect(onChangeMock.callCount).to.equal(0); }); @@ -131,28 +127,35 @@ describe('', () => { expect(screen.getAllByRole('rowheader').length).to.equal(5); }); - // test: https://github.com/mui/mui-x/issues/12373 - it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', () => { - const onChange = spy(); - const defaultDate = adapterToUse.date('2019-01-02T11:12:13.550Z'); - render(); - - fireUserEvent.mousePress( - screen.getByRole('button', { name: 'calendar view is open, switch to year view' }), - ); - fireUserEvent.mousePress(screen.getByRole('radio', { name: '2020' })); + describe('with fake timers', () => { + const { render: renderWithFakeTimers, clock } = createPickerRenderer({ + clock: 'fake', + clockConfig: new Date('2019-01-02'), + }); + // test: https://github.com/mui/mui-x/issues/12373 + it('should not reset day to `startOfDay` if value already exists when finding the closest enabled date', () => { + const onChange = spy(); + const defaultDate = adapterToUse.date('2019-01-02T11:12:13.550Z'); + renderWithFakeTimers( + , + ); - // Finish the transition to the day view - clock.runToLast(); + fireEvent.click( + screen.getByRole('button', { name: 'calendar view is open, switch to year view' }), + ); + fireEvent.click(screen.getByRole('radio', { name: '2020' })); + // Finish the transition to the day view + clock.runToLast(); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '1' })); - fireUserEvent.mousePress( - screen.getByRole('button', { name: 'calendar view is open, switch to year view' }), - ); - // select the current year with a date in the past to trigger "findClosestEnabledDate" - fireUserEvent.mousePress(screen.getByRole('radio', { name: '2019' })); + fireEvent.click(screen.getByRole('gridcell', { name: '1' })); + fireEvent.click( + screen.getByRole('button', { name: 'calendar view is open, switch to year view' }), + ); + // select the current year with a date in the past to trigger "findClosestEnabledDate" + fireEvent.click(screen.getByRole('radio', { name: '2019' })); - expect(onChange.lastCall.firstArg).toEqualDateTime(defaultDate); + expect(onChange.lastCall.firstArg).toEqualDateTime(defaultDate); + }); }); describe('Slot: calendarHeader', () => { @@ -182,10 +185,10 @@ describe('', () => { ).to.have.text('1'); }); - it('should use `referenceDate` when no value defined', () => { + it('should use `referenceDate` when no value defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { // should make the reference day firstly focusable expect(screen.getByRole('gridcell', { name: '17' })).to.have.attribute('tabindex', '0'); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); + await user.click(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 3, 2, 12, 30)); }); - it('should not use `referenceDate` when a value is defined', () => { + it('should not use `referenceDate` when a value is defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); + await user.click(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 2, 12, 20)); }); - it('should not use `referenceDate` when a defaultValue is defined', () => { + it('should not use `referenceDate` when a defaultValue is defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); + await user.click(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 0, 2, 12, 20)); }); - it('should keep the time of the currently provided date', () => { + it('should keep the time of the currently provided date', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); + await user.click(screen.getByRole('gridcell', { name: '2' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime( adapterToUse.date('2018-01-02T11:11:11.111'), @@ -290,10 +293,10 @@ describe('', () => { }); describe('view: month', () => { - it('should select the closest enabled date in the month if the current date is disabled', () => { + it('should select the closest enabled date in the month if the current date is disabled', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); + await user.click(april); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 3, 6)); }); - it('should respect minDate when selecting closest enabled date', () => { + it('should respect minDate when selecting closest enabled date', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); + await user.click(april); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 3, 7)); }); - it('should respect maxDate when selecting closest enabled date', () => { + it('should respect maxDate when selecting closest enabled date', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); + await user.click(april); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 3, 22)); }); - it('should go to next view without changing the date when no date of the new month is enabled', () => { + it('should go to next view without changing the date when no date of the new month is enabled', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); - clock.runToLast(); + await user.click(april); expect(onChange.callCount).to.equal(0); expect(screen.getByMuiTest('calendar-month-and-year-text')).to.have.text('April 2019'); }); - it('should use `referenceDate` when no value defined', () => { + it('should use `referenceDate` when no value defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); + await user.click(april); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2018, 3, 1, 12, 30)); }); - it('should not use `referenceDate` when a value is defined', () => { + it('should not use `referenceDate` when a value is defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); + await user.click(april); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 3, 1, 12, 20)); }); - it('should not use `referenceDate` when a defaultValue is defined', () => { + it('should not use `referenceDate` when a defaultValue is defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const april = screen.getByText('Apr', { selector: 'button' }); - fireEvent.click(april); + await user.click(april); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2019, 3, 1, 12, 20)); @@ -440,10 +442,10 @@ describe('', () => { expect(screen.getAllByMuiTest('year')).to.have.length(200); }); - it('should select the closest enabled date in the month if the current date is disabled', () => { + it('should select the closest enabled date in the month if the current date is disabled', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2022 = screen.getByText('2022', { selector: 'button' }); - fireEvent.click(year2022); + await user.click(year2022); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 4, 1)); }); - it('should respect minDate when selecting closest enabled date', () => { + it('should respect minDate when selecting closest enabled date', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2017 = screen.getByText('2017', { selector: 'button' }); - fireEvent.click(year2017); + await user.click(year2017); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2017, 4, 12)); }); - it('should respect maxDate when selecting closest enabled date', () => { + it('should respect maxDate when selecting closest enabled date', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2022 = screen.getByText('2022', { selector: 'button' }); - fireEvent.click(year2022); + await user.click(year2022); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 2, 31)); }); - it('should go to next view without changing the date when no date of the new year is enabled', () => { + it('should go to next view without changing the date when no date of the new year is enabled', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2022 = screen.getByText('2022', { selector: 'button' }); - fireEvent.click(year2022); - clock.runToLast(); + await user.click(year2022); expect(onChange.callCount).to.equal(0); expect(screen.getByMuiTest('calendar-month-and-year-text')).to.have.text('January 2022'); @@ -548,10 +549,10 @@ describe('', () => { expect(parentBoundingBox.bottom).not.to.lessThan(buttonBoundingBox.bottom); }); - it('should use `referenceDate` when no value defined', () => { + it('should use `referenceDate` when no value defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2022 = screen.getByText('2022', { selector: 'button' }); - fireEvent.click(year2022); + await user.click(year2022); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 0, 1, 12, 30)); }); - it('should not use `referenceDate` when a value is defined', () => { + it('should not use `referenceDate` when a value is defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2022 = screen.getByText('2022', { selector: 'button' }); - fireEvent.click(year2022); + await user.click(year2022); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 0, 1, 12, 20)); }); - it('should not use `referenceDate` when a defaultValue is defined', () => { + it('should not use `referenceDate` when a defaultValue is defined', async () => { const onChange = spy(); - render( + const { user } = render( ', () => { ); const year2022 = screen.getByText('2022', { selector: 'button' }); - fireEvent.click(year2022); + await user.click(year2022); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.firstArg).toEqualDateTime(new Date(2022, 0, 1, 12, 20)); @@ -621,7 +622,7 @@ describe('', () => { ); const renderCountBeforeChange = RenderCount.callCount; - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); + fireEvent.click(screen.getByRole('gridcell', { name: '2' })); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(2); // 2 render * 1 day }); @@ -638,7 +639,7 @@ describe('', () => { ); const renderCountBeforeChange = RenderCount.callCount; - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); + fireEvent.click(screen.getByRole('gridcell', { name: '2' })); expect(RenderCount.callCount - renderCountBeforeChange).to.equal(4); // 2 render * 2 days }); }); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx index d3ab8212f0d7..248fbb6e620e 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/describes.DateCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { DateCalendar, dateCalendarClasses as classes } from '@mui/x-date-pickers/DateCalendar'; import { pickersDayClasses } from '@mui/x-date-pickers/PickersDay'; import { @@ -10,7 +10,6 @@ import { describeValue, } from 'test/utils/pickers'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -48,7 +47,7 @@ describe(' - Describes', () => { }, setNewValue: (value) => { const newValue = adapterToUse.addDays(value, 1); - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); diff --git a/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx index 795a3bf042af..b6f1ef24905b 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/timezone.DateCalendar.test.tsx @@ -1,9 +1,8 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { describeAdapters } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; import { DateCalendar } from '@mui/x-date-pickers/DateCalendar'; const TIMEZONE_TO_TEST = ['UTC', 'system', 'America/New_York']; @@ -18,7 +17,7 @@ describe(' - Timezone', () => { const onChange = spy(); render(); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '25' })); + fireEvent.click(screen.getByRole('gridcell', { name: '25' })); const expectedDate = adapter.setDate(adapter.date(undefined, 'default'), 25); // Check the `onChange` value (uses default timezone, e.g: UTC, see TZ env variable) @@ -35,7 +34,7 @@ describe(' - Timezone', () => { it('should use timezone prop for onChange when no value is provided', () => { const onChange = spy(); render(); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '25' })); + fireEvent.click(screen.getByRole('gridcell', { name: '25' })); const expectedDate = adapter.setDate( adapter.startOfDay(adapter.date(undefined, timezone)), 25, @@ -53,7 +52,7 @@ describe(' - Timezone', () => { render(); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '25' })); + fireEvent.click(screen.getByRole('gridcell', { name: '25' })); const expectedDate = adapter.setDate(value, 25); // Check the `onChange` value (uses timezone prop) diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx index 4078e7548eb3..5d90362ce078 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/DesktopDatePicker.test.tsx @@ -6,7 +6,6 @@ import { inputBaseClasses } from '@mui/material/InputBase'; import { fireEvent, screen } from '@mui/internal-test-utils'; import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker'; import { createPickerRenderer, adapterToUse, openPicker } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; const isJSDOM = /jsdom/.test(window.navigator.userAgent); @@ -47,7 +46,8 @@ describe('', () => { expect(handleViewChange.callCount).to.equal(1); // Dismiss the picker - fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); + // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target + fireEvent.keyDown(document.activeElement!, { key: 'Escape' }); openPicker({ type: 'date', variant: 'desktop' }); expect(handleViewChange.callCount).to.equal(2); @@ -72,7 +72,8 @@ describe('', () => { expect(handleViewChange.callCount).to.equal(1); // Dismiss the picker - fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); + // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target + fireEvent.keyDown(document.activeElement!, { key: 'Escape' }); openPicker({ type: 'date', variant: 'desktop' }); expect(handleViewChange.callCount).to.equal(2); @@ -89,7 +90,8 @@ describe('', () => { expect(screen.getByRole('radio', { checked: true, name: '2018' })).not.to.equal(null); // Dismiss the picker - fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); + // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target + fireEvent.keyDown(document.activeElement!, { key: 'Escape' }); setProps({ views: ['month', 'year'] }); openPicker({ type: 'date', variant: 'desktop' }); // wait for all pending changes to be flushed @@ -126,7 +128,8 @@ describe('', () => { expect(screen.getByRole('radio', { checked: true, name: 'January' })).not.to.equal(null); // Dismiss the picker - fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); + // eslint-disable-next-line material-ui/disallow-active-element-as-key-event-target + fireEvent.keyDown(document.activeElement!, { key: 'Escape' }); setProps({ view: 'year' }); openPicker({ type: 'date', variant: 'desktop' }); // wait for all pending changes to be flushed @@ -221,7 +224,7 @@ describe('', () => { render(); - fireUserEvent.mousePress(screen.getByLabelText(/Choose date/)); + fireEvent.click(screen.getByLabelText(/Choose date/)); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); @@ -245,14 +248,14 @@ describe('', () => { openPicker({ type: 'date', variant: 'desktop' }); // Select year - fireUserEvent.mousePress(screen.getByRole('radio', { name: '2025' })); + fireEvent.click(screen.getByRole('radio', { name: '2025' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2025, 0, 1)); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); // Change the date (same value) - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '1' })); + fireEvent.click(screen.getByRole('gridcell', { name: '1' })); expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2025, 0, 1)); diff --git a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx index 782794ba18eb..5c56072e2b19 100644 --- a/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDatePicker/tests/describes.DesktopDatePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -11,7 +11,6 @@ import { } from 'test/utils/pickers'; import { DesktopDatePicker } from '@mui/x-date-pickers/DesktopDatePicker'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -63,7 +62,7 @@ describe(' - Describes', () => { const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); if (isOpened) { - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); } else { diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx index fbaa72781475..c298769075bb 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/DesktopDateTimePicker.test.tsx @@ -4,32 +4,28 @@ import { spy } from 'sinon'; import { screen } from '@mui/internal-test-utils'; import { DesktopDateTimePicker } from '@mui/x-date-pickers/DesktopDateTimePicker'; import { adapterToUse, createPickerRenderer, openPicker } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe('', () => { - const { render } = createPickerRenderer({ - clock: 'fake', - clockConfig: new Date('2018-01-01T10:05:05.000'), - }); + const { render } = createPickerRenderer(); describe('picker state', () => { - it('should open when clicking "Choose date"', () => { + it('should open when clicking "Choose date"', async () => { const onOpen = spy(); - render(); + const { user } = render(); - fireUserEvent.mousePress(screen.getByLabelText(/Choose date/)); + await user.click(screen.getByLabelText(/Choose date/)); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); }); - it('should call onAccept when selecting the same date and time after changing the year', () => { + it('should call onAccept when selecting the same date and time after changing the year', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render( + const { user } = render( ', () => { />, ); - openPicker({ type: 'date-time', variant: 'desktop' }); + await openPicker({ type: 'date-time', variant: 'desktop', click: user.click }); // Select year - fireUserEvent.mousePress(screen.getByRole('radio', { name: '2025' })); + await user.click(screen.getByRole('radio', { name: '2025' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2025, 0, 1, 11, 55)); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); // Change the date (same value) - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '1' })); + await user.click(screen.getByRole('gridcell', { name: '1' })); expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change // Change the hours (same value) - fireUserEvent.mousePress(screen.getByRole('option', { name: '11 hours' })); + await user.click(screen.getByRole('option', { name: '11 hours' })); expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change // Change the minutes (same value) - fireUserEvent.mousePress(screen.getByRole('option', { name: '55 minutes' })); + await user.click(screen.getByRole('option', { name: '55 minutes' })); expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change // Change the meridiem (same value) - fireUserEvent.mousePress(screen.getByRole('option', { name: 'AM' })); + await user.click(screen.getByRole('option', { name: 'AM' })); expect(onChange.callCount).to.equal(1); // Don't call onChange again since the value did not change expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); }); }); - it('should allow selecting same view multiple times', () => { + it('should allow selecting same view multiple times', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render( + const { user } = render( ', () => { />, ); - openPicker({ type: 'date-time', variant: 'desktop' }); + await openPicker({ type: 'date-time', variant: 'desktop', click: user.click }); // Change the date multiple times to check that picker doesn't close after cycling through all views internally - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '3' })); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '4' })); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '5' })); + await user.click(screen.getByRole('gridcell', { name: '2' })); + await user.click(screen.getByRole('gridcell', { name: '3' })); + await user.click(screen.getByRole('gridcell', { name: '4' })); + await user.click(screen.getByRole('gridcell', { name: '5' })); expect(onChange.callCount).to.equal(4); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); // Change the hours - fireUserEvent.mousePress(screen.getByRole('option', { name: '10 hours' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: '9 hours' })); + await user.click(screen.getByRole('option', { name: '10 hours' })); + await user.click(screen.getByRole('option', { name: '9 hours' })); expect(onChange.callCount).to.equal(6); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); // Change the minutes - fireUserEvent.mousePress(screen.getByRole('option', { name: '50 minutes' })); + await user.click(screen.getByRole('option', { name: '50 minutes' })); expect(onChange.callCount).to.equal(7); // Change the meridiem - fireUserEvent.mousePress(screen.getByRole('option', { name: 'PM' })); + await user.click(screen.getByRole('option', { name: 'PM' })); expect(onChange.callCount).to.equal(8); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); }); describe('prop: timeSteps', () => { - it('should use "DigitalClock" view renderer, when "timeSteps.minutes" = 60', () => { + it('should use "DigitalClock" view renderer, when "timeSteps.minutes" = 60', async () => { const onChange = spy(); const onAccept = spy(); - render( + const { user } = render( , ); - fireUserEvent.mousePress(screen.getByLabelText(/Choose date/)); + await user.click(screen.getByLabelText(/Choose date/)); - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '2' })); - fireUserEvent.mousePress(screen.getByRole('option', { name: '03:00 AM' })); + await user.click(screen.getByRole('gridcell', { name: '2' })); + await user.click(screen.getByRole('option', { name: '03:00 AM' })); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 2, 3, 0, 0)); expect(onAccept.callCount).to.equal(1); }); - it('should accept value and close picker when selecting time on "DigitalClock" view renderer', () => { + it('should accept value and close picker when selecting time on "DigitalClock" view renderer', async () => { const onChange = spy(); const onAccept = spy(); - render( + const { user } = render( , ); - fireUserEvent.mousePress(screen.getByLabelText(/Choose date/)); + await user.click(screen.getByLabelText(/Choose date/)); - fireUserEvent.mousePress(screen.getByRole('option', { name: '03:00 AM' })); + await user.click(screen.getByRole('option', { name: '03:00 AM' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 3, 0, 0)); diff --git a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx index dc66bec63c58..c59e43a86486 100644 --- a/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopDateTimePicker/tests/describes.DesktopDateTimePicker.test.tsx @@ -1,4 +1,4 @@ -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -12,7 +12,6 @@ import { DesktopDateTimePicker } from '@mui/x-date-pickers/DesktopDateTimePicker import { expect } from 'chai'; import * as React from 'react'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -85,24 +84,20 @@ describe(' - Describes', () => { : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); if (isOpened) { - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h'); const hoursNumber = adapterToUse.getHours(newValue); - fireUserEvent.mousePress( - screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), - ); - fireUserEvent.mousePress( + fireEvent.click(screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` })); + fireEvent.click( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }), ); if (hasMeridiem) { // meridiem is an extra view on `DesktopDateTimePicker` // we need to click it to finish selection - fireUserEvent.mousePress( - screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), - ); + fireEvent.click(screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' })); } } else { selectSection('day'); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx index b60fa37d20fb..28663c2a7557 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/DesktopTimePicker.test.tsx @@ -3,16 +3,15 @@ import { expect } from 'chai'; import { spy } from 'sinon'; import { screen } from '@mui/internal-test-utils'; import { DesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker'; -import { createPickerRenderer, openPicker } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; +import { adapterToUse, createPickerRenderer, openPicker } from 'test/utils/pickers'; describe('', () => { - const { render } = createPickerRenderer({ - clock: 'fake', - clockConfig: new Date('2018-01-01T10:05:05.000'), - }); - describe('rendering behavior', () => { + const { render } = createPickerRenderer({ + clock: 'fake', + clockConfig: new Date('2018-01-01T10:05:05.000'), + }); + it('should render "accept" action and 3 time sections by default', () => { render(); @@ -61,23 +60,26 @@ describe('', () => { }); describe('selecting behavior', () => { - it('should call "onAccept", "onChange", and "onClose" when selecting a single option', () => { + const { render } = createPickerRenderer(); + + it('should call "onAccept", "onChange", and "onClose" when selecting a single option', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render( + const { user } = render( , ); - openPicker({ type: 'time', variant: 'desktop' }); + await openPicker({ type: 'time', variant: 'desktop', click: user.click }); - fireUserEvent.mousePress(screen.getByRole('option', { name: '09:00 AM' })); + await user.click(screen.getByRole('option', { name: '09:00 AM' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 9, 0)); expect(onAccept.callCount).to.equal(1); @@ -85,73 +87,94 @@ describe('', () => { expect(onClose.callCount).to.equal(1); }); - it('should call "onAccept", "onChange", and "onClose" when selecting all section', () => { + it('should call "onAccept", "onChange", and "onClose" when selecting all section', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render(); + const { user } = render( + , + ); - openPicker({ type: 'time', variant: 'desktop' }); + await openPicker({ type: 'time', variant: 'desktop', click: user.click }); - fireUserEvent.mousePress(screen.getByRole('option', { name: '2 hours' })); + await user.click(screen.getByRole('option', { name: '2 hours' })); expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - fireUserEvent.mousePress(screen.getByRole('option', { name: '15 minutes' })); + await user.click(screen.getByRole('option', { name: '15 minutes' })); expect(onChange.callCount).to.equal(2); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - fireUserEvent.mousePress(screen.getByRole('option', { name: 'PM' })); + await user.click(screen.getByRole('option', { name: 'PM' })); expect(onChange.callCount).to.equal(3); expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 14, 15)); expect(onClose.callCount).to.equal(1); }); - it('should allow out of order section selection', () => { + it('should allow out of order section selection', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render(); + const { user } = render( + , + ); - openPicker({ type: 'time', variant: 'desktop' }); + await openPicker({ type: 'time', variant: 'desktop', click: user.click }); - fireUserEvent.mousePress(screen.getByRole('option', { name: '15 minutes' })); + await user.click(screen.getByRole('option', { name: '15 minutes' })); expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - fireUserEvent.mousePress(screen.getByRole('option', { name: '2 hours' })); + await user.click(screen.getByRole('option', { name: '2 hours' })); expect(onChange.callCount).to.equal(2); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - fireUserEvent.mousePress(screen.getByRole('option', { name: '25 minutes' })); + await user.click(screen.getByRole('option', { name: '25 minutes' })); expect(onChange.callCount).to.equal(3); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); - fireUserEvent.mousePress(screen.getByRole('option', { name: 'PM' })); + await user.click(screen.getByRole('option', { name: 'PM' })); expect(onChange.callCount).to.equal(4); expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 14, 25)); expect(onClose.callCount).to.equal(1); }); - it('should finish selection when selecting only the last section', () => { + it('should finish selection when selecting only the last section', async () => { const onChange = spy(); const onAccept = spy(); const onClose = spy(); - render(); + const { user } = render( + , + ); - openPicker({ type: 'time', variant: 'desktop' }); + await openPicker({ type: 'time', variant: 'desktop', click: user.click }); - fireUserEvent.mousePress(screen.getByRole('option', { name: 'PM' })); + await user.click(screen.getByRole('option', { name: 'PM' })); expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(new Date(2018, 0, 1, 12, 0)); diff --git a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx index 2fe4730f6fd1..7d4652b6c4df 100644 --- a/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx +++ b/packages/x-date-pickers/src/DesktopTimePicker/tests/describes.DesktopTimePicker.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -12,7 +12,6 @@ import { } from 'test/utils/pickers'; import { DesktopTimePicker } from '@mui/x-date-pickers/DesktopTimePicker'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -77,18 +76,14 @@ describe(' - Describes', () => { const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); const hours = adapterToUse.format(newValue, hasMeridiem ? 'hours12h' : 'hours24h'); const hoursNumber = adapterToUse.getHours(newValue); - fireUserEvent.mousePress( - screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` }), - ); - fireUserEvent.mousePress( + fireEvent.click(screen.getByRole('option', { name: `${parseInt(hours, 10)} hours` })); + fireEvent.click( screen.getByRole('option', { name: `${adapterToUse.getMinutes(newValue)} minutes` }), ); if (hasMeridiem) { // meridiem is an extra view on `DesktopTimePicker` // we need to click it to finish selection - fireUserEvent.mousePress( - screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' }), - ); + fireEvent.click(screen.getByRole('option', { name: hoursNumber >= 12 ? 'PM' : 'AM' })); } } else { selectSection('hours'); diff --git a/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx b/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx index 070c9b9243f5..5d7a0aa650d8 100644 --- a/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx +++ b/packages/x-date-pickers/src/DigitalClock/tests/timezone.DigitalClock.test.tsx @@ -1,10 +1,9 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { DigitalClock } from '@mui/x-date-pickers/DigitalClock'; import { getDateOffset, describeAdapters } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; const TIMEZONE_TO_TEST = ['UTC', 'system', 'America/New_York']; @@ -26,7 +25,7 @@ describe(' - Timezone', () => { const onChange = spy(); render(); - fireUserEvent.mousePress(screen.getByRole('option', { name: '08:00 AM' })); + fireEvent.click(screen.getByRole('option', { name: '08:00 AM' })); const expectedDate = adapter.setHours(adapter.date(), 8); @@ -45,7 +44,7 @@ describe(' - Timezone', () => { const onChange = spy(); render(); - fireUserEvent.mousePress(screen.getByRole('option', { name: '08:00 AM' })); + fireEvent.click(screen.getByRole('option', { name: '08:00 AM' })); const expectedDate = adapter.setHours( adapter.startOfDay(adapter.date(undefined, timezone)), @@ -76,7 +75,7 @@ describe(' - Timezone', () => { (adapter.getHours(value) + offsetDiff / 60 + 24) % 24, ); - fireUserEvent.mousePress(screen.getByRole('option', { name: '08:30 PM' })); + fireEvent.click(screen.getByRole('option', { name: '08:30 PM' })); const actualDate = onChange.lastCall.firstArg; diff --git a/packages/x-date-pickers/src/MobileDatePicker/tests/MobileDatePicker.test.tsx b/packages/x-date-pickers/src/MobileDatePicker/tests/MobileDatePicker.test.tsx index 3dc67b806538..8491613b2622 100644 --- a/packages/x-date-pickers/src/MobileDatePicker/tests/MobileDatePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDatePicker/tests/MobileDatePicker.test.tsx @@ -13,7 +13,6 @@ import { openPicker, getFieldSectionsContainer, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe('', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -156,7 +155,7 @@ describe('', () => { render(); - fireUserEvent.mousePress(getFieldSectionsContainer()); + fireEvent.click(getFieldSectionsContainer()); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); diff --git a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx index b988c49e5827..431e6682e182 100644 --- a/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDatePicker/tests/describes.MobileDatePicker.test.tsx @@ -12,7 +12,6 @@ import { } from 'test/utils/pickers'; import { MobileDatePicker } from '@mui/x-date-pickers/MobileDatePicker'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -65,7 +64,7 @@ describe(' - Describes', () => { } const newValue = applySameValue ? value : adapterToUse.addDays(value, 1); - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); diff --git a/packages/x-date-pickers/src/MobileDateTimePicker/tests/MobileDateTimePicker.test.tsx b/packages/x-date-pickers/src/MobileDateTimePicker/tests/MobileDateTimePicker.test.tsx index 34849b1b5dc0..1e21c3dbc935 100644 --- a/packages/x-date-pickers/src/MobileDateTimePicker/tests/MobileDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDateTimePicker/tests/MobileDateTimePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; +import { fireEvent, fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; import { MobileDateTimePicker } from '@mui/x-date-pickers/MobileDateTimePicker'; import { adapterToUse, @@ -10,7 +10,6 @@ import { getClockTouchEvent, getFieldSectionsContainer, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe('', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -99,7 +98,7 @@ describe('', () => { render(); - fireUserEvent.mousePress(getFieldSectionsContainer()); + fireEvent.click(getFieldSectionsContainer()); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); @@ -132,8 +131,8 @@ describe('', () => { expect(onClose.callCount).to.equal(0); // Change the year view - fireUserEvent.mousePress(screen.getByLabelText(/switch to year view/)); - fireUserEvent.mousePress(screen.getByText('2010', { selector: 'button' })); + fireEvent.click(screen.getByLabelText(/switch to year view/)); + fireEvent.click(screen.getByText('2010', { selector: 'button' })); expect(onChange.callCount).to.equal(1); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2010, 0, 1)); @@ -141,7 +140,7 @@ describe('', () => { clock.runToLast(); // Change the date - fireUserEvent.mousePress(screen.getByRole('gridcell', { name: '15' })); + fireEvent.click(screen.getByRole('gridcell', { name: '15' })); expect(onChange.callCount).to.equal(2); expect(onChange.lastCall.args[0]).toEqualDateTime(new Date(2010, 0, 15)); diff --git a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx index 7db743bb1c2e..49ebb8d55837 100644 --- a/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileDateTimePicker/tests/describes.MobileDateTimePicker.test.tsx @@ -13,7 +13,6 @@ import { } from 'test/utils/pickers'; import { MobileDateTimePicker } from '@mui/x-date-pickers/MobileDateTimePicker'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ @@ -79,7 +78,7 @@ describe(' - Describes', () => { const newValue = applySameValue ? value : adapterToUse.addMinutes(adapterToUse.addHours(adapterToUse.addDays(value, 1), 1), 5); - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('gridcell', { name: adapterToUse.getDate(newValue).toString() }), ); const hasMeridiem = adapterToUse.is12HourCycleInCurrentLocale(); @@ -98,9 +97,7 @@ describe(' - Describes', () => { if (hasMeridiem) { const newHours = adapterToUse.getHours(newValue); // select appropriate meridiem - fireUserEvent.mousePress( - screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }), - ); + fireEvent.click(screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' })); } // Close the picker @@ -110,7 +107,7 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the date view in case we'd like to repeat the selection process - fireUserEvent.mousePress(screen.getByRole('tab', { name: 'pick date' })); + fireEvent.click(screen.getByRole('tab', { name: 'pick date' })); } return newValue; diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/MobileTimePicker.test.tsx index 16e28b5b3c29..62d073d3c10c 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/MobileTimePicker.test.tsx @@ -1,7 +1,7 @@ import * as React from 'react'; import { spy } from 'sinon'; import { expect } from 'chai'; -import { fireTouchChangedEvent, screen, act } from '@mui/internal-test-utils'; +import { fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; import { MobileTimePicker } from '@mui/x-date-pickers/MobileTimePicker'; import { createPickerRenderer, @@ -10,26 +10,27 @@ import { getClockTouchEvent, getFieldSectionsContainer, } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe('', () => { - const { render } = createPickerRenderer({ clock: 'fake' }); + const { render } = createPickerRenderer(); describe('picker state', () => { - it('should open when clicking the input', () => { + it('should open when clicking the input', async () => { const onOpen = spy(); - render(); + const { user } = render( + , + ); - fireUserEvent.mousePress(getFieldSectionsContainer()); + await user.click(getFieldSectionsContainer()); expect(onOpen.callCount).to.equal(1); expect(screen.queryByRole('dialog')).toBeVisible(); }); - it('should fire a change event when meridiem changes', () => { + it('should fire a change event when meridiem changes', async () => { const handleChange = spy(); - render( + const { user } = render( ', () => { ); const buttonPM = screen.getByRole('button', { name: 'PM' }); - act(() => { - buttonPM.click(); - }); + await user.click(buttonPM); expect(handleChange.callCount).to.equal(1); expect(handleChange.firstCall.args[0]).toEqualDateTime(new Date(2019, 0, 1, 16, 20)); }); - it('should call onChange when selecting each view', function test() { + it('should call onChange when selecting each view', async function test() { if (typeof window.Touch === 'undefined' || typeof window.TouchEvent === 'undefined') { this.skip(); } @@ -59,7 +58,7 @@ describe('', () => { const onClose = spy(); const defaultValue = adapterToUse.date('2018-01-01'); - render( + const { user } = render( ', () => { />, ); - openPicker({ type: 'time', variant: 'mobile' }); + await openPicker({ type: 'time', variant: 'mobile', click: user.click }); // Change the hours const hourClockEvent = getClockTouchEvent(11, '12hours'); diff --git a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx index 8a694129a784..b3fa12461d7b 100644 --- a/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx +++ b/packages/x-date-pickers/src/MobileTimePicker/tests/describes.MobileTimePicker.test.tsx @@ -14,7 +14,6 @@ import { } from 'test/utils/pickers'; import { MobileTimePicker } from '@mui/x-date-pickers/MobileTimePicker'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ @@ -93,9 +92,7 @@ describe(' - Describes', () => { if (hasMeridiem) { const newHours = adapterToUse.getHours(newValue); // select appropriate meridiem - fireUserEvent.mousePress( - screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' }), - ); + fireEvent.click(screen.getByRole('button', { name: newHours >= 12 ? 'PM' : 'AM' })); } // Close the picker @@ -105,7 +102,7 @@ describe(' - Describes', () => { clock.runToLast(); } else { // return to the hours view in case we'd like to repeat the selection process - fireUserEvent.mousePress(screen.getByRole('button', { name: 'Open previous view' })); + fireEvent.click(screen.getByRole('button', { name: 'Open previous view' })); } return newValue; diff --git a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx index ef370265decd..2f289f70a552 100644 --- a/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx +++ b/packages/x-date-pickers/src/MonthCalendar/tests/describes.MonthCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { createPickerRenderer, adapterToUse, @@ -9,7 +9,6 @@ import { } from 'test/utils/pickers'; import { MonthCalendar, monthCalendarClasses as classes } from '@mui/x-date-pickers/MonthCalendar'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ clock: 'fake' }); @@ -55,9 +54,7 @@ describe(' - Describes', () => { setNewValue: (value) => { const newValue = adapterToUse.addMonths(value, 1); - fireUserEvent.mousePress( - screen.getByRole('radio', { name: adapterToUse.format(newValue, 'month') }), - ); + fireEvent.click(screen.getByRole('radio', { name: adapterToUse.format(newValue, 'month') })); return newValue; }, diff --git a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx index 465baad26cee..58d3b35893ac 100644 --- a/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx +++ b/packages/x-date-pickers/src/PickersActionBar/PickersActionBar.test.tsx @@ -4,12 +4,9 @@ import { spy } from 'sinon'; import { screen } from '@mui/internal-test-utils'; import { PickersActionBar } from '@mui/x-date-pickers/PickersActionBar'; import { createPickerRenderer } from 'test/utils/pickers'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe('', () => { - const { render } = createPickerRenderer({ - clock: 'fake', - }); + const { render } = createPickerRenderer(); it('should not render buttons if actions array is empty', () => { const onAccept = () => {}; @@ -29,13 +26,13 @@ describe('', () => { expect(screen.queryByRole('button')).to.equal(null); }); - it('should render button for "clear" action calling the associated callback', () => { + it('should render button for "clear" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); const onSetToday = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByText(/clear/i)); + await user.click(screen.getByText(/clear/i)); expect(onClear.callCount).to.equal(1); }); - it('should render button for "cancel" action calling the associated callback', () => { + it('should render button for "cancel" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); const onSetToday = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByText(/cancel/i)); + await user.click(screen.getByText(/cancel/i)); expect(onCancel.callCount).to.equal(1); }); - it('should render button for "accept" action calling the associated callback', () => { + it('should render button for "accept" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); const onSetToday = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByText(/ok/i)); + await user.click(screen.getByText(/ok/i)); expect(onAccept.callCount).to.equal(1); }); - it('should render button for "today" action calling the associated callback', () => { + it('should render button for "today" action calling the associated callback', async () => { const onAccept = spy(); const onClear = spy(); const onCancel = spy(); const onSetToday = spy(); - render( + const { user } = render( ', () => { />, ); - fireUserEvent.mousePress(screen.getByText(/today/i)); + await user.click(screen.getByText(/today/i)); expect(onSetToday.callCount).to.equal(1); }); diff --git a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx index 87eeb7fee9f4..06c4de6035f4 100644 --- a/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx +++ b/packages/x-date-pickers/src/YearCalendar/tests/describes.YearCalendar.test.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { expect } from 'chai'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { YearCalendar, yearCalendarClasses as classes } from '@mui/x-date-pickers/YearCalendar'; import { createPickerRenderer, @@ -9,7 +9,6 @@ import { describeValue, } from 'test/utils/pickers'; import { describeConformance } from 'test/utils/describeConformance'; -import { fireUserEvent } from 'test/utils/fireUserEvent'; describe(' - Describes', () => { const { render, clock } = createPickerRenderer({ @@ -52,7 +51,7 @@ describe(' - Describes', () => { }, setNewValue: (value) => { const newValue = adapterToUse.addYears(value, 1); - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('radio', { name: adapterToUse.getYear(newValue).toString() }), ); diff --git a/test/utils/pickers/describeValue/testPickerActionBar.tsx b/test/utils/pickers/describeValue/testPickerActionBar.tsx index 850189c47294..1491dc6b8856 100644 --- a/test/utils/pickers/describeValue/testPickerActionBar.tsx +++ b/test/utils/pickers/describeValue/testPickerActionBar.tsx @@ -1,14 +1,13 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { adapterToUse, getExpectedOnChangeCount, expectPickerChangeHandlerValue, } from 'test/utils/pickers'; import { DescribeValueTestSuite } from './describeValue.types'; -import { fireUserEvent } from '../../fireUserEvent'; export const testPickerActionBar: DescribeValueTestSuite = ( ElementToTest, @@ -50,7 +49,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( ); // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); + fireEvent.click(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, emptyValue); expect(onAccept.callCount).to.equal(1); @@ -76,7 +75,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( ); // Clear the date - fireUserEvent.mousePress(screen.getByText(/clear/i)); + fireEvent.click(screen.getByText(/clear/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -104,7 +103,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Cancel the modifications - fireUserEvent.mousePress(screen.getByText(/cancel/i)); + fireEvent.click(screen.getByText(/cancel/i)); expect(onChange.callCount).to.equal( getExpectedOnChangeCount(componentFamily, pickerParams) + 1, ); @@ -138,7 +137,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( ); // Cancel the modifications - fireUserEvent.mousePress(screen.getByText(/cancel/i)); + fireEvent.click(screen.getByText(/cancel/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -166,7 +165,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); + fireEvent.click(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal( getExpectedOnChangeCount(componentFamily, pickerParams), ); // The accepted value as already been committed, don't call onChange again @@ -193,7 +192,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( ); // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); + fireEvent.click(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal(1); expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); @@ -218,7 +217,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( ); // Accept the modifications - fireUserEvent.mousePress(screen.getByText(/ok/i)); + fireEvent.click(screen.getByText(/ok/i)); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -243,7 +242,7 @@ export const testPickerActionBar: DescribeValueTestSuite = ( />, ); - fireUserEvent.mousePress(screen.getByText(/today/i)); + fireEvent.click(screen.getByText(/today/i)); let startOfToday: any; if (pickerParams.type === 'date') { diff --git a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx index d2e1d1494439..e4cebf8bc764 100644 --- a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx +++ b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx @@ -1,16 +1,15 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { getExpectedOnChangeCount, getFieldInputRoot, openPicker } from 'test/utils/pickers'; import { DescribeValueTestSuite } from './describeValue.types'; -import { fireUserEvent } from '../../fireUserEvent'; export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite = ( ElementToTest, options, ) => { - const { componentFamily, render, renderWithProps, values, setNewValue, ...pickerParams } = + const { componentFamily, render, renderWithProps, values, setNewValue, clock, ...pickerParams } = options; if (componentFamily !== 'picker') { @@ -273,7 +272,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker - fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); + fireEvent.keyDown(document.activeElement!, { key: 'Escape' }); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); expect(onAccept.callCount).to.equal(1); if (isRangeType) { @@ -309,7 +308,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Dismiss the picker - fireUserEvent.mousePress(document.body); + fireEvent.click(document.body); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -342,7 +341,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker - fireUserEvent.mousePress(document.body); + fireEvent.click(document.body); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); expect(onAccept.callCount).to.equal(1); expect(onAccept.lastCall.args[0]).toEqualDateTime(newValue as any); @@ -365,7 +364,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Dismiss the picker - fireUserEvent.mousePress(document.body); + fireEvent.click(document.body); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); @@ -386,7 +385,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Dismiss the picker - fireUserEvent.keyPress(document.body, { key: 'Escape' }); + fireEvent.keyDown(document.body, { key: 'Escape' }); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); diff --git a/test/utils/pickers/describeValue/testShortcuts.tsx b/test/utils/pickers/describeValue/testShortcuts.tsx index 4e4493b442c2..ae14f1ddc801 100644 --- a/test/utils/pickers/describeValue/testShortcuts.tsx +++ b/test/utils/pickers/describeValue/testShortcuts.tsx @@ -2,9 +2,8 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; import { expectPickerChangeHandlerValue } from 'test/utils/pickers'; -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { DescribeValueTestSuite } from './describeValue.types'; -import { fireUserEvent } from '../../fireUserEvent'; export const testShortcuts: DescribeValueTestSuite = (ElementToTest, options) => { const { @@ -50,7 +49,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - fireUserEvent.mousePress(shortcut); + fireEvent.click(shortcut); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); @@ -88,7 +87,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - fireUserEvent.mousePress(shortcut); + fireEvent.click(shortcut); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); @@ -126,7 +125,7 @@ export const testShortcuts: DescribeValueTestSuite = (ElementToTe ); const shortcut = screen.getByRole('button', { name: 'Test shortcut' }); - fireUserEvent.mousePress(shortcut); + fireEvent.click(shortcut); expect(onChange.callCount).to.equal(1); expectPickerChangeHandlerValue(pickerParams.type, onChange, values[1]); diff --git a/test/utils/pickers/openPicker.ts b/test/utils/pickers/openPicker.ts index 67293e7a3cce..229510842e61 100644 --- a/test/utils/pickers/openPicker.ts +++ b/test/utils/pickers/openPicker.ts @@ -1,12 +1,12 @@ -import { screen } from '@mui/internal-test-utils'; +import { fireEvent, screen } from '@mui/internal-test-utils'; import { getFieldSectionsContainer } from 'test/utils/pickers/fields'; import { pickersInputBaseClasses } from '@mui/x-date-pickers/PickersTextField'; -import { fireUserEvent } from '../fireUserEvent'; export type OpenPickerParams = | { type: 'date' | 'date-time' | 'time'; variant: 'mobile' | 'desktop'; + click?: (element: Element) => Promise; } | { type: 'date-range' | 'date-time-range'; @@ -16,30 +16,34 @@ export type OpenPickerParams = * @default false */ isSingleInput?: boolean; + click?: (element: Element) => Promise; }; -export const openPicker = (params: OpenPickerParams) => { +export const openPicker = async (params: OpenPickerParams) => { const isRangeType = params.type === 'date-range' || params.type === 'date-time-range'; const fieldSectionsContainer = getFieldSectionsContainer( isRangeType && !params.isSingleInput && params.initialFocus === 'end' ? 1 : 0, ); + const { click = fireEvent.click } = params; if (isRangeType) { - fireUserEvent.mousePress(fieldSectionsContainer); + await click(fieldSectionsContainer); if (params.isSingleInput && params.initialFocus === 'end') { const sections = fieldSectionsContainer.querySelectorAll( `.${pickersInputBaseClasses.sectionsContainer}`, ); - fireUserEvent.mousePress(sections[sections.length - 1]); + await click(sections[sections.length - 1]); } - return undefined; + return true; } if (params.variant === 'mobile') { - return fireUserEvent.mousePress(fieldSectionsContainer); + await click(fieldSectionsContainer); + + return true; } const target = @@ -47,5 +51,6 @@ export const openPicker = (params: OpenPickerParams) => { ? screen.getByLabelText(/choose time/i) : screen.getByLabelText(/choose date/i); - return fireUserEvent.mousePress(target); + await click(target); + return true; }; diff --git a/test/utils/pickers/viewHandlers.ts b/test/utils/pickers/viewHandlers.ts index 2b3ab36c387f..845261f64156 100644 --- a/test/utils/pickers/viewHandlers.ts +++ b/test/utils/pickers/viewHandlers.ts @@ -1,8 +1,7 @@ -import { fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; +import { fireEvent, fireTouchChangedEvent, screen } from '@mui/internal-test-utils'; import { getClockTouchEvent, formatFullTimeValue } from 'test/utils/pickers'; import { MuiPickersAdapter, TimeView } from '@mui/x-date-pickers/models'; import { formatMeridiem } from '@mui/x-date-pickers/internals'; -import { fireUserEvent } from '../fireUserEvent'; type TDate = any; @@ -36,9 +35,7 @@ export const timeClockHandler: ViewHandler = { export const digitalClockHandler: ViewHandler = { setViewValue: (adapter, value) => { - fireUserEvent.mousePress( - screen.getByRole('option', { name: formatFullTimeValue(adapter, value) }), - ); + fireEvent.click(screen.getByRole('option', { name: formatFullTimeValue(adapter, value) })); }, }; @@ -47,10 +44,10 @@ export const multiSectionDigitalClockHandler: ViewHandler = { const hasMeridiem = adapter.is12HourCycleInCurrentLocale(); const hoursLabel = parseInt(adapter.format(value, hasMeridiem ? 'hours12h' : 'hours24h'), 10); const minutesLabel = adapter.getMinutes(value).toString(); - fireUserEvent.mousePress(screen.getByRole('option', { name: `${hoursLabel} hours` })); - fireUserEvent.mousePress(screen.getByRole('option', { name: `${minutesLabel} minutes` })); + fireEvent.click(screen.getByRole('option', { name: `${hoursLabel} hours` })); + fireEvent.click(screen.getByRole('option', { name: `${minutesLabel} minutes` })); if (hasMeridiem) { - fireUserEvent.mousePress( + fireEvent.click( screen.getByRole('option', { name: formatMeridiem(adapter, adapter.getHours(value) >= 12 ? 'pm' : 'am'), }), From efcf5e6906a168f52f3d0d1d407c9453e1bb7a0e Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 28 Aug 2024 21:17:57 +0200 Subject: [PATCH 92/96] fix data grid tests --- .../src/tests/columnHeaders.DataGrid.test.tsx | 14 ++++++++++---- .../src/tests/rowSelection.DataGrid.test.tsx | 18 ++++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx index 3746dc1550cb..d2fe4adf9853 100644 --- a/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/columnHeaders.DataGrid.test.tsx @@ -1,5 +1,5 @@ import * as React from 'react'; -import { createRenderer, screen, within } from '@mui/internal-test-utils'; +import { createRenderer, screen, waitFor, within } from '@mui/internal-test-utils'; import { expect } from 'chai'; import { DataGrid } from '@mui/x-data-grid'; import { getColumnHeaderCell, getColumnHeadersTextContent } from 'test/utils/helperFn'; @@ -87,7 +87,9 @@ describe(' - Column headers', () => { expect(getColumnHeadersTextContent()).to.deep.equal(['id']); await user.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - await user.click(screen.getByRole('menuitem', { name: 'Hide column' })); + await user + .setup({ pointerEventsCheck: 0 }) + .click(screen.getByRole('menuitem', { name: 'Hide column' })); expect(getColumnHeadersTextContent()).to.deep.equal(['id']); }); @@ -108,7 +110,9 @@ describe(' - Column headers', () => { expect(getColumnHeadersTextContent()).to.deep.equal(['id', 'brand']); await user.click(within(getColumnHeaderCell(1)).getByLabelText('Menu')); - await user.click(screen.getByRole('menuitem', { name: 'Hide column' })); + await user + .setup({ pointerEventsCheck: 0 }) + .click(screen.getByRole('menuitem', { name: 'Hide column' })); expect(getColumnHeadersTextContent()).to.deep.equal(['id', 'brand']); }); @@ -124,7 +128,9 @@ describe(' - Column headers', () => { expect(screen.queryByRole('menu')).not.to.equal(null); await user.click(within(getColumnHeaderCell(0)).getByLabelText('Menu')); - expect(screen.queryByRole('menu')).to.equal(null); + await waitFor(() => { + expect(screen.queryByRole('menu')).to.equal(null); + }); }); }); diff --git a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx index 1a2e4e3783bd..b39a5d79d580 100644 --- a/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx +++ b/packages/x-data-grid/src/tests/rowSelection.DataGrid.test.tsx @@ -1,7 +1,14 @@ import * as React from 'react'; import { expect } from 'chai'; import { spy } from 'sinon'; -import { createRenderer, fireEvent, screen, act, waitFor } from '@mui/internal-test-utils'; +import { + createRenderer, + fireEvent, + screen, + act, + waitFor, + flushMicrotasks, +} from '@mui/internal-test-utils'; import { DataGrid, DataGridProps, @@ -228,9 +235,11 @@ describe(' - Row selection', () => { // simulate click const checkboxInput = getCell(0, 0).querySelector('input'); - fireEvent.click(checkboxInput!); + fireUserEvent.mousePress(checkboxInput!); - expect(getActiveCell()).to.equal('0-0'); + await waitFor(() => { + expect(getActiveCell()).to.equal('0-0'); + }); }); it('should select all visible rows regardless of pagination', () => { @@ -527,7 +536,7 @@ describe(' - Row selection', () => { describe('ripple', () => { clock.withFakeTimers(); - it('should keep only one ripple visible when navigating between checkboxes', function test() { + it('should keep only one ripple visible when navigating between checkboxes', async function test() { if (isJSDOM) { // JSDOM doesn't fire "blur" when .focus is called in another element // FIXME Firefox doesn't show any ripple @@ -539,6 +548,7 @@ describe(' - Row selection', () => { fireEvent.keyDown(cell, { key: 'ArrowLeft' }); fireEvent.keyDown(getCell(1, 0).querySelector('input')!, { key: 'ArrowUp' }); clock.runToLast(); // Wait for transition + await flushMicrotasks(); expect(document.querySelectorAll('.MuiTouchRipple-rippleVisible')).to.have.length(1); }); }); From ad1ef0a520e0442ccf0cadf7f412c0e1f341cb9d Mon Sep 17 00:00:00 2001 From: Andrew Cherniavskyi Date: Wed, 28 Aug 2024 21:41:58 +0200 Subject: [PATCH 93/96] fix pickers test --- .../src/DateCalendar/tests/DateCalendar.test.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx index 274e3313809b..bf13515b44c8 100644 --- a/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx +++ b/packages/x-date-pickers/src/DateCalendar/tests/DateCalendar.test.tsx @@ -70,13 +70,13 @@ describe('', () => { expect(screen.queryByText('January 2019')).toBeVisible(); expect(screen.queryByLabelText('year view is open, switch to calendar view')).to.equal(null); - await user.click(screen.getByTitle('Previous month')); + await user.setup({ pointerEventsCheck: 0 }).click(screen.getByTitle('Previous month')); expect(onMonthChangeMock.callCount).to.equal(0); - await user.click(screen.getByTitle('Next month')); + await user.setup({ pointerEventsCheck: 0 }).click(screen.getByTitle('Next month')); expect(onMonthChangeMock.callCount).to.equal(0); - await user.click(screen.getByRole('gridcell', { name: '5' })); + await user.setup({ pointerEventsCheck: 0 }).click(screen.getByRole('gridcell', { name: '5' })); expect(onChangeMock.callCount).to.equal(0); }); From 39805f51f3923cde3e62e74acd7c83b2134901c8 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 29 Aug 2024 10:15:22 +0300 Subject: [PATCH 94/96] Fix 2 open/close Pickers tests --- .../testPickerOpenCloseLifeCycle.tsx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx index e4cebf8bc764..57aa07b9e9c6 100644 --- a/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx +++ b/test/utils/pickers/describeValue/testPickerOpenCloseLifeCycle.tsx @@ -4,6 +4,7 @@ import { spy } from 'sinon'; import { fireEvent, screen } from '@mui/internal-test-utils'; import { getExpectedOnChangeCount, getFieldInputRoot, openPicker } from 'test/utils/pickers'; import { DescribeValueTestSuite } from './describeValue.types'; +import { fireUserEvent } from '../../fireUserEvent'; export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite = ( ElementToTest, @@ -81,7 +82,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onChange.lastCall.args[0][index]).toEqualDateTime(value); }); } else { - expect(onChange.lastCall.args[0]).toEqualDateTime(newValue as any); + expect(onChange.lastCall.args[0]).toEqualDateTime(newValue); } expect(onAccept.callCount).to.equal(pickerParams.variant === 'mobile' ? 0 : 1); expect(onClose.callCount).to.equal(pickerParams.variant === 'mobile' ? 0 : 1); @@ -139,7 +140,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onChange.lastCall.args[0][index]).toEqualDateTime(value); }); } else { - expect(onChange.lastCall.args[0]).toEqualDateTime(newValue as any); + expect(onChange.lastCall.args[0]).toEqualDateTime(newValue); } expect(onAccept.callCount).to.equal(1); expect(onClose.callCount).to.equal(1); @@ -215,7 +216,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onChange.lastCall.args[0][index]).toEqualDateTime(value); }); } else { - expect(onChange.lastCall.args[0]).toEqualDateTime(newValue as any); + expect(onChange.lastCall.args[0]).toEqualDateTime(newValue); } expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); @@ -244,7 +245,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite // meridiem does not change this time in case of multi section digital clock (pickerParams.type === 'time' || pickerParams.type === 'date-time' ? 1 : 0), ); - expect(onChange.lastCall.args[0]).toEqualDateTime(newValueBis as any); + expect(onChange.lastCall.args[0]).toEqualDateTime(newValueBis); } expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(0); @@ -280,7 +281,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite expect(onChange.lastCall.args[0][index]).toEqualDateTime(value); }); } else { - expect(onChange.lastCall.args[0]).toEqualDateTime(newValue as any); + expect(onChange.lastCall.args[0]).toEqualDateTime(newValue); } expect(onClose.callCount).to.equal(1); }); @@ -308,7 +309,7 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite ); // Dismiss the picker - fireEvent.click(document.body); + fireUserEvent.mousePress(document.body); expect(onChange.callCount).to.equal(0); expect(onAccept.callCount).to.equal(0); expect(onClose.callCount).to.equal(1); @@ -341,10 +342,10 @@ export const testPickerOpenCloseLifeCycle: DescribeValueTestSuite const newValue = setNewValue(values[0], { isOpened: true, selectSection, pressKey }); // Dismiss the picker - fireEvent.click(document.body); + fireUserEvent.keyPress(document.activeElement!, { key: 'Escape' }); expect(onChange.callCount).to.equal(getExpectedOnChangeCount(componentFamily, pickerParams)); expect(onAccept.callCount).to.equal(1); - expect(onAccept.lastCall.args[0]).toEqualDateTime(newValue as any); + expect(onAccept.lastCall.args[0]).toEqualDateTime(newValue); expect(onClose.callCount).to.equal(1); }); From af8eefe8832801de6a0c09b6c77f7ee36ca2c437 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 29 Aug 2024 10:25:47 +0300 Subject: [PATCH 95/96] Remove no longer relevant `experimental_extendTheme` error message exclusion --- test/regressions/index.test.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/regressions/index.test.js b/test/regressions/index.test.js index febd9f694baf..12be3f7d69bc 100644 --- a/test/regressions/index.test.js +++ b/test/regressions/index.test.js @@ -13,16 +13,11 @@ function sleep(timeoutMS) { const isMaterialUIv6 = materialPackageJson.version.startsWith('6.'); -const ignoredMaterialUIv6Warnings = [ - 'MUI: The `experimental_extendTheme` has been stabilized.', - 'MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.', -]; - const isConsoleWarningIgnored = (msg) => { if ( msg && isMaterialUIv6 && - ignoredMaterialUIv6Warnings.some((warning) => msg.startsWith(warning)) + msg.startsWith('MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.') ) { return true; } From 054893f08f4206e3cf1b8e374a44123a373e4cf6 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 29 Aug 2024 10:45:09 +0300 Subject: [PATCH 96/96] prettier --- test/regressions/index.test.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/regressions/index.test.js b/test/regressions/index.test.js index 12be3f7d69bc..cc3f44deeb07 100644 --- a/test/regressions/index.test.js +++ b/test/regressions/index.test.js @@ -17,7 +17,9 @@ const isConsoleWarningIgnored = (msg) => { if ( msg && isMaterialUIv6 && - msg.startsWith('MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.') + msg.startsWith( + 'MUI: The Experimental_CssVarsProvider component has been ported into ThemeProvider.', + ) ) { return true; }