@blocklet/ui-react 2.12.12 → 2.12.13

package/lib/Footer/links.js

@@ -3,6 +3,7 @@ import { useState } from "react";
 import PropTypes from "prop-types";
 import { useCreation } from "ahooks";
 import isInteger from "lodash/isInteger";
+import isString from "lodash/isString";
 import { styled } from "@arcblock/ux/lib/Theme";
 import clsx from "clsx";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
@@ -18,7 +19,7 @@ export default function Links({ links, flowLayout, columns, ...rest }) {
     let result = label;
     if (render) {
       result = render({ label, link, props });
-    } else if (link) {
+    } else if (isString(link)) {
       const isExternal = link.startsWith("http") || link.startsWith("//");
       result = /* @__PURE__ */ jsx(
         "a",

package/lib/Header/index.js

@@ -44,7 +44,7 @@ const parseNavigation = (navigation) => {
       };
     }
     let props = {};
-    if (item.link?.startsWith("http://") || item.link?.startsWith("https://")) {
+    if (item.link?.startsWith("http") || item.link?.startsWith("//")) {
       props = {
         target: "_blank",
         rel: "noreferrer"
@@ -54,6 +54,7 @@ const parseNavigation = (navigation) => {
       id: `${counter++}`,
       label: /* @__PURE__ */ jsx("a", { href: item.link, ...props, children: item.title }),
       icon,
+      description: item.description,
       link: item.link
     };
   };

package/lib/blocklets.js

@@ -45,15 +45,12 @@ export const getLocalizedNavigation = (navigation, locale = 'en') => {
   if (!navigation?.length) {
     return navigation;
   }
-  // eslint-disable-next-line no-shadow
-  const getTitle = (title, _locale) => {
-    if (typeof title === 'string') {
-      return title;
+  const trans = (text, _locale) => {
+    if (text && typeof text === 'object') {
+      return text[_locale] || text?.en || text?.zh;
     }
-    if (typeof title === 'object') {
-      return title[_locale] || title?.en || title?.zh;
-    }
-    return title;
+
+    return text;
   };
 
   return mapRecursive(
@@ -61,7 +58,8 @@ export const getLocalizedNavigation = (navigation, locale = 'en') => {
     (item) => {
       return {
         ...item,
-        title: getTitle(item.title, locale),
+        title: trans(item.title, locale),
+        description: trans(item.description, locale),
         // 仅对叶结点进行处理
         link: !item.items?.length ? getLink(item.link, locale) : item.link,
         _rawLink: item.link,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.12.12",
+  "version": "2.12.13",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@abtnode/constant": "^1.16.39",
-    "@arcblock/bridge": "^2.12.12",
-    "@arcblock/react-hooks": "^2.12.12",
+    "@arcblock/bridge": "^2.12.13",
+    "@arcblock/react-hooks": "^2.12.13",
     "@arcblock/ws": "^1.19.15",
     "@blocklet/did-space-react": "^1.0.26",
     "@iconify-icons/logos": "^1.2.36",
@@ -87,5 +87,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "d4fb00f694f282048939f0681ee0fbce178b540d"
+  "gitHead": "82ab8092972356c7746cb2b1c77bd133ef00ebca"
 }

package/src/Footer/links.jsx

@@ -3,6 +3,7 @@ import { useState } from 'react';
 import PropTypes from 'prop-types';
 import { useCreation } from 'ahooks';
 import isInteger from 'lodash/isInteger';
+import isString from 'lodash/isString';
 import { styled } from '@arcblock/ux/lib/Theme';
 import clsx from 'clsx';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
@@ -25,7 +26,7 @@ export default function Links({ links, flowLayout, columns, ...rest }) {
     let result = label;
     if (render) {
       result = render({ label, link, props });
-    } else if (link) {
+    } else if (isString(link)) {
       const isExternal = link.startsWith('http') || link.startsWith('//');
       result = (
         <a

package/src/Header/index.tsx

@@ -40,6 +40,8 @@ const parseNavigation = (navigation: any) => {
   let counter = 1;
   const parseItem = (item: any) => {
     const icon = item.icon ? <Icon icon={item.icon} /> : null;
+
+    // sub menu
     if (item.items) {
       return {
         id: `${counter++}`,
@@ -49,12 +51,15 @@ const parseNavigation = (navigation: any) => {
       };
     }
     let props = {};
-    if (item.link?.startsWith('http://') || item.link?.startsWith('https://')) {
+
+    // external link
+    if (item.link?.startsWith('http') || item.link?.startsWith('//')) {
       props = {
         target: '_blank',
         rel: 'noreferrer',
       };
     }
+
     return {
       id: `${counter++}`,
       label: (
@@ -63,6 +68,7 @@ const parseNavigation = (navigation: any) => {
         </a>
       ),
       icon,
+      description: item.description,
       link: item.link,
     };
   };

package/src/blocklets.js

@@ -45,15 +45,12 @@ export const getLocalizedNavigation = (navigation, locale = 'en') => {
   if (!navigation?.length) {
     return navigation;
   }
-  // eslint-disable-next-line no-shadow
-  const getTitle = (title, _locale) => {
-    if (typeof title === 'string') {
-      return title;
+  const trans = (text, _locale) => {
+    if (text && typeof text === 'object') {
+      return text[_locale] || text?.en || text?.zh;
     }
-    if (typeof title === 'object') {
-      return title[_locale] || title?.en || title?.zh;
-    }
-    return title;
+
+    return text;
   };
 
   return mapRecursive(
@@ -61,7 +58,8 @@ export const getLocalizedNavigation = (navigation, locale = 'en') => {
     (item) => {
       return {
         ...item,
-        title: getTitle(item.title, locale),
+        title: trans(item.title, locale),
+        description: trans(item.description, locale),
         // 仅对叶结点进行处理
         link: !item.items?.length ? getLink(item.link, locale) : item.link,
         _rawLink: item.link,