uikit 3.11.2-dev.3dfa2c50b → 3.11.2-dev.45194f70c

package/src/js/core/drop.js

@@ -1,4 +1,5 @@
 import Container from '../mixin/container';
+import Lazyload from '../mixin/lazyload';
 import Position from '../mixin/position';
 import Togglable from '../mixin/togglable';
 import {
@@ -30,7 +31,7 @@ import {
 export let active;
 
 export default {
-    mixins: [Container, Position, Togglable],
+    mixins: [Container, Lazyload, Position, Togglable],
 
     args: 'pos',
 
@@ -84,6 +85,7 @@ export default {
                 mode: this.mode,
             }).$el;
             attr(this.target, 'aria-haspopup', true);
+            this.lazyload(this.target);
         }
     },
 

package/src/js/core/form-custom.js

@@ -60,7 +60,7 @@ export default {
             name: 'change',
 
             handler() {
-                this.$update();
+                this.$emit();
             },
         },
 
@@ -72,7 +72,7 @@ export default {
             },
 
             handler() {
-                this.$update();
+                this.$emit();
             },
         },
     ],

package/src/js/core/height-viewport.js

@@ -1,3 +1,4 @@
+import Class from '../mixin/class';
 import {
     boxModelAdjust,
     css,
@@ -14,6 +15,8 @@ import {
 } from 'uikit-util';
 
 export default {
+    mixins: [Class],
+
     props: {
         expand: Boolean,
         offsetTop: Boolean,

package/src/js/core/icon.js

@@ -68,14 +68,14 @@ const Icon = {
     },
 
     methods: {
-        getSvg() {
+        async getSvg() {
             const icon = getIcon(this.icon);
 
             if (!icon) {
-                return Promise.reject('Icon not found.');
+                throw 'Icon not found.';
             }
 
-            return Promise.resolve(icon);
+            return icon;
         },
     },
 };
@@ -137,9 +137,16 @@ export const Close = {
 export const Spinner = {
     extends: IconComponent,
 
-    async connected() {
-        const svg = await this.svg;
-        svg && this.ratio !== 1 && css($('circle', svg), 'strokeWidth', 1 / this.ratio);
+    methods: {
+        async getSvg() {
+            const icon = await Icon.methods.getSvg.call(this);
+
+            if (this.ratio !== 1) {
+                css($('circle', icon), 'strokeWidth', 1 / this.ratio);
+            }
+
+            return icon;
+        },
     },
 };
 

package/src/js/core/img.js

@@ -1,132 +1,116 @@
 import {
+    append,
+    attr,
+    children,
     createEvent,
     css,
-    Dimensions,
+    data,
     escape,
-    getImage,
+    fragment,
+    hasAttr,
+    hasIntersectionObserver,
     includes,
-    isUndefined,
+    isArray,
+    isEmpty,
+    isTag,
+    observeIntersection,
+    parent,
+    parseOptions,
     queryAll,
+    removeAttr,
     startsWith,
     toFloat,
     toPx,
     trigger,
 } from 'uikit-util';
 
+const nativeLazyLoad = 'loading' in HTMLImageElement.prototype;
+
 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)];
             },
 
             watch() {
-                this.observe();
+                this.$reset();
             },
         },
-
-        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' || !hasIntersectionObserver) {
+            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);
+
+            if (this.target.length === 1) {
+                return;
+            }
         }
 
-        this.observer = new IntersectionObserver(this.load, {
-            rootMargin: `${this.offsetTop}px ${this.offsetLeft}px`,
-        });
+        ensureSrcAttribute(this.$el);
 
-        requestAnimationFrame(this.observe);
+        this.registerObserver(
+            observeIntersection(
+                this.target,
+                (entries, observer) => {
+                    this.load();
+                    observer.disconnect();
+                },
+                {
+                    rootMargin: `${toPx(this.offsetTop, 'height')}px ${toPx(
+                        this.offsetLeft,
+                        'width'
+                    )}px`,
+                }
+            )
+        );
     },
 
     disconnected() {
-        this.observer && this.observer.disconnect();
+        if (this._data.image) {
+            this._data.image.onload = '';
+        }
     },
 
     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,42 +119,27 @@ 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();
-        },
-
-        observe() {
-            if (this._connected && !this._data.image) {
-                for (const el of this.target) {
-                    this.observer.observe(el);
-                }
-            }
+            removeAttr(image, 'loading');
+            setSrcAttrs(this.$el, image.currentSrc);
+            return (this._data.image = image);
         },
     },
 };
 
-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 +149,62 @@ 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 +244,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,
-                    })
+                    }
                 );
             },