fix: Skip shadow root when traversing up the dom tree

theKashey · Jul 4, 2021 · eb6a5e7 · eb6a5e7
1 parent 2bff2f1
commit eb6a5e7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-remove-scroll",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "Disables scroll outside of `children` node.",
   "main": "dist/es5/index.js",
   "scripts": {

diff --git a/src/handleScroll.ts b/src/handleScroll.ts
@@ -1,4 +1,4 @@
-import { Axis } from './types';
+import {Axis} from './types';
 
 const elementCouldBeVScrolled = (node: HTMLElement): boolean => {
   const styles = window.getComputedStyle(node);
@@ -27,7 +27,7 @@ export const locationCouldBeScrolled = (
   let current = node;
   do {
     // Skip over shadow root
-    if (window.ShadowRoot && current instanceof window.ShadowRoot) {
+    if (typeof ShadowRoot !== "undefined" && current instanceof ShadowRoot) {
       current = current.host as HTMLElement;
     }
 
@@ -45,15 +45,15 @@ export const locationCouldBeScrolled = (
 };
 
 const getVScrollVariables = ({
-  scrollTop,
-  scrollHeight,
-  clientHeight
-}: HTMLElement) => [scrollTop, scrollHeight, clientHeight];
+                               scrollTop,
+                               scrollHeight,
+                               clientHeight
+                             }: HTMLElement) => [scrollTop, scrollHeight, clientHeight];
 const getHScrollVariables = ({
-  scrollLeft,
-  scrollWidth,
-  clientWidth
-}: HTMLElement) => [scrollLeft, scrollWidth, clientWidth];
+                               scrollLeft,
+                               scrollWidth,
+                               clientWidth
+                             }: HTMLElement) => [scrollLeft, scrollWidth, clientWidth];
 
 const elementCouldBeScrolled = (axis: Axis, node: HTMLElement): boolean =>
   axis === 'v' ? elementCouldBeVScrolled(node) : elementCouldBeHScrolled(node);
@@ -93,10 +93,10 @@ export const handleScroll = (
     target = target.parentNode as any;
   } while (
     // portaled content
-    (!targetInLock && target !== document.body) ||
-    // self content
-    (targetInLock && (endTarget.contains(target) || endTarget === target))
-  );
+  (!targetInLock && target !== document.body) ||
+  // self content
+  (targetInLock && (endTarget.contains(target) || endTarget === target))
+    );
 
   if (
     isDeltaPositive &&