@arcblock/did-connect-react 3.4.8 → 3.4.10

package/lib/Connect/components/login-item/wallet-login-options.js

@@ -1,34 +1,37 @@
-import { jsxs as d, Fragment as p, jsx as e } from "react/jsx-runtime";
+import { jsxs as f, Fragment as p, jsx as e } from "react/jsx-runtime";
 import o from "prop-types";
-import { Box as t, Divider as C } from "@mui/material";
+import { Box as i, Divider as q } from "@mui/material";
 import { LOGIN_PROVIDER as u } from "@arcblock/ux/lib/Util/constant";
-import { checkSameProtocol as k, getWebWalletUrl as W } from "@arcblock/ux/lib/Util/wallet";
-import { detectWalletExtension as q } from "@arcblock/ux/lib/Util";
-import { useCreation as j } from "ahooks";
-import { useBrowser as T } from "@arcblock/react-hooks";
-import P from "./mobile-login-item.js";
-import v from "./web-login-item.js";
-import B from "../back-button.js";
-import { useStateContext as E } from "../../contexts/state.js";
-function I({
-  qrcode: b,
+import { checkSameProtocol as T, getWebWalletUrl as j } from "@arcblock/ux/lib/Util/wallet";
+import { detectWalletExtension as v } from "@arcblock/ux/lib/Util";
+import { useCreation as I } from "ahooks";
+import { useBrowser as P } from "@arcblock/react-hooks";
+import A from "./mobile-login-item.js";
+import B from "./web-login-item.js";
+import E from "../back-button.js";
+import { useStateContext as O } from "../../contexts/state.js";
+function S({
+  qrcode: g,
   tokenState: r,
-  webWalletUrl: n = W(),
+  webWalletUrl: n = j(),
   size: l = "small",
-  disableSwitchApp: m = !1,
+  disableSwitchApp: s = !1,
   tokenKey: x,
-  walletLoginRef: g = null,
+  walletLoginRef: b = null,
   webLoginRef: h = null,
   onMobileLoginClick: L,
-  onWebLoginClick: w,
-  onBack: s
+  onWebLoginClick: C,
+  onBack: a
 }) {
-  const { t: a, locale: y } = E(), i = T(), R = k(n), c = q(), f = j(() => i.mobile.tablet || !i.mobile.any && window?.navigator?.maxTouchPoints > 0, [i.mobile.tablet, i.mobile.any]);
-  return /* @__PURE__ */ d(p, { children: [
-    b,
-    /* @__PURE__ */ d(t, { sx: { width: "100%", display: "flex", flexDirection: "column", gap: 1.5 }, children: [
-      /* @__PURE__ */ e(t, { sx: { width: "100%" }, children: /* @__PURE__ */ e(
-        C,
+  const { t: c, locale: R } = O(), w = P(), k = T(n), m = v(), d = I(() => {
+    const t = navigator.userAgent.toLowerCase(), y = /ipad/.test(t) || navigator.platform === "MacIntel" && navigator.maxTouchPoints > 1, W = /android/.test(t) && !/mobile/.test(t);
+    return !!(y || W);
+  }, []);
+  return /* @__PURE__ */ f(p, { children: [
+    g,
+    /* @__PURE__ */ f(i, { sx: { width: "100%", display: "flex", flexDirection: "column", gap: 1.5 }, children: [
+      /* @__PURE__ */ e(i, { sx: { width: "100%" }, children: /* @__PURE__ */ e(
+        q,
         {
           orientation: "horizontal",
           sx: {
@@ -42,7 +45,7 @@ function I({
         }
       ) }),
       /* @__PURE__ */ e(
-        t,
+        i,
         {
           sx: {
             width: "100%",
@@ -57,43 +60,43 @@ function I({
               }
             }
           },
-          children: f ? /* @__PURE__ */ e(
-            P,
+          children: d ? /* @__PURE__ */ e(
+            A,
             {
-              t: a,
-              ref: g,
+              t: c,
+              ref: b,
               tokenState: r,
-              isTablet: f,
+              isTablet: d,
               sx: [l === "small" ? { p: 1 } : { p: 2 }],
-              locale: y,
+              locale: R,
               tokenKey: x,
-              disableSwitchApp: m,
+              disableSwitchApp: s,
               onClick: L
             },
             u.WALLET
           ) : (
             // eslint-disable-next-line react/jsx-no-useless-fragment
-            /* @__PURE__ */ e(p, { children: (R || c) && (!i.mobile.any || c) ? /* @__PURE__ */ e(
-              v,
+            /* @__PURE__ */ e(p, { children: (k || m) && (!w.mobile.any || m) ? /* @__PURE__ */ e(
+              B,
               {
-                t: a,
+                t: c,
                 ref: h,
                 tokenState: r,
                 webWalletUrl: n,
                 sx: [l === "small" ? { p: 1 } : { p: 2 }],
-                disableSwitchApp: m,
-                onClick: w
+                disableSwitchApp: s,
+                onClick: C
               },
               u.WALLET
             ) : null })
           )
         }
       ),
-      s && /* @__PURE__ */ e(B, { variant: "text", onClick: s })
+      a && /* @__PURE__ */ e(E, { variant: "text", onClick: a })
     ] })
   ] });
 }
-I.propTypes = {
+S.propTypes = {
   qrcode: o.node.isRequired,
   tokenState: o.object.isRequired,
   webWalletUrl: o.string,
@@ -107,5 +110,5 @@ I.propTypes = {
   onBack: o.func.isRequired
 };
 export {
-  I as default
+  S as default
 };

package/lib/Connect/hooks/provider-list.js

@@ -1,10 +1,10 @@
-import { useBrowser as k } from "@arcblock/react-hooks";
-import { useRequest as y, useCreation as p } from "ahooks";
-import i from "lodash/isNil";
+import { useBrowser as C } from "@arcblock/react-hooks";
+import { useRequest as T, useCreation as p } from "ahooks";
+import n from "lodash/isNil";
 import { LOGIN_PROVIDER as s } from "@arcblock/ux/lib/Util/constant";
-import { getFederatedEnabled as C, getMaster as T, getBlockletData as I } from "@arcblock/ux/lib/Util/federated";
-import { useState as S } from "react";
-const B = async ({ sourceAppPid: d }) => {
+import { getFederatedEnabled as y, getMaster as D, getBlockletData as I } from "@arcblock/ux/lib/Util/federated";
+import { useState as R } from "react";
+const S = async ({ sourceAppPid: d }) => {
   const t = globalThis?.blocklet;
   if (!t)
     return {
@@ -18,49 +18,52 @@ const B = async ({ sourceAppPid: d }) => {
         enabled: !0
       }
     };
-  const a = C(t), e = T(t);
-  return a && e?.appPid && d === e?.appPid ? (await I(e.appUrl))?.settings?.authentication || {} : t?.settings?.authentication || {};
-}, R = async ({ sourceAppPid: d } = {}) => {
-  const t = await B({ sourceAppPid: d });
-  return Object.entries(t).map(([e, o]) => ({ ...o, provider: e })).filter((e) => e.enabled).sort((e, o) => !i(e?.order) && !i(o?.order) ? e.order - o.order : i(e?.order) ? 1 : -1);
+  const l = y(t), e = D(t);
+  return l && e?.appPid && d === e?.appPid ? (await I(e.appUrl))?.settings?.authentication || {} : t?.settings?.authentication || {};
+}, B = async ({ sourceAppPid: d } = {}) => {
+  const t = await S({ sourceAppPid: d });
+  return Object.entries(t).map(([e, o]) => ({ ...o, provider: e })).filter((e) => e.enabled).sort((e, o) => !n(e?.order) && !n(o?.order) ? e.order - o.order : n(e?.order) ? 1 : -1);
 };
-function j({
+function Y({
   allowWallet: d = !0,
   passkeyBehavior: t = "none",
-  action: a,
+  action: l,
   sourceAppPid: e,
   mode: o = "dialog",
-  blocklet: b = globalThis.blocklet,
+  blocklet: P = globalThis.blocklet,
   isSmallView: L = !1,
-  lastLoginMethod: u = ""
+  lastLoginMethod: a = ""
 }) {
-  const [P, g] = S(!1), w = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], E = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], c = k(), { data: v = [] } = y(
+  const [m, g] = R(!1), w = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], E = ["login", "invite", "connect-to-did-space", "connect-to-did-domain", "destroy-self"], c = C(), { data: v = [] } = T(
     async () => {
       g(!0);
-      const l = await R({ sourceAppPid: e });
-      return g(!1), l;
+      const i = await B({ sourceAppPid: e });
+      return g(!1), i;
     },
     { refreshDeps: [e] }
-  ), f = p(() => v.filter((r) => r.provider === s.WALLET ? d : r.provider === s.PASSKEY ? t !== "none" && !c.wallet && !c.arcSphere : r.provider === s.EMAIL ? E.includes(a) && (b?.settings?.notification?.email?.enabled ?? !1) : !(r.type === "oauth" && !w.includes(a))).sort((r, n) => {
-    if (u) {
-      const h = r.provider === u, m = n.provider === u;
-      if (h && !m)
-        return -1;
-      if (!h && m)
-        return 1;
-    }
-    return !i(r?.order) && !i(n?.order) ? r.order - n.order : i(r?.order) ? i(n?.order) ? 0 : 1 : -1;
-  }), [v, u]), A = p(() => {
-    const l = o === "drawer" || L && c.mobile.any;
-    return globalThis?.blocklet ? !!(f.find((n) => n.provider === s.WALLET)?.showQrcode !== !0 || l) : !!l;
+  ), f = p(() => {
+    const i = globalThis?.blocklet?.DID_CONNECT_ENABLED_PROVIDERS?.split(",") || [];
+    return v.filter((r) => i.length > 0 && !i.includes(r.provider) ? !1 : r.provider === s.WALLET ? d : r.provider === s.PASSKEY ? t !== "none" && !c.wallet && !c.arcSphere : r.provider === s.EMAIL ? E.includes(l) && (P?.settings?.notification?.email?.enabled ?? !1) : !(r.type === "oauth" && !w.includes(l))).sort((r, u) => {
+      if (a) {
+        const h = r.provider === a, b = u.provider === a;
+        if (h && !b)
+          return -1;
+        if (!h && b)
+          return 1;
+      }
+      return !n(r?.order) && !n(u?.order) ? r.order - u.order : n(r?.order) ? n(u?.order) ? 0 : 1 : -1;
+    });
+  }, [v, a]), A = p(() => {
+    const i = o === "drawer" || L && c.mobile.any;
+    return globalThis?.blocklet ? !!(f.find((r) => r.provider === s.WALLET)?.showQrcode !== !0 || i) : !!i;
   }, [o, L, f]);
   return {
     hideChooseList: p(() => !1),
     hideQRCode: A,
     providerList: f,
-    loadingProviderList: P
+    loadingProviderList: m
   };
 }
 export {
-  j as default
+  Y as default
 };

package/lib/package.json.js

@@ -1,4 +1,4 @@
-const o = "3.4.8", s = {
+const o = "3.4.10", s = {
   version: o
 };
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/did-connect-react",
-  "version": "3.4.8",
+  "version": "3.4.10",
   "description": "Client side library to work with DID Connect by ArcBlock.",
   "keywords": [
     "react",
@@ -32,17 +32,17 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "3.4.8",
-    "@arcblock/did": "^1.28.5",
-    "@arcblock/icons": "3.4.8",
-    "@arcblock/react-hooks": "3.4.8",
-    "@arcblock/ws": "^1.28.5",
+    "@arcblock/bridge": "3.4.10",
+    "@arcblock/did": "^1.28.6",
+    "@arcblock/icons": "3.4.10",
+    "@arcblock/react-hooks": "3.4.10",
+    "@arcblock/ws": "^1.28.6",
     "@blocklet/constant": "^1.17.7",
     "@fontsource/lexend": "^5.2.9",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify/react": "^5.2.1",
-    "@ocap/util": "^1.28.5",
+    "@ocap/util": "^1.28.6",
     "@simplewebauthn/browser": "^13.1.0",
     "ahooks": "^3.8.5",
     "axios": "^1.10.0",
@@ -85,5 +85,5 @@
     "eslint-plugin-react-hooks": "^4.6.2",
     "jest": "^29.7.0"
   },
-  "gitHead": "6bbdc63e6e0b7ddfd5e37f2ac6bb44ee49da7139"
+  "gitHead": "162768378bf0a1d1e0984d1f01235eafa5bd9bdb"
 }

package/src/Connect/components/login-item/wallet-login-options.jsx

@@ -30,8 +30,20 @@ export default function WalletLoginOptions({
   const extension = detectWalletExtension();
 
   const isTablet = useCreation(() => {
-    return browser.mobile.tablet || (!browser.mobile.any && window?.navigator?.maxTouchPoints > 0);
-  }, [browser.mobile.tablet, browser.mobile.any]);
+    const ua = navigator.userAgent.toLowerCase();
+
+    // 1. 判断是否是 iPad (iOS 13+ 可能会显示为 Macintosh，需要结合触控点判断)
+    const isIpad = /ipad/.test(ua) || (navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1);
+
+    // 2. 判断是否是 Android 平板 (即 User Agent 包含 Android 但不包含 Mobile)
+    const isAndroidTablet = /android/.test(ua) && !/mobile/.test(ua);
+
+    // 3. 综合判断平板
+    if (isIpad || isAndroidTablet) {
+      return true;
+    }
+    return false;
+  }, []);
   return (
     <>
       {qrcode}

package/src/Connect/hooks/provider-list.js

@@ -74,8 +74,14 @@ export default function useProviderList({
   );
 
   const showedLoginProviderList = useCreation(() => {
+    const allowedProviders = globalThis?.blocklet?.DID_CONNECT_ENABLED_PROVIDERS?.split(',') || [];
     const result = loginProviderList
       .filter((item) => {
+        if (allowedProviders.length > 0) {
+          if (!allowedProviders.includes(item.provider)) {
+            return false;
+          }
+        }
         if (item.provider === LOGIN_PROVIDER.WALLET) {
           return allowWallet;
         }