@blocklet/theme 3.1.5 → 3.1.6

package/dist/cjs/index.js

@@ -44,21 +44,48 @@ function generateUtilityClasses(componentName, slots, globalStatePrefix = "Mui")
 }
 const alertClasses = generateUtilityClasses("MuiAlert", ["root", "action", "icon", "message", "filled", "colorSuccess", "colorInfo", "colorWarning", "colorError", "filledSuccess", "filledInfo", "filledWarning", "filledError", "outlined", "outlinedSuccess", "outlinedInfo", "outlinedWarning", "outlinedError", "standard", "standardSuccess", "standardInfo", "standardWarning", "standardError"]);
 const BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
-const merge = (x, y) => {
+const arrayOverrides = (_, source) => source;
+const mergeThemeOptions = (x, y = {}) => {
   return deepmerge(x, y, {
     // 采用替换策略合并数组
-    arrayMerge: (_, source) => source
+    arrayMerge: arrayOverrides,
+    // 自定义合并策略，特别处理 styleOverrides 字段
+    customMerge: (key) => {
+      if (key === "styleOverrides") {
+        return (target, source) => {
+          if (!target || !source) {
+            return source || target;
+          }
+          const result = { ...target };
+          for (const [sKey, sVal] of Object.entries(source)) {
+            const tVal = target[sKey];
+            if (tVal && sVal && (typeof tVal === "function" || typeof sVal === "function")) {
+              result[sKey] = (...args) => {
+                const tResult = typeof tVal === "function" ? tVal(...args) : tVal;
+                const sResult = typeof sVal === "function" ? sVal(...args) : sVal;
+                return deepmerge(tResult, sResult, { arrayMerge: arrayOverrides });
+              };
+            } else if (sVal) {
+              result[sKey] = tVal ? deepmerge(tVal, sVal, { arrayMerge: arrayOverrides }) : sVal;
+            }
+          }
+          return result;
+        };
+      }
+      return void 0;
+    }
   });
 };
+const merge = mergeThemeOptions;
 function isValidThemeMode(mode) {
   return mode === "light" || mode === "dark";
 }
 function getBlockletThemeOptions(mode = "light", meta) {
   const { common = {}, light = {}, dark = {} } = meta || window.blocklet?.theme || {};
   if (mode === "dark") {
-    return merge(common, dark);
+    return mergeThemeOptions(common, dark);
   }
-  return merge(common, light);
+  return mergeThemeOptions(common, light);
 }
 function getDefaultThemePrefer(meta) {
   const blockletInfo = Object.assign({}, window.blocklet, meta);
@@ -503,7 +530,7 @@ const BLOCKLET_THEME_LIGHT = {
     }
   }
 };
