uikit 3.14.1-dev.e15dd286c → 3.14.2-dev.1d34cc58b

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-dev.e15dd286c",
+    "version": "3.14.2-dev.1d34cc58b",
     "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/api/hooks.js

@@ -105,7 +105,7 @@ export default function (UIkit) {
         const {
             $options: { computed },
         } = this;
-        const values = { ...(initial ? {} : this._computed) };
+        const values = { ...this._computed };
         this._computed = {};
 
         for (const key in computed) {

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/scrollspy.js

@@ -4,6 +4,7 @@ import {
     css,
     filter,
     data as getData,
+    isEqual,
     observeIntersection,
     once,
     removeClass,
@@ -45,13 +46,13 @@ export default {
                 return target ? $$(target, $el) : [$el];
             },
 
-            watch(elements) {
+            watch(elements, prev) {
                 if (this.hidden) {
                     css(filter(elements, `:not(.${this.inViewClass})`), 'visibility', 'hidden');
                 }
 
-                for (const element of elements) {
-                    this._observer.observe(element);
+                if (!isEqual(elements, prev)) {
+                    this.$reset();
                 }
             },
 
@@ -61,10 +62,9 @@ export default {
 
     connected() {
         this._data.elements = new Map();
-
         this.registerObserver(
-            (this._observer = observeIntersection(
-                [],
+            observeIntersection(
+                this.elements,
                 (records) => {
                     const elements = this._data.elements;
                     for (const { target: el, isIntersecting } of records) {
@@ -90,7 +90,7 @@ export default {
                     }px`,
                 },
                 false
-            ))
+            )
         );
     },
 
@@ -98,8 +98,6 @@ export default {
         for (const [el, state] of this._data.elements.entries()) {
             removeClass(el, this.inViewClass, state?.cls || '');
         }
-
-        this._observer = null;
     },
 
     update: [

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,15 +22,11 @@ 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));
+            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 attach = {
@@ -60,8 +45,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,22 +153,18 @@ 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'],
         ['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] = (
-            isWindow(viewportElement) ? scrollingElement(viewportElement) : viewportElement
-        )[`client${ucfirst(prop)}`];
+        rect[prop] = rect[dir] = viewportElement[`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/less/theme/navbar.less

@@ -133,11 +133,13 @@
      * 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; }
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-nav:first-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-item:first-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-toggle:first-child { margin-left: -@navbar-nav-item-padding-horizontal; }
+
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-nav:last-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-item:last-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-toggle:last-child { margin-right: -@navbar-nav-item-padding-horizontal; }
 
     /*
      * Grid Divider

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/src/scss/mixins-theme.scss

@@ -1765,11 +1765,13 @@
      * 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); }
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-nav:first-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-item:first-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-left .uk-navbar-toggle:first-child { margin-left: (-$navbar-nav-item-padding-horizontal); }
+
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-nav:last-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-item:last-child,
+    .uk-container > :not(.uk-navbar-justified) > .uk-navbar-right .uk-navbar-toggle:last-child { margin-right: (-$navbar-nav-item-padding-horizontal); }
 
     /*
      * Grid Divider

package/tests/drop.html

@@ -15,7 +15,7 @@
                 -webkit-overflow-scrolling: touch;
             }
 
-            .boundary-overflow { width: 200%; }
+            .boundary-overflow { width: 250%; }
 
         </style>
     </head>
@@ -260,7 +260,7 @@
             <div class="uk-child-width-1-2@m" uk-grid>
                 <div>
 
-                    <div class="boundary uk-height-medium uk-margin uk-flex uk-flex-between uk-flex-wrap">
+                    <div class="boundary uk-height-medium uk-margin uk-flex uk-flex-around uk-flex-wrap">
                         <div>
 
                             <button class="uk-button uk-button-default" type="button">Bottom Right</button>
@@ -279,6 +279,12 @@
                             <div class="uk-width-medium" uk-dropdown="pos: bottom-left; boundary: !.boundary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div>
 
                         </div>
+                        <div>
+
+                            <button class="uk-button uk-button-default" type="button">Bottom Justify</button>
+                            <div class="uk-width-medium" uk-dropdown="pos: bottom-justify; boundary: !.boundary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div>
+
+                        </div>
                     </div>
 
                 </div>
@@ -303,6 +309,12 @@
                             <div class="uk-width-medium" uk-dropdown="pos: right-top; boundary: !.boundary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div>
 
                         </div>
+                        <div>
+
+                            <button class="uk-button uk-button-default" type="button">Right Justify</button>
+                            <div class="uk-width-medium" uk-dropdown="pos: right-justify; boundary: !.boundary">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</div>
+
+                        </div>
                     </div>
 
                 </div>
@@ -473,6 +485,12 @@
                             <td>200</td>
                             <td>The animation duration.</td>
                         </tr>
+                        <tr>
+                            <td><code>container</code></td>
+                            <td>Boolean</td>
+                            <td>false</td>
+                            <td>Define a target container via a selector to specify where the drop should be appended in the DOM.</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>

package/tests/dropdown.html

@@ -431,6 +431,12 @@
                             <td>200</td>
                             <td>The animation duration.</td>
                         </tr>
+                        <tr>
+                            <td><code>container</code></td>
+                            <td>Boolean</td>
+                            <td>false</td>
+                            <td>Define a target container via a selector to specify where the drop should be appended in the DOM.</td>
+                        </tr>
                     </tbody>
                 </table>
             </div>