@arcblock/ux 3.1.48 → 3.1.49

package/lib/Config/config-provider.d.ts

@@ -15,6 +15,7 @@ export declare function useConfig(): {
     changeMode: (mode: import('@mui/material').PaletteMode) => void;
     prefer?: import('../Theme').Prefer;
     locale: import('../type').Locale;
+    defaultLocale: import('../type').Locale;
     changeLocale: (locale: import('../type').Locale) => void;
     t: (key: string, data?: Record<string, any>) => string;
     languages: {

package/lib/DIDConnect/auth-apps/switch-role.d.ts

@@ -1,6 +1,7 @@
 import { UserPublicInfo } from '@blocklet/js-sdk';
 declare function SwitchRole({ user, switchPassport, }: {
     user: UserPublicInfo & {
+        role: string;
         passports: {
             name: string;
             title: string;

package/lib/Locale/context.d.ts

@@ -19,6 +19,7 @@ export interface LocaleProviderProps {
 }
 export interface LocaleContextType {
     locale: Locale;
+    defaultLocale: Locale;
     changeLocale: (locale: Locale) => void;
     t: (key: string, data?: Record<string, any>) => string;
     languages: {

package/lib/Locale/context.js

@@ -1,80 +1,80 @@
-import { jsx as y } from "react/jsx-runtime";
-import { createContext as x, use as k, useState as h, useRef as A, useEffect as R, useCallback as b } from "react";
-import j from "lodash/get";
-import i from "js-cookie";
-import S from "./browser-lang.js";
-import { translate as U } from "./util.js";
-import { getCookieOptions as D, resolveRootDomain as E } from "../Util/index.js";
-const l = "nf_lang", F = (e, o = window.location.href) => {
+import { jsx as x } from "react/jsx-runtime";
+import { createContext as k, use as A, useState as h, useRef as R, useEffect as b, useCallback as j } from "react";
+import S from "lodash/get";
+import l from "js-cookie";
+import U from "./browser-lang.js";
+import { translate as D } from "./util.js";
+import { getCookieOptions as E, resolveRootDomain as F } from "../Util/index.js";
+const i = "nf_lang", O = (e, o = window.location.href) => {
   const t = new URL(o).searchParams.get("locale");
   return e.find((c) => c.code === t) ? t : null;
-}, O = (e, o = window.location.href) => {
+}, z = (e, o = window.location.href) => {
   const t = new URL(o);
   t.searchParams.has("locale") && (t.searchParams.set("locale", e), window.history.replaceState({}, "", t.href));
-}, d = (e = []) => {
+}, g = (e = []) => {
   const o = {
     languages: e.map((t) => t.code),
     // 取 languages 首个元素的 code 值, 如果不存在则取 'en'
     fallback: e?.[0]?.code || "en"
   };
-  return F(e) || i.get(l) || S(o);
-}, z = (e) => {
-  const o = D();
+  return O(e) || l.get(i) || U(o);
+}, N = (e) => {
+  const o = E();
   if (!o.domain) {
-    const t = E();
-    t && i.remove(l, { path: o.path || "/", domain: t });
+    const t = F();
+    t && l.remove(i, { path: o.path || "/", domain: t });
   }
-  i.set(l, e, o), O(e);
-}, N = (e) => {
-  const o = j(window, "blocklet.languages");
+  l.set(i, e, o), z(e);
+}, _ = (e) => {
+  const o = S(window, "blocklet.languages");
   return Array.isArray(o) && o.length ? o : Array.isArray(e) && e.length ? e : [
     { code: "en", name: "English" },
     { code: "zh", name: "简体中文" }
   ];
-}, g = x(null), { Provider: _, Consumer: M } = g;
-function Q({
+}, p = k(null), { Provider: q, Consumer: Q } = p;
+function T({
   children: e,
   locale: o = void 0,
-  fallbackLocale: t = void 0,
+  fallbackLocale: t = "en",
   translations: c,
-  onLoadingTranslation: p = void 0,
-  languages: L = [],
-  ...P
+  onLoadingTranslation: L = void 0,
+  languages: P = [],
+  ...C
 }) {
-  const s = N(L);
-  let [n, v] = h(o || d(s));
-  const m = A(t || ""), [, C] = h(0), u = (r) => {
-    v(r), z(r);
+  const s = _(P);
+  let [n, v] = h(o || g(s));
+  const m = s?.[0]?.code ?? t, u = R(m), [, w] = h(0), f = (r) => {
+    v(r), N(r);
   };
-  if (R(() => {
-    const r = o || d(s);
-    r !== n && u(r);
+  if (b(() => {
+    const r = o || g(s);
+    r !== n && f(r);
   }, [o]), n && c[n] && typeof c[n] == "function") {
     const r = n;
     try {
       Promise.resolve(c[r]()).then((a) => {
-        a && typeof a == "object" && (c[r] = a, C((f) => f > 999 ? 0 : f + 1));
+        a && typeof a == "object" && (c[r] = a, w((d) => d > 999 ? 0 : d + 1));
       });
     } catch (a) {
       console.error(a);
     }
-    p?.(r, s), n = m.current;
+    L?.(r, s), n = u.current;
   } else
-    m.current = n;
-  const w = b(
-    (r, a) => U(c, r, n, t, a),
+    u.current = n;
+  const y = j(
+    (r, a) => D(c, r, n, t, a),
     [c, n, t]
   );
-  return /* @__PURE__ */ y(_, { value: { locale: n, changeLocale: u, t: w, languages: s, ...P }, children: e });
+  return /* @__PURE__ */ x(q, { value: { locale: n, changeLocale: f, t: y, languages: s, defaultLocale: m, ...C }, children: e });
 }
-function T() {
-  return k(g);
+function V() {
+  return A(p);
 }
 export {
-  M as LocaleConsumer,
-  g as LocaleContext,
-  Q as LocaleProvider,
-  d as getLocale,
-  z as setLocale,
-  T as useLocaleContext
+  Q as LocaleConsumer,
+  p as LocaleContext,
+  T as LocaleProvider,
+  g as getLocale,
+  N as setLocale,
+  V as useLocaleContext
 };

package/lib/package.json.js

@@ -1,4 +1,4 @@
-const e = "3.1.48", s = { "@blocklet/js-sdk": "1.16.52" }, n = {
+const e = "3.1.49", s = { "@blocklet/js-sdk": "1.16.52" }, n = {
   version: e,
   dependencies: s
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.1.48",
+  "version": "3.1.49",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -68,16 +68,16 @@
     "react": "^19.0.0",
     "react-router-dom": "^6.22.3"
   },
-  "gitHead": "49a6dabae8a06667e517c6811f5f7939ff907ce1",
+  "gitHead": "4612b57a1452bd4330755b53d093505a6ae7dea5",
   "dependencies": {
-    "@arcblock/bridge": "3.1.48",
+    "@arcblock/bridge": "3.1.49",
     "@arcblock/did": "^1.25.6",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.1.48",
-    "@arcblock/nft-display": "3.1.48",
-    "@arcblock/react-hooks": "3.1.48",
+    "@arcblock/icons": "3.1.49",
+    "@arcblock/nft-display": "3.1.49",
+    "@arcblock/react-hooks": "3.1.49",
     "@blocklet/js-sdk": "1.16.52",
-    "@blocklet/theme": "3.1.48",
+    "@blocklet/theme": "3.1.49",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",

package/src/DIDConnect/auth-apps/switch-role.tsx

@@ -9,7 +9,7 @@ function SwitchRole({
   user,
   switchPassport,
 }: {
-  user: UserPublicInfo & { passports: { name: string; title: string; role: string }[] };
+  user: UserPublicInfo & { role: string; passports: { name: string; title: string; role: string }[] };
   switchPassport: () => void;
 }) {
   const currentRole = useCreation(

package/src/Locale/context.tsx

@@ -83,6 +83,7 @@ export interface LocaleProviderProps {
 
 export interface LocaleContextType {
   locale: Locale;
+  defaultLocale: Locale;
   changeLocale: (locale: Locale) => void;
   t: (key: string, data?: Record<string, any>) => string;
   languages: { code: string; name: string }[];
@@ -95,7 +96,7 @@ const { Provider, Consumer } = LocaleContext;
 function LocaleProvider({
   children,
   locale = undefined,
-  fallbackLocale = undefined,
+  fallbackLocale = 'en',
   translations,
   onLoadingTranslation = undefined,
   languages = [],
@@ -104,7 +105,8 @@ function LocaleProvider({
   const langs = getLanguages(languages);
   // eslint-disable-next-line prefer-const
   let [currentLocale, setCurrentLocale] = useState<Locale>(locale || getLocale(langs));
-  const lastCurrentLocale = useRef<string>(fallbackLocale || '');
+  const defaultLocale = langs?.[0]?.code ?? fallbackLocale;
+  const lastCurrentLocale = useRef<string>(defaultLocale);
   const [, setForceUpdate] = useState(0);
 
   const changeLocale = (newLocale: Locale) => {
@@ -145,7 +147,11 @@ function LocaleProvider({
     [translations, currentLocale, fallbackLocale]
   );
 
-  return <Provider value={{ locale: currentLocale, changeLocale, t, languages: langs, ...rest }}>{children}</Provider>;
+  return (
+    <Provider value={{ locale: currentLocale, changeLocale, t, languages: langs, defaultLocale, ...rest }}>
+      {children}
+    </Provider>
+  );
 }
 
 function useLocaleContext() {