@abtnode/ux 1.16.13 → 1.16.14-beta-a898bfcb

package/lib/blocklet/actions.js

@@ -294,12 +294,12 @@ function BlockletActions(_ref) {
     }, true),
     disabled: inProgress
   } : null;
-  const cancelDownloadAction = !inService ? {
+  const cancelDownloadAction = {
     action: 'remove',
     icon: _icons.default.Remove,
     name: t('common.cancel'),
     handler: createHandler('cancelDownload', node.api.cancelDownloadBlocklet, true)
-  } : null;
+  };
   const missingRequiredConfigs = (0, _util.getAppMissingConfigs)(blocklet);
   const actions = [{
     action: 'start',

package/lib/blocklet/component/space-connector.js

@@ -106,7 +106,7 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
         }]
       }
     }).then(() => {
-      _Toast.default.success(t('storage.spaces.connected', locale));
+      _Toast.default.success(t('storage.spaces.connect.succeeded', locale));
     }).catch(error => {
       console.error(error);
       _Toast.default.error(error.message);

package/lib/blocklet/storage/backups.js

@@ -210,7 +210,11 @@ function SpacesBackupRecords(_ref2) {
   }];
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, _objectSpread(_objectSpread({}, rest), {}, {
     children: backups !== null && backups !== void 0 && backups.length ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Datatable.default, {
-      title: t('storage.spaces.backup.records'),
+      title: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+        fontSize: "1.2rem",
+        fontWeight: "bold",
+        children: t('storage.spaces.backup.records')
+      }),
       data: backups,
       columns: columns,
       emptyNode: t('storage.spaces.record.emptyData', locale),
@@ -219,10 +223,23 @@ function SpacesBackupRecords(_ref2) {
         filter: false,
         print: false
       }
-    }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-      color: "#9397A1",
-      marginTop: "24px",
-      children: t('storage.spaces.record.emptyData')
+    }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+        display: "flex",
+        height: "56px",
+        lineHeight: "56px",
+        alignItems: "center",
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+          fontSize: "1.2rem",
+          fontWeight: "bold",
+          children: t('storage.spaces.backup.records')
+        })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+        color: "#9397A1",
+        marginTop: "16px",
+        marginBottom: "24px",
+        children: t('storage.spaces.record.emptyData')
+      })]
     })
   }));
 }

package/lib/blocklet/storage/item.js

@@ -13,13 +13,11 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _constant = require("@blocklet/constant");
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
-var _Address = _interopRequireDefault(require("@arcblock/ux/lib/Address"));
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _ahooks = require("ahooks");
-var _didMotif = require("@arcblock/did-motif");
 var _lodash = require("lodash");
 var _Check = _interopRequireDefault(require("@mui/icons-material/Check"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _switchControl = _interopRequireDefault(require("../component/switch-control"));
 var _action = _interopRequireDefault(require("./action"));
 var _mode = require("../../util/mode");
@@ -368,29 +366,12 @@ function SpaceItem(_ref) {
               fontSize: '14px'
             },
             color: "#9397A1",
-            children: spaceGateway.did && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
-                fontSize: "14px",
-                color: (0, _didMotif.getDIDMotifInfo)(spaceGateway.did).color,
-                children: "DID:ABT:"
-              }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-                style: {
-                  display: 'inline-flex',
-                  marginLeft: '8px'
-                },
-                copyable: false,
-                size: 14,
-                compact: true,
-                responsive: false,
-                prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-                  did: spaceGateway.did,
-                  size: 16,
-                  style: {
-                    marginRight: 8
-                  }
-                }),
-                children: spaceGateway.did
-              })]
+            children: spaceGateway.did && /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+              copyable: false,
+              size: 14,
+              compact: true,
+              responsive: false,
+              did: spaceGateway.did
             })
           })
         })]

package/lib/did-address.js

