@blocklet/ui-react 2.5.58 → 2.5.60

package/lib/blocklets.js

@@ -4,29 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.publicPath = exports.parseNavigation = exports.getLocalizedNavigation = exports.formatTheme = exports.formatNavigation = exports.formatBlockletInfo = exports.filterValidNavItems = exports.filterNavByRole = void 0;
-
 var _utils = require("./utils");
-
 var _window, _window$blocklet, _window2, _window2$blocklet;
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const publicPath = ((_window = window) === null || _window === void 0 ? void 0 : (_window$blocklet = _window.blocklet) === null || _window$blocklet === void 0 ? void 0 : _window$blocklet.groupPrefix) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$blocklet = _window2.blocklet) === null || _window2$blocklet === void 0 ? void 0 : _window2$blocklet.prefix) || '/';
+
 /**
  * 格式化 theme (目前仅考虑 background)
  */
-
 exports.publicPath = publicPath;
-
 const formatTheme = theme => {
   const formatted = _objectSpread({}, theme);
-
   const background = theme === null || theme === void 0 ? void 0 : theme.background;
-
   if (typeof background === 'string') {
     formatted.background = {
       header: background,
@@ -40,37 +33,29 @@ const formatTheme = theme => {
       default: background.default
     };
   }
-
   return formatted;
 };
+
 /**
  * 获取指定 locale 对应的 navigation 数据, 仅考虑 zh/en
  */
-
-
 exports.formatTheme = formatTheme;
-
 const getLocalizedNavigation = function getLocalizedNavigation(navigation) {
   let locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'en';
-
   if (!(navigation !== null && navigation !== void 0 && navigation.length)) {
     return navigation;
-  } // eslint-disable-next-line no-shadow
-
-
+  }
+  // eslint-disable-next-line no-shadow
   const getTitle = (title, locale) => {
     if (typeof title === 'string') {
       return title;
     }
-
     if (typeof title === 'object') {
       return title[locale] || (title === null || title === void 0 ? void 0 : title.en) || (title === null || title === void 0 ? void 0 : title.zh);
     }
-
     return title;
-  }; // eslint-disable-next-line no-shadow
-
-
+  };
+  // eslint-disable-next-line no-shadow
   const getLink = (link, locale) => {
     if (typeof link === 'string') {
       // http[s] 开头的 url
@@ -79,22 +64,17 @@ const getLocalizedNavigation = function getLocalizedNavigation(navigation) {
         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 => {
     var _item$items;
-
     return _objectSpread(_objectSpread({}, item), {}, {
       title: getTitle(item.title, locale),
       // 仅对叶结点进行处理
@@ -102,15 +82,13 @@ const getLocalizedNavigation = function getLocalizedNavigation(navigation) {
     });
   }, 'items');
 };
+
 /**
  * 格式化 navigation
  *
  * - role 统一为数组形式
  */
-
-
 exports.getLocalizedNavigation = getLocalizedNavigation;
-
 const formatNavigation = navigation => {
   return (0, _utils.mapRecursive)(navigation, item => {
     if (item.role) {
@@ -118,18 +96,14 @@ const formatNavigation = navigation => {
         role: Array.isArray(item.role) ? item.role : [item.role]
       });
     }
-
     return item;
   }, 'items');
 };
-
 exports.formatNavigation = formatNavigation;
-
 const parseNavigation = navigation => {
   if (!(navigation !== null && navigation !== void 0 && navigation.length)) {
     return null;
   }
-
   const formattedNav = formatNavigation(navigation);
   const sections = {
     header: [],
@@ -142,61 +116,56 @@ const parseNavigation = navigation => {
     dashboard: [],
     // session manager menus
     sessionManager: []
-  }; // 对 navigation 顶层元素按 section 分组
+  };
 
+  // 对 navigation 顶层元素按 section 分组
   formattedNav.forEach(item => {
     // item#section 为空时, 表示只存在于 header
     if (!item.section) {
-      sections.header.push(item); // item 出现在指定几个 section 中 (array)
+      sections.header.push(item);
+      // item 出现在指定几个 section 中 (array)
     } else if (Array.isArray(item.section)) {
       item.section.forEach(sectionKey => {
         var _sections$sectionKey;
-
         (_sections$sectionKey = sections[sectionKey]) === null || _sections$sectionKey === void 0 ? void 0 : _sections$sectionKey.push(item);
-      }); // item 出现在指定的一个 section 中 (string)
+      });
+      // item 出现在指定的一个 section 中 (string)
     } else if (typeof item.section === 'string') {
       var _sections$item$sectio;
-
       (_sections$item$sectio = sections[item.section]) === null || _sections$item$sectio === void 0 ? void 0 : _sections$item$sectio.push(item);
     }
   });
   return sections;
 };
