Skip to content

Commit 5b67925

Browse files
authored
Fix default theme and store (#575)
1 parent cd704b4 commit 5b67925

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

src/core/AdminGuesser.tsx

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import React, { useEffect, useMemo, useState } from 'react';
2-
import { AdminContext, defaultI18nProvider } from 'react-admin';
2+
import {
3+
AdminContext,
4+
defaultI18nProvider,
5+
/* tree-shaking no-side-effects-when-called */ localStorageStore,
6+
} from 'react-admin';
37

48
import type { ComponentType } from 'react';
59
import type { AdminProps } from 'react-admin';
@@ -12,8 +16,8 @@ import {
1216
Error as DefaultError,
1317
Layout,
1418
LoginPage,
15-
darkTheme,
16-
lightTheme,
19+
darkTheme as defaultDarkTheme,
20+
lightTheme as defaultLightTheme,
1721
} from '../layout/index.js';
1822
import type { ApiPlatformAdminDataProvider, SchemaAnalyzer } from '../types.js';
1923

@@ -24,6 +28,8 @@ export interface AdminGuesserProps extends AdminProps {
2428
includeDeprecated?: boolean;
2529
}
2630

31+
const defaultStore = localStorageStore();
32+
2733
const AdminGuesser = ({
2834
// Props for SchemaAnalyzerContext
2935
schemaAnalyzer,
@@ -33,7 +39,7 @@ const AdminGuesser = ({
3339
basename,
3440
// eslint-disable-next-line @typescript-eslint/no-explicit-any
3541
error = DefaultError as any,
36-
store,
42+
store = defaultStore,
3743
dataProvider,
3844
i18nProvider = defaultI18nProvider,
3945
authProvider,
@@ -42,7 +48,8 @@ const AdminGuesser = ({
4248
layout = Layout,
4349
loginPage = LoginPage,
4450
loading: loadingPage,
45-
theme = lightTheme,
51+
theme = defaultLightTheme,
52+
darkTheme = defaultDarkTheme,
4653
// Other props
4754
children,
4855
...rest
@@ -98,7 +105,6 @@ const AdminGuesser = ({
98105
queryClient={queryClient}
99106
theme={theme}
100107
darkTheme={darkTheme}
101-
lightTheme={lightTheme}
102108
defaultTheme={defaultTheme}>
103109
<IntrospectionContext.Provider value={introspectionContext}>
104110
<SchemaAnalyzerContext.Provider value={schemaAnalyzer}>

src/layout/themes.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ export const darkTheme: RaThemeOptions = {
3434
},
3535
},
3636
},
37+
MuiFilledInput: {
38+
styleOverrides: undefined,
39+
},
3740
},
3841
};
3942

0 commit comments

Comments
 (0)