uikit 3.11.2-dev.31cd2ba38 → 3.11.2-dev.4274bc35b

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, trigger, ucfirst} from 'uikit-util';
+import { getMaxPathLength } from '../core/svg';
+import {
+    css,
+    Dimensions,
+    each,
+    findIndex,
+    isNumber,
+    isString,
+    isUndefined,
+    noop,
+    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,7 +46,6 @@ export default {
     data: fillObject(keys(props), undefined),
 
     computed: {
-
         props(properties, $el) {
             return keys(props).reduce((result, prop) => {
                 if (!isUndefined(properties[prop])) {
@@ -42,73 +53,67 @@ export default {
                 }
                 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] || '';
+function transformFn(prop, el, stops) {
+    const unit = getUnit(stops) || { x: 'px', y: 'px', rotate: 'deg' }[prop] || '';
+    let transformFn;
 
     if (prop === 'x' || prop === 'y') {
         prop = `translate${ucfirst(prop)}`;
+        transformFn = (stop) => toFloat(toFloat(stop).toFixed(unit === 'px' ? 0 : 6));
     }
 
-    steps = steps.map(toFloat);
-
-    if (steps.length === 1) {
-        steps.unshift(prop === 'scale' ? 1 : 0);
+    if (stops.length === 1) {
+        stops.unshift(prop === 'scale' ? 1 : 0);
     }
 
-    return (css, percent) => {
-        let value = getValue(steps, percent);
-
-        if (startsWith(prop, 'translate')) {
-            value = toFloat(value).toFixed(unit === 'px' ? 0 : 6);
-        }
+    stops = parseStops(stops, transformFn);
 
-        css.transform += ` ${prop}(${value}${unit})`;
+    return (css, percent) => {
+        css.transform += ` ${prop}(${getValue(stops, percent)}${unit})`;
     };
 }
 
-function colorFn(prop, el, steps) {
-
-    if (steps.length === 1) {
-        steps.unshift(getCssValue(el, prop, ''));
+function colorFn(prop, el, stops) {
+    if (stops.length === 1) {
+        stops.unshift(getCssValue(el, prop, ''));
     }
 
-    steps = steps.map(step => parseColor(el, step));
+    stops = parseStops(stops, (stop) => parseColor(el, stop));
 
     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 [start, end, p] = getStop(stops, percent);
+        const value = start
+            .map((value, i) => {
+                value += p * (end[i] - value);
+                return i === 3 ? toFloat(value) : parseInt(value, 10);
+            })
+            .join(',');
         css[prop] = `rgba(${value})`;
     };
 }
@@ -122,98 +127,90 @@ function parseColor(el, color) {
         .map(toFloat);
 }
 
-function filterFn(prop, el, steps) {
-
-    if (steps.length === 1) {
-        steps.unshift(0);
+function filterFn(prop, el, stops) {
+    if (stops.length === 1) {
+        stops.unshift(0);
     }
 
-    const unit = getUnit(steps) || {blur: 'px', hue: 'deg'}[prop] || '%';
-    prop = {fopacity: 'opacity', hue: 'hue-rotate'}[prop] || prop;
-    steps = steps.map(toFloat);
+    const unit = getUnit(stops) || { blur: 'px', hue: 'deg' }[prop] || '%';
+    prop = { fopacity: 'opacity', hue: 'hue-rotate' }[prop] || prop;
+    stops = parseStops(stops);
 
     return (css, percent) => {
-        const value = getValue(steps, percent);
+        const value = getValue(stops, percent);
         css.filter += ` ${prop}(${value + unit})`;
     };
 }
 
-function cssPropFn(prop, el, steps) {
-
-    if (steps.length === 1) {
-        steps.unshift(getCssValue(el, prop, ''));
+function cssPropFn(prop, el, stops) {
+    if (stops.length === 1) {
+        stops.unshift(getCssValue(el, prop, ''));
     }
 
-    steps = steps.map(toFloat);
+    stops = parseStops(stops);
 
     return (css, percent) => {
-        css[prop] = getValue(steps, percent);
+        css[prop] = getValue(stops, percent);
     };
 }
 
-function strokeFn(prop, el, steps) {
-
-    if (steps.length === 1) {
-        steps.unshift(0);
+function strokeFn(prop, el, stops) {
+    if (stops.length === 1) {
+        stops.unshift(0);
     }
 
-    const unit = getUnit(steps);
-    steps = steps.map(toFloat);
+    const unit = getUnit(stops);
+    const length = getMaxPathLength(el);
+    stops = parseStops(stops.reverse(), (stop) => {
+        stop = toFloat(stop);
+        return unit === '%' ? (stop * length) / 100 : stop;
+    });
 
-    if (!steps.some(step => step)) {
+    if (!stops.some(([value]) => value)) {
         return noop;
     }
 
-    const length = getMaxPathLength(el);
     css(el, 'strokeDasharray', length);
 
-    if (unit === '%') {
-        steps = steps.map(step => step * length / 100);
-    }
-
-    steps = steps.reverse();
-
     return (css, percent) => {
-        css.strokeDashoffset = getValue(steps, percent);
+        css.strokeDashoffset = getValue(stops, percent);
     };
 }
 
-function backgroundFn(prop, el, steps) {
-
-    if (steps.length === 1) {
-        steps.unshift(0);
+function backgroundFn(prop, el, stops) {
+    if (stops.length === 1) {
+        stops.unshift(0);
     }
 
     prop = prop.substr(-1);
     const attr = prop === 'y' ? 'height' : 'width';
-    steps = steps.map(step => toPx(step, attr, el));
+    stops = parseStops(stops, (stop) => toPx(stop, 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(prop, el, steps, bgPos, attr)
-        : setBackgroundPosFn(prop, steps, bgPos);
+        ? backgroundCoverFn(prop, el, stops, bgPos, attr)
+        : setBackgroundPosFn(prop, stops, bgPos);
 }
 
-function backgroundCoverFn(prop, el, steps, bgPos, attr) {
-
+function backgroundCoverFn(prop, el, stops, bgPos, attr) {
     const dimImage = getBackgroundImageDimensions(el);
 
     if (!dimImage.width) {
         return noop;
     }
 
-    const min = Math.min(...steps);
-    const max = Math.max(...steps);
-    const down = steps.indexOf(min) < steps.indexOf(max);
+    const values = stops.map(([value]) => value);
+    const min = Math.min(...values);
+    const max = Math.max(...values);
+    const down = values.indexOf(min) < values.indexOf(max);
 
     const diff = max - min;
     let pos = (down ? -diff : 0) - (down ? min : max);
 
     const dimEl = {
         width: el.offsetWidth,
-        height: el.offsetHeight
+        height: el.offsetHeight,
     };
 
     const baseDim = Dimensions.cover(dimImage, dimEl);
@@ -222,7 +219,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) {
@@ -232,7 +228,7 @@ function backgroundCoverFn(prop, el, steps, bgPos, attr) {
 
     const dim = Dimensions.cover(dimImage, dimEl);
 
-    const fn = setBackgroundPosFn(prop, steps, `${pos}px`);
+    const fn = setBackgroundPosFn(prop, stops, `${pos}px`);
     return (css, percent) => {
         fn(css, percent);
         css.backgroundSize = `${dim.width}px ${dim.height}px`;
@@ -240,9 +236,9 @@ function backgroundCoverFn(prop, el, steps, bgPos, attr) {
     };
 }
 
-function setBackgroundPosFn(prop, steps, pos) {
+function setBackgroundPosFn(prop, stops, pos) {
     return function (css, percent) {
-        css[`background-position-${prop}`] = `calc(${pos} + ${getValue(steps, percent)}px)`;
+        css[`background-position-${prop}`] = `calc(${pos} + ${getValue(stops, percent)}px)`;
     };
 }
 
@@ -266,34 +262,62 @@ function getBackgroundImageDimensions(el) {
         }
     }
 
-    return dimensions[src] = toDimensions(image);
+    return (dimensions[src] = toDimensions(image));
 }
 
 function toDimensions(image) {
     return {
         width: image.naturalWidth,
-        height: image.naturalHeight
+        height: image.naturalHeight,
     };
 }
 
-function getStep(steps, percent) {
-    const count = steps.length - 1;
-    const index = Math.min(Math.floor(count * percent), count - 1);
+function parseStops(stops, fn = toFloat) {
+    const result = [];
+    for (const stop of stops) {
+        const [value, percent] = isString(stop) ? stop.trim().split(' ') : [stop];
+        result.push([fn(value), percent ? toFloat(percent) / 100 : null]);
+    }
+
+    const { length } = result;
+    result[0][1] = 0;
+    result[length - 1][1] = 1;
+    for (let i = 1; i < length - 1; i++) {
+        if (result[i] === null) {
+            const nextIndex = findIndex(result.slice(i + 1), ([, percent]) => percent !== null) + 1;
+            const percent = (result[i + nextIndex] - result[i - 1][1]) / (nextIndex + 1);
+            for (let j = 0; j < nextIndex; j++) {
+                result[i + j][1] = percent * j + 1;
+            }
+        }
+    }
+
+    return result;
+}
 
-    return steps
-        .slice(index, index + 2)
-        .concat(percent === 1 ? 1 : percent % (1 / count) * count);
+function getStop(stops, percent) {
+    const index = findIndex(stops.slice(1), ([, targetPercent]) => percent <= targetPercent) + 1;
+    return [
+        stops[index - 1][0],
+        stops[index][0],
+        (percent - stops[index - 1][1]) / (stops[index][1] - stops[index - 1][1]),
+    ];
 }
 
-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;
+function getValue(stops, percent) {
+    const [start, end, p] = getStop(stops, percent);
+    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;
+const unitRe = /^[\d-]+([^\s]+)/;
+function getUnit(stops, defaultUnit) {
+    for (const stop of stops) {
+        const match = stop.match?.(unitRe);
+        if (match) {
+            return match[1];
+        }
+    }
+    return 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);
-        }
-
-    }
-
+        },
+    },
 };