@@ -5,11 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _reactRouterDom = require("react-router-dom");
 var _Link = _interopRequireDefault(require("@mui/material/Link"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
+var _DID = _interopRequireDefault(require("@arcblock/ux/lib/DID"));
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["did", "href", "external", "avatarProps"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -28,37 +26,24 @@ function WrappedDidAddress(_ref) {
       avatarProps
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
-  // eslint-disable-next-line react/no-unstable-nested-components
-  function Content() {
-    if (href) {
-      if (external) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link.default, {
-          target: "_blank",
-          href: href,
-          underline: "hover",
-          children: did
-        });
-      }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
-        to: href,
-        children: did
+  const content = /*#__PURE__*/(0, _jsxRuntime.jsx)(_DID.default, _objectSpread({
+    did: did
+  }, rest));
+  if (href) {
+    if (external) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link.default, {
+        target: "_blank",
+        href: href,
+        underline: "hover",
+        children: content
       });
     }
-    return did;
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactRouterDom.Link, {
+      to: href,
+      children: content
+    });
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, _objectSpread(_objectSpread({
-    prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      component: "span",
-      display: "flex",
-      mr: 1,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, _objectSpread({
-        did: did,
-        size: 18
-      }, avatarProps))
-    })
-  }, rest), {}, {
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Content, {})
-  }));
+  return content;
 }
 WrappedDidAddress.propTypes = {
   did: _propTypes.default.string.isRequired,

package/lib/locales/en.js

@@ -1422,7 +1422,8 @@ module.exports = {
         useWallet: 'Connect DID Spaces',
         useSpaceGateway: 'Connect using the DID Spaces gateway',
         switchToSpace: 'Switch to Space',
-        switchToSpaceSucceeded: 'Switched to Space{name}'
+        switchToSpaceSucceeded: 'Switched to Space{name}',
+        succeeded: 'You have successfully connected to DID Spaces'
       },
       disconnected: {
         tag: 'Disconnected',

package/lib/locales/zh.js

@@ -1425,7 +1425,8 @@ module.exports = {
         useWallet: '使用 DID Wallet 连接',
         useSpaceGateway: '使用 DID Spaces 网关连接',
         switchToSpace: '切换至 Space',
-        switchToSpaceSucceeded: '已切换至 Space{name}'
+        switchToSpaceSucceeded: '已切换至 Space{name}',
+        succeeded: '你已成功连接至 DID Spaces'
       },
       disconnected: {
         tag: '连接已断开',

package/lib/lost-passport.js

@@ -19,12 +19,12 @@ var _GetApp = _interopRequireDefault(require("@mui/icons-material/GetApp"));
 var _Done = _interopRequireDefault(require("@mui/icons-material/Done"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _constant = require("@abtnode/constant");
 var _cardSelector = _interopRequireDefault(require("./card-selector"));
+var _didAddress = _interopRequireDefault(require("./did-address"));
 var _wrapLocale = _interopRequireDefault(require("./wrap-locale"));
 var _usePassportId = _interopRequireDefault(require("./hooks/use-passport-id"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -199,8 +199,8 @@ function LostPassport(_ref2) {
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
               className: "did",
               mt: 1,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-                children: user.did
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+                did: user.did
               })
             })]
           })]

package/lib/team/members/index.js

@@ -16,7 +16,6 @@ var _FormControlLabel = _interopRequireDefault(require("@mui/material/FormContro
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
 var _Add = _interopRequireDefault(require("@mui/icons-material/Add"));
 var _Loop = _interopRequireDefault(require("@mui/icons-material/Loop"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -28,6 +27,7 @@ var _constant = require("@abtnode/constant");
 var _useUrlState = _interopRequireDefault(require("@ahooksjs/use-url-state"));
 var _ahooks = require("ahooks");
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
 var _blocklet = require("../../contexts/blocklet");
@@ -263,10 +263,11 @@ function MemberList(_ref2) {
     name: 'did',
     options: {
       customBodyRender: e => {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
           size: 14,
+          responsive: true,
           copyable: false,
-          children: e
+          did: e
         });
       }
     }

package/lib/team/members/member.js

@@ -15,11 +15,11 @@ var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _ForbidLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/ForbidLoginIcon"));
 var _AllowLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/AllowLoginIcon"));
 var _ahooks = require("ahooks");
 var _constant = require("@abtnode/constant");
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = _interopRequireDefault(require("../../permission"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -73,8 +73,8 @@ function TabOAuth(_ref2) {
       valueComponent: "div",
       nameWidth: 120,
       name: account.provider,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-        children: account.did
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+        did: account.did
       })
     }, account.did);
   });
