uikit 3.25.11-dev.e160bfb → 3.25.12-dev.bb12864

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.25.11-dev.e160bfb",
+    "version": "3.25.12-dev.bb12864",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/mixin/modal.js

@@ -23,7 +23,6 @@ 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 = [];
@@ -197,9 +196,7 @@ export default {
 
                     queueMicrotask(() => {
                         if (isFocusable(target)) {
-                            const restoreScrollPosition = storeScrollPosition(target);
-                            target.focus();
-                            restoreScrollPosition();
+                            target.focus({ preventScroll: true });
                         }
                     });
                 }

package/src/js/mixin/position.js

@@ -99,15 +99,9 @@ export function storeScrollPosition(element) {
     const scrollElement = scrollParent(element);
     const { scrollTop } = scrollElement;
 
-    const restore = () => {
+    return () => {
         if (scrollTop !== scrollElement.scrollTop) {
             scrollElement.scrollTop = scrollTop;
         }
     };
-
-    return () => {
-        restore();
-        // setTimeout is needed for iOS Safari
-        setTimeout(restore);
-    };
 }

package/src/js/mixin/togglable.js

@@ -20,7 +20,6 @@ import {
     unwrap,
     wrapInner,
 } from 'uikit-util';
-import { storeScrollPosition } from './position';
 
 export default {
     props: {
@@ -82,9 +81,9 @@ export default {
                             trigger(el, show ? 'shown' : 'hidden', [this]);
 
                             if (show) {
-                                const restoreScrollPosition = storeScrollPosition(el);
-                                $$('[autofocus]', el).find(isVisible)?.focus();
-                                restoreScrollPosition();
+                                $$('[autofocus]', el)
+                                    .find(isVisible)
+                                    ?.focus({ preventScroll: true });
                             }
                         };