Merge pull request #2639 from fabio-aiello-appfolio/restore-scrolling-when-multiple-modals-close

fix: ensure initial overflow status is stored when opening multiple modals

Author: davidacevedo

src/Modal.js

@@ -116,7 +116,6 @@ class Modal extends React.Component {
 
     this._element = null;
     this._originalBodyPadding = null;
-    this._originalBodyOverflow = null;
     this.getFocusableChildren = this.getFocusableChildren.bind(this);
     this.handleBackdropClick = this.handleBackdropClick.bind(this);
     this.handleBackdropMouseDown = this.handleBackdropMouseDown.bind(this);
@@ -371,9 +370,11 @@ class Modal extends React.Component {
     }
 
     this._originalBodyPadding = getOriginalBodyPadding();
-    this._originalBodyOverflow = window.getComputedStyle(
-      document.body,
-    ).overflow;
+    if (Modal.openCount < 1) {
+      Modal.originalBodyOverflow = window.getComputedStyle(
+        document.body,
+        ).overflow;
+    };
     conditionallyUpdateScrollbar();
 
     if (Modal.openCount === 0) {
@@ -419,7 +420,7 @@ class Modal extends React.Component {
       document.body.className = document.body.className
         .replace(modalOpenClassNameRegex, ' ')
         .trim();
-      document.body.style.overflow = this._originalBodyOverflow;
+      document.body.style.overflow = Modal.originalBodyOverflow;
     }
     this.manageFocusAfterClose();
     Modal.openCount = Math.max(0, Modal.openCount - 1);
@@ -571,5 +572,6 @@ class Modal extends React.Component {
 Modal.propTypes = propTypes;
 Modal.defaultProps = defaultProps;
 Modal.openCount = 0;
+Modal.originalBodyOverflow = null;
 
 export default Modal;