uikit 3.14.2-dev.e270e98f7 → 3.14.2-dev.f917389f5

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.e270e98f7",
+    "version": "3.14.2-dev.f917389f5",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [
@@ -34,32 +34,32 @@
     },
     "homepage": "https://getuikit.com",
     "devDependencies": {
-        "@babel/core": "^7.17.8",
-        "@babel/preset-env": "^7.16.4",
+        "@babel/core": "^7.17.10",
+        "@babel/preset-env": "^7.17.10",
         "@rollup/plugin-alias": "^3.1.9",
         "@rollup/plugin-babel": "^5.3.1",
         "@rollup/plugin-replace": "^4.0.0",
-        "archiver": "^5.3.0",
+        "archiver": "^5.3.1",
         "camelcase": "^6.3.0",
         "clean-css": "^5.3.0",
         "dateformat": "^5.0.3",
-        "esbuild": "^0.14.32",
-        "eslint": "^8.12.0",
+        "esbuild": "^0.14.38",
+        "eslint": "^8.15.0",
         "eslint-config-prettier": "^8.5.0",
-        "fs-extra": "^10.0.1",
-        "glob": "^7.2.0",
-        "inquirer": "^8.2.2",
+        "fs-extra": "^10.1.0",
+        "glob": "^8.0.1",
+        "inquirer": "^8.2.4",
         "less": "^4.1.2",
         "minimist": "^1.2.6",
         "number-precision": "^1.5.2",
         "p-limit": "^4.0.0",
         "prettier": "^2.6.2",
-        "rollup": "^2.70.1",
+        "rollup": "^2.72.1",
         "rollup-plugin-esbuild": "^4.9.1",
         "rollup-plugin-html": "^0.2.1",
         "rollup-plugin-modify": "^3.0.0",
         "rtlcss": "^3.5.0",
-        "semver": "^7.3.2",
+        "semver": "^7.3.7",
         "svgo": "^2.8.0",
         "watch-run": "^1.2.5"
     }

package/src/js/components/parallax.js

@@ -74,7 +74,7 @@ export default {
 };
 
 function ease(percent, easing) {
-    return easing >= 0 ? Math.pow(percent, easing + 1) : 1 - Math.pow(1 - percent, -easing + 1);
+    return easing >= 0 ? Math.pow(percent, easing + 1) : 1 - Math.pow(1 - percent, 1 - easing);
 }
 
 // SVG elements do not inherit from HTMLElement

package/src/js/core/drop.js

