Bump React (#12295)

Co-authored-by: Lukas <llukas.tyla@gmail.com> Co-authored-by: Andrew Cherniavskyi <andrew@mui.com>
mui · Jun 25, 2024 · cef1835 · cef1835
1 parent 3d9b919
commit cef1835
Show file tree

Hide file tree

Showing 44 changed files with 413 additions and 489 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -78,11 +78,11 @@
     "postcss": "^8.4.38",
     "prismjs": "^1.29.0",
     "prop-types": "^15.8.1",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-docgen": "^5.4.3",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-hook-form": "^7.52.0",
-    "react-is": "^18.2.0",
+    "react-is": "^18.3.1",
     "react-router": "^6.23.1",
     "react-router-dom": "^6.23.1",
     "react-runner": "^1.0.5",
@@ -107,7 +107,7 @@
     "@types/luxon": "^3.4.2",
     "@types/moment-hijri": "^2.1.4",
     "@types/moment-jalaali": "^0.7.9",
-    "@types/react-dom": "18.2.25",
+    "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
     "@types/stylis": "^4.2.6",
     "@types/webpack-bundle-analyzer": "^4.7.0",

diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "@mnajdova/enzyme-adapter-react-18": "^0.2.0",
     "@mui/icons-material": "^5.15.20",
     "@mui/internal-markdown": "^1.0.5",
-    "@mui/internal-test-utils": "^1.0.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@mui/material": "^5.15.20",
     "@mui/monorepo": "github:mui/material-ui#22c5206a9e8191b2f81131d6978a0958e55b7032",
     "@mui/utils": "^5.15.20",
@@ -106,8 +106,8 @@
     "@types/lodash": "^4.17.5",
     "@types/mocha": "^10.0.6",
     "@types/node": "^18.19.34",
-    "@types/react": "^18.2.60",
-    "@types/react-dom": "^18.2.25",
+    "@types/react": "^18.3.3",
+    "@types/react-dom": "^18.3.0",
     "@types/react-test-renderer": "^18.3.0",
     "@types/requestidlecallback": "^0.3.7",
     "@types/sinon": "^17.0.3",
@@ -175,8 +175,8 @@
     "prettier": "^3.3.2",
     "pretty-quick": "^4.0.0",
     "process": "^0.11.10",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
     "remark": "^13.0.0",
     "rimraf": "^5.0.7",
     "serve": "^14.2.3",
@@ -194,7 +194,7 @@
     "yargs": "^17.7.2"
   },
   "resolutions": {
-    "react-is": "^18.2.0",
+    "react-is": "^18.3.1",
     "@types/node": "^18.19.34"
   },
   "packageManager": "pnpm@9.4.0",

diff --git a/packages/x-charts/package.json b/packages/x-charts/package.json
@@ -69,7 +69,7 @@
     }
   },
   "devDependencies": {
-    "@mui/internal-test-utils": "^1.0.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@react-spring/core": "^9.7.3",
     "@react-spring/shared": "^9.7.3",
     "@types/d3-color": "^3.1.3",

diff --git a/packages/x-data-grid-premium/package.json b/packages/x-data-grid-premium/package.json
@@ -61,7 +61,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
-    "@mui/internal-test-utils": "^1.0.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@types/prop-types": "^15.7.12",
     "date-fns": "^2.30.0",
     "rimraf": "^5.0.7"

diff --git a/packages/x-data-grid-pro/package.json b/packages/x-data-grid-pro/package.json
@@ -59,7 +59,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
-    "@mui/internal-test-utils": "^1.0.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@types/prop-types": "^15.7.12",
     "rimraf": "^5.0.7"
   },

diff --git a/packages/x-data-grid/package.json b/packages/x-data-grid/package.json
@@ -60,7 +60,7 @@
     "react-dom": "^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
-    "@mui/internal-test-utils": "^1.0.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@mui/joy": "5.0.0-beta.32",
     "@mui/types": "^7.2.14",
     "@types/prop-types": "^15.7.12",

