@kbach/react 0.2.2 → 0.2.3

package/dist/index.js

@@ -2065,17 +2065,15 @@ function subscribeGlobalDarkMode(callback) {
 
 // src/ThemeProvider.tsx
 var import_jsx_runtime = require("react/jsx-runtime");
-var Appearance;
+var _useColorScheme;
 try {
-  ({ Appearance } = require("react-native"));
+  ({ useColorScheme: _useColorScheme } = require("react-native"));
 } catch {
 }
 var STORAGE_KEY = "kbach-theme";
 function loadPersistedMode() {
   try {
-    if (isWeb) {
-      return localStorage.getItem(STORAGE_KEY);
-    }
+    if (isWeb) return localStorage.getItem(STORAGE_KEY);
     return null;
   } catch {
     return null;
@@ -2106,17 +2104,14 @@ function ThemeProvider({
   const [resolvedConfig, setResolvedConfig] = (0, import_react2.useState)(
     () => configOverride ? buildConfig(configOverride) : getConfig()
   );
-  const getSystemScheme = (0, import_react2.useCallback)(() => {
+  const nativeScheme = _useColorScheme?.();
+  const [webScheme, setWebScheme] = (0, import_react2.useState)(() => {
     if (isWeb && typeof window !== "undefined") {
       return window.matchMedia?.("(prefers-color-scheme: dark)").matches ? "dark" : "light";
     }
-    if (Appearance) {
-      const scheme = Appearance.getColorScheme();
-      return scheme === "dark" ? "dark" : "light";
-    }
     return "light";
-  }, []);
-  const [systemScheme, setSystemScheme] = (0, import_react2.useState)(getSystemScheme);
+  });
+  const systemScheme = isWeb ? webScheme : nativeScheme === "dark" ? "dark" : "light";
   const [mode, _setMode] = (0, import_react2.useState)(() => {
     if (!disablePersistence) {
       const persisted = loadPersistedMode();
@@ -2138,33 +2133,17 @@ function ThemeProvider({
     applyWebTheme(resolvedMode, resolvedConfig.darkMode);
     setGlobalDarkMode(isDark);
   }, [isDark, resolvedMode, resolvedConfig.darkMode]);
-  const setSystemSchemeRef = (0, import_react2.useRef)(setSystemScheme);
-  setSystemSchemeRef.current = setSystemScheme;
+  const setWebSchemeRef = (0, import_react2.useRef)(setWebScheme);
+  setWebSchemeRef.current = setWebScheme;
   (0, import_react2.useEffect)(() => {
-    if (Appearance) {
-      const scheme = Appearance.getColorScheme();
-      if (scheme != null) {
-        setSystemSchemeRef.current(scheme === "dark" ? "dark" : "light");
-      }
-    }
-  }, []);
-  (0, import_react2.useEffect)(() => {
-    if (isWeb && typeof window !== "undefined") {
-      const mq = window.matchMedia?.("(prefers-color-scheme: dark)");
-      if (!mq) return;
-      const handler = (e) => {
-        setSystemSchemeRef.current(e.matches ? "dark" : "light");
-      };
-      mq.addEventListener("change", handler);
-      return () => mq.removeEventListener("change", handler);
-    }
-    if (Appearance) {
-      const sub = Appearance.addChangeListener(({ colorScheme }) => {
-        setSystemSchemeRef.current(colorScheme === "dark" ? "dark" : "light");
-      });
-      return () => sub.remove();
-    }
-    return void 0;
+    if (!isWeb || typeof window === "undefined") return;
+    const mq = window.matchMedia?.("(prefers-color-scheme: dark)");
+    if (!mq) return;
+    const handler = (e) => {
+      setWebSchemeRef.current(e.matches ? "dark" : "light");
+    };
+    mq.addEventListener("change", handler);
+    return () => mq.removeEventListener("change", handler);
   }, []);
   (0, import_react2.useEffect)(() => {
     if (configOverride) return;

package/dist/index.mjs

@@ -39,17 +39,15 @@ import {
   useState
 } from "react";
 import { jsx } from "react/jsx-runtime";
-var Appearance;
+var _useColorScheme;
 try {
-  ({ Appearance } = __require("react-native"));
+  ({ useColorScheme: _useColorScheme } = __require("react-native"));
 } catch {
 }
 var STORAGE_KEY = "kbach-theme";
 function loadPersistedMode() {
   try {
-    if (isWeb) {
-      return localStorage.getItem(STORAGE_KEY);
-    }
+    if (isWeb) return localStorage.getItem(STORAGE_KEY);
     return null;
   } catch {
     return null;
@@ -80,17 +78,14 @@ function ThemeProvider({
   const [resolvedConfig, setResolvedConfig] = useState(
     () => configOverride ? buildConfig(configOverride) : getConfig()
   );
-  const getSystemScheme = useCallback(() => {
+  const nativeScheme = _useColorScheme?.();
+  const [webScheme, setWebScheme] = useState(() => {
     if (isWeb && typeof window !== "undefined") {
       return window.matchMedia?.("(prefers-color-scheme: dark)").matches ? "dark" : "light";
     }
-    if (Appearance) {
-      const scheme = Appearance.getColorScheme();
-      return scheme === "dark" ? "dark" : "light";
-    }
     return "light";
-  }, []);
-  const [systemScheme, setSystemScheme] = useState(getSystemScheme);
+  });
+  const systemScheme = isWeb ? webScheme : nativeScheme === "dark" ? "dark" : "light";
   const [mode, _setMode] = useState(() => {
     if (!disablePersistence) {
       const persisted = loadPersistedMode();
@@ -112,33 +107,17 @@ function ThemeProvider({
     applyWebTheme(resolvedMode, resolvedConfig.darkMode);
     setGlobalDarkMode(isDark);
   }, [isDark, resolvedMode, resolvedConfig.darkMode]);
-  const setSystemSchemeRef = useRef(setSystemScheme);
-  setSystemSchemeRef.current = setSystemScheme;
+  const setWebSchemeRef = useRef(setWebScheme);
+  setWebSchemeRef.current = setWebScheme;
   useEffect(() => {
-    if (Appearance) {
-      const scheme = Appearance.getColorScheme();
-      if (scheme != null) {
-        setSystemSchemeRef.current(scheme === "dark" ? "dark" : "light");
-      }
-    }
-  }, []);
-  useEffect(() => {
-    if (isWeb && typeof window !== "undefined") {
-      const mq = window.matchMedia?.("(prefers-color-scheme: dark)");
-      if (!mq) return;
-      const handler = (e) => {
-        setSystemSchemeRef.current(e.matches ? "dark" : "light");
-      };
-      mq.addEventListener("change", handler);
-      return () => mq.removeEventListener("change", handler);
-    }
-    if (Appearance) {
-      const sub = Appearance.addChangeListener(({ colorScheme }) => {
-        setSystemSchemeRef.current(colorScheme === "dark" ? "dark" : "light");
-      });
-      return () => sub.remove();
-    }
-    return void 0;
+    if (!isWeb || typeof window === "undefined") return;
+    const mq = window.matchMedia?.("(prefers-color-scheme: dark)");
+    if (!mq) return;
+    const handler = (e) => {
+      setWebSchemeRef.current(e.matches ? "dark" : "light");
+    };
+    mq.addEventListener("change", handler);
+    return () => mq.removeEventListener("change", handler);
   }, []);
   useEffect(() => {
     if (configOverride) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kbach/react",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "React / React Native components and hooks for the Kbach framework",
   "source": "./src/index.ts",
   "main": "./dist/index.js",