@arcblock/ux 3.1.20 → 3.1.21

package/lib/Theme/index.js

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

package/lib/Theme/theme.js

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

package/lib/Util/index.d.ts

@@ -1,7 +1,9 @@
-import { ThemeOptions } from '@blocklet/theme';
+import { mergeAllThemeOptions } from '@blocklet/theme';
 import { default as Cookies } from 'js-cookie';
 import { $TSFixMe, Locale } from '../type';
 declare let dateTool: $TSFixMe | null;
+/** @deprecated for compatibility, please use `import { mergeAllThemeOptions } from '@blocklet/theme'` instead */
+export { mergeAllThemeOptions as deepmergeAll };
 /** 是否常见二段式顶级域名 */
 export declare function isTwoSegmentTLD(domain: string): boolean;
 /** 获取根域名 */
@@ -104,10 +106,3 @@ export declare const cleanedObj: (obj: object) => import('lodash').Dictionary<an
  * @returns RGBA 颜色字符串 (例如: "rgba(255, 0, 0, 1)")
  */
 export declare function hexToRgba(hex: string, alpha?: number): string;
-/**
- * 依次对数组中的对象进行深度合并
- * @param objects - 需要合并的主题配置对象数组
- * @returns 合并后的对象
- */
-export declare function deepmergeAll(objects: ThemeOptions[]): ThemeOptions;
-export {};

package/lib/Util/index.js

@@ -1,58 +1,58 @@
-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 { lazy as x } from "react";
+import l from "lodash/padStart";
+import { colors as g, getDIDMotifInfo as E } from "@arcblock/did-motif";
+import { mergeAllThemeOptions as vt } from "@blocklet/theme";
 import y from "lodash/isNil";
-import A from "lodash/omitBy";
-import F from "p-retry";
-import l from "js-cookie";
+import j from "lodash/omitBy";
+import k from "p-retry";
+import u from "js-cookie";
 import O from "color-convert";
 import a from "dayjs";
 import "dayjs/locale/zh-cn";
 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";
-import { DID_PREFIX as P, BLOCKLET_SERVICE_PATH_PREFIX as v } from "./constant.js";
-import { getFederatedEnabled as C } from "./federated.js";
+import A from "dayjs/plugin/timezone";
+import F from "dayjs/plugin/relativeTime";
+import R from "dayjs/plugin/updateLocale";
+import W from "dayjs/plugin/localizedFormat";
+import { DID_PREFIX as L, BLOCKLET_SERVICE_PATH_PREFIX as P } from "./constant.js";
+import { getFederatedEnabled as v } from "./federated.js";
 let f = null;
