uikit 3.15.6-dev.fb448ac28 → 3.15.7-dev.a12865820

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.15.6-dev.fb448ac28",
+    "version": "3.15.7-dev.a12865820",
     "main": "dist/js/uikit.js",
     "style": "dist/css/uikit.css",
     "sideEffects": [
@@ -20,7 +20,7 @@
         "prefix": "node build/prefix",
         "scope": "node build/scope",
         "release": "node build/release",
-        "watch": "watch-run -i -p '**/*.less' yarn compile-less",
+        "watch": "watch-run -i -p \"**/*.less\" -- node build/less",
         "eslint": "eslint src/js",
         "eslint-fix": "eslint --fix src/js"
     },

package/src/js/core/accordion.js

@@ -12,7 +12,6 @@ import {
     includes,
     index,
     isInView,
-    noop,
     scrollIntoView,
     toFloat,
     toggleClass,
@@ -116,42 +115,41 @@ export default {
     ],
 
     methods: {
-        toggle(item, animate) {
-            let items = [this.items[getIndex(item, this.items)]];
+        async toggle(item, animate) {
+            item = this.items[getIndex(item, this.items)];
+            let items = [item];
             const activeItems = filter(this.items, `.${this.clsOpen}`);
 
             if (!this.multiple && !includes(activeItems, items[0])) {
                 items = items.concat(activeItems);
             }
 
-            if (
-                !this.collapsible &&
-                activeItems.length < 2 &&
-                !filter(items, `:not(.${this.clsOpen})`).length
-            ) {
+            if (!this.collapsible && activeItems.length < 2 && includes(activeItems, item)) {
                 return;
             }
 
-            for (const el of items) {
-                this.toggleElement(el, !hasClass(el, this.clsOpen), (el, show) => {
-                    toggleClass(el, this.clsOpen, show);
-                    attr($(this.$props.toggle, el), 'aria-expanded', show);
+            await Promise.all(
+                items.map((el) =>
+                    this.toggleElement(el, !includes(activeItems, el), (el, show) => {
+                        toggleClass(el, this.clsOpen, show);
+                        attr($(this.$props.toggle, el), 'aria-expanded', show);
 
-                    if (animate === false || !this.animation) {
-                        hide($(this.content, el), !show);
-                        return;
-                    }
-
-                    return transition(el, show, this).then(() => {
-                        if (show) {
-                            const toggle = $(this.$props.toggle, el);
-                            requestAnimationFrame(() => {
-                                if (!isInView(toggle)) {
-                                    scrollIntoView(toggle, { offset: this.offset });
-                                }
-                            });
+                        if (animate === false || !this.animation) {
+                            hide($(this.content, el), !show);
+                            return;
                         }
-                    }, noop);
+
+                        return transition(el, show, this);
+                    })
+                )
+            );
+
+            if (animate !== false && this.animation && !includes(activeItems, item)) {
+                const toggle = $(this.$props.toggle, item);
+                requestAnimationFrame(() => {
+                    if (!isInView(toggle)) {
+                        scrollIntoView(toggle, { offset: this.offset });
+                    }
                 });
             }
         },

package/src/js/core/drop.js

@@ -30,7 +30,7 @@ import {
     scrollParents,
     within,
 } from 'uikit-util';
-import { preventBackgroundScroll, preventOverscroll } from '../mixin/modal';
+import { isSameSiteAnchor, preventBackgroundScroll, preventOverscroll } from '../mixin/modal';
 
 export let active;
 
@@ -143,11 +143,17 @@ export default {
             name: 'click',
 
             delegate() {
-                return 'a[href^="#"]';
+                return 'a[href*="#"]';
             },
 
-            handler({ defaultPrevented, current: { hash } }) {
-                if (!defaultPrevented && hash && !within(hash, this.$el)) {
+            handler({ defaultPrevented, current }) {
+                const { hash } = current;
+                if (
+                    !defaultPrevented &&
+                    hash &&
+                    isSameSiteAnchor(current) &&
+                    !within(hash, this.$el)
+                ) {
                     this.hide(false);
                 }
             },

package/src/js/core/offcanvas.js

@@ -79,20 +79,6 @@ export default {
     },
 
     events: [
-        {
-            name: 'click',
-
-            delegate() {
-                return 'a[href^="#"]';
-            },
-
-            handler({ current: { hash }, defaultPrevented }) {
-                if (!defaultPrevented && hash && $(hash, document.body)) {
-                    this.hide();
-                }
-            },
-        },
-
         {
             name: 'touchmove',
 

package/src/js/core/scrollspy-nav.js

@@ -11,6 +11,7 @@ import {
     trigger,
 } from 'uikit-util';
 import { getTargetElement } from './scroll';
+import { isSameSiteAnchor } from '../mixin/modal';
 
 export default {
     mixins: [Scroll],
@@ -34,7 +35,7 @@ export default {
     computed: {
         links: {
             get(_, $el) {
-                return $$('a[href^="#"]', $el).filter((el) => el.hash);
+                return $$('a[href*="#"]', $el).filter((el) => el.hash && isSameSiteAnchor(el));
             },
 
             watch(links) {

package/src/js/mixin/modal.js

@@ -81,6 +81,27 @@ export default {
             },
         },
 
+        {
+            name: 'click',
+
+            delegate() {
+                return 'a[href*="#"]';
+            },
+
+            handler({ current, defaultPrevented }) {
+                const { hash } = current;
+                if (
+                    !defaultPrevented &&
+                    hash &&
+                    isSameSiteAnchor(current) &&
+                    !within(hash, this.$el) &&
+                    $(hash, document.body)
+                ) {
+                    this.hide();
+                }
+            },
+        },
+
         {
             name: 'toggle',
 
@@ -361,3 +382,7 @@ function filterChildren(el, fn) {
     });
     return children;
 }
+
+export function isSameSiteAnchor(a) {
+    return ['origin', 'pathname', 'search'].every((part) => a[part] === location[part]);
+}

package/src/js/mixin/slider-drag.js

@@ -14,9 +14,10 @@ import {
 } from 'uikit-util';
 
 const pointerOptions = { passive: false, capture: true };
+const pointerUpOptions = { passive: true, capture: true };
 const pointerDown = 'touchstart mousedown';
 const pointerMove = 'touchmove mousemove';
-const pointerUp = 'touchend touchcancel mouseup click input';
+const pointerUp = 'touchend touchcancel mouseup click input scroll';
 
 export default {
     props: {
@@ -75,7 +76,7 @@ export default {
 
         {
             // iOS workaround for slider stopping if swiping fast
-            name: `${pointerMove} ${pointerUp}`,
+            name: pointerMove,
             el() {
                 return this.list;
             },
@@ -105,7 +106,7 @@ export default {
             on(document, pointerMove, this.move, pointerOptions);
 
             // 'input' event is triggered by video controls
-            on(document, pointerUp, this.end, pointerOptions);
+            on(document, pointerUp, this.end, pointerUpOptions);
 
             css(this.list, 'userSelect', 'none');
         },
@@ -186,7 +187,7 @@ export default {
 
         end() {
             off(document, pointerMove, this.move, pointerOptions);
-            off(document, pointerUp, this.end, pointerOptions);
+            off(document, pointerUp, this.end, pointerUpOptions);
 
             if (this.dragging) {
                 this.dragging = null;