@arcblock/react-hooks 2.8.16 → 2.8.17

package/lib/useBrowser.js

@@ -12,10 +12,21 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
+const DID_WALLET_TAG = 'ABTWallet';
+function getDIDWalletVersion(userAgent) {
+  var _result$groups;
+  const reg = new RegExp("".concat(DID_WALLET_TAG, "/(?<version>[0-9.]+)"), 'g');
+  const result = reg.exec(userAgent);
+  const version = result === null || result === void 0 ? void 0 : (_result$groups = result.groups) === null || _result$groups === void 0 ? void 0 : _result$groups.version;
+  return version;
+}
 function useBrowser() {
+  var _window, _window$navigator;
+  const userAgent = (_window = window) === null || _window === void 0 ? void 0 : (_window$navigator = _window.navigator) === null || _window$navigator === void 0 ? void 0 : _window$navigator.userAgent;
   const [browser] = (0, _react.useState)({
-    wallet: navigator.userAgent.indexOf('ABTWallet') > -1,
-    wechat: /MicroMessenger/i.test(navigator.userAgent),
+    wallet: userAgent.indexOf(DID_WALLET_TAG) > -1,
+    walletVersion: getDIDWalletVersion(userAgent),
+    wechat: /MicroMessenger/i.test(userAgent),
     mobile: _objectSpread({
       apple: {
         phone: false,
@@ -49,7 +60,7 @@ function useBrowser() {
       phone: false,
       tablet: false,
       any: false
-    }, (0, _ismobilejs.default)(navigator.userAgent))
+    }, (0, _ismobilejs.default)(userAgent))
   });
   return browser;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/react-hooks",
-  "version": "2.8.16",
+  "version": "2.8.17",
   "description": "React hooks used by arcblock products",
   "keywords": [
     "react",
@@ -45,5 +45,5 @@
     "eslint-plugin-react-hooks": "^4.6.0",
     "jest": "^28.1.3"
   },
-  "gitHead": "dc9390c0ece7e74eb351c568ef8cb4a3d167fac3"
+  "gitHead": "bd7a8f9d5bfbd61bcb0f6ff57de4600d8afded7b"
 }

package/src/useBrowser.js

@@ -1,10 +1,21 @@
 import { useState } from 'react';
 import isMobile from 'ismobilejs';
 
+const DID_WALLET_TAG = 'ABTWallet';
+
+function getDIDWalletVersion(userAgent) {
+  const reg = new RegExp(`${DID_WALLET_TAG}/(?<version>[0-9.]+)`, 'g');
+  const result = reg.exec(userAgent);
+  const version = result?.groups?.version;
+  return version;
+}
+
 export default function useBrowser() {
+  const userAgent = window?.navigator?.userAgent;
   const [browser] = useState({
-    wallet: navigator.userAgent.indexOf('ABTWallet') > -1,
-    wechat: /MicroMessenger/i.test(navigator.userAgent),
+    wallet: userAgent.indexOf(DID_WALLET_TAG) > -1,
+    walletVersion: getDIDWalletVersion(userAgent),
+    wechat: /MicroMessenger/i.test(userAgent),
     mobile: {
       apple: {
         phone: false,
@@ -38,7 +49,7 @@ export default function useBrowser() {
       phone: false,
       tablet: false,
       any: false,
-      ...isMobile(navigator.userAgent),
+      ...isMobile(userAgent),
     },
   });