uikit 3.14.1 → 3.14.2-dev.dedde7cc1

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

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,13 +379,13 @@ 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(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';

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/mixin/position.js

@@ -21,7 +21,6 @@ export default {
         pos: `bottom-${isRtl ? 'right' : 'left'}`,
         flip: true,
         offset: false,
-        viewportPadding: 10,
     },
 
     connected() {
@@ -60,8 +59,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]) {
@@ -172,10 +176,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 +188,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

@@ -153,11 +153,6 @@ export function scrollParents(element, overflowRe = /auto|scroll|hidden/, scroll
 export function offsetViewport(scrollElement) {
     let viewportElement = getViewport(scrollElement);
 
-    // iOS 12 returns <body> as scrollingElement
-    if (viewportElement === scrollingElement(viewportElement)) {
-        viewportElement = document.documentElement;
-    }
-
     let rect = offset(viewportElement);
     for (let [prop, dir, start, end] of [
         ['width', 'x', 'left', 'right'],
@@ -166,9 +161,8 @@ export function offsetViewport(scrollElement) {
         if (!isWindow(getViewport(viewportElement))) {
             rect[start] += toFloat(css(viewportElement, `border${ucfirst(start)}Width`));
         }
-        rect[prop] = rect[dir] = (
-            isWindow(viewportElement) ? scrollingElement(viewportElement) : viewportElement
-        )[`client${ucfirst(prop)}`];
+        rect[prop] = rect[dir] =
+            viewportElement[(isWindow(viewportElement) ? 'inner' : 'client') + ucfirst(prop)];
         rect[end] = rect[prop] + rect[start];
     }
     return rect;

package/src/less/components/drop.less

@@ -42,6 +42,7 @@
     position: absolute;
     z-index: @drop-z-index;
     --uk-position-offset: @drop-margin;
+    --uk-position-viewport-offset: 10;
     /* 3 */
     box-sizing: border-box;
     width: @drop-width;

package/src/less/components/dropdown.less

@@ -55,6 +55,7 @@
     position: absolute;
     z-index: @dropdown-z-index;
     --uk-position-offset: @dropdown-margin;
+    --uk-position-viewport-offset: 10;
     /* 3 */
     box-sizing: border-box;
     min-width: @dropdown-min-width;

package/src/less/components/navbar.less

@@ -362,6 +362,7 @@
     position: absolute;
     z-index: @navbar-dropdown-z-index;
     --uk-position-offset: @navbar-dropdown-margin;
+    --uk-position-viewport-offset: 10;
     /* 3 */
     box-sizing: border-box;
     width: @navbar-dropdown-width;
@@ -410,6 +411,7 @@
 .uk-navbar-dropdown-dropbar {
     /* 1 */
     --uk-position-offset: @navbar-dropdown-dropbar-margin-top;
+    --uk-position-viewport-offset: 0;
     /* 2 */
     margin-bottom: @navbar-dropdown-dropbar-margin-bottom;
     /* 3 */

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/scss/components/drop.scss

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

package/src/scss/components/dropdown.scss

@@ -55,6 +55,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;
     /* 3 */
     box-sizing: border-box;
     min-width: $dropdown-min-width;

package/src/scss/components/navbar.scss

@@ -362,6 +362,7 @@ $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;
     /* 3 */
     box-sizing: border-box;
     width: $navbar-dropdown-width;
@@ -410,6 +411,7 @@ $navbar-dropbar-z-index:                         $global-z-index - 20 !default;
 .uk-navbar-dropdown-dropbar {
     /* 1 */
     --uk-position-offset: #{$navbar-dropdown-dropbar-margin-top};
+    --uk-position-viewport-offset: 0;
     /* 2 */
     margin-bottom: $navbar-dropdown-dropbar-margin-bottom;
     /* 3 */

package/src/scss/components/tooltip.scss

@@ -51,6 +51,7 @@ $tooltip-font-size:                              12px !default;
     position: absolute;
     z-index: $tooltip-z-index;
     --uk-position-offset: #{$tooltip-margin};
+    --uk-position-viewport-offset: 10;
     /* 3 */
     top: 0;
     /* 4 */

package/tests/drop.html

@@ -15,7 +15,7 @@
                 -webkit-overflow-scrolling: touch;
             }
 
-            .boundary-overflow { width: 200%; }
+            .boundary-overflow { width: 250%; }
 
         </style>
     </head>