uikit 3.23.6-dev.99eccf626 → 3.23.6-dev.eb1cbd14e

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.6-dev.99eccf626",
+  "version": "3.23.6-dev.eb1cbd14e",
   "main": "dist/js/uikit.js",
   "style": "dist/css/uikit.css",
   "sideEffects": [

package/src/js/components/filter.js

@@ -19,6 +19,7 @@ import {
 } from 'uikit-util';
 import { parseOptions } from '../api/options';
 import Animate from '../mixin/animate';
+import { maybeDefautPreventClick } from '../mixin/event';
 import { keyMap } from '../util/keys';
 
 export default {
@@ -79,7 +80,7 @@ export default {
             }
 
             if (e.target.closest('a,button')) {
-                e.preventDefault();
+                maybeDefautPreventClick(e);
                 this.apply(e.current);
             }
         },

package/src/js/components/notification.js

@@ -12,6 +12,7 @@ import {
     trigger,
 } from 'uikit-util';
 import Container from '../mixin/container';
+import { maybeDefautPreventClick } from '../mixin/event';
 
 export default {
     mixins: [Container],
@@ -78,9 +79,7 @@ export default {
 
     events: {
         click(e) {
-            if (e.target.closest('a[href="#"],a[href=""]')) {
-                e.preventDefault();
-            }
+            maybeDefautPreventClick(e);
             this.close();
         },
 

package/src/js/components/sortable.js

@@ -25,6 +25,7 @@ import {
     pointInRect,
     remove,
     removeClass,
+    resetProps,
     scrollParents,
     toggleClass,
     Transition,
@@ -95,8 +96,9 @@ export default {
         },
 
         handles(handles, prev) {
-            css(prev, { touchAction: '', userSelect: '' });
-            css(handles, { touchAction: 'none', userSelect: 'none' });
+            const props = { touchAction: 'none', userSelect: 'none' };
+            resetProps(prev, props);
+            css(handles, props);
         },
     },
 

package/src/js/core/accordion.js

@@ -22,6 +22,7 @@ import {
 import { generateId } from '../api/instance';
 import { lazyload } from '../api/observables';
 import Class from '../mixin/class';
+import { maybeDefautPreventClick } from '../mixin/event';
 import Togglable from '../mixin/togglable';
 import { keyMap } from '../util/keys';
 
@@ -108,7 +109,7 @@ export default {
                     return;
                 }
 
-                e.preventDefault();
+                maybeDefautPreventClick(e);
 
                 this._off?.();
                 this._off = keepScrollPosition(e.target);

package/src/js/core/alert.js

@@ -1,5 +1,6 @@
 import { css, toFloat, Transition } from 'uikit-util';
 import Class from '../mixin/class';
+import { maybeDefautPreventClick } from '../mixin/event';
 import Togglable from '../mixin/togglable';
 
 export default {
@@ -24,7 +25,7 @@ export default {
         delegate: ({ selClose }) => selClose,
 
         handler(e) {
-            e.preventDefault();
+            maybeDefautPreventClick(e);
             this.close();
         },
     },

package/src/js/core/drop.js

@@ -29,6 +29,7 @@ import {
     removeClass,
 } from 'uikit-util';
 import Container from '../mixin/container';
+import { maybeDefautPreventClick } from '../mixin/event';
 import Position, { storeScrollPosition } from '../mixin/position';
 import Togglable from '../mixin/togglable';
 import { keyMap } from '../util/keys';
@@ -80,6 +81,7 @@ export default {
         cls: 'uk-open',
         container: false,
         closeOnScroll: false,
+        selClose: '.uk-drop-close',
     },
 
     computed: {
@@ -131,10 +133,10 @@ export default {
         {
             name: 'click',
 
-            delegate: () => '.uk-drop-close',
+            delegate: ({ selClose }) => selClose,
 
             handler(e) {
-                e.preventDefault();
+                maybeDefautPreventClick(e);
                 this.hide(false);
             },
         },

package/src/js/core/modal.js

@@ -96,7 +96,7 @@ function install({ modal }) {
                 isString(message) ? message : html(message)
             }</div>
             <div class="uk-modal-footer uk-text-right">
-                <button class="uk-button uk-button-primary uk-modal-close" autofocus>${
+                <button class="uk-button uk-button-primary uk-modal-close" type="button" autofocus>${
                     i18n.ok
                 }</button>
             </div>`,

package/src/js/core/switcher.js

@@ -18,6 +18,7 @@ import {
 } from 'uikit-util';
 import { generateId } from '../api/instance';
 import { lazyload, swipe } from '../api/observables';
+import { maybeDefautPreventClick } from '../mixin/event';
 import Togglable from '../mixin/togglable';
 import { keyMap } from '../util/keys';
 
@@ -111,7 +112,7 @@ export default {
                     !matches(e.current, selDisabled) &&
                     (e.type === 'click' || e.keyCode === keyMap.SPACE)
                 ) {
-                    e.preventDefault();
+                    maybeDefautPreventClick(e);
                     this.show(e.current);
                 }
             },
@@ -161,7 +162,7 @@ export default {
 
             handler(e) {
                 if (e.target.closest('a,button')) {
-                    e.preventDefault();
+                    maybeDefautPreventClick(e);
                     this.show(data(e.current, this.attrItem));
                 }
             },

package/src/js/mixin/event.js

@@ -0,0 +1,5 @@
+export function maybeDefautPreventClick(e) {
+    if (e.target.closest('a[href="#"],a[href=""]')) {
+        e.preventDefault();
+    }
+}

package/src/js/mixin/internal/animate-fade.js

@@ -7,6 +7,7 @@ import {
     isVisible,
     once,
     removeClass,
+    resetProps,
     toNumber,
     Transition,
 } from 'uikit-util';
@@ -20,7 +21,8 @@ export default function fade(action, target, duration, stagger = 0) {
     const propsIn = { opacity: 1 };
     const propsOut = { opacity: 0 };
 
-    const wrapIndexFn = (fn) => () => (index === transitionIndex(target) ? fn() : Promise.reject());
+    const isCurrentIndex = () => index === transitionIndex(target);
+    const wrapIndexFn = (fn) => () => (isCurrentIndex() ? fn() : Promise.reject());
 
     const leaveFn = wrapIndexFn(async () => {
         addClass(target, clsLeave);
@@ -65,7 +67,9 @@ export default function fade(action, target, duration, stagger = 0) {
             transitions = nodes.map(async (child, i) => {
                 await awaitTimeout(i * stagger);
                 await Transition.start(child, propsIn, duration / 2, 'ease');
-                css(child, { opacity: '' });
+                if (isCurrentIndex()) {
+                    resetProps(child, propsIn);
+                }
             });
 
             targetDuration += nodes.length * stagger;
@@ -79,8 +83,8 @@ export default function fade(action, target, duration, stagger = 0) {
         await Promise.all(transitions);
 
         removeClass(target, clsEnter);
-        if (index === transitionIndex(target)) {
-            css(target, { height: '', alignContent: '', opacity: '' });
+        if (isCurrentIndex()) {
+            resetProps(target, { height: '', alignContent: '', ...propsIn });
             delete target.dataset.transition;
         }
     });

package/src/js/mixin/internal/animate-slide.js

@@ -8,6 +8,7 @@ import {
     isVisible,
     parent,
     position,
+    resetProps,
     Transition,
     trigger,
 } from 'uikit-util';
@@ -127,12 +128,6 @@ function getTransitionProps(target, nodes, currentProps) {
     return [propsTo, propsFrom];
 }
 
-function resetProps(el, props) {
-    for (const prop in props) {
-        css(el, prop, '');
-    }
-}
-
 function getPositionWithMargin(el) {
     const { height, width } = dimensions(el);
 

package/src/js/mixin/internal/slideshow-transitioner.js

@@ -1,4 +1,4 @@
-import { clamp, createEvent, css, noop, Transition, trigger } from 'uikit-util';
+import { clamp, createEvent, css, noop, resetProps, Transition, trigger } from 'uikit-util';
 
 export default function Transitioner(prev, next, dir, { animation, easing }) {
     const { percent, translate, show = noop } = animation;
@@ -34,9 +34,7 @@ export default function Transitioner(prev, next, dir, { animation, easing }) {
         },
 
         reset() {
-            for (const prop in props[0]) {
-                css([next, prev], prop, '');
-            }
+            resetProps([next, prev], props[0]);
         },
 
         async forward(duration, percent = this.percent()) {

package/src/js/mixin/modal.js

@@ -22,6 +22,7 @@ import {
 import { preventBackgroundScroll } from '../util/scroll';
 import Class from './class';
 import Container from './container';
+import { maybeDefautPreventClick } from './event';
 import Togglable from './togglable';
 
 const active = [];
@@ -86,7 +87,7 @@ export default {
                 ) {
                     this.hide();
                 } else if (matches(current, this.selClose)) {
-                    e.preventDefault();
+                    maybeDefautPreventClick(e);
                     this.hide();
                 }
             },

package/src/js/mixin/parallax.js

@@ -9,6 +9,7 @@ import {
     noop,
     once,
     propName,
+    resetProps,
     toFloat,
     toPx,
     trigger,
@@ -71,9 +72,7 @@ export default {
 
     methods: {
         reset() {
-            for (const prop in this.getCss(0)) {
-                css(this.$el, prop, '');
-            }
+            resetProps(this.$el, this.getCss(0));
         },
 
         getCss(percent) {

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

@@ -16,6 +16,7 @@ import {
 } from 'uikit-util';
 import { generateId } from '../api/instance';
 import { keyMap } from '../util/keys';
+import { maybeDefautPreventClick } from './event';
 
 export default {
     i18n: {
@@ -151,7 +152,7 @@ export default {
                     e.target.closest('a,button') &&
                     (e.type === 'click' || e.keyCode === keyMap.SPACE)
                 ) {
-                    e.preventDefault();
+                    maybeDefautPreventClick(e);
                     this.show(data(e.current, this.attrItem));
                 }
             },

package/src/js/util/animation.js

@@ -1,7 +1,7 @@
 import { addClass, hasClass, removeClass } from './class';
 import { once, trigger } from './event';
 import { toNodes } from './lang';
-import { css, propName } from './style';
+import { css, propName, resetProps } from './style';
 
 const clsTransition = 'uk-transition';
 const transitionEnd = 'transitionend';
@@ -26,23 +26,19 @@ function transition(element, props, duration = 400, timing = 'linear') {
                         ({ type }) => {
                             clearTimeout(timer);
                             removeClass(element, clsTransition);
-                            css(element, {
-                                transitionProperty: '',
-                                transitionDuration: '',
-                                transitionTimingFunction: '',
-                            });
+                            resetProps(element, transitionProps);
                             type === transitionCanceled ? reject() : resolve(element);
                         },
                         { self: true },
                     );
 
                     addClass(element, clsTransition);
-                    css(element, {
+                    const transitionProps = {
                         transitionProperty: Object.keys(props).map(propName).join(','),
                         transitionDuration: `${duration}ms`,
                         transitionTimingFunction: timing,
-                        ...props,
-                    });
+                    };
+                    css(element, { ...transitionProps, ...props });
                 }),
         ),
     );

package/src/js/util/scroll.js

@@ -1,4 +1,4 @@
-import { css, getEventPos, matches, on, once, scrollParents, width } from 'uikit-util';
+import { css, getEventPos, matches, on, once, resetProps, scrollParents, width } from 'uikit-util';
 
 let prevented;
 export function preventBackgroundScroll(el) {
@@ -50,14 +50,15 @@ export function preventBackgroundScroll(el) {
     prevented = true;
 
     const { scrollingElement } = document;
-    css(scrollingElement, {
+    const props = {
         overflowY: CSS.supports('overflow', 'clip') ? 'clip' : 'hidden',
         touchAction: 'none',
         paddingRight: width(window) - scrollingElement.clientWidth || '',
-    });
+    };
+    css(scrollingElement, props);
     return () => {
         prevented = false;
         off();
-        css(scrollingElement, { overflowY: '', touchAction: '', paddingRight: '' });
+        resetProps(scrollingElement, props);
     };
 }

package/src/js/util/style.js

@@ -63,6 +63,12 @@ export function css(element, property, value, priority) {
     return elements[0];
 }
 
+export function resetProps(element, props) {
+    for (const prop in props) {
+        css(element, prop, '');
+    }
+}
+
 // https://drafts.csswg.org/cssom/#dom-cssstyledeclaration-setproperty
 export const propName = memoize((name) => {
     if (startsWith(name, '--')) {