@arcblock/ux 3.1.5 → 3.1.7

package/lib/Theme/index.js

@@ -1,25 +1,27 @@
-import { styled as s } from "@mui/material";
+import { styled as m } from "@mui/material";
 import { useTheme as h } from "@mui/material";
-import { collectFontFamilies as c, create as f, createDefaultThemeOptions as i, createTheme as n, isTheme as T, isUxTheme as x, lazyCreateDefaultTheme as p, loadFonts as F } from "./theme.js";
-import { ColorSchemeContext as y, default as C, useColorScheme as w } from "./theme-provider.js";
-import { deepmerge as S } from "@mui/utils";
-const o = (e) => e.startsWith("$"), m = (e, r) => s(e, {
+import { collectFontFamilies as f, create as i, createDefaultThemeOptions as n, createTheme as c, isTheme as p, isUxTheme as T, lazyCreateDefaultTheme as x, loadFonts as F } from "./theme.js";
+import { ColorSchemeContext as y, default as C, useColorScheme as g } from "./theme-provider.js";
+import { mergeThemeOptions as D } from "@blocklet/theme";
+import { deepmergeAll as S } from "../Util/index.js";
+const t = (e) => e.startsWith("$"), a = (e, r) => m(e, {
   ...r,
-  shouldForwardProp: (t) => r?.shouldForwardProp ? r.shouldForwardProp(t) && !o(t) : !o(t)
+  shouldForwardProp: (o) => r?.shouldForwardProp ? r.shouldForwardProp(o) && !t(o) : !t(o)
 });
 export {
   y as ColorSchemeContext,
   C as ThemeProvider,
-  c as collectFontFamilies,
-  f as create,
-  i as createDefaultThemeOptions,
-  n as createTheme,
-  S as deepmerge,
-  T as isTheme,
-  x as isUxTheme,
-  p as lazyCreateDefaultTheme,
+  f as collectFontFamilies,
+  i as create,
+  n as createDefaultThemeOptions,
+  c as createTheme,
+  D as deepmerge,
+  S as deepmergeAll,
+  p as isTheme,
+  T as isUxTheme,
+  x as lazyCreateDefaultTheme,
   F as loadFonts,
-  m as styled,
-  w as useColorScheme,
+  a as styled,
+  g as useColorScheme,
   h as useTheme
 };

package/lib/Theme/theme.d.ts

@@ -1,6 +1,6 @@
 import { PaletteMode } from '@mui/material';
-import { deepmerge } from '@mui/utils';
-import { ThemeOptions, Theme } from '@blocklet/theme';
+import { mergeThemeOptions as deepmerge, ThemeOptions, Theme } from '@blocklet/theme';
+import { deepmergeAll } from '../Util';
 /** 是否是 MUI Theme 对象 */
 export declare function isTheme(obj: any): obj is Theme;
 /** 是否是 UX Theme 对象 */
@@ -16,4 +16,4 @@ export interface UxThemeOptions extends ThemeOptions {
 export declare function lazyCreateDefaultTheme(mode: PaletteMode): () => Theme;
 export declare const create: (...args: Array<UxThemeOptions | ((baseTheme: Theme) => UxThemeOptions)>) => Theme;
 export declare const createTheme: (...args: Array<UxThemeOptions | ((baseTheme: Theme) => UxThemeOptions)>) => Theme;
-export { deepmerge };
+export { deepmerge, deepmergeAll };

package/lib/Theme/theme.js

@@ -1,8 +1,7 @@
 import { createTheme as p, responsiveFontSizes as O } from "@mui/material";
-import { deepmerge as f } from "@mui/utils";
-import { deepmerge as V } from "@mui/utils";
 import _ from "webfontloader";
-import { DEFAULT_FONTS as b, getDefaultThemePrefer as C, getBlockletThemeOptions as d, BLOCKLET_THEME_DARK as k, BLOCKLET_THEME_LIGHT as x } from "@blocklet/theme";
+import { DEFAULT_FONTS as b, getDefaultThemePrefer as C, mergeThemeOptions as f, getBlockletThemeOptions as d, BLOCKLET_THEME_DARK as k, BLOCKLET_THEME_LIGHT as x } from "@blocklet/theme";
+import { mergeThemeOptions as Q } from "@blocklet/theme";
 import { deepmergeAll as A, cleanedObj as l } from "../Util/index.js";
 import "@fontsource/roboto/latin-400.css";
 import "@fontsource/roboto/latin-500.css";
@@ -13,7 +12,7 @@ import "@fontsource/roboto/latin-ext-700.css";
 function E(e) {
   return e && typeof e == "object" && e.palette && typeof e.palette.getContrastText == "function";
 }
-function W(e) {
+function R(e) {
   return E(e) && e.__isUxTheme__ === !0;
 }
 function h(e, t = /* @__PURE__ */ new Set()) {
@@ -21,22 +20,22 @@ function h(e, t = /* @__PURE__ */ new Set()) {
     typeof o == "object" && h(o, t);
   })), t;
 }
-const s = new Set(b.concat("inherit"));
+const c = new Set(b.concat("inherit"));
 function D(e) {
-  const t = e.filter((r) => !s.has(r));
+  const t = e.filter((n) => !c.has(n));
   if (t.length === 0)
     return Promise.resolve(!0);
-  t.forEach((r) => s.add(r));
+  t.forEach((n) => c.add(n));
   const o = t.length - 1;
-  return t[o] = `${t[o]}&display=swap`, new Promise((r) => {
+  return t[o] = `${t[o]}&display=swap`, new Promise((n) => {
     _.load({
       google: {
         families: t
       },
-      active: () => r(!0),
-      inactive: () => r(!0),
-      fontinactive: (n, i) => {
-        s.delete(n), console.warn(`font ${n} ${i} download failed`);
+      active: () => n(!0),
+      inactive: () => n(!0),
+      fontinactive: (r, i) => {
+        c.delete(r), console.warn(`font ${r} ${i} download failed`);
       }
     });
   });
@@ -52,13 +51,13 @@ function w(e) {
     return t = p(o), t;
   };
 }
-const m = ({ palette: e, components: t, overrides: o, ...r }) => ({
+const m = ({ palette: e, components: t, overrides: o, ...n }) => ({
   palette: e,
   components: {
     ...o,
     ...t
   },
-  ...r
+  ...n
 }), v = {
   themeName: "ArcBlock",
   pageWidth: "md",
@@ -85,21 +84,21 @@ const m = ({ palette: e, components: t, overrides: o, ...r }) => ({
     lightGrey: "#BCBCBC"
   }
 }, L = (...e) => {
-  const t = C(), o = w(t), r = e.reduce(
-    (B, c) => f(B, m(typeof c == "function" ? c(o()) : c)),
+  const t = C(), o = w(t), n = e.reduce(
+    (B, s) => f(B, m(typeof s == "function" ? s(o()) : s)),
     m(v)
-  ), n = r.mode || r.palette?.mode || t, i = d(n), T = u(n), { disableBlockletTheme: F } = r, g = A(
+  ), r = n.mode || n.palette?.mode || t, i = d(r), T = u(r), { disableBlockletTheme: g } = n, F = A(
     [
       T,
-      !F && l(i),
-      l(r),
+      !g && l(i),
+      l(n),
       // 确保 mode 跟 prefer 一致
       {
-        mode: n,
-        palette: { mode: n }
+        mode: r,
+        palette: { mode: r }
       }
     ].filter(Boolean)
-  ), a = p(g);
+  ), a = p(F);
   a.__isUxTheme__ = !0;
   const y = h(a.typography);
   return D(Array.from(y)), O(a, {
@@ -122,15 +121,16 @@ const m = ({ palette: e, components: t, overrides: o, ...r }) => ({
       "overline"
     ]
   });
-}, q = L;
+}, W = L;
 export {
   h as collectFontFamilies,
   L as create,
   u as createDefaultThemeOptions,
-  q as createTheme,
-  V as deepmerge,
+  W as createTheme,
+  Q as deepmerge,
+  A as deepmergeAll,
   E as isTheme,
-  W as isUxTheme,
+  R as isUxTheme,
   w as lazyCreateDefaultTheme,
   D as loadFonts
 };

package/lib/Util/index.d.ts

@@ -1,5 +1,5 @@
+import { ThemeOptions } from '@blocklet/theme';
 import { default as Cookies } from 'js-cookie';
-import { DeepmergeOptions } from '@mui/utils/deepmerge';
 import { $TSFixMe, Locale } from '../type';
 declare let dateTool: $TSFixMe | null;
 /** 是否常见二段式顶级域名 */
@@ -106,9 +106,8 @@ export declare const cleanedObj: (obj: object) => import('lodash').Dictionary<an
 export declare function hexToRgba(hex: string, alpha?: number): string;
 /**
  * 依次对数组中的对象进行深度合并
- * @param objects - 需要合并的对象数组
- * @param options - deepmerge 的配置选项
+ * @param objects - 需要合并的主题配置对象数组
  * @returns 合并后的对象
  */
-export declare function deepmergeAll<T>(objects: T[], options?: DeepmergeOptions): T;
+export declare function deepmergeAll(objects: ThemeOptions[]): ThemeOptions;
 export {};

package/lib/Util/index.js

@@ -1,16 +1,16 @@
 import { lazy as E } from "react";
 import u from "lodash/padStart";
 import { colors as g, getDIDMotifInfo as x } from "@arcblock/did-motif";
+import { mergeThemeOptions as k } from "@blocklet/theme";
 import y from "lodash/isNil";
-import k from "lodash/omitBy";
-import A from "p-retry";
+import A from "lodash/omitBy";
+import F from "p-retry";
 import l from "js-cookie";
-import F from "color-convert";
-import U from "@mui/utils/deepmerge";
+import O from "color-convert";
 import a from "dayjs";
 import "dayjs/locale/zh-cn";
-import j from "dayjs/plugin/utc";
-import O from "dayjs/plugin/timezone";
+import U from "dayjs/plugin/utc";
+import j from "dayjs/plugin/timezone";
 import R from "dayjs/plugin/relativeTime";
 import W from "dayjs/plugin/updateLocale";
 import L from "dayjs/plugin/localizedFormat";
@@ -23,27 +23,27 @@ function z(t) {
     return !1;
   const e = t.split(".");
   if (e.length < 2) return !1;
-  const r = e[e.length - 2], n = e[e.length - 1];
-  return V.has(r) && _.has(n);
+  const n = e[e.length - 2], r = e[e.length - 1];
+  return V.has(n) && _.has(r);
 }
 function mt() {
   const { host: t } = window.location;
   if (!t || M.test(t))
     return "";
-  const r = t.split(":")[0].split(".");
-  if (r.length === 1)
+  const n = t.split(":")[0].split(".");
+  if (n.length === 1)
     return "";
-  if (r.length > 2) {
-    const n = r.slice(-2).join(".");
-    if (z(n))
-      return `.${r.slice(-3).join(".")}`;
+  if (n.length > 2) {
+    const r = n.slice(-2).join(".");
+    if (z(r))
+      return `.${n.slice(-3).join(".")}`;
   }
-  return `.${r.slice(-2).join(".")}`;
+  return `.${n.slice(-2).join(".")}`;
 }
 function dt(t) {
-  return t.replace(/^\?/, "").split("&").map((e) => e.split("=")).filter(([e]) => !!e).reduce((e, r) => {
-    const n = r[0], i = decodeURIComponent(r[1]) || !0;
-    return e[n] = i, e;
+  return t.replace(/^\?/, "").split("&").map((e) => e.split("=")).filter(([e]) => !!e).reduce((e, n) => {
+    const r = n[0], i = decodeURIComponent(n[1]) || !0;
+    return e[r] = i, e;
   }, {});
 }
 function pt(t = {}) {
@@ -52,7 +52,7 @@ function pt(t = {}) {
 function ht(t = 1) {
   let e = t;
   typeof e == "number" && (e = { expireInDays: e }), e.path === void 0 && (e.path = "/"), e.expireInDays || (e.expireInDays = 1);
-  const r = {
+  const n = {
     expires: e.expireInDays,
     path: e.path,
     domain: e.domain || "",
@@ -60,22 +60,22 @@ function ht(t = 1) {
     // 允许自定义设置为 false，默认是 true
     secure: e.secure !== !1
   };
-  return (typeof window > "u" || e.domain || e.returnDomain === !1) && e.returnDomain === !1 && delete r.domain, r;
+  return (typeof window > "u" || e.domain || e.returnDomain === !1) && e.returnDomain === !1 && delete n.domain, n;
 }
 const gt = (t) => t.color ? t.color : t.dark ? t.theme.palette.common.white : t.theme.palette.text.primary, wt = (t) => t.background ? t.background : t.dark ? t.theme.palette.common.black : t.theme.palette.common.white;
-function yt(t, e, r = []) {
-  const n = Object.assign({}, t), i = e.defaultProps || {};
+function yt(t, e, n = []) {
+  const r = Object.assign({}, t), i = e.defaultProps || {};
   return Object.keys(i).forEach((o) => {
-    typeof n[o] == "string" && n[o].indexOf("::prop::") === 0 && (n[o] = i[o]);
-  }), Array.isArray(r) && r.forEach((o) => {
-    if (typeof n[o] == "string")
+    typeof r[o] == "string" && r[o].indexOf("::prop::") === 0 && (r[o] = i[o]);
+  }), Array.isArray(n) && n.forEach((o) => {
+    if (typeof r[o] == "string")
       try {
-        n[o] = JSON.parse(n[o]);
+        r[o] = JSON.parse(r[o]);
       } catch {
       }
-  }), Object.keys(n).forEach((o) => {
-    typeof n[o] == "string" && n[o].indexOf("::prop::") === 0 && (n[o] = "");
-  }), n;
+  }), Object.keys(r).forEach((o) => {
+    typeof r[o] == "string" && r[o].indexOf("::prop::") === 0 && (r[o] = "");
+  }), r;
 }
 function It(t = 2017) {
   const e = (/* @__PURE__ */ new Date()).getFullYear();
@@ -83,17 +83,17 @@ function It(t = 2017) {
 }
 const Dt = () => typeof Intl == "object" && typeof Intl.DateTimeFormat == "function" && typeof Intl.DateTimeFormat().resolvedOptions == "function" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "", bt = (t) => {
   let e = 0;
-  for (let n = 0; n < t.length; n++)
-    e = t.charCodeAt(n) + ((e << 5) - e);
-  let r = "#";
-  for (let n = 0; n < 3; n++) {
-    const i = e >> n * 8 & 255;
-    r += `00${i.toString(16)}`.substr(-2);
+  for (let r = 0; r < t.length; r++)
+    e = t.charCodeAt(r) + ((e << 5) - e);
+  let n = "#";
+  for (let r = 0; r < 3; r++) {
+    const i = e >> r * 8 & 255;
+    n += `00${i.toString(16)}`.substr(-2);
   }
-  return r;
+  return n;
 }, $t = (t) => {
-  const e = Math.round(t / 1e3), r = Math.floor(e / 3600), n = Math.floor((e - r * 3600) / 60), i = e % 60;
-  return `${u(r, 2, "0")}:${u(n, 2, "0")}:${u(i, 2, "0")}`;
+  const e = Math.round(t / 1e3), n = Math.floor(e / 3600), r = Math.floor((e - n * 3600) / 60), i = e % 60;
+  return `${u(n, 2, "0")}:${u(r, 2, "0")}:${u(i, 2, "0")}`;
 };
 function B(t) {
   f = t;
@@ -101,8 +101,8 @@ function B(t) {
 function Tt() {
   return f;
 }
-const I = (t) => (e, { locale: r, tz: n, isUtc: i } = {}) => {
-  if (f === null && (a.extend(L), a.extend(j), a.extend(O), a.extend(W), a.extend(R), a.updateLocale("zh-cn", {
+const I = (t) => (e, { locale: n, tz: r, isUtc: i } = {}) => {
+  if (f === null && (a.extend(L), a.extend(U), a.extend(j), a.extend(W), a.extend(R), a.updateLocale("zh-cn", {
     // copy with https://github.com/iamkun/dayjs/blob/dev/src/locale/zh-cn.js
     relativeTime: {
       future: "%s后",
@@ -122,18 +122,18 @@ const I = (t) => (e, { locale: r, tz: n, isUtc: i } = {}) => {
   }), B(a)), y(e) || e === "")
     return "-";
   let o = f(e);
-  return n && (o = o.tz(n)), i && (o = o.utc()), typeof r < "u" && (o = o.locale(r)), o.format(t);
+  return r && (o = o.tz(r)), i && (o = o.utc()), typeof n < "u" && (o = o.locale(n)), o.format(t);
 };
-function St(t, { locale: e = "en", tz: r } = {}) {
-  return I("ll")(t, { locale: e, tz: r });
+function St(t, { locale: e = "en", tz: n } = {}) {
+  return I("ll")(t, { locale: e, tz: n });
 }
 function Et(t, {
   locale: e = "en",
-  tz: r,
-  isUtc: n = !1,
+  tz: n,
+  isUtc: r = !1,
   format: i = "lll"
 } = {}) {
-  return I(i)(t, { locale: e, tz: r, isUtc: n });
+  return I(i)(t, { locale: e, tz: n, isUtc: r });
 }
 function N() {
   const t = window?.ABT_DEV || window.ABT;
@@ -142,8 +142,8 @@ function N() {
 function xt({
   webWalletUrl: t,
   action: e = "login",
-  locale: r = "en",
-  url: n,
+  locale: n = "en",
+  url: r,
   windowFeatures: i,
   appInfo: o,
   memberAppInfo: p
@@ -152,8 +152,8 @@ function xt({
   if (h)
     return h.open({
       action: e,
-      locale: r,
-      url: encodeURIComponent(n),
+      locale: n,
+      url: encodeURIComponent(r),
       appInfo: {
         ...o
       },
@@ -171,7 +171,7 @@ function xt({
     // iphone 8plus size
     width: 414,
     height: 736
-  }, b = `${t}?action=${e}&locale=${r}&url=${encodeURIComponent(n)}`, c = Object.assign({}, D, i), $ = (s) => s.innerWidth || s.document.documentElement.clientWidth || s.document.body.clientWidth;
+  }, b = `${t}?action=${e}&locale=${n}&url=${encodeURIComponent(r)}`, c = Object.assign({}, D, i), $ = (s) => s.innerWidth || s.document.documentElement.clientWidth || s.document.body.clientWidth;
   if (!("left" in c)) {
     const s = $(window.top || window), S = window.screenLeft || window.screenX;
     c.left = s + S - c.width;
@@ -190,10 +190,10 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
   if (!e)
     return t;
   try {
-    const r = new URL(t, window.location.origin);
-    return Object.keys(e).forEach((n) => {
-      r.searchParams.set(n, String(e[n]));
-    }), r.origin === window.location.origin ? r.pathname + r.search : r.href;
+    const n = new URL(t, window.location.origin);
+    return Object.keys(e).forEach((r) => {
+      n.searchParams.set(r, String(e[r]));
+    }), n.origin === window.location.origin ? n.pathname + n.search : n.href;
   } catch {
     return t;
   }
@@ -205,7 +205,7 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
   setTimeout(() => {
     e();
   }, t);
-}), Ut = (t) => /^https?:\/\//.test(t), m = "vid", d = "__visitor_id", Q = () => l.get(m) || localStorage.getItem(d), w = (t) => {
+}), Ot = (t) => /^https?:\/\//.test(t), m = "vid", d = "__visitor_id", Q = () => l.get(m) || localStorage.getItem(d), w = (t) => {
   t === null ? l.remove(m, {
     sameSite: "None",
     secure: !0
@@ -214,7 +214,7 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
     secure: !0,
     expires: 365
   });
-}, jt = () => {
+}, Ut = () => {
   let t = localStorage.getItem(d);
   if (t && (localStorage.removeItem(d), w(t)), !Q()) {
     if (!C())
@@ -226,15 +226,15 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
           if (window.crypto && typeof window.crypto.getRandomValues == "function")
             window.crypto.getRandomValues(e);
           else
-            for (let n = 0; n < 16; n++)
-              e[n] = Math.floor(Math.random() * 256);
-          const r = Array.from(e).map((n) => n.toString(16).padStart(2, "0"));
+            for (let r = 0; r < 16; r++)
+              e[r] = Math.floor(Math.random() * 256);
+          const n = Array.from(e).map((r) => r.toString(16).padStart(2, "0"));
           t = [
-            r.slice(0, 4).join(""),
-            r.slice(4, 6).join(""),
-            r.slice(6, 8).join(""),
-            r.slice(8, 10).join(""),
-            r.slice(10, 16).join("")
+            n.slice(0, 4).join(""),
+            n.slice(4, 6).join(""),
+            n.slice(6, 8).join(""),
+            n.slice(8, 10).join(""),
+            n.slice(10, 16).join("")
           ].join("-");
         }
       } catch {
@@ -242,11 +242,11 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
       }
     t && w(t);
   }
-}, Ot = (t) => {
+}, jt = (t) => {
   if (X(t)) {
     const e = Uint8Array.from(
-      t.slice(2).match(/.{1,2}/g).map((r) => parseInt(r, 16))
-    ).slice(0, 8).reduce((r, n) => r + n, 0) % g.length;
+      t.slice(2).match(/.{1,2}/g).map((n) => parseInt(n, 16))
+    ).slice(0, 8).reduce((n, r) => n + r, 0) % g.length;
     return g[e];
   }
   try {
@@ -254,14 +254,14 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
   } catch {
     return null;
   }
-}, Rt = (t, e, r = {}) => {
-  const { fallbackLocale: n = "en", defaultValue: i = "unknown" } = r;
+}, Rt = (t, e, n = {}) => {
+  const { fallbackLocale: r = "en", defaultValue: i = "unknown" } = n;
   if (typeof t == "string")
     return t;
   let o;
-  return e && (o = t[e]), (!o || typeof o != "string") && (o = t[n]), (!o || typeof o != "string") && (o = i), o;
+  return e && (o = t[e]), (!o || typeof o != "string") && (o = t[r]), (!o || typeof o != "string") && (o = i), o;
 }, Wt = (t) => E(
-  () => A(
+  () => F(
     async () => {
       try {
         return await t();
@@ -272,22 +272,22 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
     // 只需要重试两次，加上原本的一次，总共三次
     { retries: 2 }
   )
-), Lt = (t) => k(t, y);
+), Lt = (t) => A(t, y);
 function Pt(t, e = 1) {
-  const [r, n, i] = F.hex.rgb(t);
-  return `rgba(${r}, ${n}, ${i}, ${e})`;
+  const [n, r, i] = O.hex.rgb(t);
+  return `rgba(${n}, ${r}, ${i}, ${e})`;
 }
-function vt(t, e) {
+function vt(t) {
   if (!Array.isArray(t))
     throw new Error("First argument should be an array");
-  return t.length === 0 ? {} : t.length === 1 ? t[0] : t.reduce((r, n) => U(r, n, e));
+  return t.length === 0 ? {} : t.length === 1 ? t[0] : t.reduce((e, n) => k(e, n));
 }
 export {
   K as appendParams,
   Lt as cleanedObj,
   vt as deepmergeAll,
   N as detectWalletExtension,
-  jt as ensureVisitorId,
+  Ut as ensureVisitorId,
   St as formatToDate,
   Et as formatToDatetime,
   $t as formatUptime,
@@ -295,7 +295,7 @@ export {
   gt as getColor,
   ht as getCookieOptions,
   It as getCopyright,
-  Ot as getDIDColor,
+  jt as getDIDColor,
   Tt as getDateTool,
   kt as getFontSize,
   Dt as getTimezone,
@@ -305,7 +305,7 @@ export {
   Pt as hexToRgba,
   X as isEthereumDid,
   z as isTwoSegmentTLD,
-  Ut as isUrl,
+  Ot as isUrl,
   Wt as lazyRetry,
   yt as mergeProps,
   xt as openWebWallet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -35,12 +35,18 @@
   },
   "devDependencies": {
     "@arcblock/ux": "workspace:*",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/preset-env": "^7.28.0",
+    "@babel/preset-react": "^7.27.1",
+    "@babel/preset-typescript": "^7.27.1",
     "@types/base64-url": "^2.2.2",
     "@types/pako": "^2.0.3",
     "@types/react": "^19.1.8",
     "@types/react-helmet": "^6.1.11",
     "@types/webfontloader": "^1.6.38",
     "babel-jest": "29",
+    "babel-plugin-inline-react-svg": "^2.0.2",
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -60,16 +66,16 @@
     "react": "^19.0.0",
     "react-router-dom": "^6.22.3"
   },
-  "gitHead": "1ed5a2051033d58cbdbfea5a439f49c7508b97f6",
+  "gitHead": "8f0b8300d7c73a1d82f7b76d3e7c293f921b260c",
   "dependencies": {
-    "@arcblock/bridge": "3.1.5",
+    "@arcblock/bridge": "3.1.7",
     "@arcblock/did": "^1.21.2",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.1.5",
-    "@arcblock/nft-display": "3.1.5",
-    "@arcblock/react-hooks": "3.1.5",
+    "@arcblock/icons": "3.1.7",
+    "@arcblock/nft-display": "3.1.7",
+    "@arcblock/react-hooks": "3.1.7",
     "@blocklet/js-sdk": "^1.16.47",
-    "@blocklet/theme": "3.1.5",
+    "@blocklet/theme": "3.1.7",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",

package/src/Theme/theme.ts

@@ -1,12 +1,12 @@
 /* eslint-disable no-shadow */
 // https://app.zeplin.io/styleguide/5d1436f1e97c2156f49c0725/colors
 import { createTheme as _createTheme, responsiveFontSizes, type PaletteMode } from '@mui/material';
-import { deepmerge } from '@mui/utils';
 import webfontloader from 'webfontloader';
 import {
   BLOCKLET_THEME_LIGHT,
   BLOCKLET_THEME_DARK,
   DEFAULT_FONTS,
+  mergeThemeOptions as deepmerge,
   getDefaultThemePrefer,
   getBlockletThemeOptions,
   type ThemeOptions,
@@ -226,4 +226,4 @@ export const create = (...args: Array<UxThemeOptions | ((baseTheme: Theme) => Ux
 };
 
 export const createTheme = create;
-export { deepmerge };
+export { deepmerge, deepmergeAll };

package/src/Util/index.ts

@@ -2,12 +2,12 @@
 import { lazy } from 'react';
 import padStart from 'lodash/padStart';
 import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
+import { mergeThemeOptions, ThemeOptions } from '@blocklet/theme';
 import isNil from 'lodash/isNil';
 import omitBy from 'lodash/omitBy';
 import pRetry from 'p-retry';
 import Cookies from 'js-cookie';
 import colorConvert from 'color-convert';
-import deepmerge, { type DeepmergeOptions } from '@mui/utils/deepmerge';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 import utc from 'dayjs/plugin/utc';
@@ -658,17 +658,16 @@ export function hexToRgba(hex: string, alpha = 1) {
 
 /**
  * 依次对数组中的对象进行深度合并
- * @param objects - 需要合并的对象数组
- * @param options - deepmerge 的配置选项
+ * @param objects - 需要合并的主题配置对象数组
  * @returns 合并后的对象
  */
-export function deepmergeAll<T>(objects: T[], options?: DeepmergeOptions): T {
+export function deepmergeAll(objects: ThemeOptions[]): ThemeOptions {
   if (!Array.isArray(objects)) {
     throw new Error('First argument should be an array');
   }
 
   if (objects.length === 0) {
-    return {} as T;
+    return {};
   }
 
   if (objects.length === 1) {
@@ -676,6 +675,6 @@ export function deepmergeAll<T>(objects: T[], options?: DeepmergeOptions): T {
   }
 
   return objects.reduce((acc, obj) => {
-    return deepmerge(acc, obj, options);
+    return mergeThemeOptions(acc, obj);
   });
 }