@abtnode/ux 1.8.66-beta-b56e3b54 → 1.8.66

package/lib/blocklet/router/action/add-domain-alias.js

@@ -7,7 +7,7 @@ exports.default = AddDomainAlias;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _CallMerge = _interopRequireDefault(require("@mui/icons-material/CallMerge"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -140,8 +140,8 @@ function AddDomainAlias(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-add-domain-alias",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_CallMerge.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/router/action/add-rule.js

@@ -7,18 +7,20 @@ exports.default = AddRule;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Link = _interopRequireDefault(require("@mui/icons-material/Link"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@abtnode/constant");
+var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
 var _toast = _interopRequireDefault(require("../../../toast"));
 var _util = require("../util");
 var _configRoutingRule = _interopRequireDefault(require("./config-routing-rule"));
+var _util2 = require("../../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 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; }
@@ -56,7 +58,7 @@ function AddRule(_ref) {
       setLoading(true);
       const rule = {
         from: {
-          pathPrefix: params.pathPrefix.trim()
+          pathPrefix: (0, _urlFriendly.default)(params.pathPrefix)
         },
         to: {
           type: params.type
@@ -105,7 +107,7 @@ function AddRule(_ref) {
           "data-cy": "path-prefix-input",
           fullWidth: true,
           autoFocus: true,
-          helperText: t('router.rule.add.pathPrefixTip'),
+          helperText: params.helperText || t('router.rule.add.pathPrefixTip'),
           style: {
             marginBottom: 32
           },
@@ -133,8 +135,12 @@ function AddRule(_ref) {
             if (!disable) {
               setError('');
             }
+            const helperText = t('common.slugifyHint', {
+              value: (0, _util2.formatMountPoint)(e.target.value)
+            });
             setParams(_objectSpread(_objectSpread({}, params), {}, {
               pathPrefix: e.target.value,
+              helperText,
               __disableConfirm: disable
             }));
           }
@@ -170,8 +176,8 @@ function AddRule(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-add-rule",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Link.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/router/action/delete-domain-alias.js

@@ -7,7 +7,7 @@ exports.default = DeleteDomainAlias;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
@@ -78,8 +78,8 @@ function DeleteDomainAlias(props) {
       className: "rule-action",
       color: "error",
       "data-cy": "action-delete-domain-alias",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Delete.default, {
         style: {
           fontSize: 16

package/lib/blocklet/router/action/delete-rule.js

@@ -7,7 +7,7 @@ exports.default = DeleteRule;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _node = require("../../../contexts/node");
@@ -83,8 +83,8 @@ function DeleteRule(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-delete-rule",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Delete.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/router/action/update-rule.js

@@ -7,18 +7,20 @@ exports.default = UpdateRule;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Edit = _interopRequireDefault(require("@mui/icons-material/Edit"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
 var _toast = _interopRequireDefault(require("../../../toast"));
 var _util = require("../util");
 var _configRoutingRule = _interopRequireDefault(require("./config-routing-rule"));
+var _util2 = require("../../../util");
 var _jsxRuntime = require("react/jsx-runtime");
 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; }
@@ -61,7 +63,7 @@ function UpdateRule(_ref) {
       const rule = {
         id: ruleId,
         from: {
-          pathPrefix: params.pathPrefix.trim()
+          pathPrefix: (0, _urlFriendly.default)(params.pathPrefix)
         },
         to: {
           type: params.type
@@ -109,7 +111,7 @@ function UpdateRule(_ref) {
           "data-cy": "path-prefix-input",
           fullWidth: true,
           autoFocus: true,
-          helperText: t('router.rule.add.pathPrefixTip'),
+          helperText: params.helperText || t('router.rule.add.pathPrefixTip'),
           style: {
             marginBottom: 32
           },
@@ -127,8 +129,12 @@ function UpdateRule(_ref) {
             if (!disable) {
               setError('');
             }
+            const helperText = t('common.slugifyHint', {
+              value: (0, _util2.formatMountPoint)(e.target.value)
+            });
             setParams(_objectSpread(_objectSpread({}, params), {}, {
               pathPrefix: e.target.value,
+              helperText,
               __disableConfirm: disable
             }));
           }
@@ -166,8 +172,8 @@ function UpdateRule(_ref) {
       onClick: onMenuItemClick,
       className: "rule-action",
       "data-cy": "action-update-rule",
-      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Edit.default, {
         style: {
           fontSize: 18,

package/lib/blocklet/status.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = BlockletStatus;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _dot = _interopRequireDefault(require("../dot"));
@@ -85,8 +85,8 @@ function BlockletStatus(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_tag.default, _objectSpread(_objectSpread({
     type: map[status]
   }, rest), {}, {
-    children: [inProgress && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-      size: 12,
+    children: [inProgress && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+      size: [12, 6],
       color: "inherit",
       style: {
         marginRight: 5

package/lib/blocklet/version.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _semver = _interopRequireDefault(require("semver"));
 var _notistack = require("notistack");
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _ArrowUpward = _interopRequireDefault(require("@mui/icons-material/ArrowUpward"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
@@ -130,8 +130,8 @@ function Version(_ref) {
           },
           disabled: loading,
           onClick: () => setConfirmSetting(setting),
-          children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-            size: 16
+          children: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+            size: [16, 10]
           }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ArrowUpward.default, {
             style: {
               fontSize: 16,

package/lib/confirm.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _DialogActions = _interopRequireDefault(require("@mui/material/DialogActions"));
 var _DialogContent = _interopRequireDefault(require("@mui/material/DialogContent"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
@@ -118,8 +118,8 @@ function ConfirmDialog(_ref) {
         variant: "contained",
         "data-cy": "submit-confirm-dialog",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), confirm]
       })]
     })]

package/lib/form/form-text-input.js

@@ -16,7 +16,7 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _required = _interopRequireDefault(require("./required"));
 var _formWrapper = _interopRequireDefault(require("./form-wrapper"));
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["label", "disabled", "required", "initialValue", "onChange", "placeholder", "style", "onSubmit", "secure"];
+const _excluded = ["label", "disabled", "required", "initialValue", "onChange", "placeholder", "style", "onSubmit", "secure", "formatterBeforeSubmit"];
 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; }
@@ -35,7 +35,8 @@ function FormTextInput(_ref) {
       placeholder,
       style,
       onSubmit,
-      secure
+      secure,
+      formatterBeforeSubmit
     } = _ref,
     rest = _objectWithoutProperties(_ref, _excluded);
   const [editing, setEditing] = (0, _react.useState)(false);
@@ -49,7 +50,12 @@ function FormTextInput(_ref) {
       if (shouldUpdate === false) {
         setValue(defaultValue);
       } else {
-        setDefaultValue(value);
+        let tmpValue = value;
+        if (typeof formatterBeforeSubmit === 'function') {
+          tmpValue = formatterBeforeSubmit(value);
+        }
+        setValue(tmpValue);
+        setDefaultValue(tmpValue);
       }
     } catch (err) {
       setValue(defaultValue);
@@ -148,7 +154,8 @@ FormTextInput.propTypes = {
   placeholder: _propTypes.default.string,
   required: _propTypes.default.bool,
   disabled: _propTypes.default.bool,
-  secure: _propTypes.default.bool
+  secure: _propTypes.default.bool,
+  formatterBeforeSubmit: _propTypes.default.func
 };
 FormTextInput.defaultProps = {
   style: {},
@@ -159,5 +166,6 @@ FormTextInput.defaultProps = {
   placeholder: '',
   required: false,
   disabled: false,
-  secure: false
+  secure: false,
+  formatterBeforeSubmit: null
 };

package/lib/invitation/invitation.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _ahooks = require("ahooks");
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Result = _interopRequireDefault(require("@arcblock/ux/lib/Result"));
 var _invitationPassport = _interopRequireDefault(require("./invitation-passport"));
 var _invitationReceive = _interopRequireDefault(require("./invitation-receive"));
@@ -30,7 +30,7 @@ function Invitation(_ref) {
   } = _ref;
   const state = (0, _ahooks.useRequest)(getDataFn);
   if (state.loading) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {});
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {});
   }
   if (state.error) {
     var _state$error, _state$error$response;

package/lib/issue-passport.js

@@ -109,6 +109,7 @@ function IssuePassport(_ref) {
       autoConnect: false,
       checkFn: api.get,
       checkTimeout: 10 * 60 * 1000,
+      socketUrl: api.socketUrl,
       webWalletUrl: webWalletUrl,
       onSuccess: onReceivePassport,
       locale: locale,

package/lib/locales/en.js

@@ -8,12 +8,6 @@ module.exports = {
       confirm: 'Review this operation on your DID Wallet',
       success: 'Your account is connected to this server'
     },
-    keyPair: {
-      title: 'Derived KeyPair Required',
-      scan: 'Connect your DID Wallet to generate a key-pair for this app',
-      confirm: 'Review this operation on your DID Wallet',
-      success: 'Your key pair is securely stored'
-    },
     verify: {
       title: 'Ownership Credential Required',
       scan: 'Connect your DID Wallet to provide ownership credentials',
@@ -278,7 +272,8 @@ module.exports = {
     normal: 'Normal',
     gateway: 'Gateway',
     verifyNFT: 'Verify NFT',
-    errorMessage: 'Error Message:'
+    errorMessage: 'Error Message:',
+    slugifyHint: 'The actual mount point will be: {value}'
   },
   blocklet: {
     external: 'External',

package/lib/locales/zh.js

@@ -8,12 +8,6 @@ module.exports = {
       confirm: '请在 DID 钱包上确认',
       success: '你已经成功成为节点的所有者'
     },
-    keyPair: {
-      title: '生成钥匙对',
-      scan: '用你的 DID 钱包扫码为这个应用生成钥匙对',
-      confirm: '请在 DID 钱包上确认',
-      success: '你的钥匙对已经被安全存储'
-    },
     verify: {
       title: '需要节点所有权证书',
       scan: '用你的 DID 钱包扫描下面的二维码以提供所有权证书',
@@ -284,7 +278,8 @@ module.exports = {
     normal: '正常',
     gateway: '网关',
     verifyNFT: '验证凭证',
-    errorMessage: '错误信息：'
+    errorMessage: '错误信息：',
+    slugifyHint: '最终生效的挂载点是: {value}'
   },
   blocklet: {
     external: '外部',

package/lib/logs/download.js

@@ -12,7 +12,7 @@ var _Download = _interopRequireDefault(require("@mui/icons-material/Download"));
 var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
 var _Select = _interopRequireDefault(require("@mui/material/Select"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
@@ -75,8 +75,8 @@ function DownloadLog(_ref) {
       variant: "outlined",
       onClick: () => setShowDialog(true),
       disabled: isDownloading,
-      children: [isDownloading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [isDownloading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Download.default, {
         fontSize: "small",
         style: {
@@ -104,8 +104,8 @@ function DownloadLog(_ref) {
       variant: "outlined",
       onClick: () => onDownload(),
       disabled: isDownloading,
-      children: [isDownloading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-        size: 16
+      children: [isDownloading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+        size: [16, 10]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         ml: 0.5,
         children: t('common.confirm')

package/lib/lost-passport.js

@@ -147,6 +147,7 @@ function LostPassport(_ref2) {
           autoConnect: false,
           checkFn: api.get,
           checkTimeout: 10 * 60 * 1000,
+          socketUrl: api.socketUrl,
           webWalletUrl: webWalletUrl,
           onSuccess: onGetUser,
           locale: locale,
@@ -237,6 +238,7 @@ function LostPassport(_ref2) {
         action: "lost-passport-issue",
         checkFn: api.get,
         checkTimeout: 10 * 60 * 1000,
+        socketUrl: api.socketUrl,
         webWalletUrl: webWalletUrl,
         onSuccess: onReceivePassport,
         locale: locale,

package/lib/store/add.js

@@ -7,7 +7,7 @@ exports.default = AddStore;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styles = require("@mui/styles");
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
@@ -115,8 +115,8 @@ function AddStore(_ref) {
           disabled: loading || !url || disable,
           variant: "contained",
           autoFocus: true,
-          children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-            size: 16
+          children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+            size: [16, 10]
           }), t('common.confirm')]
         })]
       }),

package/lib/team/members/invite-member.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -181,8 +181,8 @@ function InviteMember(_ref) {
         disabled: loading || !role,
         variant: "contained",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), step.confirm]
       })]
     }),

package/lib/team/members/issue-passport.js

@@ -7,7 +7,7 @@ exports.default = IssuePassport;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
@@ -90,8 +90,8 @@ function IssuePassport(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "issue-passport-create-btn",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), t('team.passport.issuance.create.title')]
       })]
     }),

package/lib/team/members/member.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _notistack = require("notistack");
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
@@ -244,7 +244,7 @@ function Member(_ref) {
     }),
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
       children: [!user && /*#__PURE__*/(0, _jsxRuntime.jsx)(Center, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
       }), user && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           display: "flex",

package/lib/team/members/transfer-node.js

@@ -10,7 +10,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
@@ -76,7 +76,7 @@ function TransferMember(_ref) {
           display: 'flex',
           justifyContent: 'center'
         },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
       })
     });
   }
@@ -233,8 +233,8 @@ function TransferMember(_ref) {
         disabled: loading,
         variant: "contained",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), step.confirm]
       })]
     }),

package/lib/team/passports/color.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _reactColor = require("react-color");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -83,8 +83,8 @@ function PassportColor(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "color-btn-confirm",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), t('common.save')]
       })]
     }),

package/lib/team/passports/detail.js

@@ -9,7 +9,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _FormControlLabel = _interopRequireDefault(require("@mui/material/FormControlLabel"));
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
@@ -201,14 +201,14 @@ function PassportDetail(_ref) {
         variant: "contained",
         autoFocus: true,
         "data-cy": "bind-permission-btn-confirm",
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), t('common.save')]
       })]
     }),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
       children: [!role && /*#__PURE__*/(0, _jsxRuntime.jsx)(Center, {
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {})
       }), role && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "dialog-content",
         children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {

package/lib/team/passports/index.js

@@ -11,7 +11,7 @@ var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _SplitButton = _interopRequireDefault(require("@arcblock/ux/lib/SplitButton"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _EditIcon = _interopRequireDefault(require("@arcblock/icons/lib/EditIcon"));
 var _LockIcon = _interopRequireDefault(require("@arcblock/icons/lib/LockIcon"));
 var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/ExternalIssuerIcon"));
@@ -105,8 +105,8 @@ function PassportList() {
                 children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
                   display: "flex",
                   alignItems: "center",
-                  children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-                    size: 16,
+                  children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+                    size: [16, 10],
                     style: {
                       marginRight: 8
                     }

package/lib/team/passports/mutate-role.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _md = _interopRequireDefault(require("md5"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Spinner = _interopRequireDefault(require("@arcblock/ux/lib/Spinner"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
@@ -170,8 +170,8 @@ function MutateRole(_ref) {
         disabled: loading,
         variant: "contained",
         autoFocus: true,
-        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
-          size: 16
+        children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Spinner.default, {
+          size: [16, 10]
         }), mode === 'create' ? t('common.create') : t('common.update')]
       })]
     }),