#90 fix not worked enableBodyScroll in some conditions

willmcpo · Jan 28, 2019 · 3eae730 · 3eae730
1 parent 0e65e5f
commit 3eae730
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/lib/bodyScrollLock.es6.js b/lib/bodyScrollLock.es6.js
@@ -212,11 +212,13 @@ export const enableBodyScroll = targetElement => {
       documentListenerAdded = false;
     }
   } else if (locks.length === 1 && locks[0].targetElement === targetElement) {
-    restoreOverflowSetting();
-
     locks = [];
   } else {
     locks = locks.filter(lock => lock.targetElement !== targetElement);
   }
+
+  if (!locks.length) {
+    restoreOverflowSetting();
+  }
 };
 
diff --git a/lib/bodyScrollLock.js b/lib/bodyScrollLock.js
@@ -249,14 +249,16 @@
         documentListenerAdded = false;
       }
     } else if (locks.length === 1 && locks[0].targetElement === targetElement) {
-      restoreOverflowSetting();
-
       locks = [];
     } else {
       locks = locks.filter(function (lock) {
         return lock.targetElement !== targetElement;
       });
     }
+
+    if (!locks.length) {
+      restoreOverflowSetting();
+    }
   };
 });
 
diff --git a/lib/bodyScrollLock.min.js b/lib/bodyScrollLock.min.js
diff --git a/src/bodyScrollLock.js b/src/bodyScrollLock.js
@@ -230,10 +230,12 @@ export const enableBodyScroll = (targetElement: any): void => {
       documentListenerAdded = false;
     }
   } else if (locks.length === 1 && locks[0].targetElement === targetElement) {
-    restoreOverflowSetting();
-
     locks = [];
   } else {
     locks = locks.filter(lock => lock.targetElement !== targetElement);
   }
+
+  if (!locks.length) {
+    restoreOverflowSetting();
+  }
 };