sharpetronics/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-11-12 00:05:05 -05:00
Code Issues Projects Releases Wiki Activity

Merge fbbccac00e4887c91f72472faf23aa03aa582573 into 12b3f76cc497ea59c471b9eeb89f9bbb58991dba

Browse Source
This commit is contained in:
Moksh Kimta 2025-10-31 13:18:39 +02:00 committed by GitHub
commit 2ec38d9dff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
js/dist/collapse.js vendored
View File

@ -99,8 +99,6 @@
return; return;
} }
let activeChildren = []; let activeChildren = [];
// find active children
if (this._config.parent) { if (this._config.parent) {
activeChildren = this._getFirstLevelChildren(SELECTOR_ACTIVES).filter(element => element !== this._element).map(element => Collapse.getOrCreateInstance(element, { activeChildren = this._getFirstLevelChildren(SELECTOR_ACTIVES).filter(element => element !== this._element).map(element => Collapse.getOrCreateInstance(element, {
toggle: false toggle: false
@ -122,11 +120,24 @@
this._element.style[dimension] = 0; this._element.style[dimension] = 0;
this._addAriaAndCollapsedClass(this._triggerArray, true); this._addAriaAndCollapsedClass(this._triggerArray, true);
this._isTransitioning = true; this._isTransitioning = true;
// 🔧 Firefox scroll jump fix
const isFirefox = navigator.userAgent.toLowerCase().includes('firefox');
let originalScrollMarginTop = '';
if (isFirefox) {
originalScrollMarginTop = this._element.style.scrollMarginTop;
this._element.style.scrollMarginTop = '0px';
}
const complete = () => { const complete = () => {
this._isTransitioning = false; this._isTransitioning = false;
this._element.classList.remove(CLASS_NAME_COLLAPSING); this._element.classList.remove(CLASS_NAME_COLLAPSING);
this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW); this._element.classList.add(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW);
this._element.style[dimension] = ''; this._element.style[dimension] = '';
// ✅ Restore original scroll-margin-top
if (isFirefox) {
this._element.style.scrollMarginTop = originalScrollMarginTop;
}
EventHandler.trigger(this._element, EVENT_SHOWN); EventHandler.trigger(this._element, EVENT_SHOWN);
}; };
const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1); const capitalizedDimension = dimension[0].toUpperCase() + dimension.slice(1);

15
js/src/collapse.js
View File

@ -115,7 +115,6 @@ class Collapse extends BaseComponent {
let activeChildren = [] let activeChildren = []
// find active children
if (this._config.parent) { if (this._config.parent) {
activeChildren = this._getFirstLevelChildren(SELECTOR_ACTIVES) activeChildren = this._getFirstLevelChildren(SELECTOR_ACTIVES)
.filter(element => element !== this._element) .filter(element => element !== this._element)
@ -145,6 +144,15 @@ class Collapse extends BaseComponent {
this._addAriaAndCollapsedClass(this._triggerArray, true) this._addAriaAndCollapsedClass(this._triggerArray, true)
this._isTransitioning = true this._isTransitioning = true
// 🔧 Firefox scroll jump fix
const isFirefox = navigator.userAgent.toLowerCase().includes('firefox')
let originalScrollMarginTop = ''
if (isFirefox) {
originalScrollMarginTop = this._element.style.scrollMarginTop
this._element.style.scrollMarginTop = '0px'
}
const complete = () => { const complete = () => {
this._isTransitioning = false this._isTransitioning = false
@ -153,6 +161,11 @@ class Collapse extends BaseComponent {
this._element.style[dimension] = '' this._element.style[dimension] = ''
// ✅ Restore original scroll-margin-top
if (isFirefox) {
this._element.style.scrollMarginTop = originalScrollMarginTop
}
EventHandler.trigger(this._element, EVENT_SHOWN) EventHandler.trigger(this._element, EVENT_SHOWN)
} }