uikit 3.11.2-dev.c7ed3c19b → 3.11.2-dev.cfa6c7d5c

package/dist/js/uikit-core.js

@@ -1,4 +1,4 @@
-/*! UIkit 3.11.2-dev.c7ed3c19b | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
+/*! UIkit 3.11.2-dev.cfa6c7d5c | https://www.getuikit.com | (c) 2014 - 2022 YOOtheme | MIT License */
 
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -29,19 +29,19 @@
     }
 
     function startsWith(str, search) {
-      return str.startsWith(search);
+      return str == null ? void 0 : str.startsWith == null ? void 0 : str.startsWith(search);
     }
 
     function endsWith(str, search) {
-      return str.endsWith(search);
+      return str == null ? void 0 : str.endsWith == null ? void 0 : str.endsWith(search);
     }
 
     function includes(obj, search) {
-      return obj && obj.includes(search);
+      return obj == null ? void 0 : obj.includes == null ? void 0 : obj.includes(search);
     }
 
     function findIndex(array, predicate) {
-      return array.findIndex(predicate);
+      return array == null ? void 0 : array.findIndex == null ? void 0 : array.findIndex(predicate);
     }
 
     const { isArray, from: toArray } = Array;
@@ -130,14 +130,15 @@
       return element && (isNode(element) ? [element] : Array.from(element).filter(isNode)) || [];
     }
 
