@blocklet/theme 2.13.64 → 2.13.66

package/dist/cjs/index.js

@@ -143,6 +143,7 @@ __export(src_exports, {
   DID_CONNECT_THEME_LIGHT: () => DID_CONNECT_THEME_LIGHT,
   buildThemeScript: () => buildThemeScript,
   buildThemeStyles: () => buildThemeStyles,
+  getBlockletThemeOptions: () => getBlockletThemeOptions,
   getDefaultThemePrefer: () => getDefaultThemePrefer,
   isValidThemeMode: () => isValidThemeMode,
   merge: () => merge
@@ -269,22 +270,31 @@ var merge = (x, y) => {
 function isValidThemeMode(mode) {
   return mode === "light" || mode === "dark";
 }
+function getBlockletThemeOptions(mode = "light") {
+  const { common = {}, light = {}, dark = {} } = window.blocklet?.theme || {};
+  if (mode === "dark") {
+    return merge(common, dark);
+  }
+  return merge(common, light);
+}
 function getDefaultThemePrefer(meta) {
+  const blockletInfo = Object.assign({}, window.blocklet, meta);
+  const preferKey = blockletInfo.theme?.preferKey ?? BLOCKLET_THEME_PREFER_KEY;
   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);
+  const sessionPrefer = sessionStorage.getItem(preferKey);
   if (isValidThemeMode(sessionPrefer)) {
     return sessionPrefer;
   }
-  const prefer = Object.assign({}, window.blocklet, meta).theme?.prefer;
+  const prefer = blockletInfo.theme?.prefer;
   if (prefer === "light" || prefer === "dark") {
     return prefer;
   }
   if (prefer === "system") {
-    const localPrefer = localStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
+    const localPrefer = localStorage.getItem(preferKey);
     if (isValidThemeMode(localPrefer)) {
       return localPrefer;
     }
@@ -318,11 +328,10 @@ var buildThemeScript = (theme) => {
     <script id="blocklet-theme-script">
       (function() {
         try {
-          const BLOCKLET_THEME_PREFER_KEY = '${BLOCKLET_THEME_PREFER_KEY}';
           ${isValidThemeMode.toString()}
           ${getDefaultThemePrefer.toString()}
 
-          const prefer = getDefaultThemePrefer(${JSON.stringify({ theme: { prefer: theme?.prefer ?? "light" } })});
+          const prefer = getDefaultThemePrefer(${JSON.stringify({ theme: { prefer: theme?.prefer ?? "light", preferKey: BLOCKLET_THEME_PREFER_KEY } })});
           
           if(prefer === 'dark') {
             document.documentElement.setAttribute('data-theme', 'dark');
@@ -784,21 +793,10 @@ var BLOCKLET_THEME_DARK = merge(BLOCKLET_THEME_LIGHT, {
         }
       }
     },
-    MuiTooltip: {
-      styleOverrides: {
-        tooltip: ({ theme }) => ({
-          backgroundColor: theme.palette.grey[500],
-          color: theme.palette.text.contrast
-        }),
-        arrow: ({ theme }) => ({
-          color: theme.palette.grey[500]
-        })
-      }
-    },
     MuiPaper: {
       styleOverrides: {
-        // 暗色模式下，Paper 使用内阴影营造边框效果
-        root: ({ theme }) => ({
+        // 暗色模式下，Elevation Paper 使用内阴影营造边框效果
+        elevation: ({ theme }) => ({
           boxShadow: `inset 0 0 0 1px ${theme.palette.action.hover}`
         })
       }
@@ -892,6 +890,7 @@ var DID_CONNECT_THEME_DARK = merge(BLOCKLET_THEME_DARK, {
   DID_CONNECT_THEME_LIGHT,
   buildThemeScript,
   buildThemeStyles,
+  getBlockletThemeOptions,
   getDefaultThemePrefer,
   isValidThemeMode,
   merge

package/dist/es/index.js

@@ -247,22 +247,31 @@ var merge = (x, y) => {
 function isValidThemeMode(mode) {
   return mode === "light" || mode === "dark";
 }
+function getBlockletThemeOptions(mode = "light") {
+  const { common = {}, light = {}, dark = {} } = window.blocklet?.theme || {};
+  if (mode === "dark") {
+    return merge(common, dark);
+  }
+  return merge(common, light);
+}
 function getDefaultThemePrefer(meta) {
+  const blockletInfo = Object.assign({}, window.blocklet, meta);
+  const preferKey = blockletInfo.theme?.preferKey ?? BLOCKLET_THEME_PREFER_KEY;
   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);
+  const sessionPrefer = sessionStorage.getItem(preferKey);
   if (isValidThemeMode(sessionPrefer)) {
     return sessionPrefer;
   }
-  const prefer = Object.assign({}, window.blocklet, meta).theme?.prefer;
+  const prefer = blockletInfo.theme?.prefer;
   if (prefer === "light" || prefer === "dark") {
     return prefer;
   }
   if (prefer === "system") {
-    const localPrefer = localStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
+    const localPrefer = localStorage.getItem(preferKey);
     if (isValidThemeMode(localPrefer)) {
       return localPrefer;
     }
@@ -296,11 +305,10 @@ var buildThemeScript = (theme) => {
     <script id="blocklet-theme-script">
       (function() {
         try {
-          const BLOCKLET_THEME_PREFER_KEY = '${BLOCKLET_THEME_PREFER_KEY}';
           ${isValidThemeMode.toString()}
           ${getDefaultThemePrefer.toString()}
 
-          const prefer = getDefaultThemePrefer(${JSON.stringify({ theme: { prefer: theme?.prefer ?? "light" } })});
+          const prefer = getDefaultThemePrefer(${JSON.stringify({ theme: { prefer: theme?.prefer ?? "light", preferKey: BLOCKLET_THEME_PREFER_KEY } })});
           
           if(prefer === 'dark') {
             document.documentElement.setAttribute('data-theme', 'dark');
@@ -762,21 +770,10 @@ var BLOCKLET_THEME_DARK = merge(BLOCKLET_THEME_LIGHT, {
         }
       }
     },
-    MuiTooltip: {
-      styleOverrides: {
-        tooltip: ({ theme }) => ({
-          backgroundColor: theme.palette.grey[500],
-          color: theme.palette.text.contrast
-        }),
-        arrow: ({ theme }) => ({
-          color: theme.palette.grey[500]
-        })
-      }
-    },
     MuiPaper: {
       styleOverrides: {
-        // 暗色模式下，Paper 使用内阴影营造边框效果
-        root: ({ theme }) => ({
+        // 暗色模式下，Elevation Paper 使用内阴影营造边框效果
+        elevation: ({ theme }) => ({
           boxShadow: `inset 0 0 0 1px ${theme.palette.action.hover}`
         })
       }
@@ -869,6 +866,7 @@ export {
   DID_CONNECT_THEME_LIGHT,
   buildThemeScript,
   buildThemeStyles,
+  getBlockletThemeOptions,
   getDefaultThemePrefer,
   isValidThemeMode,
   merge

package/dist/types/index.d.ts

@@ -64,9 +64,11 @@ export declare const DID_CONNECT_THEME_DARK: import("@mui/material/styles").Them
 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 getBlockletThemeOptions(mode?: PaletteMode): ThemeOptions;
 export declare function getDefaultThemePrefer(meta?: {
 	theme: {
 		prefer: "light" | "dark" | "system";
+		preferKey?: string;
 	};
 }): PaletteMode;
 export type ThemeSettings = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "2.13.64",
+  "version": "2.13.66",
   "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": "04f505a6cbdced201553b0f69a4e62db07b1c736"
+  "gitHead": "952f406bac1d36559e581fce848179e12a405282"
 }