@arcblock/ux 2.7.21 → 2.7.22

package/es/SessionManager/index.js

@@ -48,7 +48,8 @@ function SessionManager({
   const {
     connectAccount,
     config,
-    setConfig
+    setConfig,
+    deleteAccount
   } = useConfig();
   const t = useMemoizedFn((key, data = {}) => {
     return translate(translations, key, locale, 'en', data);
@@ -286,7 +287,9 @@ function SessionManager({
             const cloneConfig = cloneDeep(config);
             cloneConfig.expandAccount = value;
             setConfig(cloneConfig);
-          }
+          },
+          deleteAccount: deleteAccount,
+          accounts: config.accounts
         }), showManageBlocklet ? [/*#__PURE__*/_jsx(Divider, {}, "divider"), /*#__PURE__*/_jsx(ManageBlocklet, {
           menu: menu,
           menuRender: menuRender,

package/es/SessionManager/manage-accounts.js

@@ -1,11 +1,12 @@
-/* eslint-disable react/prop-types */
 /* eslint-disable react/jsx-no-bind */
+import PropTypes from 'prop-types';
 import { useMemoizedFn, useUpdate } from 'ahooks';
 import { MenuItem, SvgIcon } from '@mui/material';
 import { Icon } from '@iconify/react';
 import AccountIcon from '@arcblock/icons/lib/Account';
 import LinkIcon from '@iconify-icons/mdi/link';
 import DisconnectIcon from '@arcblock/icons/lib/Disconnect';
+import noop from 'lodash/noop';
 import AccountItem from './account-item';
 import MenuAccordion from './menu-accordion';
 import { translations } from './translation';
@@ -13,7 +14,6 @@ import { translate } from '../Locale/util';
 import { useConfirm } from '../Dialog/confirm';
 import { getSourceProvider } from './utils';
 import AddAccountItem from './add-account-item';
-import useConfig from './use-config';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -28,7 +28,9 @@ export default function ManageAccounts({
   disableLogout,
   onLogout,
   expanded,
-  onExpand
+  onExpand,
+  accounts,
+  deleteAccount
 }) {
   const {
     bindOAuth,
@@ -41,10 +43,6 @@ export default function ManageAccounts({
     confirmApi,
     confirmHolder
   } = useConfirm();
-  const {
-    deleteAccount,
-    config
-  } = useConfig();
   const update = useUpdate();
   const onChoose = useMemoizedFn((account, {
     active
@@ -137,7 +135,7 @@ export default function ManageAccounts({
           }
         }), t('accounts')]
       }),
-      children: [config.accounts.map(item => /*#__PURE__*/_jsx(AccountItem, {
+      children: [accounts.map(item => /*#__PURE__*/_jsx(AccountItem, {
         account: item,
         locale: locale,
         active: session.user.did === item.did,
@@ -170,4 +168,26 @@ export default function ManageAccounts({
       })]
     }), confirmHolder]
   });
-}
+}
+ManageAccounts.propTypes = {
+  session: PropTypes.object.isRequired,
+  locale: PropTypes.string,
+  onBindWallet: PropTypes.func.isRequired,
+  onSwitchDid: PropTypes.func.isRequired,
+  connectAccount: PropTypes.func.isRequired,
+  close: PropTypes.func.isRequired,
+  hasBindAccount: PropTypes.bool,
+  disableLogout: PropTypes.bool,
+  onLogout: PropTypes.func.isRequired,
+  expanded: PropTypes.bool,
+  onExpand: PropTypes.func,
+  accounts: PropTypes.array.isRequired,
+  deleteAccount: PropTypes.func.isRequired
+};
+ManageAccounts.defaultProps = {
+  locale: 'en',
+  hasBindAccount: false,
+  disableLogout: false,
+  expanded: true,
+  onExpand: noop
+};

package/lib/SessionManager/index.js

@@ -63,7 +63,8 @@ function SessionManager(_ref) {
   const {
     connectAccount,
     config,
-    setConfig
+    setConfig,
+    deleteAccount
   } = (0, _useConfig.default)();
   const t = (0, _ahooks.useMemoizedFn)(function (key) {
     let data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -305,7 +306,9 @@ function SessionManager(_ref) {
             const cloneConfig = (0, _cloneDeep.default)(config);
             cloneConfig.expandAccount = value;
             setConfig(cloneConfig);
-          }
+          },
+          deleteAccount: deleteAccount,
+          accounts: config.accounts
         }), showManageBlocklet ? [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Divider, {}, "divider"), /*#__PURE__*/(0, _jsxRuntime.jsx)(_manageBlocklet.default, {
           menu: menu,
           menuRender: menuRender,

package/lib/SessionManager/manage-accounts.js

@@ -4,12 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ManageAccounts;
+var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
 var _material = require("@mui/material");
 var _react = require("@iconify/react");
 var _Account = _interopRequireDefault(require("@arcblock/icons/lib/Account"));
 var _link = _interopRequireDefault(require("@iconify-icons/mdi/link"));
 var _Disconnect = _interopRequireDefault(require("@arcblock/icons/lib/Disconnect"));
+var _noop = _interopRequireDefault(require("lodash/noop"));
 var _accountItem = _interopRequireDefault(require("./account-item"));
 var _menuAccordion = _interopRequireDefault(require("./menu-accordion"));
 var _translation = require("./translation");
@@ -17,14 +19,13 @@ var _util = require("../Locale/util");
 var _confirm = require("../Dialog/confirm");
 var _utils = require("./utils");
 var _addAccountItem = _interopRequireDefault(require("./add-account-item"));
-var _useConfig = _interopRequireDefault(require("./use-config"));
 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; }
 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) { 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); } /* eslint-disable react/prop-types */ /* eslint-disable react/jsx-no-bind */
+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); } /* eslint-disable react/jsx-no-bind */
 function ManageAccounts(_ref) {
   let {
     session,
@@ -37,7 +38,9 @@ function ManageAccounts(_ref) {
     disableLogout,
     onLogout,
     expanded,
-    onExpand
+    onExpand,
+    accounts,
+    deleteAccount
   } = _ref;
   const {
     bindOAuth,
@@ -51,10 +54,6 @@ function ManageAccounts(_ref) {
     confirmApi,
     confirmHolder
   } = (0, _confirm.useConfirm)();
-  const {
-    deleteAccount,
-    config
-  } = (0, _useConfig.default)();
   const update = (0, _ahooks.useUpdate)();
   const onChoose = (0, _ahooks.useMemoizedFn)((account, _ref2) => {
     let {
@@ -149,7 +148,7 @@ function ManageAccounts(_ref) {
           }
         }), t('accounts')]
       }),
-      children: [config.accounts.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_accountItem.default, {
+      children: [accounts.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_accountItem.default, {
         account: item,
         locale: locale,
         active: session.user.did === item.did,
@@ -182,4 +181,26 @@ function ManageAccounts(_ref) {
       })]
     }), confirmHolder]
   });
-}
+}
+ManageAccounts.propTypes = {
+  session: _propTypes.default.object.isRequired,
+  locale: _propTypes.default.string,
+  onBindWallet: _propTypes.default.func.isRequired,
+  onSwitchDid: _propTypes.default.func.isRequired,
+  connectAccount: _propTypes.default.func.isRequired,
+  close: _propTypes.default.func.isRequired,
+  hasBindAccount: _propTypes.default.bool,
+  disableLogout: _propTypes.default.bool,
+  onLogout: _propTypes.default.func.isRequired,
+  expanded: _propTypes.default.bool,
+  onExpand: _propTypes.default.func,
+  accounts: _propTypes.default.array.isRequired,
+  deleteAccount: _propTypes.default.func.isRequired
+};
+ManageAccounts.defaultProps = {
+  locale: 'en',
+  hasBindAccount: false,
+  disableLogout: false,
+  expanded: true,
+  onExpand: _noop.default
+};

