Fix warnings and remove deepmerge where not needed.

Madeorsk · Madeorsk · commit 8af02ea953bd · 2025-06-13T10:01:58.000+02:00
diff --git a/packages/ra-ui-materialui/src/input/BooleanInput.spec.tsx b/packages/ra-ui-materialui/src/input/BooleanInput.spec.tsx
@@ -189,6 +189,6 @@ describe('<BooleanInput />', () => {
 
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/BooleanInput.stories.tsx b/packages/ra-ui-materialui/src/input/BooleanInput.stories.tsx
@@ -3,15 +3,13 @@ import polyglotI18nProvider from 'ra-i18n-polyglot';
 import englishMessages from 'ra-language-english';
 import { useFormContext } from 'react-hook-form';
 import FavoriteIcon from '@mui/icons-material/Favorite';
+import { createTheme } from '@mui/material/styles';
 
 import { AdminContext } from '../AdminContext';
 import { Create } from '../detail';
 import { SimpleForm } from '../form';
 import { BooleanInput } from './BooleanInput';
 import { TextInput } from './TextInput';
-import { deepmerge } from '@mui/utils';
-import { createTheme } from '@mui/material/styles';
-import { ThemeOptions } from '@mui/material';
 
 export default { title: 'ra-ui-materialui/input/BooleanInput' };
 
@@ -80,20 +78,20 @@ export const SetFocus = () => (
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaBooleanInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             color: 'red',
                         },
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <BooleanInput source="published" />
     </Wrapper>
diff --git a/packages/ra-ui-materialui/src/input/DatagridInput.spec.tsx b/packages/ra-ui-materialui/src/input/DatagridInput.spec.tsx
@@ -6,6 +6,6 @@ import { Themed } from './DatagridInput.stories';
 describe('<DatagridInput />', () => {
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/DatagridInput.stories.tsx b/packages/ra-ui-materialui/src/input/DatagridInput.stories.tsx
@@ -1,8 +1,7 @@
 import * as React from 'react';
 import { Admin } from 'react-admin';
 import { Resource, TestMemoryRouter } from 'ra-core';
-import { deepmerge } from '@mui/utils';
-import { createTheme, ThemeOptions } from '@mui/material/styles';
+import { createTheme } from '@mui/material/styles';
 
 import { Edit } from '../detail';
 import { SimpleForm } from '../form';
@@ -164,12 +163,12 @@ export const Themed = () => (
     <TestMemoryRouter initialEntries={['/books/1']}>
         <Admin
             dataProvider={dataProvider}
-            theme={deepmerge(createTheme(), {
+            theme={createTheme({
                 components: {
                     RaDatagridInput: {
                         defaultProps: {
                             'data-testid': 'themed',
-                        },
+                        } as any,
                         styleOverrides: {
                             root: {
                                 ['& .MuiTypography-root']: {
@@ -180,7 +179,7 @@ export const Themed = () => (
                         },
                     },
                 },
-            } as ThemeOptions)}
+            })}
         >
             <Resource name="books" edit={BookEdit} />
         </Admin>
diff --git a/packages/ra-ui-materialui/src/input/DateInput.spec.tsx b/packages/ra-ui-materialui/src/input/DateInput.spec.tsx
@@ -323,6 +323,6 @@ describe('<DateInput />', () => {
 
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/DateInput.stories.tsx b/packages/ra-ui-materialui/src/input/DateInput.stories.tsx
@@ -5,7 +5,6 @@ import { minValue, useRecordContext } from 'ra-core';
 import { useFormContext, useWatch } from 'react-hook-form';
 import { Box, Button, createTheme, Typography } from '@mui/material';
 import { ThemeOptions } from '@mui/material/styles';
-import { deepmerge } from '@mui/utils';
 import get from 'lodash/get';
 
 import { AdminContext } from '../AdminContext';
@@ -152,12 +151,12 @@ export const Themed = ({
 }) => (
     <Wrapper
         simpleFormProps={simpleFormProps}
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaDateInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             ['& input']: {
@@ -167,7 +166,7 @@ export const Themed = ({
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <DateInput source="publishedAt" {...dateInputProps} />
     </Wrapper>
diff --git a/packages/ra-ui-materialui/src/input/DateTimeInput.spec.tsx b/packages/ra-ui-materialui/src/input/DateTimeInput.spec.tsx
@@ -332,6 +332,6 @@ describe('<DateTimeInput />', () => {
 
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/DateTimeInput.stories.tsx b/packages/ra-ui-materialui/src/input/DateTimeInput.stories.tsx
@@ -5,7 +5,6 @@ import { useRecordContext } from 'ra-core';
 import { useFormContext, useWatch } from 'react-hook-form';
 import { Box, Button, createTheme, Typography } from '@mui/material';
 import { ThemeOptions } from '@mui/material/styles';
-import { deepmerge } from '@mui/utils';
 import get from 'lodash/get';
 
 import { AdminContext } from '../AdminContext';
@@ -100,12 +99,12 @@ export const AsDateObject = () => (
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaDateTimeInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             ['& input']: {
@@ -115,7 +114,7 @@ export const Themed = () => (
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <DateTimeInput source="published" />
     </Wrapper>
diff --git a/packages/ra-ui-materialui/src/input/NumberInput.spec.tsx b/packages/ra-ui-materialui/src/input/NumberInput.spec.tsx
@@ -676,6 +676,6 @@ describe('<NumberInput />', () => {
 
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/NumberInput.stories.tsx b/packages/ra-ui-materialui/src/input/NumberInput.stories.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { required } from 'ra-core';
 import { useFormState, useFormContext } from 'react-hook-form';
-import { deepmerge } from '@mui/utils';
 import { createTheme } from '@mui/material/styles';
-import { ThemeOptions } from '@mui/material';
 
 import { NumberInput } from './NumberInput';
 import { AdminContext } from '../AdminContext';
@@ -283,12 +281,12 @@ export const SetFocus = () => (
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaNumberInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             ['& input']: {
@@ -298,7 +296,7 @@ export const Themed = () => (
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <NumberInput source="views" />
         <FormInspector name="views" />
diff --git a/packages/ra-ui-materialui/src/input/PasswordInput.spec.tsx b/packages/ra-ui-materialui/src/input/PasswordInput.spec.tsx
@@ -6,6 +6,6 @@ import { Themed } from './PasswordInput.stories';
 describe('<PasswordInput />', () => {
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/PasswordInput.stories.tsx b/packages/ra-ui-materialui/src/input/PasswordInput.stories.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import polyglotI18nProvider from 'ra-i18n-polyglot';
 import englishMessages from 'ra-language-english';
-import { deepmerge } from '@mui/utils';
 import { createTheme } from '@mui/material/styles';
-import { ThemeOptions } from '@mui/material';
 
 import { AdminContext } from '../AdminContext';
 import { Create } from '../detail';
@@ -40,12 +38,12 @@ export const ReadOnly = () => (
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaPasswordInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             ['& input']: {
@@ -55,7 +53,7 @@ export const Themed = () => (
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <PasswordInput source="password" />
     </Wrapper>
diff --git a/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.stories.tsx b/packages/ra-ui-materialui/src/input/RadioButtonGroupInput.stories.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import polyglotI18nProvider from 'ra-i18n-polyglot';
 import englishMessages from 'ra-language-english';
-import { deepmerge } from '@mui/utils';
 import { createTheme } from '@mui/material/styles';
-import { ThemeOptions } from '@mui/material';
 
 import { AdminContext } from '../AdminContext';
 import { Create, Edit } from '../detail';
@@ -282,7 +280,7 @@ export const TranslateChoice = () => {
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaRadioButtonGroupInputItem: {
                     defaultProps: {
@@ -295,7 +293,7 @@ export const Themed = () => (
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <RadioButtonGroupInput source="category" choices={choices} />
     </Wrapper>
diff --git a/packages/ra-ui-materialui/src/input/TextInput.spec.tsx b/packages/ra-ui-materialui/src/input/TextInput.spec.tsx
@@ -248,6 +248,6 @@ describe('<TextInput />', () => {
 
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/TextInput.stories.tsx b/packages/ra-ui-materialui/src/input/TextInput.stories.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import { required, Resource } from 'ra-core';
 import { useFormState, useFormContext } from 'react-hook-form';
-import { deepmerge } from '@mui/utils';
 import { createTheme } from '@mui/material/styles';
-import { ThemeOptions } from '@mui/material';
 
 import { TextInput } from './TextInput';
 import { AdminContext } from '../AdminContext';
@@ -411,12 +409,12 @@ export const Parse = ({ onSuccess = console.log }) => (
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaTextInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             ['& input']: {
@@ -426,7 +424,7 @@ export const Themed = () => (
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <TextInput source="title" />
         <FormInspector />
diff --git a/packages/ra-ui-materialui/src/input/TimeInput.spec.tsx b/packages/ra-ui-materialui/src/input/TimeInput.spec.tsx
@@ -278,6 +278,6 @@ describe('<TimeInput />', () => {
 
     it('should be customized by a theme', async () => {
         render(<Themed />);
-        const input = await screen.findByTestId('themed');
+        await screen.findByTestId('themed');
     });
 });
diff --git a/packages/ra-ui-materialui/src/input/TimeInput.stories.tsx b/packages/ra-ui-materialui/src/input/TimeInput.stories.tsx
@@ -1,9 +1,7 @@
 import * as React from 'react';
 import polyglotI18nProvider from 'ra-i18n-polyglot';
 import englishMessages from 'ra-language-english';
-import { deepmerge } from '@mui/utils';
 import { createTheme } from '@mui/material/styles';
-import { ThemeOptions } from '@mui/material';
 
 import { AdminContext } from '../AdminContext';
 import { Create } from '../detail';
@@ -46,12 +44,12 @@ export const OutlinedNoLabel = () => (
 
 export const Themed = () => (
     <Wrapper
-        theme={deepmerge(createTheme(), {
+        theme={createTheme({
             components: {
                 RaTimeInput: {
                     defaultProps: {
                         'data-testid': 'themed',
-                    },
+                    } as any,
                     styleOverrides: {
                         root: {
                             ['& input']: {
@@ -61,7 +59,7 @@ export const Themed = () => (
                     },
                 },
             },
-        } as ThemeOptions)}
+        })}
     >
         <TimeInput source="published" />
     </Wrapper>
diff --git a/packages/ra-ui-materialui/src/list/List.stories.tsx b/packages/ra-ui-materialui/src/list/List.stories.tsx
@@ -30,7 +30,7 @@ import { ShowGuesser } from '../detail';
 import TopToolbar from '../layout/TopToolbar';
 import { BulkActionsToolbar } from './BulkActionsToolbar';
 import { deepmerge } from '@mui/utils';
-import { defaultLightTheme, RaThemeOptions } from '../theme';
+import { defaultLightTheme } from '../theme';
 
 export default { title: 'ra-ui-materialui/list/List' };
 
