uikit 3.11.2-dev.4c11be04b → 3.11.2-dev.54d67da03

package/dist/js/uikit.js

@@ -1,4 +1,4 @@
-/*! UIkit 3.11.2-dev.4c11be04b | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
+/*! UIkit 3.11.2-dev.54d67da03 | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -1750,19 +1750,35 @@
         if ( element === void 0 ) element = window;
         if ( offsetDim === void 0 ) offsetDim = false;
 
-        return isNumeric(value)
-            ? +value
-            : endsWith(value, 'vh')
-                ? percent(height(toWindow(element)), value)
-                : endsWith(value, 'vw')
-                    ? percent(width(toWindow(element)), value)
-                    : endsWith(value, '%')
-                        ? percent(offsetDim
-                            ? element[("offset" + (ucfirst(property)))]
-                            : dimensions$1(element)[property], value)
-                        : toFloat(value);
+
+        if (!isString(value)) {
+            return toFloat(value);
+        }
+
+        return parseCalc(value).reduce(function (result, value) {
+            var unit = parseUnit(value);
+            if (unit) {
+                value = percent(
+                    unit === 'vh'
+                        ? height(toWindow(element))
+                        : unit === 'vw'
+                            ? width(toWindow(element))
+                            : offsetDim
+                                ? element[("offset" + (ucfirst(property)))]
+                                : dimensions$1(element)[property],
+                    value
+                );
+            }
+
+            return result + toFloat(value);
+        }, 0);
     }
 
+    var calcRe = /-?\d+(?:\.\d+)?(?:v[wh]|%|px)?/g;
+    var parseCalc = memoize(function (calc) { return calc.toString().replace(/\s/g, '').match(calcRe) || []; });
+    var unitRe = /(?:v[hw]|%)$/;
+    var parseUnit = memoize(function (str) { return (str.match(unitRe) || [])[0]; });
+
     function percent(base, value) {
         return base * toFloat(value) / 100;
     }
@@ -1800,8 +1816,6 @@
     };
 
     function flush(recursion) {
-        if ( recursion === void 0 ) recursion = 1;
-
         runTasks(fastdom.reads);
         runTasks(fastdom.writes.splice(0));
 
@@ -1823,7 +1837,7 @@
         if (recursion && recursion < RECURSION_LIMIT) {
             Promise$1.resolve().then(function () { return flush(recursion); });
         } else {
-            requestAnimationFrame(function () { return flush(); });
+            requestAnimationFrame(function () { return flush(1); });
         }
 
     }
@@ -2079,9 +2093,8 @@
 
         try {
 
-            return !options
-                ? {}
-                : startsWith(options, '{')
+            return options
+                ? startsWith(options, '{')
                     ? JSON.parse(options)
                     : args.length && !includes(options, ':')
                         ? (( obj = {}, obj[args[0]] = options, obj ))
@@ -2093,7 +2106,8 @@
                                 options[key.trim()] = value.trim();
                             }
                             return options;
-                        }, {});
+                        }, {})
+                : {};
 
         } catch (e) {
             return {};
@@ -2241,7 +2255,11 @@
             element = toNode(element);
         }
 
-        element.scrollTop = top;
+        if (isUndefined(top)) {
+            return element.scrollTop;
+        } else {
+            element.scrollTop = top;
+        }
     }
 
     function scrollIntoView(element, ref) {
@@ -2673,7 +2691,8 @@
         scrolledOver: scrolledOver,
         scrollParents: scrollParents,
         getViewport: getViewport$1,
-        getViewportClientHeight: getViewportClientHeight
+        getViewportClientHeight: getViewportClientHeight,
+        getScrollingElement: getScrollingElement
     });
 
     function globalAPI (UIkit) {
@@ -3137,11 +3156,11 @@
                 on(
                     el,
                     name,
-                    !delegate
-                        ? null
-                        : isString(delegate)
+                    delegate
+                        ? isString(delegate)
                             ? delegate
-                            : delegate.call(component),
+                            : delegate.call(component)
+                        : null,
                     isString(handler) ? component[handler] : handler.bind(component),
                     {passive: passive, capture: capture, self: self}
                 )
@@ -3462,7 +3481,7 @@
     UIkit.data = '__uikit__';
     UIkit.prefix = 'uk-';
     UIkit.options = {};
-    UIkit.version = '3.11.2-dev.4c11be04b';
+    UIkit.version = '3.11.2-dev.54d67da03';
 
     globalAPI(UIkit);
     hooksAPI(UIkit);
@@ -3483,7 +3502,7 @@
                 return;
             }
             pendingResize = true;
-            fastdom.write(function () { return pendingResize = false; });
+            fastdom.read(function () { return pendingResize = false; });
             UIkit.update(null, 'resize');
         };
 
@@ -3502,7 +3521,7 @@
                 return;
             }
             pending = true;
-            fastdom.write(function () { return pending = false; });
+            fastdom.read(function () { return pending = false; });
 
             UIkit.update(null, e.type);
 
@@ -4588,7 +4607,7 @@
                 if (active$1) {
 
                     if (delay && active$1.isDelaying) {
-                        this.showTimer = setTimeout(this.show, 10);
+                        this.showTimer = setTimeout(function () { return matches(target, ':hover') && this$1$1.show(); }, 10);
                         return;
                     }
 
@@ -5312,7 +5331,7 @@
                 css(this.$el, {minHeight: minHeight});
 
                 if (minHeight !== prev) {
-                    this.$update(this.$el, 'resize');
+                    trigger(this.$el, 'resize');
                 }
 
                 if (this.minHeight && toFloat(css(this.$el, 'minHeight')) < this.minHeight) {
@@ -5789,10 +5808,7 @@
 
         props: {
             dataSrc: String,
-            dataSrcset: Boolean,
-            sizes: String,
-            width: Number,
-            height: Number,
+            dataSources: String,
             offsetTop: String,
             offsetLeft: String,
             target: String
@@ -5800,10 +5816,7 @@
 
         data: {
             dataSrc: '',
-            dataSrcset: false,
-            sizes: false,
-            width: false,
-            height: false,
+            dataSources: [],
             offsetTop: '50vh',
             offsetLeft: '50vw',
             target: false
@@ -5811,37 +5824,6 @@
 
         computed: {
 
-            cacheKey: function(ref) {
-                var dataSrc = ref.dataSrc;
-
-                return ((this.$name) + "." + dataSrc);
-            },
-
-            width: function(ref) {
-                var width = ref.width;
-                var dataWidth = ref.dataWidth;
-
-                return width || dataWidth;
-            },
-
-            height: function(ref) {
-                var height = ref.height;
-                var dataHeight = ref.dataHeight;
-
-                return height || dataHeight;
-            },
-
-            sizes: function(ref) {
-                var sizes = ref.sizes;
-                var dataSizes = ref.dataSizes;
-
-                return sizes || dataSizes;
-            },
-
-            isImg: function(_, $el) {
-                return isImg($el);
-            },
-
             target: {
 
                 get: function(ref) {
@@ -5854,18 +5836,6 @@
                     this.observe();
                 }
 
-            },
-
-            offsetTop: function(ref) {
-                var offsetTop = ref.offsetTop;
-
-                return toPx(offsetTop, 'height');
-            },
-
-            offsetLeft: function(ref) {
-                var offsetLeft = ref.offsetLeft;
-
-                return toPx(offsetLeft, 'width');
             }
 
         },
@@ -5873,21 +5843,15 @@
         connected: function() {
 
             if (!window.IntersectionObserver) {
-                setSrcAttrs(this.$el, this.dataSrc, this.dataSrcset, this.sizes);
+                setSrcAttrs(this.$el, this.dataSrc);
                 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));
-            }
-
-            this.observer = new IntersectionObserver(this.load, {
-                rootMargin: ((this.offsetTop) + "px " + (this.offsetLeft) + "px")
-            });
+            ensurePlaceholderImage(this.$el);
 
-            requestAnimationFrame(this.observe);
+            var rootMargin = (toPx(this.offsetTop, 'height')) + "px " + (toPx(this.offsetLeft, 'width')) + "px";
+            this.observer = new IntersectionObserver(this.load, {rootMargin: rootMargin});
+            this.observe();
 
         },
 
@@ -5897,35 +5861,17 @@
 
         update: {
 
-            read: function(ref) {
-                var this$1$1 = this;
-                var image = ref.image;
-
-
-                if (!this.observer) {
+            write: function(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(function (img) { return img && img.currentSrc !== '' && setSrcAttrs(this$1$1.$el, currentSrc(img)); });
-
-            },
-
-            write: function(data) {
-
-                if (this.dataSrcset && window.devicePixelRatio !== 1) {
+                var srcset = data(this.$el, 'data-srcset');
+                if (srcset && window.devicePixelRatio !== 1) {
 
                     var 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"));
                     }
 
                 }
@@ -5939,21 +5885,26 @@
         methods: {
 
             load: function(entries) {
-                var this$1$1 = this;
-
 
                 // Old chromium based browsers (UC Browser) did not implement `isIntersecting`
                 if (!entries.some(function (entry) { return isUndefined(entry.isIntersecting) || entry.isIntersecting; })) {
                     return;
                 }
 
-                this._data.image = getImage(this.dataSrc, this.dataSrcset, this.sizes).then(function (img) {
+                if (this._data.image) {
+                    return this._data.image;
+                }
 
-                    setSrcAttrs(this$1$1.$el, currentSrc(img), img.srcset, img.sizes);
-                    storage[this$1$1.cacheKey] = currentSrc(img);
-                    return img;
+                var image = isImg(this.$el)
+                    ? this.$el
+                    : getImageFromElement(
+                        this.$el,
+                        this.dataSrc,
+                        this.dataSources
+                    );
 
-                }, function (e) { return trigger(this$1$1.$el, new e.constructor(e.type, e)); });
+                this._data.image = image;
+                setSrcAttrs(this.$el, image.currentSrc);
 
                 this.observer.disconnect();
             },
@@ -5970,13 +5921,14 @@
 
     };
 
-    function setSrcAttrs(el, src, srcset, sizes) {
+    function setSrcAttrs(el, src) {
 
         if (isImg(el)) {
-            var set = function (prop, val) { return val && val !== el[prop] && (el[prop] = val); };
-            set('sizes', sizes);
-            set('srcset', srcset);
-            set('src', src);
+
+            var parentNode = parent(el);
+            var elements = isPicture(parentNode) ? children(parentNode) : [el];
+            elements.forEach(function (el) { return setSourceProps(el, el); });
+
         } else if (src) {
 
             var change = !includes(el.style.backgroundImage, src);
@@ -5989,15 +5941,66 @@
 
     }
 
-    function getPlaceholderImage(width, height, sizes) {
-        var assign;
+    var srcProps = ['data-src', 'data-srcset', 'sizes'];
+    function setSourceProps(sourceEl, targetEl) {
+        srcProps.forEach(function (prop) {
+            var value = data(sourceEl, prop);
+            if (value) {
+                attr(targetEl, prop.replace(/^(data-)+/, ''), value);
+            }
+        });
+    }
 
+    function getImageFromElement(el, src, sources) {
 
-        if (sizes) {
-            ((assign = Dimensions.ratio({width: width, height: height}, 'width', toPx(sizesToPixel(sizes))), width = assign.width, height = assign.height));
+        if (!src) {
+            return false;
         }
 
-        return ("data:image/svg+xml;utf8,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + width + "\" height=\"" + height + "\"></svg>");
+        var img = new Image();
+
+        wrapInPicture(img, sources);
+        setSourceProps(el, img);
+        img.onload = function () { return setSrcAttrs(el, img.currentSrc); };
+        attr(img, 'src', src);
+        return img;
+    }
+
+    function wrapInPicture(img, sources) {
+
+        sources = parseSources(sources);
+
+        if (sources.length) {
+            var picture = fragment('<picture>');
+            sources.forEach(function (attrs) {
+                var 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);
+        }
+
+        if (!isArray(sources)) {
+            sources = [sources];
+        }
+
+        return sources.filter(function (source) { return !isEmpty(source); });
     }
 
     var sizesRe = /\s*(.*?)\s*(\w+|calc\(.*?\))\s*(?:,|$)/g;
@@ -6037,24 +6040,22 @@
         return descriptors.filter(function (size) { return size >= srcSize; })[0] || descriptors.pop() || '';
     }
 
-    function isImg(el) {
-        return el.tagName === 'IMG';
+    function ensurePlaceholderImage(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 isA(el, 'PICTURE');
     }
 
-    var key = '__test__';
-    var storage;
+    function isImg(el) {
+        return isA(el, 'IMG');
+    }
 
-    // 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 isA(el, tagName) {
+        return el && el.tagName === tagName;
     }
 
     var Media = {
@@ -6720,7 +6721,7 @@
                     var current = ref.current;
 
                     var active = this.getActive();
-                    if (active && includes(active.mode, 'hover') && active.target && !within(active.target, current) && !active.tracker.movesTo(active.$el)) {
+                    if (active && includes(active.mode, 'hover') && active.target && !within(active.target, current) && !active.isDelaying) {
                         active.hide(false);
                     }
                 }
@@ -6895,7 +6896,11 @@
 
                     var active = this.getActive();
 
-                    if (matches(this.dropbar, ':hover') && active && active.$el === $el) {
+                    if (matches(this.dropbar, ':hover')
+                        && active
+                        && active.$el === $el
+                        && !this.toggles.some(function (el) { return active.target !== el && matches(el, ':focus'); })
+                    ) {
                         e.preventDefault();
                     }
                 }
@@ -7687,6 +7692,7 @@
         mixins: [Class, Media],
 
         props: {
+            position: String,
             top: null,
             bottom: Boolean,
             offset: String,
@@ -7702,6 +7708,7 @@
         },
 
         data: {
+            position: 'top',
             top: 0,
             bottom: false,
             offset: 0,
@@ -7718,10 +7725,23 @@
 
         computed: {
 
-            offset: function(ref) {
+            position: function(ref, $el) {
+                var position = ref.position;
+
+                return position === 'auto'
+                    ? (this.isFixed ? this.placeholder : $el).offsetHeight > height(window)
+                        ? 'bottom'
+                        : 'top'
+                    : position;
+            },
+
+            offset: function(ref, $el) {
                 var offset = ref.offset;
 
-                return toPx(offset);
+                if (this.position === 'bottom') {
+                    offset += '+100vh-100%';
+                }
+                return toPx(offset, 'height', $el);
             },
 
             selTarget: function(ref, $el) {
@@ -7788,7 +7808,7 @@
                     var this$1$1 = this;
 
 
-                    if (!(this.targetOffset !== false && location.hash && window.pageYOffset > 0)) {
+                    if (!(this.targetOffset !== false && location.hash && scrollTop(window) > 0)) {
                         return;
                     }
 
@@ -7821,6 +7841,7 @@
 
                 read: function(ref, types) {
                     var height$1 = ref.height;
+                    var margin = ref.margin;
 
 
                     this.inactive = !this.matchMedia || !isVisible(this.$el);
@@ -7829,46 +7850,56 @@
                         return false;
                     }
 
-                    if (this.isActive && types.has('resize')) {
+                    var hide = this.isActive && types.has('resize');
+                    if (hide) {
                         this.hide();
-                        height$1 = this.$el.offsetHeight;
-                        this.show();
                     }
 
-                    height$1 = this.isActive ? height$1 : this.$el.offsetHeight;
+                    if (!this.isActive) {
+                        height$1 = this.$el.offsetHeight;
+                        margin = css(this.$el, 'margin');
+                    }
 
-                    if (height$1 + this.offset > height(window)) {
-                        this.inactive = true;
-                        return false;
+                    if (hide) {
+                        this.show();
                     }
 
+                    var overflow = Math.max(0, height$1 + this.offset - height(window));
+
                     var referenceElement = this.isFixed ? this.placeholder : this.$el;
-                    this.topOffset = offset(referenceElement).top;
-                    this.bottomOffset = this.topOffset + height$1;
-                    this.offsetParentTop = offset(referenceElement.offsetParent).top;
+                    var topOffset = offset(referenceElement).top;
+                    var offsetParentTop = offset(referenceElement.offsetParent).top;
 
-                    var bottom = parseProp('bottom', this);
+                    var top = parseProp(this.top, this.$el, topOffset);
+                    var bottom = parseProp(this.bottom, this.$el, topOffset + height$1);
 
-                    this.top = Math.max(toFloat(parseProp('top', this)), this.topOffset) - this.offset;
-                    this.bottom = bottom && bottom - this.$el.offsetHeight;
-                    this.width = dimensions$1(isVisible(this.widthElement) ? this.widthElement : this.$el).width;
+                    var start = Math.max(top, topOffset) - this.offset;
+                    var end = bottom
+                        ? bottom - this.$el.offsetHeight + overflow - this.offset
+                        : getScrollingElement(this.$el).scrollHeight - height(window);
 
                     return {
+                        start: start,
+                        end: end,
+                        overflow: overflow,
+                        topOffset: topOffset,
+                        offsetParentTop: offsetParentTop,
                         height: height$1,
-                        top: offsetPosition(this.placeholder)[0],
-                        margins: css(this.$el, ['marginTop', 'marginBottom', 'marginLeft', 'marginRight'])
+                        margin: margin,
+                        width: dimensions$1(isVisible(this.widthElement) ? this.widthElement : this.$el).width,
+                        top: offsetPosition(this.placeholder)[0]
                     };
                 },
 
                 write: function(ref) {
                     var height = ref.height;
-                    var margins = ref.margins;
+                    var margin = ref.margin;
 
 
                     var ref$1 = this;
                     var placeholder = ref$1.placeholder;
 
-                    css(placeholder, assign({height: height}, margins));
+                    css(placeholder, {height: height, margin: margin});
 
                     if (!within(placeholder, document)) {
                         after(this.$el, placeholder);
@@ -7886,14 +7917,29 @@
             {
 
                 read: function(ref) {
-                    var scroll = ref.scroll; if ( scroll === void 0 ) scroll = 0;
+                    var prevScroll = ref.scroll; if ( prevScroll === void 0 ) prevScroll = 0;
+                    var prevDir = ref.dir; if ( prevDir === void 0 ) prevDir = 'down';
+                    var overflow = ref.overflow;
+                    var overflowScroll = ref.overflowScroll; if ( overflowScroll === void 0 ) overflowScroll = 0;
+                    var start = ref.start;
+                    var end = ref.end;
 
 
-                    this.scroll = window.pageYOffset;
+                    var scroll = scrollTop(window);
+                    var dir = prevScroll <= scroll ? 'down' : 'up';
 
                     return {
-                        dir: scroll <= this.scroll ? 'down' : 'up',
-                        scroll: this.scroll
+                        dir: dir,
+                        prevDir: prevDir,
+                        scroll: scroll,
+                        prevScroll: prevScroll,
+                        overflowScroll: clamp(
+                            overflowScroll
+                            + clamp(scroll, start, end)
+                            - clamp(prevScroll, start, end),
+                            0,
+                            overflow
+                        )
                     };
                 },
 
@@ -7901,35 +7947,34 @@
                     var this$1$1 = this;
 
 
-                    var now = Date.now();
                     var isScrollUpdate = types.has('scroll');
                     var initTimestamp = data.initTimestamp; if ( initTimestamp === void 0 ) initTimestamp = 0;
                     var dir = data.dir;
-                    var lastDir = data.lastDir;
-                    var lastScroll = data.lastScroll;
+                    var prevDir = data.prevDir;
                     var scroll = data.scroll;
+                    var prevScroll = data.prevScroll; if ( prevScroll === void 0 ) prevScroll = 0;
                     var top = data.top;
+                    var start = data.start;
+                    var topOffset = data.topOffset;
+                    var height = data.height;
 
-                    data.lastScroll = scroll;
-
-                    if (scroll < 0 || scroll === lastScroll && isScrollUpdate || this.showOnUp && !isScrollUpdate && !this.isFixed) {
+                    if (scroll < 0 || scroll === prevScroll && isScrollUpdate || this.showOnUp && !isScrollUpdate && !this.isFixed) {
                         return;
                     }
 
-                    if (now - initTimestamp > 300 || dir !== lastDir) {
+                    var now = Date.now();
+                    if (now - initTimestamp > 300 || dir !== prevDir) {
                         data.initScroll = scroll;
                         data.initTimestamp = now;
                     }
 
-                    data.lastDir = dir;
-
-                    if (this.showOnUp && !this.isFixed && Math.abs(data.initScroll - scroll) <= 30 && Math.abs(lastScroll - scroll) <= 10) {
+                    if (this.showOnUp && !this.isFixed && Math.abs(data.initScroll - scroll) <= 30 && Math.abs(prevScroll - scroll) <= 10) {
                         return;
                     }
 
                     if (this.inactive
-                        || scroll < this.top
-                        || this.showOnUp && (scroll <= this.top || dir === 'down' && isScrollUpdate || dir === 'up' && !this.isFixed && scroll <= this.bottomOffset)
+                        || scroll < start
+                        || this.showOnUp && (scroll <= start || dir === 'down' && isScrollUpdate || dir === 'up' && !this.isFixed && scroll <= topOffset + height)
                     ) {
 
                         if (!this.isFixed) {
@@ -7944,7 +7989,7 @@
 
                         this.isFixed = false;
 
-                        if (this.animation && scroll > this.topOffset) {
+                        if (this.animation && scroll > topOffset) {
                             Animation.cancel(this.$el);
                             Animation.out(this.$el, this.animation).then(function () { return this$1$1.hide(); }, noop);
                         } else {
@@ -7994,23 +8039,37 @@
 
             update: function() {
 
-                var active = this.top !== 0 || this.scroll > this.top;
-                var top = Math.max(0, this.offset);
+                var ref = this._data;
+                var width = ref.width;
+                var scroll = ref.scroll; if ( scroll === void 0 ) scroll = 0;
+                var overflow = ref.overflow;
+                var overflowScroll = ref.overflowScroll; if ( overflowScroll === void 0 ) overflowScroll = 0;
+                var start = ref.start;
+                var end = ref.end;
+                var topOffset = ref.topOffset;
+                var height = ref.height;
+                var offsetParentTop = ref.offsetParentTop;
+                var active = start !== 0 || scroll > start;
+                var top = this.offset;
                 var position = 'fixed';
 
-                if (isNumeric(this.bottom) && this.scroll > this.bottom - this.offset) {
-                    top = this.bottom - this.offsetParentTop;
+                if (scroll > end) {
+                    top = end + this.offset - offsetParentTop;
                     position = 'absolute';
                 }
 
+                if (overflow) {
+                    top -= overflowScroll;
+                }
+
                 css(this.$el, {
                     position: position,
                     top: (top + "px"),
-                    width: this.width
+                    width: width
                 });
 
                 this.isActive = active;
-                toggleClass(this.$el, this.clsBelow, this.scroll > this.bottomOffset);
+                toggleClass(this.$el, this.clsBelow, scroll > topOffset + height);
                 addClass(this.$el, this.clsFixed);
 
             }
@@ -8019,16 +8078,10 @@
 
     };
 
-    function parseProp(prop, ref) {
-        var $props = ref.$props;
-        var $el = ref.$el;
-        var propOffset = ref[(prop + "Offset")];
-
-
-        var value = $props[prop];
+    function parseProp(value, el, propOffset) {
 
         if (!value) {
-            return;
+            return 0;
         }
 
         if (isString(value) && value.match(/^-?\d/)) {
@@ -8037,7 +8090,7 @@
 
         } else {
 
-            return offset(value === true ? parent($el) : query(value, $el)).bottom;
+            return offset(value === true ? parent(el) : query(value, el)).bottom;
 
         }
     }
@@ -11049,16 +11102,18 @@
             start: function(ref) {
                 var start = ref.start;
 
-                return parseCalc(start, this.target);
+                return toPx(start, 'height', this.target, true);
             },
 
             end: function(ref) {
                 var end = ref.end;
                 var viewport = ref.viewport;
 
-                return parseCalc(
+                return toPx(
                     end || (viewport = (1 - viewport) * 100) && (viewport + "vh+" + viewport + "%"),
-                    this.target
+                    'height',
+                    this.target,
+                    true
                 );
             }
 
@@ -11105,19 +11160,6 @@
 
     };
 
-    var calcRe = /-?\d+(?:\.\d+)?(?:v[wh]|%|px)?/g;
-    function parseCalc(calc, el) {
-        var match;
-        var result = 0;
-        calc = calc.toString().replace(/\s/g, '');
-        calcRe.lastIndex = 0;
-        while ((match = calcRe.exec(calc)) !== null) {
-            result += toPx(match[0], 'height', el, true);
-        }
-
-        return result;
-    }
-
     function ease(percent, easing) {
         return easing >= 0
             ? Math.pow(percent, easing + 1)
@@ -12097,7 +12139,6 @@
 
                 off(document, pointerMove, this.move);
                 off(document, pointerUp, this.end);
-                off(window, 'scroll', this.scroll);
 
                 if (!this.drag) {
                     return;
@@ -12180,7 +12221,7 @@
 
             var x = pos.x;
             var y = pos.y;
-            y += window.pageYOffset;
+            y += scrollTop(window);
 
             var dist = (Date.now() - last) * .3;
             last = Date.now();