package/package.json

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

package/src/SessionManager/index.jsx

@@ -44,7 +44,7 @@ function SessionManager({
   ...rest
 }) {
   const latestSession = useLatest(session);
-  const { connectAccount, config, setConfig } = useConfig();
+  const { connectAccount, config, setConfig, deleteAccount } = useConfig();
   const t = useMemoizedFn((key, data = {}) => {
     return translate(translations, key, locale, 'en', data);
   });
@@ -260,6 +260,8 @@ function SessionManager({
               cloneConfig.expandAccount = value;
               setConfig(cloneConfig);
             }}
+            deleteAccount={deleteAccount}
+            accounts={config.accounts}
           />
 
           {/* 为了避免控制台出现警告，采用数组的方式 */}

package/src/SessionManager/manage-accounts.jsx

@@ -1,11 +1,12 @@
-/* eslint-disable react/prop-types */
 /* eslint-disable react/jsx-no-bind */
+import PropTypes from 'prop-types';
 import { useMemoizedFn, useUpdate } from 'ahooks';
 import { MenuItem, SvgIcon } from '@mui/material';
 import { Icon } from '@iconify/react';
 import AccountIcon from '@arcblock/icons/lib/Account';
 import LinkIcon from '@iconify-icons/mdi/link';
 import DisconnectIcon from '@arcblock/icons/lib/Disconnect';
+import noop from 'lodash/noop';
 
 import AccountItem from './account-item';
 import MenuAccordion from './menu-accordion';
@@ -14,7 +15,6 @@ import { translate } from '../Locale/util';
 import { useConfirm } from '../Dialog/confirm';
 import { getSourceProvider } from './utils';
 import AddAccountItem from './add-account-item';
-import useConfig from './use-config';
 
 export default function ManageAccounts({
   session,
@@ -28,6 +28,8 @@ export default function ManageAccounts({
   onLogout,
   expanded,
   onExpand,
+  accounts,
+  deleteAccount,
 }) {
   const { bindOAuth, configs: oauthConfigs } = session.useOAuth();
   const t = useMemoizedFn((key, data = {}) => {
@@ -35,7 +37,6 @@ export default function ManageAccounts({
   });
 
   const { confirmApi, confirmHolder } = useConfirm();
-  const { deleteAccount, config } = useConfig();
   const update = useUpdate();
 
   const onChoose = useMemoizedFn((account, { active }) => {
@@ -133,7 +134,7 @@ export default function ManageAccounts({
             {t('accounts')}
           </>
         }>
-        {config.accounts.map((item) => (
+        {accounts.map((item) => (
           <AccountItem
             key={item.did}
             account={item}
@@ -170,3 +171,27 @@ export default function ManageAccounts({
     </>
   );
 }
+
+ManageAccounts.propTypes = {
+  session: PropTypes.object.isRequired,
+  locale: PropTypes.string,
+  onBindWallet: PropTypes.func.isRequired,
+  onSwitchDid: PropTypes.func.isRequired,
+  connectAccount: PropTypes.func.isRequired,
+  close: PropTypes.func.isRequired,
+  hasBindAccount: PropTypes.bool,
+  disableLogout: PropTypes.bool,
+  onLogout: PropTypes.func.isRequired,
+  expanded: PropTypes.bool,
+  onExpand: PropTypes.func,
+  accounts: PropTypes.array.isRequired,
+  deleteAccount: PropTypes.func.isRequired,
+};
+
+ManageAccounts.defaultProps = {
+  locale: 'en',
+  hasBindAccount: false,
+  disableLogout: false,
+  expanded: true,
+  onExpand: noop,
+};