fix(modal): fix scroll to top issue when modal has no-fade set (#4004)

tmorehouse · web-flow · commit 332b79fe8511 · 2019-09-03T16:44:22.000-03:00
diff --git a/src/components/modal/modal.js b/src/components/modal/modal.js
@@ -775,11 +775,14 @@ export const BModal = /*#__PURE__*/ Vue.extend({
                   : autoFocus === 'close' && close
                     ? close.$el || close
                     : content
-            // Make sure top of modal is showing (if longer than the viewport)
+            // Focus the element
+            attemptFocus(el)
             if (el === content) {
-              modal.scrollTop = 0
+              // Make sure top of modal is showing (if longer than the viewport)
+              this.$nextTick(() => {
+                modal.scrollTop = 0
+              })
             }
-            attemptFocus(el)
           }
         })
       }

Original file line number	Diff line number	Diff line change
`@@ -775,11 +775,14 @@ export const BModal = /#__PURE__/ Vue.extend({`
`775`	`775`	`: autoFocus === 'close' && close`
`776`	`776`	`? close.$el \|\| close`
`777`	`777`	`: content`
`778`		`- // Make sure top of modal is showing (if longer than the viewport)`
	`778`	`+ // Focus the element`
	`779`	`+ attemptFocus(el)`
`779`	`780`	`if (el === content) {`
`780`		`- modal.scrollTop = 0`
	`781`	`+ // Make sure top of modal is showing (if longer than the viewport)`
	`782`	`+ this.$nextTick(() => {`
	`783`	`+ modal.scrollTop = 0`
	`784`	`+ })`
`781`	`785`	`}`
`782`		`- attemptFocus(el)`
`783`	`786`	`}`
`784`	`787`	`})`
`785`	`788`	`}`