@blocklet/theme 2.13.53 → 2.13.55

package/dist/cjs/index.js

@@ -140,7 +140,10 @@ __export(src_exports, {
   BLOCKLET_THEME_PREFER_KEY: () => BLOCKLET_THEME_PREFER_KEY,
   DEFAULT_FONTS: () => DEFAULT_FONTS,
   DID_CONNECT_THEME_DARK: () => DID_CONNECT_THEME_DARK,
-  DID_CONNECT_THEME_LIGHT: () => DID_CONNECT_THEME_LIGHT
+  DID_CONNECT_THEME_LIGHT: () => DID_CONNECT_THEME_LIGHT,
+  getDefaultThemePrefer: () => getDefaultThemePrefer,
+  isValidThemeMode: () => isValidThemeMode,
+  merge: () => merge
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -254,15 +257,41 @@ function alpha(color, value) {
 
 // src/util.ts
 var import_deepmerge = __toESM(require_cjs());
+var BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
 var merge = (x, y) => {
   return (0, import_deepmerge.default)(x, y, {
     // 采用替换策略合并数组
     arrayMerge: (_, source) => source
   });
 };
+function isValidThemeMode(mode) {
+  return mode === "light" || mode === "dark";
+}
+function getDefaultThemePrefer(meta) {
+  const urlParams = new URLSearchParams(window.location.search);
+  const urlPrefer = urlParams.get("theme");
+  if (isValidThemeMode(urlPrefer)) {
+    return urlPrefer;
+  }
+  const sessionPrefer = sessionStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
+  if (isValidThemeMode(sessionPrefer)) {
+    return sessionPrefer;
+  }
+  const prefer = Object.assign({}, window.blocklet, meta).theme?.prefer;
+  if (prefer === "light" || prefer === "dark") {
+    return prefer;
+  }
+  if (prefer === "system") {
+    const localPrefer = localStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
+    if (isValidThemeMode(localPrefer)) {
+      return localPrefer;
+    }
+    return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+  }
+  return "light";
+}
 
 // src/blocklet.ts
-var BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
 var DEFAULT_FONTS = ["Roboto", "Helvetica", "Arial", "sans-serif"];
 var shadows = [
   "none",
@@ -821,5 +850,8 @@ var DID_CONNECT_THEME_DARK = merge(BLOCKLET_THEME_DARK, {
   BLOCKLET_THEME_PREFER_KEY,
   DEFAULT_FONTS,
   DID_CONNECT_THEME_DARK,
-  DID_CONNECT_THEME_LIGHT
+  DID_CONNECT_THEME_LIGHT,
+  getDefaultThemePrefer,
+  isValidThemeMode,
+  merge
 });

package/dist/es/index.js

@@ -237,15 +237,41 @@ function alpha(color, value) {
 
 // src/util.ts
 var import_deepmerge = __toESM(require_cjs());
+var BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
 var merge = (x, y) => {
   return (0, import_deepmerge.default)(x, y, {
     // 采用替换策略合并数组
     arrayMerge: (_, source) => source
   });
 };
+function isValidThemeMode(mode) {
+  return mode === "light" || mode === "dark";
+}
+function getDefaultThemePrefer(meta) {
+  const urlParams = new URLSearchParams(window.location.search);
+  const urlPrefer = urlParams.get("theme");
+  if (isValidThemeMode(urlPrefer)) {
+    return urlPrefer;
+  }
+  const sessionPrefer = sessionStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
+  if (isValidThemeMode(sessionPrefer)) {
+    return sessionPrefer;
+  }
+  const prefer = Object.assign({}, window.blocklet, meta).theme?.prefer;
+  if (prefer === "light" || prefer === "dark") {
+    return prefer;
+  }
+  if (prefer === "system") {
+    const localPrefer = localStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
+    if (isValidThemeMode(localPrefer)) {
+      return localPrefer;
+    }
+    return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+  }
+  return "light";
+}
 
 // src/blocklet.ts
-var BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
 var DEFAULT_FONTS = ["Roboto", "Helvetica", "Arial", "sans-serif"];
 var shadows = [
   "none",
@@ -803,5 +829,8 @@ export {
   BLOCKLET_THEME_PREFER_KEY,
   DEFAULT_FONTS,
   DID_CONNECT_THEME_DARK,
-  DID_CONNECT_THEME_LIGHT
+  DID_CONNECT_THEME_LIGHT,
+  getDefaultThemePrefer,
+  isValidThemeMode,
+  merge
 };

package/dist/types/index.d.ts

@@ -53,7 +53,6 @@ declare module "@mui/material/styles/createTypography" {
 		color?: Record<string, string>;
 	}
 }
-export declare const BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
 export declare const DEFAULT_FONTS: string[];
 /**
  * figma: https://www.figma.com/file/1qHyMF137EXOQpSFVByszG/UX-Library?node-id=295%3A1518
@@ -62,6 +61,14 @@ export declare const BLOCKLET_THEME_LIGHT: ThemeOptions;
 export declare const BLOCKLET_THEME_DARK: ThemeOptions;
 export declare const DID_CONNECT_THEME_LIGHT: import("@mui/material/styles").ThemeOptions;
 export declare const DID_CONNECT_THEME_DARK: import("@mui/material/styles").ThemeOptions;
+export declare const BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
+export declare const merge: <T>(x: T, y: Partial<T>) => T;
+export declare function isValidThemeMode(mode: any): mode is PaletteMode;
+export declare function getDefaultThemePrefer(meta?: {
+	theme: {
+		prefer: "light" | "dark" | "system";
+	};
+}): PaletteMode;
 
 export {
 	Theme,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.13.53",
+  "version": "2.13.55",
   "description": "A preset MUI-based theme configuration designed for use with Blocklet.",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -55,5 +55,5 @@
     "ts-jest": "^29.1.2",
     "typescript": "~5.5.4"
   },
-  "gitHead": "02906cfcf1ed344c4c24587177fa2bcdd071954d"
+  "gitHead": "fd8de005ce497660cbf1ea7378cf0d725b45fe87"
 }