uikit 3.11.2-dev.f2970ffaa → 3.12.0

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]`;
@@ -38,50 +39,33 @@ export function isFocusable(element) {
 }
 
 export function parent(element) {
-    element = toNode(element);
-    return element && isElement(element.parentNode) && element.parentNode;
+    return toNode(element)?.parentElement;
 }
 
 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 +87,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

@@ -10,10 +10,10 @@ export * from './fastdom';
 export * from './filter';
 export * from './lang';
 export * from './mouse';
+export * from './observer';
 export * from './options';
 export * from './player';
 export * from './position';
-export * from './promise';
 export * from './selector';
 export * from './style';
 export * from './viewport';