@blocklet/ui-react 2.12.59 → 2.12.61

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

@@ -166,17 +166,18 @@ export default function UserCenter({
     }
   }, []);
   const defaultTabs = useCreation(() => {
-    let tabs = [];
+    const nftTab = {
+      label: t("common.nft"),
+      protected: false,
+      isPrivate: false,
+      // true: 隐私数据，仅自己可见
+      value: nftsLink,
+      url: getLink(nftsLink, locale)
+    };
+    let tabs = [nftTab];
     if (isMyself) {
       tabs = [
-        {
-          label: t("common.nft"),
-          protected: true,
-          isPrivate: true,
-          // 隐私数据，仅自己可见
-          value: nftsLink,
-          url: getLink(nftsLink, locale)
-        },
+        nftTab,
         {
           label: t("common.setting"),
           protected: true,
@@ -206,7 +207,7 @@ export default function UserCenter({
         label: x.title || x.label,
         url: x.link || x.url,
         protected: privacyState?.data?.[value] ?? false,
-        isPrivate: x.isPrivate || x.private || x._rawLink.includes("/customer")
+        isPrivate: x.isPrivate || x.private || (x?._rawLink?.includes("/customer") ?? false)
         // FIXME: HACK: 隐藏 /customer 菜单, 需要一个通用的解决方案，在嵌入的时候就决定是否是私有的
         // icon: x.icon,
       };
@@ -263,7 +264,7 @@ export default function UserCenter({
     }
   });
   const renderDefaultTab = useCreation(() => {
-    if (isNftsTab && isMyself) {
+    if (isNftsTab) {
       return /* @__PURE__ */ jsxs(
         Box,
         {
@@ -273,7 +274,7 @@ export default function UserCenter({
             gap: 2.5
           },
           children: [
-            /* @__PURE__ */ jsxs(Box, { sx: { border: `1px solid ${colors.dividerColor}`, borderRadius: 2, p: 2 }, children: [
+            isMyself ? /* @__PURE__ */ jsxs(Box, { sx: { border: `1px solid ${colors.dividerColor}`, borderRadius: 2, p: 2 }, children: [
               /* @__PURE__ */ jsx(
                 Typography,
                 {
@@ -286,7 +287,7 @@ export default function UserCenter({
                 }
               ),
               /* @__PURE__ */ jsx(Passport, { user: userState.data })
-            ] }),
+            ] }) : null,
             /* @__PURE__ */ jsx(Nft, { user: userState.data })
           ]
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.12.59",
+  "version": "2.12.61",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@abtnode/constant": "^1.16.41",
-    "@arcblock/bridge": "^2.12.59",
-    "@arcblock/react-hooks": "^2.12.59",
+    "@arcblock/bridge": "^2.12.61",
+    "@arcblock/react-hooks": "^2.12.61",
     "@arcblock/ws": "^1.19.18",
     "@blocklet/did-space-react": "^1.0.41",
     "@iconify-icons/logos": "^1.2.36",
@@ -87,5 +87,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "01a024341e2608cf33a91060b9a5f25e7773b268"
+  "gitHead": "ba8229f0a4a824a565e04056b78130c75b5bae14"
 }

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

@@ -40,6 +40,15 @@ const nftsLink = joinURL(PROFILE_URL, '/nfts');
 const settingsLink = joinURL(PROFILE_URL, '/settings');
 const didSpacesLink = joinURL(PROFILE_URL, '/did-spaces');
 
+interface NavigationTabProps {
+  label: string;
+  protected: boolean;
+  isPrivate: boolean;
+  value: string;
+  url: string;
+  [key: string]: any;
+}
+
 const Main = styled(Box)(({ theme }) => ({
   flex: 1,
   boxSizing: 'border-box',
@@ -198,17 +207,18 @@ export default function UserCenter({
     }
   }, []);
 
-  const defaultTabs = useCreation((): any => {
-    let tabs: any = [];
+  const defaultTabs = useCreation((): NavigationTabProps[] => {
+    const nftTab = {
+      label: t('common.nft'),
+      protected: false,
+      isPrivate: false, // true: 隐私数据，仅自己可见
+      value: nftsLink,
+      url: getLink(nftsLink, locale),
+    };
+    let tabs: NavigationTabProps[] = [nftTab];
     if (isMyself) {
       tabs = [
-        {
-          label: t('common.nft'),
-          protected: true,
-          isPrivate: true, // 隐私数据，仅自己可见
-          value: nftsLink,
-          url: getLink(nftsLink, locale),
-        },
+        nftTab,
         {
           label: t('common.setting'),
           protected: true,
@@ -241,7 +251,7 @@ export default function UserCenter({
           label: x.title || x.label,
           url: x.link || x.url,
           protected: privacyState?.data?.[value] ?? false,
-          isPrivate: x.isPrivate || x.private || x._rawLink.includes('/customer'), // FIXME: HACK: 隐藏 /customer 菜单, 需要一个通用的解决方案，在嵌入的时候就决定是否是私有的
+          isPrivate: x.isPrivate || x.private || (x?._rawLink?.includes('/customer') ?? false), // FIXME: HACK: 隐藏 /customer 菜单, 需要一个通用的解决方案，在嵌入的时候就决定是否是私有的
           // icon: x.icon,
         };
       })
@@ -309,7 +319,7 @@ export default function UserCenter({
   });
 
   const renderDefaultTab = useCreation(() => {
-    if (isNftsTab && isMyself) {
+    if (isNftsTab) {
       return (
         <Box
           sx={{
@@ -317,17 +327,19 @@ export default function UserCenter({
             flexDirection: 'column',
             gap: 2.5,
           }}>
-          <Box sx={{ border: `1px solid ${colors.dividerColor}`, borderRadius: 2, p: 2 }}>
-            <Typography
-              sx={{
-                color: colors.foregroundsFgBase,
-                fontWeight: 600,
-                mb: 2.5,
-              }}>
-              {t('passport')}
-            </Typography>
-            <Passport user={userState.data as User} />
-          </Box>
+          {isMyself ? (
+            <Box sx={{ border: `1px solid ${colors.dividerColor}`, borderRadius: 2, p: 2 }}>
+              <Typography
+                sx={{
+                  color: colors.foregroundsFgBase,
+                  fontWeight: 600,
+                  mb: 2.5,
+                }}>
+                {t('passport')}
+              </Typography>
+              <Passport user={userState.data as User} />
+            </Box>
+          ) : null}
           <Nft user={userState.data as User} />
         </Box>
       );