Skip to content

fix(modal): use resizeobserver #2969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lubber-de wants to merge 14 commits into
base: develop
Choose a base branch
from
+89 −19
Open

fix(modal): use resizeobserver #2969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ca06749
fix(modal): use resizeobserver
lubber-de Dec 20, 2023
6c5a7ea
feat(modal): make scrollbar gutter appearance customizable
lubber-de May 1, 2024
ad31293
Merge branch 'develop' into resizeObserver
lubber-de Feb 17, 2025
899f419
Merge branch 'develop' into resizeObserver
lubber-de Mar 8, 2025
6d288c4
Merge branch 'develop' into resizeObserver
lubber-de Mar 21, 2025
87ea82e
fix(modal): linting fixes
lubber-de Mar 21, 2025
bb4fc85
Merge branch 'develop' into resizeObserver
lubber-de Mar 30, 2025
be041ad
Merge branch 'develop' into resizeObserver
lubber-de Sep 9, 2025
7cb6407
feat(modal): resizeobserver is supported everywhere
lubber-de Sep 9, 2025
4f28335
Merge branch 'develop' into resizeObserver
lubber-de Oct 2, 2025
393cf6a
Merge branch 'develop' into resizeObserver
lubber-de Oct 18, 2025
4ba32ab
Merge branch 'develop' into resizeObserver
lubber-de Nov 1, 2025
09f4591
Merge branch 'refs/heads/develop' into resizeObserver
lubber-de Nov 7, 2025
2553af2
fix(modal): lint fixes
lubber-de Nov 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 77 additions & 19 deletions src/definitions/modules/modal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@
let id;
let observer;
let observeAttributes = false;
let resizeObserver;
const module = {

initialize: function () {
Expand Down Expand Up @@ -239,6 +240,9 @@
if (observer) {
observer.disconnect();
}
if (resizeObserver) {
resizeObserver.disconnect();
}
module.verbose('Destroying previous modal');
$module
.removeData(moduleNamespace)
Expand All @@ -254,6 +258,13 @@
},

observeChanges: function () {
if (settings.observeChanges) {
resizeObserver = new ResizeObserver(function (entries) {
module.refresh();
});
resizeObserver.observe(element);
module.debug('Setting up resize observer', resizeObserver);
}
observer = new MutationObserver(function (mutations) {
const collectNodes = function (parent) {
const nodes = [];
Expand Down Expand Up @@ -288,7 +299,7 @@
return !shouldRefreshInputs;
});

if (shouldRefresh && settings.observeChanges) {
if (!resizeObserver && shouldRefresh && settings.observeChanges) {
module.debug('DOM tree modified, refreshing');
module.refresh();
}
Expand All @@ -307,12 +318,15 @@

refresh: function () {
module.remove.scrolling();
module.cacheSizes();
if (!module.can.useFlex()) {
module.set.modalOffset();
if ($module.css('display') !== 'none') {
module.cacheSizes();
if (!module.can.useFlex()) {
module.set.modalOffset();
}
module.set.screenHeight();
module.set.dimmerHeight();
module.set.type();
}
module.set.screenHeight();
module.set.type();
},

refreshModals: function () {
Expand Down Expand Up @@ -569,7 +583,7 @@
}
hadScrollbar = module.has.scrollbar();
module.showDimmer();
module.cacheSizes();
module.cacheSizes(true);
if (hadScrollbar) {
module.set.bodyMargin();
}
Expand Down Expand Up @@ -693,7 +707,8 @@
if ($dimmable.dimmer('is animating') || !$dimmable.dimmer('is active')) {
if (hadScrollbar) {
if (!isBody) {
$dimmer.css('top', $dimmable.scrollTop());
$dimmer.css('top', settings.detachable ? $dimmable.scrollTop() : 0);
module.set.dimmerHeight();
}
module.save.bodyMargin();
}
Expand All @@ -713,6 +728,7 @@
}
module.remove.clickaway();
module.remove.screenHeight();
module.remove.dimmerHeight();
});
} else {
module.debug('Dimmer is not visible cannot hide');
Expand Down Expand Up @@ -830,12 +846,27 @@
$context.removeAttr('style');
}
},
dimmerStyle: function () {
if ($dimmer.attr('style') === '') {
module.verbose('Removing dimmer style attribute');
$dimmer.removeAttr('style');
}
},
screenHeight: function () {
module.debug('Removing page height');
$context
.css('height', '');
module.remove.bodyStyle();
},
dimmerHeight: function () {
module.debug('Removing dimmer height');
$dimmer.css({
top: '',
height: '',
maxHeight: '',
});
module.remove.dimmerStyle();
},
keyboardShortcuts: function () {
module.verbose('Removing keyboard shortcuts');
$document
Expand All @@ -849,11 +880,13 @@
},
},

