fixup: restore old event trigger behavior

twbs · Dec 20, 2024 · 3fdd6fc · 3fdd6fc
1 parent 17dc58b
commit 3fdd6fc
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
@@ -168,14 +168,19 @@ class ScrollSpy extends BaseComponent {
     }
 
     let maxIntersectionRatio = 0
+    let element = null
     for (const [key, val] of this._intersectionRatio.entries()) {
       if (val > maxIntersectionRatio) {
-        const element = targetElement(key)
-        this._activeTarget = element
+        element = targetElement(key)
         maxIntersectionRatio = val
       }
     }
 
+    if (element !== null) {
+      this._process(element)
+      return
+    }
+
     if (this._activeTarget !== null) {
       this._process(this._activeTarget)
     }
@@ -208,6 +213,11 @@ class ScrollSpy extends BaseComponent {
     this._activateParents(target)
 
     target.classList.add(CLASS_NAME_ACTIVE)
+    if (target === this._activeTarget) {
+      return
+    }
+
+    this._activeTarget = target
     EventHandler.trigger(this._element, EVENT_ACTIVATE, { relatedTarget: target })
   }