v12.8.1: fix onbeforeunload

DePayFi · Feb 26, 2024 · 3ebf270 · 3ebf270
1 parent 474f927
commit 3ebf270
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 66 deletions.
diff --git a/dist/esm/index.bundle.js b/dist/esm/index.bundle.js
diff --git a/dist/esm/index.evm.js b/dist/esm/index.evm.js
@@ -4758,7 +4758,7 @@ var ClosableContext = /*#__PURE__*/React.createContext();
 var UpdatableContext = /*#__PURE__*/React.createContext();
 
 var ClosableProvider = (function (props) {
-  var _useState = useState(true),
+  var _useState = useState(props.closable || true),
       _useState2 = _slicedToArray(_useState, 2),
       closable = _useState2[0],
       setClosable = _useState2[1];
@@ -4808,14 +4808,9 @@ var ClosableProvider = (function (props) {
       }
     };
 
-    setTimeout(function () {
-      window.addEventListener('beforeunload', preventReload);
-    }, 800); // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
-
+    window.addEventListener('beforeunload', preventReload);
     return function () {
-      setTimeout(function () {
-        window.removeEventListener('beforeunload', preventReload);
-      }, 800);
+      window.removeEventListener('beforeunload', preventReload);
     };
   }, [closable, props.closable]);
   return /*#__PURE__*/React.createElement(ClosableContext.Provider, {

diff --git a/dist/esm/index.evm.js.map b/dist/esm/index.evm.js.map
diff --git a/dist/esm/index.js b/dist/esm/index.js
@@ -4760,7 +4760,7 @@ var ClosableContext = /*#__PURE__*/React.createContext();
 var UpdatableContext = /*#__PURE__*/React.createContext();
 
 var ClosableProvider = (function (props) {
-  var _useState = useState(true),
+  var _useState = useState(props.closable || true),
       _useState2 = _slicedToArray(_useState, 2),
       closable = _useState2[0],
       setClosable = _useState2[1];
@@ -4810,14 +4810,9 @@ var ClosableProvider = (function (props) {
       }
     };
 
-    setTimeout(function () {
-      window.addEventListener('beforeunload', preventReload);
-    }, 800); // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
-
+    window.addEventListener('beforeunload', preventReload);
     return function () {
-      setTimeout(function () {
-        window.removeEventListener('beforeunload', preventReload);
-      }, 800);
+      window.removeEventListener('beforeunload', preventReload);
     };
   }, [closable, props.closable]);
   return /*#__PURE__*/React.createElement(ClosableContext.Provider, {

diff --git a/dist/esm/index.js.map b/dist/esm/index.js.map
diff --git a/dist/esm/index.solana.js b/dist/esm/index.solana.js
@@ -4759,7 +4759,7 @@ var ClosableContext = /*#__PURE__*/React.createContext();
 var UpdatableContext = /*#__PURE__*/React.createContext();
 
 var ClosableProvider = (function (props) {
-  var _useState = useState(true),
+  var _useState = useState(props.closable || true),
       _useState2 = _slicedToArray(_useState, 2),
       closable = _useState2[0],
       setClosable = _useState2[1];
@@ -4809,14 +4809,9 @@ var ClosableProvider = (function (props) {
       }
     };
 
-    setTimeout(function () {
-      window.addEventListener('beforeunload', preventReload);
-    }, 800); // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
-
+    window.addEventListener('beforeunload', preventReload);
     return function () {
-      setTimeout(function () {
-        window.removeEventListener('beforeunload', preventReload);
-      }, 800);
+      window.removeEventListener('beforeunload', preventReload);
     };
   }, [closable, props.closable]);
   return /*#__PURE__*/React.createElement(ClosableContext.Provider, {

diff --git a/dist/esm/index.solana.js.map b/dist/esm/index.solana.js.map
diff --git a/dist/umd/index.bundle.js b/dist/umd/index.bundle.js
diff --git a/dist/umd/index.evm.js b/dist/umd/index.evm.js
@@ -4756,7 +4756,7 @@
   var UpdatableContext = /*#__PURE__*/React__default['default'].createContext();
 
   var ClosableProvider = (function (props) {
-    var _useState = React.useState(true),
+    var _useState = React.useState(props.closable || true),
         _useState2 = _slicedToArray(_useState, 2),
         closable = _useState2[0],
         setClosable = _useState2[1];
@@ -4806,14 +4806,9 @@
         }
       };
 
-      setTimeout(function () {
-        window.addEventListener('beforeunload', preventReload);
-      }, 800); // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
-
+      window.addEventListener('beforeunload', preventReload);
       return function () {
-        setTimeout(function () {
-          window.removeEventListener('beforeunload', preventReload);
-        }, 800);
+        window.removeEventListener('beforeunload', preventReload);
       };
     }, [closable, props.closable]);
     return /*#__PURE__*/React__default['default'].createElement(ClosableContext.Provider, {

diff --git a/dist/umd/index.evm.js.map b/dist/umd/index.evm.js.map
diff --git a/dist/umd/index.js b/dist/umd/index.js
@@ -4756,7 +4756,7 @@
   var UpdatableContext = /*#__PURE__*/React__default['default'].createContext();
 
   var ClosableProvider = (function (props) {
-    var _useState = React.useState(true),
+    var _useState = React.useState(props.closable || true),
         _useState2 = _slicedToArray(_useState, 2),
         closable = _useState2[0],
         setClosable = _useState2[1];
@@ -4806,14 +4806,9 @@
         }
       };
 
-      setTimeout(function () {
-        window.addEventListener('beforeunload', preventReload);
-      }, 800); // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
-
+      window.addEventListener('beforeunload', preventReload);
       return function () {
-        setTimeout(function () {
-          window.removeEventListener('beforeunload', preventReload);
-        }, 800);
+        window.removeEventListener('beforeunload', preventReload);
       };
     }, [closable, props.closable]);
     return /*#__PURE__*/React__default['default'].createElement(ClosableContext.Provider, {

diff --git a/dist/umd/index.js.map b/dist/umd/index.js.map
diff --git a/dist/umd/index.solana.js b/dist/umd/index.solana.js
@@ -4757,7 +4757,7 @@
   var UpdatableContext = /*#__PURE__*/React__default['default'].createContext();
 
   var ClosableProvider = (function (props) {
-    var _useState = React.useState(true),
+    var _useState = React.useState(props.closable || true),
         _useState2 = _slicedToArray(_useState, 2),
         closable = _useState2[0],
         setClosable = _useState2[1];
@@ -4807,14 +4807,9 @@
         }
       };
 
-      setTimeout(function () {
-        window.addEventListener('beforeunload', preventReload);
-      }, 800); // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
-
+      window.addEventListener('beforeunload', preventReload);
       return function () {
-        setTimeout(function () {
-          window.removeEventListener('beforeunload', preventReload);
-        }, 800);
+        window.removeEventListener('beforeunload', preventReload);
       };
     }, [closable, props.closable]);
     return /*#__PURE__*/React__default['default'].createElement(ClosableContext.Provider, {

diff --git a/dist/umd/index.solana.js.map b/dist/umd/index.solana.js.map
diff --git a/package.evm.json b/package.evm.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets-evm",
   "moduleName": "DePayWidgets",
-  "version": "12.8.0",
+  "version": "12.8.1",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets",
   "moduleName": "DePayWidgets",
-  "version": "12.8.0",
+  "version": "12.8.1",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",

diff --git a/package.solana.json b/package.solana.json
@@ -1,7 +1,7 @@
 {
   "name": "@depay/widgets-solana",
   "moduleName": "DePayWidgets",
-  "version": "12.8.0",
+  "version": "12.8.1",
   "description": "Web3 Payments with any token. DePay simplifies and improves Web3 Payments with the power of DeFi. Accept any token with on-the-fly conversion.",
   "main": "./dist/umd/index.js",
   "module": "./dist/esm/index.js",

diff --git a/src/providers/ClosableProvider.jsx b/src/providers/ClosableProvider.jsx
@@ -4,7 +4,7 @@ import UpdatableContext from '../contexts/UpdatableContext'
 
 export default (props)=>{
 
-  const [closable, setClosable] = useState(true)
+  const [closable, setClosable] = useState(props.closable || true)
   const [open, setOpen] = useState(true)
   const { setUpdatable } = useContext(UpdatableContext)
 
@@ -36,13 +36,9 @@ export default (props)=>{
         return msg
       }
     }
-    setTimeout(()=>{
-      window.addEventListener('beforeunload', preventReload);
-    }, 800) // timeout to prevent beforeunload error in case browser redirects to wallet (e.g. Solana Mobile Wallet Adapter)
+    window.addEventListener('beforeunload', preventReload);
     return ()=>{
-      setTimeout(()=>{
-        window.removeEventListener('beforeunload', preventReload);
-      }, 800)
+      window.removeEventListener('beforeunload', preventReload);
     }
   }, [closable, props.closable])