Scrollspy selecting the last element when at the bottom of the page (fixes #17739)

1 files changed, 7 insertions, 1 deletions

diff --git a/js/src/scrollspy.js b/js/src/scrollspy.js
index 98582f9182..9b39acd362 100644
--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@@ -196,12 +196,17 @@ const ScrollSpy = (($) => {
       )
     }
 
+    _getOffsetHeight() {
+      return this._scrollElement === window ?
+          window.innerHeight : this._scrollElement.offsetHeight
+    }
+
     _process() {
       const scrollTop    = this._getScrollTop() + this._config.offset
       const scrollHeight = this._getScrollHeight()
       const maxScroll    = this._config.offset
         + scrollHeight
-        - this._scrollElement.offsetHeight
+        - this._getOffsetHeight()
 
       if (this._scrollHeight !== scrollHeight) {
         this.refresh()
@@ -213,6 +218,7 @@ const ScrollSpy = (($) => {
         if (this._activeTarget !== target) {
           this._activate(target)
         }
+        return
       }
 
       if (this._activeTarget && scrollTop < this._offsets[0]) {