fix unit tests

Author: smeng9

packages/ra-ui-materialui/package.json

@@ -81,7 +81,8 @@
         "react-dropzone": "^14.2.3",
         "react-error-boundary": "^4.0.13",
         "react-hotkeys-hook": "^5.1.0",
-        "react-transition-group": "^4.4.5"
+        "react-transition-group": "^4.4.5",
+        "semver": "^7.7.4"
     },
     "gitHead": "19dcb264898c8e01c408eb66ce02c50b67c851ab",
     "exports": {

packages/ra-ui-materialui/src/input/DateInput.tsx

@@ -11,7 +11,8 @@ import {
 import { CommonInputProps } from './CommonInputProps';
 import { sanitizeInputRestProps } from './sanitizeInputRestProps';
 import { InputHelperText } from './InputHelperText';
-import { useForkRef } from '@mui/material';
+import { useForkRef, version as muiVersion } from '@mui/material';
+import { gte } from 'semver';
 
 /**
  * Form input to edit a Date string value in the "YYYY-MM-DD" format (e.g. '2021-06-23').
@@ -236,7 +237,9 @@ export const DateInput = (props: DateInputProps) => {
             }
             InputLabelProps={defaultInputLabelProps}
             {...sanitizeInputRestProps(rest)}
-            slotProps={mergedSlotProps}
+            {...(gte(muiVersion as string, '9.0.0')
+                ? { slotProps: mergedSlotProps }
+                : {})}
         />
     );
 };

packages/ra-ui-materialui/src/input/DateTimeInput.tsx

@@ -11,7 +11,8 @@ import {
 import { CommonInputProps } from './CommonInputProps';
 import { sanitizeInputRestProps } from './sanitizeInputRestProps';
 import { InputHelperText } from './InputHelperText';
-import { useForkRef } from '@mui/material';
+import { useForkRef, version as muiVersion } from '@mui/material';
+import { gte } from 'semver';
 
 /**
  * Input component for entering a date and a time with timezone, using the browser locale
@@ -195,7 +196,9 @@ export const DateTimeInput = (props: DateTimeInputProps) => {
             }
             InputLabelProps={defaultInputLabelProps}
             {...sanitizeInputRestProps(rest)}
-            slotProps={mergedSlotProps}
+            {...(gte(muiVersion as string, '9.0.0')
+                ? { slotProps: mergedSlotProps }
+                : {})}
         />
     );
 };

packages/ra-ui-materialui/src/input/NumberInput.tsx

@@ -7,6 +7,8 @@ import {
     styled,
     useThemeProps,
 } from '@mui/material/styles';
+import { version as muiVersion } from '@mui/material';
+import { gte } from 'semver';
 
 import { CommonInputProps } from './CommonInputProps';
 import { InputHelperText } from './InputHelperText';
@@ -177,7 +179,9 @@ export const NumberInput = (props: NumberInputProps) => {
             margin={margin}
             inputProps={inputProps}
             {...sanitizeInputRestProps(rest)}
-            slotProps={mergedSlotProps}
+            {...(gte(muiVersion as string, '9.0.0')
+                ? { slotProps: mergedSlotProps }
+                : {})}
         />
     );
 };

packages/ra-ui-materialui/src/input/ResettableTextField.tsx

@@ -11,7 +11,9 @@ import {
     IconButton,
     TextField as MuiTextField,
     type TextFieldProps,
+    version as muiVersion,
 } from '@mui/material';
+import { gte } from 'semver';
 import ClearIcon from '@mui/icons-material/Clear';
 import { useTranslate } from 'ra-core';
 
@@ -174,8 +176,9 @@ export const ResettableTextField = forwardRef(
                 margin={margin}
                 className={className}
                 {...rest}
-                // @ts-expect-error slotProps do not yet exist in MUI v5
-                slotProps={mergedSlotProps}
+                {...(gte(muiVersion as string, '9.0.0')
+                    ? { slotProps: mergedSlotProps }
+                    : {})}
                 inputRef={ref}
             />
         );

packages/ra-ui-materialui/src/input/TimeInput.tsx

@@ -7,6 +7,8 @@ import {
     styled,
     useThemeProps,
 } from '@mui/material/styles';
+import { version as muiVersion } from '@mui/material';
+import { gte } from 'semver';
 
 import { CommonInputProps } from './CommonInputProps';
 import { sanitizeInputRestProps } from './sanitizeInputRestProps';
@@ -131,7 +133,9 @@ export const TimeInput = (props: TimeInputProps) => {
             }
             InputLabelProps={defaultInputLabelProps}
             {...sanitizeInputRestProps(rest)}
-            slotProps={mergedSlotProps}
+            {...(gte(muiVersion as string, '9.0.0')
+                ? { slotProps: mergedSlotProps }
+                : {})}
         />
     );
 };

packages/ra-ui-materialui/src/layout/Notification.tsx

@@ -11,7 +11,9 @@ import {
     Snackbar,
     type SnackbarProps,
     SnackbarOrigin,
+    version as muiVersion,
 } from '@mui/material';
+import { gte } from 'semver';
 import clsx from 'clsx';
 
 import {
@@ -185,8 +187,9 @@ export const Notification = (inProps: NotificationProps) => {
                 anchorOrigin={anchorOrigin}
                 {...rest}
                 {...options}
-                // @ts-expect-error slotProps do not yet exist in MUI v5
-                slotProps={mergedSlotProps}
+                {...(gte(muiVersion as string, '9.0.0')
+                    ? { slotProps: mergedSlotProps }
+                    : {})}
             >
                 {message &&
                 typeof message !== 'string' &&

packages/ra-ui-materialui/src/list/datagrid/DatagridHeader.tsx

@@ -7,7 +7,14 @@ import {
     SortPayload,
     useTranslate,
 } from 'ra-core';
-import { Checkbox, TableCell, TableHead, TableRow } from '@mui/material';
+import {
+    Checkbox,
+    TableCell,
+    TableHead,
+    TableRow,
+    version as muiVersion,
+} from '@mui/material';
+import { gte } from 'semver';
 import clsx from 'clsx';
 
 import DatagridHeaderCell from './DatagridHeaderCell';
@@ -114,8 +121,9 @@ export const DatagridHeader = (props: DatagridHeaderProps) => {
                     >
                         <Checkbox
                             inputProps={selectAllInputProps}
-                            // @ts-expect-error slotProps do not yet exist in MUI v5
-                            slotProps={{ input: selectAllInputProps }}
+                            {...(gte(muiVersion as string, '9.0.0')
+                                ? { slotProps: { input: selectAllInputProps } }
+                                : {})}
                             className="select-all"
                             color="primary"
                             checked={

packages/ra-ui-materialui/src/list/datatable/SelectPageCheckbox.tsx

@@ -1,4 +1,5 @@
-import { Checkbox } from '@mui/material';
+import { Checkbox, version as muiVersion } from '@mui/material';
+import { gte } from 'semver';
 import {
     useDataTableCallbacksContext,
     useDataTableDataContext,
@@ -54,8 +55,9 @@ export const SelectPageCheckbox = () => {
     return (
         <Checkbox
             inputProps={selectAllInputProps}
-            // @ts-expect-error slotProps do not yet exist in MUI v5
-            slotProps={{ input: selectAllInputProps }}
+            {...(gte(muiVersion as string, '9.0.0')
+                ? { slotProps: { input: selectAllInputProps } }
+                : {})}
             className="select-all"
             color="primary"
             checked={

yarn.lock

@@ -21086,6 +21086,7 @@ __metadata:
     react-router: "npm:^6.28.1"
     react-router-dom: "npm:^6.28.1"
     react-transition-group: "npm:^4.4.5"
+    semver: "npm:^7.7.4"
     typescript: "npm:^5.1.3"
     zshy: "npm:^0.5.0"
   peerDependencies:
@@ -22760,7 +22761,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3":
+"semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.3, semver@npm:^7.7.4":
   version: 7.7.4
   resolution: "semver@npm:7.7.4"
   bin: