uikit 3.23.12 → 3.23.13-dev.e2ca1857a

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.23.12",
+  "version": "3.23.13-dev.e2ca1857a",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

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

@@ -4,7 +4,6 @@ import {
     getCoveringElement,
     getTargetedElement,
     hasClass,
-    isSameSiteAnchor,
     isVisible,
     offset,
     offsetViewport,
@@ -32,7 +31,20 @@ export default {
     },
 
     computed: {
-        links: ({ target }, $el) => $$(target, $el).filter(isSameSiteAnchor),
+        links: {
+            get({ target }, $el) {
+                return $$(target, $el).filter(getTargetedElement);
+            },
+            observe: () => '*',
+        },
+
+        targets() {
+            return this.links.map((el) => getTargetedElement(el));
+        },
+
+        elements({ closest }) {
+            return this.links.map((el) => el.closest(closest || '*'));
+        },
     },
 
     watch: {
@@ -48,9 +60,7 @@ export default {
     update: [
         {
             read() {
-                const links = this.links.filter(getTargetedElement);
-                const targets = links.map(getTargetedElement);
-
+                const { targets } = this;
                 const { length } = targets;
 
                 if (!length || !isVisible(this.$el)) {
@@ -79,11 +89,11 @@ export default {
                     }
                 }
 
-                return { active, links };
+                return { active };
             },
 
-            write({ active, links }) {
-                const elements = links.map((el) => el.closest(this.closest || '*'));
+            write({ active }) {
+                const { elements } = this;
                 const changed = active !== false && !hasClass(elements[active], this.cls);
 
                 this.links.forEach((el) => el.blur());

package/src/js/mixin/modal.js

@@ -22,6 +22,7 @@ import { preventBackgroundScroll } from '../util/scroll';
 import Class from './class';
 import Container from './container';
 import { maybeDefaultPreventClick } from './event';
+import { storeScrollPosition } from './position';
 import Togglable from './togglable';
 
 const active = [];
@@ -193,7 +194,13 @@ export default {
                 if (!active.some((modal) => modal.clsPage === this.clsPage)) {
                     removeClass(document.documentElement, this.clsPage);
 
-                    queueMicrotask(() => isFocusable(target) && target.focus());
+                    queueMicrotask(() => {
+                        if (isFocusable(target)) {
+                            const restoreScrollPosition = storeScrollPosition(target);
+                            target.focus();
+                            restoreScrollPosition();
+                        }
+                    });
                 }
 
                 setAriaExpanded(target, false);