Updates

tuax · Mar 11, 2024 · 3c3499b · 3c3499b
1 parent ac2633f
commit 3c3499b
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 25 deletions.
diff --git a/tua-bsl.esm.browser.js b/tua-bsl.esm.browser.js
@@ -53,10 +53,19 @@ function noticeRequiredTargetElement(targetElement) {
     }
     return true;
 }
-function preventEventDefault(event) {
-    if (!event.cancelable)
-        return;
-    event.preventDefault();
+/**
+ * Get global function that calls preventDefault
+ */
+function getPreventEventDefault() {
+    if ('__BSL_PREVENT_DEFAULT__' in window) {
+        return window.__BSL_PREVENT_DEFAULT__;
+    }
+    window.__BSL_PREVENT_DEFAULT__ = function (event) {
+        if (!event.cancelable)
+            return;
+        event.preventDefault();
+    };
+    return window.__BSL_PREVENT_DEFAULT__;
 }
 
 const initialLockState = {
@@ -96,7 +105,7 @@ function handleScroll(event, targetElement, initialClientPos) {
         const isOnBottom = clientY < 0 && scrollTop + clientHeight + 1 >= scrollHeight;
         if ((isVertical && (isOnTop || isOnBottom)) ||
             (!isVertical && (isOnLeft || isOnRight))) {
-            return preventEventDefault(event);
+            return getPreventEventDefault()(event);
         }
     }
     event.stopPropagation();
@@ -172,7 +181,7 @@ function lock(targetElement, options) {
             });
         }
         if (!lockState.documentListenerAdded) {
-            document.addEventListener('touchmove', preventEventDefault, eventListenerOptions);
+            document.addEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
             lockState.documentListenerAdded = true;
         }
     }
@@ -209,7 +218,7 @@ function unlock(targetElement, options) {
         });
     }
     if (lockState.documentListenerAdded) {
-        document.removeEventListener('touchmove', preventEventDefault, eventListenerOptions);
+        document.removeEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
         lockState.documentListenerAdded = false;
     }
 }
@@ -234,7 +243,7 @@ function clearBodyLocks(options) {
         }
     }
     if (lockState.documentListenerAdded) {
-        document.removeEventListener('touchmove', preventEventDefault, eventListenerOptions);
+        document.removeEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
         lockState.documentListenerAdded = false;
     }
 }

diff --git a/tua-bsl.esm.browser.min.js b/tua-bsl.esm.browser.min.js
diff --git a/tua-bsl.mjs b/tua-bsl.mjs
@@ -52,9 +52,18 @@ function noticeRequiredTargetElement(targetElement) {
   }
   return true;
 }
-function preventEventDefault(event) {
-  if (!event.cancelable) return;
-  event.preventDefault();
+/**
+ * Get global function that calls preventDefault
+ */
+function getPreventEventDefault() {
+  if ('__BSL_PREVENT_DEFAULT__' in window) {
+    return window.__BSL_PREVENT_DEFAULT__;
+  }
+  window.__BSL_PREVENT_DEFAULT__ = function (event) {
+    if (!event.cancelable) return;
+    event.preventDefault();
+  };
+  return window.__BSL_PREVENT_DEFAULT__;
 }
 
 var initialLockState = {
@@ -95,7 +104,7 @@ function handleScroll(event, targetElement, initialClientPos) {
     var isOnRight = clientX < 0 && scrollLeft + clientWidth + 1 >= scrollWidth;
     var isOnBottom = clientY < 0 && scrollTop + clientHeight + 1 >= scrollHeight;
     if (isVertical && (isOnTop || isOnBottom) || !isVertical && (isOnLeft || isOnRight)) {
-      return preventEventDefault(event);
+      return getPreventEventDefault()(event);
     }
   }
   event.stopPropagation();
@@ -178,7 +187,7 @@ function lock(targetElement, options) {
       });
     }
     if (!lockState.documentListenerAdded) {
-      document.addEventListener('touchmove', preventEventDefault, eventListenerOptions);
+      document.addEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
       lockState.documentListenerAdded = true;
     }
   } else if (lockState.lockedNum <= 0) {
@@ -209,7 +218,7 @@ function unlock(targetElement, options) {
     });
   }
   if (lockState.documentListenerAdded) {
-    document.removeEventListener('touchmove', preventEventDefault, eventListenerOptions);
+    document.removeEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
     lockState.documentListenerAdded = false;
   }
 }
@@ -232,7 +241,7 @@ function clearBodyLocks(options) {
     }
   }
   if (lockState.documentListenerAdded) {
-    document.removeEventListener('touchmove', preventEventDefault, eventListenerOptions);
+    document.removeEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
     lockState.documentListenerAdded = false;
   }
 }

diff --git a/tua-bsl.umd.js b/tua-bsl.umd.js
@@ -56,9 +56,18 @@
     }
     return true;
   }
-  function preventEventDefault(event) {
-    if (!event.cancelable) return;
-    event.preventDefault();
+  /**
+   * Get global function that calls preventDefault
+   */
+  function getPreventEventDefault() {
+    if ('__BSL_PREVENT_DEFAULT__' in window) {
+      return window.__BSL_PREVENT_DEFAULT__;
+    }
+    window.__BSL_PREVENT_DEFAULT__ = function (event) {
+      if (!event.cancelable) return;
+      event.preventDefault();
+    };
+    return window.__BSL_PREVENT_DEFAULT__;
   }
 
   var initialLockState = {
@@ -99,7 +108,7 @@
       var isOnRight = clientX < 0 && scrollLeft + clientWidth + 1 >= scrollWidth;
       var isOnBottom = clientY < 0 && scrollTop + clientHeight + 1 >= scrollHeight;
       if (isVertical && (isOnTop || isOnBottom) || !isVertical && (isOnLeft || isOnRight)) {
-        return preventEventDefault(event);
+        return getPreventEventDefault()(event);
       }
     }
     event.stopPropagation();
@@ -182,7 +191,7 @@
         });
       }
       if (!lockState.documentListenerAdded) {
-        document.addEventListener('touchmove', preventEventDefault, eventListenerOptions);
+        document.addEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
         lockState.documentListenerAdded = true;
       }
     } else if (lockState.lockedNum <= 0) {
@@ -213,7 +222,7 @@
       });
     }
     if (lockState.documentListenerAdded) {
-      document.removeEventListener('touchmove', preventEventDefault, eventListenerOptions);
+      document.removeEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
       lockState.documentListenerAdded = false;
     }
   }
@@ -236,7 +245,7 @@
       }
     }
     if (lockState.documentListenerAdded) {
-      document.removeEventListener('touchmove', preventEventDefault, eventListenerOptions);
+      document.removeEventListener('touchmove', getPreventEventDefault(), eventListenerOptions);
       lockState.documentListenerAdded = false;
     }
   }