@@ -8,6 +8,7 @@ import {
     apply,
     attr,
     css,
+    getCssVar,
     hasClass,
     includes,
     isTouch,
@@ -15,7 +16,6 @@ import {
     MouseTracker,
     observeResize,
     offset,
-    offsetViewport,
     on,
     once,
     parent,
@@ -28,6 +28,7 @@ import {
     removeClass,
     scrollParents,
     toggleClass,
+    toPx,
     within,
 } from 'uikit-util';
 
@@ -378,19 +379,27 @@ export default {
             toggleClass(this.$el, `${this.clsDrop}-boundary`, this.boundaryAlign);
 
             const boundary = query(this.boundary, this.$el);
-            const [scrollParent] = scrollParents(this.$el);
-            const scrollParentOffset = offsetViewport(scrollParent);
+            const scrollParentOffset = offset(
+                scrollParents(boundary && this.boundaryAlign ? boundary : this.$el)[0]
+            );
             const boundaryOffset = boundary ? offset(boundary) : scrollParentOffset;
 
             css(this.$el, 'maxWidth', '');
             const maxWidth =
-                scrollParentOffset.width - (this.boundaryAlign ? 0 : 2 * this.viewportPadding);
+                scrollParentOffset.width -
+                2 * toPx(getCssVar('position-viewport-offset', this.$el));
 
             if (this.pos[1] === 'justify') {
                 const prop = this.axis === 'y' ? 'width' : 'height';
-                const targetOffset = offset(this.target);
-                const alignTo = this.boundaryAlign ? boundaryOffset : targetOffset;
-                css(this.$el, prop, alignTo[prop]);
+                css(
+                    this.$el,
+                    prop,
+                    Math.min(
+                        (boundary ? boundaryOffset : offset(this.target))[prop],
+                        scrollParentOffset[prop] -
+                            2 * toPx(getCssVar('position-viewport-offset', this.$el))
+                    )
+                );
             } else if (this.$el.offsetWidth > maxWidth) {
                 addClass(this.$el, `${this.clsDrop}-stack`);
             }

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

@@ -1,4 +1,3 @@
-import Class from '../mixin/class';
 import Resize from '../mixin/resize';
 import {
     boxModelAdjust,
@@ -15,7 +14,7 @@ import {
 } from 'uikit-util';
 
 export default {
-    mixins: [Class, Resize],
+    mixins: [Resize],
 
     props: {
         expand: Boolean,

package/src/js/core/toggle.js

@@ -156,6 +156,10 @@ export default {
         {
             name: 'click',
 
+            filter() {
+                return ['click', 'hover'].some((mode) => includes(this.mode, mode));
+            },
+
             handler(e) {
                 let link;
                 if (

package/src/js/mixin/position.js

@@ -1,14 +1,4 @@
-import {
-    $,
-    flipPosition,
-    getCssVar,
-    offset as getOffset,
-    includes,
-    isNumeric,
-    isRtl,
-    positionAt,
-    toPx,
-} from 'uikit-util';
+import { flipPosition, getCssVar, includes, isRtl, positionAt, toPx } from 'uikit-util';
 
 export default {
     props: {
@@ -21,7 +11,6 @@ export default {
         pos: `bottom-${isRtl ? 'right' : 'left'}`,
         flip: true,
         offset: false,
-        viewportPadding: 10,
     },
 
     connected() {
@@ -33,16 +22,22 @@ export default {
         positionAt(element, target, boundary) {
             const [dir, align] = this.pos;
 
-            let { offset } = this;
-            if (!isNumeric(offset)) {
-                const node = $(offset);
-                offset = node
-                    ? getOffset(node)[this.axis === 'x' ? 'left' : 'top'] -
-                      getOffset(target)[this.axis === 'x' ? 'right' : 'bottom']
-                    : 0;
-            }
-            offset = toPx(offset) + toPx(getCssVar('position-offset', element));
-            offset = [includes(['left', 'top'], dir) ? -offset : +offset, 0];
+            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];
 
             const attach = {
                 element: [flipPosition(dir), align],
@@ -60,8 +55,8 @@ export default {
                 attach,
                 offset,
                 boundary,
-                viewportPadding: this.boundaryAlign ? 0 : this.viewportPadding,
                 flip: this.flip,
+                viewportOffset: toPx(getCssVar('position-viewport-offset', element)),
             });
         },
     },

package/src/js/mixin/togglable.js

@@ -81,6 +81,11 @@ export default {
                             return Promise.reject();
                         }
 
+                        if (!animate) {
+                            Animation.cancel(el);
+                            Transition.cancel(el);
+                        }
+
                         const promise = (
                             isFunction(animate)
                                 ? animate

package/src/js/util/position.js

@@ -49,6 +49,10 @@ function attachTo(element, target, options) {
     return position;
 }
 
+function moveBy(start, end, dim) {
+    return start === 'center' ? dim / 2 : start === end ? dim : 0;
+}
+
 function attachToWithFlip(element, target, options) {
     const position = attachTo(element, target, options);
     const targetDim = offset(target);
@@ -59,7 +63,7 @@ function attachToWithFlip(element, target, options) {
         offset: elOffset,
         boundary,
         viewport,
-        viewportPadding,
+        viewportOffset,
     } = options;
 
     let viewports = scrollParents(element);
@@ -80,9 +84,9 @@ function attachToWithFlip(element, target, options) {
 
         viewport = getIntersectionArea(...viewports.filter(Boolean).map(offsetViewport));
 
-        if (viewportPadding) {
-            viewport[start] += viewportPadding;
-            viewport[end] -= viewportPadding;
+        if (viewportOffset) {
+            viewport[start] += viewportOffset;
+            viewport[end] -= viewportOffset;
         }
 
         if (boundary && !willFlip && position[prop] <= offset(boundary)[prop]) {
@@ -139,19 +143,21 @@ function attachToWithFlip(element, target, options) {
                     return false;
                 }
 
-                const newPos = attachToWithFlip(element, target, {
-                    ...options,
-                    attach: {
-                        element: elAttach.map(flipDir).reverse(),
-                        target: targetAttach.map(flipDir).reverse(),
-                    },
-                    offset: elOffset.reverse(),
-                    flip: flip === true ? flip : [...flip, dirs[1 - i][1]],
-                    recursion: true,
-                });
-
-                if (newPos && isInScrollArea(newPos, scrollElement, 1 - i)) {
-                    return newPos;
+                if (flip === true || includes(flip, dirs[1 - i][1])) {
+                    const newPos = attachToWithFlip(element, target, {
+                        ...options,
+                        attach: {
+                            element: elAttach.map(flipDir).reverse(),
+                            target: targetAttach.map(flipDir).reverse(),
+                        },
+                        offset: elOffset.reverse(),
+                        flip: flip === true ? flip : [...flip, dirs[1 - i][1]],
+                        recursion: true,
+                    });
+
+                    if (newPos && isInScrollArea(newPos, scrollElement, 1 - i)) {
+                        return newPos;
+                    }
                 }
             }
 
@@ -172,10 +178,6 @@ function attachToWithFlip(element, target, options) {
     return offsetPosition;
 }
 
-function moveBy(start, end, dim) {
-    return start === 'center' ? dim / 2 : start === end ? dim : 0;
-}
-
 function getIntersectionArea(...rects) {
     let area = {};
     for (const rect of rects) {
@@ -188,7 +190,7 @@ function getIntersectionArea(...rects) {
 }
 
 function isInScrollArea(position, scrollElement, dir) {
-    const viewport = offsetViewport(scrollElement);
+    const viewport = offsetViewport(scrollElement, false);
     const [prop, , start, end] = dirs[dir];
     viewport[start] -= scrollElement[`scroll${ucfirst(start)}`];
     viewport[end] = viewport[start] + scrollElement[`scroll${ucfirst(prop)}`];

package/src/js/util/viewport.js

@@ -158,21 +158,20 @@ export function offsetViewport(scrollElement) {
         ['width', 'x', 'left', 'right'],
         ['height', 'y', 'top', 'bottom'],
     ]) {
-        if (!isWindow(getViewport(viewportElement))) {
+        if (!isWindow(viewportElement)) {
             rect[start] += toFloat(css(viewportElement, `border${ucfirst(start)}Width`));
+        } else {
+            // iOS 12 returns <body> as scrollingElement
+            viewportElement = viewportElement.document.documentElement;
         }
-        rect[prop] = rect[dir] =
-            viewportElement[(isWindow(viewportElement) ? 'inner' : 'client') + ucfirst(prop)];
+        rect[prop] = rect[dir] = viewportElement[`client${ucfirst(prop)}`];
         rect[end] = rect[prop] + rect[start];
     }
     return rect;
 }
 
 function scrollingElement(element) {
-    const {
-        document: { scrollingElement },
-    } = toWindow(element);
-    return scrollingElement;
+    return toWindow(element).document.scrollingElement;
 }
 
 function getViewport(scrollElement) {

package/src/less/components/drop.less

@@ -22,6 +22,7 @@
 
 @drop-z-index:                              @global-z-index + 20;
 @drop-margin:                               @global-margin;
+@drop-viewport-margin:                      15px;
 @drop-width:                                300px;
 
 
@@ -42,6 +43,7 @@
     position: absolute;
     z-index: @drop-z-index;
     --uk-position-offset: @drop-margin;
+    --uk-position-viewport-offset: @drop-viewport-margin;
     /* 3 */
     box-sizing: border-box;
     width: @drop-width;

package/src/less/components/dropdown.less

@@ -22,6 +22,7 @@
 
 @dropdown-z-index:                              @global-z-index + 20;
 @dropdown-margin:                               @global-small-margin;
+@dropdown-viewport-margin:                      15px;
 @dropdown-min-width:                            200px;
 @dropdown-padding:                              15px;
 @dropdown-background:                           @global-muted-background;
@@ -55,6 +56,7 @@
     position: absolute;
     z-index: @dropdown-z-index;
     --uk-position-offset: @dropdown-margin;
+    --uk-position-viewport-offset: @dropdown-viewport-margin;
     /* 3 */
     box-sizing: border-box;
     min-width: @dropdown-min-width;

package/src/less/components/modal.less

@@ -40,15 +40,21 @@
 
 @modal-container-width:                         1200px;
 
-@modal-body-padding-horizontal:                 @global-gutter;
-@modal-body-padding-vertical:                   @global-gutter;
+@modal-body-padding-horizontal:                 20px;
+@modal-body-padding-vertical:                   20px;
+@modal-body-padding-horizontal-s:               @global-gutter;
+@modal-body-padding-vertical-s:                 @global-gutter;
 
-@modal-header-padding-horizontal:               @global-gutter;
+@modal-header-padding-horizontal:               20px;
 @modal-header-padding-vertical:                 (@modal-header-padding-horizontal / 2);
+@modal-header-padding-horizontal-s:             @global-gutter;
+@modal-header-padding-vertical-s:               (@modal-header-padding-horizontal-s / 2);
 @modal-header-background:                       @global-muted-background;
 
-@modal-footer-padding-horizontal:               @global-gutter;
+@modal-footer-padding-horizontal:               20px;
 @modal-footer-padding-vertical:                 (@modal-footer-padding-horizontal / 2);
+@modal-footer-padding-horizontal-s:             @global-gutter;
+@modal-footer-padding-vertical-s:               (@modal-footer-padding-horizontal-s / 2);
 @modal-footer-background:                       @global-muted-background;
 
 @modal-title-font-size:                         @global-xlarge-font-size;
@@ -228,6 +234,15 @@
     .hook-modal-footer();
 }
 
+/* Phone landscape and bigger */
+@media (min-width: @breakpoint-small) {
+
+    .uk-modal-body { padding: @modal-body-padding-vertical-s @modal-body-padding-horizontal-s; }
+    .uk-modal-header { padding: @modal-header-padding-vertical-s @modal-header-padding-horizontal-s; }
+    .uk-modal-footer { padding: @modal-footer-padding-vertical-s @modal-footer-padding-horizontal-s; }
+
+}
+
 /*
  * Remove margin from the last-child
  */

package/src/less/components/navbar.less

@@ -40,6 +40,7 @@
 @navbar-color-mode:                             none;
 
 @navbar-nav-item-height:                        80px;
+@navbar-nav-item-gap:                           0;
 @navbar-nav-item-padding-horizontal:            15px;
 @navbar-nav-item-color:                         @global-muted-color;
 @navbar-nav-item-font-size:                     @global-font-size;
@@ -48,6 +49,7 @@
 @navbar-nav-item-onclick-color:                 @global-emphasis-color;
 @navbar-nav-item-active-color:                  @global-emphasis-color;
 
+@navbar-item-padding-horizontal:                @navbar-nav-item-padding-horizontal;
 @navbar-item-color:                             @global-color;
 
 @navbar-toggle-color:                           @global-muted-color;
@@ -56,7 +58,9 @@
 @navbar-subtitle-font-size:                     @global-small-font-size;
 
 @navbar-dropdown-z-index:                       @global-z-index + 20;
-@navbar-dropdown-margin:                        0px;
+@navbar-dropdown-margin:                        0;
+@navbar-dropdown-shift-margin:                  0;
+@navbar-dropdown-viewport-margin:               15px;
 @navbar-dropdown-width:                         200px;
 @navbar-dropdown-padding:                       15px;
 @navbar-dropdown-background:                    @global-muted-background;
@@ -93,6 +97,7 @@
 
 .uk-navbar {
     display: flex;
+    --uk-navbar-nav-item-gap: @navbar-nav-item-gap;
     /* 1 */
     position: relative;
     .hook-navbar();
@@ -127,6 +132,7 @@
 .uk-navbar-center-left > *,
 .uk-navbar-center-right > * {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     align-items: center;
 }
@@ -168,8 +174,14 @@
    top: 0;
 }
 
-.uk-navbar-center-left { right: 100%; }
-.uk-navbar-center-right { left: 100%; }
+.uk-navbar-center-left {
+    right: 100%; // Fallback if gap is 0
+    right:  ~'calc(100% + var(--uk-navbar-nav-item-gap))';
+}
+.uk-navbar-center-right {
+    left: 100%; // Fallback if gap is 0
+    left: ~'calc(100% + var(--uk-navbar-nav-item-gap))';
+}
 
 [class*='uk-navbar-center-'] {
     width: max-content;
@@ -186,6 +198,7 @@
 
 .uk-navbar-nav {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     margin: 0;
     padding: 0;
@@ -267,6 +280,7 @@
  ========================================================================== */
 
 .uk-navbar-item {
+    padding: 0 @navbar-item-padding-horizontal;
     color: @navbar-item-color;
     .hook-navbar-item();
 }
@@ -362,6 +376,8 @@
     position: absolute;
     z-index: @navbar-dropdown-z-index;
     --uk-position-offset: @navbar-dropdown-margin;
+    --uk-position-shift-offset: @navbar-dropdown-shift-margin;
+    --uk-position-viewport-offset: @navbar-dropdown-viewport-margin;
     /* 3 */
     box-sizing: border-box;
     width: @navbar-dropdown-width;
@@ -402,19 +418,23 @@
 
 /*
  * Dropbar modifier
- * 1. Set position
- * 2. Bottom padding for dropbar
- * 3. Horizontal padding
+ * 1. Reset dropdown width to prevent to early shifting
+ * 2. Set position
+ * 3. Bottom padding for dropbar
+ * 4. Horizontal padding
  */
 
 .uk-navbar-dropdown-dropbar {
     /* 1 */
-    --uk-position-offset: @navbar-dropdown-dropbar-margin-top;
+    width: auto;
     /* 2 */
-    margin-bottom: @navbar-dropdown-dropbar-margin-bottom;
+    --uk-position-offset: @navbar-dropdown-dropbar-margin-top;
     /* 3 */
+    margin-bottom: @navbar-dropdown-dropbar-margin-bottom;
+    /* 4 */
     padding-left: @navbar-dropdown-dropbar-padding-horizontal;
     padding-right: @navbar-dropdown-dropbar-padding-horizontal;
+    --uk-position-shift-offset: 0;
     .hook-navbar-dropdown-dropbar();
 }
 

package/src/less/components/offcanvas.less

@@ -26,19 +26,19 @@
 @offcanvas-z-index:                             @global-z-index;
 
 @offcanvas-bar-width:                           270px;
-@offcanvas-bar-padding-vertical:                @global-margin;
-@offcanvas-bar-padding-horizontal:              @global-margin;
+@offcanvas-bar-padding-vertical:                20px;
+@offcanvas-bar-padding-horizontal:              20px;
 @offcanvas-bar-background:                      @global-secondary-background;
 @offcanvas-bar-color-mode:                      light;
 
-@offcanvas-bar-width-m:                         350px;
-@offcanvas-bar-padding-vertical-m:              @global-medium-gutter;
-@offcanvas-bar-padding-horizontal-m:            @global-medium-gutter;
+@offcanvas-bar-width-s:                         350px;
+@offcanvas-bar-padding-vertical-s:              @global-gutter;
+@offcanvas-bar-padding-horizontal-s:            @global-gutter;
 
 @offcanvas-close-position:                      5px;
 @offcanvas-close-padding:                       5px;
 
-@offcanvas-close-position-m:                    20px;
+@offcanvas-close-position-s:                    10px;
 
 @offcanvas-overlay-background:                  rgba(0,0,0,0.1);
 
@@ -99,13 +99,13 @@
     .hook-offcanvas-bar();
 }
 
-/* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
+/* Phone landscape and bigger */
+@media (min-width: @breakpoint-small) {
 
     .uk-offcanvas-bar {
-        left: -@offcanvas-bar-width-m;
-        width: @offcanvas-bar-width-m;
-        padding: @offcanvas-bar-padding-vertical-m @offcanvas-bar-padding-horizontal-m;
+        left: -@offcanvas-bar-width-s;
+        width: @offcanvas-bar-width-s;
+        padding: @offcanvas-bar-padding-vertical-s @offcanvas-bar-padding-horizontal-s;
     }
 
 }
@@ -121,9 +121,9 @@
 }
 
 /* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
+@media (min-width: @breakpoint-small) {
 
-    .uk-offcanvas-flip .uk-offcanvas-bar { right: -@offcanvas-bar-width-m; }
+    .uk-offcanvas-flip .uk-offcanvas-bar { right: -@offcanvas-bar-width-s; }
 
 }
 
@@ -179,9 +179,9 @@
 .uk-open > .uk-offcanvas-reveal { width: @offcanvas-bar-width; }
 
 /* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
+@media (min-width: @breakpoint-small) {
 
-    .uk-open > .uk-offcanvas-reveal { width: @offcanvas-bar-width-m; }
+    .uk-open > .uk-offcanvas-reveal { width: @offcanvas-bar-width-s; }
 
 }
 
@@ -209,11 +209,11 @@
 }
 
 /* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
+@media (min-width: @breakpoint-small) {
 
     .uk-offcanvas-close {
-        top: @offcanvas-close-position-m;
-        right: @offcanvas-close-position-m;
+        top: @offcanvas-close-position-s;
+        right: @offcanvas-close-position-s;
     }
 
 }
@@ -304,11 +304,11 @@
 .uk-offcanvas-flip.uk-offcanvas-container-animation { left: -@offcanvas-bar-width; }
 
 /* Tablet landscape and bigger */
-@media (min-width: @breakpoint-medium) {
+@media (min-width: @breakpoint-small) {
 
-    :not(.uk-offcanvas-flip).uk-offcanvas-container-animation { left: @offcanvas-bar-width-m; }
+    :not(.uk-offcanvas-flip).uk-offcanvas-container-animation { left: @offcanvas-bar-width-s; }
 
-    .uk-offcanvas-flip.uk-offcanvas-container-animation { left: -@offcanvas-bar-width-m; }
+    .uk-offcanvas-flip.uk-offcanvas-container-animation { left: -@offcanvas-bar-width-s; }
 
 }
 

package/src/less/components/tooltip.less

@@ -51,6 +51,7 @@
     position: absolute;
     z-index: @tooltip-z-index;
     --uk-position-offset: @tooltip-margin;
+    --uk-position-viewport-offset: 10;
     /* 3 */
     top: 0;
     /* 4 */

package/src/less/theme/navbar.less

@@ -7,6 +7,9 @@
 // Variables
 // ========================================================================
 
+@navbar-nav-item-gap:                           30px;
+@navbar-nav-item-padding-horizontal:            0;
+
 @navbar-nav-item-font-size:                     @global-small-font-size;
 
 @navbar-dropdown-margin:                        15px;
@@ -129,16 +132,6 @@
 
 .hook-navbar-misc() {
 
-    /*
-     * Navbar
-     */
-
-    .uk-navbar-container > .uk-container .uk-navbar-left {
-        margin-left: -@navbar-nav-item-padding-horizontal;
-        margin-right: -@navbar-nav-item-padding-horizontal;
-    }
-    .uk-navbar-container > .uk-container .uk-navbar-right { margin-right: -@navbar-nav-item-padding-horizontal; }
-
     /*
      * Grid Divider
      */