@abtnode/ux 1.16.23-beta-7b5b0175 → 1.16.23-beta-abdda301

package/es/blocklet/component/did-space/connect-to.js

@@ -9,10 +9,10 @@ import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import Alert from '@arcblock/ux/lib/Alert';
 import { func } from 'prop-types';
-import { PROD_DID_SPACES } from '@abtnode/constant';
+import isEmpty from 'lodash/isEmpty';
 import useBlockletInfoForConnectDIDSpaces from '../../../hooks/use-blocklet-info-for-connect-did-spaces';
 import { extraDIDSpacesCoreUrl, getDIDSpaceDidFromEndpoint, getSpaceGatewayUrl, isValidSpaceGatewayUrl } from '../../../util/spaces';
-import { formatError, getWebWalletUrl } from '../../../util';
+import { formatError, getPathPrefix, getWebWalletUrl } from '../../../util';
 import { useBlockletContext } from '../../../contexts/blocklet';
 import { useConfigSpaceContext } from '../../../contexts/config-space';
 import { useNodeContext } from '../../../contexts/node';
@@ -60,12 +60,11 @@ function ConnectTo({
   } = useConfigSpaceContext();
   const [authorizeFromNftConnect, setAuthorizeFromNftConnect] = useState({
     open: false,
-    action: 'one-click-authorization',
+    action: 'connect-to-did-spaces',
     checkTimeout: 1000 * 300,
-    prefix: joinUrl(PROD_DID_SPACES.CORE_URL, 'space/api/did'),
-    baseUrl: new URL(PROD_DID_SPACES.CORE_URL).origin,
+    prefix: '/api/did',
     checkFn: axios.create({
-      baseURL: joinUrl(PROD_DID_SPACES.CORE_URL, 'space')
+      baseURL: joinUrl(window.location.origin, getPathPrefix())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -113,32 +112,6 @@ function ConnectTo({
       }));
     }
   });
-  const onAuthorizeConnectSuccess = (response, decrypt) => {
-    setTimeout(async () => {
-      setAuthorizeConnect(preValue => ({
-        ...preValue,
-        open: false
-      }));
-      setUrl(null);
-      setAuthorizeFromNftConnect(preValue => ({
-        ...preValue,
-        open: false
-      }));
-      const endpoint = decrypt(response.endpoint);
-      const space = response.space ? decrypt(response.space) : {};
-
-      // eslint-disable-next-line no-use-before-define
-      await updateSpaceGateway({
-        endpoint,
-        // name 默认为 DID Space，兼容旧版本的 DID Spaces
-        ...{
-          did: getDIDSpaceDidFromEndpoint(endpoint),
-          name: 'DID Space'
-        },
-        ...space
-      });
-    }, 0);
-  };
 
   /**
    *
@@ -168,18 +141,43 @@ function ConnectTo({
       name: spaceGateway.name
     }));
   };
+  const onAuthorizeConnectSuccess = (response, decrypt) => {
+    setTimeout(async () => {
+      setAuthorizeConnect(preValue => ({
+        ...preValue,
+        open: false
+      }));
+      setUrl(null);
+      setAuthorizeFromNftConnect(preValue => ({
+        ...preValue,
+        open: false
+      }));
+      if (!isEmpty(response.spaceGateway)) {
+        await updateSpaceGateway(decrypt(response.spaceGateway));
+        return;
+      }
+      const endpoint = decrypt(response.endpoint);
+      const space = response.space ? decrypt(response.space) : {};
+
+      // eslint-disable-next-line no-use-before-define
+      await updateSpaceGateway({
+        endpoint,
+        // name 默认为 DID Space，兼容旧版本的 DID Spaces
+        ...{
+          did: getDIDSpaceDidFromEndpoint(endpoint),
+          name: 'DID Space'
+        },
+        ...space
+      });
+    }, 0);
+  };
   const handleUseWalletConnect = () => {
     setAuthorizeFromNftConnect(preValue => ({
       ...preValue,
       open: true,
       extraParams: {
-        appDid: blockletInfo.appDid,
-        appName: blockletInfo.appName,
-        appDescription: blockletInfo.appDescription,
-        scopes: blockletInfo.scopes,
-        appUrl: blockletInfo.appUrl,
-        referrer: blockletInfo.referrer,
-        nodeDid: info.did
+        appPid: blocklet.appPid,
+        referrer: window.location.href
       }
     }));
   };

package/es/blocklet/component/did-space/index.js

@@ -69,5 +69,7 @@ DidSpace.defaultProps = {
 const Container = styled(Layout)`
   height: 100%;
   overflow-y: auto;
+  padding-bottom: 32px;
+  overflow-x: hidden;
 `;
 export default DidSpace;

package/es/blocklet/publish/tree.js

@@ -4,8 +4,8 @@ import classnames from 'classnames';
 import isUrl from 'is-url';
 import Box from '@mui/material/Box';
 import FormControlLabel from '@mui/material/FormControlLabel';
-import TreeView from '@mui/lab/TreeView';
-import TreeItem from '@mui/lab/TreeItem';
+import { TreeView } from '@mui/x-tree-view/TreeView';
+import { TreeItem } from '@mui/x-tree-view/TreeItem';
 import Checkbox from '@mui/material/Checkbox';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import ChevronRightIcon from '@mui/icons-material/ChevronRight';

package/es/blocklet/storage/connect-to.js

@@ -8,10 +8,10 @@ import toast from '@arcblock/ux/lib/Toast';
 import SplitButton from '@arcblock/ux/lib/SplitButton';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import Alert from '@arcblock/ux/lib/Alert';
-import { PROD_DID_SPACES } from '@abtnode/constant';
+import { isEmpty } from 'lodash';
 import { useBlockletContext } from '../../contexts/blocklet';
 import { axios } from '../../util/api';
-import { formatError, getWebWalletUrl } from '../../util';
+import { formatError, getPathPrefix, getWebWalletUrl } from '../../util';
 import { useNodeContext } from '../../contexts/node';
 import useBlockletInfoForConnectDIDSpaces from '../../hooks/use-blocklet-info-for-connect-did-spaces';
 import { extraDIDSpacesCoreUrl, getDIDSpaceDidFromEndpoint, getSpaceGatewayUrl, isValidSpaceGatewayUrl } from '../../util/spaces';
@@ -27,6 +27,7 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 function ConnectTo({
   ...rest
 }) {
+  /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
   const {
     blocklet
   } = useBlockletContext();
@@ -51,12 +52,10 @@ function ConnectTo({
   } = useBlockletStorageContext();
   const [authorizeFromNftConnect, setAuthorizeFromNftConnect] = useState({
     open: false,
-    action: 'one-click-authorization',
+    action: 'connect-to-did-spaces',
     checkTimeout: 1000 * 300,
-    prefix: joinUrl(PROD_DID_SPACES.CORE_URL, 'space/api/did'),
-    baseUrl: new URL(PROD_DID_SPACES.CORE_URL).origin,
     checkFn: axios.create({
-      baseURL: joinUrl(PROD_DID_SPACES.CORE_URL, 'space')
+      baseURL: joinUrl(window.location.origin, getPathPrefix())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -104,35 +103,6 @@ function ConnectTo({
       }));
     }
   });
-  const onAuthorizeConnectSuccess = async (response, decrypt) => {
-    try {
-      const endpoint = decrypt(response.endpoint);
-      const space = response.space ? decrypt(response.space) : {};
-
-      // eslint-disable-next-line no-use-before-define
-      await addSpaceGatewayNow({
-        endpoint,
-        // name 默认为 DID Space，兼容旧版本的 DID Spaces
-        ...{
-          did: getDIDSpaceDidFromEndpoint(endpoint),
-          name: 'DID Space'
-        },
-        ...space
-      });
-      setAuthorizeConnect(preValue => ({
-        ...preValue,
-        open: false
-      }));
-      setUrl(null);
-      setAuthorizeFromNftConnect(preValue => ({
-        ...preValue,
-        open: false
-      }));
-    } catch (error) {
-      console.error(error);
-      toast.error(formatError(error));
-    }
-  };
 
   /**
    *
@@ -171,12 +141,44 @@ function ConnectTo({
       name: spaceGateway?.name ?? 'DID Spaces'
     }));
   };
+  const onAuthorizeConnectSuccess = async (response, decrypt) => {
+    try {
+      if (!isEmpty(response.spaceGateway)) {
+        await addSpaceGatewayNow(decrypt(response.spaceGateway));
+      } else {
+        const endpoint = decrypt(response.endpoint);
+        const space = response.space ? decrypt(response.space) : {};
+        // eslint-disable-next-line no-use-before-define
+        await addSpaceGatewayNow({
+          endpoint,
+          // name 默认为 DID Space，兼容旧版本的 DID Spaces
+          ...{
+            did: getDIDSpaceDidFromEndpoint(endpoint),
+            name: 'DID Space'
+          },
+          ...space
+        });
+      }
+      setAuthorizeConnect(preValue => ({
+        ...preValue,
+        open: false
+      }));
+      setUrl(null);
+      setAuthorizeFromNftConnect(preValue => ({
+        ...preValue,
+        open: false
+      }));
+    } catch (error) {
+      console.error(error);
+      toast.error(formatError(error));
+    }
+  };
   const handleUseWalletConnect = () => {
     setAuthorizeFromNftConnect(preValue => ({
       ...preValue,
       open: true,
       extraParams: {
-        appDid: blockletInfo.appDid,
+        appPid: blocklet.appPid,
         appName: blockletInfo.appName,
         appDescription: blockletInfo.appDescription,
         scopes: blockletInfo.scopes,

package/es/blocklet/util.js

@@ -3,7 +3,7 @@ import joinUrl from 'url-join';
 import isEmpty from 'lodash/isEmpty';
 import normalizePathPrefix from '@abtnode/util/lib/normalize-path-prefix';
 import { forEachBlockletSync, replaceSlotToIp } from '@blocklet/meta/lib/util';
-import { BLOCKLET_APP_SPACE_ENDPOINTS } from '@blocklet/constant';
+import { BLOCKLET_APP_SPACE_REQUIREMENT } from '@blocklet/constant';
 import { SLOT_FOR_IP_DNS_SITE } from '@abtnode/constant';
 export const getServerUrl = (info, encodeURI = false) => {
   const adminPath = process.env.NODE_ENV === 'production' ? info.routing.adminPath : '';
@@ -49,7 +49,7 @@ export const getAppCapabilities = blocklet => {
     didSpace: null
   };
   forEachBlockletSync(blocklet, b => {
-    if (capabilities.didSpace === BLOCKLET_APP_SPACE_ENDPOINTS.REQUIRED) {
+    if (capabilities.didSpace === BLOCKLET_APP_SPACE_REQUIREMENT.REQUIRED || capabilities.didSpace === BLOCKLET_APP_SPACE_REQUIREMENT.REQUIRED_ON_SETUP) {
       return;
     }
     if (b?.meta?.capabilities?.didSpace) {
@@ -142,4 +142,10 @@ export const getWalletType = (raw, fromState = false) => {
   }
   return DEFAULT_WALLET_TYPE;
 };
+
+/**
+ *
+ * @param {import('@abtnode/client').BlockletState} blocklet
+ * @returns {boolean}
+ */
 export const isServerless = blocklet => !isEmpty(blocklet?.controller);

package/es/contexts/config-space.js

@@ -39,7 +39,7 @@ const {
 } = ConfigSpaceContext;
 
 /**
- * @description
+ * @description 专门连接存储 NFT 的 DID Space,目前主要是 NFT Blender 使用
  * @param {{
  *  children: React.ReactNode,
  * }} { children }

package/es/hooks/use-blocklet-info-for-connect-did-spaces.js

@@ -1,4 +1,5 @@
 import { getAppDescription, getAppName } from '@blocklet/meta/lib/util';
+import isEmpty from 'lodash/isEmpty';
 
 /**
  *
@@ -17,6 +18,9 @@ import { getAppDescription, getAppName } from '@blocklet/meta/lib/util';
 function useBlockletInfoForConnectDIDSpaces({
   blocklet
 }) {
+  if (isEmpty(blocklet)) {
+    return {};
+  }
   const {
     appDid
   } = blocklet;

package/lib/blocklet/component/did-space/connect-to.js

@@ -15,7 +15,7 @@ var _SplitButton = _interopRequireDefault(require("@arcblock/ux/lib/SplitButton"
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _propTypes = require("prop-types");
-var _constant = require("@abtnode/constant");
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
 var _useBlockletInfoForConnectDidSpaces = _interopRequireDefault(require("../../../hooks/use-blocklet-info-for-connect-did-spaces"));
 var _spaces = require("../../../util/spaces");
 var _util = require("../../../util");
@@ -74,12 +74,11 @@ function ConnectTo(_ref) {
   } = (0, _configSpace.useConfigSpaceContext)();
   const [authorizeFromNftConnect, setAuthorizeFromNftConnect] = (0, _react.useState)({
     open: false,
-    action: 'one-click-authorization',
+    action: 'connect-to-did-spaces',
     checkTimeout: 1000 * 300,
-    prefix: (0, _urlJoin.default)(_constant.PROD_DID_SPACES.CORE_URL, 'space/api/did'),
-    baseUrl: new URL(_constant.PROD_DID_SPACES.CORE_URL).origin,
+    prefix: '/api/did',
     checkFn: _api.axios.create({
-      baseURL: (0, _urlJoin.default)(_constant.PROD_DID_SPACES.CORE_URL, 'space')
+      baseURL: (0, _urlJoin.default)(window.location.origin, (0, _util.getPathPrefix)())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -125,27 +124,6 @@ function ConnectTo(_ref) {
       }));
     }
   });
-  const onAuthorizeConnectSuccess = (response, decrypt) => {
-    setTimeout(async () => {
-      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-        open: false
-      }));
-      setUrl(null);
-      setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-        open: false
-      }));
-      const endpoint = decrypt(response.endpoint);
-      const space = response.space ? decrypt(response.space) : {};
-
-      // eslint-disable-next-line no-use-before-define
-      await updateSpaceGateway(_objectSpread(_objectSpread({
-        endpoint
-      }, {
-        did: (0, _spaces.getDIDSpaceDidFromEndpoint)(endpoint),
-        name: 'DID Space'
-      }), space));
-    }, 0);
-  };
 
   /**
    *
@@ -176,17 +154,37 @@ function ConnectTo(_ref) {
       name: spaceGateway.name
     }));
   };
+  const onAuthorizeConnectSuccess = (response, decrypt) => {
+    setTimeout(async () => {
+      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+      setUrl(null);
+      setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+      if (!(0, _isEmpty.default)(response.spaceGateway)) {
+        await updateSpaceGateway(decrypt(response.spaceGateway));
+        return;
+      }
+      const endpoint = decrypt(response.endpoint);
+      const space = response.space ? decrypt(response.space) : {};
+
+      // eslint-disable-next-line no-use-before-define
+      await updateSpaceGateway(_objectSpread(_objectSpread({
+        endpoint
+      }, {
+        did: (0, _spaces.getDIDSpaceDidFromEndpoint)(endpoint),
+        name: 'DID Space'
+      }), space));
+    }, 0);
+  };
   const handleUseWalletConnect = () => {
     setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
       open: true,
       extraParams: {
-        appDid: blockletInfo.appDid,
-        appName: blockletInfo.appName,
-        appDescription: blockletInfo.appDescription,
-        scopes: blockletInfo.scopes,
-        appUrl: blockletInfo.appUrl,
-        referrer: blockletInfo.referrer,
-        nodeDid: info.did
+        appPid: blocklet.appPid,
+        referrer: window.location.href
       }
     }));
   };

package/lib/blocklet/component/did-space/index.js

@@ -77,5 +77,5 @@ DidSpace.propTypes = {
 DidSpace.defaultProps = {
   onEndpointUpdate: () => undefined
 };
-const Container = (0, _styled.default)(_contentLayout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 100%;\n  overflow-y: auto;\n"])));
+const Container = (0, _styled.default)(_contentLayout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: 100%;\n  overflow-y: auto;\n  padding-bottom: 32px;\n  overflow-x: hidden;\n"])));
 var _default = exports.default = DidSpace;

package/lib/blocklet/publish/tree.js

@@ -10,8 +10,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _FormControlLabel = _interopRequireDefault(require("@mui/material/FormControlLabel"));
-var _TreeView = _interopRequireDefault(require("@mui/lab/TreeView"));
-var _TreeItem = _interopRequireDefault(require("@mui/lab/TreeItem"));
+var _TreeView = require("@mui/x-tree-view/TreeView");
+var _TreeItem = require("@mui/x-tree-view/TreeItem");
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
 var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
 var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
@@ -128,7 +128,7 @@ function Tree(_ref2) {
   });
   const renderTree = node => {
     var _node$images;
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeItem.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_TreeItem.TreeItem, {
       nodeId: node.id,
       label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {
         onClick: stopExpand,
@@ -192,7 +192,7 @@ Tree.defaultProps = {
   onChange: () => {},
   disabled: false
 };
-const StyledTreeView = (0, _styled.default)(_TreeView.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.no-children {\n    .MuiTreeItem-content {\n      padding: 0;\n      .MuiTreeItem-iconContainer {\n        display: none;\n      }\n      .MuiTreeItem-label {\n        padding-left: 0;\n      }\n    }\n  }\n  .MuiTreeItem-content {\n    align-items: flex-start;\n    .MuiTreeItem-iconContainer {\n      transform: translateY(10px);\n    }\n    &.Mui-selected {\n      background-color: transparent;\n    }\n  }\n  .MuiTreeItem-label {\n    cursor: default;\n  }\n  .MuiFormControlLabel-root {\n    align-items: flex-start;\n  }\n  .content {\n    padding-top: 6px;\n  }\n  .name {\n    font-size: 16px;\n    font-weight: 700;\n  }\n  .resource-icon {\n    margin-right: 2px;\n    font-size: 16px;\n  }\n  img.resource-icon {\n    width: 1rem;\n    height: 1rem;\n  }\n  .link {\n    margin-left: 8px;\n    font-size: 16px;\n    color: ", ";\n    display: flex;\n  }\n  .link-icon {\n    font-size: inherit;\n  }\n  .description {\n    font-size: 14px;\n    color: ", ";\n  }\n"])), _ref3 => {
+const StyledTreeView = (0, _styled.default)(_TreeView.TreeView)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &.no-children {\n    .MuiTreeItem-content {\n      padding: 0;\n      .MuiTreeItem-iconContainer {\n        display: none;\n      }\n      .MuiTreeItem-label {\n        padding-left: 0;\n      }\n    }\n  }\n  .MuiTreeItem-content {\n    align-items: flex-start;\n    .MuiTreeItem-iconContainer {\n      transform: translateY(10px);\n    }\n    &.Mui-selected {\n      background-color: transparent;\n    }\n  }\n  .MuiTreeItem-label {\n    cursor: default;\n  }\n  .MuiFormControlLabel-root {\n    align-items: flex-start;\n  }\n  .content {\n    padding-top: 6px;\n  }\n  .name {\n    font-size: 16px;\n    font-weight: 700;\n  }\n  .resource-icon {\n    margin-right: 2px;\n    font-size: 16px;\n  }\n  img.resource-icon {\n    width: 1rem;\n    height: 1rem;\n  }\n  .link {\n    margin-left: 8px;\n    font-size: 16px;\n    color: ", ";\n    display: flex;\n  }\n  .link-icon {\n    font-size: inherit;\n  }\n  .description {\n    font-size: 14px;\n    color: ", ";\n  }\n"])), _ref3 => {
   let {
     theme
   } = _ref3;

package/lib/blocklet/storage/connect-to.js

@@ -14,7 +14,7 @@ var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _SplitButton = _interopRequireDefault(require("@arcblock/ux/lib/SplitButton"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
-var _constant = require("@abtnode/constant");
+var _lodash = require("lodash");
 var _blocklet = require("../../contexts/blocklet");
 var _api = require("../../util/api");
 var _util = require("../../util");
@@ -38,6 +38,7 @@ function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("
  */
 function ConnectTo(_ref) {
   let rest = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
+  /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
   const {
     blocklet
   } = (0, _blocklet.useBlockletContext)();
@@ -62,12 +63,10 @@ function ConnectTo(_ref) {
   } = (0, _blockletStorage.useBlockletStorageContext)();
   const [authorizeFromNftConnect, setAuthorizeFromNftConnect] = (0, _react.useState)({
     open: false,
-    action: 'one-click-authorization',
+    action: 'connect-to-did-spaces',
     checkTimeout: 1000 * 300,
-    prefix: (0, _urlJoin.default)(_constant.PROD_DID_SPACES.CORE_URL, 'space/api/did'),
-    baseUrl: new URL(_constant.PROD_DID_SPACES.CORE_URL).origin,
     checkFn: _api.axios.create({
-      baseURL: (0, _urlJoin.default)(_constant.PROD_DID_SPACES.CORE_URL, 'space')
+      baseURL: (0, _urlJoin.default)(window.location.origin, (0, _util.getPathPrefix)())
     }).get,
     messages: {
       title: t('storage.spaces.provideNFT.title', {
@@ -113,30 +112,6 @@ function ConnectTo(_ref) {
       }));
     }
   });
-  const onAuthorizeConnectSuccess = async (response, decrypt) => {
-    try {
-      const endpoint = decrypt(response.endpoint);
-      const space = response.space ? decrypt(response.space) : {};
-
-      // eslint-disable-next-line no-use-before-define
-      await addSpaceGatewayNow(_objectSpread(_objectSpread({
-        endpoint
-      }, {
-        did: (0, _spaces.getDIDSpaceDidFromEndpoint)(endpoint),
-        name: 'DID Space'
-      }), space));
-      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-        open: false
-      }));
-      setUrl(null);
-      setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
-        open: false
-      }));
-    } catch (error) {
-      console.error(error);
-      _Toast.default.error((0, _util.formatError)(error));
-    }
-  };
 
   /**
    *
@@ -177,11 +152,38 @@ function ConnectTo(_ref) {
       name: (_spaceGateway$name = spaceGateway === null || spaceGateway === void 0 ? void 0 : spaceGateway.name) !== null && _spaceGateway$name !== void 0 ? _spaceGateway$name : 'DID Spaces'
     }));
   };
+  const onAuthorizeConnectSuccess = async (response, decrypt) => {
+    try {
+      if (!(0, _lodash.isEmpty)(response.spaceGateway)) {
+        await addSpaceGatewayNow(decrypt(response.spaceGateway));
+      } else {
+        const endpoint = decrypt(response.endpoint);
+        const space = response.space ? decrypt(response.space) : {};
+        // eslint-disable-next-line no-use-before-define
+        await addSpaceGatewayNow(_objectSpread(_objectSpread({
+          endpoint
+        }, {
+          did: (0, _spaces.getDIDSpaceDidFromEndpoint)(endpoint),
+          name: 'DID Space'
+        }), space));
+      }
+      setAuthorizeConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+      setUrl(null);
+      setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
+        open: false
+      }));
+    } catch (error) {
+      console.error(error);
+      _Toast.default.error((0, _util.formatError)(error));
+    }
+  };
   const handleUseWalletConnect = () => {
     setAuthorizeFromNftConnect(preValue => _objectSpread(_objectSpread({}, preValue), {}, {
       open: true,
       extraParams: {
-        appDid: blockletInfo.appDid,
+        appPid: blocklet.appPid,
         appName: blockletInfo.appName,
         appDescription: blockletInfo.appDescription,
         scopes: blockletInfo.scopes,

package/lib/blocklet/util.js

@@ -60,7 +60,7 @@ const getAppCapabilities = blocklet => {
   };
   (0, _util.forEachBlockletSync)(blocklet, b => {
     var _b$meta, _b$meta$capabilities;
-    if (capabilities.didSpace === _constant.BLOCKLET_APP_SPACE_ENDPOINTS.REQUIRED) {
+    if (capabilities.didSpace === _constant.BLOCKLET_APP_SPACE_REQUIREMENT.REQUIRED || capabilities.didSpace === _constant.BLOCKLET_APP_SPACE_REQUIREMENT.REQUIRED_ON_SETUP) {
       return;
     }
     if (b !== null && b !== void 0 && (_b$meta = b.meta) !== null && _b$meta !== void 0 && (_b$meta$capabilities = _b$meta.capabilities) !== null && _b$meta$capabilities !== void 0 && _b$meta$capabilities.didSpace) {
@@ -158,5 +158,11 @@ const getWalletType = exports.getWalletType = function getWalletType(raw) {
   }
   return DEFAULT_WALLET_TYPE;
 };
+
+/**
+ *
+ * @param {import('@abtnode/client').BlockletState} blocklet
+ * @returns {boolean}
+ */
 const isServerless = blocklet => !(0, _isEmpty.default)(blocklet === null || blocklet === void 0 ? void 0 : blocklet.controller);
 exports.isServerless = isServerless;

