@blocklet/ui-react 2.4.32 → 2.4.34

package/lib/Dashboard/index.js

@@ -138,7 +138,7 @@ function Dashboard(_ref) {
   }
 
   const {
-    did,
+    appId: did,
     appLogo,
     appName
   } = formattedBlocklet;

package/lib/Header/index.js

@@ -150,7 +150,7 @@ function Header(_ref) {
   }
 
   const {
-    did,
+    appId: did,
     appLogo,
     appName,
     theme

package/lib/blocklets.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.publicPath = exports.parseNavigation = exports.getLocalizedNavigation = exports.formatTheme = exports.formatNavigation = exports.formatBlockletInfo = exports.filterNavByRole = void 0;
+exports.publicPath = exports.parseNavigation = exports.getLocalizedNavigation = exports.formatTheme = exports.formatNavigation = exports.formatBlockletInfo = exports.filterValidNavItems = exports.filterNavByRole = void 0;
 
 var _utils = require("./utils");
 
@@ -179,9 +179,24 @@ const formatBlockletInfo = blockletInfo => {
 
   formatted.theme = formatTheme(formatted.theme); // navigation
 
-  formatted.navigation = parseNavigation(formatted.navigation);
+  formatted.navigation = parseNavigation(filterValidNavItems(formatted.navigation));
   return formatted;
 };
+/**
+ * 过滤掉无效结点 (无 link 且子元素为空)
+ */
+
+
+exports.formatBlockletInfo = formatBlockletInfo;
+
+const filterValidNavItems = function filterValidNavItems() {
+  let navigation = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return (0, _utils.filterRecursive)(navigation, (item, context) => {
+    var _context$filteredChil;
+
+    return !!item.link || ((_context$filteredChil = context.filteredChildren) === null || _context$filteredChil === void 0 ? void 0 : _context$filteredChil.length);
+  }, 'items');
+};
 /**
  * 根据 role 筛选 nav, 规则:
  * - 如果是枝结点, 必须至少存在一个符合条件的子结点
@@ -194,16 +209,16 @@ const formatBlockletInfo = blockletInfo => {
  */
 
 
-exports.formatBlockletInfo = formatBlockletInfo;
+exports.filterValidNavItems = filterValidNavItems;
 
 const filterNavByRole = (nav, userRole) => {
   return (0, _utils.filterRecursive)(nav, (item, context) => {
     const isRoleMatched = !item.role || userRole && item.role.includes(userRole);
 
     if (!context.isLeaf) {
-      var _context$filteredChil;
+      var _context$filteredChil2;
 
-      return isRoleMatched && ((_context$filteredChil = context.filteredChildren) === null || _context$filteredChil === void 0 ? void 0 : _context$filteredChil.length);
+      return isRoleMatched && ((_context$filteredChil2 = context.filteredChildren) === null || _context$filteredChil2 === void 0 ? void 0 : _context$filteredChil2.length);
     }
 
     return isRoleMatched;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.4.32",
+  "version": "2.4.34",
   "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.32",
-    "@arcblock/ux": "^2.4.32",
+    "@arcblock/did-connect": "^2.4.34",
+    "@arcblock/ux": "^2.4.34",
     "@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": "^28.1.3"
   },
-  "gitHead": "2d5ae94d1098073c5483f53af3613f0976841a5a"
+  "gitHead": "02c1622ae5619e5e15293111d2465e2d94a8e5ec"
 }

package/src/Dashboard/index.js

@@ -79,7 +79,7 @@ function Dashboard({ meta, fallbackUrl, invalidPathFallback, headerAddons, sessi
   if (!formattedBlocklet.appName) {
     return null;
   }
-  const { did, appLogo, appName } = formattedBlocklet;
+  const { appId: did, appLogo, appName } = formattedBlocklet;
   const _headerAddons = (
     <HeaderAddons
       formattedBlocklet={formattedBlocklet}

package/src/Header/index.js

@@ -75,7 +75,7 @@ function Header({ meta, addons, sessionManagerProps, homeLink, theme: themeOverr
   if (!formattedBlocklet.appName) {
     return null;
   }
-  const { did, appLogo, appName, theme } = formattedBlocklet;
+  const { appId: did, appLogo, appName, theme } = formattedBlocklet;
   const navigation = getLocalizedNavigation(formattedBlocklet?.navigation?.header, locale);
   const parsedNavigation = parseNavigation(navigation);
   const { navItems, activeId } = parsedNavigation;

package/src/blocklets.js

@@ -140,10 +140,17 @@ export const formatBlockletInfo = (blockletInfo) => {
   // theme
   formatted.theme = formatTheme(formatted.theme);
   // navigation
-  formatted.navigation = parseNavigation(formatted.navigation);
+  formatted.navigation = parseNavigation(filterValidNavItems(formatted.navigation));
   return formatted;
 };
 
+/**
+ * 过滤掉无效结点 (无 link 且子元素为空)
+ */
+export const filterValidNavItems = (navigation = []) => {
+  return filterRecursive(navigation, (item, context) => !!item.link || context.filteredChildren?.length, 'items');
+};
+
 /**
  * 根据 role 筛选 nav, 规则:
  * - 如果是枝结点, 必须至少存在一个符合条件的子结点