uikit 3.9.3 → 3.9.5-dev.600ee2ba9

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.9.3",
+  "version": "3.9.5-dev.600ee2ba9",
   "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-less": "watch-run -i -p 'src/less/**/*.less' yarn compile-less",
+    "watch": "watch-run -i -p 'src/less/**/*.less' yarn compile-less",
     "eslint": "eslint src/js",
     "eslint-fix": "eslint --fix src/js"
   },

package/src/js/core/drop.js

@@ -1,7 +1,7 @@
 import Container from '../mixin/container';
 import Position from '../mixin/position';
 import Togglable from '../mixin/togglable';
-import {addClass, append, apply, css, hasClass, includes, isTouch, matches, MouseTracker, offset, on, once, parent, pointerCancel, pointerDown, pointerEnter, pointerLeave, pointerUp, query, removeClass, toggleClass, within} from 'uikit-util';
+import {addClass, append, apply, attr, css, hasClass, includes, isTouch, matches, MouseTracker, offset, on, once, parent, pointerCancel, pointerDown, pointerEnter, pointerLeave, pointerUp, query, removeClass, toggleClass, within} from 'uikit-util';
 
 export let active;
 
@@ -62,7 +62,8 @@ export default {
             this.target = this.$create('toggle', query(this.toggle, this.$el), {
                 target: this.$el,
                 mode: this.mode
-            });
+            }).$el;
+            attr(this.target, 'aria-haspopup', true);
         }
 
     },

package/src/js/core/img.js

@@ -1,4 +1,4 @@
-import {createEvent, css, Dimensions, escape, getImage, includes, isUndefined, queryAll, startsWith, toFloat, toPx, trigger} from 'uikit-util';
+import {attr, children, createEvent, css, data, Dimensions, escape, getImage, includes, isUndefined, once, parent, queryAll, startsWith, toFloat, toPx, trigger} from 'uikit-util';
 
 export default {
 
@@ -6,8 +6,6 @@ export default {
 
     props: {
         dataSrc: String,
-        dataSrcset: Boolean,
-        sizes: String,
         width: Number,
         height: Number,
         offsetTop: String,
@@ -17,8 +15,6 @@ export default {
 
     data: {
         dataSrc: '',
-        dataSrcset: false,
-        sizes: false,
         width: false,
         height: false,
         offsetTop: '50vh',
@@ -32,22 +28,6 @@ export default {
             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}) {
@@ -73,14 +53,14 @@ export default {
     connected() {
 
         if (!window.IntersectionObserver) {
-            setSrcAttrs(this.$el, this.dataSrc, this.dataSrcset, this.sizes);
+            setSrcAttrs(this.$el);
             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));
+            setSrcAttrs(this.$el, storage[this.cacheKey]);
+        } else if (isImg(this.$el) && this.width && this.height) {
+            attr(this.$el, 'src', getPlaceholderImage(this.$el));
         }
 
         this.observer = new IntersectionObserver(this.load, {
@@ -107,7 +87,7 @@ export default {
                 this.load(this.observer.takeRecords());
             }
 
-            if (this.isImg) {
+            if (isImg(this.$el)) {
                 return false;
             }
 
@@ -115,14 +95,15 @@ export default {
 
         },
 
-        write(data) {
+        write(store) {
 
-            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`);
                 }
 
             }
@@ -142,9 +123,9 @@ export default {
                 return;
             }
 
-            this._data.image = getImage(this.dataSrc, this.dataSrcset, this.sizes).then(img => {
+            this._data.image = getImageFromElement(this.$el, this.dataSrc).then(img => {
 
-                setSrcAttrs(this.$el, currentSrc(img), img.srcset, img.sizes);
+                setSrcAttrs(this.$el, currentSrc(img));
                 storage[this.cacheKey] = currentSrc(img);
                 return img;
 
@@ -163,13 +144,20 @@ export default {
 
 };
 
-function setSrcAttrs(el, src, srcset, sizes) {
+const srcProps = ['data-src', 'data-srcset', 'sizes'];
+function setSrcAttrs(el, src) {
 
+    const parentNode = parent(el);
     if (isImg(el)) {
-        const set = (prop, val) => val && val !== el[prop] && (el[prop] = val);
-        set('sizes', sizes);
-        set('srcset', srcset);
-        set('src', src);
+        (isPicture(parentNode) ? children(parentNode) : [el]).forEach(el =>
+            srcProps.forEach(prop => {
+                const value = data(el, prop);
+                if (value) {
+                    attr(el, prop.replace(/^(data-)+/, ''), value);
+                }
+            })
+        );
+        attr(el, 'src', src);
     } else if (src) {
 
         const change = !includes(el.style.backgroundImage, src);
@@ -182,7 +170,10 @@ function setSrcAttrs(el, src, srcset, sizes) {
 
 }
 
-function getPlaceholderImage(width, height, sizes) {
+function getPlaceholderImage(el) {
+    const sizes = data(el, 'sizes');
+    let width = data(el, 'width');
+    let height = data(el, 'height');
 
     if (sizes) {
         ({width, height} = Dimensions.ratio({width, height}, 'width', toPx(sizesToPixel(sizes))));
@@ -207,6 +198,24 @@ function sizesToPixel(sizes) {
     return matches || '100vw';
 }
 
+function getImageFromElement(el, src) {
+    const parentNode = parent(el);
+
+    if (!src) {
+        return Promise.reject(createEvent('error', false));
+    }
+
+    if (!isPicture(parentNode)) {
+        return getImage(src, ...srcProps.slice(1).map(prop => data(el, prop)));
+    }
+
+    return new Promise((resolve, reject) => {
+        const picture = parentNode.cloneNode(true);
+        once(picture, 'load error', e => e.type === 'error' ? reject(e) : resolve(e.target), true);
+        setSrcAttrs(el);
+    });
+}
+
 const sizeRe = /\d+(?:\w+|%)/g;
 const additionRe = /[+-]?(\d+)/g;
 function evaluateSize(size) {
@@ -228,8 +237,16 @@ function getSourceSize(srcset, sizes) {
     return descriptors.filter(size => size >= srcSize)[0] || descriptors.pop() || '';
 }
 
+function isPicture(el) {
+    return isA(el, 'PICTURE');
+}
+
 function isImg(el) {
-    return el.tagName === 'IMG';
+    return isA(el, 'IMG');
+}
+
+function isA(el, tagName) {
+    return el && el.tagName === tagName;
 }
 
 function currentSrc(el) {

package/src/js/core/sticky.js

@@ -146,9 +146,10 @@ export default {
 
                 height = !this.isActive ? this.$el.offsetHeight : height;
 
-                this.topOffset = offset(this.isFixed ? this.placeholder : this.$el).top;
+                const referenceElement = this.isFixed ? this.placeholder : this.$el;
+                this.topOffset = offset(referenceElement).top;
                 this.bottomOffset = this.topOffset + height;
-                this.offsetParentTop = offset(this.$el.offsetParent).top;
+                this.offsetParentTop = offset(referenceElement.offsetParent).top;
 
                 const bottom = parseProp('bottom', this);