+
 /**
  * 格式化 blocklet info 数据
  */
-
-
 exports.parseNavigation = parseNavigation;
-
 const formatBlockletInfo = blockletInfo => {
   if (!blockletInfo) {
     return null;
   }
-
-  const formatted = _objectSpread({}, blockletInfo); // theme
-
-
-  formatted.theme = formatTheme(formatted.theme); // navigation
-
+  const formatted = _objectSpread({}, blockletInfo);
+  // theme
+  formatted.theme = formatTheme(formatted.theme);
+  // 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, 规则:
  * - 如果是枝结点, 必须至少存在一个符合条件的子结点
@@ -207,22 +176,15 @@ const filterValidNavItems = function filterValidNavItems() {
  * @param {string} userRole 当前用户 role
  * @returns 符合 role 权限的导航菜单数据
  */
-
-
 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$filteredChil2;
-
       return isRoleMatched && ((_context$filteredChil2 = context.filteredChildren) === null || _context$filteredChil2 === void 0 ? void 0 : _context$filteredChil2.length);
     }
-
     return isRoleMatched;
   }, 'items');
 };
-
 exports.filterNavByRole = filterNavByRole;

package/lib/common/header-addons.js

@@ -4,37 +4,24 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = HeaderAddons;
-
 var _react = require("react");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 var _Session = require("@arcblock/did-connect/lib/Session");
-
 var _SessionManager = _interopRequireDefault(require("@arcblock/did-connect/lib/SessionManager"));
-
 var _selector = _interopRequireDefault(require("@arcblock/ux/lib/Locale/selector"));
-
 var _context = require("@arcblock/ux/lib/Locale/context");
-
 var _types = require("../types");
-
 var _blocklets = require("../blocklets");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // FIXME: 直接从 react 中 import  Fragment 可能会在 vite 下出错，先暂时从 react/jsx-runtime 导入 Fragment 来跳过这个问题
 // eslint-disable-next-line no-shadow
 function HeaderAddons(_ref) {
   var _sessionCtx$session, _formattedBlocklet$na, _sessionCtx$session2, _sessionCtx$session2$;
-
   let {
     formattedBlocklet,
     addons,
@@ -49,30 +36,25 @@ function HeaderAddons(_ref) {
     enableLocale = true
   } = formattedBlocklet;
   const authenticated = !!(sessionCtx !== null && sessionCtx !== void 0 && (_sessionCtx$session = sessionCtx.session) !== null && _sessionCtx$session !== void 0 && _sessionCtx$session.user);
-  let localizedNav = (0, _blocklets.getLocalizedNavigation)(formattedBlocklet === null || formattedBlocklet === void 0 ? void 0 : (_formattedBlocklet$na = formattedBlocklet.navigation) === null || _formattedBlocklet$na === void 0 ? void 0 : _formattedBlocklet$na.sessionManager, locale) || []; // 根据 role 筛选 nav 数据
-
+  let localizedNav = (0, _blocklets.getLocalizedNavigation)(formattedBlocklet === null || formattedBlocklet === void 0 ? void 0 : (_formattedBlocklet$na = formattedBlocklet.navigation) === null || _formattedBlocklet$na === void 0 ? void 0 : _formattedBlocklet$na.sessionManager, locale) || [];
+  // 根据 role 筛选 nav 数据
   localizedNav = (0, _blocklets.filterNavByRole)(localizedNav, sessionCtx === null || sessionCtx === void 0 ? void 0 : (_sessionCtx$session2 = sessionCtx.session) === null || _sessionCtx$session2 === void 0 ? void 0 : (_sessionCtx$session2$ = _sessionCtx$session2.user) === null || _sessionCtx$session2$ === void 0 ? void 0 : _sessionCtx$session2$.role);
-
   const renderAddons = () => {
     // 不关心内置的 session manager 和 locale selector, 直接覆盖 UX Header 的 addons
     if (addons && typeof addons !== 'function') {
       return Array.isArray(addons) ? addons : [addons];
     }
-
-    let addonsArray = []; // 启用了多语言并且检测到了 locale context
-
+    let addonsArray = [];
+    // 启用了多语言并且检测到了 locale context
     if (enableLocale && locale) {
       addonsArray.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_selector.default, {
         showText: false
       }, "locale-selector"));
-    } // 启用了连接钱包并且检测到了 session context
-
-
+    }
+    // 启用了连接钱包并且检测到了 session context
     if (enableConnect && sessionCtx) {
       var _localizedNav;
-
       const menu = [];
-
       if (authenticated && (_localizedNav = localizedNav) !== null && _localizedNav !== void 0 && _localizedNav[0]) {
         const firstItem = localizedNav[0];
         menu.push({
@@ -90,28 +72,23 @@ function HeaderAddons(_ref) {
           key: firstItem.link
         });
       }
-
       addonsArray.push( /*#__PURE__*/(0, _jsxRuntime.jsx)(_SessionManager.default, _objectSpread({
         session: sessionCtx.session,
         locale: locale,
         menu: menu,
         showRole: true
       }, sessionManagerProps), "session-manager"));
-    } // 在内置 addons 基础上定制 addons
-
-
+    }
+    // 在内置 addons 基础上定制 addons
     if (typeof addons === 'function') {
       addonsArray = addons(addonsArray) || [];
     }
