ph-utils 0.9.0 → 0.9.2

package/lib/theme.d.ts

@@ -1,16 +1,16 @@
 /** 获取当前系统的主题 */
-export declare function getSystemTheme(): "dark" | "light";
+export declare function getSystemTheme(): "dark" | "light" | "auto";
 /**
  * 初始化主题, 让网页能够适应系统主题, 同时根据缓存的主题切换主题
  * @returns 当前应用的主题
  */
-export declare function initTheme(): Promise<"dark" | "light">;
+export declare function initTheme(): Promise<"dark" | "light" | "auto">;
 /**
  * 切换主题, 通常用于预览
  * @param theme 切换的主题
  * @returns 切换后的主题
  */
-export declare function toggleTheme(theme?: "light" | "dark" | "auto"): Promise<"dark" | "light">;
+export declare function toggleTheme(theme?: "light" | "dark" | "auto"): Promise<"dark" | "light" | "auto">;
 /** 获取当前主题 */
 export declare function getTheme(): string;
 /**
@@ -19,7 +19,7 @@ export declare function getTheme(): string;
  * @param cache 是否缓存应用的主题, 让应用下一次启动的时候, 可以应用主题, 默认: true
  * @returns 应用的主题
  */
-export declare function applyTheme(theme?: "light" | "dark" | "auto", cache?: boolean): Promise<"dark" | "light">;
+export declare function applyTheme(theme?: "light" | "dark" | "auto", cache?: boolean): Promise<"dark" | "light" | "auto">;
 /** 获取当前主题色 */
 export declare function getColorTheme(defaultValue?: string): string | undefined;
 /**

package/lib/theme.js

@@ -4,7 +4,10 @@ export function getSystemTheme() {
     if (window.matchMedia("(prefers-color-scheme: dark)").matches) {
         return "dark";
     }
-    return "light";
+    else if (window.matchMedia("(prefers-color-scheme: light)").matches) {
+        return "light";
+    }
+    return "auto";
 }
 /**
  * 初始化主题, 让网页能够适应系统主题, 同时根据缓存的主题切换主题
@@ -33,10 +36,10 @@ export async function initTheme() {
  * @returns 切换后的主题
  */
 export async function toggleTheme(theme) {
-    if (theme !== "light" && theme !== "dark") {
+    const classList = document.documentElement.classList;
+    if (theme == null) {
         theme = getSystemTheme();
     }
-    const classList = document.documentElement.classList;
     if (theme === "light") {
         classList.add("light");
         classList.remove("dark");
@@ -45,6 +48,9 @@ export async function toggleTheme(theme) {
         classList.add("dark");
         classList.remove("light");
     }
+    else {
+        classList.remove("light", "dark");
+    }
     return theme;
 }
 /** 获取当前主题 */

package/package.json

@@ -64,7 +64,7 @@
     },
     "./*": "./lib/*"
   },
-  "version": "0.9.0",
+  "version": "0.9.2",
   "type": "module",
   "repository": {
     "type": "git",