@abtnode/ux 1.16.0-beta-b16cb035 → 1.16.0-beta-8ee536d7

package/lib/blocklet/util.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.downloadExportedSource = downloadExportedSource;
 exports.fixBlocklet = exports.ensureDomainAliases = void 0;
 exports.genExportedMeta = genExportedMeta;
-exports.getLaunchAgreementUrl = void 0;
+exports.getLaunchAgreementUrl = exports.getAppCapabilities = void 0;
 exports.getNameByTitle = getNameByTitle;
 exports.getServerUrl = void 0;
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
@@ -21,7 +21,8 @@ var _didMotif = require("@arcblock/did-motif");
 var _normalizePathPrefix = _interopRequireDefault(require("@abtnode/util/lib/normalize-path-prefix"));
 var _did = _interopRequireDefault(require("@blocklet/meta/lib/did"));
 var _util = require("@blocklet/meta/lib/util");
-var _constant = require("@abtnode/constant");
+var _constant = require("@blocklet/constant");
+var _constant2 = require("@abtnode/constant");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const base64ToArrayBuffer = base64 => {
   const bufStr = window.atob(base64);
@@ -131,7 +132,7 @@ const ensureDomainAliases = async function ensureDomainAliases(domainAliases) {
   if (!getIP) {
     return domainAliases;
   }
-  if (!domainAliases.some(x => x.value.includes(_constant.SLOT_FOR_IP_DNS_SITE))) {
+  if (!domainAliases.some(x => x.value.includes(_constant2.SLOT_FOR_IP_DNS_SITE))) {
     return domainAliases;
   }
   const ip = await getIP();
@@ -148,6 +149,24 @@ const ensureDomainAliases = async function ensureDomainAliases(domainAliases) {
   }).filter(Boolean);
 };
 
+/** @type {import('@abtnode/client').BlockletState} */
+exports.ensureDomainAliases = ensureDomainAliases;
+const getAppCapabilities = blocklet => {
+  const capabilities = {
+    didSpace: null
+  };
+  (0, _util.forEachBlockletSync)(blocklet, b => {
+    var _b$meta, _b$meta$capabilities;
+    if (capabilities.didSpace === _constant.BLOCKLET_APP_SPACE_ENDPOINTS.REQUIRED) {
+      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) {
+      capabilities.didSpace = b.meta.capabilities.didSpace;
+    }
+  });
+  return capabilities;
+};
+
 /**
  * @param {object} blocklet
  * @param {{
@@ -156,7 +175,7 @@ const ensureDomainAliases = async function ensureDomainAliases(domainAliases) {
  *   getIP: function
  * }}
  */
-exports.ensureDomainAliases = ensureDomainAliases;
+exports.getAppCapabilities = getAppCapabilities;
 const fixBlocklet = async function fixBlocklet(blocklet) {
   let {
     fixRuntime = true,
@@ -209,5 +228,6 @@ const fixBlocklet = async function fixBlocklet(blocklet) {
   } else {
     blocklet.site.domainAliases = [];
   }
+  blocklet.capabilities = getAppCapabilities(blocklet);
 };
 exports.fixBlocklet = fixBlocklet;

package/lib/lost-passport.js

@@ -21,6 +21,7 @@ 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"));
@@ -30,6 +31,15 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+const isFromWallet = () => {
+  const {
+    searchParams
+  } = new URL(window.location.href);
+  return searchParams.get('fromWallet') === '1';
+};
+
 // eslint-disable-next-line react/prop-types
 function ColorStepIcon(_ref) {
   let {
@@ -85,6 +95,9 @@ function LostPassport(_ref2) {
   const {
     setPassportId
   } = (0, _usePassportId.default)();
+  const {
+    wallet: isWalletWebview
+  } = (0, _useBrowser.default)();
 
   // eslint-disable-next-line no-undef
   const {
@@ -108,6 +121,12 @@ function LostPassport(_ref2) {
   };
   const onUsePassport = () => {
     var _window$env;
+    if (isWalletWebview && isFromWallet()) {
+      Promise.resolve().then(() => _interopRequireWildcard(require('dsbridge'))).then(jsBridge => {
+        jsBridge.call('arcClosePage');
+      });
+      return;
+    }
     try {
       session.logout();
     } catch (err) {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-b16cb035",
+  "version": "1.16.0-beta-8ee536d7",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,19 +21,20 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0-beta-b16cb035",
-    "@abtnode/constant": "1.16.0-beta-b16cb035",
-    "@abtnode/util": "1.16.0-beta-b16cb035",
-    "@arcblock/did-connect": "^2.5.12",
+    "@abtnode/auth": "1.16.0-beta-8ee536d7",
+    "@abtnode/constant": "1.16.0-beta-8ee536d7",
+    "@abtnode/util": "1.16.0-beta-8ee536d7",
+    "@arcblock/did-connect": "^2.5.14",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.12",
-    "@arcblock/terminal": "^2.5.12",
-    "@arcblock/ux": "^2.5.12",
-    "@blocklet/constant": "1.16.0-beta-b16cb035",
+    "@arcblock/icons": "^2.5.14",
+    "@arcblock/react-hooks": "^2.5.14",
+    "@arcblock/terminal": "^2.5.14",
+    "@arcblock/ux": "^2.5.14",
+    "@blocklet/constant": "1.16.0-beta-8ee536d7",
     "@blocklet/launcher-layout": "1.9.65",
     "@blocklet/list": "^0.11.6",
-    "@blocklet/meta": "1.16.0-beta-b16cb035",
-    "@blocklet/ui-react": "^2.5.12",
+    "@blocklet/meta": "1.16.0-beta-8ee536d7",
+    "@blocklet/ui-react": "^2.5.14",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -47,6 +48,7 @@
     "axios": "^0.27.2",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.7",
+    "dsbridge": "3.1.4",
     "file-saver": "^2.0.5",
     "filesize": "^6.4.0",
     "flat": "^5.0.2",
@@ -86,5 +88,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "138bd91aee5a35b28c2de4e1e924c44932efaf3a"
+  "gitHead": "57d0c45be311a5fbc1c0fffa2814b62c1a3ee34c"
 }