Skip to content

Fix: useTheme check by removing default context value #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions apps/base-docs/contexts/Theme.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,11 @@ type ThemeContextProps = {
toggleTheme: () => void;
};

export const ThemeContext = createContext<ThemeContextProps>({
theme: 'dark',
toggleTheme: () => {},
});
export const ThemeContext = createContext<ThemeContextProps | null>(null);

export function useTheme() {
const context = useContext(ThemeContext);
if (context === undefined) {
if (!context) {
throw new Error('useTheme must be used within a ThemeProvider');
}
return context;
Expand All @@ -31,27 +28,23 @@ export default function ThemeProvider({ children }: { children: ReactNode }) {
const [theme, setTheme] = useState<Theme>('dark');

const toggleTheme = useCallback(() => {
setTheme((prev) => (prev === 'light' ? 'dark' : 'light'));
document.documentElement.classList.toggle('dark');
}, []);

useEffect(() => {
const rootElement = document.documentElement;
const observer = new MutationObserver(() => {
if (rootElement.classList.contains('dark')) {
setTheme('dark');
} else {
setTheme('light');
}
});

observer.observe(rootElement, {
attributes: true,
attributeFilter: ['class'],
});

if (rootElement.classList.contains('dark')) {
setTheme('dark');
}
if (!rootElement) return;

const updateTheme = () => {
requestAnimationFrame(() => {
setTheme(rootElement.classList.contains('dark') ? 'dark' : 'light');
});
};

const observer = new MutationObserver(updateTheme);
observer.observe(rootElement, { attributes: true, attributeFilter: ['class'] });

updateTheme();

return () => observer.disconnect();
}, []);
Expand Down