From fb4efb49ea7f5ebe36e67a457b8f713b2c5b2bb4 Mon Sep 17 00:00:00 2001 From: Shohei Yoshida Date: Thu, 25 Jun 2020 17:35:53 +0900 Subject: Prevent overflowing static backdrop modal animation (#30326) Co-authored-by: XhmikosR --- js/src/modal.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'js/src') diff --git a/js/src/modal.js b/js/src/modal.js index 0d15041bd..8c6617650 100644 --- a/js/src/modal.js +++ b/js/src/modal.js @@ -409,10 +409,23 @@ class Modal { return } + const isModalOverflowing = this._element.scrollHeight > document.documentElement.clientHeight + + if (!isModalOverflowing) { + this._element.style.overflowY = 'hidden' + } + this._element.classList.add(CLASS_NAME_STATIC) - const modalTransitionDuration = getTransitionDurationFromElement(this._element) + const modalTransitionDuration = getTransitionDurationFromElement(this._dialog) + EventHandler.off(this._element, TRANSITION_END) EventHandler.one(this._element, TRANSITION_END, () => { this._element.classList.remove(CLASS_NAME_STATIC) + if (!isModalOverflowing) { + EventHandler.one(this._element, TRANSITION_END, () => { + this._element.style.overflowY = '' + }) + emulateTransitionEnd(this._element, modalTransitionDuration) + } }) emulateTransitionEnd(this._element, modalTransitionDuration) this._element.focus() -- cgit v1.2.3