uikit 3.25.26 → 3.25.27-dev.2d5695a

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.26",
+    "version": "3.25.27-dev.2d5695a",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/components/lightbox-panel.js

@@ -24,7 +24,7 @@ import {
 import { wrapInPicture } from '../core/img';
 import Modal from '../mixin/modal';
 import Slideshow from '../mixin/slideshow';
-import { keyMap } from '../util/keys';
+import { getNavigationIndex } from '../util/keys';
 import Animations from './internal/lightbox-animations';
 
 export default {
@@ -212,18 +212,7 @@ export default {
                     return;
                 }
 
-                let i = -1;
-
-                if (keyCode === keyMap.LEFT) {
-                    i = 'previous';
-                } else if (keyCode === keyMap.RIGHT) {
-                    i = 'next';
-                } else if (keyCode === keyMap.HOME) {
-                    i = 0;
-                } else if (keyCode === keyMap.END) {
-                    i = 'last';
-                }
-
+                const i = getNavigationIndex(keyCode);
                 if (~i) {
                     this.show(i);
                 }

package/src/js/core/dropnav.js

@@ -29,7 +29,7 @@ import {
 } from 'uikit-util';
 import Class from '../mixin/class';
 import Container from '../mixin/container';
-import { keyMap } from '../util/keys';
+import { getNavigationIndex, keyMap } from '../util/keys';
 import { active } from './drop';
 
 export default {
@@ -200,20 +200,7 @@ export default {
                 }
 
                 const active = this.getActive();
-                let next = -1;
-
-                if (keyCode === keyMap.HOME) {
-                    next = 0;
-                } else if (keyCode === keyMap.END) {
-                    next = 'last';
-                } else if (keyCode === keyMap.UP) {
-                    next = 'previous';
-                } else if (keyCode === keyMap.DOWN) {
-                    next = 'next';
-                } else if (keyCode === keyMap.ESC) {
-                    active.targetEl?.focus();
-                }
-
+                const next = getNavigationIndex(keyCode, keyMap.UP, keyMap.DOWN);
                 if (~next) {
                     e.preventDefault();
                     const elements = $$(selFocusable, current);
@@ -227,6 +214,10 @@ export default {
                     return;
                 }
 
+                if (keyCode === keyMap.ESC) {
+                    active.targetEl?.focus();
+                }
+
                 handleNavItemNavigation(e, this.items, active);
             },
         },
@@ -417,25 +408,15 @@ export default {
 
 function handleNavItemNavigation(e, toggles, active) {
     const { current, keyCode } = e;
-    let next = -1;
-
-    if (keyCode === keyMap.HOME) {
-        next = 0;
-    } else if (keyCode === keyMap.END) {
-        next = 'last';
-    } else if (keyCode === keyMap.LEFT) {
-        next = 'previous';
-    } else if (keyCode === keyMap.RIGHT) {
-        next = 'next';
-    } else if (keyCode === keyMap.TAB) {
-        active.targetEl?.focus();
-        active.hide?.(false);
-    }
+    const next = getNavigationIndex(keyCode);
 
     if (~next) {
         e.preventDefault();
         active.hide?.(false);
         toggles[getIndex(next, toggles, toggles.indexOf(active.targetEl || current))].focus();
+    } else if (keyCode === keyMap.TAB) {
+        active.targetEl?.focus();
+        active.hide?.(false);
     }
 }
 

package/src/js/core/switcher.js

@@ -19,7 +19,7 @@ import { generateId } from '../api/instance';
 import { lazyload, swipe } from '../api/observables';
 import { maybeDefaultPreventClick } from '../mixin/event';
 import Togglable from '../mixin/togglable';
-import { keyMap } from '../util/keys';
+import { getNavigationIndex, keyMap } from '../util/keys';
 
 const selDisabled = '.uk-disabled *, .uk-disabled, [disabled]';
 
@@ -126,18 +126,11 @@ export default {
                 const { current, keyCode } = e;
                 const isVertical = matches(this.$el, this.selVertical);
 
-                let i =
-                    keyCode === keyMap.HOME
-                        ? 0
-                        : keyCode === keyMap.END
-                          ? 'last'
-                          : (keyCode === keyMap.LEFT && !isVertical) ||
-                              (keyCode === keyMap.UP && isVertical)
-                            ? 'previous'
-                            : (keyCode === keyMap.RIGHT && !isVertical) ||
-                                (keyCode === keyMap.DOWN && isVertical)
-                              ? 'next'
-                              : -1;
+                const i = getNavigationIndex(
+                    keyCode,
+                    isVertical ? keyMap.UP : keyMap.LEFT,
+                    isVertical ? keyMap.DOWN : keyMap.RIGHT,
+                );
 
                 if (~i) {
                     e.preventDefault();

package/src/js/mixin/slider-nav.js

@@ -15,7 +15,7 @@ import {
     toggleClass,
 } from 'uikit-util';
 import { generateId } from '../api/instance';
-import { keyMap } from '../util/keys';
+import { getNavigationIndex, keyMap } from '../util/keys';
 import { maybeDefaultPreventClick } from './event';
 
 export default {
@@ -175,17 +175,7 @@ export default {
                     return;
                 }
 
-                let i =
-                    keyCode === keyMap.HOME
-                        ? 0
-                        : keyCode === keyMap.END
-                          ? 'last'
-                          : keyCode === keyMap.LEFT
-                            ? 'previous'
-                            : keyCode === keyMap.RIGHT
-                              ? 'next'
-                              : -1;
-
+                const i = getNavigationIndex(keyCode);
                 if (~i) {
                     e.preventDefault();
                     this.show(i);

package/src/js/util/keys.js

@@ -10,3 +10,17 @@ export const keyMap = {
     RIGHT: 39,
     DOWN: 40,
 };
+
+export function getNavigationIndex(keyCode, previousKey = keyMap.LEFT, nextKey = keyMap.RIGHT) {
+    switch (keyCode) {
+        case keyMap.HOME:
+            return 0;
+        case keyMap.END:
+            return 'last';
+        case previousKey:
+            return 'previous';
+        case nextKey:
+            return 'next';
+    }
+    return -1;
+}