@arcblock/ux 3.0.29 → 3.0.31

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

@@ -1,10 +1,11 @@
 import { BoxProps } from '@mui/material';
 import { UserPublicInfo } from '@blocklet/js-sdk';
+import { Ref } from 'react';
 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, }: {
+export default function AuthApps({ session, requestAppInfo, currentAppInfo, children, userInfo, hideSwitchConnect, hideAuthorize, hideCancel, notThisText, authorizeText, connectText, cancelText, useAnotherText, slotProps, onConnect, onAuthorize, onSwitchConnect, onCancel, ref, }: {
     session: any;
     requestAppInfo: RequestAppInfo;
     currentAppInfo: CurrentAppInfo;
@@ -27,4 +28,7 @@ export default function AuthApps({ session, requestAppInfo, currentAppInfo, chil
     onAuthorize?: (done: () => void) => void;
     onSwitchConnect?: (done: () => void) => void;
     onCancel?: () => void;
+    ref: Ref<{
+        closeLoading: () => void;
+    }>;
 }): import("react/jsx-runtime").JSX.Element;

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

@@ -1,17 +1,18 @@
-import { jsx as e, jsxs as o, Fragment as U } from "react/jsx-runtime";
+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 d from "lodash/noop";
-import H from "../did-connect-container.js";
-import J from "./auth-apps-info.js";
-import K from "../../Center/index.js";
-import O from "../landing-page.js";
-import { translate as Q } from "../../Locale/util.js";
-import { useLocaleContext as V } from "../../Locale/context.js";
-import X from "../../UserCard/index.js";
-import { InfoType as Y, CardType as Z } from "../../UserCard/types.js";
+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 _ = {
+const P = {
   en: {
     notThis: "Not this?",
     useAnother: "Use another",
@@ -27,8 +28,8 @@ const _ = {
     cancel: "取消"
   }
 };
-function ue({
-  session: c,
+function pe({
+  session: s,
   requestAppInfo: p,
   currentAppInfo: f,
   children: g = null,
@@ -42,28 +43,31 @@ function ue({
   cancelText: k = void 0,
   useAnotherText: T = void 0,
   slotProps: r = void 0,
-  onConnect: w = d,
-  onAuthorize: D = d,
-  onSwitchConnect: I = d,
-  onCancel: L = d
+  onConnect: w = c,
+  onAuthorize: D = c,
+  onSwitchConnect: I = c,
+  onCancel: L = c,
+  ref: S
 }) {
   const n = G({
     loading: !1
-  }), { locale: S = "en" } = V() || {}, t = i((M, R = {}) => Q(_, M, S, "en", R)), s = i(() => {
+  }), { locale: W = "en" } = Y() || {}, t = i((R, U = {}) => X(P, R, W, "en", U)), a = i(() => {
     n.loading = !1;
-  }), W = i(() => {
-    n.loading = !0, w?.(s);
   }), j = i(() => {
-    n.loading = !0, I?.(s);
+    n.loading = !0, w?.(a);
   }), B = i(() => {
-    n.loading = !0, D?.(s);
+    n.loading = !0, I?.(a);
   }), F = i(() => {
+    n.loading = !0, D?.(a);
+  }), M = i(() => {
     L?.();
   });
-  if (c.loading || !c.initialized)
-    return /* @__PURE__ */ e(K, { children: /* @__PURE__ */ e(u, {}) });
-  const a = x ?? c?.user;
-  return /* @__PURE__ */ e(O, { did: window.blocklet?.appPid, standalone: !0, children: /* @__PURE__ */ e(
+  if (J(S, () => ({
+    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(
     l,
     {
       ...r?.root,
@@ -74,7 +78,7 @@ function ue({
         },
         r?.root?.sx
       ),
-      children: /* @__PURE__ */ e(H, { hideCloseButton: !0, ...r?.didConnectContainer, children: /* @__PURE__ */ o(
+      children: /* @__PURE__ */ e(K, { hideCloseButton: !0, ...r?.didConnectContainer, children: /* @__PURE__ */ o(
         l,
         {
           ...r?.contentContainer,
@@ -97,9 +101,9 @@ function ue({
             r?.contentContainer?.sx
           ),
           children: [
-            /* @__PURE__ */ e(J, { requestAppInfo: p, currentAppInfo: f }),
-            a ? /* @__PURE__ */ o(U, { children: [
-              /* @__PURE__ */ e(X, { user: a, showDid: !0, cardType: Z.Detailed, infoType: Y.Minimal }),
+            /* @__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(l, {})
             ] }) : null,
             g,
@@ -123,20 +127,20 @@ function ue({
                   variant: "outlined",
                   size: "large",
                   fullWidth: !0,
-                  onClick: F,
+                  onClick: M,
                   sx: {
                     color: "grey.500"
                   },
                   children: k || t("cancel")
                 }
               ),
-              a && !v ? /* @__PURE__ */ o(
+              d && !v ? /* @__PURE__ */ o(
                 h,
                 {
                   variant: "contained",
                   size: "large",
                   fullWidth: !0,
-                  onClick: B,
+                  onClick: F,
                   disabled: n.loading,
                   children: [
                     n.loading ? /* @__PURE__ */ e(u, { size: 20, sx: { mr: 1 } }) : null,
@@ -150,7 +154,7 @@ function ue({
                   size: "large",
                   fullWidth: !0,
                   disabled: n.loading,
-                  onClick: W,
+                  onClick: j,
                   children: [
                     n.loading ? /* @__PURE__ */ e(u, { size: 20, sx: { mr: 1 } }) : null,
                     b || t("connect")
@@ -158,7 +162,7 @@ function ue({
                 }
               )
             ] }),
-            C || !a ? null : /* @__PURE__ */ e(l, { sx: { textAlign: "center" }, children: /* @__PURE__ */ o(
+            C || !d ? null : /* @__PURE__ */ e(l, { sx: { textAlign: "center" }, children: /* @__PURE__ */ o(
               q,
               {
                 variant: "body2",
@@ -175,7 +179,7 @@ function ue({
                     E,
                     {
                       underline: "hover",
-                      onClick: j,
+                      onClick: B,
                       sx: {
                         cursor: "pointer"
                       },
@@ -192,5 +196,5 @@ function ue({
   ) });
 }
 export {
-  ue as default
+  pe as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.0.29",
+  "version": "3.0.31",
   "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": "3c3532881441518b47bce00147ba469a03baad78",
+  "gitHead": "0a320cf26cee69b651a5cd708cd4fc0e44667cd7",
   "dependencies": {
-    "@arcblock/bridge": "3.0.29",
-    "@arcblock/did": "^1.20.15",
+    "@arcblock/bridge": "3.0.31",
+    "@arcblock/did": "^1.21.0",
     "@arcblock/did-motif": "^1.1.14",
-    "@arcblock/icons": "3.0.29",
-    "@arcblock/nft-display": "3.0.29",
-    "@arcblock/react-hooks": "3.0.29",
+    "@arcblock/icons": "3.0.31",
+    "@arcblock/nft-display": "3.0.31",
+    "@arcblock/react-hooks": "3.0.31",
     "@blocklet/js-sdk": "^1.16.46",
-    "@blocklet/theme": "3.0.29",
+    "@blocklet/theme": "3.0.31",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",
@@ -77,7 +77,7 @@
     "@iconify-icons/mdi": "^1.2.48",
     "@iconify-icons/tabler": "^1.2.95",
     "@iconify/react": "^5.2.1",
-    "@ocap/mcrypto": "^1.20.15",
+    "@ocap/mcrypto": "^1.21.0",
     "@solana/qr-code-styling": "^1.6.0",
     "@types/dompurify": "^3.2.0",
     "@types/mui-datatables": "^4.3.12",

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

@@ -2,6 +2,7 @@ import { Box, BoxProps, Button, CircularProgress, Link, Stack, SxProps, Typograp
 import { useMemoizedFn, useReactive } from 'ahooks';
 import noop from 'lodash/noop';
 import type { UserPublicInfo } from '@blocklet/js-sdk';
+import { useImperativeHandle, Ref } from 'react';
 
 import DIDConnectContainer from '../did-connect-container';
 import AuthAppsInfo, { type RequestAppInfo, type CurrentAppInfo } from './auth-apps-info';
@@ -56,6 +57,7 @@ export default function AuthApps({
   onAuthorize = noop,
   onSwitchConnect = noop,
   onCancel = noop,
+  ref,
 }: {
   session: any;
   requestAppInfo: RequestAppInfo;
@@ -83,6 +85,7 @@ export default function AuthApps({
   onAuthorize?: (done: () => void) => void;
   onSwitchConnect?: (done: () => void) => void;
   onCancel?: () => void;
+  ref: Ref<{ closeLoading: () => void }>;
 }) {
   const currentState = useReactive({
     loading: false,
@@ -110,6 +113,10 @@ export default function AuthApps({
     onCancel?.();
   });
 
+  useImperativeHandle(ref, () => ({
+    closeLoading: handleCloseLoading,
+  }));
+
   if (session.loading || !session.initialized) {
     return (
       <Center>