@blocklet/ui-react 2.1.53 → 2.1.54

package/lib/Header/index.js

@@ -7,6 +7,8 @@ exports.default = void 0;
 
 var _react = require("react");
 
+var _jsxRuntime = require("react/jsx-runtime");
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
@@ -43,8 +45,6 @@ var _utils = require("../utils");
 
 var _blocklets = require("../blocklets");
 
-var _jsxRuntime = require("react/jsx-runtime");
-
 const _excluded = ["meta", "addons", "sessionManagerProps"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -167,7 +167,7 @@ function Header(_ref) {
   const renderAddons = () => {
     // 不关心内置的 session manager 和 locale selector, 直接覆盖 UX Header 的 addons
     if (addons && typeof addons !== 'function') {
-      return addons;
+      return Array.isArray(addons) ? addons : [addons];
     }
 
     let addonsArray = []; // 启用了多语言并且检测到了 locale context
@@ -190,10 +190,10 @@ function Header(_ref) {
       addonsArray = addons(addonsArray) || [];
     }
 
-    const addonsFragment = /*#__PURE__*/(0, _react.createElement)(_react.Fragment, null, ...addonsArray);
-    return addonsFragment;
+    return addonsArray;
   };
 
+  const addonList = /*#__PURE__*/(0, _react.createElement)(_jsxRuntime.Fragment, null, ...renderAddons());
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.ThemeProvider, {
     theme: muiTheme,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledUxHeader, _objectSpread(_objectSpread({
@@ -218,7 +218,7 @@ function Header(_ref) {
         }),
         children: did
       }) : null,
-      addons: renderAddons()
+      addons: addonList
     }, rest), {}, {
       $bgcolor: theme === null || theme === void 0 ? void 0 : (_theme$background = theme.background) === null || _theme$background === void 0 ? void 0 : _theme$background.header,
       $theme: muiTheme,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.1.53",
+  "version": "2.1.54",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -34,8 +34,8 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.1.53",
-    "@arcblock/ux": "^2.1.53",
+    "@arcblock/did-connect": "^2.1.54",
+    "@arcblock/ux": "^2.1.54",
     "@iconify/iconify": "^2.2.1",
     "@mui/material": "^5.6.4",
     "core-js": "^3.6.4",
@@ -57,5 +57,5 @@
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^24.1.0"
   },
-  "gitHead": "00b76f602f945f510fe002f8a16b120327a3f068"
+  "gitHead": "a3907bf6904c52478a692d09ee0c4fc4fab7d42e"
 }

package/src/Header/index.js

@@ -1,4 +1,6 @@
-import { useContext, createElement, Fragment, useMemo } from 'react';
+import { useContext, useMemo, createElement } from 'react';
+// FIXME: 直接从 react 中 import  Fragment 可能会在 vite 下出错，先暂时从 react/jsx-runtime 导入 Fragment 来跳过这个问题
+import { Fragment } from 'react/jsx-runtime';
 import PropTypes from 'prop-types';
 import styled from 'styled-components';
 import { ThemeProvider } from '@mui/material/styles';
@@ -88,7 +90,7 @@ function Header({ meta, addons, sessionManagerProps, ...rest }) {
   const renderAddons = () => {
     // 不关心内置的 session manager 和 locale selector, 直接覆盖 UX Header 的 addons
     if (addons && typeof addons !== 'function') {
-      return addons;
+      return Array.isArray(addons) ? addons : [addons];
     }
     let addonsArray = [];
     // 启用了多语言并且检测到了 locale context
@@ -103,10 +105,11 @@ function Header({ meta, addons, sessionManagerProps, ...rest }) {
     if (typeof addons === 'function') {
       addonsArray = addons(addonsArray) || [];
     }
-    const addonsFragment = createElement(Fragment, null, ...addonsArray);
-    return addonsFragment;
+    return addonsArray;
   };
 
+  const addonList = createElement(Fragment, null, ...renderAddons());
+
   return (
     <ThemeProvider theme={muiTheme}>
       <StyledUxHeader
@@ -127,7 +130,7 @@ function Header({ meta, addons, sessionManagerProps, ...rest }) {
             </DidAddress>
           ) : null
         }
-        addons={renderAddons()}
+        addons={addonList}
         {...rest}
         $bgcolor={theme?.background?.header}
         $theme={muiTheme}>