Skip to content

Commit a566c50

Browse files
committed
Make color scheme value required prop
1 parent ced08bc commit a566c50

File tree

4 files changed

+8
-27
lines changed

4 files changed

+8
-27
lines changed

packages/mobile-app/app/_layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export default function Layout() {
4646
const scheme = useColorScheme();
4747
return (
4848
<ThemeProvider value={scheme === "dark" ? DarkTheme : DefaultTheme}>
49-
<ColorScheme scheme={scheme === "dark" ? "_dark" : "_light"}>
49+
<ColorScheme value={scheme === "dark" ? "_dark" : "_light"}>
5050
<QueryClientProvider client={queryClient}>
5151
<FacadeProvider>
5252
<DatabaseLoader loading={<Text>Loading databases...</Text>}>

packages/tackle-box/.storybook/preview.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const preview: Preview = {
1515
(Story, { context }) => {
1616
const isDarkMode = context.globals?.backgrounds?.value === "#333333";
1717
return (
18-
<ColorScheme scheme={isDarkMode ? "_dark" : "_light"}>
18+
<ColorScheme value={isDarkMode ? "_dark" : "_light"}>
1919
<Story />
2020
</ColorScheme>
2121
);

packages/tackle-box/src/components/Button/Button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export function Button({
3737
onPressOut,
3838
});
3939

40-
const { colorScheme } = useColorScheme();
40+
const colorScheme = useColorScheme();
4141

4242
return (
4343
<Pressable

packages/tackle-box/src/components/ColorScheme/ColorScheme.tsx

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,17 @@
1-
import React, {
2-
createContext,
3-
ReactNode,
4-
useCallback,
5-
useContext,
6-
useState,
7-
} from "react";
1+
import React, { createContext, ReactNode, useContext } from "react";
82

93
type Scheme = "_light" | "_dark";
104

11-
const ColorSchemeContext = createContext<{
12-
colorScheme: Scheme;
13-
toggleColorScheme?: () => void;
14-
}>({
15-
colorScheme: "_light",
16-
toggleColorScheme: () => {},
17-
});
5+
const ColorSchemeContext = createContext<Scheme>("_light");
186

197
type Props = {
208
children: ReactNode;
21-
scheme?: Scheme;
9+
value?: Scheme;
2210
};
2311

24-
export function ColorScheme({ children, scheme }: Props) {
25-
const [globalScheme, setGlobalScheme] = useState<Scheme>("_light");
26-
const toggleColorScheme = useCallback(() => {
27-
setGlobalScheme((prev) => (prev === "_light" ? "_dark" : "_light"));
28-
}, []);
29-
12+
export function ColorScheme({ children, value }: Props) {
3013
return (
31-
<ColorSchemeContext.Provider
32-
value={{ colorScheme: scheme ?? globalScheme, toggleColorScheme }}
33-
>
14+
<ColorSchemeContext.Provider value={value ?? "_light"}>
3415
{children}
3516
</ColorSchemeContext.Provider>
3617
);

0 commit comments

Comments
 (0)