[FIX] website, *: review modal behaviors with right-panelization

*: web, web_editor

Since the right-panelization made with [1], the modals were not
compensating the body scrollbar when opened anymore and the backdrop
was misplaced. This commit fixes the problems generically, to support
modals with non-body scrolling.

[1]: https://github.com/odoo/odoo/pull/57975

closes odoo/odoo#58442

X-original-commit: ebd0c90a146145079061e79c2d4c37fa182a2975
Signed-off-by: Quentin Smetz (qsm) <qsm@odoo.com>
This commit is contained in:
qsm-odoo
2020-09-25 08:56:52 +00:00
parent 7e6d9f2c1b
commit 9cf8b97fe4
7 changed files with 53 additions and 8 deletions
+7
View File
@@ -147,6 +147,13 @@ var dom = {
closestScrollable(el) {
return $(el).closestScrollable()[0];
},
/**
* @param {HTMLElement} el
* @see $.compensateScrollbar
*/
compensateScrollbar(el, ...rest) {
$(el).compensateScrollbar(...rest);
},
/**
* jQuery find function behavior is::
*
+18
View File
@@ -96,6 +96,24 @@ $.fn.scrollspy.Constructor.prototype.refresh = function () {
}
};
/* Bootstrap modal scrollbar compensation on non-body */
const bsSetScrollbarFunction = $.fn.modal.Constructor.prototype._setScrollbar;
$.fn.modal.Constructor.prototype._setScrollbar = function () {
const $scrollable = $().getScrollingElement();
if (document.body.contains($scrollable[0])) {
$scrollable.compensateScrollbar(true);
}
return bsSetScrollbarFunction.apply(this, arguments);
};
const bsResetScrollbarFunction = $.fn.modal.Constructor.prototype._resetScrollbar;
$.fn.modal.Constructor.prototype._resetScrollbar = function () {
const $scrollable = $().getScrollingElement();
if (document.body.contains($scrollable[0])) {
$scrollable.compensateScrollbar(false);
}
return bsResetScrollbarFunction.apply(this, arguments);
};
return {
makeExtendedSanitizeWhiteList: makeExtendedSanitizeWhiteList,
};
+22
View File
@@ -135,6 +135,28 @@ $.fn.extend({
}
return $el;
},
/**
* Adapt the given css property by adding the size of a scrollbar if any.
* Limitation: only works if the given css property is not already used as
* inline style for another reason.
*
* @param {boolean} [add=true]
* @param {boolean} [isScrollElement=true]
* @param {string} [cssProperty='padding-right']
*/
compensateScrollbar(add = true, isScrollElement = true, cssProperty = 'padding-right') {
for (const el of this) {
// Compensate scrollbar
el.style.removeProperty(cssProperty);
if (!add) {
return;
}
const scrollableEl = isScrollElement ? el : $(el).parent().closestScrollable()[0];
const style = window.getComputedStyle(el);
const newValue = parseInt(style[cssProperty]) + scrollableEl.offsetWidth - scrollableEl.clientWidth;
el.style.setProperty(cssProperty, `${newValue}px`, 'important');
}
},
/**
* @returns {jQuery}
*/
@@ -24,3 +24,6 @@ html, body, #wrapwrap {
flex: 1 0 auto;
}
}
.modal-open #wrapwrap {
overflow: hidden;
}
@@ -11,6 +11,7 @@ body.editor_enable.editor_has_snippets {
}
.modal:not(.o_technical_modal) {
top: 0 !important;
// set z-index so customize options visible on dialog.
z-index: $o-we-overlay-zindex - 1;
// just for fake backdrop effect
+1 -7
View File
@@ -73,13 +73,7 @@ const BaseAnimatedHeader = animations.Animation.extend({
* @private
*/
_adaptFixedHeaderPosition() {
// Compensate scrollbar
this.el.style.removeProperty('right');
if (this.fixedHeader) {
const scrollableEl = this.$el.parent().closestScrollable()[0];
const style = window.getComputedStyle(this.el);
this.el.style.setProperty('right', `${parseInt(style['right']) + scrollableEl.offsetWidth - scrollableEl.clientWidth}px`, 'important');
}
dom.compensateScrollbar(this.el, this.fixedHeader, false, 'right');
},
/**
* @private
@@ -159,8 +159,8 @@ body.editor_enable.editor_has_snippets {
.s_popup .modal {
// s_popup in edit mode
top: var(--o-we-toolbar-height);
background-color: transparent;
&.fade .modal-dialog {
transform: none;
}