@arcblock/did-connect-react 3.4.0 → 3.4.2

package/lib/Connect/connect.js

@@ -1,107 +1,108 @@
-import { jsx as t, jsxs as b, Fragment as qe } from "react/jsx-runtime";
-import { use as He, useRef as le, useState as Ve, useEffect as ue } from "react";
+import { jsx as t, jsxs as b, Fragment as He } from "react/jsx-runtime";
+import { use as Ve, useRef as ce, useState as Ye, useEffect as le } from "react";
 import e from "prop-types";
-import { Box as i, Skeleton as Ye, Divider as Ge } from "@mui/material";
-import { useUpdate as Ke, useSize as Qe, useCreation as u, useMount as de, useMemoizedFn as F, useDebounceFn as Xe, usePrevious as Je, useUpdateEffect as Ze } from "ahooks";
+import { Box as i, Skeleton as Ge, Divider as Ke } from "@mui/material";
+import { useUpdate as Qe, useSize as Xe, useCreation as u, useMount as ue, useMemoizedFn as F, useDebounceFn as Je, usePrevious as Ze, useUpdateEffect as $e } from "ahooks";
 import C from "lodash/noop";
-import $e from "lodash/isUndefined";
-import et from "@arcblock/ux/lib/CloseButton";
-import { DID_CONNECT_MEDIUM_WIDTH as N, LOGIN_PROVIDER_NAME as tt, DID_CONNECT_SMALL_WIDTH as ot, OAUTH_PROVIDER as j, LOGIN_PROVIDER as rt } from "@arcblock/ux/lib/Util/constant";
-import nt from "@arcblock/ux/lib/QRCode";
-import { DIDConnectFooter as it } from "@arcblock/ux/lib/DIDConnect";
-import { useTheme as st } from "@arcblock/ux/lib/Theme";
-import at from "@arcblock/ux/lib/DIDConnect/provider-icon";
+import et from "lodash/isUndefined";
+import tt from "@arcblock/ux/lib/CloseButton";
+import { DID_CONNECT_MEDIUM_WIDTH as N, LOGIN_PROVIDER_NAME as ot, DID_CONNECT_SMALL_WIDTH as rt, OAUTH_PROVIDER as j, LOGIN_PROVIDER as nt } from "@arcblock/ux/lib/Util/constant";
+import it from "@arcblock/ux/lib/QRCode";
+import { DIDConnectFooter as st } from "@arcblock/ux/lib/DIDConnect";
+import { useTheme as at } from "@arcblock/ux/lib/Theme";
+import ct from "@arcblock/ux/lib/DIDConnect/provider-icon";
 import "@fontsource/lexend/400.css";
 import "@fontsource/lexend/600.css";
-import { SessionContext as ct } from "../Session/context.js";
-import { StateProvider as lt, useStateContext as ut } from "./contexts/state.js";
-import dt from "./components/login-item/connect-provider-list.js";
-import ft from "./components/auto-height.js";
-import mt from "./hooks/token.js";
-import { useOAuth as pt } from "../OAuth/context.js";
-import ht from "./components/connect-status.js";
-import { usePasskey as bt } from "../Passkey/context.js";
-import { CHECK_STATUS_INTERVAL as gt, API_DID_PREFIX as xt, BUSY_STATUS as w, DEFAULT_TIMEOUT as Ct } from "../constant.js";
+import { SessionContext as lt } from "../Session/context.js";
+import { StateProvider as ut, useStateContext as dt } from "./contexts/state.js";
+import ft from "./components/login-item/connect-provider-list.js";
+import mt from "./components/auto-height.js";
+import pt from "./hooks/token.js";
+import { useOAuth as ht } from "../OAuth/context.js";
+import bt from "./components/connect-status.js";
+import { usePasskey as gt } from "../Passkey/context.js";
+import { CHECK_STATUS_INTERVAL as xt, API_DID_PREFIX as Ct, BUSY_STATUS as w, DEFAULT_TIMEOUT as yt } from "../constant.js";
 import "../utils.js";
