uikit 3.11.2-dev.57792c7e7 → 3.11.2-dev.72dbb9a19

package/src/js/mixin/parallax.js

@@ -1,6 +1,19 @@
 import Media from '../mixin/media';
-import {getMaxPathLength} from '../core/svg';
-import {css, Dimensions, each, isNumber, isString, isUndefined, noop, startsWith, toFloat, toPx, ucfirst} from 'uikit-util';
+import { getMaxPathLength } from '../core/svg';
+import {
+    css,
+    Dimensions,
+    each,
+    isNumber,
+    isString,
+    isUndefined,
+    noop,
+    startsWith,
+    toFloat,
+    toPx,
+    trigger,
+    ucfirst,
+} from 'uikit-util';
 
 const props = {
     x: transformFn,
@@ -20,13 +33,12 @@ const props = {
     opacity: cssPropFn,
     stroke: strokeFn,
     bgx: backgroundFn,
-    bgy: backgroundFn
+    bgy: backgroundFn,
 };
 
-const {keys} = Object;
+const { keys } = Object;
 
 export default {
-
     mixins: [Media],
 
     props: fillObject(keys(props), 'list'),
@@ -34,38 +46,41 @@ export default {
     data: fillObject(keys(props), undefined),
 
     computed: {
-
         props(properties, $el) {
             return keys(props).reduce((result, prop) => {
                 if (!isUndefined(properties[prop])) {
-                    result[prop] = props[prop].call(this, prop, $el, properties[prop].slice());
+                    result[prop] = props[prop](prop, $el, properties[prop].slice());
                 }
                 return result;
             }, {});
-        }
+        },
+    },
 
+    events: {
+        bgimageload() {
+            this.$emit();
+        },
     },
 
     methods: {
-
         reset() {
             each(this.getCss(0), (_, prop) => css(this.$el, prop, ''));
         },
 
         getCss(percent) {
-            return keys(this.props).reduce((css, prop) => {
-                this.props[prop](css, percent);
-                return css;
-            }, {transform: '', filter: ''});
-        }
-
-    }
-
+            return keys(this.props).reduce(
+                (css, prop) => {
+                    this.props[prop](css, percent);
+                    return css;
+                },
+                { transform: '', filter: '' }
+            );
+        },
+    },
 };
 
 function transformFn(prop, el, steps) {
-
-    const unit = getUnit(steps) || {x: 'px', y: 'px', rotate: 'deg'}[prop] || '';
+    const unit = getUnit(steps) || { x: 'px', y: 'px', rotate: 'deg' }[prop] || '';
 
     if (prop === 'x' || prop === 'y') {
         prop = `translate${ucfirst(prop)}`;
@@ -89,20 +104,20 @@ function transformFn(prop, el, steps) {
 }
 
 function colorFn(prop, el, steps) {
-
     if (steps.length === 1) {
         steps.unshift(getCssValue(el, prop, ''));
     }
 
-    steps = steps.map(step => parseColor(el, step));
+    steps = steps.map((step) => parseColor(el, step));
 
     return (css, percent) => {
-
         const [start, end, p] = getStep(steps, percent);
-        const value = start.map((value, i) => {
-            value += p * (end[i] - value);
-            return i === 3 ? toFloat(value) : parseInt(value, 10);
-        }).join(',');
+        const value = start
+            .map((value, i) => {
+                value += p * (end[i] - value);
+                return i === 3 ? toFloat(value) : parseInt(value, 10);
+            })
+            .join(',');
         css[prop] = `rgba(${value})`;
     };
 }
@@ -117,13 +132,12 @@ function parseColor(el, color) {
 }
 
 function filterFn(prop, el, steps) {
-
     if (steps.length === 1) {
         steps.unshift(0);
     }
 
-    const unit = getUnit(steps) || {blur: 'px', hue: 'deg'}[prop] || '%';
-    prop = {fopacity: 'opacity', hue: 'hue-rotate'}[prop] || prop;
+    const unit = getUnit(steps) || { blur: 'px', hue: 'deg' }[prop] || '%';
+    prop = { fopacity: 'opacity', hue: 'hue-rotate' }[prop] || prop;
     steps = steps.map(toFloat);
 
     return (css, percent) => {
@@ -133,7 +147,6 @@ function filterFn(prop, el, steps) {
 }
 
 function cssPropFn(prop, el, steps) {
-
     if (steps.length === 1) {
         steps.unshift(getCssValue(el, prop, ''));
     }
@@ -146,7 +159,6 @@ function cssPropFn(prop, el, steps) {
 }
 
 function strokeFn(prop, el, steps) {
-
     if (steps.length === 1) {
         steps.unshift(0);
     }
@@ -154,7 +166,7 @@ function strokeFn(prop, el, steps) {
     const unit = getUnit(steps);
     steps = steps.map(toFloat);
 
-    if (!steps.some(step => step)) {
+    if (!steps.some((step) => step)) {
         return noop;
     }
 
@@ -162,7 +174,7 @@ function strokeFn(prop, el, steps) {
     css(el, 'strokeDasharray', length);
 
     if (unit === '%') {
-        steps = steps.map(step => step * length / 100);
+        steps = steps.map((step) => (step * length) / 100);
     }
 
     steps = steps.reverse();
@@ -173,28 +185,25 @@ function strokeFn(prop, el, steps) {
 }
 
 function backgroundFn(prop, el, steps) {
-
     if (steps.length === 1) {
         steps.unshift(0);
     }
 
     prop = prop.substr(-1);
     const attr = prop === 'y' ? 'height' : 'width';
-    steps = steps.map(step => toPx(step, attr, el));
+    steps = steps.map((step) => toPx(step, attr, el));
 
-    css(el, `background-position-${prop}`, '');
-    const bgPos = css(el, 'backgroundPosition').split(' ')[prop === 'x' ? 0 : 1]; // IE 11 can't read background-position-[x|y]
+    const bgPos = getCssValue(el, `background-position-${prop}`, '');
 
     return getCssValue(el, 'backgroundSize', '') === 'cover'
-        ? backgroundCoverFn.call(this, prop, el, steps, bgPos, attr)
+        ? backgroundCoverFn(prop, el, steps, bgPos, attr)
         : setBackgroundPosFn(prop, steps, bgPos);
 }
 
 function backgroundCoverFn(prop, el, steps, bgPos, attr) {
+    const dimImage = getBackgroundImageDimensions(el);
 
-    const image = getBackgroundImage.call(this, el);
-
-    if (!image.naturalWidth) {
+    if (!dimImage.width) {
         return noop;
     }
 
@@ -207,12 +216,7 @@ function backgroundCoverFn(prop, el, steps, bgPos, attr) {
 
     const dimEl = {
         width: el.offsetWidth,
-        height: el.offsetHeight
-    };
-
-    const dimImage = {
-        width: image.naturalWidth,
-        height: image.naturalHeight
+        height: el.offsetHeight,
     };
 
     const baseDim = Dimensions.cover(dimImage, dimEl);
@@ -221,7 +225,6 @@ function backgroundCoverFn(prop, el, steps, bgPos, attr) {
     if (span < diff) {
         dimEl[attr] = baseDim[attr] + diff - span;
     } else if (span > diff) {
-
         const posPercentage = dimEl[attr] / toPx(bgPos, attr, el, true);
 
         if (posPercentage) {
@@ -245,24 +248,34 @@ function setBackgroundPosFn(prop, steps, pos) {
     };
 }
 
-function getBackgroundImage(el) {
+const dimensions = {};
+function getBackgroundImageDimensions(el) {
     const src = css(el, 'backgroundImage').replace(/^none|url\(["']?(.+?)["']?\)$/, '$1');
 
-    const data = this._data;
-
-    if (data[src]) {
-        return data[src];
+    if (dimensions[src]) {
+        return dimensions[src];
     }
 
+    const image = new Image();
     if (src) {
-        const img = new Image();
-        img.src = src;
-        if (!img.naturalWidth) {
-            img.onload = () => this.$update();
-        }
+        image.src = src;
 
-        return data[src] = img;
+        if (!image.naturalWidth) {
+            image.onload = () => {
+                dimensions[src] = toDimensions(image);
+                trigger(el, 'bgimageload');
+            };
+        }
     }
+
+    return (dimensions[src] = toDimensions(image));
+}
+
+function toDimensions(image) {
+    return {
+        width: image.naturalWidth,
+        height: image.naturalHeight,
+    };
 }
 
 function getStep(steps, percent) {
@@ -271,18 +284,21 @@ function getStep(steps, percent) {
 
     return steps
         .slice(index, index + 2)
-        .concat(percent === 1 ? 1 : percent % (1 / count) * count);
+        .concat(percent === 1 ? 1 : (percent % (1 / count)) * count);
 }
 
 function getValue(steps, percent) {
     const [start, end, p] = getStep(steps, percent);
-    return isNumber(start)
-        ? start + Math.abs(start - end) * p * (start < end ? 1 : -1)
-        : +end;
+    return isNumber(start) ? start + Math.abs(start - end) * p * (start < end ? 1 : -1) : +end;
 }
 
 function getUnit(steps, defaultUnit) {
-    return steps.reduce((unit, step) => unit || isString(step) && step.replace(/[\d-]/g, '').trim(), '') || defaultUnit;
+    return (
+        steps.reduce(
+            (unit, step) => unit || (isString(step) && step.replace(/[\d-]/g, '').trim()),
+            ''
+        ) || defaultUnit
+    );
 }
 
 function getCssValue(el, prop, value) {

package/src/js/mixin/position.js

@@ -1,24 +1,31 @@
-import {$, flipPosition, offset as getOffset, isNumeric, isRtl, positionAt, removeClasses, toggleClass} from 'uikit-util';
+import {
+    $,
+    flipPosition,
+    offset as getOffset,
+    isNumeric,
+    isRtl,
+    positionAt,
+    removeClasses,
+    toggleClass,
+} from 'uikit-util';
 
 export default {
-
     props: {
         pos: String,
         offset: null,
         flip: Boolean,
-        clsPos: String
+        clsPos: String,
     },
 
     data: {
         pos: `bottom-${isRtl ? 'right' : 'left'}`,
         flip: true,
         offset: false,
-        clsPos: ''
+        clsPos: '',
     },
 
     computed: {
-
-        pos({pos}) {
+        pos({ pos }) {
             return pos.split('-').concat('center').slice(0, 2);
         },
 
@@ -28,32 +35,34 @@ export default {
 
         align() {
             return this.pos[1];
-        }
-
+        },
     },
 
     methods: {
-
         positionAt(element, target, boundary) {
-
             removeClasses(element, `${this.clsPos}-(top|bottom|left|right)(-[a-z]+)?`);
 
-            let {offset} = this;
+            let { offset } = this;
             const axis = this.getAxis();
 
             if (!isNumeric(offset)) {
                 const node = $(offset);
                 offset = node
-                    ? getOffset(node)[axis === 'x' ? 'left' : 'top'] - getOffset(target)[axis === 'x' ? 'right' : 'bottom']
+                    ? getOffset(node)[axis === 'x' ? 'left' : 'top'] -
+                      getOffset(target)[axis === 'x' ? 'right' : 'bottom']
                     : 0;
             }
 
-            const {x, y} = positionAt(
+            const { x, y } = positionAt(
                 element,
                 target,
-                axis === 'x' ? `${flipPosition(this.dir)} ${this.align}` : `${this.align} ${flipPosition(this.dir)}`,
+                axis === 'x'
+                    ? `${flipPosition(this.dir)} ${this.align}`
+                    : `${this.align} ${flipPosition(this.dir)}`,
                 axis === 'x' ? `${this.dir} ${this.align}` : `${this.align} ${this.dir}`,
-                axis === 'x' ? `${this.dir === 'left' ? -offset : offset}` : ` ${this.dir === 'top' ? -offset : offset}`,
+                axis === 'x'
+                    ? `${this.dir === 'left' ? -offset : offset}`
+                    : ` ${this.dir === 'top' ? -offset : offset}`,
                 null,
                 this.flip,
                 boundary
@@ -63,13 +72,10 @@ export default {
             this.align = axis === 'x' ? y : x;
 
             toggleClass(element, `${this.clsPos}-${this.dir}-${this.align}`, this.offset === false);
-
         },
 
         getAxis() {
             return this.dir === 'top' || this.dir === 'bottom' ? 'y' : 'x';
-        }
-
-    }
-
+        },
+    },
 };

package/src/js/mixin/slider-autoplay.js

@@ -1,17 +1,16 @@
-import {$, attr, matches} from 'uikit-util';
+import { $, attr, matches } from 'uikit-util';
 
 export default {
-
     props: {
         autoplay: Boolean,
         autoplayInterval: Number,
-        pauseOnHover: Boolean
+        pauseOnHover: Boolean,
     },
 
     data: {
         autoplay: false,
         autoplayInterval: 7000,
-        pauseOnHover: true
+        pauseOnHover: true,
     },
 
     connected() {
@@ -27,9 +26,7 @@ export default {
     },
 
     events: [
-
         {
-
             name: 'visibilitychange',
 
             el() {
@@ -46,32 +43,26 @@ export default {
                 } else {
                     this.startAutoplay();
                 }
-            }
-
-        }
-
+            },
+        },
     ],
 
     methods: {
-
         startAutoplay() {
-
             this.stopAutoplay();
 
             this.interval = setInterval(
-                () => (!this.draggable || !$(':focus', this.$el))
-                    && (!this.pauseOnHover || !matches(this.$el, ':hover'))
-                    && !this.stack.length
-                    && this.show('next'),
+                () =>
+                    (!this.draggable || !$(':focus', this.$el)) &&
+                    (!this.pauseOnHover || !matches(this.$el, ':hover')) &&
+                    !this.stack.length &&
+                    this.show('next'),
                 this.autoplayInterval
             );
-
         },
 
         stopAutoplay() {
             this.interval && clearInterval(this.interval);
-        }
-
-    }
-
+        },
+    },
 };