uikit 3.11.2-dev.c2430c233 → 3.11.2-dev.c7ed3c19b

package/src/js/util/style.js

@@ -1,7 +1,16 @@
-import {isIE} from './env';
-import {append, fragment, remove} from './dom';
-import {addClass} from './class';
-import {each, hyphenate, isArray, isNumber, isNumeric, isObject, isString, isUndefined, memoize, toNodes, toWindow} from './lang';
+import {
+    each,
+    hyphenate,
+    isArray,
+    isNumber,
+    isNumeric,
+    isObject,
+    isString,
+    isUndefined,
+    memoize,
+    toNodes,
+    toWindow,
+} from './lang';
 
 const cssNumber = {
     'animation-iteration-count': true,
@@ -11,22 +20,19 @@ const cssNumber = {
     'flex-shrink': true,
     'font-weight': true,
     'line-height': true,
-    'opacity': true,
-    'order': true,
-    'orphans': true,
+    opacity: true,
+    order: true,
+    orphans: true,
     'stroke-dasharray': true,
     'stroke-dashoffset': true,
-    'widows': true,
+    widows: true,
     'z-index': true,
-    'zoom': true
+    zoom: true,
 };
 
 export function css(element, property, value, priority = '') {
-
-    return toNodes(element).map(element => {
-
+    return toNodes(element).map((element) => {
         if (isString(property)) {
-
             property = propName(property);
 
             if (isUndefined(value)) {
@@ -34,27 +40,26 @@ export function css(element, property, value, priority = '') {
             } else if (!value && !isNumber(value)) {
                 element.style.removeProperty(property);
             } else {
-                element.style.setProperty(property, isNumeric(value) && !cssNumber[property] ? `${value}px` : value, priority);
+                element.style.setProperty(
+                    property,
+                    isNumeric(value) && !cssNumber[property] ? `${value}px` : value,
+                    priority
+                );
             }
-
         } else if (isArray(property)) {
-
             const styles = getStyles(element);
-
-            return property.reduce((props, property) => {
-                props[property] = styles[propName(property)];
-                return props;
-            }, {});
-
+            const props = {};
+            for (const prop of property) {
+                props[prop] = styles[propName(prop)];
+            }
+            return props;
         } else if (isObject(property)) {
             priority = value;
             each(property, (value, property) => css(element, property, value, priority));
         }
 
         return element;
-
     })[0];
-
 }
 
 function getStyles(element, pseudoElt) {
@@ -65,44 +70,29 @@ function getStyle(element, property, pseudoElt) {
     return getStyles(element, pseudoElt)[property];
 }
 
-const parseCssVar = memoize(name => {
-    /* usage in css: .uk-name:before { content:"xyz" } */
-
-    const element = append(document.documentElement, fragment('<div>'));
-
-    addClass(element, `uk-${name}`);
-
-    const value = getStyle(element, 'content', ':before');
-
-    remove(element);
-
-    return value;
-});
-
 const propertyRe = /^\s*(["'])?(.*?)\1\s*$/;
 export function getCssVar(name) {
-    return (isIE
-        ? parseCssVar(name)
-        : getStyles(document.documentElement).getPropertyValue(`--uk-${name}`)
-    ).replace(propertyRe, '$2');
+    return getStyles(document.documentElement)
+        .getPropertyValue(`--uk-${name}`)
+        .replace(propertyRe, '$2');
 }
 
 // https://drafts.csswg.org/cssom/#dom-cssstyledeclaration-setproperty
-export const propName = memoize(name => vendorPropName(name));
+export const propName = memoize((name) => vendorPropName(name));
 
 const cssPrefixes = ['webkit', 'moz', 'ms'];
 
 function vendorPropName(name) {
-
     name = hyphenate(name);
 
-    const {style} = document.documentElement;
+    const { style } = document.documentElement;
 
     if (name in style) {
         return name;
     }
 
-    let i = cssPrefixes.length, prefixedName;
+    let i = cssPrefixes.length,
+        prefixedName;
 
     while (i--) {
         prefixedName = `-${cssPrefixes[i]}-${name}`;

package/src/js/util/viewport.js

@@ -1,30 +1,39 @@
-import {css} from './style';
-import {Promise} from './promise';
-import {isVisible, parents} from './filter';
-import {offset, offsetPosition} from './dimensions';
-import {clamp, findIndex, intersectRect, isDocument, isUndefined, isWindow, toNode, toWindow} from './lang';
+import { css } from './style';
+import { isVisible, parents } from './filter';
+import { offset, offsetPosition } from './dimensions';
+import {
+    clamp,
+    findIndex,
+    intersectRect,
+    isDocument,
+    isUndefined,
+    isWindow,
+    toNode,
+    toWindow,
+} from './lang';
 
 export function isInView(element, offsetTop = 0, offsetLeft = 0) {
-
     if (!isVisible(element)) {
         return false;
     }
 
-    return intersectRect(...scrollParents(element).map(parent => {
-
-        const {top, left, bottom, right} = offset(getViewport(parent));
-
-        return {
-            top: top - offsetTop,
-            left: left - offsetLeft,
-            bottom: bottom + offsetTop,
-            right: right + offsetLeft
-        };
-    }).concat(offset(element)));
+    return intersectRect(
+        ...scrollParents(element)
+            .map((parent) => {
+                const { top, left, bottom, right } = offset(getViewport(parent));
+
+                return {
+                    top: top - offsetTop,
+                    left: left - offsetLeft,
+                    bottom: bottom + offsetTop,
+                    right: right + offsetLeft,
+                };
+            })
+            .concat(offset(element))
+    );
 }
 
 export function scrollTop(element, top) {
-
     if (isWindow(element) || isDocument(element)) {
         element = getScrollingElement(element);
     } else {
@@ -38,49 +47,44 @@ export function scrollTop(element, top) {
     }
 }
 
-export function scrollIntoView(element, {offset: offsetBy = 0} = {}) {
-
+export function scrollIntoView(element, { offset: offsetBy = 0 } = {}) {
     const parents = isVisible(element) ? scrollParents(element) : [];
-    return parents.reduce((fn, scrollElement, i) => {
-
-        const {scrollTop, scrollHeight, offsetHeight} = scrollElement;
-        const maxScroll = scrollHeight - getViewportClientHeight(scrollElement);
-        const {height: elHeight, top: elTop} = offset(parents[i - 1] || element);
-
-        let top = Math.ceil(
-            elTop
-            - offset(getViewport(scrollElement)).top
-            - offsetBy
-            + scrollTop
-        );
-
-        if (offsetBy > 0 && offsetHeight < elHeight + offsetBy) {
-            top += offsetBy;
-        } else {
-            offsetBy = 0;
-        }
-
-        if (top > maxScroll) {
-            offsetBy -= top - maxScroll;
-            top = maxScroll;
-        } else if (top < 0) {
-            offsetBy -= top;
-            top = 0;
-        }
-
-        return () => scrollTo(scrollElement, top - scrollTop).then(fn);
-
-    }, () => Promise.resolve())();
+    return parents.reduce(
+        (fn, scrollElement, i) => {
+            const { scrollTop, scrollHeight, offsetHeight } = scrollElement;
+            const maxScroll = scrollHeight - getViewportClientHeight(scrollElement);
+            const { height: elHeight, top: elTop } = offset(parents[i - 1] || element);
+
+            let top = Math.ceil(
+                elTop - offset(getViewport(scrollElement)).top - offsetBy + scrollTop
+            );
+
+            if (offsetBy > 0 && offsetHeight < elHeight + offsetBy) {
+                top += offsetBy;
+            } else {
+                offsetBy = 0;
+            }
+
+            if (top > maxScroll) {
+                offsetBy -= top - maxScroll;
+                top = maxScroll;
+            } else if (top < 0) {
+                offsetBy -= top;
+                top = 0;
+            }
+
+            return () => scrollTo(scrollElement, top - scrollTop).then(fn);
+        },
+        () => Promise.resolve()
+    )();
 
     function scrollTo(element, top) {
-        return new Promise(resolve => {
-
+        return new Promise((resolve) => {
             const scroll = element.scrollTop;
             const duration = getDuration(Math.abs(top));
             const start = Date.now();
 
             (function step() {
-
                 const percent = ease(clamp((Date.now() - start) / duration));
 
                 scrollTop(element, scroll + top * percent);
@@ -91,29 +95,26 @@ export function scrollIntoView(element, {offset: offsetBy = 0} = {}) {
                 } else {
                     requestAnimationFrame(step);
                 }
-
             })();
         });
     }
 
     function getDuration(dist) {
-        return 40 * Math.pow(dist, .375);
+        return 40 * Math.pow(dist, 0.375);
     }
 
     function ease(k) {
         return 0.5 * (1 - Math.cos(Math.PI * k));
     }
-
 }
 
 export function scrolledOver(element, startOffset = 0, endOffset = 0) {
-
     if (!isVisible(element)) {
         return 0;
     }
 
     const [scrollElement] = scrollParents(element, /auto|scroll/, true);
-    const {scrollHeight, scrollTop} = scrollElement;
+    const { scrollHeight, scrollTop } = scrollElement;
     const viewportHeight = getViewportClientHeight(scrollElement);
     const maxScroll = scrollHeight - viewportHeight;
     const elementOffsetTop = offsetPosition(element)[0] - offsetPosition(scrollElement)[0];
@@ -130,14 +131,20 @@ export function scrollParents(element, overflowRe = /auto|scroll|hidden/, scroll
     let ancestors = parents(element).reverse();
     ancestors = ancestors.slice(ancestors.indexOf(scrollEl) + 1);
 
-    const fixedIndex = findIndex(ancestors, el => css(el, 'position') === 'fixed');
+    const fixedIndex = findIndex(ancestors, (el) => css(el, 'position') === 'fixed');
     if (~fixedIndex) {
         ancestors = ancestors.slice(fixedIndex);
     }
 
-    return [scrollEl].concat(ancestors.filter(parent =>
-        overflowRe.test(css(parent, 'overflow')) && (!scrollable || parent.scrollHeight > getViewportClientHeight(parent)))
-    ).reverse();
+    return [scrollEl]
+        .concat(
+            ancestors.filter(
+                (parent) =>
+                    overflowRe.test(css(parent, 'overflow')) &&
+                    (!scrollable || parent.scrollHeight > getViewportClientHeight(parent))
+            )
+        )
+        .reverse();
 }
 
 export function getViewport(scrollElement) {
@@ -146,10 +153,14 @@ export function getViewport(scrollElement) {
 
 // iOS 12 returns <body> as scrollingElement
 export function getViewportClientHeight(scrollElement) {
-    return (scrollElement === getScrollingElement(scrollElement) ? document.documentElement : scrollElement).clientHeight;
+    return (
+        scrollElement === getScrollingElement(scrollElement)
+            ? document.documentElement
+            : scrollElement
+    ).clientHeight;
 }
 
 export function getScrollingElement(element) {
-    const {document} = toWindow(element);
+    const { document } = toWindow(element);
     return document.scrollingElement || document.documentElement;
 }

package/tests/js/index.js

@@ -1,5 +1,5 @@
 /* global UIkit, TESTS */
-import {addClass, css, fastdom, on, prepend, removeClass, ucfirst} from 'uikit-util';
+import { addClass, css, fastdom, on, prepend, removeClass, ucfirst } from 'uikit-util';
 
 const tests = TESTS;
 const storage = window.sessionStorage;
@@ -14,10 +14,13 @@ request.send(null);
 
 const themes = request.status === 200 ? JSON.parse(request.responseText) : {};
 const styles = {
-    core: {css: '../dist/css/uikit-core.css'},
-    theme: {css: '../dist/css/uikit.css'}
+    core: { css: '../dist/css/uikit-core.css' },
+    theme: { css: '../dist/css/uikit.css' },
 };
-const component = location.pathname.split('/').pop().replace(/.html$/, '');
+const component = location.pathname
+    .split('/')
+    .pop()
+    .replace(/.html$/, '');
 
 for (const theme in themes) {
     styles[theme] = themes[theme];
@@ -26,7 +29,7 @@ for (const theme in themes) {
 const variations = {
     '': 'Default',
     light: 'Dark',
-    dark: 'Light'
+    dark: 'Light',
 };
 
 if (getParam('style') && getParam('style').match(/\.(json|css)$/)) {
@@ -44,102 +47,128 @@ docEl.dir = dir;
 const style = styles[storage[key]] || styles.theme;
 
 // add style
-document.writeln(`<link rel="stylesheet" href="${dir !== 'rtl' ? style.css : style.css.replace('.css', '-rtl.css')}">`);
+document.writeln(
+    `<link rel="stylesheet" href="${
+        dir !== 'rtl' ? style.css : style.css.replace('.css', '-rtl.css')
+    }">`
+);
 
 // add javascript
 document.writeln('<script src="../dist/js/uikit.js"></script>');
-document.writeln(`<script src="${style.icons ? style.icons : '../dist/js/uikit-icons.js'}"></script>`);
-
-on(window, 'load', () => setTimeout(() => fastdom.write(() => {
-
-    const $body = document.body;
-    const $container = prepend($body, `
+document.writeln(
+    `<script src="${style.icons ? style.icons : '../dist/js/uikit-icons.js'}"></script>`
+);
+
+on(window, 'load', () =>
+    setTimeout(
+        () =>
+            fastdom.write(() => {
+                const $body = document.body;
+                const $container = prepend(
+                    $body,
+                    `
         <div class="uk-container">
             <select class="uk-select uk-form-width-small" style="margin: 20px 20px 20px 0">
                 <option value="index.html">Overview</option>
-                ${tests.map(name => `<option value="${name}.html">${name.split('-').map(ucfirst).join(' ')}</option>`).join('')}
+                ${tests
+                    .map(
+                        (name) =>
+                            `<option value="${name}.html">${name
+                                .split('-')
+                                .map(ucfirst)
+                                .join(' ')}</option>`
+                    )
+                    .join('')}
             </select>
             <select class="uk-select uk-form-width-small" style="margin: 20px">
-                ${Object.keys(styles).map(style => `<option value="${style}">${ucfirst(style)}</option>`).join('')}
+                ${Object.keys(styles)
+                    .map((style) => `<option value="${style}">${ucfirst(style)}</option>`)
+                    .join('')}
             </select>
             <select class="uk-select uk-form-width-small" style="margin: 20px">
-                ${Object.keys(variations).map(name => `<option value="${name}">${variations[name]}</option>`).join('')}
+                ${Object.keys(variations)
+                    .map((name) => `<option value="${name}">${variations[name]}</option>`)
+                    .join('')}
             </select>
             <label style="margin: 20px">
                 <input type="checkbox" class="uk-checkbox"/>
                 <span style="margin: 5px">RTL</span>
             </label>
         </div>
-    `);
-
-    const [$tests, $styles, $inverse, $rtl] = $container.children;
-
-    // Tests
-    // ------------------------------
-
-    on($tests, 'change', () => {
-        if ($tests.value) {
-            location.href = `${$tests.value}${styles.custom ? `?style=${getParam('style')}` : ''}`;
-        }
-    });
-    $tests.value = `${component || 'index'}.html`;
-
-    // Styles
-    // ------------------------------
-
-    on($styles, 'change', () => {
-        storage[key] = $styles.value;
-        location.reload();
-    });
-    $styles.value = storage[key];
-
-    // Variations
-    // ------------------------------
-
-    $inverse.value = storage[keyinverse];
-
-    if ($inverse.value) {
-
-        removeClass(document.querySelectorAll('*'),
-            'uk-navbar-container',
-            'uk-card-default',
-            'uk-card-muted',
-            'uk-card-primary',
-            'uk-card-secondary',
-            'uk-tile-default',
-            'uk-tile-muted',
-            'uk-tile-primary',
-            'uk-tile-secondary',
-            'uk-section-default',
-            'uk-section-muted',
-            'uk-section-primary',
-            'uk-section-secondary',
-            'uk-overlay-default',
-            'uk-overlay-primary'
-        );
-
-        css(docEl, 'background', $inverse.value === 'dark' ? '#fff' : '#222');
-        addClass($body, `uk-${$inverse.value}`);
-
-    }
-
-    on($inverse, 'change', () => {
-        storage[keyinverse] = $inverse.value;
-        location.reload();
-    });
-
-    // RTL
-    // ------------------------------
-
-    on($rtl, 'change', ({target}) => {
-        storage._uikit_dir = target.checked ? 'rtl' : 'ltr';
-        location.reload();
-    });
-    $rtl.firstElementChild.checked = dir === 'rtl';
-
-    css(docEl, 'paddingTop', '');
-
-}), 100));
+    `
+                );
+
+                const [$tests, $styles, $inverse, $rtl] = $container.children;
+
+                // Tests
+                // ------------------------------
+
+                on($tests, 'change', () => {
+                    if ($tests.value) {
+                        location.href = `${$tests.value}${
+                            styles.custom ? `?style=${getParam('style')}` : ''
+                        }`;
+                    }
+                });
+                $tests.value = `${component || 'index'}.html`;
+
+                // Styles
+                // ------------------------------
+
+                on($styles, 'change', () => {
+                    storage[key] = $styles.value;
+                    location.reload();
+                });
+                $styles.value = storage[key];
+
+                // Variations
+                // ------------------------------
+
+                $inverse.value = storage[keyinverse];
+
+                if ($inverse.value) {
+                    removeClass(
+                        document.querySelectorAll('*'),
+                        'uk-navbar-container',
+                        'uk-card-default',
+                        'uk-card-muted',
+                        'uk-card-primary',
+                        'uk-card-secondary',
+                        'uk-tile-default',
+                        'uk-tile-muted',
+                        'uk-tile-primary',
+                        'uk-tile-secondary',
+                        'uk-section-default',
+                        'uk-section-muted',
+                        'uk-section-primary',
+                        'uk-section-secondary',
+                        'uk-overlay-default',
+                        'uk-overlay-primary'
+                    );
+
+                    css(docEl, 'background', $inverse.value === 'dark' ? '#fff' : '#222');
+                    addClass($body, `uk-${$inverse.value}`);
+                }
+
+                on($inverse, 'change', () => {
+                    storage[keyinverse] = $inverse.value;
+                    location.reload();
+                });
+
+                // RTL
+                // ------------------------------
+
+                on($rtl, 'change', ({ target }) => {
+                    storage._uikit_dir = target.checked ? 'rtl' : 'ltr';
+                    location.reload();
+                });
+                $rtl.firstElementChild.checked = dir === 'rtl';
+
+                css(docEl, 'paddingTop', '');
+            }),
+        100
+    )
+);
 
 css(docEl, 'paddingTop', '80px');
 

package/src/js/mixin/flex-bug.js

@@ -1,56 +0,0 @@
-import {$$, boxModelAdjust, css, isIE, toFloat} from 'uikit-util';
-
-// IE 11 fix (min-height on a flex container won't apply to its flex items)
-export default isIE ? {
-
-    props: {
-        selMinHeight: String
-    },
-
-    data: {
-        selMinHeight: false,
-        forceHeight: false
-    },
-
-    computed: {
-
-        elements({selMinHeight}, $el) {
-            return selMinHeight ? $$(selMinHeight, $el) : [$el];
-        }
-
-    },
-
-    update: [
-
-        {
-
-            read() {
-                css(this.elements, 'height', '');
-            },
-
-            order: -5,
-
-            events: ['resize']
-
-        },
-
-        {
-
-            write() {
-                this.elements.forEach(el => {
-                    const height = toFloat(css(el, 'minHeight'));
-                    if (height && (this.forceHeight || Math.round(height + boxModelAdjust(el, 'height', 'content-box')) >= el.offsetHeight)) {
-                        css(el, 'height', height);
-                    }
-                });
-            },
-
-            order: 5,
-
-            events: ['resize']
-
-        }
-
-    ]
-
-} : {};