-import yt from "./components/did-connect-title.js";
-import St from "./components/download-tips.js";
-import kt from "./hooks/provider-list.js";
-import wt from "./hooks/auth-url.js";
-import { getWalletDid as It } from "../User/use-did.js";
-import vt from "./fallback-connect.js";
-import { getWebWalletUrl as Pt } from "@arcblock/ux/lib/Util/wallet";
-function fe({
+import St from "./components/did-connect-title.js";
+import kt from "./components/download-tips.js";
+import wt from "./hooks/provider-list.js";
+import It from "./hooks/auth-url.js";
+import { getWalletDid as vt } from "../User/use-did.js";
+import Pt from "./fallback-connect.js";
+import { getWebWalletUrl as _t } from "@arcblock/ux/lib/Util/wallet";
+function de({
   hideCloseButton: y = !1,
   mode: p = "dialog",
   action: I,
   baseUrl: g = "",
   checkFn: v,
-  checkInterval: P = gt,
-  checkTimeout: _ = Ct * 1e3,
-  prefix: D = xt,
+  checkInterval: P = xt,
+  checkTimeout: _ = yt * 1e3,
+  prefix: D = Ct,
   tokenKey: B = "_t_",
   locale: q = "en",
-  encKey: me = "_ek_",
-  autoConnect: pe = !0,
+  encKey: fe = "_ek_",
+  autoConnect: me = !0,
   forceConnected: H = !0,
-  saveConnect: he = !0,
-  useSocket: be = !0,
+  saveConnect: pe = !0,
+  useSocket: he = !0,
   allowWallet: V = !0,
-  provider: ge = "",
+  provider: be = "",
   messages: d = {},
   passkeyBehavior: Y = "none",
-  webWalletUrl: xe = Pt(),
-  enabledConnectTypes: Ce = ["web", "mobile", ...Object.keys(j)],
+  webWalletUrl: ge = _t(),
+  enabledConnectTypes: xe = ["web", "mobile", ...Object.keys(j)],
   extraContent: G = null,
   disableSwitchApp: T = !1,
   magicToken: K = void 0,
-  customItems: ye = [],
+  customItems: Ce = [],
   onClose: O = C,
   onError: Q = C,
   onSuccess: R = C,
   onRecreateSession: X = C,
-  setColor: Se = C
+  setColor: ye = C
 }) {
-  const A = st(), J = Ke(), ke = He(ct), we = It(ke?.session?.user), {
+  const A = at(), J = Qe(), Se = Ve(lt), ke = vt(Se?.session?.user), {
     t: Z,
-    staticState: Ie,
+    staticState: we,
     connectState: s,
-    extraParams: ve,
-    currentAppInfo: Pe,
+    extraParams: Ie,
+    currentAppInfo: ve,
     currentAppColor: W,
     // 插件相关
     selectedPlugin: a,
     blocklet: $,
-    masterBlocklet: _e,
+    masterBlocklet: Pe,
     showWalletOptions: f,
-    setShowWalletOptions: De
-  } = ut(), { state: o, generate: ee, cancelWhenScanned: Te } = mt({
+    setShowWalletOptions: _e,
+    lastLoginMethod: De
+  } = dt(), { state: o, generate: ee, cancelWhenScanned: Te } = pt({
     action: I,
     baseUrl: g,
     checkFn: v,
     checkInterval: P,
     checkTimeout: _,
-    extraParams: ve,
+    extraParams: Ie,
     prefix: D,
     onError: Q,
     onSuccess: R,
     locale: q,
     tokenKey: B,
-    encKey: me,
-    autoConnect: pe,
-    forceConnected: H === !0 ? we || !0 : H,
-    saveConnect: he,
-    useSocket: be,
-    provider: ge
-  }), z = le(!1), te = le(null), x = Qe(te), oe = u(() => x ? x.width < N - 50 : !0, [x, x?.width]), [re, Oe] = Ve(!1);
-  de(() => {
+    encKey: fe,
+    autoConnect: me,
+    forceConnected: H === !0 ? ke || !0 : H,
+    saveConnect: pe,
+    useSocket: he,
+    provider: be
+  }), z = ce(!1), te = ce(null), x = Xe(te), oe = u(() => x ? x.width < N - 50 : !0, [x, x?.width]), [re, Oe] = Ye(!1);
+  ue(() => {
     Oe(x?.width < N - 50);
   });
-  const { oauthState: c, setBaseUrl: Re } = pt(), { passkeyState: l, setTargetAppPid: Ae } = bt();
-  de(() => {
+  const { oauthState: c, setBaseUrl: Re } = ht(), { passkeyState: l, setTargetAppPid: Ae } = gt();
+  ue(() => {
     Re(g), Ae($?.appPid), o.reset(), c.reset(), l.reset();
-  }), ue(() => {
-    Se(W);
+  }), le(() => {
+    ye(W);
   }, [W]);
   const We = u(() => ({
     confirm: d.confirm,
@@ -119,31 +120,32 @@ function fe({
   }), ze = F(() => {
     s?.retryConnect();
   }), Ee = F(() => {
-    X(), c.reset(), l.reset(), a?.state?.reset(), Ie.current.cancelCount++, Te();
-  }), { run: Ue } = Xe(
+    X(), c.reset(), l.reset(), a?.state?.reset(), we.current.cancelCount++, Te();
+  }), { run: Le } = Je(
     () => {
       z.current || o.status === "timeout" && (z.current = !0, o.reset(), ne(), z.current = !1);
     },
     { leading: !0, trailing: !1 }
   );
-  ue(Ue, [o.status]);
-  const Le = u(() => tt[s.chooseMethod] || "DID Wallet", [s.chooseMethod]), { providerList: Me, hideQRCode: m, hideChooseList: r, loadingProviderList: Fe } = kt({
+  le(Le, [o.status]);
+  const Me = u(() => ot[s.chooseMethod] || "DID Wallet", [s.chooseMethod]), { providerList: Ue, hideQRCode: m, hideChooseList: r, loadingProviderList: Fe } = wt({
     action: o.action,
     sourceAppPid: s?.sourceAppPid,
     allowWallet: V,
     passkeyBehavior: Y,
     mode: p,
-    blocklet: s?.sourceAppPid ? _e : $,
-    isSmallView: oe
-  }), Ne = Je(s?.sourceAppPid);
-  Ze(() => {
-    $e(Ne) || ee();
+    blocklet: s?.sourceAppPid ? Pe : $,
+    isSmallView: oe,
+    lastLoginMethod: De
+  }), Ne = Ze(s?.sourceAppPid);
+  $e(() => {
+    et(Ne) || ee();
   }, [s?.sourceAppPid]);
   const n = (k) => {
     const h = A.spacing(k);
     return parseInt(h, 10);
   }, je = u(() => y ? null : /* @__PURE__ */ t(
-    et,
+    tt,
     {
       onClose: O,
       sx: {
@@ -152,19 +154,17 @@ function fe({
         top: 14
       }
     }
-  ), [y, O]);
-  let ie = null;
-  S && (ie = /* @__PURE__ */ t(
+  ), [y, O]), Be = /* @__PURE__ */ t(
     i,
     {
       sx: {
         flex: 1,
-        display: "flex",
+        display: S ? "flex" : "none",
         alignItems: "center",
         justifyContent: "center"
       },
       children: /* @__PURE__ */ t(i, { children: /* @__PURE__ */ t(
-        ht,
+        bt,
         {
           status: a?.state?.computedStatus || c.status || l.status || o.status,
           nextWorkflow: o.nextWorkflow,
@@ -175,30 +175,29 @@ function fe({
           messages: We,
           locale: q,
           className: "did-connect__auth-status auth-status",
-          loadingIcon: s.chooseMethod ? /* @__PURE__ */ t(at, { provider: s.chooseMethod, sx: { color: "text.primary" } }) : null,
-          chooseMethod: Le,
+          loadingIcon: s.chooseMethod ? /* @__PURE__ */ t(ct, { provider: s.chooseMethod, sx: { color: "text.primary" } }) : null,
+          chooseMethod: Me,
           hideRetry: s.chooseMethod === "email",
           hideBack: !!K
         }
       ) })
     }
-  ));
-  const se = wt({ disableSwitchApp: T, tokenState: o }), E = u(() => {
+  ), ie = It({ disableSwitchApp: T, tokenState: o }), E = u(() => {
     const k = A.mode === "dark" ? A.palette.grey[600] : "white";
-    let h = r ? 240 - n(3) * 2 : 196 - n(2) * 2, M = r ? 3 : 2;
-    return f && (M = 1, h += n(M) * 2), /* @__PURE__ */ t(
+    let h = r ? 240 - n(3) * 2 : 196 - n(2) * 2, U = r ? 3 : 2;
+    return f && (U = 1, h += n(U) * 2), /* @__PURE__ */ t(
       i,
       {
         className: "did-connect__qrcode",
         sx: {
-          p: M,
+          p: U,
           width: (r ? 240 : 196) + n(1) * 2,
           height: (r ? 240 : 196) + n(1) * 2
         },
         children: o.url ? /* @__PURE__ */ t(
-          nt,
+          it,
           {
-            data: se,
+            data: ie,
             size: h,
             sx: {
               width: h + n(1) * 2,
@@ -220,7 +219,7 @@ function fe({
             }
           }
         ) : /* @__PURE__ */ t(
-          Ye,
+          Ge,
           {
             animation: "wave",
             variant: "rectangular",
@@ -239,7 +238,7 @@ function fe({
         )
       }
     );
-  }, [se, r, f]), Be = u(() => r ? "column-reverse" : !m && re ? "column" : "row", [r, re, m]), ae = u(() => E ? /* @__PURE__ */ t(
+  }, [ie, r, f]), qe = u(() => r ? "column-reverse" : !m && re ? "column" : "row", [r, re, m]), se = u(() => E ? /* @__PURE__ */ t(
     i,
     {
       sx: {
@@ -289,7 +288,7 @@ function fe({
                 children: [
                   Z("scanWithWallet1"),
                   " ",
-                  /* @__PURE__ */ t(St, {}),
+                  /* @__PURE__ */ t(kt, {}),
                   " ",
                   Z("scanWithWallet2")
                 ]
@@ -299,13 +298,13 @@ function fe({
         }
       )
     }
-  ) : null, [E, r, f]), U = /* @__PURE__ */ b(
+  ) : null, [E, r, f]), L = /* @__PURE__ */ b(
     i,
     {
       className: "did-connect__body",
       sx: {
         display: "flex",
-        flexDirection: Be,
+        flexDirection: qe,
         justifyContent: "center",
         alignItems: "stretch",
         flex: 1,
@@ -314,10 +313,10 @@ function fe({
         px: r ? 2 : 0
       },
       children: [
-        !S && !m ? /* @__PURE__ */ b(qe, { children: [
-          ae,
+        !S && !m ? /* @__PURE__ */ b(He, { children: [
+          se,
           r ? null : /* @__PURE__ */ t(i, { children: /* @__PURE__ */ t(
-            Ge,
+            Ke,
             {
               orientation: "vertical",
               sx: {
@@ -339,9 +338,9 @@ function fe({
               flex: 1
             },
             children: [
-              ie,
+              Be,
               /* @__PURE__ */ t(
-                dt,
+                ft,
                 {
                   slotProps: {
                     root: {
@@ -356,17 +355,17 @@ function fe({
                   tokenKey: B,
                   onSuccess: R,
                   passkeyBehavior: Y,
-                  webWalletUrl: xe,
+                  webWalletUrl: ge,
                   extraContent: G,
-                  enabledConnectTypes: Ce,
+                  enabledConnectTypes: xe,
                   onReset: ne,
                   disableSwitchApp: T,
                   forceUpdate: J,
                   magicToken: K,
                   baseUrl: g,
-                  customItems: ye,
-                  providerList: Me,
-                  qrcode: ae
+                  customItems: Ce,
+                  providerList: Ue,
+                  qrcode: se
                 }
               )
             ]
@@ -375,15 +374,15 @@ function fe({
       ]
     }
   );
-  let L = U;
-  a ? L = a.renderPlaceholder({
-    fallback: U,
+  let M = L;
+  a ? M = a.renderPlaceholder({
+    fallback: L,
     forceUpdate: J,
     onSuccess: R,
     onError: Q
-  }) : L = U;
-  const ce = m || S ? ot : N;
-  return Fe ? /* @__PURE__ */ t(vt, {}) : /* @__PURE__ */ b(
+  }) : M = L;
+  const ae = m || S ? rt : N;
+  return Fe ? /* @__PURE__ */ t(Pt, {}) : /* @__PURE__ */ b(
     i,
     {
       ref: te,
@@ -397,7 +396,7 @@ function fe({
         maxWidth: "100%",
         width: (
           // eslint-disable-next-line no-nested-ternary
-          p === "drawer" ? "100%" : f ? ce - 20 : ce
+          p === "drawer" ? "100%" : f ? ae - 20 : ae
         ),
         transition: "width 0.2s ease-in-out",
         margin: "auto",
@@ -408,24 +407,24 @@ function fe({
       children: [
         /* @__PURE__ */ t(i, { "data-did-auth-url": o.url, sx: { display: "none" } }),
         /* @__PURE__ */ t(
-          yt,
+          St,
           {
             title: d.title,
             description: d.scan,
             extraContent: G,
             disableSwitchApp: T,
             showWalletOptions: f,
-            onBack: () => De(!1)
+            onBack: () => _e(!1)
           }
         ),
-        /* @__PURE__ */ t(ft, { initHeight: 72, children: L }),
-        /* @__PURE__ */ t(it, { currentAppInfo: Pe, currentAppColor: W }),
+        /* @__PURE__ */ t(mt, { initHeight: 72, children: M }),
+        /* @__PURE__ */ t(st, { currentAppInfo: ve, currentAppColor: W }),
         je
       ]
     }
   );
 }
-fe.propTypes = {
+de.propTypes = {
   mode: e.oneOf(["dialog", "drawer", "page"]),
   action: e.string.isRequired,
   baseUrl: e.string,
@@ -447,7 +446,7 @@ fe.propTypes = {
   enabledConnectTypes: e.arrayOf(e.oneOf(["web", "mobile", ...Object.keys(j)])),
   webWalletUrl: e.string,
   allowWallet: e.bool,
-  provider: e.oneOf([rt.WALLET, ...Object.keys(j), ""]),
+  provider: e.oneOf([nt.WALLET, ...Object.keys(j), ""]),
   hideCloseButton: e.bool,
   disableSwitchApp: e.bool,
   onClose: e.func,
@@ -458,12 +457,12 @@ fe.propTypes = {
   magicToken: e.string,
   customItems: e.arrayOf(e.node)
 };
-function _t({ testOnlyBorderColor: y = void 0, ...p }) {
+function Dt({ testOnlyBorderColor: y = void 0, ...p }) {
   const { checkFn: I, extraParams: g = {}, blocklet: v, masterBlocklet: P, action: _, locale: D = "en" } = p;
   if (typeof I != "function")
     throw new Error("Cannot initialize did connect component without a fetchFn");
   return /* @__PURE__ */ t(
-    lt,
+    ut,
     {
       blocklet: v,
       masterBlocklet: P,
@@ -483,11 +482,11 @@ function _t({ testOnlyBorderColor: y = void 0, ...p }) {
           boxSizing: "border-box"
         }
       },
-      children: /* @__PURE__ */ t(fe, { ...p })
+      children: /* @__PURE__ */ t(de, { ...p })
     }
   );
 }
-_t.propTypes = {
+Dt.propTypes = {
   checkFn: e.func.isRequired,
   extraParams: e.object,
   blocklet: e.object.isRequired,
@@ -497,5 +496,5 @@ _t.propTypes = {
   testOnlyBorderColor: e.string
 };
 export {
-  _t as default
+  Dt as default
 };