Merge branch 'main' into gs/tweak-collapse-js-selector

diff --cc js/src/collapse.js
index 6ac77a2a86ad514b82916904f444052f8b6a3c89,9f0c60cc5338bf75fc3af18523bbbf55da49cbba..8f5f8b389edb031fb34751c96892ffc421aa0bda
--- 1/js/src/collapse.js
--- 2/js/src/collapse.js
+++ b/js/src/collapse.js
@@@ -181,10 -180,10 +179,10 @@@ class Collapse extends BaseComponent 
      reflow(this._element)
  
      this._element.classList.add(CLASS_NAME_COLLAPSING)
 -    this._element.classList.remove(CLASS_NAME_COLLAPSE, CLASS_NAME_SHOW)
 +    this._element.classList.remove(CLASS_NAME_SHOW)
  
      for (const trigger of this._triggerArray) {
-       const element = getElementFromSelector(trigger)
+       const element = SelectorEngine.getElementFromSelector(trigger)
  
        if (element && !this._isShown(element)) {
          this._addAriaAndCollapsedClass([trigger], false)

diff --cc js/tests/unit/collapse.spec.js
Simple merge