From dcdaf70601572e4d26e8f94f2dfc666053768d90 Mon Sep 17 00:00:00 2001 From: djmaze Date: Mon, 31 Aug 2020 16:32:27 +0200 Subject: [PATCH] Bugfix: compose window resizeObserver --- dev/Styles/Compose.less | 2 +- dev/View/Popup/Compose.js | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dev/Styles/Compose.less b/dev/Styles/Compose.less index 6535a4dfb..df790f0f0 100644 --- a/dev/Styles/Compose.less +++ b/dev/Styles/Compose.less @@ -5,7 +5,7 @@ width: 98%; max-width: 1000px; margin: 10px auto; -/* height: 94vh;*/ + height: calc(100% - 60px); .modal-body { overflow: auto; diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js index ed654d6ed..157b20b66 100644 --- a/dev/View/Popup/Compose.js +++ b/dev/View/Popup/Compose.js @@ -1053,7 +1053,6 @@ class ComposePopupView extends AbstractViewNext { let el = document.querySelector('.b-compose'); this.resizeObserver.compose = el; - this.resizeObserver.popups = el.parentNode; // el.closest('.popups'); this.resizeObserver.els = [el.querySelector('.textAreaParent'), el.querySelector('.attachmentAreaParent')]; this.resizeObserver.observe(el); this.resizeObserver.observe(el.querySelector('.b-header')); @@ -1509,13 +1508,11 @@ class ComposePopupView extends AbstractViewNext { } resizerTrigger() { - let top = 0; - this.resizeObserver.els.forEach(element => top = Math.max(top, element.getBoundingClientRect().top)); + let top = 0, ro = this.resizeObserver; + ro.els.forEach(element => top = Math.max(top, element.getBoundingClientRect().top)); if (0 < top) { - top = this.resizeObserver.popups.clientHeight - this.resizeObserver.compose.offsetTop - 50 - top; - this.resizeObserver.els.forEach(element => - element.style.height = Math.max(top, Math.max(200,parseInt(element.style.minHeight,10))) + 'px' - ); + top = ro.compose.clientHeight - top; + ro.els.forEach(element => element.style.height = Math.max(top, 200) + 'px'); if (this.oEditor) { this.oEditor.resize(); }