uikit 3.14.2-dev.7f1f28069 → 3.14.2-dev.854a8e6b0

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.7f1f28069",
+    "version": "3.14.2-dev.854a8e6b0",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [

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/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

@@ -171,10 +171,7 @@ export function offsetViewport(scrollElement) {
 }
 
 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

@@ -58,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;
@@ -374,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;
@@ -415,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/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

@@ -58,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;
@@ -374,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;
@@ -415,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/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;
@@ -745,6 +747,8 @@ $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;
@@ -742,7 +744,9 @@ $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;