ThemeProvider nitpicks

src/components/ThemeProvider.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from "react"
-import { Theme, ThemeProviderContext } from "@/lib/theme-context"
+import { type Theme, ThemeContext } from "@/lib/ThemeContext"
 
 type ThemeProviderProps = {
   children: React.ReactNode
@@ -61,9 +61,9 @@ export function ThemeProvider({
   }
 
   return (
-    <ThemeProviderContext.Provider {...props} value={value}>
+    <ThemeContext.Provider {...props} value={value}>
       {children}
-    </ThemeProviderContext.Provider>
+    </ThemeContext.Provider>
   )
 }
 

src/hooks/useTheme.ts

@@ -1,11 +1,13 @@
 import { useContext } from "react"
-import { ThemeProviderContext } from "@/lib/theme-context"
+import { ThemeContext, type ThemeContextType } from "@/lib/ThemeContext"
 
-export const useTheme = () => {
+/** Hook to get and set the active theme. */
-  const context = useContext(ThemeProviderContext)
+export function useTheme(): ThemeContextType {
+  const context = useContext(ThemeContext);
 
-  if (context === undefined)
+  if (!context) {
-    throw new Error("useTheme must be used within a ThemeProvider")
+    throw new Error("useTheme must be used within a ThemeProvider");
-
+  }
-  return context
+
+  return context;
 }

src/lib/ThemeContext.ts

@@ -0,0 +1,15 @@
+import { createContext } from "react";
+
+export type Theme = "dark" | "light" | "system";
+
+export type ThemeContextType = {
+  theme: Theme;
+  setTheme: (theme: Theme) => void;
+};
+
+const initialState: ThemeContextType = {
+  theme: "system",
+  setTheme: () => undefined,
+};
+
+export const ThemeContext = createContext<ThemeContextType>(initialState);

src/lib/theme-context.ts

@@ -1,15 +0,0 @@
-import { createContext } from "react";
-
-export type Theme = "dark" | "light" | "system";
-
-export type ThemeProviderState = {
-  theme: Theme;
-  setTheme: (theme: Theme) => void;
-};
-
-const initialState: ThemeProviderState = {
-  theme: "system",
-  setTheme: () => null,
-};
-
-export const ThemeProviderContext = createContext<ThemeProviderState>(initialState);