From daeea9d7facbae3d52ef2822280822bd52f6311f Mon Sep 17 00:00:00 2001
From: Artur Paikin <artur@arturpaikin.com>
Date: Mon, 29 Jan 2018 14:18:16 -0500
Subject: [PATCH] simplify back and just use css class

---
 src/plugins/Dashboard/index.js | 29 +++++++----------------------
 src/scss/_dashboard.scss       |  3 +--
 website/package.json           |  4 ++--
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/plugins/Dashboard/index.js b/src/plugins/Dashboard/index.js
index 021bb4fa1..1087899e1 100644
--- a/src/plugins/Dashboard/index.js
+++ b/src/plugins/Dashboard/index.js
@@ -201,20 +201,6 @@ module.exports = class Dashboard extends Plugin {
     }
   }
 
-  scrollBehaviour (toggle) {
-    if (!this.opts.disablePageScrollWhenModalOpen) return
-    const body = document.querySelector('body')
-    switch (toggle) {
-      case 'enable':
-        Object.assign(body.style, { overflow: 'initial', height: 'initial' })
-        break
-      case 'disable':
-        Object.assign(body.style, { overflow: 'hidden', height: '100vh' })
-        break
-      default:
-    }
-  }
-
   openModal () {
     this.setPluginState({
       isHidden: false
@@ -225,12 +211,10 @@ module.exports = class Dashboard extends Plugin {
     // save active element, so we can restore focus when modal is closed
     this.savedActiveElement = document.activeElement
 
-    // add class to body that sets position fixed, move everything back
-    // to scroll position
-    // document.body.classList.add('uppy-Dashboard-isOpen')
-    // document.body.style.top = `-${this.savedScrollPosition}px`
+    if (!this.opts.disablePageScrollWhenModalOpen) {
+      document.body.classList.remove('uppy-Dashboard-isOpen')
+    }
 
-    this.scrollBehaviour('disable')
     this.updateDashboardElWidth()
     this.setFocusToFirstNode()
   }
@@ -240,10 +224,11 @@ module.exports = class Dashboard extends Plugin {
       isHidden: true
     })
 
-    // document.body.classList.remove('uppy-Dashboard-isOpen')
-    this.scrollBehaviour('enable')
+    if (!this.opts.disablePageScrollWhenModalOpen) {
+      document.body.classList.remove('uppy-Dashboard-isOpen')
+    }
+
     this.savedActiveElement.focus()
-    // window.scrollTo(0, this.savedScrollPosition)
   }
 
   isModalOpen () {
diff --git a/src/scss/_dashboard.scss b/src/scss/_dashboard.scss
index 44be901ab..55ad14faa 100644
--- a/src/scss/_dashboard.scss
+++ b/src/scss/_dashboard.scss
@@ -9,9 +9,8 @@
 
 // Added to body to prevent the page from scrolling when Modal is open
 .uppy-Dashboard-isOpen {
-  width: 100%;
   overflow: hidden;
-  position: fixed;
+  height: 100vh;
 }
 
 .uppy-Dashboard--modal .uppy-Dashboard-overlay {
diff --git a/website/package.json b/website/package.json
index d7aac3971..85e16ec23 100644
--- a/website/package.json
+++ b/website/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.1",
   "private": true,
   "hexo": {
-    "version": "3.3.7"
+    "version": "3.5.0"
   },
   "dependencies": {
     "autoprefixer": "^7.2.5",
@@ -42,4 +42,4 @@
     "remark": "5.0.1",
     "watchify": "^3.9.0"
   }
-}
+}
\ No newline at end of file