@arcblock/ux 2.5.22 → 2.5.24

package/lib/Util/index.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.detectWalletExtension = detectWalletExtension;
 exports.formatToDate = formatToDate;
 exports.formatToDatetime = formatToDatetime;
 exports.getColor = exports.getBackground = exports.formatUptime = void 0;
@@ -289,9 +290,19 @@ function formatToDatetime(date) {
   });
 }
 
-function openWebWallet(_ref3) {
+function detectWalletExtension() {
   var _window;
 
+  const extension = ((_window = window) === null || _window === void 0 ? void 0 : _window.ABT_DEV) || window.ABT;
+
+  if (extension && typeof extension.open === 'function') {
+    return extension;
+  }
+
+  return null;
+}
+
+function openWebWallet(_ref3) {
   let {
     webWalletUrl,
     action = 'login',
@@ -300,10 +311,10 @@ function openWebWallet(_ref3) {
     windowFeatures
   } = _ref3;
   // web wallet extension
-  const webWalletExtension = ((_window = window) === null || _window === void 0 ? void 0 : _window.ABT_DEV) || window.ABT;
+  const extension = detectWalletExtension();
 
-  if (webWalletExtension && typeof webWalletExtension.open === 'function') {
-    webWalletExtension.open({
+  if (extension) {
+    extension.open({
       action,
       locale,
       url: encodeURIComponent(url)

package/lib/WebWalletSWKeeper/index.js

@@ -15,6 +15,8 @@ var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalSto
 
 var _useBrowser = _interopRequireDefault(require("@arcblock/react-hooks/lib/useBrowser"));
 
+var _Util = require("@arcblock/ux/lib/Util");
+
 var _wallet = require("../Util/wallet");
 
 var _jsxRuntime = require("react/jsx-runtime");
@@ -130,7 +132,7 @@ const withWebWalletSWKeeper = Component => {
 
     webWalletUrl = webWalletUrl || (0, _wallet.getWebWalletUrl)();
     const [disabled] = (0, _useLocalStorage.default)(STORAGE_KEY_DISABLED, 1);
-    const webWalletExtension = window.ABT_DEV || window.ABT;
+    const extension = (0, _Util.detectWalletExtension)();
     const isSameProtocol = (0, _wallet.checkSameProtocol)(webWalletUrl);
     const isWalletWebview = browser.wallet; // 以下几种情况不会嵌入 wallet iframe :
     // - 通过设置 localStorage#wallet_sw_keeper_disabled = 1 明确禁止 (开发调试过程中可以使用, 避免控制台打印一堆日志影响调试)
@@ -139,7 +141,7 @@ const withWebWalletSWKeeper = Component => {
     // - wallet webview
 
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [!disabled && !webWalletExtension && isSameProtocol && !isWalletWebview && /*#__PURE__*/(0, _jsxRuntime.jsx)(WebWalletSWKeeper, {
+      children: [!disabled && !extension && isSameProtocol && !isWalletWebview && /*#__PURE__*/(0, _jsxRuntime.jsx)(WebWalletSWKeeper, {
         webWalletUrl: webWalletUrl,
         maxIdleTime: maxIdleTime
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.5.22",
+  "version": "2.5.24",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -47,11 +47,11 @@
     "react": ">=18.1.0",
     "react-ga": "^2.7.0"
   },
-  "gitHead": "bccb6ab469f7509312eb20303f79848a0d3c54f3",
+  "gitHead": "9745fcd6e990cdf75732781a3e05e3c4b987ce48",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.22",
-    "@arcblock/react-hooks": "^2.5.22",
+    "@arcblock/icons": "^2.5.24",
+    "@arcblock/react-hooks": "^2.5.24",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",

package/src/Util/index.js

@@ -227,11 +227,20 @@ export function formatToDatetime(date, { locale, tz } = {}) {
   return createDateFormater('lll')(date, { locale, tz });
 }
 
+export function detectWalletExtension() {
+  const extension = window?.ABT_DEV || window.ABT;
+  if (extension && typeof extension.open === 'function') {
+    return extension;
+  }
+
+  return null;
+}
+
 export function openWebWallet({ webWalletUrl, action = 'login', locale = 'en', url, windowFeatures }) {
   // web wallet extension
-  const webWalletExtension = window?.ABT_DEV || window.ABT;
-  if (webWalletExtension && typeof webWalletExtension.open === 'function') {
-    webWalletExtension.open({
+  const extension = detectWalletExtension();
+  if (extension) {
+    extension.open({
       action,
       locale,
       url: encodeURIComponent(url),

package/src/WebWalletSWKeeper/index.js

@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import useIdle from 'react-use/lib/useIdle';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 import useBrowser from '@arcblock/react-hooks/lib/useBrowser';
+import { detectWalletExtension } from '@arcblock/ux/lib/Util';
+
 import { getWebWalletUrl, checkSameProtocol } from '../Util/wallet';
 
 // 默认最大空闲时间: 30min
@@ -91,7 +93,7 @@ export const withWebWalletSWKeeper = (Component) => {
     // eslint-disable-next-line no-param-reassign
     webWalletUrl = webWalletUrl || getWebWalletUrl();
     const [disabled] = useLocalStorage(STORAGE_KEY_DISABLED, 1);
-    const webWalletExtension = window.ABT_DEV || window.ABT;
+    const extension = detectWalletExtension();
     const isSameProtocol = checkSameProtocol(webWalletUrl);
     const isWalletWebview = browser.wallet;
     // 以下几种情况不会嵌入 wallet iframe :
@@ -101,7 +103,7 @@ export const withWebWalletSWKeeper = (Component) => {
     // - wallet webview
     return (
       <>
-        {!disabled && !webWalletExtension && isSameProtocol && !isWalletWebview && (
+        {!disabled && !extension && isSameProtocol && !isWalletWebview && (
           <WebWalletSWKeeper webWalletUrl={webWalletUrl} maxIdleTime={maxIdleTime} />
         )}
         <Component webWalletUrl={webWalletUrl} {...rest} />