cacheSizes: function () {
cacheSizes: function (getScrollingMargins) {
$module.addClass(className.loading);
const scrollHeight = $module.prop('scrollHeight');
const modalWidth = $module.outerWidth();
const modalHeight = $module.outerHeight();
let scrollingTop = 0;
let bottomMargin = 0;
if (module.cache.pageHeight === undefined || modalHeight !== 0) {
$.extend(module.cache, {
pageHeight: $document.outerHeight(),
Expand All @@ -866,6 +899,18 @@
});
module.cache.topOffset = -(module.cache.height / 2);
}
if (getScrollingMargins) {
if (module.can.useFlex()) {
$module.addClass(className.scrolling);
scrollingTop = Number.parseInt($module.css('top').replace(/[^\d.]/g, ''), 10) || 0;
bottomMargin = Number.parseInt(window.getComputedStyle($module[0], '::after').height.replace(/[^\d.]/g, ''), 10) || 0;
$module.removeClass(className.scrolling);
}
$.extend(module.cache, {
scrollingTop: scrollingTop,
bottomMargin: bottomMargin,
});
}
$module.removeClass(className.loading);
module.debug('Caching modal and container sizes', module.cache);
},
Expand Down Expand Up @@ -908,14 +953,15 @@
const contextHeight = module.cache.contextHeight;
const verticalCenter = module.cache.contextHeight / 2;
const topOffset = module.cache.topOffset;
const scrollingTop = module.cache.scrollingTop || 0;
const scrollHeight = module.cache.scrollHeight;
const height = module.cache.height;
const paddingHeight = settings.padding;
const startPosition = verticalCenter + topOffset;

return scrollHeight > height
? startPosition + scrollHeight + paddingHeight < contextHeight
: height + (paddingHeight * 2) < contextHeight;
: height + (paddingHeight * 2) - scrollingTop < contextHeight;
},
},
has: {
Expand Down Expand Up @@ -1037,13 +1083,14 @@
modalOffset: function () {
if (!settings.detachable) {
const canFit = module.can.fit();
const scrollTop = (isBody ? $document : $context).scrollTop();
$module
.css({
top: !$module.hasClass('aligned') && canFit
? $document.scrollTop() + (module.cache.contextHeight - module.cache.height) / 2
? scrollTop + (module.cache.contextHeight - module.cache.height) / 2
: (!canFit || $module.hasClass('top')
? $document.scrollTop() + settings.padding
: $document.scrollTop() + (module.cache.contextHeight - module.cache.height - settings.padding)),
? scrollTop + settings.padding
: scrollTop + (module.cache.contextHeight - module.cache.height - settings.padding)),
marginLeft: -(module.cache.width / 2),
});
} else {
Expand All @@ -1058,12 +1105,23 @@
module.verbose('Setting modal offset for legacy mode');
},
screenHeight: function () {
if (module.can.fit()) {
$context.css('height', '');
} else if (!$module.hasClass('bottom')) {
module.debug('Modal is taller than page content, resizing page height');
$context
.css('height', module.cache.height + (settings.padding * 2) + 'px');
if (!isBody && !settings.detachable) {
if (module.can.fit() || hadScrollbar) {
$context.css('height', '');
} else if (!$module.hasClass('bottom')) {
module.debug('Modal is taller than page content, resizing page height');
$context
.css('height', module.cache.height + (settings.padding * 2) + 'px');
}
}
},
dimmerHeight: function () {
if (!isBody && !settings.detachable) {
const contextHeight = $context.prop('scrollHeight');
$dimmer.css({
height: contextHeight,
maxHeight: contextHeight,
});
}
},
active: function () {
Expand Down
12 changes: 12 additions & 0 deletions src/definitions/modules/modal.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
}
}
& when (@variationModalClose) {
.undetached.dimmable.dimmed > .ui.modal@{notFullscreen} > .close@{notInside},
.ui.dimmer > .ui.modal@{notFullscreen} > .close@{notInside} {
text-shadow: @closeShadow;
}
Expand Down Expand Up @@ -469,6 +470,11 @@
overflow: auto;
overscroll-behavior: @overscrollBehavior;
}
@supports selector(:has(.f)) {
.modals.dimmer:has(.scrollable) {
scrollbar-gutter: stable;
}
}
.modals.dimmer .ui.scrolling.modal.fullscreen {
top: 0;
}
Expand All @@ -481,8 +487,14 @@
.modals.dimmer .ui.scrolling.modal:not([class*="overlay fullscreen"])::after {
content: "\00A0";
position: absolute;
height: 0;
}
.modals.dimmer .ui.scrolling.modal:not([class*="overlay fullscreen"])::after {
height: @scrollingMargin;
}
.dimmable.dimmed > .modals.dimmer {
overflow: auto;
}

/* Undetached Scrolling */
.scrolling.undetached.dimmable.dimmed {
Expand Down