uikit 3.11.2-dev.2b60845fb → 3.11.2-dev.2f4ac8e16

package/src/js/core/img.js

@@ -1,64 +1,52 @@
 import {
+    append,
+    attr,
+    children,
     createEvent,
     css,
-    Dimensions,
+    data,
     escape,
-    getImage,
+    fragment,
+    hasAttr,
     includes,
-    isUndefined,
+    isArray,
+    isEmpty,
+    isTag,
+    parent,
+    parseOptions,
     queryAll,
+    removeAttr,
     startsWith,
     toFloat,
     toPx,
     trigger,
 } from 'uikit-util';
 
+const nativeLazyLoad = 'loading' in HTMLImageElement.prototype;
+const nativeIsIntersecting = 'isIntersecting' in IntersectionObserverEntry.prototype; // Old chromium based browsers (UC Browser) did not implement `isIntersecting`
+
 export default {
     args: 'dataSrc',
 
     props: {
         dataSrc: String,
-        dataSrcset: Boolean,
-        sizes: String,
-        width: Number,
-        height: Number,
+        sources: String,
         offsetTop: String,
         offsetLeft: String,
         target: String,
+        loading: String,
     },
 
     data: {
         dataSrc: '',
-        dataSrcset: false,
-        sizes: false,
-        width: false,
-        height: false,
+        sources: false,
         offsetTop: '50vh',
         offsetLeft: '50vw',
         target: false,
+        loading: 'lazy',
     },
 
     computed: {
-        cacheKey({ dataSrc }) {
-            return `${this.$name}.${dataSrc}`;
-        },
-
-        width({ width, dataWidth }) {
-            return width || dataWidth;
-        },
-
-        height({ height, dataHeight }) {
-            return height || dataHeight;
-        },
-
-        sizes({ sizes, dataSizes }) {
-            return sizes || dataSizes;
-        },
-
-        isImg(_, $el) {
-            return isImg($el);
-        },
-
         target: {
             get({ target }) {
                 return [this.$el, ...queryAll(target, this.$el)];
@@ -68,65 +56,61 @@ export default {
                 this.observe();
             },
         },
-
-        offsetTop({ offsetTop }) {
-            return toPx(offsetTop, 'height');
-        },
-
-        offsetLeft({ offsetLeft }) {
-            return toPx(offsetLeft, 'width');
-        },
     },
 
     connected() {
-        if (!window.IntersectionObserver) {
-            setSrcAttrs(this.$el, this.dataSrc, this.dataSrcset, this.sizes);
+        if (this.loading !== 'lazy' || !window.IntersectionObserver || !nativeIsIntersecting) {
+            this.load();
             return;
         }
 
-        if (storage[this.cacheKey]) {
-            setSrcAttrs(this.$el, storage[this.cacheKey], this.dataSrcset, this.sizes);
-        } else if (this.isImg && this.width && this.height) {
-            setSrcAttrs(this.$el, getPlaceholderImage(this.width, this.height, this.sizes));
-        }
+        if (nativeLazyLoad && isImg(this.$el)) {
+            this.$el.loading = 'lazy';
+            setSrcAttrs(this.$el);
 
-        this.observer = new IntersectionObserver(this.load, {
-            rootMargin: `${this.offsetTop}px ${this.offsetLeft}px`,
-        });
+            if (this.target.length === 1) {
+                return;
+            }
+        }
 
-        requestAnimationFrame(this.observe);
+        ensureSrcAttribute(this.$el);
+
+        const rootMargin = `${toPx(this.offsetTop, 'height')}px ${toPx(
+            this.offsetLeft,
+            'width'
+        )}px`;
+        this.observer = new IntersectionObserver(
+            (entries) => {
+                if (entries.some((entry) => entry.isIntersecting)) {
+                    this.load();
+                    this.observer.disconnect();
+                }
+            },
+            { rootMargin }
+        );
+        this.observe();
     },
 
     disconnected() {
-        this.observer && this.observer.disconnect();
+        if (this._data.image) {
+            this._data.image.onload = '';
+        }
+
+        this.observer?.disconnect();
     },
 
     update: {
-        read({ image }) {
-            if (!this.observer) {
+        write(store) {
+            if (!this.observer || isImg(this.$el)) {
                 return false;
             }
 
-            if (!image && document.readyState === 'complete') {
-                this.load(this.observer.takeRecords());
-            }
-
-            if (this.isImg) {
-                return false;
-            }
-
-            image &&
-                image.then(
-                    (img) => img && img.currentSrc !== '' && setSrcAttrs(this.$el, currentSrc(img))
-                );
-        },
-
-        write(data) {
-            if (this.dataSrcset && window.devicePixelRatio !== 1) {
+            const srcset = data(this.$el, 'data-srcset');
+            if (srcset && window.devicePixelRatio !== 1) {
                 const bgSize = css(this.$el, 'backgroundSize');
-                if (bgSize.match(/^(auto\s?)+$/) || toFloat(bgSize) === data.bgSize) {
-                    data.bgSize = getSourceSize(this.dataSrcset, this.sizes);
-                    css(this.$el, 'backgroundSize', `${data.bgSize}px`);
+                if (bgSize.match(/^(auto\s?)+$/) || toFloat(bgSize) === store.bgSize) {
+                    store.bgSize = getSourceSize(srcset, data(this.$el, 'sizes'));
+                    css(this.$el, 'backgroundSize', `${store.bgSize}px`);
                 }
             }
         },
@@ -135,24 +119,18 @@ export default {
     },
 
     methods: {
-        load(entries) {
-            // Old chromium based browsers (UC Browser) did not implement `isIntersecting`
-            if (
-                !entries.some((entry) => isUndefined(entry.isIntersecting) || entry.isIntersecting)
-            ) {
-                return;
+        load() {
+            if (this._data.image) {
+                return this._data.image;
             }
 
-            this._data.image = getImage(this.dataSrc, this.dataSrcset, this.sizes).then(
-                (img) => {
-                    setSrcAttrs(this.$el, currentSrc(img), img.srcset, img.sizes);
-                    storage[this.cacheKey] = currentSrc(img);
-                    return img;
-                },
-                (e) => trigger(this.$el, new e.constructor(e.type, e))
-            );
+            const image = isImg(this.$el)
+                ? this.$el
+                : getImageFromElement(this.$el, this.dataSrc, this.sources);
 
-            this.observer.disconnect();
+            removeAttr(image, 'loading');
+            setSrcAttrs(this.$el, image.currentSrc);
+            return (this._data.image = image);
         },
 
         observe() {
@@ -165,12 +143,11 @@ export default {
     },
 };
 
-function setSrcAttrs(el, src, srcset, sizes) {
+function setSrcAttrs(el, src) {
     if (isImg(el)) {
-        const set = (prop, val) => val && val !== el[prop] && (el[prop] = val);
-        set('sizes', sizes);
-        set('srcset', srcset);
-        set('src', src);
+        const parentNode = parent(el);
+        const elements = isPicture(parentNode) ? children(parentNode) : [el];
+        elements.forEach((el) => setSourceProps(el, el));
     } else if (src) {
         const change = !includes(el.style.backgroundImage, src);
         if (change) {
@@ -180,16 +157,60 @@ function setSrcAttrs(el, src, srcset, sizes) {
     }
 }
 
-function getPlaceholderImage(width, height, sizes) {
-    if (sizes) {
-        ({ width, height } = Dimensions.ratio(
-            { width, height },
-            'width',
-            toPx(sizesToPixel(sizes))
-        ));
+const srcProps = ['data-src', 'data-srcset', 'sizes'];
+function setSourceProps(sourceEl, targetEl) {
+    srcProps.forEach((prop) => {
+        const value = data(sourceEl, prop);
+        if (value) {
+            attr(targetEl, prop.replace(/^(data-)+/, ''), value);
+        }
+    });
+}
+
+function getImageFromElement(el, src, sources) {
+    const img = new Image();
+
+    wrapInPicture(img, sources);
+    setSourceProps(el, img);
+    img.onload = () => setSrcAttrs(el, img.currentSrc);
+    attr(img, 'src', src);
+    return img;
+}
+
+function wrapInPicture(img, sources) {
+    sources = parseSources(sources);
+
+    if (sources.length) {
+        const picture = fragment('<picture>');
+        for (const attrs of sources) {
+            const source = fragment('<source>');
+            attr(source, attrs);
+            append(picture, source);
+        }
+        append(picture, img);
+    }
+}
+
+function parseSources(sources) {
+    if (!sources) {
+        return [];
+    }
+
+    if (startsWith(sources, '[')) {
+        try {
+            sources = JSON.parse(sources);
+        } catch (e) {
+            sources = [];
+        }
+    } else {
+        sources = parseOptions(sources);
     }
 
-    return `data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="${width}" height="${height}"></svg>`;
+    if (!isArray(sources)) {
+        sources = [sources];
+    }
+
+    return sources.filter((source) => !isEmpty(source));
 }
 
 const sizesRe = /\s*(.*?)\s*(\w+|calc\(.*?\))\s*(?:,|$)/g;
@@ -229,22 +250,16 @@ function getSourceSize(srcset, sizes) {
     return descriptors.filter((size) => size >= srcSize)[0] || descriptors.pop() || '';
 }
 
-function isImg(el) {
-    return el.tagName === 'IMG';
+function ensureSrcAttribute(el) {
+    if (isImg(el) && !hasAttr(el, 'src')) {
+        attr(el, 'src', 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"></svg>');
+    }
 }
 
-function currentSrc(el) {
-    return el.currentSrc || el.src;
+function isPicture(el) {
+    return isTag(el, 'picture');
 }
 
-const key = '__test__';
-let storage;
-
-// workaround for Safari's private browsing mode and accessing sessionStorage in Blink
-try {
-    storage = window.sessionStorage || {};
-    storage[key] = 1;
-    delete storage[key];
-} catch (e) {
-    storage = {};
+function isImg(el) {
+    return isTag(el, 'img');
 }

package/src/js/core/modal.js

@@ -2,7 +2,6 @@ import Modal from '../mixin/modal';
 import {
     $,
     addClass,
-    assign,
     css,
     Deferred,
     hasClass,
@@ -136,7 +135,7 @@ function install({ modal }) {
     };
 
     function openDialog(tmpl, options, hideFn, submitFn) {
-        options = assign({ bgClose: false, escClose: true, labels: modal.labels }, options);
+        options = { bgClose: false, escClose: true, labels: modal.labels, ...options };
 
         const dialog = modal.dialog(tmpl(options), options);
         const deferred = new Deferred();

package/src/js/core/navbar.js

@@ -6,7 +6,6 @@ import {
     $$,
     addClass,
     after,
-    assign,
     css,
     findIndex,
     hasAttr,
@@ -126,11 +125,12 @@ export default {
                 this.$create(
                     'drop',
                     dropdowns.filter((el) => !this.getDropdown(el)),
-                    assign({}, this.$props, {
+                    {
+                        ...this.$props,
                         boundary: this.boundary,
                         pos: this.pos,
                         offset: this.dropbar || this.offset,
-                    })
+                    }
                 );
             },
 

package/src/js/core/sticky.js

@@ -213,7 +213,7 @@ export default {
                     margin,
                     width: dimensions(isVisible(this.widthElement) ? this.widthElement : this.$el)
                         .width,
-                    top: offsetPosition(this.placeholder)[0],
+                    top: offsetPosition(referenceElement)[0],
                 };
             },
 

package/src/js/core/svg.js

@@ -5,10 +5,12 @@ import {
     append,
     attr,
     includes,
+    isTag,
     isVisible,
     isVoidElement,
     memoize,
     noop,
+    once,
     remove,
     removeAttr,
     startsWith,
@@ -94,6 +96,12 @@ export default {
 
     methods: {
         async getSvg() {
+            if (isTag(this.$el, 'img') && !this.$el.complete && this.$el.loading === 'lazy') {
+                return new Promise((resolve) =>
+                    once(this.$el, 'load', () => resolve(this.getSvg()))
+                );
+            }
+
             return parseSVG(await loadSVG(this.src), this.icon) || Promise.reject('SVG not found.');
         },
 
@@ -193,7 +201,7 @@ export function getMaxPathLength(el) {
 }
 
 function insertSVG(el, root) {
-    if (isVoidElement(root) || root.tagName === 'CANVAS') {
+    if (isVoidElement(root) || isTag(root, 'canvas')) {
         root.hidden = true;
 
         const next = root.nextElementSibling;
@@ -205,11 +213,7 @@ function insertSVG(el, root) {
 }
 
 function equals(el, other) {
-    return isSVG(el) && isSVG(other) && innerHTML(el) === innerHTML(other);
-}
-
-function isSVG(el) {
-    return el?.tagName === 'svg';
+    return isTag(el, 'svg') && isTag(other, 'svg') && innerHTML(el) === innerHTML(other);
 }
 
 function innerHTML(el) {

package/src/js/core/toggle.js

@@ -7,6 +7,7 @@ import {
     includes,
     isBoolean,
     isFocusable,
+    isTag,
     isTouch,
     matches,
     once,
@@ -134,7 +135,7 @@ export default {
             name: 'keydown',
 
             filter() {
-                return includes(this.mode, 'click') && this.$el.tagName !== 'INPUT';
+                return includes(this.mode, 'click') && isTag(this.$el, 'input');
             },
 
             handler(e) {

package/src/js/mixin/internal/animate-slide.js

@@ -1,5 +1,4 @@
 import {
-    assign,
     children,
     css,
     fastdom,
@@ -44,7 +43,7 @@ export default function (action, target, duration) {
 
                 // Reset to previous state
                 nodes.forEach((el, i) => propsFrom[i] && css(el, propsFrom[i]));
-                css(target, assign({ display: 'block' }, targetProps));
+                css(target, { display: 'block', ...targetProps });
 
                 // Start transitions on next frame
                 requestAnimationFrame(() => {
@@ -76,16 +75,14 @@ function getProps(el, opacity) {
     const zIndex = css(el, 'zIndex');
 
     return isVisible(el)
-        ? assign(
-              {
-                  display: '',
-                  opacity: opacity ? css(el, 'opacity') : '0',
-                  pointerEvents: 'none',
-                  position: 'absolute',
-                  zIndex: zIndex === 'auto' ? index(el) : zIndex,
-              },
-              getPositionWithMargin(el)
-          )
+        ? {
+              display: '',
+              opacity: opacity ? css(el, 'opacity') : '0',
+              pointerEvents: 'none',
+              position: 'absolute',
+              zIndex: zIndex === 'auto' ? index(el) : zIndex,
+              ...getPositionWithMargin(el),
+          }
         : false;
 }