uikit 3.17.4 → 3.17.5-dev.563196f5e

package/package.json

@@ -2,7 +2,7 @@
   "name": "uikit",
   "title": "UIkit",
   "description": "UIkit is a lightweight and modular front-end framework for developing fast and powerful web interfaces.",
-  "version": "3.17.4",
+  "version": "3.17.5-dev.563196f5e",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/scrollspy-nav.js

@@ -1,7 +1,7 @@
 import {
     $$,
     closest,
-    css,
+    getCoveringElement,
     getTargetedElement,
     hasClass,
     isSameSiteAnchor,
@@ -70,7 +70,7 @@ export default {
                     active = length - 1;
                 } else {
                     for (let i = 0; i < targets.length; i++) {
-                        const fixedEl = findFixedElement(targets[i]);
+                        const fixedEl = getCoveringElement(targets[i]);
                         const offsetBy = this.offset + (fixedEl ? offset(fixedEl).height : 0);
                         if (offset(targets[i]).top - viewport.top - offsetBy > 0) {
                             break;
@@ -103,9 +103,3 @@ export default {
         },
     ],
 };
-
-function findFixedElement(target) {
-    return target.ownerDocument
-        .elementsFromPoint(offset(target).left, 1)
-        .find((el) => ['fixed', 'sticky'].includes(css(el, 'position')) && !el.contains(target));
-}

package/src/js/util/viewport.js

@@ -1,5 +1,5 @@
 import { offset, offsetPosition } from './dimensions';
-import { isVisible, parents } from './filter';
+import { isVisible, parents, within } from './filter';
 import {
     clamp,
     findIndex,
@@ -79,8 +79,8 @@ export function scrollIntoView(element, { offset: offsetBy = 0 } = {}) {
                 let diff = 0;
                 if (parents[0] === element && scroll + top < maxScroll) {
                     diff = offset(targetEl).top - targetTop;
-                    const fixedEl = findFixedElement(targetEl);
-                    diff -= fixedEl ? offset(fixedEl).height : 0;
+                    const coverEl = getCoveringElement(targetEl);
+                    diff -= coverEl ? offset(coverEl).height : 0;
                 }
 
                 element.scrollTop = Math[top + diff > 0 ? 'max' : 'min'](
@@ -107,14 +107,6 @@ export function scrollIntoView(element, { offset: offsetBy = 0 } = {}) {
     function ease(k) {
         return 0.5 * (1 - Math.cos(Math.PI * k));
     }
-
-    function findFixedElement(target) {
-        return target.ownerDocument
-            .elementsFromPoint(offset(target).left, 0)
-            .find(
-                (el) => ['fixed', 'sticky'].includes(css(el, 'position')) && !el.contains(target),
-            );
-    }
 }
 
 export function scrolledOver(element, startOffset = 0, endOffset = 0) {
@@ -206,6 +198,17 @@ export function offsetViewport(scrollElement) {
     return rect;
 }
 
+export function getCoveringElement(target) {
+    return target.ownerDocument
+        .elementsFromPoint(offset(target).left, 0)
+        .find(
+            (el) =>
+                !el.contains(target) &&
+                (css(el, 'position') === 'fixed' ||
+                    (css(el, 'position') === 'sticky' && within(target, el.parentElement))),
+        );
+}
+
 function scrollingElement(element) {
     return toWindow(element).document.scrollingElement;
 }