diff --git a/packages/x-data-grid/src/components/panel/GridPanel.test.tsx b/packages/x-data-grid/src/components/panel/GridPanel.test.tsx
@@ -33,18 +33,13 @@ describe('<GridPanel />', () => {
     classes: classes as any,
     inheritComponent: Popper,
     muiName: 'MuiGridPanel',
-    render: (node: React.ReactElement) => render(<Wrapper>{node}</Wrapper>),
-    wrapMount:
-      (baseMount: (node: React.ReactElement) => import('enzyme').ReactWrapper) =>
-      (node: React.ReactNode) => {
-        const wrapper = baseMount(
-          <Wrapper>
-            <div data-id="gridPanelAnchor" />
-            <span>{node}</span>
-          </Wrapper>,
-        );
-        return wrapper.find('span').childAt(0);
-      },
+    render: (node: React.ReactElement) =>
+      render(
+        <Wrapper>
+          <div data-id="gridPanelAnchor" />
+          {node}
+        </Wrapper>,
+      ),
     refInstanceof: window.HTMLDivElement,
     only: ['mergeClassName', 'propsSpread', 'refForwarding', 'rootClass'],
   }));

diff --git 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.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@types/luxon": "^3.4.2",
     "@types/prop-types": "^15.7.12",
     "date-fns": "^2.30.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
@@ -14,7 +14,6 @@ import {
   MockedDataTransfer,
   rangeCalendarDayTouches,
   createPickerRenderer,
-  wrapPickerMount,
 } from 'test/utils/pickers';
 import {
   DateRangeCalendar,
@@ -45,7 +44,6 @@ describe('<DateRangeCalendar />', () => {
     inheritComponent: 'div',
     render,
     muiName: 'MuiDateRangeCalendar',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: ['componentProp', 'componentsProp', 'reactTestRenderer', 'themeVariants'],
   }));

