uikit 3.14.2-dev.92611d66f → 3.14.2-dev.dd84f6c31

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.92611d66f",
+    "version": "3.14.2-dev.dd84f6c31",
     "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/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

@@ -22,12 +22,22 @@ export default {
         positionAt(element, target, boundary) {
             const [dir, align] = this.pos;
 
-            let offset = toPx(
-                this.offset === false ? getCssVar('position-offset', element) : this.offset,
-                this.axis === 'x' ? 'width' : 'height',
-                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],

package/src/js/util/position.js

@@ -143,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;
+                    }
                 }
             }
 

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,7 +43,7 @@
     position: absolute;
     z-index: @drop-z-index;
     --uk-position-offset: @drop-margin;
-    --uk-position-viewport-offset: 10;
+    --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,7 +56,7 @@
     position: absolute;
     z-index: @dropdown-z-index;
     --uk-position-offset: @dropdown-margin;
-    --uk-position-viewport-offset: 10;
+    --uk-position-viewport-offset: @dropdown-viewport-margin;
     /* 3 */
     box-sizing: border-box;
     min-width: @dropdown-min-width;

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,7 +376,8 @@
     position: absolute;
     z-index: @navbar-dropdown-z-index;
     --uk-position-offset: @navbar-dropdown-margin;
-    --uk-position-viewport-offset: 10;
+    --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;
@@ -403,20 +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;
-    --uk-position-viewport-offset: 0;
+    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/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
      */

package/src/scss/components/drop.scss

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

package/src/scss/components/dropdown.scss

@@ -22,6 +22,7 @@
 
 $dropdown-z-index:                               $global-z-index + 20 !default;
 $dropdown-margin:                                $global-small-margin !default;
+$dropdown-viewport-margin:                       15px !default;
 $dropdown-min-width:                             200px !default;
 $dropdown-padding:                               15px !default;
 $dropdown-background:                            $global-muted-background !default;
@@ -55,7 +56,7 @@ $dropdown-nav-sublist-item-hover-color:          $global-color !default;
     position: absolute;
     z-index: $dropdown-z-index;
     --uk-position-offset: #{$dropdown-margin};
-    --uk-position-viewport-offset: 10;
+    --uk-position-viewport-offset: #{$dropdown-viewport-margin};
     /* 3 */
     box-sizing: border-box;
     min-width: $dropdown-min-width;

package/src/scss/components/navbar.scss

@@ -40,6 +40,7 @@ $navbar-background:                              $global-muted-background !defau
 $navbar-color-mode:                              none !default;
 
 $navbar-nav-item-height:                         80px !default;
+$navbar-nav-item-gap:                            0 !default;
 $navbar-nav-item-padding-horizontal:             15px !default;
 $navbar-nav-item-color:                          $global-muted-color !default;
 $navbar-nav-item-font-size:                      $global-font-size !default;
@@ -48,6 +49,7 @@ $navbar-nav-item-hover-color:                    $global-color !default;
 $navbar-nav-item-onclick-color:                  $global-emphasis-color !default;
 $navbar-nav-item-active-color:                   $global-emphasis-color !default;
 
+$navbar-item-padding-horizontal:                 $navbar-nav-item-padding-horizontal !default;
 $navbar-item-color:                              $global-color !default;
 
 $navbar-toggle-color:                            $global-muted-color !default;
@@ -56,7 +58,9 @@ $navbar-toggle-hover-color:                      $global-color !default;
 $navbar-subtitle-font-size:                      $global-small-font-size !default;
 
 $navbar-dropdown-z-index:                        $global-z-index + 20 !default;
-$navbar-dropdown-margin:                         0px !default;
+$navbar-dropdown-margin:                         0 !default;
+$navbar-dropdown-shift-margin:                   0 !default;
+$navbar-dropdown-viewport-margin:                15px !default;
 $navbar-dropdown-width:                          200px !default;
 $navbar-dropdown-padding:                        15px !default;
 $navbar-dropdown-background:                     $global-muted-background !default;
