uikit 3.16.17-dev.d72bbb079 → 3.16.18-dev.4ae70ea68

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.16.17-dev.d72bbb079",
+  "version": "3.16.18-dev.4ae70ea68",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/core/dropnav.js

@@ -9,7 +9,6 @@ import {
     css,
     findIndex,
     getIndex,
-    hasAttr,
     hasClass,
     height,
     includes,
@@ -18,7 +17,6 @@ import {
     noop,
     observeResize,
     offset,
-    once,
     parents,
     query,
     remove,
@@ -159,6 +157,8 @@ export default {
         {
             name: 'keydown',
 
+            self: true,
+
             delegate() {
                 return this.selNavItem;
             },
@@ -167,17 +167,9 @@ export default {
                 const { current, keyCode } = e;
                 const active = this.getActive();
 
-                if (keyCode === keyMap.DOWN && hasAttr(current, 'aria-expanded')) {
+                if (keyCode === keyMap.DOWN && active?.targetEl === current) {
                     e.preventDefault();
-
-                    if (!active || active.targetEl !== current) {
-                        current.click();
-                        once(this.dropContainer, 'show', ({ target }) =>
-                            focusFirstFocusableElement(target)
-                        );
-                    } else {
-                        focusFirstFocusableElement(active.$el);
-                    }
+                    $(selFocusable, active.$el)?.focus();
                 }
 
                 handleNavItemNavigation(e, this.items, active);
@@ -428,9 +420,3 @@ function handleNavItemNavigation(e, toggles, active) {
         toggles[getIndex(next, toggles, toggles.indexOf(active.targetEl || current))].focus();
     }
 }
-
-function focusFirstFocusableElement(el) {
-    if (!$(':focus', el)) {
-        $(selFocusable, el)?.focus();
-    }
-}

package/src/js/core/modal.js

@@ -61,7 +61,7 @@ function install({ modal }) {
             `<div class="uk-modal">
                 <div class="uk-modal-dialog">${content}</div>
              </div>`,
-            options
+            { stack: true, role: 'alertdialog', ...options }
         );
 
         dialog.show();
@@ -110,7 +110,7 @@ function install({ modal }) {
     };
 
     modal.prompt = function (message, value, options) {
-        return openDialog(
+        const promise = openDialog(
             ({ i18n }) => `<form class="uk-form-stacked">
                 <div class="uk-modal-body">
                     <label>${isString(message) ? message : html(message)}</label>
@@ -125,8 +125,14 @@ function install({ modal }) {
             </form>`,
             options,
             () => null,
-            (dialog) => $('input', dialog.$el).value
+            () => input.value
         );
+
+        const { $el } = promise.dialog;
+        const input = $('input', $el);
+        on($el, 'show', () => input.select());
+
+        return promise;
     };
 
     modal.i18n = {
@@ -138,7 +144,6 @@ function install({ modal }) {
         options = {
             bgClose: false,
             escClose: true,
-            role: 'alertdialog',
             ...options,
             i18n: { ...modal.i18n, ...options?.i18n },
         };