Skip to content

Commit a88fd3c

Browse files
committed
fix: remove context in theme provider
1 parent ab2f8a3 commit a88fd3c

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

src/components/ThemeProvider.tsx

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { createContext } from "react";
1+
import React from "react";
22
import { ThemeProvider as StyledThemeProvider } from "styled-components";
33
import { PartialDeep } from "type-fest";
44
import useDarkMode from "use-dark-mode";
@@ -48,21 +48,17 @@ export const defaultTheme: PartialDeep<Theme> = {
4848
},
4949
};
5050

51-
export const ThemeContext = createContext(defaultTheme);
52-
5351
export const ThemeProvider = (props: {
5452
children: React.ReactNode;
5553
theme?: PartialDeep<Theme>;
56-
dark?: boolean
54+
dark?: boolean;
5755
}) => {
5856
const { children, theme: providedTheme, dark } = props;
5957
const theme = providedTheme ?? defaultTheme;
6058
return (
61-
<ThemeContext.Provider value={theme}>
62-
<StyledThemeProvider theme={dark ? theme.dark : theme.light}>
63-
{children}
64-
</StyledThemeProvider>
65-
</ThemeContext.Provider>
59+
<StyledThemeProvider theme={dark ? theme.dark : theme.light}>
60+
{children}
61+
</StyledThemeProvider>
6662
);
6763
};
6864

@@ -74,19 +70,16 @@ export const StorybookThemeProvider = (props: {
7470
const darkMode = useDarkMode(false);
7571
const theme = providedTheme ?? defaultTheme;
7672
return (
77-
<ThemeContext.Provider value={theme}>
78-
<StyledThemeProvider theme={darkMode.value ? theme.dark : theme.light}>
79-
{children}
80-
</StyledThemeProvider>
81-
</ThemeContext.Provider>
73+
<StyledThemeProvider theme={darkMode.value ? theme.dark : theme.light}>
74+
{children}
75+
</StyledThemeProvider>
8276
);
8377
};
8478

8579
export const getThemeValue = (key: keyof Palette) => {
8680
try {
87-
const theme = React.useContext(ThemeContext) ?? defaultTheme;
8881
const darkMode = useDarkMode(false);
89-
return darkMode.value ? theme.dark![key] : theme.light![key];
82+
return darkMode.value ? defaultTheme.dark![key] : defaultTheme.light![key];
9083
} catch {
9184
defaultTheme.light![key];
9285
// in case of error, return the default value

0 commit comments

Comments
 (0)