@@ -356,8 +356,8 @@ function Member(_ref3) {
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
               className: "did",
               mt: 1,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
-                children: pageState.user.did
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+                did: pageState.user.did
               })
             })]
           })]

package/lib/team/passports/trusted-factories.js

@@ -16,11 +16,10 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = require("../../permission");
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -134,24 +133,11 @@ function TrustedFactories(_ref) {
             mt: "20px",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
               flexGrow: 1,
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
                 copyable: false,
-                prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                  display: "flex",
-                  alignItems: "center",
-                  mr: 1,
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-                    did: x.factoryAddress,
-                    size: 20
-                  })
-                }),
-                showDidLogo: false,
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  style: {
-                    fontSize: 16
-                  },
-                  children: x.factoryAddress
-                })
+                did: x.factoryAddress,
+                size: 16,
+                showDidLogo: false
               }), !!x.remark && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
                 pl: 3.5,
                 fontSize: 12,

package/lib/team/passports/trusted-issuers.js

@@ -15,11 +15,10 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
-var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _DeleteIcon = _interopRequireDefault(require("@arcblock/icons/lib/DeleteIcon"));
-var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _didAddress = _interopRequireDefault(require("../../did-address"));
 var _permission = require("../../permission");
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -139,24 +138,11 @@ function TrustedIssuers(_ref) {
             mt: "20px",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
               flexShrink: 0,
-              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
+              children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
                 copyable: false,
-                prepend: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-                  display: "flex",
-                  alignItems: "center",
-                  mr: 1,
-                  children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar.default, {
-                    did: x.issuerDid,
-                    size: 20
-                  })
-                }),
-                showDidLogo: false,
-                children: /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  style: {
-                    fontSize: 16
-                  },
-                  children: x.issuerDid
-                })
+                size: 16,
+                did: x.issuerDid,
+                showDidLogo: false
               }), !!x.remark && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
                 pl: 3.5,
                 fontSize: 12,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.13",
+  "version": "1.16.14-beta-a898bfcb",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -23,22 +23,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.13",
-    "@abtnode/constant": "1.16.13",
-    "@abtnode/util": "1.16.13",
+    "@abtnode/auth": "1.16.14-beta-a898bfcb",
+    "@abtnode/constant": "1.16.14-beta-a898bfcb",
+    "@abtnode/util": "1.16.14-beta-a898bfcb",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.84",
-    "@arcblock/did-connect": "^2.5.54",
+    "@arcblock/did-connect": "^2.5.58",
     "@arcblock/did-motif": "^1.1.12",
-    "@arcblock/icons": "^2.5.54",
-    "@arcblock/react-hooks": "^2.5.54",
-    "@arcblock/terminal": "^2.5.54",
-    "@arcblock/ux": "^2.5.54",
-    "@blocklet/constant": "1.16.13",
-    "@blocklet/launcher-layout": "2.1.26",
-    "@blocklet/list": "^0.12.4",
-    "@blocklet/meta": "1.16.13",
-    "@blocklet/ui-react": "^2.5.54",
+    "@arcblock/icons": "^2.5.58",
+    "@arcblock/react-hooks": "^2.5.58",
+    "@arcblock/terminal": "^2.5.58",
+    "@arcblock/ux": "^2.5.58",
+    "@blocklet/constant": "1.16.14-beta-a898bfcb",
+    "@blocklet/launcher-layout": "2.1.37",
+    "@blocklet/list": "^0.12.7",
+    "@blocklet/meta": "1.16.14-beta-a898bfcb",
+    "@blocklet/ui-react": "^2.5.58",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -95,5 +95,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "0f07f6617a8cf53a4fa693d6ca227f6f6bd90af2"
+  "gitHead": "1e6f2ec5199ca28e106a6b02114f2a3f355b3ceb"
 }