uikit 3.14.2-dev.f917389f5 → 3.14.3-dev.68d38eb6d

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.14.2-dev.f917389f5",
+    "version": "3.14.3-dev.68d38eb6d",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

package/src/js/components/parallax.js

@@ -73,6 +73,21 @@ export default {
     },
 };
 
+/*
+ * Inspired by https://gist.github.com/gre/1650294?permalink_comment_id=3477425#gistcomment-3477425
+ *
+ * linear: 0
+ * easeInSine: 0.5
+ * easeOutSine: -0.5
+ * easeInQuad: 1
+ * easeOutQuad: -1
+ * easeInCubic: 2
+ * easeOutCubic: -2
+ * easeInQuart: 3
+ * easeOutQuart: -3
+ * easeInQuint: 4
+ * easeOutQuint: -4
+ */
 function ease(percent, easing) {
     return easing >= 0 ? Math.pow(percent, easing + 1) : 1 - Math.pow(1 - percent, 1 - easing);
 }

package/src/js/core/accordion.js

@@ -1,6 +1,6 @@
 import Class from '../mixin/class';
 import Lazyload from '../mixin/lazyload';
-import { default as Togglable, toggleHeight } from '../mixin/togglable';
+import { slide, default as Togglable } from '../mixin/togglable';
 import {
     $,
     $$,
@@ -34,7 +34,7 @@ export default {
     data: {
         targets: '> *',
         active: false,
-        animation: [true],
+        animation: ['slide'],
         collapsible: true,
         multiple: false,
         clsOpen: 'uk-open',
@@ -144,7 +144,7 @@ export default {
                     }
 
                     hide(content, false);
-                    await toggleHeight(this)(el._wrapper, show);
+                    await slide(this)(el._wrapper, show);
                     hide(content, !show);
 
                     delete el._wrapper;

package/src/js/core/alert.js

@@ -11,7 +11,7 @@ export default {
     },
 
     data: {
-        animation: [true],
+        animation: ['slide'],
         selClose: '.uk-alert-close',
         duration: 150,
         hideProps: { opacity: 0, ...Togglable.data.hideProps },

package/src/js/core/drop.js

@@ -8,7 +8,6 @@ import {
     apply,
     attr,
     css,
-    getCssVar,
     hasClass,
     includes,
     isTouch,
@@ -16,6 +15,7 @@ import {
     MouseTracker,
     observeResize,
     offset,
+    offsetViewport,
     on,
     once,
     parent,
@@ -28,7 +28,6 @@ import {
     removeClass,
     scrollParents,
     toggleClass,
-    toPx,
     within,
 } from 'uikit-util';
 
@@ -48,6 +47,7 @@ export default {
         delayHide: Number,
         display: String,
         clsDrop: String,
+        animateOut: Boolean,
     },
 
     data: {
@@ -62,6 +62,7 @@ export default {
         animation: ['uk-animation-fade'],
         cls: 'uk-open',
         container: false,
+        animateOut: false,
     },
 
     created() {
@@ -249,7 +250,7 @@ export default {
                         }
                     }),
 
-                    ...(this.display === 'static'
+                    ...(this.display === 'static' && this.align !== 'stretch'
                         ? []
                         : (() => {
                               const handler = () => this.$emit();
@@ -310,7 +311,7 @@ export default {
     methods: {
         show(target = this.target, delay = true) {
             if (this.isToggled() && target && this.target && target !== this.target) {
-                this.hide(false);
+                this.hide(false, false);
             }
 
             this.target = target;
@@ -330,7 +331,7 @@ export default {
                 let prev;
                 while (active && prev !== active && !within(this.$el, active.$el)) {
                     prev = active;
-                    active.hide(false);
+                    active.hide(false, false);
                 }
             }
 
@@ -344,8 +345,8 @@ export default {
             );
         },
 
-        hide(delay = true) {
-            const hide = () => this.toggleElement(this.$el, false, false);
+        hide(delay = true, animate = true) {
+            const hide = () => this.toggleElement(this.$el, false, this.animateOut && animate);
 
             this.clearTimers();
 
@@ -377,40 +378,59 @@ export default {
         position() {
             removeClass(this.$el, `${this.clsDrop}-stack`);
             toggleClass(this.$el, `${this.clsDrop}-boundary`, this.boundaryAlign);
+            toggleClass(this.$el, `${this.clsDrop}-stretch`, this.align === 'stretch');
 
             const boundary = query(this.boundary, this.$el);
-            const scrollParentOffset = offset(
-                scrollParents(boundary && this.boundaryAlign ? boundary : this.$el)[0]
+            const target = boundary && this.boundaryAlign ? boundary : this.target;
+            const [scrollParent] = scrollParents(
+                boundary && this.boundaryAlign ? boundary : this.$el
             );
+            const scrollParentOffset = offset(scrollParent);
             const boundaryOffset = boundary ? offset(boundary) : scrollParentOffset;
+            const viewportOffset = this.getViewportOffset(this.$el);
 
             css(this.$el, 'maxWidth', '');
-            const maxWidth =
-                scrollParentOffset.width -
-                2 * toPx(getCssVar('position-viewport-offset', this.$el));
+            const maxWidth = scrollParentOffset.width - 2 * viewportOffset;
 
-            if (this.pos[1] === 'justify') {
+            if (this.align === 'justify') {
                 const prop = this.axis === 'y' ? 'width' : 'height';
                 css(
                     this.$el,
                     prop,
                     Math.min(
                         (boundary ? boundaryOffset : offset(this.target))[prop],
-                        scrollParentOffset[prop] -
-                            2 * toPx(getCssVar('position-viewport-offset', this.$el))
+                        scrollParentOffset[prop] - 2 * viewportOffset
                     )
                 );
+            } else if (this.align === 'stretch') {
+                this.flip = this.axis === 'y' ? 'x' : 'y';
+                this.display = 'static';
+
+                const viewport = offsetViewport(scrollParent);
+                const targetDim = offset(target);
+                const elOffset = Math.abs(this.getPositionOffset(this.$el)) + viewportOffset;
+
+                css(this.$el, {
+                    width:
+                        this.axis === 'y'
+                            ? viewport.width
+                            : (this.dir === 'left'
+                                  ? targetDim.left - viewport.left
+                                  : viewport.right - targetDim.right) - elOffset,
+                    height:
+                        this.axis === 'x'
+                            ? viewport.height
+                            : (this.dir === 'top'
+                                  ? targetDim.top - viewport.top
+                                  : viewport.bottom - targetDim.bottom) - elOffset,
+                });
             } else if (this.$el.offsetWidth > maxWidth) {
                 addClass(this.$el, `${this.clsDrop}-stack`);
             }
 
             css(this.$el, 'maxWidth', maxWidth);
 
-            this.positionAt(
-                this.$el,
-                boundary && this.boundaryAlign ? boundary : this.target,
-                boundary
-            );
+            this.positionAt(this.$el, target, boundary);
         },
     },
 };

package/src/js/core/height-viewport.js

@@ -4,12 +4,13 @@ import {
     css,
     dimensions,
     endsWith,
-    height,
     isNumeric,
     isString,
     isVisible,
-    offset,
+    offsetPosition,
+    offsetViewport,
     query,
+    scrollParents,
     toFloat,
 } from 'uikit-util';
 
@@ -32,7 +33,7 @@ export default {
 
     resizeTargets() {
         // check for offsetTop change
-        return [this.$el, document.documentElement];
+        return [this.$el, ...scrollParents(this.$el, /auto|scroll/)];
     },
 
     update: {
@@ -44,21 +45,25 @@ export default {
             let minHeight = '';
             const box = boxModelAdjust(this.$el, 'height', 'content-box');
 
+            const [scrollElement] = scrollParents(this.$el, /auto|scroll/);
+            const { height: viewportHeight } = offsetViewport(scrollElement);
+
             if (this.expand) {
                 minHeight = Math.max(
-                    height(window) -
-                        (dimensions(document.documentElement).height -
-                            dimensions(this.$el).height) -
+                    viewportHeight -
+                        (dimensions(scrollElement).height - dimensions(this.$el).height) -
                         box,
                     0
                 );
             } else {
                 // on mobile devices (iOS and Android) window.innerHeight !== 100vh
-                minHeight = 'calc(100vh';
+                minHeight = `calc(${
+                    document.scrollingElement === scrollElement ? '100vh' : `${viewportHeight}px`
+                }`;
 
                 if (this.offsetTop) {
-                    const { top } = offset(this.$el);
-                    minHeight += top > 0 && top < height(window) / 2 ? ` - ${top}px` : '';
+                    const top = offsetPosition(this.$el)[0] - offsetPosition(scrollElement)[0];
+                    minHeight += top > 0 && top < viewportHeight / 2 ? ` - ${top}px` : '';
                 }
 
                 if (this.offsetBottom === true) {

package/src/js/core/navbar.js

@@ -13,9 +13,9 @@ import {
     height,
     includes,
     isRtl,
-    isVisible,
     matches,
     noop,
+    observeResize,
     offset,
     once,
     parent,
@@ -285,8 +285,8 @@ export default {
                 return this.dropbar;
             },
 
-            handler(_, { $el }) {
-                if (!hasClass($el, this.clsDrop)) {
+            handler(_, { $el, align }) {
+                if (!hasClass($el, this.clsDrop) || align === 'stretch') {
                     return;
                 }
 
@@ -309,19 +309,19 @@ export default {
                 return this.dropbar;
             },
 
-            handler(_, { $el, pos: [dir] = [] }) {
-                if (!hasClass($el, this.clsDrop)) {
+            handler(_, { $el, align }) {
+                if (!hasClass($el, this.clsDrop) || align === 'stretch') {
                     return;
                 }
 
-                if (dir === 'bottom') {
+                this._observer = observeResize($el, () =>
                     this.transitionTo(
                         offset($el).bottom -
                             offset(this.dropbar).top +
                             toFloat(css($el, 'marginBottom')),
                         $el
-                    );
-                }
+                    )
+                );
             },
         },
 
@@ -360,11 +360,13 @@ export default {
                 return this.dropbar;
             },
 
-            handler(_, { $el }) {
-                if (!hasClass($el, this.clsDrop)) {
+            handler(_, { $el, align }) {
+                if (!hasClass($el, this.clsDrop) || align === 'stretch') {
                     return;
                 }
 
+                this._observer.disconnect();
+
                 const active = this.getActive();
 
                 if (!active || active?.$el === $el) {
@@ -381,28 +383,27 @@ export default {
 
         transitionTo(newHeight, el) {
             const { dropbar } = this;
-            const oldHeight = isVisible(dropbar) ? height(dropbar) : 0;
+            const oldHeight = height(dropbar);
 
             el = oldHeight < newHeight && el;
 
-            css(el, 'clip', `rect(0,${el.offsetWidth}px,${oldHeight}px,0)`);
+            css(el, 'clipPath', `polygon(0 0,100% 0,100% ${oldHeight}px,0 ${oldHeight}px)`);
 
             height(dropbar, oldHeight);
 
             Transition.cancel([el, dropbar]);
-            return Promise.all([
+            Promise.all([
                 Transition.start(dropbar, { height: newHeight }, this.duration),
                 Transition.start(
                     el,
-                    { clip: `rect(0,${el.offsetWidth}px,${newHeight}px,0)` },
+                    {
+                        clipPath: `polygon(0 0,100% 0,100% ${newHeight}px,0 ${newHeight}px)`,
+                    },
                     this.duration
                 ),
             ])
                 .catch(noop)
-                .then(() => {
-                    css(el, { clip: '' });
-                    this.$update(dropbar);
-                });
+                .then(() => css(el, { clipPath: '' }));
         },
 
         getDropdown(el) {

package/src/js/core/scrollspy.js

@@ -128,6 +128,10 @@ export default {
         toggle(el, inview) {
             const state = this._data.elements.get(el);
 
+            if (!state) {
+                return;
+            }
+
             state.off?.();
 
             css(el, 'visibility', !inview && this.hidden ? 'hidden' : '');

package/src/js/core/toggle.js

@@ -77,6 +77,8 @@ export default {
             },
 
             handler(e) {
+                this._preventClick = null;
+
                 if (!isTouch(e) || this._showState) {
                     return;
                 }
@@ -163,6 +165,7 @@ export default {
             handler(e) {
                 let link;
                 if (
+                    this._preventClick ||
                     closest(e.target, 'a[href="#"], a[href=""]') ||
                     ((link = closest(e.target, 'a[href]')) &&
                         (attr(this.$el, 'aria-expanded') !== 'true' ||
@@ -171,15 +174,9 @@ export default {
                     e.preventDefault();
                 }
 
-                if (this._preventClick) {
-                    return (this._preventClick = null);
-                }
-
-                if (!includes(this.mode, 'click')) {
-                    return;
+                if (!this._preventClick && includes(this.mode, 'click')) {
+                    this.toggle();
                 }
-
-                this.toggle();
             },
         },
 

package/src/js/mixin/parallax.js

@@ -47,12 +47,17 @@ export default {
 
     computed: {
         props(properties, $el) {
-            return keys(props).reduce((result, prop) => {
-                if (!isUndefined(properties[prop])) {
-                    result[prop] = props[prop](prop, $el, properties[prop].slice());
+            const stops = {};
+            for (const prop in properties) {
+                if (prop in props && !isUndefined(properties[prop])) {
+                    stops[prop] = properties[prop].slice();
                 }
-                return result;
-            }, {});
+            }
+            const result = {};
+            for (const prop in stops) {
+                result[prop] = props[prop](prop, $el, stops[prop], stops);
+            }
+            return result;
         },
     },
 
@@ -181,58 +186,66 @@ function strokeFn(prop, el, stops) {
     };
 }
 
-function backgroundFn(prop, el, stops) {
+function backgroundFn(prop, el, stops, props) {
     if (stops.length === 1) {
         stops.unshift(0);
     }
 
-    prop = prop.substr(-1);
-    const attr = prop === 'y' ? 'height' : 'width';
-    stops = parseStops(stops, (stop) => toPx(stop, attr, el));
+    const attr = prop === 'bgy' ? 'height' : 'width';
+    props[prop] = parseStops(stops, (stop) => toPx(stop, attr, el));
+
+    const bgProps = ['bgx', 'bgy'].filter((prop) => prop in props);
+    if (bgProps.length === 2 && prop === 'bgx') {
+        return noop;
+    }
+
+    if (getCssValue(el, 'backgroundSize', '') === 'cover') {
+        return backgroundCoverFn(prop, el, stops, props);
+    }
 
-    const bgPos = getCssValue(el, `background-position-${prop}`, '');
+    const positions = {};
+    for (const prop of bgProps) {
+        positions[prop] = getBackgroundPos(el, prop);
+    }
 
-    return getCssValue(el, 'backgroundSize', '') === 'cover'
-        ? backgroundCoverFn(prop, el, stops, bgPos, attr)
-        : setBackgroundPosFn(prop, stops, bgPos);
+    return setBackgroundPosFn(bgProps, positions, props);
 }
 
-function backgroundCoverFn(prop, el, stops, bgPos, attr) {
+function backgroundCoverFn(prop, el, stops, props) {
     const dimImage = getBackgroundImageDimensions(el);
 
     if (!dimImage.width) {
         return noop;
     }
 
-    const values = stops.map(([value]) => value);
-    const min = Math.min(...values);
-    const max = Math.max(...values);
-    const down = values.indexOf(min) < values.indexOf(max);
-
-    const diff = max - min;
-    let pos = (down ? -diff : 0) - (down ? min : max);
-
     const dimEl = {
         width: el.offsetWidth,
         height: el.offsetHeight,
     };
 
-    const baseDim = Dimensions.cover(dimImage, dimEl);
-    const span = baseDim[attr] - dimEl[attr];
+    const bgProps = ['bgx', 'bgy'].filter((prop) => prop in props);
 
-    if (span < diff) {
-        dimEl[attr] = baseDim[attr] + diff - span;
-    } else if (span > diff) {
-        const posPercentage = dimEl[attr] / toPx(bgPos, attr, el, true);
+    const positions = {};
+    for (const prop of bgProps) {
+        const values = props[prop].map(([value]) => value);
+        const min = Math.min(...values);
+        const max = Math.max(...values);
+        const down = values.indexOf(min) < values.indexOf(max);
+        const diff = max - min;
 
-        if (posPercentage) {
-            pos -= (span - diff) / posPercentage;
-        }
+        positions[prop] = `${(down ? -diff : 0) - (down ? min : max)}px`;
+        dimEl[prop === 'bgy' ? 'height' : 'width'] += diff;
     }
 
     const dim = Dimensions.cover(dimImage, dimEl);
 
-    const fn = setBackgroundPosFn(prop, stops, `${pos}px`);
+    for (const prop of bgProps) {
+        const attr = prop === 'bgy' ? 'height' : 'width';
+        const overflow = dim[attr] - dimEl[attr];
+        positions[prop] = `max(${getBackgroundPos(el, prop)},-${overflow}px) + ${positions[prop]}`;
+    }
+
+    const fn = setBackgroundPosFn(bgProps, positions, props);
     return (css, percent) => {
         fn(css, percent);
         css.backgroundSize = `${dim.width}px ${dim.height}px`;
@@ -240,9 +253,16 @@ function backgroundCoverFn(prop, el, stops, bgPos, attr) {
     };
 }
 
-function setBackgroundPosFn(prop, stops, pos) {
+function getBackgroundPos(el, prop) {
+    return getCssValue(el, `background-position-${prop.substr(-1)}`, '');
+}
+
+function setBackgroundPosFn(bgProps, positions, props) {
     return function (css, percent) {
-        css[`background-position-${prop}`] = `calc(${pos} + ${getValue(stops, percent)}px)`;
+        for (const prop of bgProps) {
+            const value = getValue(props[prop], percent);
+            css[`background-position-${prop.substr(-1)}`] = `calc(${positions[prop]} + ${value}px)`;
+        }
     };
 }
 

package/src/js/mixin/position.js

@@ -1,4 +1,13 @@
-import { flipPosition, getCssVar, includes, isRtl, positionAt, toPx } from 'uikit-util';
+import {
+    css,
+    dimensions,
+    flipPosition,
+    getCssVar,
+    includes,
+    isRtl,
+    positionAt,
+    toPx,
+} from 'uikit-util';
 
 export default {
     props: {
@@ -15,33 +24,17 @@ export default {
 
     connected() {
         this.pos = this.$props.pos.split('-').concat('center').slice(0, 2);
-        this.axis = includes(['top', 'bottom'], this.pos[0]) ? 'y' : 'x';
+        [this.dir, this.align] = this.pos;
+        this.axis = includes(['top', 'bottom'], this.dir) ? 'y' : 'x';
     },
 
     methods: {
         positionAt(element, target, boundary) {
-            const [dir, align] = this.pos;
-
-            const mainAxisOffset =
-                toPx(
-                    this.offset === false ? getCssVar('position-offset', element) : this.offset,
-                    this.axis === 'x' ? 'width' : 'height',
-                    element
-                ) * (includes(['left', 'top'], dir) ? -1 : 1);
-
-            const crossAxisOffset = includes(['center', 'justify'], align)
-                ? 0
-                : toPx(
-                      getCssVar('position-shift-offset', element),
-                      this.axis === 'y' ? 'width' : 'height',
-                      element
-                  ) * (includes(['left', 'top'], align) ? 1 : -1);
-
-            let offset = [mainAxisOffset, crossAxisOffset];
+            let offset = [this.getPositionOffset(element), this.getShiftOffset(element)];
 
             const attach = {
-                element: [flipPosition(dir), align],
-                target: [dir, align],
+                element: [flipPosition(this.dir), this.align],
+                target: [this.dir, this.align],
             };
 
             if (this.axis === 'y') {
@@ -51,13 +44,41 @@ export default {
                 offset = offset.reverse();
             }
 
+            // Ensure none positioned element does not generate scrollbars
+            const elDim = dimensions(element);
+            css(element, { top: -elDim.height, left: -elDim.width });
+
             positionAt(element, target, {
                 attach,
                 offset,
                 boundary,
                 flip: this.flip,
-                viewportOffset: toPx(getCssVar('position-viewport-offset', element)),
+                viewportOffset: this.getViewportOffset(element),
             });
         },
+
+        getPositionOffset(element) {
+            return (
+                toPx(
+                    this.offset === false ? getCssVar('position-offset', element) : this.offset,
+                    this.axis === 'x' ? 'width' : 'height',
+                    element
+                ) * (includes(['left', 'top'], this.dir) ? -1 : 1)
+            );
+        },
+
+        getShiftOffset(element) {
+            return includes(['center', 'justify', 'stretch'], this.align)
+                ? 0
+                : toPx(
+                      getCssVar('position-shift-offset', element),
+                      this.axis === 'y' ? 'width' : 'height',
+                      element
+                  ) * (includes(['left', 'top'], this.align) ? 1 : -1);
+        },
+
+        getViewportOffset(element) {
+            return toPx(getCssVar('position-viewport-offset', element));
+        },
     },
 };