@@ -93,6 +97,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 
 .uk-navbar {
     display: flex;
+    --uk-navbar-nav-item-gap: #{$navbar-nav-item-gap};
     /* 1 */
     position: relative;
     @if(mixin-exists(hook-navbar)) {@include hook-navbar();}
@@ -127,6 +132,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 .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 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
    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:  unquote('calc(100% + var(--uk-navbar-nav-item-gap))');
+}
+.uk-navbar-center-right {
+    left: 100%; // Fallback if gap is 0
+    left: unquote('calc(100% + var(--uk-navbar-nav-item-gap))');
+}
 
 [class*='uk-navbar-center-'] {
     width: max-content;
@@ -186,6 +198,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 
 .uk-navbar-nav {
     display: flex;
+    gap: var(--uk-navbar-nav-item-gap);
     /* 1 */
     margin: 0;
     padding: 0;
@@ -267,6 +280,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
  ========================================================================== */
 
 .uk-navbar-item {
+    padding: 0 $navbar-item-padding-horizontal;
     color: $navbar-item-color;
     @if(mixin-exists(hook-navbar-item)) {@include hook-navbar-item();}
 }
@@ -362,7 +376,8 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
     position: absolute;
     z-index: $navbar-dropdown-z-index;
     --uk-position-offset: #{$navbar-dropdown-margin};
-    --uk-position-viewport-offset: 10;
+    --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;
@@ -403,20 +418,23 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 
 /*
  * 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};
-    --uk-position-viewport-offset: 0;
+    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;
     @if(mixin-exists(hook-navbar-dropdown-dropbar)) {@include hook-navbar-dropdown-dropbar();}
 }
 

package/src/scss/mixins-theme.scss

@@ -1761,16 +1761,6 @@
 @mixin hook-navbar-dropbar(){ box-shadow: $navbar-dropbar-box-shadow; }
 @mixin 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
      */

package/src/scss/theme/navbar.scss

@@ -7,6 +7,9 @@
 // Variables
 // ========================================================================
 
+$navbar-nav-item-gap:                            30px !default;
+$navbar-nav-item-padding-horizontal:             0 !default;
+
 $navbar-nav-item-font-size:                      $global-small-font-size !default;
 
 $navbar-dropdown-margin:                         15px !default;

package/src/scss/variables-theme.scss

@@ -367,9 +367,11 @@ $inverse-dotnav-item-active-background: rgba($inverse-global-color, 0.9) !defaul
 $global-z-index: 1000 !default;
 $drop-z-index: $global-z-index + 20 !default;
 $drop-margin: $global-margin !default;
+$drop-viewport-margin: 15px !default;
 $drop-width: 300px !default;
 $dropdown-z-index: $global-z-index + 20 !default;
 $dropdown-margin: $global-small-margin !default;
+$dropdown-viewport-margin: 15px !default;
 $dropdown-min-width: 200px !default;
 $dropdown-padding: 25px !default;
 $dropdown-background: $global-background !default;
@@ -730,19 +732,23 @@ $inverse-nav-dividers-border: $inverse-global-border !default;
 $navbar-background: $global-muted-background !default;
 $navbar-color-mode: none !default;
 $navbar-nav-item-height: 80px !default;
-$navbar-nav-item-padding-horizontal: 15px !default;
+$navbar-nav-item-gap: 30px !default;
+$navbar-nav-item-padding-horizontal: 0 !default;
 $navbar-nav-item-color: $global-muted-color !default;
 $navbar-nav-item-font-size: $global-small-font-size !default;
 $navbar-nav-item-font-family: $global-font-family !default;
 $navbar-nav-item-hover-color: $global-color !default;
 $navbar-nav-item-onclick-color: $global-emphasis-color !default;
 $navbar-nav-item-active-color: $global-emphasis-color !default;
+$navbar-item-padding-horizontal: $navbar-nav-item-padding-horizontal !default;
 $navbar-item-color: $global-color !default;
 $navbar-toggle-color: $global-muted-color !default;
 $navbar-toggle-hover-color: $global-color !default;
 $navbar-subtitle-font-size: $global-small-font-size !default;
 $navbar-dropdown-z-index: $global-z-index + 20 !default;
 $navbar-dropdown-margin: 15px !default;
+$navbar-dropdown-shift-margin: 0 !default;
+$navbar-dropdown-viewport-margin: 15px !default;
 $navbar-dropdown-width: 200px !default;
 $navbar-dropdown-padding: 25px !default;
 $navbar-dropdown-background: $global-background !default;

package/src/scss/variables.scss

@@ -366,9 +366,11 @@ $inverse-dotnav-item-active-background: rgba($inverse-global-color, 0.9) !defaul
 $global-z-index: 1000 !default;
 $drop-z-index: $global-z-index + 20 !default;
 $drop-margin: $global-margin !default;
+$drop-viewport-margin: 15px !default;
 $drop-width: 300px !default;
 $dropdown-z-index: $global-z-index + 20 !default;
 $dropdown-margin: $global-small-margin !default;
+$dropdown-viewport-margin: 15px !default;
 $dropdown-min-width: 200px !default;
 $dropdown-padding: 15px !default;
 $dropdown-background: $global-muted-background !default;
@@ -728,6 +730,7 @@ $inverse-nav-dividers-border: $inverse-global-border !default;
 $navbar-background: $global-muted-background !default;
 $navbar-color-mode: none !default;
 $navbar-nav-item-height: 80px !default;
+$navbar-nav-item-gap: 0 !default;
 $navbar-nav-item-padding-horizontal: 15px !default;
 $navbar-nav-item-color: $global-muted-color !default;
 $navbar-nav-item-font-size: $global-font-size !default;
@@ -735,12 +738,15 @@ $navbar-nav-item-font-family: $global-font-family !default;
 $navbar-nav-item-hover-color: $global-color !default;
 $navbar-nav-item-onclick-color: $global-emphasis-color !default;
 $navbar-nav-item-active-color: $global-emphasis-color !default;
+$navbar-item-padding-horizontal: $navbar-nav-item-padding-horizontal !default;
 $navbar-item-color: $global-color !default;
 $navbar-toggle-color: $global-muted-color !default;
 $navbar-toggle-hover-color: $global-color !default;
 $navbar-subtitle-font-size: $global-small-font-size !default;
 $navbar-dropdown-z-index: $global-z-index + 20 !default;
-$navbar-dropdown-margin: 0px !default;
+$navbar-dropdown-margin: 0 !default;
+$navbar-dropdown-shift-margin: 0 !default;
+$navbar-dropdown-viewport-margin: 15px !default;
 $navbar-dropdown-width: 200px !default;
 $navbar-dropdown-padding: 15px !default;
 $navbar-dropdown-background: $global-muted-background !default;