@arcblock/ux 3.1.1 → 3.1.3

package/lib/DIDConnect/auth-apps/index.d.ts

@@ -5,7 +5,7 @@ import { RequestAppInfo, CurrentAppInfo } from './auth-apps-info';
 /**
  * @example app/connect-to-did-space?appPid=zNKp8tdZUanWKnvhwZWvF2hKRutwM9ykLaY8&appDid=zNKp8tdZUanWKnvhwZWvF2hKRutwM9ykLaY8&appName=233&appDescription=456&appUrl=https://bbqaw5mgxc6fnihrwqcejcxvukkdgkk4anwxwk5msvm.did.abtnet.io/zh
  */
-export default function AuthApps({ session, requestAppInfo, currentAppInfo, children, userInfo, hideSwitchConnect, hideAuthorize, hideCancel, notThisText, authorizeText, connectText, cancelText, useAnotherText, slotProps, onConnect, onAuthorize, onSwitchConnect, onCancel, ref, }: {
+export default function AuthApps({ session, requestAppInfo, currentAppInfo, children, userInfo, hideSwitchConnect, hideAuthorize, hideCancel, hideButton, notThisText, authorizeText, connectText, cancelText, useAnotherText, slotProps, onConnect, onAuthorize, onSwitchConnect, onCancel, ref, }: {
     session: any;
     requestAppInfo: RequestAppInfo;
     currentAppInfo: CurrentAppInfo;
@@ -14,6 +14,7 @@ export default function AuthApps({ session, requestAppInfo, currentAppInfo, chil
     hideSwitchConnect?: boolean;
     hideAuthorize?: boolean;
     hideCancel?: boolean;
+    hideButton?: boolean;
     notThisText?: string;
     authorizeText?: string;
     connectText?: string;

package/lib/DIDConnect/auth-apps/index.js

@@ -1,18 +1,18 @@
-import { jsx as e, jsxs as o, Fragment as H } from "react/jsx-runtime";
-import { CircularProgress as u, Box as l, Stack as N, Button as h, Typography as q, Link as E } from "@mui/material";
-import { useReactive as G, useMemoizedFn as i } from "ahooks";
+import { jsx as e, jsxs as o, Fragment as m } from "react/jsx-runtime";
+import { CircularProgress as u, Box as l, Stack as q, Button as h, Typography as E, Link as G } from "@mui/material";
+import { useReactive as J, useMemoizedFn as i } from "ahooks";
 import c from "lodash/noop";
-import { useImperativeHandle as J } from "react";
-import K from "../did-connect-container.js";
-import O from "./auth-apps-info.js";
-import Q from "../../Center/index.js";
-import V from "../landing-page.js";
-import { translate as X } from "../../Locale/util.js";
-import { useLocaleContext as Y } from "../../Locale/context.js";
-import Z from "../../UserCard/index.js";
-import { InfoType as _, CardType as $ } from "../../UserCard/types.js";
-import { mergeSx as m } from "../../Util/style.js";
-const P = {
+import { useImperativeHandle as K } from "react";
+import O from "../did-connect-container.js";
+import Q from "./auth-apps-info.js";
+import V from "../../Center/index.js";
+import X from "../landing-page.js";
+import { translate as Y } from "../../Locale/util.js";
+import { useLocaleContext as Z } from "../../Locale/context.js";
+import _ from "../../UserCard/index.js";
+import { InfoType as $, CardType as P } from "../../UserCard/types.js";
+import { mergeSx as p } from "../../Util/style.js";
+const ee = {
   en: {
     notThis: "Not you?",
     useAnother: "Use another account",
@@ -28,61 +28,62 @@ const P = {
     cancel: "取消"
   }
 };
-function pe({
+function fe({
   session: s,
-  requestAppInfo: p,
-  currentAppInfo: f,
-  children: g = null,
-  userInfo: x = void 0,
-  hideSwitchConnect: C = !1,
-  hideAuthorize: v = !1,
-  hideCancel: y = !1,
-  notThisText: z = void 0,
-  authorizeText: A = void 0,
-  connectText: b = void 0,
-  cancelText: k = void 0,
-  useAnotherText: T = void 0,
+  requestAppInfo: f,
+  currentAppInfo: g,
+  children: x = null,
+  userInfo: C = void 0,
+  hideSwitchConnect: v = !1,
+  hideAuthorize: y = !1,
+  hideCancel: z = !1,
+  hideButton: A = !1,
+  notThisText: b = void 0,
+  authorizeText: k = void 0,
+  connectText: T = void 0,
+  cancelText: w = void 0,
+  useAnotherText: D = void 0,
   slotProps: r = void 0,
-  onConnect: w = c,
-  onAuthorize: D = c,
-  onSwitchConnect: I = c,
-  onCancel: L = c,
-  ref: S
+  onConnect: I = c,
+  onAuthorize: L = c,
+  onSwitchConnect: S = c,
+  onCancel: W = c,
+  ref: j
 }) {
-  const n = G({
+  const n = J({
     loading: !1
-  }), { locale: W = "en" } = Y() || {}, t = i((R, U = {}) => X(P, R, W, "en", U)), a = i(() => {
+  }), { locale: B = "en" } = Z() || {}, t = i((H, N = {}) => Y(ee, H, B, "en", N)), a = i(() => {
     n.loading = !1;
-  }), j = i(() => {
-    n.loading = !0, w?.(a);
-  }), B = i(() => {
-    n.loading = !0, I?.(a);
   }), F = i(() => {
-    n.loading = !0, D?.(a);
+    n.loading = !0, I?.(a);
   }), M = i(() => {
-    L?.();
+    n.loading = !0, S?.(a);
+  }), R = i(() => {
+    n.loading = !0, L?.(a);
+  }), U = i(() => {
+    W?.();
   });
-  if (J(S, () => ({
+  if (K(j, () => ({
     closeLoading: a
   })), s.loading || !s.initialized)
-    return /* @__PURE__ */ e(Q, { children: /* @__PURE__ */ e(u, {}) });
-  const d = x ?? s?.user;
-  return /* @__PURE__ */ e(V, { did: window.blocklet?.appPid, standalone: !0, children: /* @__PURE__ */ e(
+    return /* @__PURE__ */ e(V, { children: /* @__PURE__ */ e(u, {}) });
+  const d = C ?? s?.user;
+  return /* @__PURE__ */ e(X, { did: window.blocklet?.appPid, standalone: !0, children: /* @__PURE__ */ e(
     l,
     {
       ...r?.root,
-      sx: m(
+      sx: p(
         {
           width: 420,
           maxWidth: "100%"
         },
         r?.root?.sx
       ),
-      children: /* @__PURE__ */ e(K, { hideCloseButton: !0, ...r?.didConnectContainer, children: /* @__PURE__ */ o(
+      children: /* @__PURE__ */ e(O, { hideCloseButton: !0, ...r?.didConnectContainer, children: /* @__PURE__ */ o(
         l,
         {
           ...r?.contentContainer,
-          sx: m(
+          sx: p(
             {
               display: "flex",
               flexDirection: "column",
@@ -101,69 +102,71 @@ function pe({
             r?.contentContainer?.sx
           ),
           children: [
-            /* @__PURE__ */ e(O, { requestAppInfo: p, currentAppInfo: f }),
-            d ? /* @__PURE__ */ o(H, { children: [
-              /* @__PURE__ */ e(Z, { user: d, showDid: !0, cardType: $.Detailed, infoType: _.Minimal }),
+            /* @__PURE__ */ e(Q, { requestAppInfo: f, currentAppInfo: g }),
+            d ? /* @__PURE__ */ o(m, { children: [
+              /* @__PURE__ */ e(_, { user: d, showDid: !0, cardType: P.Detailed, infoType: $.Minimal }),
               /* @__PURE__ */ e(l, {})
             ] }) : null,
-            g,
-            /* @__PURE__ */ e(
-              l,
-              {
-                sx: {
-                  border: "1px solid",
-                  borderColor: "divider",
-                  borderRadius: 2,
-                  overflow: "hidden",
-                  my: 1
-                }
-              }
-            ),
-            /* @__PURE__ */ o(N, { direction: "row", spacing: 2, children: [
-              y ? null : /* @__PURE__ */ e(
-                h,
+            x,
+            A ? null : /* @__PURE__ */ o(m, { children: [
+              /* @__PURE__ */ e(
+                l,
                 {
-                  color: "inherit",
-                  variant: "outlined",
-                  size: "large",
-                  fullWidth: !0,
-                  onClick: M,
                   sx: {
-                    color: "grey.500"
-                  },
-                  children: k || t("cancel")
+                    border: "1px solid",
+                    borderColor: "divider",
+                    borderRadius: 2,
+                    overflow: "hidden",
+                    my: 1
+                  }
                 }
               ),
-              d && !v ? /* @__PURE__ */ o(
-                h,
-                {
-                  variant: "contained",
-                  size: "large",
-                  fullWidth: !0,
-                  onClick: F,
-                  disabled: n.loading,
-                  children: [
-                    n.loading ? /* @__PURE__ */ e(u, { size: 20, sx: { mr: 1 } }) : null,
-                    A || t("authorize")
-                  ]
-                }
-              ) : /* @__PURE__ */ o(
-                h,
-                {
-                  variant: "contained",
-                  size: "large",
-                  fullWidth: !0,
-                  disabled: n.loading,
-                  onClick: j,
-                  children: [
-                    n.loading ? /* @__PURE__ */ e(u, { size: 20, sx: { mr: 1 } }) : null,
-                    b || t("connect")
-                  ]
-                }
-              )
+              /* @__PURE__ */ o(q, { direction: "row", spacing: 2, children: [
+                z ? null : /* @__PURE__ */ e(
+                  h,
+                  {
+                    color: "inherit",
+                    variant: "outlined",
+                    size: "large",
+                    fullWidth: !0,
+                    onClick: U,
+                    sx: {
+                      color: "grey.500"
+                    },
+                    children: w || t("cancel")
+                  }
+                ),
+                d && !y ? /* @__PURE__ */ o(
+                  h,
+                  {
+                    variant: "contained",
+                    size: "large",
+                    fullWidth: !0,
+                    onClick: R,
+                    disabled: n.loading,
+                    children: [
+                      n.loading ? /* @__PURE__ */ e(u, { size: 20, sx: { mr: 1 } }) : null,
+                      k || t("authorize")
+                    ]
+                  }
+                ) : /* @__PURE__ */ o(
+                  h,
+                  {
+                    variant: "contained",
+                    size: "large",
+                    fullWidth: !0,
+                    disabled: n.loading,
+                    onClick: F,
+                    children: [
+                      n.loading ? /* @__PURE__ */ e(u, { size: 20, sx: { mr: 1 } }) : null,
+                      T || t("connect")
+                    ]
+                  }
+                )
+              ] })
             ] }),
-            C || !d ? null : /* @__PURE__ */ e(l, { sx: { textAlign: "center" }, children: /* @__PURE__ */ o(
-              q,
+            v || !d ? null : /* @__PURE__ */ e(l, { sx: { textAlign: "center" }, children: /* @__PURE__ */ o(
+              E,
               {
                 variant: "body2",
                 sx: {
@@ -173,17 +176,17 @@ function pe({
                   gap: 1
                 },
                 children: [
-                  z || t("notThis"),
+                  b || t("notThis"),
                   " ",
                   /* @__PURE__ */ e(
-                    E,
+                    G,
                     {
                       underline: "hover",
-                      onClick: B,
+                      onClick: M,
                       sx: {
                         cursor: "pointer"
                       },
-                      children: T || t("useAnother")
+                      children: D || t("useAnother")
                     }
                   )
                 ]
@@ -196,5 +199,5 @@ function pe({
   ) });
 }
 export {
-  pe as default
+  fe as default
 };

package/lib/DIDLogo/index.js

@@ -1,6 +1,6 @@
 import { jsxs as l, jsx as C, Fragment as f } from "react/jsx-runtime";
-import { useRef as g, useState as d, useEffect as P } from "react";
-const w = {
+import { useRef as w, useState as d, useEffect as P } from "react";
+const m = {
   default: {
     color: "#4598FA",
     text: void 0
@@ -23,26 +23,26 @@ const w = {
   }
 };
 function H({
-  style: m = {},
-  className: B = "",
-  size: p = "1em",
-  color: v = void 0,
-  text: W = void 0,
+  style: B = {},
+  className: p = "",
+  size: v = "1em",
+  color: W = void 0,
+  text: h = void 0,
   textColor: S = void 0,
-  fontSize: h = void 0,
-  gap: x = 10,
+  fontSize: x = void 0,
+  gap: M = 10,
   variant: T = "default",
   name: y = void 0,
   dark: A = !1
 }) {
-  const c = T === "contained", M = w[y] || w.default, o = W || M?.text, F = v || M?.color, R = S || (A ? "white" : "#121212");
-  let e = 1, t = 80, n = h, i = x + 5;
-  !c && o && (t = 64, e = 1.25, i = x, h || (n = 32)), n = n || 40;
-  const Z = g(null), L = g(null), [z, D] = d(), [j, $] = d(t), [b, I] = d(t), N = c ? t / 2 + 5 : t / 2 + 3, r = t / 5;
+  const c = T === "contained", Z = m[y] || m.default, o = h === void 0 ? Z?.text : h, F = W || Z?.color, R = S || (A ? "white" : "#121212");
+  let e = 1, t = 80, n = x, i = M + 5;
+  !c && o && (t = 64, e = 1.25, i = M, x || (n = 32)), n = n || 40;
+  const u = w(null), L = w(null), [z, D] = d(), [j, $] = d(t), [b, I] = d(t), N = c ? t / 2 + 5 : t / 2 + 3, r = t / 5;
   P(() => {
     if (L.current) {
-      const E = Z.current?.getBBox(), G = L.current.getBoundingClientRect(), a = E?.width || 0, O = G.height / t, u = t * e + a + (a ? i : 0);
-      I(u), $(t * e + (a ? i : 0)), D(u * O);
+      const E = u.current?.getBBox(), G = L.current.getBoundingClientRect(), a = E?.width || 0, O = G.height / t, g = t * e + a + (a ? i : 0);
+      I(g), $(t * e + (a ? i : 0)), D(g * O);
     }
   }, [o, i, e, t]);
   const V = /* @__PURE__ */ l(f, { children: [
@@ -79,17 +79,17 @@ function H({
     {
       xmlns: "http://www.w3.org/2000/svg",
       width: z,
-      height: p,
+      height: v,
       viewBox: `0 0 ${b} ${t}`,
       fill: "currentColor",
-      className: `${B}`.trim(),
-      style: Object.assign({ color: F }, m),
+      className: `${p}`.trim(),
+      style: Object.assign({ color: F }, B),
       children: [
         s,
         o && /* @__PURE__ */ C(
           "text",
           {
-            ref: Z,
+            ref: u,
             x: j,
             y: N,
             fontSize: n,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -60,16 +60,16 @@
     "react": "^19.0.0",
     "react-router-dom": "^6.22.3"
   },
-  "gitHead": "858111bd8bce6a904a1ec70982896d815672f2f1",
+  "gitHead": "be7c396a4fbbf7869c12cf2fd90e0c5c8f3ed46e",
   "dependencies": {
-    "@arcblock/bridge": "3.1.1",
+    "@arcblock/bridge": "3.1.3",
     "@arcblock/did": "^1.21.2",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.1.1",
-    "@arcblock/nft-display": "3.1.1",
-    "@arcblock/react-hooks": "3.1.1",
+    "@arcblock/icons": "3.1.3",
+    "@arcblock/nft-display": "3.1.3",
+    "@arcblock/react-hooks": "3.1.3",
     "@blocklet/js-sdk": "^1.16.46",
-    "@blocklet/theme": "3.1.1",
+    "@blocklet/theme": "3.1.3",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",

package/src/DIDConnect/auth-apps/index.tsx

@@ -44,6 +44,7 @@ export default function AuthApps({
   hideSwitchConnect = false,
   hideAuthorize = false,
   hideCancel = false,
+  hideButton = false,
 
   notThisText = undefined,
   authorizeText = undefined,
@@ -68,6 +69,7 @@ export default function AuthApps({
   hideSwitchConnect?: boolean;
   hideAuthorize?: boolean;
   hideCancel?: boolean;
+  hideButton?: boolean;
 
   notThisText?: string;
   authorizeText?: string;
@@ -170,52 +172,56 @@ export default function AuthApps({
 
             {children}
 
-            <Box
-              sx={{
-                border: '1px solid',
-                borderColor: 'divider',
-                borderRadius: 2,
-                overflow: 'hidden',
-                my: 1,
-              }}
-            />
-
-            <Stack direction="row" spacing={2}>
-              {!hideCancel ? (
-                <Button
-                  color="inherit"
-                  variant="outlined"
-                  size="large"
-                  fullWidth
-                  onClick={handleCancel}
+            {hideButton ? null : (
+              <>
+                <Box
                   sx={{
-                    color: 'grey.500',
-                  }}>
-                  {cancelText || t('cancel')}
-                </Button>
-              ) : null}
-              {user && !hideAuthorize ? (
-                <Button
-                  variant="contained"
-                  size="large"
-                  fullWidth
-                  onClick={handleAuthorize}
-                  disabled={currentState.loading}>
-                  {currentState.loading ? <CircularProgress size={20} sx={{ mr: 1 }} /> : null}
-                  {authorizeText || t('authorize')}
-                </Button>
-              ) : (
-                <Button
-                  variant="contained"
-                  size="large"
-                  fullWidth
-                  disabled={currentState.loading}
-                  onClick={handleConnect}>
-                  {currentState.loading ? <CircularProgress size={20} sx={{ mr: 1 }} /> : null}
-                  {connectText || t('connect')}
-                </Button>
-              )}
-            </Stack>
+                    border: '1px solid',
+                    borderColor: 'divider',
+                    borderRadius: 2,
+                    overflow: 'hidden',
+                    my: 1,
+                  }}
+                />
+
+                <Stack direction="row" spacing={2}>
+                  {!hideCancel ? (
+                    <Button
+                      color="inherit"
+                      variant="outlined"
+                      size="large"
+                      fullWidth
+                      onClick={handleCancel}
+                      sx={{
+                        color: 'grey.500',
+                      }}>
+                      {cancelText || t('cancel')}
+                    </Button>
+                  ) : null}
+                  {user && !hideAuthorize ? (
+                    <Button
+                      variant="contained"
+                      size="large"
+                      fullWidth
+                      onClick={handleAuthorize}
+                      disabled={currentState.loading}>
+                      {currentState.loading ? <CircularProgress size={20} sx={{ mr: 1 }} /> : null}
+                      {authorizeText || t('authorize')}
+                    </Button>
+                  ) : (
+                    <Button
+                      variant="contained"
+                      size="large"
+                      fullWidth
+                      disabled={currentState.loading}
+                      onClick={handleConnect}>
+                      {currentState.loading ? <CircularProgress size={20} sx={{ mr: 1 }} /> : null}
+                      {connectText || t('connect')}
+                    </Button>
+                  )}
+                </Stack>
+              </>
+            )}
 
             {hideSwitchConnect || !user ? null : (
               <Box sx={{ textAlign: 'center' }}>

package/src/DIDLogo/index.tsx

@@ -52,7 +52,8 @@ export default function DIDLogo({
 }: DIDLogoProps) {
   const isContained = variant === 'contained';
   const currentPreset = presetMap[name as keyof typeof presetMap] || presetMap.default;
-  const finalText = text || currentPreset?.text;
+  // 可通过传入 text = null，强制隐藏文字
+  const finalText = text === undefined ? currentPreset?.text : text;
   const finalColor = color || currentPreset?.color;
   const finalTextColor = textColor || (dark ? 'white' : '#121212');