uikit 3.11.2-dev.28b7953b9 → 3.11.2-dev.3cbd0b859

package/src/js/util/dom.js

@@ -1,10 +1,9 @@
-import {once} from './event';
-import {parent} from './filter';
-import {find, findAll} from './selector';
-import {isElement, isString, isUndefined, toNode, toNodes} from './lang';
+import { once } from './event';
+import { parent } from './filter';
+import { find, findAll } from './selector';
+import { isElement, isString, isUndefined, startsWith, toNode, toNodes } from './lang';
 
 export function ready(fn) {
-
     if (document.readyState !== 'loading') {
         fn();
         return;
@@ -14,62 +13,48 @@ export function ready(fn) {
 }
 
 export function empty(element) {
-    element = $(element);
-    element.innerHTML = '';
-    return element;
+    return replaceChildren(element, '');
 }
 
 export function html(parent, html) {
-    parent = $(parent);
-    return isUndefined(html)
-        ? parent.innerHTML
-        : append(parent.hasChildNodes() ? empty(parent) : parent, html);
+    return isUndefined(html) ? $(parent).innerHTML : replaceChildren(parent, html);
 }
 
-export function prepend(parent, element) {
-
-    parent = $(parent);
+export function replaceChildren(parent, element) {
+    const nodes = $$(element);
+    $(parent).replaceChildren(...nodes);
+    return nodes;
+}
 
-    if (parent.hasChildNodes()) {
-        return insertNodes(element, element => parent.insertBefore(element, parent.firstChild));
-    } else {
-        return append(parent, element);
-    }
+export function prepend(parent, element) {
+    const nodes = $$(element);
+    $(parent).prepend(...nodes);
+    return nodes;
 }
 
 export function append(parent, element) {
-    parent = $(parent);
-    return insertNodes(element, element => parent.appendChild(element));
+    const nodes = $$(element);
+    $(parent).append(...nodes);
+    return nodes;
 }
 
 export function before(ref, element) {
-    ref = $(ref);
-    return insertNodes(element, element => ref.parentNode.insertBefore(element, ref));
+    const nodes = $$(element);
+    $(ref).before(...nodes);
+    return nodes;
 }
 
 export function after(ref, element) {
-    ref = $(ref);
-    return insertNodes(element, element => ref.nextSibling
-        ? before(ref.nextSibling, element)
-        : append(ref.parentNode, element)
-    );
-}
-
-function insertNodes(element, fn) {
-    element = isString(element) ? fragment(element) : element;
-    return element
-        ? 'length' in element
-            ? toNodes(element).map(fn)
-            : fn(element)
-        : null;
+    const nodes = $$(element);
+    $(ref).after(...nodes);
+    return nodes;
 }
 
 export function remove(element) {
-    toNodes(element).forEach(element => element.parentNode && element.parentNode.removeChild(element));
+    toNodes(element).forEach((element) => element.remove());
 }
 
 export function wrapAll(element, structure) {
-
     structure = toNode(before(element, structure));
 
     while (structure.firstChild) {
@@ -82,44 +67,30 @@ export function wrapAll(element, structure) {
 }
 
 export function wrapInner(element, structure) {
-    return toNodes(toNodes(element).map(element =>
-        element.hasChildNodes ? wrapAll(toNodes(element.childNodes), structure) : append(element, structure)
-    ));
+    return toNodes(
+        toNodes(element).map((element) =>
+            element.hasChildNodes
+                ? wrapAll(toNodes(element.childNodes), structure)
+                : append(element, structure)
+        )
+    );
 }
 
 export function unwrap(element) {
     toNodes(element)
         .map(parent)
         .filter((value, index, self) => self.indexOf(value) === index)
-        .forEach(parent => {
-            before(parent, parent.childNodes);
-            remove(parent);
-        });
+        .forEach((parent) => parent.replaceWith(...parent.childNodes));
 }
 
-const fragmentRe = /^\s*<(\w+|!)[^>]*>/;
-const singleTagRe = /^<(\w+)\s*\/?>(?:<\/\1>)?$/;
-
 export function fragment(html) {
-
-    const matches = singleTagRe.exec(html);
-    if (matches) {
-        return document.createElement(matches[1]);
-    }
-
-    const container = document.createElement('div');
-    if (fragmentRe.test(html)) {
-        container.insertAdjacentHTML('beforeend', html.trim());
-    } else {
-        container.textContent = html;
-    }
-
-    return container.childNodes.length > 1 ? toNodes(container.childNodes) : container.firstChild;
-
+    const template = document.createElement('template');
+    template.innerHTML = html;
+    const { childNodes } = template.content;
+    return childNodes.length > 1 ? toNodes(childNodes) : childNodes[0];
 }
 
 export function apply(node, fn) {
-
     if (!isElement(node)) {
         return;
     }
@@ -134,17 +105,13 @@ export function apply(node, fn) {
 }
 
 export function $(selector, context) {
-    return isHtml(selector)
-        ? toNode(fragment(selector))
-        : find(selector, context);
+    return isHtml(selector) ? toNode(fragment(selector)) : find(selector, context);
 }
 
 export function $$(selector, context) {
-    return isHtml(selector)
-        ? toNodes(fragment(selector))
-        : findAll(selector, context);
+    return isHtml(selector) ? toNodes(fragment(selector)) : findAll(selector, context);
 }
 
 function isHtml(str) {
-    return isString(str) && (str[0] === '<' || str.match(/^\s*</));
+    return isString(str) && startsWith(str.trim(), '<');
 }

package/src/js/util/env.js

@@ -1,19 +1,14 @@
-/* global DocumentTouch */
-import {attr} from './attr';
+import { attr } from './attr';
 
 export const inBrowser = typeof window !== 'undefined';
-export const isIE = inBrowser && /msie|trident/i.test(window.navigator.userAgent);
 export const isRtl = inBrowser && attr(document.documentElement, 'dir') === 'rtl';
 
-const hasTouchEvents = inBrowser && 'ontouchstart' in window;
+export const hasTouch = inBrowser && 'ontouchstart' in window;
 const hasPointerEvents = inBrowser && window.PointerEvent;
-export const hasTouch = inBrowser && (hasTouchEvents
-    || window.DocumentTouch && document instanceof DocumentTouch
-    || navigator.maxTouchPoints); // IE >=11
 
-export const pointerDown = hasPointerEvents ? 'pointerdown' : hasTouchEvents ? 'touchstart' : 'mousedown';
-export const pointerMove = hasPointerEvents ? 'pointermove' : hasTouchEvents ? 'touchmove' : 'mousemove';
-export const pointerUp = hasPointerEvents ? 'pointerup' : hasTouchEvents ? 'touchend' : 'mouseup';
-export const pointerEnter = hasPointerEvents ? 'pointerenter' : hasTouchEvents ? '' : 'mouseenter';
-export const pointerLeave = hasPointerEvents ? 'pointerleave' : hasTouchEvents ? '' : 'mouseleave';
+export const pointerDown = hasPointerEvents ? 'pointerdown' : hasTouch ? 'touchstart' : 'mousedown';
+export const pointerMove = hasPointerEvents ? 'pointermove' : hasTouch ? 'touchmove' : 'mousemove';
+export const pointerUp = hasPointerEvents ? 'pointerup' : hasTouch ? 'touchend' : 'mouseup';
+export const pointerEnter = hasPointerEvents ? 'pointerenter' : hasTouch ? '' : 'mouseenter';
+export const pointerLeave = hasPointerEvents ? 'pointerleave' : hasTouch ? '' : 'mouseleave';
 export const pointerCancel = hasPointerEvents ? 'pointercancel' : 'touchcancel';

package/src/js/util/event.js

@@ -1,19 +1,15 @@
-import {isIE} from './env';
-import {findAll} from './selector';
-import {closest, within} from './filter';
-import {isArray, isBoolean, isFunction, isString, toNode, toNodes} from './lang';
+import { findAll } from './selector';
+import { closest, within } from './filter';
+import { isArray, isFunction, isString, toNode, toNodes } from './lang';
 
 export function on(...args) {
-
-    let [targets, type, selector, listener, useCapture] = getArgs(args);
-
-    targets = toEventTargets(targets);
+    let [targets, types, selector, listener, useCapture = false] = getArgs(args);
 
     if (listener.length > 1) {
         listener = detail(listener);
     }
 
-    if (useCapture && useCapture.self) {
+    if (useCapture?.self) {
         listener = selfFilter(listener);
     }
 
@@ -21,80 +17,92 @@ export function on(...args) {
         listener = delegate(selector, listener);
     }
 
-    useCapture = useCaptureFilter(useCapture);
+    for (const type of types) {
+        for (const target of targets) {
+            target.addEventListener(type, listener, useCapture);
+        }
+    }
 
-    type.split(' ').forEach(type =>
-        targets.forEach(target =>
-            target.addEventListener(type, listener, useCapture)
-        )
-    );
-    return () => off(targets, type, listener, useCapture);
+    return () => off(targets, types, listener, useCapture);
 }
 
-export function off(targets, type, listener, useCapture = false) {
-    useCapture = useCaptureFilter(useCapture);
-    targets = toEventTargets(targets);
-    type.split(' ').forEach(type =>
-        targets.forEach(target =>
-            target.removeEventListener(type, listener, useCapture)
-        )
-    );
+export function off(...args) {
+    let [targets, types, , listener, useCapture = false] = getArgs(args);
+    for (const type of types) {
+        for (const target of targets) {
+            target.removeEventListener(type, listener, useCapture);
+        }
+    }
 }
 
 export function once(...args) {
-
-    const [element, type, selector, listener, useCapture, condition] = getArgs(args);
-    const off = on(element, type, selector, e => {
-        const result = !condition || condition(e);
-        if (result) {
-            off();
-            listener(e, result);
-        }
-    }, useCapture);
+    const [element, types, selector, listener, useCapture = false, condition] = getArgs(args);
+    const off = on(
+        element,
+        types,
+        selector,
+        (e) => {
+            const result = !condition || condition(e);
+            if (result) {
+                off();
+                listener(e, result);
+            }
+        },
+        useCapture
+    );
 
     return off;
 }
 
 export function trigger(targets, event, detail) {
-    return toEventTargets(targets).reduce((notCanceled, target) =>
-            notCanceled && target.dispatchEvent(createEvent(event, true, true, detail))
-        , true);
+    return toEventTargets(targets).every((target) =>
+        target.dispatchEvent(createEvent(event, true, true, detail))
+    );
 }
 
 export function createEvent(e, bubbles = true, cancelable = false, detail) {
     if (isString(e)) {
-        const event = document.createEvent('CustomEvent'); // IE 11
-        event.initCustomEvent(e, bubbles, cancelable, detail);
-        e = event;
+        e = new CustomEvent(e, { bubbles, cancelable, detail });
     }
 
     return e;
 }
 
 function getArgs(args) {
+    // Event targets
+    args[0] = toEventTargets(args[0]);
+
+    // Event types
+    if (isString(args[1])) {
+        args[1] = args[1].split(' ');
+    }
+
+    // Delegate?
     if (isFunction(args[2])) {
         args.splice(2, 0, false);
     }
+
     return args;
 }
 
 function delegate(selector, listener) {
-    return e => {
-
-        const current = selector[0] === '>'
-            ? findAll(selector, e.currentTarget).reverse().filter(element => within(e.target, element))[0]
-            : closest(e.target, selector);
+    return (e) => {
+        const current =
+            selector[0] === '>'
+                ? findAll(selector, e.currentTarget)
+                      .reverse()
+                      .filter((element) => within(e.target, element))[0]
+                : closest(e.target, selector);
 
         if (current) {
             e.current = current;
             listener.call(this, e);
         }
-
     };
 }
 
 function detail(listener) {
-    return e => isArray(e.detail) ? listener(e, ...e.detail) : listener(e);
+    return (e) => (isArray(e.detail) ? listener(e, ...e.detail) : listener(e));
 }
 
 function selfFilter(listener) {
@@ -105,12 +113,6 @@ function selfFilter(listener) {
     };
 }
 
-function useCaptureFilter(options) {
-    return options && isIE && !isBoolean(options)
-        ? !!options.capture
-        : options;
-}
-
 function isEventTarget(target) {
     return target && 'addEventListener' in target;
 }
@@ -123,10 +125,10 @@ export function toEventTargets(target) {
     return isArray(target)
         ? target.map(toEventTarget).filter(Boolean)
         : isString(target)
-            ? findAll(target)
-            : isEventTarget(target)
-                ? [target]
-                : toNodes(target);
+        ? findAll(target)
+        : isEventTarget(target)
+        ? [target]
+        : toNodes(target);
 }
 
 export function isTouch(e) {
@@ -134,8 +136,7 @@ export function isTouch(e) {
 }
 
 export function getEventPos(e) {
-    const {touches, changedTouches} = e;
-    const {clientX: x, clientY: y} = touches && touches[0] || changedTouches && changedTouches[0] || e;
+    const { clientX: x, clientY: y } = e.touches?.[0] || e.changedTouches?.[0] || e;
 
-    return {x, y};
+    return { x, y };
 }

package/src/js/util/fastdom.js

@@ -1,4 +1,3 @@
-import {Promise} from './promise';
 /*
     Based on:
     Copyright (c) 2016 Wilson Page wilsonpage@me.com
@@ -6,7 +5,6 @@ import {Promise} from './promise';
 */
 
 export const fastdom = {
-
     reads: [],
     writes: [],
 
@@ -27,8 +25,7 @@ export const fastdom = {
         remove(this.writes, task);
     },
 
-    flush
-
+    flush,
 };
 
 function flush(recursion) {
@@ -44,7 +41,6 @@ function flush(recursion) {
 
 const RECURSION_LIMIT = 4;
 function scheduleFlush(recursion) {
-
     if (fastdom.scheduled) {
         return;
     }
@@ -55,7 +51,6 @@ function scheduleFlush(recursion) {
     } else {
         requestAnimationFrame(() => flush(1));
     }
-
 }
 
 function runTasks(tasks) {

package/src/js/util/filter.js

@@ -1,5 +1,4 @@
-import {inBrowser} from './env';
-import {isDocument, isElement, isString, noop, startsWith, toNode, toNodes} from './lang';
+import { isElement, isString, startsWith, toNode, toNodes } from './lang';
 
 const voidElements = {
     area: true,
@@ -17,19 +16,21 @@ const voidElements = {
     param: true,
     source: true,
     track: true,
-    wbr: true
+    wbr: true,
 };
 export function isVoidElement(element) {
-    return toNodes(element).some(element => voidElements[element.tagName.toLowerCase()]);
+    return toNodes(element).some((element) => voidElements[element.tagName.toLowerCase()]);
 }
 
 export function isVisible(element) {
-    return toNodes(element).some(element => element.offsetWidth || element.offsetHeight || element.getClientRects().length);
+    return toNodes(element).some(
+        (element) => element.offsetWidth || element.offsetHeight || element.getClientRects().length
+    );
 }
 
 export const selInput = 'input,select,textarea,button';
 export function isInput(element) {
-    return toNodes(element).some(element => matches(element, selInput));
+    return toNodes(element).some((element) => matches(element, selInput));
 }
 
 export const selFocusable = `${selInput},a[href],[tabindex]`;
@@ -43,45 +44,29 @@ export function parent(element) {
 }
 
 export function filter(element, selector) {
-    return toNodes(element).filter(element => matches(element, selector));
+    return toNodes(element).filter((element) => matches(element, selector));
 }
 
-const elProto = inBrowser ? Element.prototype : {};
-const matchesFn = elProto.matches || elProto.webkitMatchesSelector || elProto.msMatchesSelector || noop;
-
 export function matches(element, selector) {
-    return toNodes(element).some(element => matchesFn.call(element, selector));
+    return toNodes(element).some((element) => element.matches(selector));
 }
 
-const closestFn = elProto.closest || function (selector) {
-    let ancestor = this;
-
-    do {
-
-        if (matches(ancestor, selector)) {
-            return ancestor;
-        }
-
-    } while ((ancestor = parent(ancestor)));
-};
-
 export function closest(element, selector) {
-
     if (startsWith(selector, '>')) {
         selector = selector.slice(1);
     }
 
     return isElement(element)
-        ? closestFn.call(element, selector)
-        : toNodes(element).map(element => closest(element, selector)).filter(Boolean);
+        ? element.closest(selector)
+        : toNodes(element)
+              .map((element) => closest(element, selector))
+              .filter(Boolean);
 }
 
 export function within(element, selector) {
-    return !isString(selector)
-        ? element === selector || (isDocument(selector)
-            ? selector.documentElement
-            : toNode(selector)).contains(toNode(element)) // IE 11 document does not implement contains
-        : matches(element, selector) || !!closest(element, selector);
+    return isString(selector)
+        ? matches(element, selector) || !!closest(element, selector)
+        : element === selector || toNode(selector).contains(toNode(element));
 }
 
 export function parents(element, selector) {
@@ -103,7 +88,5 @@ export function children(element, selector) {
 }
 
 export function index(element, ref) {
-    return ref
-        ? toNodes(element).indexOf(toNode(ref))
-        : children(parent(element)).indexOf(element);
+    return ref ? toNodes(element).indexOf(toNode(ref)) : children(parent(element)).indexOf(element);
 }

package/src/js/util/index.js

@@ -13,7 +13,6 @@ export * from './mouse';
 export * from './options';
 export * from './player';
 export * from './position';
-export * from './promise';
 export * from './selector';
 export * from './style';
 export * from './viewport';