-    function toWindow(element) {
+    function toWindow(element) {var _element;
       if (isWindow(element)) {
         return element;
       }
 
       element = toNode(element);
+      const document = isDocument(element) ? element : (_element = element) == null ? void 0 : _element.ownerDocument;
 
-      return element ? (isDocument(element) ? element : element.ownerDocument).defaultView : window;
+      return (document == null ? void 0 : document.defaultView) || window;
     }
 
     function toMs(time) {
@@ -224,7 +225,7 @@
       },
 
       contain(dimensions, maxDimensions) {
-        dimensions = assign({}, dimensions);
+        dimensions = { ...dimensions };
 
         each(
         dimensions,
@@ -438,12 +439,6 @@
       return findAll(selector, getContext(selector, context));
     }
 
-    function getContext(selector, context) {if (context === void 0) {context = document;}
-      return isString(selector) && isContextSelector(selector) || isDocument(context) ?
-      context :
-      context.ownerDocument;
-    }
-
     function find(selector, context) {
       return toNode(_query(selector, context, 'querySelector'));
     }
@@ -452,6 +447,17 @@
       return toNodes(_query(selector, context, 'querySelectorAll'));
     }
 
+    const contextSelectorRe = /(^|[^\\],)\s*[!>+~-]/;
+    const isContextSelector = memoize((selector) => selector.match(contextSelectorRe));
+
+    function getContext(selector, context) {if (context === void 0) {context = document;}
+      return isString(selector) && isContextSelector(selector) || isDocument(context) ?
+      context :
+      context.ownerDocument;
+    }
+
+    const contextSanitizeRe = /([!>+~-])(?=\s+[!>+~-]|\s*$)/g;
+
     function _query(selector, context, queryFn) {if (context === void 0) {context = document;}
       if (!selector || !isString(selector)) {
         return selector;
@@ -496,11 +502,6 @@
       }
     }
 
-    const contextSelectorRe = /(^|[^\\],)\s*[!>+~-]/;
-    const contextSanitizeRe = /([!>+~-])(?=\s+[!>+~-]|\s*$)/g;
-
-    const isContextSelector = memoize((selector) => selector.match(contextSelectorRe));
-
     const selectorRe = /.*?[^\\](?:,|$)/g;
 
     const splitSelector = memoize((selector) =>
@@ -670,17 +671,14 @@
     }
 
     function ajax(url, options) {
-      const env = assign(
-      {
+      const env = {
         data: null,
         method: 'GET',
         headers: {},
         xhr: new XMLHttpRequest(),
         beforeSend: noop,
-        responseType: '' },
-
-      options);
-
+        responseType: '',
+        ...options };
 
       return Promise.resolve().
       then(() => env.beforeSend(env)).
@@ -731,8 +729,12 @@
       return new Promise((resolve, reject) => {
         const img = new Image();
 
-        img.onerror = (e) => reject(e);
-        img.onload = () => resolve(img);
+        img.onerror = (e) => {
+          reject(e);
+        };
+        img.onload = () => {
+          resolve(img);
+        };
 
         sizes && (img.sizes = sizes);
         srcset && (img.srcset = srcset);
@@ -759,7 +761,8 @@
 
 
     function css(element, property, value, priority) {if (priority === void 0) {priority = '';}
-      return toNodes(element).map((element) => {
+      const elements = toNodes(element);
+      for (const element of elements) {
         if (isString(property)) {
           property = propName(property);
 
@@ -785,9 +788,8 @@
           priority = value;
           each(property, (value, property) => css(element, property, value, priority));
         }
-
-        return element;
-      })[0];
+      }
+      return elements[0];
     }
 
     function getStyles(element, pseudoElt) {
@@ -914,16 +916,11 @@
 
 
         addClass(element, 'uk-transition');
-        css(
-        element,
-        assign(
-        {
+        css(element, {
           transitionProperty: Object.keys(props).map(propName).join(','),
           transitionDuration: duration + "ms",
-          transitionTimingFunction: timing },
-
-        props));
-
+          transitionTimingFunction: timing,
+          ...props });
 
       })));
 
@@ -1023,8 +1020,8 @@
       const currentOffset = dimensions(element);
 
       if (element) {
-        const { pageYOffset, pageXOffset } = toWindow(element);
-        const offsetBy = { height: pageYOffset, width: pageXOffset };
+        const { scrollY, scrollX } = toWindow(element);
+        const offsetBy = { height: scrollY, width: scrollX };
 
         for (const dir in dirs$1) {
           for (const i in dirs$1[dir]) {
@@ -1090,8 +1087,8 @@
 
         if (css(element, 'position') === 'fixed') {
           const win = toWindow(element);
-          offset[0] += win.pageYOffset;
-          offset[1] += win.pageXOffset;
+          offset[0] += win.scrollY;
+          offset[1] += win.scrollX;
           return offset;
         }
       } while (element = element.offsetParent);
@@ -1198,6 +1195,10 @@
       once(document, 'DOMContentLoaded', fn);
     }
 
+    function isTag(element, tagName) {var _element$tagName;
+      return (element == null ? void 0 : (_element$tagName = element.tagName) == null ? void 0 : _element$tagName.toLowerCase()) === tagName.toLowerCase();
+    }
+
     function empty(element) {
       return replaceChildren(element, '');
     }
@@ -1206,34 +1207,20 @@
       return isUndefined(html) ? $(parent).innerHTML : replaceChildren(parent, html);
     }
 
-    function replaceChildren(parent, element) {
-      const nodes = $$(element);
-      $(parent).replaceChildren(...nodes);
-      return nodes;
-    }
-
-    function prepend(parent, element) {
-      const nodes = $$(element);
-      $(parent).prepend(...nodes);
-      return nodes;
-    }
-
-    function append(parent, element) {
-      const nodes = $$(element);
-      $(parent).append(...nodes);
-      return nodes;
-    }
-
-    function before(ref, element) {
-      const nodes = $$(element);
-      $(ref).before(...nodes);
-      return nodes;
-    }
+    const replaceChildren = applyFn('replaceChildren');
+    const prepend = applyFn('prepend');
+    const append = applyFn('append');
+    const before = applyFn('before');
+    const after = applyFn('after');
 
-    function after(ref, element) {
-      const nodes = $$(element);
-      $(ref).after(...nodes);
-      return nodes;
+    function applyFn(fn) {
+      return function (ref, element) {
+        const nodes = toNodes(isString(element) ? fragment(element) : element);
+        if (nodes.length) {
+          $(ref)[fn](...nodes);
+        }
+        return unwrapSingle(nodes);
+      };
     }
 
     function remove$1(element) {
@@ -1269,11 +1256,27 @@
       forEach((parent) => parent.replaceWith(...parent.childNodes));
     }
 
+    const fragmentRe = /^\s*<(\w+|!)[^>]*>/;
+    const singleTagRe = /^<(\w+)\s*\/?>(?:<\/\1>)?$/;
+
     function fragment(html) {
-      const template = document.createElement('template');
-      template.innerHTML = html;
-      const { childNodes } = template.content;
-      return childNodes.length > 1 ? toNodes(childNodes) : childNodes[0];
+      const matches = singleTagRe.exec(html);
+      if (matches) {
+        return document.createElement(matches[1]);
+      }
+
+      const container = document.createElement('div');
+      if (fragmentRe.test(html)) {
+        container.insertAdjacentHTML('beforeend', html.trim());
+      } else {
+        container.textContent = html;
+      }
+
+      return unwrapSingle(container.childNodes);
+    }
+
+    function unwrapSingle(nodes) {
+      return nodes.length > 1 ? nodes : nodes[0];
     }
 
     function apply(node, fn) {
@@ -1506,7 +1509,7 @@
 
     // extend strategy
     strats.computed = strats.methods = function (parentVal, childVal) {
-      return childVal ? parentVal ? assign({}, parentVal, childVal) : childVal : parentVal;
+      return childVal ? parentVal ? { ...parentVal, ...childVal } : childVal : parentVal;
     };
 
     // data strategy
@@ -1646,11 +1649,11 @@
     }
 
     function isHTML5(el) {
-      return (el == null ? void 0 : el.tagName) === 'VIDEO';
+      return isTag(el, 'video');
     }
 
     function isIFrame(el) {
-      return (el == null ? void 0 : el.tagName) === 'IFRAME' && (isYoutube(el) || isVimeo(el));
+      return isTag(el, 'iframe') && (isYoutube(el) || isVimeo(el));
     }
 
     function isYoutube(el) {
@@ -1670,7 +1673,7 @@
 
     function post(el, cmd) {
       try {
-        el.contentWindow.postMessage(JSON.stringify(assign({ event: 'command' }, cmd)), '*');
+        el.contentWindow.postMessage(JSON.stringify({ event: 'command', ...cmd }), '*');
       } catch (e) {
         // noop
       }
@@ -2050,6 +2053,7 @@
         flipPosition: flipPosition,
         toPx: toPx,
         ready: ready,
+        isTag: isTag,
         empty: empty,
         html: html,
         replaceChildren: replaceChildren,
@@ -2344,7 +2348,7 @@
         const {
           $options: { computed } } =
         this;
-        const values = assign({}, this._computeds);
+        const values = { ...this._computeds };
         this._computeds = {};
 
         for (const key in computed) {
@@ -2529,7 +2533,7 @@
         el = isFunction(el) ? el.call(component) : el || component.$el;
 
         if (isArray(el)) {
-          el.forEach((el) => registerEvent(component, assign({}, event, { el }), key));
+          el.forEach((el) => registerEvent(component, { ...event, el }, key));
           return;
         }
 
@@ -2763,7 +2767,7 @@
           }
         };
 
-        const opt = isPlainObject(options) ? assign({}, options) : options.options;
+        const opt = isPlainObject(options) ? { ...options } : options.options;
 
         opt.name = name;
 
@@ -2816,7 +2820,7 @@
     UIkit.data = '__uikit__';
     UIkit.prefix = 'uk-';
     UIkit.options = {};
-    UIkit.version = '3.11.2-dev.c7ed3c19b';
+    UIkit.version = '3.11.2-dev.cfa6c7d5c';
 
     globalAPI(UIkit);
     hooksAPI(UIkit);
@@ -3139,7 +3143,7 @@
         show ?
         Transition.start(
         el,
-        assign({}, initProps, { overflow: 'hidden', height: endHeight }),
+        { ...initProps, overflow: 'hidden', height: endHeight },
         Math.round(duration * (1 - currentHeight / endHeight)),
         transition) :
 
@@ -3311,7 +3315,7 @@
         animation: [true],
         selClose: '.uk-alert-close',
         duration: 150,
-        hideProps: assign({ opacity: 0 }, Togglable.data.hideProps) },
+        hideProps: { opacity: 0, ...Togglable.data.hideProps } },
 
 
       events: [
@@ -4321,6 +4325,8 @@
     }
 
     var heightViewport = {
+      mixins: [Class],
+
       props: {
         expand: Boolean,
         offsetTop: Boolean,
@@ -4468,6 +4474,12 @@
 
       methods: {
         async getSvg() {
+          if (isTag(this.$el, 'img') && !this.$el.complete && this.$el.loading === 'lazy') {
+            return new Promise((resolve) =>
+            once(this.$el, 'load', () => resolve(this.getSvg())));
+
+          }
+
           return parseSVG(await loadSVG(this.src), this.icon) || Promise.reject('SVG not found.');
         },
 
@@ -4567,7 +4579,7 @@
     }
 
     function insertSVG(el, root) {
-      if (isVoidElement(root) || root.tagName === 'CANVAS') {
+      if (isVoidElement(root) || isTag(root, 'canvas')) {
         root.hidden = true;
 
         const next = root.nextElementSibling;
@@ -4579,11 +4591,7 @@
     }
 
     function equals(el, other) {
-      return isSVG(el) && isSVG(other) && innerHTML(el) === innerHTML(other);
-    }
-
-    function isSVG(el) {
-      return (el == null ? void 0 : el.tagName) === 'svg';
+      return isTag(el, 'svg') && isTag(other, 'svg') && innerHTML(el) === innerHTML(other);
     }
 
     function innerHTML(el) {
@@ -4664,14 +4672,14 @@
       },
 
       methods: {
-        getSvg() {
+        async getSvg() {
           const icon = getIcon(this.icon);
 
           if (!icon) {
-            return Promise.reject('Icon not found.');
+            throw 'Icon not found.';
           }
 
-          return Promise.resolve(icon);
+          return icon;
         } } };
 
     const IconComponent = {
@@ -4729,10 +4737,17 @@
     const Spinner = {
       extends: IconComponent,
 
-      async connected() {
-        const svg = await this.svg;
-        svg && this.ratio !== 1 && css($('circle', svg), 'strokeWidth', 1 / this.ratio);
-      } };
+      methods: {
+        async getSvg() {
+          const icon = await Icon.methods.getSvg.call(this);
+
+          if (this.ratio !== 1) {
+            css($('circle', icon), 'strokeWidth', 1 / this.ratio);
+          }
+
+          return icon;
+        } } };
+
 
 
     const parsed = {};
@@ -4770,120 +4785,95 @@
       return isRtl ? swap(swap(icon, 'left', 'right'), 'previous', 'next') : icon;
     }
 
+    const nativeLazyLoad = ('loading' in HTMLImageElement.prototype);
+    const nativeIsIntersecting = ('isIntersecting' in IntersectionObserverEntry.prototype); // Old chromium based browsers (UC Browser) did not implement `isIntersecting`
+
     var img = {
       args: 'dataSrc',
 
       props: {
         dataSrc: String,
-        dataSrcset: Boolean,
-        sizes: String,
-        width: Number,
-        height: Number,
+        sources: String,
         offsetTop: String,
         offsetLeft: String,
-        target: String },
+        target: String,
+        loading: String },
 
 
       data: {
         dataSrc: '',
-        dataSrcset: false,
-        sizes: false,
-        width: false,
-        height: false,
+        sources: false,
         offsetTop: '50vh',
         offsetLeft: '50vw',
-        target: false },
+        target: false,
+        loading: 'lazy' },
 
 
       computed: {
-        cacheKey(_ref) {let { dataSrc } = _ref;
-          return this.$name + "." + dataSrc;
-        },
-
-        width(_ref2) {let { width, dataWidth } = _ref2;
-          return width || dataWidth;
-        },
-
-        height(_ref3) {let { height, dataHeight } = _ref3;
-          return height || dataHeight;
-        },
-
-        sizes(_ref4) {let { sizes, dataSizes } = _ref4;
-          return sizes || dataSizes;
-        },
-
-        isImg(_, $el) {
-          return isImg($el);
-        },
-
         target: {
-          get(_ref5) {let { target } = _ref5;
+          get(_ref) {let { target } = _ref;
             return [this.$el, ...queryAll(target, this.$el)];
           },
 
           watch() {
             this.observe();
-          } },
-
+          } } },
 
-        offsetTop(_ref6) {let { offsetTop } = _ref6;
-          return toPx(offsetTop, 'height');
-        },
-
-        offsetLeft(_ref7) {let { offsetLeft } = _ref7;
-          return toPx(offsetLeft, 'width');
-        } },
 
 
       connected() {
-        if (!window.IntersectionObserver) {
-          setSrcAttrs(this.$el, this.dataSrc, this.dataSrcset, this.sizes);
+        if (this.loading !== 'lazy' || !window.IntersectionObserver || !nativeIsIntersecting) {
+          this.load();
           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));
+        if (nativeLazyLoad && isImg(this.$el)) {
+          this.$el.loading = 'lazy';
+          setSrcAttrs(this.$el);
+
+          if (this.target.length === 1) {
+            return;
+          }
         }
 
-        this.observer = new IntersectionObserver(this.load, {
-          rootMargin: this.offsetTop + "px " + this.offsetLeft + "px" });
+        ensureSrcAttribute(this.$el);
 
+        const rootMargin = toPx(this.offsetTop, 'height') + "px " + toPx(
+        this.offsetLeft,
+        'width') + "px";
 
-        requestAnimationFrame(this.observe);
-      },
+        this.observer = new IntersectionObserver(
+        (entries) => {
+          if (entries.some((entry) => entry.isIntersecting)) {
+            this.load();
+            this.observer.disconnect();
+          }
+        },
+        { rootMargin });
 
-      disconnected() {
-        this.observer && this.observer.disconnect();
+        this.observe();
       },
 
-      update: {
-        read(_ref8) {let { image } = _ref8;
-          if (!this.observer) {
-            return false;
-          }
+      disconnected() {var _this$observer;
+        if (this._data.image) {
+          this._data.image.onload = '';
+        }
 
-          if (!image && document.readyState === 'complete') {
-            this.load(this.observer.takeRecords());
-          }
+        (_this$observer = this.observer) == null ? void 0 : _this$observer.disconnect();
+      },
 
-          if (this.isImg) {
+      update: {
+        write(store) {
+          if (!this.observer || isImg(this.$el)) {
             return false;
           }
 
-          image &&
-          image.then(
-          (img) => img && img.currentSrc !== '' && setSrcAttrs(this.$el, currentSrc(img)));
-
-        },
-
-        write(data) {
-          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");
             }
           }
         },
@@ -4892,24 +4882,18 @@
 
 
       methods: {
-        load(entries) {
-          // Old chromium based browsers (UC Browser) did not implement `isIntersecting`
-          if (
-          !entries.some((entry) => isUndefined(entry.isIntersecting) || entry.isIntersecting))
-          {
-            return;
+        load() {
+          if (this._data.image) {
+            return this._data.image;
           }
 
-          this._data.image = getImage(this.dataSrc, this.dataSrcset, this.sizes).then(
-          (img) => {
-            setSrcAttrs(this.$el, currentSrc(img), img.srcset, img.sizes);
-            storage[this.cacheKey] = currentSrc(img);
-            return img;
-          },
-          (e) => trigger(this.$el, new e.constructor(e.type, e)));
-
+          const image = isImg(this.$el) ?
+          this.$el :
+          getImageFromElement(this.$el, this.dataSrc, this.sources);
 
-          this.observer.disconnect();
+          removeAttr(image, 'loading');
+          setSrcAttrs(this.$el, image.currentSrc);
+          return this._data.image = image;
         },
 
         observe() {
@@ -4922,12 +4906,11 @@
 
 
 
-    function setSrcAttrs(el, src, srcset, sizes) {
+    function setSrcAttrs(el, src) {
       if (isImg(el)) {
-        const set = (prop, val) => val && val !== el[prop] && (el[prop] = val);
-        set('sizes', sizes);
-        set('srcset', srcset);
-        set('src', src);
+        const parentNode = parent(el);
+        const elements = isPicture(parentNode) ? children(parentNode) : [el];
+        elements.forEach((el) => setSourceProps(el, el));
       } else if (src) {
         const change = !includes(el.style.backgroundImage, src);
         if (change) {
@@ -4937,16 +4920,62 @@
       }
     }
 
-    function getPlaceholderImage(width, height, sizes) {
-      if (sizes) {
-        ({ width, height } = Dimensions.ratio(
-        { width, height },
-        'width',
-        toPx(sizesToPixel(sizes))));
+    const srcProps = ['data-src', 'data-srcset', 'sizes'];
+    function setSourceProps(sourceEl, targetEl) {
+      srcProps.forEach((prop) => {
+        const value = data(sourceEl, prop);
+        if (value) {
+          attr(targetEl, prop.replace(/^(data-)+/, ''), value);
+        }
+      });
+    }
+
+    function getImageFromElement(el, src, sources) {
+      const img = new Image();
+
+      wrapInPicture(img, sources);
+      setSourceProps(el, img);
+      img.onload = () => {
+        setSrcAttrs(el, img.currentSrc);
+      };
+      attr(img, 'src', src);
+      return img;
+    }
+
+    function wrapInPicture(img, sources) {
+      sources = parseSources(sources);
+
+      if (sources.length) {
+        const picture = fragment('<picture>');
+        for (const attrs of sources) {
+          const 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);
       }
 
-      return "data:image/svg+xml;utf8,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + width + "\" height=\"" + height + "\"></svg>";
+      if (!isArray(sources)) {
+        sources = [sources];
+      }
+
+      return sources.filter((source) => !isEmpty(source));
     }
 
     const sizesRe = /\s*(.*?)\s*(\w+|calc\(.*?\))\s*(?:,|$)/g;
@@ -4986,24 +5015,18 @@
       return descriptors.filter((size) => size >= srcSize)[0] || descriptors.pop() || '';
     }
 
-    function isImg(el) {
-      return el.tagName === 'IMG';
+    function ensureSrcAttribute(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 isTag(el, 'picture');
     }
 
-    const key = '__test__';
-    let storage;
-
-    // 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 isImg(el) {
+      return isTag(el, 'img');
     }
 
     var Media = {
@@ -5459,7 +5482,7 @@
 
 
       function openDialog(tmpl, options, hideFn, submitFn) {
-        options = assign({ bgClose: false, escClose: true, labels: modal.labels }, options);
+        options = { bgClose: false, escClose: true, labels: modal.labels, ...options };
 
         const dialog = modal.dialog(tmpl(options), options);
         const deferred = new Deferred();
@@ -5588,10 +5611,11 @@
             this.$create(
             'drop',
             dropdowns.filter((el) => !this.getDropdown(el)),
-            assign({}, this.$props, {
+            {
+              ...this.$props,
               boundary: this.boundary,
               pos: this.pos,
-              offset: this.dropbar || this.offset }));
+              offset: this.dropbar || this.offset });
 
 
           },
@@ -6483,26 +6507,11 @@
 
 
       computed: {
-        position(_ref, $el) {let { position } = _ref;
-          return position === 'auto' ?
-          (this.isFixed ? this.placeholder : $el).offsetHeight > height(window) ?
-          'bottom' :
-          'top' :
-          position;
-        },
-
-        offset(_ref2, $el) {let { offset } = _ref2;
-          if (this.position === 'bottom') {
-            offset += '+100vh-100%';
-          }
-          return toPx(offset, 'height', $el);
-        },
-
-        selTarget(_ref3, $el) {let { selTarget } = _ref3;
+        selTarget(_ref, $el) {let { selTarget } = _ref;
           return selTarget && $(selTarget, $el) || $el;
         },
 
-        widthElement(_ref4, $el) {let { widthElement } = _ref4;
+        widthElement(_ref2, $el) {let { widthElement } = _ref2;
           return query(widthElement, $el) || this.placeholder;
         },
 
@@ -6550,41 +6559,36 @@
           return window;
         },
 
+        filter() {
+          return this.targetOffset !== false;
+        },
+
         handler() {
-          if (!(this.targetOffset !== false && location.hash && scrollTop(window) > 0)) {
+          if (!location.hash || scrollTop(window) === 0) {
             return;
           }
 
-          const target = $(location.hash);
-
-          if (target) {
-            fastdom.read(() => {
-              const { top } = offset(target);
-              const elTop = offset(this.$el).top;
-              const elHeight = this.$el.offsetHeight;
+          fastdom.read(() => {
+            const targetOffset = offset($(location.hash));
+            const elOffset = offset(this.$el);
 
-              if (
-              this.isFixed &&
-              elTop + elHeight >= top &&
-              elTop <= top + target.offsetHeight)
-              {
-                scrollTop(
-                window,
-                top -
-                elHeight - (
-                isNumeric(this.targetOffset) ? this.targetOffset : 0) -
-                this.offset);
+            if (this.isFixed && intersectRect(targetOffset, elOffset)) {
+              scrollTop(
+              window,
+              targetOffset.top -
+              elOffset.height -
+              toPx(this.targetOffset, 'height') -
+              toPx(this.offset, 'height'));
 
-              }
-            });
-          }
+            }
+          });
         } }],
 
 
 
       update: [
       {
-        read(_ref5, types) {let { height: height$1, margin } = _ref5;
+        read(_ref3, types) {let { height: height$1, margin } = _ref3;
           this.inactive = !this.matchMedia || !isVisible(this.$el);
 
           if (this.inactive) {
@@ -6593,35 +6597,49 @@
 
           const hide = this.isActive && types.has('resize');
           if (hide) {
+            css(this.selTarget, 'transition', '0s');
             this.hide();
           }
 
           if (!this.isActive) {
-            height$1 = this.$el.offsetHeight;
+            height$1 = offset(this.$el).height;
             margin = css(this.$el, 'margin');
           }
 
           if (hide) {
             this.show();
+            fastdom.write(() => css(this.selTarget, 'transition', ''));
           }
 
-          const overflow = Math.max(0, height$1 + this.offset - height(window));
-
           const referenceElement = this.isFixed ? this.placeholder : this.$el;
+          const windowHeight = height(window);
+
+          let position = this.position;
+          if (position === 'auto' && height$1 > windowHeight) {
+            position = 'bottom';
+          }
+
+          let offset$1 = toPx(this.offset, 'height', referenceElement);
+          if (position === 'bottom') {
+            offset$1 += windowHeight - height$1;
+          }
+
+          const overflow = Math.max(0, height$1 + offset$1 - windowHeight);
           const topOffset = offset(referenceElement).top;
           const offsetParentTop = offset(referenceElement.offsetParent).top;
 
           const top = parseProp(this.top, this.$el, topOffset);
           const bottom = parseProp(this.bottom, this.$el, topOffset + height$1, true);
 
-          const start = Math.max(top, topOffset) - this.offset;
+          const start = Math.max(top, topOffset) - offset$1;
           const end = bottom ?
-          bottom - this.$el.offsetHeight + overflow - this.offset :
-          getScrollingElement(this.$el).scrollHeight - height(window);
+          bottom - offset(this.$el).height + overflow - offset$1 :
+          getScrollingElement(this.$el).scrollHeight - windowHeight;
 
           return {
             start,
             end,
+            offset: offset$1,
             overflow,
             topOffset,
             offsetParentTop,
@@ -6629,11 +6647,11 @@
             margin,
             width: dimensions(isVisible(this.widthElement) ? this.widthElement : this.$el).
             width,
-            top: offsetPosition(this.placeholder)[0] };
+            top: offsetPosition(referenceElement)[0] };
 
         },
 
-        write(_ref6) {let { height, margin } = _ref6;
+        write(_ref4) {let { height, margin } = _ref4;
           const { placeholder } = this;
 
           css(placeholder, { height, margin });
@@ -6650,14 +6668,14 @@
 
 
       {
-        read(_ref7)
+        read(_ref5)
 
 
 
 
 
 
-        {let { scroll: prevScroll = 0, dir: prevDir = 'down', overflow, overflowScroll = 0, start, end } = _ref7;
+        {let { scroll: prevScroll = 0, dir: prevDir = 'down', overflow, overflowScroll = 0, start, end } = _ref5;
           const scroll = scrollTop(window);
           const dir = prevScroll <= scroll ? 'down' : 'up';
 
@@ -6738,7 +6756,7 @@
             }
           } else if (this.isFixed) {
             this.update();
-          } else if (this.animation) {
+          } else if (this.animation && scroll > topOffset) {
             Animation.cancel(this.$el);
             this.show();
             Animation.in(this.$el, this.animation).catch(noop);
@@ -6766,33 +6784,33 @@
         },
 
         update() {
-          const {
+          let {
             width,
             scroll = 0,
             overflow,
             overflowScroll = 0,
             start,
             end,
+            offset,
             topOffset,
             height,
             offsetParentTop } =
           this._data;
           const active = start !== 0 || scroll > start;
-          let top = this.offset;
           let position = 'fixed';
 
           if (scroll > end) {
-            top = end + this.offset - offsetParentTop;
+            offset += end - offsetParentTop;
             position = 'absolute';
           }
 
           if (overflow) {
-            top -= overflowScroll;
+            offset -= overflowScroll;
           }
 
           css(this.$el, {
             position,
-            top: top + "px",
+            top: offset + "px",
             width });
 
 
@@ -7107,7 +7125,7 @@
         name: 'keydown',
 
         filter() {
-          return includes(this.mode, 'click') && this.$el.tagName !== 'INPUT';
+          return includes(this.mode, 'click') && !isTag(this.$el, 'input');
         },
 
         handler(e) {