-
     return addonsArray;
   };
-
   const renderedAddons = renderAddons();
   const addonList = /*#__PURE__*/(0, _react.createElement)(_jsxRuntime.Fragment, null, ...(Array.isArray(renderedAddons) ? renderedAddons : [renderedAddons]));
   return addonList;
 }
-
 HeaderAddons.propTypes = {
   formattedBlocklet: _propTypes.default.object.isRequired,
   // 需要考虑 定制的 addons 与内置的 连接钱包/选择语言 addons 共存的情况

package/lib/common/link-blocker.js

@@ -4,40 +4,32 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function hasParentOfType(node, type) {
   if (!node) return false;
   if (type === node.nodeName) return true;
   return hasParentOfType(node.parentNode, type);
 }
+
 /**
  * 适用于 header/footer/dashboard "preview mode", 阻止内部组件中所有 link 的默认点击行为
  */
-
-
 function LinkBlocker(_ref) {
   let rest = Object.assign({}, _ref);
-
   const handleOnClick = e => {
     const isInsideLink = hasParentOfType(e.target, 'A');
-
     if (isInsideLink) {
       e.preventDefault();
     }
   };
-
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", _objectSpread({
     onClick: handleOnClick
   }, rest));
 }
-
 var _default = LinkBlocker;
 exports.default = _default;

package/lib/common/overridable-theme-provider.js

@@ -4,20 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = OverridableThemeProvider;
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _Theme = require("@arcblock/ux/lib/Theme");
-
 var _jsxRuntime = require("react/jsx-runtime");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const defaultTheme = (0, _Theme.createTheme)();
+
 /**
  * 允许 theme 被覆盖的 ThemeProvider 组件, 默认使用 ux default theme, 可以传入 theme 进行覆盖
  */
-
 function OverridableThemeProvider(_ref) {
   let {
     theme: themeOverrides,
@@ -29,7 +24,6 @@ function OverridableThemeProvider(_ref) {
     children: children
   });
 }
-
 OverridableThemeProvider.propTypes = {
   children: _propTypes.default.any.isRequired,
   theme: _propTypes.default.object

package/lib/common/wallet-hidden-topbar.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useWalletHiddenTopbar = void 0;
-
 var _react = require("react");
-
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
-
 var _dsbridge = _interopRequireDefault(require("dsbridge"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // 在 wallet webview 环境中, 隐藏 wallet topbar
 // eslint-disable-next-line import/prefer-default-export
 const useWalletHiddenTopbar = () => {
@@ -23,5 +18,4 @@ const useWalletHiddenTopbar = () => {
     }
   }, [browser]);
 };
-
 exports.useWalletHiddenTopbar = useWalletHiddenTopbar;

package/lib/types.js

@@ -4,12 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sessionManagerProps = exports.blockletMetaProps = void 0;
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /* eslint-disable import/prefer-default-export */
+
 const blockletMetaProps = _propTypes.default.shape({
   appLogo: _propTypes.default.node,
   appName: _propTypes.default.string,
@@ -28,9 +26,7 @@ const blockletMetaProps = _propTypes.default.shape({
     }))
   }))
 });
-
 exports.blockletMetaProps = blockletMetaProps;
-
 const sessionManagerProps = _propTypes.default.shape({
   showText: _propTypes.default.bool,
   showRole: _propTypes.default.bool,
@@ -48,5 +44,4 @@ const sessionManagerProps = _propTypes.default.shape({
   dark: _propTypes.default.bool,
   size: _propTypes.default.number
 });
-
 exports.sessionManagerProps = sessionManagerProps;

package/lib/utils.js

@@ -4,13 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.matchPaths = exports.matchPath = exports.mapRecursive = exports.isUrl = exports.isIconifyString = exports.flatRecursive = exports.filterRecursive = exports.countRecursive = void 0;
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const mapRecursive = function mapRecursive(array, fn) {
   let childrenKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   return array.map(item => {
@@ -19,106 +17,88 @@ const mapRecursive = function mapRecursive(array, fn) {
         [childrenKey]: mapRecursive(item[childrenKey], fn, childrenKey)
       }));
     }
-
     return fn(item);
   });