diff --git a/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/DateRangePicker/describes.DateRangePicker.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { DateRangePicker } from '@mui/x-date-pickers-pro/DateRangePicker';
-import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers';
+import { createPickerRenderer } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<DateRangePicker /> - Describes', () => {
@@ -10,7 +10,6 @@ describe('<DateRangePicker /> - Describes', () => {
     classes: {} as any,
     render,
     muiName: 'MuiDateRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',

diff --git a/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx b/packages/x-date-pickers-pro/src/DateRangePickerDay/DateRangePickerDay.test.tsx
@@ -3,7 +3,7 @@ import {
   DateRangePickerDay,
   dateRangePickerDayClasses as classes,
 } from '@mui/x-date-pickers-pro/DateRangePickerDay';
-import { wrapPickerMount, createPickerRenderer, adapterToUse } from 'test/utils/pickers';
+import { createPickerRenderer, adapterToUse } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<DateRangePickerDay />', () => {
@@ -29,12 +29,12 @@ describe('<DateRangePickerDay />', () => {
       inheritComponent: 'button',
       muiName: 'MuiDateRangePickerDay',
       render,
-      wrapMount: wrapPickerMount,
       refInstanceof: window.HTMLButtonElement,
       // cannot test reactTestRenderer because of required context
       skip: [
         'componentProp',
         'rootClass', // forwards classes to DateRangePickerDayDay, but applies root class on DateRangePickerDayRoot
+        'mergeClassName', // forwards other props (i.e. data-test-id) to the DateRangePickerDayDay, but `className` is applied on the root
         'componentsProp',
         'reactTestRenderer',
         'propsSpread',

diff --git a/...s/x-date-pickers-pro/src/DateTimeRangePicker/tests/describes.DateTimeRangePicker.test.tsx b/...s/x-date-pickers-pro/src/DateTimeRangePicker/tests/describes.DateTimeRangePicker.test.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers';
+import { createPickerRenderer } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 import { DateTimeRangePicker } from '../DateTimeRangePicker';
 
@@ -10,7 +10,6 @@ describe('<DateTimeRangePicker /> - Describes', () => {
     classes: {} as any,
     render,
     muiName: 'MuiDateTimeRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',

diff --git a/...te-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx b/...te-pickers-pro/src/DesktopDateRangePicker/tests/describes.DesktopDateRangePicker.test.tsx
@@ -3,7 +3,6 @@ import { screen, userEvent } from '@mui/internal-test-utils';
 import {
   adapterToUse,
   createPickerRenderer,
-  wrapPickerMount,
   expectFieldValueV7,
   describePicker,
   describeValue,
@@ -34,7 +33,6 @@ describe('<DesktopDateRangePicker /> - Describes', () => {
     classes: {} as any,
     render,
     muiName: 'MuiDesktopDateRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',

diff --git a/...rs-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx b/...rs-pro/src/DesktopDateTimeRangePicker/tests/describes.DesktopDateTimeRangePicker.test.tsx
@@ -7,7 +7,6 @@ import {
   describeValue,
   describePicker,
   describeRangeValidation,
-  wrapPickerMount,
   getFieldSectionsContainer,
 } from 'test/utils/pickers';
 import { DesktopDateTimeRangePicker } from '../DesktopDateTimeRangePicker';
@@ -35,7 +34,6 @@ describe('<DesktopDateTimeRangePicker /> - Describes', () => {
     classes: {} as any,
     render,
     muiName: 'MuiDesktopDateTimeRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',

diff --git a/...date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx b/...date-pickers-pro/src/MobileDateRangePicker/tests/describes.MobileDateRangePicker.test.tsx
@@ -4,7 +4,6 @@ import { MobileDateRangePicker } from '@mui/x-date-pickers-pro/MobileDateRangePi
 import {
   adapterToUse,
   createPickerRenderer,
-  wrapPickerMount,
   openPicker,
   expectFieldValueV7,
   describeRangeValidation,
@@ -34,7 +33,6 @@ describe('<MobileDateRangePicker /> - Describes', () => {
     classes: {} as any,
     render,
     muiName: 'MuiMobileDateRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',

diff --git a/...kers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx b/...kers-pro/src/MobileDateTimeRangePicker/tests/describes.MobileDateTimeRangePicker.test.tsx
@@ -7,7 +7,6 @@ import {
   describeValue,
   describePicker,
   describeRangeValidation,
-  wrapPickerMount,
   getFieldSectionsContainer,
   openPicker,
 } from 'test/utils/pickers';
@@ -36,7 +35,6 @@ describe('<MobileDateTimeRangePicker /> - Describes', () => {
     classes: {} as any,
     render,
     muiName: 'MuiMobileDateTimeRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     skip: [
       'componentProp',

diff --git a/...kers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx b/...kers-pro/src/MultiInputDateRangeField/tests/MultiInputDateRangeField.conformance.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { MultiInputDateRangeField } from '@mui/x-date-pickers-pro/MultiInputDateRangeField';
-import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers';
+import { createPickerRenderer } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<MultiInputDateRangeField />', () => {
@@ -11,7 +11,6 @@ describe('<MultiInputDateRangeField />', () => {
     inheritComponent: 'div',
     render,
     muiName: 'MuiMultiInputDateRangeField',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     // cannot test reactTestRenderer because of required context
     skip: ['reactTestRenderer', 'themeVariants', 'componentProp', 'componentsProp'],

diff --git a/.../src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx b/.../src/MultiInputDateTimeRangeField/tests/MultiInputDateTimeRangeField.conformance.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { MultiInputDateTimeRangeField } from '@mui/x-date-pickers-pro/MultiInputDateTimeRangeField';
-import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers';
+import { createPickerRenderer } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<MultiInputDateTimeRangeField />', () => {
@@ -11,7 +11,6 @@ describe('<MultiInputDateTimeRangeField />', () => {
     inheritComponent: 'div',
     render,
     muiName: 'MuiMultiInputDateTimeRangeField',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     // cannot test reactTestRenderer because of required context
     skip: ['componentProp', 'componentsProp', 'reactTestRenderer', 'themeVariants'],

diff --git a/...kers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx b/...kers-pro/src/MultiInputTimeRangeField/tests/MultiInputTimeRangeField.conformance.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { MultiInputTimeRangeField } from '@mui/x-date-pickers-pro/MultiInputTimeRangeField';
-import { createPickerRenderer, wrapPickerMount } from 'test/utils/pickers';
+import { createPickerRenderer } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<MultiInputTimeRangeField />', () => {
@@ -11,7 +11,6 @@ describe('<MultiInputTimeRangeField />', () => {
     inheritComponent: 'div',
     render,
     muiName: 'MuiMultiInputTimeRangeField',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     // cannot test reactTestRenderer because of required context
     skip: ['reactTestRenderer', 'themeVariants', 'componentProp', 'componentsProp'],

diff --git a/...kers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx b/...kers-pro/src/SingleInputDateRangeField/tests/describes.SingleInputDateRangeField.test.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { PickersTextField } from '@mui/x-date-pickers/PickersTextField';
 import { SingleInputDateRangeField } from '@mui/x-date-pickers-pro/SingleInputDateRangeField';
-import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers';
+import { createPickerRenderer, describeRangeValidation } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<SingleInputDateRangeField /> - Describes', () => {
@@ -12,7 +12,6 @@ describe('<SingleInputDateRangeField /> - Describes', () => {
     inheritComponent: PickersTextField,
     render,
     muiName: 'MuiSingleInputDateRangeField',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     // cannot test reactTestRenderer because of required context
     skip: [

diff --git a/.../src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx b/.../src/SingleInputDateTimeRangeField/tests/describes.SingleInputDateTimeRangeField.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { SingleInputDateTimeRangeField } from '@mui/x-date-pickers-pro/SingleInputDateTimeRangeField';
-import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers';
+import { createPickerRenderer, describeRangeValidation } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<SingleInputDateTimeRangeField /> - Describes', () => {
@@ -11,7 +11,6 @@ describe('<SingleInputDateTimeRangeField /> - Describes', () => {
     inheritComponent: 'div',
     render,
     muiName: 'MuiSingleInputDateTimeRangeField',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     // cannot test reactTestRenderer because of required context
     skip: [

diff --git a/...kers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx b/...kers-pro/src/SingleInputTimeRangeField/tests/describes.SingleInputTimeRangeField.test.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { SingleInputTimeRangeField } from '@mui/x-date-pickers-pro/SingleInputTimeRangeField';
-import { createPickerRenderer, wrapPickerMount, describeRangeValidation } from 'test/utils/pickers';
+import { createPickerRenderer, describeRangeValidation } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<SingleInputTimeRangeField /> - Describes', () => {
@@ -11,7 +11,6 @@ describe('<SingleInputTimeRangeField /> - Describes', () => {
     inheritComponent: 'div',
     render,
     muiName: 'MuiSingleInputTimeRangeField',
-    wrapMount: wrapPickerMount,
     refInstanceof: window.HTMLDivElement,
     // cannot test reactTestRenderer because of required context
     skip: [

diff --git a/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx b/packages/x-date-pickers-pro/src/StaticDateRangePicker/StaticDateRangePicker.test.tsx
@@ -3,12 +3,7 @@ import { expect } from 'chai';
 import { isWeekend } from 'date-fns';
 import { StaticDateRangePicker } from '@mui/x-date-pickers-pro/StaticDateRangePicker';
 import { screen } from '@mui/internal-test-utils';
-import {
-  wrapPickerMount,
-  createPickerRenderer,
-  adapterToUse,
-  describeRangeValidation,
-} from 'test/utils/pickers';
+import { createPickerRenderer, adapterToUse, describeRangeValidation } from 'test/utils/pickers';
 import { describeConformance } from 'test/utils/describeConformance';
 
 describe('<StaticDateRangePicker />', () => {
@@ -21,7 +16,6 @@ describe('<StaticDateRangePicker />', () => {
     classes: {} as any,
     render,
     muiName: 'MuiStaticDateRangePicker',
-    wrapMount: wrapPickerMount,
     refInstanceof: undefined,
     skip: [
       'componentProp',

diff --git 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.1",
+    "@mui/internal-test-utils": "^1.0.2",
     "@types/luxon": "^3.4.2",
     "@types/moment-hijri": "^2.1.4",
     "@types/moment-jalaali": "^0.7.9",