@arcblock/ux 2.7.19 → 2.7.21

package/es/BlockletContext/index.js

@@ -22,7 +22,7 @@ function BlockletProvider({
   const [blockletData, setBlockletData] = useState(null);
   const getBlockleData = useMemoizedFn(async () => {
     if (!baseUrl || window.location.href.startsWith(baseUrl)) {
-      return window.blocklet;
+      throw new Error('no blocklet data');
     }
     const url = new URL('__blocklet__.js', baseUrl);
     url.searchParams.set('type', 'json');
@@ -36,7 +36,8 @@ function BlockletProvider({
       setBlockletData(data);
     } catch {
       // NOTICE: 如果获取指定 blockletData 失败，则使用 window.blocklet
-      setBlockletData(window.blocklet);
+      const data = window.blocklet || window.env;
+      setBlockletData(data);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [baseUrl]);

package/es/SessionManager/translation.js

@@ -19,7 +19,7 @@ export const translations = {
     from: 'From',
     addAnotherAccount: 'Add another account',
     deleteAccountTitle: 'Remove this account ?',
-    deleteAccountContent: 'After delete account, you can add it agian',
+    deleteAccountContent: 'After delete account, you can add it again',
     confirm: 'Confirm',
     cancel: 'Cancel',
     noneMenu: 'Empty menu, maybe you should switch to another role'

package/es/SessionManager/user-info.js

@@ -32,7 +32,7 @@ export default function UserInfo({
     session
   });
   const currentRole = useCreation(() => session.user?.passports?.find(item => item.name === session.user.role), [session?.user?.passports, session?.user?.role]);
-  const userEmail = useCreation(() => session.user?.email || 'lancelot_lewis@163.com', [session?.user]);
+  const userEmail = useCreation(() => session.user?.email, [session?.user]);
   const canEdit = useCreation(() => {
     if (onSwitchProfile instanceof Function) {
       if (switchProfile && hasBindWallet) {
@@ -92,43 +92,38 @@ export default function UserInfo({
         overflow: 'hidden',
         fontSize: '14px'
       },
-      children: [/*#__PURE__*/_jsxs(Box, {
-        display: "flex",
-        alignItems: "center",
-        gap: "4px",
-        mb: 0.5,
-        children: [/*#__PURE__*/_jsx(Typography, {
-          variant: "h5",
-          fontWeight: "bold",
-          sx: {
-            flex: 1,
-            wordBreak: 'break-all'
-          },
-          children: session.user.fullName
-        }), /*#__PURE__*/_jsx(Chip, {
-          label: currentRole?.title || session.user?.role.toUpperCase(),
-          size: "small",
-          variant: "outlined",
-          sx: {
-            height: 'auto',
-            marginRight: 0,
-            fontWeight: 'bold',
-            fontSize: '12px'
-          },
-          icon: /*#__PURE__*/_jsx(Icon, {
-            icon: ShieldCheckIcon,
-            height: "0.8em"
-          }),
-          deleteIcon: /*#__PURE__*/_jsx(Icon, {
-            icon: ExpandMoreIcon,
-            height: "1em"
-          })
-          // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
-          ,
-          onDelete: onSwitchPassport,
-          onClick: onSwitchPassport,
-          "data-cy": "sessionManager-switch-passport-trigger"
-        })]
+      children: [/*#__PURE__*/_jsx(Typography, {
+        variant: "h5",
+        fontWeight: "bold",
+        sx: {
+          wordBreak: 'break-all',
+          lineHeight: 1
+        },
+        children: session.user.fullName
+      }), /*#__PURE__*/_jsx(Chip, {
+        label: currentRole?.title || session.user?.role.toUpperCase(),
+        size: "small",
+        variant: "outlined",
+        sx: {
+          height: 'auto',
+          marginRight: 0,
+          fontWeight: 'bold',
+          fontSize: '12px',
+          margin: '6px 0 4px 0'
+        },
+        icon: /*#__PURE__*/_jsx(Icon, {
+          icon: ShieldCheckIcon,
+          height: "0.8em"
+        }),
+        deleteIcon: /*#__PURE__*/_jsx(Icon, {
+          icon: ExpandMoreIcon,
+          height: "1em"
+        })
+        // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
+        ,
+        onDelete: onSwitchPassport,
+        onClick: onSwitchPassport,
+        "data-cy": "sessionManager-switch-passport-trigger"
       }), session.provider === 'auth0' ? walletDid ? /*#__PURE__*/_jsx(DID, {
         responsive: false,
         compact: true,

package/es/Util/index.js

@@ -130,7 +130,7 @@ export function setDateTool(tool) {
 export function getDateTool() {
   return dateTool;
 }
-const createDateFormater = format => (date, {
+const createDateFormatter = format => (date, {
   locale,
   tz
 }) => {
@@ -157,13 +157,13 @@ const createDateFormater = format => (date, {
  * @param {object} option
  * @param {string} option.locale, default: en
  * @param {string} option.tz, default: timzone
- * @returns formated date string
+ * @returns formatted date string
  */
 export function formatToDate(date, {
   locale,
   tz
 } = {}) {
-  return createDateFormater('ll')(date, {
+  return createDateFormatter('ll')(date, {
     locale,
     tz
   });
@@ -176,13 +176,13 @@ export function formatToDate(date, {
  * @param {object} option
  * @param {string} option.locale, default: en
  * @param {string} option.tz, default: timzone
- * @returns formated date string
+ * @returns formatted date string
  */
 export function formatToDatetime(date, {
   locale,
   tz
 } = {}) {
-  return createDateFormater('lll')(date, {
+  return createDateFormatter('lll')(date, {
     locale,
     tz
   });

package/lib/BlockletContext/index.js

@@ -34,7 +34,7 @@ function BlockletProvider(_ref) {
   const [blockletData, setBlockletData] = (0, _react.useState)(null);
   const getBlockleData = (0, _ahooks.useMemoizedFn)(async () => {
     if (!baseUrl || window.location.href.startsWith(baseUrl)) {
-      return window.blocklet;
+      throw new Error('no blocklet data');
     }
     const url = new URL('__blocklet__.js', baseUrl);
     url.searchParams.set('type', 'json');
@@ -48,7 +48,8 @@ function BlockletProvider(_ref) {
       setBlockletData(data);
     } catch (_unused) {
       // NOTICE: 如果获取指定 blockletData 失败，则使用 window.blocklet
-      setBlockletData(window.blocklet);
+      const data = window.blocklet || window.env;
+      setBlockletData(data);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [baseUrl]);

package/lib/SessionManager/translation.js

@@ -25,7 +25,7 @@ const translations = {
     from: 'From',
     addAnotherAccount: 'Add another account',
     deleteAccountTitle: 'Remove this account ?',
-    deleteAccountContent: 'After delete account, you can add it agian',
+    deleteAccountContent: 'After delete account, you can add it again',
     confirm: 'Confirm',
     cancel: 'Cancel',
     noneMenu: 'Empty menu, maybe you should switch to another role'

package/lib/SessionManager/user-info.js

@@ -47,7 +47,7 @@ function UserInfo(_ref) {
   }, [session === null || session === void 0 ? void 0 : (_session$user3 = session.user) === null || _session$user3 === void 0 ? void 0 : _session$user3.passports, session === null || session === void 0 ? void 0 : (_session$user4 = session.user) === null || _session$user4 === void 0 ? void 0 : _session$user4.role]);
   const userEmail = (0, _ahooks.useCreation)(() => {
     var _session$user5;
-    return ((_session$user5 = session.user) === null || _session$user5 === void 0 ? void 0 : _session$user5.email) || 'lancelot_lewis@163.com';
+    return (_session$user5 = session.user) === null || _session$user5 === void 0 ? void 0 : _session$user5.email;
   }, [session === null || session === void 0 ? void 0 : session.user]);
   const canEdit = (0, _ahooks.useCreation)(() => {
     if (onSwitchProfile instanceof Function) {
@@ -108,43 +108,38 @@ function UserInfo(_ref) {
         overflow: 'hidden',
         fontSize: '14px'
       },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-        display: "flex",
-        alignItems: "center",
-        gap: "4px",
-        mb: 0.5,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
-          variant: "h5",
-          fontWeight: "bold",
-          sx: {
-            flex: 1,
-            wordBreak: 'break-all'
-          },
-          children: session.user.fullName
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
-          label: (currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user6 = session.user) === null || _session$user6 === void 0 ? void 0 : _session$user6.role.toUpperCase()),
-          size: "small",
-          variant: "outlined",
-          sx: {
-            height: 'auto',
-            marginRight: 0,
-            fontWeight: 'bold',
-            fontSize: '12px'
-          },
-          icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-            icon: _shieldCheck.default,
-            height: "0.8em"
-          }),
-          deleteIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
-            icon: _expandMore.default,
-            height: "1em"
-          })
-          // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
-          ,
-          onDelete: onSwitchPassport,
-          onClick: onSwitchPassport,
-          "data-cy": "sessionManager-switch-passport-trigger"
-        })]
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+        variant: "h5",
+        fontWeight: "bold",
+        sx: {
+          wordBreak: 'break-all',
+          lineHeight: 1
+        },
+        children: session.user.fullName
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Chip, {
+        label: (currentRole === null || currentRole === void 0 ? void 0 : currentRole.title) || ((_session$user6 = session.user) === null || _session$user6 === void 0 ? void 0 : _session$user6.role.toUpperCase()),
+        size: "small",
+        variant: "outlined",
+        sx: {
+          height: 'auto',
+          marginRight: 0,
+          fontWeight: 'bold',
+          fontSize: '12px',
+          margin: '6px 0 4px 0'
+        },
+        icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: _shieldCheck.default,
+          height: "0.8em"
+        }),
+        deleteIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.Icon, {
+          icon: _expandMore.default,
+          height: "1em"
+        })
+        // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
+        ,
+        onDelete: onSwitchPassport,
+        onClick: onSwitchPassport,
+        "data-cy": "sessionManager-switch-passport-trigger"
       }), session.provider === 'auth0' ? walletDid ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_DID.default, {
         responsive: false,
         compact: true,

package/lib/Util/index.js

@@ -164,7 +164,7 @@ function setDateTool(tool) {
 function getDateTool() {
   return dateTool;
 }
-const createDateFormater = format => (date, _ref2) => {
+const createDateFormatter = format => (date, _ref2) => {
   let {
     locale,
     tz
@@ -192,14 +192,14 @@ const createDateFormater = format => (date, _ref2) => {
  * @param {object} option
  * @param {string} option.locale, default: en
  * @param {string} option.tz, default: timzone
- * @returns formated date string
+ * @returns formatted date string
  */
 function formatToDate(date) {
   let {
     locale,
     tz
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return createDateFormater('ll')(date, {
+  return createDateFormatter('ll')(date, {
     locale,
     tz
   });
@@ -212,14 +212,14 @@ function formatToDate(date) {
  * @param {object} option
  * @param {string} option.locale, default: en
  * @param {string} option.tz, default: timzone
- * @returns formated date string
+ * @returns formatted date string
  */
 function formatToDatetime(date) {
   let {
     locale,
     tz
   } = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return createDateFormater('lll')(date, {
+  return createDateFormatter('lll')(date, {
     locale,
     tz
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.7.19",
+  "version": "2.7.21",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -322,11 +322,11 @@
   "peerDependencies": {
     "react": ">=18.1.0"
   },
-  "gitHead": "b87566fc7ec2502f2f1481189cd9a22a2ebde42e",
+  "gitHead": "e92f763c6f07c8adf341ffc8ffa417adb98c47fa",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.7.19",
-    "@arcblock/react-hooks": "^2.7.19",
+    "@arcblock/icons": "^2.7.21",
+    "@arcblock/react-hooks": "^2.7.21",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/BlockletContext/index.jsx

@@ -17,7 +17,7 @@ function BlockletProvider({ children, baseUrl }) {
   const [blockletData, setBlockletData] = useState(null);
   const getBlockleData = useMemoizedFn(async () => {
     if (!baseUrl || window.location.href.startsWith(baseUrl)) {
-      return window.blocklet;
+      throw new Error('no blocklet data');
     }
 
     const url = new URL('__blocklet__.js', baseUrl);
@@ -32,7 +32,8 @@ function BlockletProvider({ children, baseUrl }) {
       setBlockletData(data);
     } catch {
       // NOTICE: 如果获取指定 blockletData 失败，则使用 window.blocklet
-      setBlockletData(window.blocklet);
+      const data = window.blocklet || window.env;
+      setBlockletData(data);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [baseUrl]);

package/src/SessionManager/translation.js

@@ -19,7 +19,7 @@ export const translations = {
     from: 'From',
     addAnotherAccount: 'Add another account',
     deleteAccountTitle: 'Remove this account ?',
-    deleteAccountContent: 'After delete account, you can add it agian',
+    deleteAccountContent: 'After delete account, you can add it again',
     confirm: 'Confirm',
     cancel: 'Cancel',
     noneMenu: 'Empty menu, maybe you should switch to another role',

package/src/SessionManager/user-info.jsx

@@ -24,7 +24,7 @@ export default function UserInfo({ session, locale, onSwitchProfile, onSwitchPas
     () => session.user?.passports?.find((item) => item.name === session.user.role),
     [session?.user?.passports, session?.user?.role]
   );
-  const userEmail = useCreation(() => session.user?.email || 'lancelot_lewis@163.com', [session?.user]);
+  const userEmail = useCreation(() => session.user?.email, [session?.user]);
 
   const canEdit = useCreation(() => {
     if (onSwitchProfile instanceof Function) {
@@ -79,28 +79,27 @@ export default function UserInfo({ session, locale, onSwitchProfile, onSwitchPas
         <DidAvatar variant="circle" did={session.user.did} src={avatar} size={64} shape="circle" />
       </Box>
       <Box sx={{ flex: 1, position: 'static', overflow: 'hidden', fontSize: '14px' }}>
-        <Box display="flex" alignItems="center" gap="4px" mb={0.5}>
-          <Typography variant="h5" fontWeight="bold" sx={{ flex: 1, wordBreak: 'break-all' }}>
-            {session.user.fullName}
-          </Typography>
-          <Chip
-            label={currentRole?.title || session.user?.role.toUpperCase()}
-            size="small"
-            variant="outlined"
-            sx={{
-              height: 'auto',
-              marginRight: 0,
-              fontWeight: 'bold',
-              fontSize: '12px',
-            }}
-            icon={<Icon icon={ShieldCheckIcon} height="0.8em" />}
-            deleteIcon={<Icon icon={ExpandMoreIcon} height="1em" />}
-            // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
-            onDelete={onSwitchPassport}
-            onClick={onSwitchPassport}
-            data-cy="sessionManager-switch-passport-trigger"
-          />
-        </Box>
+        <Typography variant="h5" fontWeight="bold" sx={{ wordBreak: 'break-all', lineHeight: 1 }}>
+          {session.user.fullName}
+        </Typography>
+        <Chip
+          label={currentRole?.title || session.user?.role.toUpperCase()}
+          size="small"
+          variant="outlined"
+          sx={{
+            height: 'auto',
+            marginRight: 0,
+            fontWeight: 'bold',
+            fontSize: '12px',
+            margin: '6px 0 4px 0',
+          }}
+          icon={<Icon icon={ShieldCheckIcon} height="0.8em" />}
+          deleteIcon={<Icon icon={ExpandMoreIcon} height="1em" />}
+          // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
+          onDelete={onSwitchPassport}
+          onClick={onSwitchPassport}
+          data-cy="sessionManager-switch-passport-trigger"
+        />
         {/* eslint-disable-next-line no-nested-ternary */}
         {session.provider === 'auth0' ? (
           walletDid ? (

package/src/Util/index.js

@@ -161,7 +161,7 @@ export function getDateTool() {
   return dateTool;
 }
 
-const createDateFormater =
+const createDateFormatter =
   (format) =>
   (date, { locale, tz }) => {
     if (dateTool === null) {
@@ -192,10 +192,10 @@ const createDateFormater =
  * @param {object} option
  * @param {string} option.locale, default: en
  * @param {string} option.tz, default: timzone
- * @returns formated date string
+ * @returns formatted date string
  */
 export function formatToDate(date, { locale, tz } = {}) {
-  return createDateFormater('ll')(date, { locale, tz });
+  return createDateFormatter('ll')(date, { locale, tz });
 }
 
 /**
@@ -205,10 +205,10 @@ export function formatToDate(date, { locale, tz } = {}) {
  * @param {object} option
  * @param {string} option.locale, default: en
  * @param {string} option.tz, default: timzone
- * @returns formated date string
+ * @returns formatted date string
  */
 export function formatToDatetime(date, { locale, tz } = {}) {
-  return createDateFormater('lll')(date, { locale, tz });
+  return createDateFormatter('lll')(date, { locale, tz });
 }
 
 export function detectWalletExtension() {