@blocklet/ui-react 3.1.27 → 3.1.30

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

@@ -1,4 +1,4 @@
-import { Children, cloneElement, isValidElement, use } from 'react';
+import { Children, cloneElement, isValidElement, use, useMemo } from 'react';
 import { Box, CircularProgress, Divider, Typography } from '@mui/material';
 import type { BoxProps, Theme } from '@mui/material';
 import { useCreation, useMemoizedFn, useRequest } from 'ahooks';
@@ -19,6 +19,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import { getQuery, withQuery, joinURL, withoutTrailingSlash } from 'ufo';
 import type { AxiosError } from 'axios';
 import type { UserPublicInfo } from '@blocklet/js-sdk';
+import { isSupportFollow } from '@arcblock/ux/lib/Util';
 
 import { PROFILE_URL } from '@arcblock/ux/lib/Util/constant';
 import Footer from '../../Footer';
@@ -143,6 +144,10 @@ export default function UserCenter({
     return false;
   }, [currentDid, session?.user?.did]);
 
+  const isShowSocialActions = useMemo((): boolean => {
+    return isSupportFollow();
+  }, []);
+
   const userState = useRequest<UserPublicInfo | User | undefined, []>(
     // eslint-disable-next-line consistent-return
     async () => {
@@ -227,9 +232,9 @@ export default function UserCenter({
       value: userFollowersLink,
       url: getLink(userFollowersLink, locale),
     };
-    let tabs: NavigationTabProps[] = [nftTab, userFollowersTab];
+    let tabs: NavigationTabProps[] = isShowSocialActions ? [nftTab, userFollowersTab] : [nftTab];
     if (isMyself) {
-      tabs = [
+      const restTabs = [
         nftTab,
         {
           label: t('common.setting'),
@@ -245,11 +250,11 @@ export default function UserCenter({
           value: didSpacesLink,
           url: getLink(didSpacesLink, locale),
         },
-        userFollowersTab,
       ];
+      tabs = isShowSocialActions ? [...restTabs, userFollowersTab] : restTabs;
     }
     return tabs;
-  }, [isMyself, locale]);
+  }, [isMyself, locale, isShowSocialActions]);
 
   const userCenterTabs = useCreation<UserCenterTab[]>(() => {
     const menus = formattedBlocklet?.navigation?.userCenter || [];
@@ -442,7 +447,10 @@ export default function UserCenter({
 
     return (
       <Box sx={{ flex: 1 }}>
-        <Fallback currentActiveTab={currentActiveTab as UserCenterTab} isMyself={isMyself}>
+        <Fallback
+          isSupportFollow={isShowSocialActions}
+          currentActiveTab={currentActiveTab as UserCenterTab}
+          isMyself={isMyself}>
           {children ? <Box {...contentProps}>{renderChildrenWithProps(children)}</Box> : renderDefaultTab}
         </Fallback>
       </Box>
@@ -534,6 +542,7 @@ export default function UserCenter({
             showFullDid={false}
             onlyProfile={onlyProfile}
             refreshProfile={onRefreshUser}
+            isShowSocialActions={isShowSocialActions}
             sx={{
               padding: !isMobile ? '40px 24px 24px 40px' : '16px 0 0 0',
               ...(!isMobile ? { width: 320, maxWidth: 320, flexShrink: 0 } : {}),
@@ -617,6 +626,7 @@ export default function UserCenter({
           user={userState.data as User}
           refreshProfile={onRefreshUser}
           showFullDid={false}
+          isShowSocialActions={isShowSocialActions}
           sx={{
             padding: !isMobile ? '40px 24px 24px 40px' : '16px 0 0 0',
             ...(!isMobile ? { width: 320, maxWidth: 320, flexShrink: 0 } : {}),

package/src/UserCenter/components/user-info/social-actions/chat.tsx

@@ -1,6 +1,7 @@
 import { useMemo } from 'react';
 import { Button } from '@mui/material';
 import { useMemoizedFn } from 'ahooks';
+import { Icon } from '@iconify/react';
 import { translate } from '@arcblock/ux/lib/Locale/util';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 
@@ -33,7 +34,7 @@ function Chat({ user }: { user: User }) {
 
   return (
     <Button fullWidth variant="outlined" color="inherit" onClick={onNavigateToChat}>
-      <i className="iconify" data-icon="mi:message-alt" style={{ fontSize: '15px', marginRight: '4px' }} />
+      <Icon icon="tabler:message-dots" style={{ marginRight: 4 }} />
       {t('profile.chat')}
     </Button>
   );

package/src/UserCenter/components/user-info/user-basic-info.tsx

@@ -35,6 +35,7 @@ export default function UserBasicInfo({
   isMobile = false,
   onlyProfile = false,
   refreshProfile,
+  isShowSocialActions = false,
   ...rest
 }: {
   user: User;
@@ -46,6 +47,7 @@ export default function UserBasicInfo({
   isMobile?: boolean;
   onlyProfile?: boolean;
   refreshProfile: () => void;
+  isShowSocialActions?: boolean;
 } & BoxProps) {
   const { locale } = useLocaleContext();
   const [userStatus, setUserStatus] = useState<UserMetadata['status']>(undefined);
@@ -226,7 +228,7 @@ export default function UserBasicInfo({
           <DID did={user.did} showQrcode copyable compact={!showFullDid} responsive={!showFullDid} locale={locale} />
         </Box>
       </Box>
-      {!isMyself ? (
+      {!isMyself && isShowSocialActions ? (
         <Box sx={{ mt: 2 }}>
           <SocialActions user={user} />
         </Box>

package/src/blocklets.js

@@ -1,4 +1,4 @@
-import { mapRecursive, filterRecursive, isUrl } from './utils';
+import { mapRecursive, filterRecursive, isUrl, isMailProtocol } from './utils';
 
 export const publicPath = window?.blocklet?.groupPrefix || window?.blocklet?.prefix || '/';
 
@@ -28,6 +28,10 @@ export const getLink = (link, locale = 'en') => {
       url.searchParams.set('locale', locale);
       return url.href;
     }
+    // 如果是 mailto 协议, 直接返回
+    if (isMailProtocol(link)) {
+      return link;
+    }
     const url = new URL(link, window.location.origin);
     url.searchParams.set('locale', locale);
     return url.pathname + url.search;

package/src/common/notification-addon.jsx

@@ -6,10 +6,10 @@ import NotificationsOutlinedIcon from '@arcblock/icons/lib/Notification';
 import { useCreation } from 'ahooks';
 import { EVENTS, WELLKNOWN_SERVICE_PATH_PREFIX } from '@abtnode/constant';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
+import { compareVersions } from '@arcblock/ux/lib/Util';
 import { joinURL, withQuery } from 'ufo';
 import { useListenWsClient } from './ws';
 import NotificationSnackbar from '../Notifications/Snackbar';
-import { compareVersions } from '../utils';
 
 const viewAllUrl = joinURL(WELLKNOWN_SERVICE_PATH_PREFIX, 'user', 'notifications');
 

package/src/utils.js

@@ -1,5 +1,3 @@
-import semver from 'semver';
-
 export const mapRecursive = (array, fn, childrenKey = 'children') => {
   return array.map((item) => {
     if (Array.isArray(item[childrenKey])) {
@@ -47,6 +45,11 @@ export const isUrl = (str) => {
   return /^https?:\/\//.test(str);
 };
 
+// 链接是否是 mailto 协议
+export const isMailProtocol = (str) => {
+  return /^mailto:/i.test(str.trim());
+};
+
 /**
  * @description 检测是否是 Iconify 格式的字符串
  * @deprecated
@@ -153,27 +156,3 @@ export const splitNavColumns = (items, options = {}) => {
 
   return result;
 };
-
-/**
- * 比较两个版本号，用于判断版本号是否兼容
- * @param {*} version1
- * @param {*} version2
- * @returns 0: 版本相同, -1: version1 < version2, 1: version1 > version2
- */
-export const compareVersions = (version1, version2) => {
-  const getDateVersion = (version) => {
-    const match = version.match(/^(\d+\.\d+\.\d+(?:-[^-]+?-\d{8}))/);
-    return match ? match[1] : version;
-  };
-
-  const dateVersion1 = getDateVersion(version1);
-  const dateVersion2 = getDateVersion(version2);
-
-  // 如果基础版本相同，但完整版本不同（意味着有额外部分），返回false
-  if (dateVersion1 === dateVersion2 && version1 !== version2) {
-    return false;
-  }
-
-  // 其他情况正常比较
-  return semver.gte(dateVersion1, dateVersion2);
-};