-const BLOCKLET_THEME_DARK = merge(BLOCKLET_THEME_LIGHT, {
+const BLOCKLET_THEME_DARK = mergeThemeOptions(BLOCKLET_THEME_LIGHT, {
   palette: {
     mode: "dark",
     common: {
@@ -698,10 +725,10 @@ const paletteDark = {
     selected: "rgba(255, 255, 255, 0.16)"
   }
 };
-const DID_CONNECT_THEME_LIGHT = merge(BLOCKLET_THEME_LIGHT, {
+const DID_CONNECT_THEME_LIGHT = mergeThemeOptions(BLOCKLET_THEME_LIGHT, {
   palette: paletteLight
 });
-const DID_CONNECT_THEME_DARK = merge(BLOCKLET_THEME_DARK, {
+const DID_CONNECT_THEME_DARK = mergeThemeOptions(BLOCKLET_THEME_DARK, {
   palette: paletteDark
 });
 exports.BLOCKLET_THEME_DARK = BLOCKLET_THEME_DARK;
@@ -716,3 +743,4 @@ exports.getBlockletThemeOptions = getBlockletThemeOptions;
 exports.getDefaultThemePrefer = getDefaultThemePrefer;
 exports.isValidThemeMode = isValidThemeMode;
 exports.merge = merge;
+exports.mergeThemeOptions = mergeThemeOptions;

package/dist/es/index.js

@@ -42,21 +42,48 @@ function generateUtilityClasses(componentName, slots, globalStatePrefix = "Mui")
 }
 const alertClasses = generateUtilityClasses("MuiAlert", ["root", "action", "icon", "message", "filled", "colorSuccess", "colorInfo", "colorWarning", "colorError", "filledSuccess", "filledInfo", "filledWarning", "filledError", "outlined", "outlinedSuccess", "outlinedInfo", "outlinedWarning", "outlinedError", "standard", "standardSuccess", "standardInfo", "standardWarning", "standardError"]);
 const BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
-const merge = (x, y) => {
+const arrayOverrides = (_, source) => source;
+const mergeThemeOptions = (x, y = {}) => {
   return deepmerge(x, y, {
     // 采用替换策略合并数组
-    arrayMerge: (_, source) => source
+    arrayMerge: arrayOverrides,
+    // 自定义合并策略，特别处理 styleOverrides 字段
+    customMerge: (key) => {
+      if (key === "styleOverrides") {
+        return (target, source) => {
+          if (!target || !source) {
+            return source || target;
+          }
+          const result = { ...target };
+          for (const [sKey, sVal] of Object.entries(source)) {
+            const tVal = target[sKey];
+            if (tVal && sVal && (typeof tVal === "function" || typeof sVal === "function")) {
+              result[sKey] = (...args) => {
+                const tResult = typeof tVal === "function" ? tVal(...args) : tVal;
+                const sResult = typeof sVal === "function" ? sVal(...args) : sVal;
+                return deepmerge(tResult, sResult, { arrayMerge: arrayOverrides });
+              };
+            } else if (sVal) {
+              result[sKey] = tVal ? deepmerge(tVal, sVal, { arrayMerge: arrayOverrides }) : sVal;
+            }
+          }
+          return result;
+        };
+      }
+      return void 0;
+    }
   });
 };
+const merge = mergeThemeOptions;
 function isValidThemeMode(mode) {
   return mode === "light" || mode === "dark";
 }
 function getBlockletThemeOptions(mode = "light", meta) {
   const { common = {}, light = {}, dark = {} } = meta || window.blocklet?.theme || {};
   if (mode === "dark") {
-    return merge(common, dark);
+    return mergeThemeOptions(common, dark);
   }
-  return merge(common, light);
+  return mergeThemeOptions(common, light);
 }
 function getDefaultThemePrefer(meta) {
   const blockletInfo = Object.assign({}, window.blocklet, meta);
@@ -501,7 +528,7 @@ const BLOCKLET_THEME_LIGHT = {
     }
   }
 };
-const BLOCKLET_THEME_DARK = merge(BLOCKLET_THEME_LIGHT, {
+const BLOCKLET_THEME_DARK = mergeThemeOptions(BLOCKLET_THEME_LIGHT, {
   palette: {
     mode: "dark",
     common: {
@@ -696,10 +723,10 @@ const paletteDark = {
     selected: "rgba(255, 255, 255, 0.16)"
   }
 };
-const DID_CONNECT_THEME_LIGHT = merge(BLOCKLET_THEME_LIGHT, {
+const DID_CONNECT_THEME_LIGHT = mergeThemeOptions(BLOCKLET_THEME_LIGHT, {
   palette: paletteLight
 });
-const DID_CONNECT_THEME_DARK = merge(BLOCKLET_THEME_DARK, {
+const DID_CONNECT_THEME_DARK = mergeThemeOptions(BLOCKLET_THEME_DARK, {
   palette: paletteDark
 });
 export {
@@ -714,5 +741,6 @@ export {
   getBlockletThemeOptions,
   getDefaultThemePrefer,
   isValidThemeMode,
-  merge
+  merge,
+  mergeThemeOptions
 };

package/dist/types/util.d.ts

@@ -1,7 +1,9 @@
 import { PaletteMode } from '@mui/material';
 import { BlockletThemeMeta, ThemeOptions } from './types';
 export declare const BLOCKLET_THEME_PREFER_KEY = "blocklet_theme_prefer";
-export declare const merge: <T>(x: T, y: Partial<T>) => T;
+export declare const mergeThemeOptions: (x: ThemeOptions, y?: ThemeOptions) => ThemeOptions;
+/** @deprecated please use mergeThemeOptions instead */
+export declare const merge: (x: ThemeOptions, y?: ThemeOptions) => ThemeOptions;
 export declare function isValidThemeMode(mode: any): mode is PaletteMode;
 export declare function getBlockletThemeOptions(mode?: PaletteMode, meta?: BlockletThemeMeta): ThemeOptions;
 export declare function getDefaultThemePrefer(meta?: {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "A preset MUI-based theme configuration designed for use with Blocklet.",
   "main": "dist/cjs/index.js",
   "module": "dist/es/index.js",
@@ -44,5 +44,5 @@
     "ts-jest": "^29.4.0",
     "typescript": "~5.5.4"
   },
-  "gitHead": "1ed5a2051033d58cbdbfea5a439f49c7508b97f6"
+  "gitHead": "d3267421c4d35038b226d34edc0e7bc943c5c926"
 }