@arcblock/did-connect-react 3.4.13 → 3.4.15

package/lib/Connect/components/login-item/passkey-login-item.js

@@ -1,46 +1,44 @@
-import { jsx as a } from "react/jsx-runtime";
+import { jsx as l } from "react/jsx-runtime";
 import e from "prop-types";
-import { useRef as l, useImperativeHandle as d } from "react";
+import { useRef as d, useImperativeHandle as S } from "react";
 import { useMemoizedFn as y } from "ahooks";
-import { LOGIN_PROVIDER as P } from "@arcblock/ux/lib/Util/constant";
-import A from "../../../Passkey/actions.js";
-import { getAppId as I } from "../../../utils.js";
-import { useStateContext as R } from "../../contexts/state.js";
-function x({ ref: p = null, onSuccess: i, tokenState: o, behavior: n = "none", ...c }) {
-  const { extraParams: r, lastLoginMethod: t } = R(), s = l(null), m = y(
-    (f) => i(
-      {
-        ...f,
-        encrypted: !1
-      },
-      (u) => u,
-      {
-        sourceAppPid: r?.sourceAppPid,
-        connected_app: I(o.appInfo, o.memberAppInfo)
-      }
-    )
-  );
-  return d(p, () => ({
+import { LAST_USED_LOGIN_METHOD as A, LOGIN_PROVIDER as p } from "@arcblock/ux/lib/Util/constant";
+import I from "../../../Passkey/actions.js";
+import { getAppId as P } from "../../../utils.js";
+import { useStateContext as L } from "../../contexts/state.js";
+function R({ ref: i = null, onSuccess: c, tokenState: o, behavior: n = "none", ...m }) {
+  const { extraParams: t, lastLoginMethod: r } = L(), s = d(null), a = y((u) => (localStorage.setItem(A, p.PASSKEY), c(
+    {
+      ...u,
+      encrypted: !1
+    },
+    (f) => f,
+    {
+      sourceAppPid: t?.sourceAppPid,
+      connected_app: P(o.appInfo, o.memberAppInfo)
+    }
+  )));
+  return S(i, () => ({
     connect: s.current.click
-  })), n === "none" ? null : /* @__PURE__ */ a(
-    A,
+  })), n === "none" ? null : /* @__PURE__ */ l(
+    I,
     {
-      ...c,
+      ...m,
       ref: s,
-      isLatest: t && t === P.PASSKEY,
+      isLatest: r && r === p.PASSKEY,
       action: o.action,
       behavior: n,
-      onSuccess: m,
-      extraParams: r
+      onSuccess: a,
+      extraParams: t
     }
   );
 }
-x.propTypes = {
+R.propTypes = {
   onSuccess: e.func.isRequired,
   tokenState: e.object.isRequired,
   behavior: e.oneOf(["none", "both", "only-existing", "only-new"]),
   ref: e.any
 };
 export {
-  x as default
+  R as default
 };

package/lib/Connect/components/login-item/web-login-item.js

@@ -1,16 +1,16 @@
 import { jsx as p } from "react/jsx-runtime";
 import o from "prop-types";
-import { CircularProgress as _ } from "@mui/material";
-import { useReactive as w, useMemoizedFn as I, useCreation as f } from "ahooks";
-import { detectWalletExtension as C, openWebWallet as E } from "@arcblock/ux/lib/Util";
-import { mergeSx as O } from "@arcblock/ux/lib/Util/style";
+import { CircularProgress as O } from "@mui/material";
+import { useReactive as R, useMemoizedFn as I, useCreation as a } from "ahooks";
+import { detectWalletExtension as w, openWebWallet as A } from "@arcblock/ux/lib/Util";
+import { mergeSx as C } from "@arcblock/ux/lib/Util/style";
 import P from "lodash/noop";
-import v from "lodash/omit";
-import { useImperativeHandle as A } from "react";
+import T from "lodash/omit";
+import { useImperativeHandle as v } from "react";
 import y from "@arcblock/ux/lib/DIDConnect/provider-icon";
-import { LOGIN_PROVIDER_ICON_SIZE as a, LOGIN_PROVIDER as T } from "@arcblock/ux/lib/Util/constant";
-import N from "./login-method-item.js";
-import { useStateContext as U } from "../../contexts/state.js";
+import { WALLET_LOGIN_METHOD as N, LOGIN_PROVIDER_ICON_SIZE as f, LOGIN_PROVIDER as M } from "@arcblock/ux/lib/Util/constant";
+import U from "./login-method-item.js";
+import { useStateContext as G } from "../../contexts/state.js";
 import { EXT_DOWNLOAD_URL as g } from "../../../constant.js";
 import j from "../../hooks/auth-url.js";
 function q({
@@ -18,54 +18,56 @@ function q({
   tokenState: r,
   locale: D = "en",
   webWalletUrl: b,
-  onClick: h = P,
-  disableSwitchApp: W = !1,
+  onClick: W = P,
+  disableSwitchApp: h = !1,
   autoConnect: t = !0,
   ...u
 }) {
-  const { browserBrand: l } = U(), s = C(), n = w({
+  const { browserBrand: l, connectState: L } = G(), s = w(), n = R({
     loading: !1
-  }), R = j({ disableSwitchApp: W, tokenState: r }), c = I(() => {
+  }), E = j({ disableSwitchApp: h, tokenState: r }), c = I(() => {
     if (!t)
       return;
-    n.loading = !0, E({
+    n.loading = !0;
+    const e = A({
       webWalletUrl: b,
-      url: R,
+      url: E,
       locale: D,
       appInfo: r.appInfo,
       memberAppInfo: r.memberAppInfo
-    })?.type === "web" ? n.loading = !1 : setTimeout(() => {
+    });
+    L.walletMethod = N.WEB, e?.type === "web" ? n.loading = !1 : setTimeout(() => {
       n.loading = !1;
     }, 3e3);
   }), m = I((e) => {
-    r.url && (h(e), e?.preventDefault(), c());
+    r.url && (W(e), e?.preventDefault(), c());
   });
-  A(x, () => ({
+  v(x, () => ({
     connect: c
   }));
-  const i = f(() => l === "edge" ? g.edge : l === "chrome" ? g.chrome : null, [l]), d = f(() => {
+  const i = a(() => l === "edge" ? g.edge : l === "chrome" ? g.chrome : null, [l]), d = a(() => {
     const e = {};
     return s || !t ? e.onClick = m : i && t ? (e.component = "a", e.href = i, e.target = "_blank", e.rel = "noopener") : e.onClick = m, r.url || (e.sx = {
       cursor: "not-allowed"
     }), e;
-  }, [m, r.url]), L = f(() => t ? s || i ? "DID Wallet (Extension)" : "DID Wallet (Web)" : "DID Wallet", [s, i]);
+  }, [m, r.url]), _ = a(() => t ? s || i ? "DID Wallet (Extension)" : "DID Wallet (Web)" : "DID Wallet", [s, i]);
   return /* @__PURE__ */ p(
-    N,
+    U,
     {
       ...u,
-      sx: O(
+      sx: C(
         {
           textDecoration: "none"
         },
         u?.sx,
         d.sx
       ),
-      title: L,
+      title: _,
       icon: n.loading || !r.url ? /* @__PURE__ */ p(
-        _,
+        O,
         {
           color: "primary",
-          size: a,
+          size: f,
           sx: {
             "& svg": {
               transform: "scale(0.75)"
@@ -76,14 +78,14 @@ function q({
         y,
         {
           sx: {
-            width: a,
-            height: a,
+            width: f,
+            height: f,
             transform: "scale(0.9)"
           },
-          provider: T.DID_WALLET
+          provider: M.DID_WALLET
         }
       ),
-      ...v(d, "sx")
+      ...T(d, "sx")
     }
   );
 }