-}; // 展平有层级结构的 array
-
+};
 
+// 展平有层级结构的 array
 exports.mapRecursive = mapRecursive;
-
 const flatRecursive = function flatRecursive(array) {
   let childrenKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'children';
   const result = [];
   mapRecursive(array, item => result.push(item), childrenKey);
   return result;
-}; // 对有层级结构的 array 元素计数
-
+};
 
+// 对有层级结构的 array 元素计数
 exports.flatRecursive = flatRecursive;
-
 const countRecursive = function countRecursive(array) {
   let childrenKey = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'children';
   let counter = 0;
   mapRecursive(array, () => counter++, childrenKey);
   return counter;
-}; // 对有层级结构的 array 进行 filter 处理
-// 因为是 DFS 遍历, 可以借助 context.filteredChildren 在过滤/保留子结的同时保持父子结构 (即使父结点不满足筛选条件)
-
+};
 
+// 对有层级结构的 array 进行 filter 处理
+// 因为是 DFS 遍历, 可以借助 context.filteredChildren 在过滤/保留子结的同时保持父子结构 (即使父结点不满足筛选条件)
 exports.countRecursive = countRecursive;
-
 const filterRecursive = function filterRecursive(array, predicate) {
   let childrenKey = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   return array.map(item => _objectSpread({}, item)).filter(item => {
     const children = item[childrenKey];
-
     if (Array.isArray(children)) {
       const filtered = filterRecursive(children, predicate, childrenKey);
       item[childrenKey] = filtered !== null && filtered !== void 0 && filtered.length ? filtered : undefined;
     }
-
     const context = {
       filteredChildren: item[childrenKey],
       isLeaf: !(children !== null && children !== void 0 && children.length)
     };
     return predicate(item, context);
   });
-}; // "http://", "https://" 2 种情况
-
+};
 
+// "http://", "https://" 2 种情况
 exports.filterRecursive = filterRecursive;
-
 const isUrl = str => {
   return /^https?:\/\//.test(str);
 };
-
 exports.isUrl = isUrl;
-
 const isIconifyString = str => {
   return /^[\w-]+:[\w-]+$/.test(str);
 };
+
 /**
  * 检测 path 是否匹配当前 location, path 只考虑 "/" 开头的相对路径
  */
-
-
 exports.isIconifyString = isIconifyString;
-
 const matchPath = path => {
   if (!path || !(path !== null && path !== void 0 && path.startsWith('/'))) {
     return false;
   }
-
   const ensureTrailingSlash = str => str.endsWith('/') ? str : "".concat(str, "/");
-
   const pathname = ensureTrailingSlash(window.location.pathname);
   const normalizedPath = ensureTrailingSlash(new URL(path, window.location.origin).pathname);
   return pathname.startsWith(normalizedPath);
 };
+
 /**
  * 从一组 paths 中, 找到匹配当前 location 的 path, 返回序号
  */
-
-
 exports.matchPath = matchPath;
-
 const matchPaths = function matchPaths() {
   let paths = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   const matched = paths.map((item, index) => ({
     path: item,
     index
   })).filter(item => matchPath(item.path));
-
   if (!(matched !== null && matched !== void 0 && matched.length)) {
     return -1;
-  } // 多个 path 都匹配时, 取一个最具体 (最长的) path
-
-
+  }
+  // 多个 path 都匹配时, 取一个最具体 (最长的) path
   const mostSpecific = matched.slice(1).reduce((prev, cur) => {
     return prev.path.length >= cur.path.length ? prev : cur;
   }, matched[0]);
   return mostSpecific.index;
 };
-
 exports.matchPaths = matchPaths;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.5.58",
+  "version": "2.5.60",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -31,8 +31,8 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.5.58",
-    "@arcblock/ux": "^2.5.58",
+    "@arcblock/did-connect": "^2.5.60",
+    "@arcblock/ux": "^2.5.60",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/iconify": "^2.2.1",
@@ -54,5 +54,5 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3"
   },
-  "gitHead": "ac16776460613a0e3a004ebb66fba2b98f3e0d86"
+  "gitHead": "50a0f90ecfb1d239e04cdfebc16e30d3947db4a2"
 }