package/lib/contexts/config-space.js

@@ -46,7 +46,7 @@ const {
 } = ConfigSpaceContext;
 
 /**
- * @description
+ * @description 专门连接存储 NFT 的 DID Space,目前主要是 NFT Blender 使用
  * @param {{
  *  children: React.ReactNode,
  * }} { children }

package/lib/hooks/use-blocklet-info-for-connect-did-spaces.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _util = require("@blocklet/meta/lib/util");
+var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /**
  *
  *
@@ -24,6 +26,9 @@ function useBlockletInfoForConnectDIDSpaces(_ref) {
   let {
     blocklet
   } = _ref;
+  if ((0, _isEmpty.default)(blocklet)) {
+    return {};
+  }
   const {
     appDid
   } = blocklet;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.23-beta-7b5b0175",
+  "version": "1.16.23-beta-abdda301",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -27,24 +27,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.23-beta-7b5b0175",
-    "@abtnode/constant": "1.16.23-beta-7b5b0175",
-    "@abtnode/util": "1.16.23-beta-7b5b0175",
+    "@abtnode/auth": "1.16.23-beta-abdda301",
+    "@abtnode/constant": "1.16.23-beta-abdda301",
+    "@abtnode/util": "1.16.23-beta-abdda301",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.108",
-    "@arcblock/did-connect": "^2.9.15",
+    "@arcblock/did-connect": "^2.9.19",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.15",
-    "@arcblock/nft-display": "2.9.15",
-    "@arcblock/react-hooks": "^2.9.15",
-    "@arcblock/terminal": "^2.9.15",
-    "@arcblock/ux": "^2.9.15",
-    "@blocklet/constant": "1.16.23-beta-7b5b0175",
+    "@arcblock/icons": "^2.9.19",
+    "@arcblock/nft-display": "2.9.19",
+    "@arcblock/react-hooks": "^2.9.19",
+    "@arcblock/terminal": "^2.9.19",
+    "@arcblock/ux": "^2.9.19",
+    "@blocklet/constant": "1.16.23-beta-abdda301",
     "@blocklet/launcher-layout": "2.2.51",
-    "@blocklet/list": "^0.12.66",
-    "@blocklet/meta": "1.16.23-beta-7b5b0175",
-    "@blocklet/ui-react": "^2.9.15",
-    "@blocklet/uploader": "^0.0.65",
+    "@blocklet/list": "^0.12.67",
+    "@blocklet/meta": "1.16.23-beta-abdda301",
+    "@blocklet/ui-react": "^2.9.19",
+    "@blocklet/uploader": "^0.0.67",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -54,6 +54,7 @@
     "@mui/material": "^5.15.6",
     "@mui/styles": "^5.15.6",
     "@mui/x-date-pickers": "^6.19.0",
+    "@mui/x-tree-view": "^6.17.0",
     "@ocap/client": "1.18.108",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.8",
@@ -104,7 +105,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "d1386002a4a10a65bf53cfca9754ea077c1d5983",
+  "gitHead": "2b064df15b34007f6145170ee691ae9e91ff1528",
   "exports": {
     ".": {
       "import": "./es/index.js",