@blocklet/ui-react 3.1.59 → 3.1.60

package/lib/UserCenter/components/user-center.js

@@ -84,26 +84,26 @@ function Or({
   // 只显示 profile 页面，用于 ArcSphere 只需要显示 Profile 的内容
   onDestroySelf: xe = void 0
 }) {
-  const { locale: h, defaultLocale: k } = Ue(), a = qe({ key: "md" }), f = C((e, t = {}) => Le(Ee, e, h, "en", t)), o = ke(Fe)?.session, x = u(() => {
+  const { locale: x, defaultLocale: k } = Ue(), a = qe({ key: "md" }), f = C((e, t = {}) => Le(Ee, e, x, "en", t)), o = ke(Fe)?.session, h = u(() => {
     if (D)
       return D;
     const e = window.location.href, t = Ne(e);
     return t?.did ? Array.isArray(t.did) ? t.did[0] : t.did : o?.user?.did;
-  }, [o?.user?.did, D]), i = u(() => o?.user ? x === o?.user?.did : !1, [x, o?.user?.did]), w = Ce(() => je(), []), n = te(
+  }, [o?.user?.did, D]), i = u(() => o?.user ? h === o?.user?.did : !1, [h, o?.user?.did]), w = Ce(() => je(), []), n = te(
     // eslint-disable-next-line consistent-return
     async () => {
       if (await De(() => o?.initialized), i)
         return o.user;
-      if (x)
-        return ae.user.getUserPublicInfo({ did: x });
+      if (h)
+        return ae.user.getUserPublicInfo({ did: h });
     },
     {
-      refreshDeps: [x, i, o?.initialized, o?.user]
+      refreshDeps: [h, i, o?.initialized, o?.user]
     }
   ), E = C(() => i ? o.refresh() : n.refresh()), g = te(
-    async () => n.data && b ? await ae.user.getUserPrivacyConfig({ did: x }) : null,
+    async () => n.data && b ? await ae.user.getUserPrivacyConfig({ did: h }) : null,
     {
-      refreshDeps: [x, n.data, b],
+      refreshDeps: [h, n.data, b],
       loadingDelay: 300
     }
   ), { confirmHolder: _ } = Ae({
@@ -140,13 +140,13 @@ function Or({
       isPrivate: !1,
       // true: 隐私数据，仅自己可见
       value: W,
-      url: M(W, h, k)
+      url: M(W, x, k)
     }, t = {
       label: f("userFollowers"),
       protected: !1,
       isPrivate: !1,
       value: ce,
-      url: M(ce, h, k)
+      url: M(ce, x, k)
     };
     let p = w ? [e, t] : [e];
     if (i) {
@@ -157,22 +157,22 @@ function Or({
           protected: !0,
           isPrivate: !0,
           value: A,
-          url: M(A, h, k)
+          url: M(A, x, k)
         },
         {
           label: f("storageManagement"),
           protected: !0,
           isPrivate: !0,
           value: L,
-          url: M(L, h, k)
+          url: M(L, x, k)
         }
       ];
       p = w ? [...c, t] : c;
     }
     return p;
-  }, [i, h, w]), d = u(() => {
+  }, [i, x, w]), d = u(() => {
     const e = O?.navigation?.userCenter || [];
-    return (Oe({ navigation: e, locale: h, defaultLocale: k }) || []).concat(R).map((c) => {
+    return (Oe({ navigation: e, locale: x, defaultLocale: k }) || []).concat(R).map((c) => {
       const Z = c.value ?? c._rawLink ?? c.link ?? c.url;
       return {
         value: Z,
@@ -186,7 +186,7 @@ function Or({
         // icon: x.icon,
       };
     }).filter((c) => i || !c.isPrivate);
-  }, [O, n.data, g?.data, h, R, i]), s = u(() => d.find((e) => oe(e.value) === oe(b)), [d]), $ = u(() => {
+  }, [O, n.data, g?.data, x, R, i]), s = u(() => d.find((e) => oe(e.value) === oe(b)), [d]), $ = u(() => {
     const e = window.blocklet?.appName, p = [s?.label, f("userCenter.title")].filter(Boolean).join("-");
     return e ? `${p} | ${e}` : p;
   }, [s, f]), ge = C((e) => e && (ee(e) ? re(e, {
@@ -198,7 +198,7 @@ function Or({
   }) : t))), be = C((e) => {
     const t = d.find((p) => p.value === e);
     t && (window.location.href = ne(t.url, {
-      did: i ? void 0 : x
+      did: i ? void 0 : h
     }));
   }), q = u(() => /* @__PURE__ */ r(
     $e,
@@ -249,7 +249,7 @@ function Or({
       },
       children: /* @__PURE__ */ r(z, { children: f("emptyContent") })
     }
-  ), [i, h]), K = u(() => !g.data || g.loading ? /* @__PURE__ */ r(
+  ), [i, x]), K = u(() => !g.data || g.loading ? /* @__PURE__ */ r(
     l,
     {
       sx: {
@@ -271,14 +271,9 @@ function Or({
       isMyself: i,
       children: v ? /* @__PURE__ */ r(l, { ...I, children: ge(v) }) : F
     }
-  ) }), [g, s, i, v, I, F, h]), X = u(() => {
+  ) }), [g, s, i, v, I, F, x]), X = u(() => {
     if (n.loading || o.loading)
       return null;
-    if (!n.data && !n.loading)
-      return /* @__PURE__ */ r(z, { style: { width: "100%", paddingTop: 16 }, children: /* @__PURE__ */ m(l, { sx: { textAlign: "center", width: "100%" }, children: [
-        /* @__PURE__ */ r(T, { variant: "body1", sx: { fontSize: 18, fontWeight: 500 }, children: f("userNotFound") }),
-        /* @__PURE__ */ r(T, { variant: "body1", color: "text.secondary", children: f("userNotFoundDescription") })
-      ] }) });
     if (n.error) {
       if (n.error?.response?.status === 404)
         return /* @__PURE__ */ r(l, { sx: { width: "100%" }, children: /* @__PURE__ */ r(We, { status: 404, description: f("noUserFound") }) });
@@ -287,7 +282,7 @@ function Or({
       };
       return /* @__PURE__ */ r(l, { sx: { width: "100%" }, children: /* @__PURE__ */ r(Be, { error: p }) });
     }
-    return !x && !n.data ? B || /* @__PURE__ */ r(l, { sx: { width: "100%" }, children: /* @__PURE__ */ m(
+    return !h && !n.data ? B || /* @__PURE__ */ r(l, { sx: { width: "100%" }, children: /* @__PURE__ */ m(
       l,
       {
         sx: {
@@ -302,7 +297,10 @@ function Or({
           /* @__PURE__ */ r(ze, { size: "small", variant: "contained", onClick: () => o.login(), children: f("loginNow") })
         ]
       }
-    ) }) : H ? /* @__PURE__ */ m(U, { children: [
+    ) }) : h && !n.data && !n.loading ? /* @__PURE__ */ r(z, { style: { width: "100%", paddingTop: 16 }, children: /* @__PURE__ */ m(l, { sx: { textAlign: "center", width: "100%" }, children: [
+      /* @__PURE__ */ r(T, { variant: "body1", sx: { fontSize: 18, fontWeight: 500 }, children: f("userNotFound") }),
+      /* @__PURE__ */ r(T, { variant: "body1", color: "text.secondary", children: f("userNotFoundDescription") })
+    ] }) }) : H ? /* @__PURE__ */ m(U, { children: [
       d.length > 0 && b ? /* @__PURE__ */ r(
         l,
         {
@@ -444,7 +442,7 @@ function Or({
     const e = d[0]?.url, t = d.find((p) => p.value === e);
     return e && !t?.isPrivate && window.location.replace(
       ne(e, {
-        did: i ? void 0 : x
+        did: i ? void 0 : h
       })
     ), null;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "3.1.59",
+  "version": "3.1.60",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -35,9 +35,9 @@
   "dependencies": {
     "@abtnode/constant": "1.17.0-beta-20251104-112713-e947b159",
     "@abtnode/util": "1.17.0-beta-20251104-112713-e947b159",
-    "@arcblock/bridge": "3.1.59",
-    "@arcblock/icons": "3.1.59",
-    "@arcblock/react-hooks": "3.1.59",
+    "@arcblock/bridge": "3.1.60",
+    "@arcblock/icons": "3.1.60",
+    "@arcblock/react-hooks": "3.1.60",
     "@arcblock/ws": "^1.27.2",
     "@blocklet/constant": "1.17.0-beta-20251104-112713-e947b159",
     "@blocklet/did-space-react": "^1.2.0",
@@ -83,7 +83,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@arcblock/did-connect-react": "3.1.59",
+    "@arcblock/did-connect-react": "3.1.60",
     "@types/dompurify": "^3.2.0",
     "@types/ua-parser-js": "^0.7.39",
     "@types/validator": "^13.15.2",
@@ -91,5 +91,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "40bce7b0f6ed43f138bdd0c0d73f365533e66c80"
+  "gitHead": "d1747930d04d6c0951c6c6c3fa73707787c425bd"
 }

package/src/UserCenter/components/user-center.tsx

@@ -462,21 +462,6 @@ export default function UserCenter({
       return null;
     }
 
-    if (!userState.data && !userState.loading) {
-      return (
-        <Empty style={{ width: '100%', paddingTop: 16 }}>
-          <Box sx={{ textAlign: 'center', width: '100%' }}>
-            <Typography variant="body1" sx={{ fontSize: 18, fontWeight: 500 }}>
-              {t('userNotFound')}
-            </Typography>
-            <Typography variant="body1" color="text.secondary">
-              {t('userNotFoundDescription')}
-            </Typography>
-          </Box>
-        </Empty>
-      );
-    }
-
     if (userState.error) {
       const errorStatus = (userState.error as AxiosError<{ error: string }>)?.response?.status;
       if (errorStatus === 404) {
@@ -525,6 +510,21 @@ export default function UserCenter({
       );
     }
 
+    if (currentDid && !userState.data && !userState.loading) {
+      return (
+        <Empty style={{ width: '100%', paddingTop: 16 }}>
+          <Box sx={{ textAlign: 'center', width: '100%' }}>
+            <Typography variant="body1" sx={{ fontSize: 18, fontWeight: 500 }}>
+              {t('userNotFound')}
+            </Typography>
+            <Typography variant="body1" color="text.secondary">
+              {t('userNotFoundDescription')}
+            </Typography>
+          </Box>
+        </Empty>
+      );
+    }
+
     // 嵌入时，只显示 tabContent
     if (embed) {
       return (