Merge pull request #85 from transverse-dev/fix/modal

hotfix/modal html scroll issue
transverse-dev · Sep 8, 2022 · b986e4e · b986e4e
2 parents c65df77 + c3f6b30
commit b986e4e
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 46 deletions.
diff --git a/docs/commons.36a20d0df26ed08ca82a.js b/docs/commons.36a20d0df26ed08ca82a.js
diff --git a/...mmons.8484fe3c826c739133e1.js.LICENSE.txt → ...mmons.36a20d0df26ed08ca82a.js.LICENSE.txt b/...mmons.8484fe3c826c739133e1.js.LICENSE.txt → ...mmons.36a20d0df26ed08ca82a.js.LICENSE.txt
diff --git a/docs/commons.8484fe3c826c739133e1.js b/docs/commons.8484fe3c826c739133e1.js
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><base href="https://transverse-dev.github.io/evoui/"/><meta charset="UTF-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>EvoUI</title><script>!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><script defer="defer" src="./framework.1c173ba7ebbb319e202f.js"></script><script defer="defer" src="./commons.8484fe3c826c739133e1.js"></script><script defer="defer" src="./main.f41d31e82ee5bdef6fab.js"></script></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><base href="https://transverse-dev.github.io/evoui/"/><meta charset="UTF-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>EvoUI</title><script>!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><script defer="defer" src="./framework.1c173ba7ebbb319e202f.js"></script><script defer="defer" src="./commons.36a20d0df26ed08ca82a.js"></script><script defer="defer" src="./main.c50b9ed266f22906b40c.js"></script></head><body><div id="root"></div></body></html>
diff --git a/docs/main.f41d31e82ee5bdef6fab.js → docs/main.c50b9ed266f22906b40c.js b/docs/main.f41d31e82ee5bdef6fab.js → docs/main.c50b9ed266f22906b40c.js
diff --git a/src/evoui/components/Modal/modal.tsx b/src/evoui/components/Modal/modal.tsx
@@ -182,6 +182,12 @@ export default function Modal({
 
   const [alreadyHidden, setAlreadyHidden] = useState<boolean>(false);
 
+  const keypressEvent = (e: KeyboardEvent) => {
+    if (e.code === 'Escape') {
+      onClose();
+    }
+  };
+
   useEffect(() => {
     if (window.document.body.style.overflow === 'hidden' && !alreadyHidden) {
       setAlreadyHidden(true);
@@ -199,17 +205,14 @@ export default function Modal({
     }
 
     return () => {
+      if (!alreadyHidden) {
+        window.document.body.style.overflow = '';
+      }
       setAlreadyHidden(false);
       window?.removeEventListener('keydown', keypressEvent);
     };
   }, [isOpen]);
 
-  const keypressEvent = (e: KeyboardEvent) => {
-    if (e.code === 'Escape') {
-      onClose();
-    }
-  };
-
   return isOpen ? (
     <RootWrapper
       isBackgroundOff={!!options?.RootBackgroundOff}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html lang="en"><head><base href="https://transverse-dev.github.io/evoui/"/><meta charset="UTF-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>EvoUI</title><script>!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><script defer="defer" src="./framework.1c173ba7ebbb319e202f.js"></script><script defer="defer" src="./commons.8484fe3c826c739133e1.js"></script><script defer="defer" src="./main.f41d31e82ee5bdef6fab.js"></script></head><body><div id="root"></div></body></html>
		<!doctype html><html lang="en"><head><base href="https://transverse-dev.github.io/evoui/"/><meta charset="UTF-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>EvoUI</title><script>!function(n){if("/"===n.search[1]){var a=n.search.slice(1).split("&").map((function(n){return n.replace(/~and~/g,"&")})).join("?");window.history.replaceState(null,null,n.pathname.slice(0,-1)+a+n.hash)}}(window.location)</script><script defer="defer" src="./framework.1c173ba7ebbb319e202f.js"></script><script defer="defer" src="./commons.36a20d0df26ed08ca82a.js"></script><script defer="defer" src="./main.c50b9ed266f22906b40c.js"></script></head><body><div id="root"></div></body></html>