Merge pull request #602 from topcoder-platform/issue-292

changes for #292

Author: callmekatootie

client/src/components/Modal/index.jsx

@@ -6,17 +6,24 @@ import style from "./style.module.scss";
 
 export default function Modal({ children, className, overlayClassName = "" }) {
   const [portal, setPortal] = React.useState();
+  const [isDisabledScroll, disableScroll] = React.useState(false);
 
   React.useEffect(() => {
     const p = document.createElement("div");
-    document.body.classList.add("scrolling-disabled-by-modal");
+    if (document.body.classList.contains("scrolling-disabled-by-modal")) {
+      disableScroll(true);
+    } else {
+      document.body.classList.add("scrolling-disabled-by-modal");
+    }
     document.body.appendChild(p);
     setPortal(p);
     return () => {
-      document.body.classList.remove("scrolling-disabled-by-modal");
+      if (isDisabledScroll === false) {
+        document.body.classList.remove("scrolling-disabled-by-modal");
+      }
       document.body.removeChild(p);
     };
-  }, []);
+  }, [isDisabledScroll]);
 
   let containerStyle = style.container;
   if (className) containerStyle += ` ${className}`;