@blocklet/ui-react 2.4.6 → 2.4.7

package/lib/blocklets.js

@@ -68,11 +68,34 @@ const getLocalizedNavigation = function getLocalizedNavigation(navigation) {
     }
 
     return title;
+  }; // eslint-disable-next-line no-shadow
+
+
+  const getLink = (link, locale) => {
+    if (typeof link === 'string') {
+      // http[s] 开头的 url
+      if ((0, _utils.isUrl)(link)) {
+        const url = new URL(link);
+        url.searchParams.set('locale', locale);
+        return url.href;
+      }
+
+      const url = new URL(link, window.location.origin);
+      url.searchParams.set('locale', locale);
+      return url.pathname + url.search;
+    }
+
+    if (typeof link === 'object') {
+      return link[locale] || (link === null || link === void 0 ? void 0 : link.en) || (link === null || link === void 0 ? void 0 : link.zh);
+    }
+
+    return link;
   };
 
   return (0, _utils.mapRecursive)(navigation, item => {
     return _objectSpread(_objectSpread({}, item), {}, {
-      title: getTitle(item.title, locale)
+      title: getTitle(item.title, locale),
+      link: getLink(item.link, locale)
     });
   }, 'items');
 };

package/lib/utils.js

@@ -42,13 +42,13 @@ const countRecursive = function countRecursive(array) {
   let counter = 0;
   mapRecursive(array, () => counter++, childrenKey);
   return counter;
-}; // "http://", "https://", "//" 开头的 3 种情况
+}; // "http://", "https://" 2 种情况
 
 
 exports.countRecursive = countRecursive;
 
 const isUrl = str => {
-  return /^(https?:)?\/\//.test(str);
+  return /^https?:\/\//.test(str);
 };
 /**
  * 检测 path 是否匹配当前 location, path 只考虑 "/" 开头的相对路径

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.4.6",
+  "version": "2.4.7",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -30,8 +30,8 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.4.6",
-    "@arcblock/ux": "^2.4.6",
+    "@arcblock/did-connect": "^2.4.7",
+    "@arcblock/ux": "^2.4.7",
     "@emotion/react": "^11.10.0",
     "@emotion/styled": "^11.10.0",
     "@iconify/iconify": "^2.2.1",
@@ -53,5 +53,5 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^24.9.0"
   },
-  "gitHead": "c8e8b2a1ed387bb26f9c15ca3ad59b72fe724e3f"
+  "gitHead": "bf9bb3c3501333a9e218f6a78892431769530e41"
 }

package/src/blocklets.js

@@ -1,4 +1,4 @@
-import { mapRecursive } from './utils';
+import { mapRecursive, isUrl } from './utils';
 
 export const publicPath = window?.blocklet?.groupPrefix || window?.blocklet?.prefix || '/';
 
@@ -37,12 +37,31 @@ export const getLocalizedNavigation = (navigation, locale = 'en') => {
     }
     return title;
   };
+  // eslint-disable-next-line no-shadow
+  const getLink = (link, locale) => {
+    if (typeof link === 'string') {
+      // http[s] 开头的 url
+      if (isUrl(link)) {
+        const url = new URL(link);
+        url.searchParams.set('locale', locale);
+        return url.href;
+      }
+      const url = new URL(link, window.location.origin);
+      url.searchParams.set('locale', locale);
+      return url.pathname + url.search;
+    }
+    if (typeof link === 'object') {
+      return link[locale] || link?.en || link?.zh;
+    }
+    return link;
+  };
   return mapRecursive(
     navigation,
     (item) => {
       return {
         ...item,
         title: getTitle(item.title, locale),
+        link: getLink(item.link, locale),
       };
     },
     'items'

package/src/utils.js

@@ -24,9 +24,9 @@ export const countRecursive = (array, childrenKey = 'children') => {
   return counter;
 };
 
-// "http://", "https://", "//" 开头的 3 种情况
+// "http://", "https://" 2 种情况
 export const isUrl = (str) => {
-  return /^(https?:)?\/\//.test(str);
+  return /^https?:\/\//.test(str);
 };
 
 /**