fix(Dialog): add/remove overlay and scroll when fullscreen is changed (…

…#5707) fixes #2201
vuetifyjs · Nov 23, 2018 · 76db39d · 76db39d
1 parent cb605ac
commit 76db39d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/packages/vuetify/src/components/VDialog/VDialog.js b/packages/vuetify/src/components/VDialog/VDialog.js
@@ -91,14 +91,22 @@ export default {
     isActive (val) {
       if (val) {
         this.show()
+        this.hideScroll()
       } else {
         this.removeOverlay()
         this.unbind()
       }
     },
     fullscreen (val) {
-      if (val) this.hideScroll()
-      else this.showScroll()
+      if (!this.isActive) return
+
+      if (val) {
+        this.hideScroll()
+        this.removeOverlay(false)
+      } else {
+        this.showScroll()
+        this.genOverlay()
+      }
     }
   },
 
@@ -154,7 +162,6 @@ export default {
     },
     show () {
       !this.fullscreen && !this.hideOverlay && this.genOverlay()
-      this.fullscreen && this.hideScroll()
       this.$refs.content.focus()
       this.$listeners.keydown && this.bind()
     },

diff --git a/packages/vuetify/src/mixins/overlayable.js b/packages/vuetify/src/mixins/overlayable.js
@@ -67,9 +67,10 @@ export default {
 
       return true
     },
-    removeOverlay () {
+    /** removeOverlay(false) will not restore the scollbar afterwards */
+    removeOverlay (showScroll = true) {
       if (!this.overlay) {
-        return this.showScroll()
+        return showScroll && this.showScroll()
       }
 
       this.overlay.classList.remove('v-overlay--active')
@@ -81,7 +82,7 @@ export default {
             this.overlay.parentNode.removeChild(this.overlay)
           }
           this.overlay = null
-          this.showScroll()
+          showScroll && this.showScroll()
         } catch (e) { console.log(e) }
 
         clearTimeout(this.overlayTimeout)