-const M = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?$/, V = /* @__PURE__ */ new Set(["co", "com", "net", "org", "gov", "edu", "ac"]), _ = /* @__PURE__ */ new Set(["uk", "au", "cn", "nz", "za", "in", "br", "mx", "fr", "it", "ca"]);
-function z(t) {
+const C = /^(\d{1,3}\.){3}\d{1,3}(:\d+)?$/, M = /* @__PURE__ */ new Set(["co", "com", "net", "org", "gov", "edu", "ac"]), V = /* @__PURE__ */ new Set(["uk", "au", "cn", "nz", "za", "in", "br", "mx", "fr", "it", "ca"]);
+function _(t) {
   if (!t)
     return !1;
   const e = t.split(".");
   if (e.length < 2) return !1;
-  const n = e[e.length - 2], r = e[e.length - 1];
-  return V.has(n) && _.has(r);
+  const o = e[e.length - 2], n = e[e.length - 1];
+  return M.has(o) && V.has(n);
 }
-function mt() {
+function lt() {
   const { host: t } = window.location;
-  if (!t || M.test(t))
+  if (!t || C.test(t))
     return "";
-  const n = t.split(":")[0].split(".");
-  if (n.length === 1)
+  const o = t.split(":")[0].split(".");
+  if (o.length === 1)
     return "";
-  if (n.length > 2) {
-    const r = n.slice(-2).join(".");
-    if (z(r))
-      return `.${n.slice(-3).join(".")}`;
+  if (o.length > 2) {
+    const n = o.slice(-2).join(".");
+    if (_(n))
+      return `.${o.slice(-3).join(".")}`;
   }
-  return `.${n.slice(-2).join(".")}`;
+  return `.${o.slice(-2).join(".")}`;
 }
-function dt(t) {
-  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 ut(t) {
+  return t.replace(/^\?/, "").split("&").map((e) => e.split("=")).filter(([e]) => !!e).reduce((e, o) => {
+    const n = o[0], i = decodeURIComponent(o[1]) || !0;
+    return e[n] = i, e;
   }, {});
 }
-function pt(t = {}) {
+function mt(t = {}) {
   return new URLSearchParams(t).toString();
 }
-function ht(t = 1) {
+function dt(t = 1) {
   let e = t;
   typeof e == "number" && (e = { expireInDays: e }), e.path === void 0 && (e.path = "/"), e.expireInDays || (e.expireInDays = 1);
-  const n = {
+  const o = {
     expires: e.expireInDays,
     path: e.path,
     domain: e.domain || "",
@@ -60,49 +60,49 @@ function ht(t = 1) {
     // 允许自定义设置为 false，默认是 true
     secure: e.secure !== !1
   };
-  return (typeof window > "u" || e.domain || e.returnDomain === !1) && e.returnDomain === !1 && delete n.domain, n;
+  return (typeof window > "u" || e.domain || e.returnDomain === !1) && e.returnDomain === !1 && delete o.domain, o;
 }
-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, n = []) {
-  const r = Object.assign({}, t), i = e.defaultProps || {};
-  return Object.keys(i).forEach((o) => {
-    typeof r[o] == "string" && r[o].indexOf("::prop::") === 0 && (r[o] = i[o]);
-  }), Array.isArray(n) && n.forEach((o) => {
-    if (typeof r[o] == "string")
+const pt = (t) => t.color ? t.color : t.dark ? t.theme.palette.common.white : t.theme.palette.text.primary, ht = (t) => t.background ? t.background : t.dark ? t.theme.palette.common.black : t.theme.palette.common.white;
+function gt(t, e, o = []) {
+  const n = Object.assign({}, t), i = e.defaultProps || {};
+  return Object.keys(i).forEach((r) => {
+    typeof n[r] == "string" && n[r].indexOf("::prop::") === 0 && (n[r] = i[r]);
+  }), Array.isArray(o) && o.forEach((r) => {
+    if (typeof n[r] == "string")
       try {
-        r[o] = JSON.parse(r[o]);
+        n[r] = JSON.parse(n[r]);
       } catch {
       }
-  }), Object.keys(r).forEach((o) => {
-    typeof r[o] == "string" && r[o].indexOf("::prop::") === 0 && (r[o] = "");
-  }), r;
+  }), Object.keys(n).forEach((r) => {
+    typeof n[r] == "string" && n[r].indexOf("::prop::") === 0 && (n[r] = "");
+  }), n;
 }
-function It(t = 2017) {
+function wt(t = 2017) {
   const e = (/* @__PURE__ */ new Date()).getFullYear();
   return `${e}` == `${t}` ? `© ArcBlock ${e}` : `© ArcBlock ${t} - ${e}`;
 }
-const Dt = () => typeof Intl == "object" && typeof Intl.DateTimeFormat == "function" && typeof Intl.DateTimeFormat().resolvedOptions == "function" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "", bt = (t) => {
+const yt = () => typeof Intl == "object" && typeof Intl.DateTimeFormat == "function" && typeof Intl.DateTimeFormat().resolvedOptions == "function" ? Intl.DateTimeFormat().resolvedOptions().timeZone : "", It = (t) => {
   let e = 0;
-  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);
+  for (let n = 0; n < t.length; n++)
+    e = t.charCodeAt(n) + ((e << 5) - e);
+  let o = "#";
+  for (let n = 0; n < 3; n++) {
+    const i = e >> n * 8 & 255;
+    o += `00${i.toString(16)}`.substr(-2);
   }
-  return n;
-}, $t = (t) => {
-  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")}`;
+  return o;
+}, bt = (t) => {
+  const e = Math.round(t / 1e3), o = Math.floor(e / 3600), n = Math.floor((e - o * 3600) / 60), i = e % 60;
+  return `${l(o, 2, "0")}:${l(n, 2, "0")}:${l(i, 2, "0")}`;
 };
-function B(t) {
+function z(t) {
   f = t;
 }
-function Tt() {
+function Dt() {
   return f;
 }
-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", {
+const I = (t) => (e, { locale: o, tz: n, isUtc: i } = {}) => {
+  if (f === null && (a.extend(W), a.extend(U), a.extend(A), a.extend(R), a.extend(F), a.updateLocale("zh-cn", {
     // copy with https://github.com/iamkun/dayjs/blob/dev/src/locale/zh-cn.js
     relativeTime: {
       future: "%s后",
@@ -119,49 +119,49 @@ const I = (t) => (e, { locale: n, tz: r, isUtc: i } = {}) => {
       y: "1 年",
       yy: "%d 年"
     }
-  }), B(a)), y(e) || e === "")
+  }), z(a)), y(e) || e === "")
     return "-";
-  let o = f(e);
-  return r && (o = o.tz(r)), i && (o = o.utc()), typeof n < "u" && (o = o.locale(n)), o.format(t);
+  let r = f(e);
+  return n && (r = r.tz(n)), i && (r = r.utc()), typeof o < "u" && (r = r.locale(o)), r.format(t);
 };
-function St(t, { locale: e = "en", tz: n } = {}) {
-  return I("ll")(t, { locale: e, tz: n });
+function $t(t, { locale: e = "en", tz: o } = {}) {
+  return I("ll")(t, { locale: e, tz: o });
 }
-function Et(t, {
+function Tt(t, {
   locale: e = "en",
-  tz: n,
-  isUtc: r = !1,
+  tz: o,
+  isUtc: n = !1,
   format: i = "lll"
 } = {}) {
-  return I(i)(t, { locale: e, tz: n, isUtc: r });
+  return I(i)(t, { locale: e, tz: o, isUtc: n });
 }
-function N() {
+function B() {
   const t = window?.ABT_DEV || window.ABT;
   return t && typeof t.open == "function" ? t : null;
 }
-function xt({
+function St({
   webWalletUrl: t,
   action: e = "login",
-  locale: n = "en",
-  url: r,
+  locale: o = "en",
+  url: n,
   windowFeatures: i,
-  appInfo: o,
+  appInfo: r,
   memberAppInfo: p
 }) {
-  const h = N();
+  const h = B();
   if (h)
     return h.open({
       action: e,
-      locale: n,
-      url: encodeURIComponent(r),
+      locale: o,
+      url: encodeURIComponent(n),
       appInfo: {
-        ...o
+        ...r
       },
       memberAppInfo: {
         ...p
       }
     }), { type: "extension" };
-  const D = {
+  const b = {
     toolbar: "no",
     location: "no",
     status: "no",
@@ -171,7 +171,7 @@ function xt({
     // iphone 8plus size
     width: 414,
     height: 736
-  }, 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;
+  }, D = `${t}?action=${e}&locale=${o}&url=${encodeURIComponent(n)}`, c = Object.assign({}, b, 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;
@@ -181,43 +181,43 @@ function xt({
     c.top = s;
   }
   const T = Object.keys(c).map((s) => `${s}=${c[s]}`).join(",");
-  return window.open(b, "targetWindow", T), { type: "web" };
+  return window.open(D, "targetWindow", T), { type: "web" };
 }
-const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) => {
-  const e = t.replace(P, "");
+const xt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", N = (t) => {
+  const e = t.replace(L, "");
   return !!/^(0x)?[0-9a-f]{40}$/i.test(e);
-}, K = (t, e) => {
+}, X = (t, e) => {
   if (!e)
     return t;
   try {
-    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;
+    const o = new URL(t, window.location.origin);
+    return Object.keys(e).forEach((n) => {
+      o.searchParams.set(n, String(e[n]));
+    }), o.origin === window.location.origin ? o.pathname + o.search : o.href;
   } catch {
     return t;
   }
-}, At = (t, e = 48) => t && (t.indexOf(v) >= 0 ? K(t, {
+}, Et = (t, e = 48) => t && (t.indexOf(P) >= 0 ? X(t, {
   imageFilter: "resize",
   w: e,
   h: e
-}) : t), Ft = (t = 0) => new Promise((e) => {
+}) : t), jt = (t = 0) => new Promise((e) => {
   setTimeout(() => {
     e();
   }, 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, {
+}), kt = (t) => /^https?:\/\//.test(t), m = "vid", d = "__visitor_id", K = () => u.get(m) || localStorage.getItem(d), w = (t) => {
+  t === null ? u.remove(m, {
     sameSite: "None",
     secure: !0
-  }) : l.set(m, t, {
+  }) : u.set(m, t, {
     sameSite: "None",
     secure: !0,
     expires: 365
   });
-}, Ut = () => {
+}, Ot = () => {
   let t = localStorage.getItem(d);
-  if (t && (localStorage.removeItem(d), w(t)), !Q()) {
-    if (!C())
+  if (t && (localStorage.removeItem(d), w(t)), !K()) {
+    if (!v())
       try {
         if (window.crypto && typeof window.crypto.randomUUID == "function")
           t = window.crypto.randomUUID();
@@ -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 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"));
+            for (let n = 0; n < 16; n++)
+              e[n] = Math.floor(Math.random() * 256);
+          const o = Array.from(e).map((n) => n.toString(16).padStart(2, "0"));
           t = [
-            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("")
+            o.slice(0, 4).join(""),
+            o.slice(4, 6).join(""),
+            o.slice(6, 8).join(""),
+            o.slice(8, 10).join(""),
+            o.slice(10, 16).join("")
           ].join("-");
         }
       } catch {
@@ -242,26 +242,26 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
       }
     t && w(t);
   }
-}, jt = (t) => {
-  if (X(t)) {
+}, Ut = (t) => {
+  if (N(t)) {
     const e = Uint8Array.from(
-      t.slice(2).match(/.{1,2}/g).map((n) => parseInt(n, 16))
-    ).slice(0, 8).reduce((n, r) => n + r, 0) % g.length;
+      t.slice(2).match(/.{1,2}/g).map((o) => parseInt(o, 16))
+    ).slice(0, 8).reduce((o, n) => o + n, 0) % g.length;
     return g[e];
   }
   try {
-    return x(t)?.color;
+    return E(t)?.color;
   } catch {
     return null;
   }
-}, Rt = (t, e, n = {}) => {
-  const { fallbackLocale: r = "en", defaultValue: i = "unknown" } = n;
+}, At = (t, e, o = {}) => {
+  const { fallbackLocale: n = "en", defaultValue: i = "unknown" } = o;
   if (typeof t == "string")
     return t;
-  let o;
-  return e && (o = t[e]), (!o || typeof o != "string") && (o = t[r]), (!o || typeof o != "string") && (o = i), o;
-}, Wt = (t) => E(
-  () => F(
+  let r;
+  return e && (r = t[e]), (!r || typeof r != "string") && (r = t[n]), (!r || typeof r != "string") && (r = i), r;
+}, Ft = (t) => x(
+  () => k(
     async () => {
       try {
         return await t();
@@ -272,48 +272,43 @@ const kt = (t) => t && Number(t) >= 12 ? `${Number(t)}px` : "inherit", X = (t) =
     // 只需要重试两次，加上原本的一次，总共三次
     { retries: 2 }
   )
-), Lt = (t) => A(t, y);
-function Pt(t, e = 1) {
-  const [n, r, i] = O.hex.rgb(t);
-  return `rgba(${n}, ${r}, ${i}, ${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((e, n) => k(e, n));
+), Rt = (t) => j(t, y);
+function Wt(t, e = 1) {
+  const [o, n, i] = O.hex.rgb(t);
+  return `rgba(${o}, ${n}, ${i}, ${e})`;
 }
 export {
-  K as appendParams,
-  Lt as cleanedObj,
+  X as appendParams,
+  Rt as cleanedObj,
   vt as deepmergeAll,
-  N as detectWalletExtension,
-  Ut as ensureVisitorId,
-  St as formatToDate,
-  Et as formatToDatetime,
-  $t as formatUptime,
-  wt as getBackground,
-  gt as getColor,
-  ht as getCookieOptions,
-  It as getCopyright,
-  jt as getDIDColor,
-  Tt as getDateTool,
-  kt as getFontSize,
-  Dt as getTimezone,
-  Rt as getTranslation,
-  At as getUserAvatar,
-  Q as getVisitorId,
-  Pt as hexToRgba,
-  X as isEthereumDid,
-  z as isTwoSegmentTLD,
-  Ot as isUrl,
-  Wt as lazyRetry,
-  yt as mergeProps,
-  xt as openWebWallet,
-  dt as parseQuery,
-  mt as resolveRootDomain,
-  B as setDateTool,
+  B as detectWalletExtension,
+  Ot as ensureVisitorId,
+  $t as formatToDate,
+  Tt as formatToDatetime,
+  bt as formatUptime,
+  ht as getBackground,
+  pt as getColor,
+  dt as getCookieOptions,
+  wt as getCopyright,
+  Ut as getDIDColor,
+  Dt as getDateTool,
+  xt as getFontSize,
+  yt as getTimezone,
+  At as getTranslation,
+  Et as getUserAvatar,
+  K as getVisitorId,
+  Wt as hexToRgba,
+  N as isEthereumDid,
+  _ as isTwoSegmentTLD,
+  kt as isUrl,
+  Ft as lazyRetry,
+  gt as mergeProps,
+  St as openWebWallet,
+  ut as parseQuery,
+  lt as resolveRootDomain,
+  z as setDateTool,
   w as setVisitorId,
-  Ft as sleep,
-  bt as str2color,
-  pt as stringifyQuery
+  jt as sleep,
+  It as str2color,
+  mt as stringifyQuery
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.1.20",
+  "version": "3.1.21",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -40,6 +40,7 @@
     "@babel/preset-env": "^7.28.0",
     "@babel/preset-react": "^7.27.1",
     "@babel/preset-typescript": "^7.27.1",
+    "@testing-library/react": "^16.3.0",
     "@types/base64-url": "^2.2.2",
     "@types/pako": "^2.0.3",
     "@types/react": "^19.1.8",
@@ -66,16 +67,16 @@
     "react": "^19.0.0",
     "react-router-dom": "^6.22.3"
   },
-  "gitHead": "acb1c932b5f600dc38e44aa2b4491a943562b81e",
+  "gitHead": "dedb6d83f569480ca7840679ef32fb863d4042e1",
   "dependencies": {
-    "@arcblock/bridge": "3.1.20",
+    "@arcblock/bridge": "3.1.21",
     "@arcblock/did": "^1.21.3",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.1.20",
-    "@arcblock/nft-display": "3.1.20",
-    "@arcblock/react-hooks": "3.1.20",
+    "@arcblock/icons": "3.1.21",
+    "@arcblock/nft-display": "3.1.21",
+    "@arcblock/react-hooks": "3.1.21",
     "@blocklet/js-sdk": "^1.16.48",
-    "@blocklet/theme": "3.1.20",
+    "@blocklet/theme": "3.1.21",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",

package/src/Util/index.ts

@@ -2,7 +2,7 @@
 import { lazy } from 'react';
 import padStart from 'lodash/padStart';
 import { getDIDMotifInfo, colors } from '@arcblock/did-motif';
-import { mergeThemeOptions, ThemeOptions } from '@blocklet/theme';
+import { mergeAllThemeOptions } from '@blocklet/theme';
 import isNil from 'lodash/isNil';
 import omitBy from 'lodash/omitBy';
 import pRetry from 'p-retry';
@@ -27,6 +27,9 @@ const commonSLDs = new Set(['co', 'com', 'net', 'org', 'gov', 'edu', 'ac']);
 // 常见国家域名
 const commonCcTLDs = new Set(['uk', 'au', 'cn', 'nz', 'za', 'in', 'br', 'mx', 'fr', 'it', 'ca']);
 
+/** @deprecated for compatibility, please use `import { mergeAllThemeOptions } from '@blocklet/theme'` instead */
+export { mergeAllThemeOptions as deepmergeAll };
+
 /** 是否常见二段式顶级域名 */
 export function isTwoSegmentTLD(domain: string) {
   if (!domain) {
@@ -655,26 +658,3 @@ export function hexToRgba(hex: string, alpha = 1) {
   // 返回 RGBA 格式
   return `rgba(${r}, ${g}, ${b}, ${alpha})`;
 }
-
-/**
- * 依次对数组中的对象进行深度合并
- * @param objects - 需要合并的主题配置对象数组
- * @returns 合并后的对象
- */
-export function deepmergeAll(objects: ThemeOptions[]): ThemeOptions {
-  if (!Array.isArray(objects)) {
-    throw new Error('First argument should be an array');
-  }
-
-  if (objects.length === 0) {
-    return {};
-  }
-
-  if (objects.length === 1) {
-    return objects[0];
-  }
-
-  return objects.reduce((acc, obj) => {
-    return mergeThemeOptions(acc, obj);
-  });
-}