quasar 1.22.3 → 1.22.5

package/dist/web-types/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "",
   "framework": "vue",
   "name": "quasar",
-  "version": "1.22.3",
+  "version": "1.22.5",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "1.22.3",
+  "version": "1.22.5",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "module": "src/index.esm.js",
   "typings": "dist/types/index.d.ts",

package/src/components/dialog/QDialog.js

@@ -372,7 +372,7 @@ export default Vue.extend({
             staticClass: 'q-dialog__backdrop fixed-full',
             attrs: backdropAttrs,
             on: cache(this, 'bkdrop', {
-              [ this.$q.platform.is.ios === true ? 'click' : 'focusin' ]: this.__onBackdropClick
+              [ this.backdropEvt ]: this.__onBackdropClick
             })
           })
         ] : null),
@@ -395,6 +395,7 @@ export default Vue.extend({
   created () {
     this.__useTick('__registerTick', '__removeTick')
     this.__useTimeout('__registerTimeout')
+    this.backdropEvt = this.$q.platform.is.ios === true || this.$q.platform.is.safari ? 'click' : 'focusin'
   },
 
   mounted () {

package/src/components/infinite-scroll/QInfiniteScroll.js

@@ -44,6 +44,12 @@ export default Vue.extend({
     }
   },
 
+  computed: {
+    renderLoadingSlot () {
+      return this.disable !== true && this.isWorking === true
+    }
+  },
+
   watch: {
     disable (val) {
       if (val === true) { this.stop() }
@@ -62,6 +68,14 @@ export default Vue.extend({
 
     debounce (val) {
       this.__setDebounce(val)
+    },
+
+    isFetching () {
+      this.__updateSvgAnimations()
+    },
+
+    renderLoadingSlot () {
+      this.__updateSvgAnimations()
     }
   },
 
@@ -183,14 +197,34 @@ export default Vue.extend({
 
         this.__scrollTarget.addEventListener('scroll', this.poll, passive)
       }
+    },
+
+    __updateSvgAnimations (isRetry) {
+      if (this.renderLoadingSlot === true) {
+        const el = this.$refs.loading
+
+        if (!el) {
+          isRetry !== true && this.$nextTick(() => {
+            this.__updateSvgAnimations(true)
+          })
+          return
+        }
+
+        // we need to pause svg animations (if any) when hiding
+        // otherwise the browser will keep on recalculating the style
+        const action = `${ this.isFetching === true ? 'un' : '' }pauseAnimations`
+        Array.from(el.getElementsByTagName('svg')).forEach(el => {
+          el[ action ]()
+        })
+      }
     }
   },
 
   mounted () {
     this.immediatePoll = this.poll
     this.__setDebounce(this.debounce)
-
     this.updateScrollTarget()
+    this.isFetching === false && this.__updateSvgAnimations()
   },
 
   activated () {
@@ -212,9 +246,10 @@ export default Vue.extend({
   render (h) {
     const child = uniqueSlot(this, 'default', [])
 
-    if (this.disable !== true && this.isWorking === true) {
+    if (this.renderLoadingSlot === true) {
       child[this.reverse === false ? 'push' : 'unshift'](
         h('div', {
+          ref: 'loading',
           staticClass: 'q-infinite-scroll__loading',
           class: this.isFetching === true ? '' : 'invisible'
         }, slot(this, 'loading'))

package/src/css/core/visibility.sass

@@ -162,4 +162,3 @@ body.desktop
   .q-focusable:focus, .q-manual-focusable--focused
     > .q-focus-helper
       opacity: .22
-

package/src/css/core/visibility.styl

@@ -161,4 +161,3 @@ body.desktop
   .q-focusable:focus, .q-manual-focusable--focused
     > .q-focus-helper
       opacity: .22
-

package/src/mixins/prevent-scroll.js

@@ -10,6 +10,7 @@ let
   vpPendingUpdate = false,
   bodyLeft,
   bodyTop,
+  href,
   closeTimer
 
 function onWheel (e) {
@@ -96,6 +97,8 @@ function apply (action) {
     bodyLeft = body.style.left
     bodyTop = body.style.top
 
+    href = window.location.href
+
     body.style.left = `-${scrollPositionX}px`
     body.style.top = `-${scrollPositionY}px`
     if (overflowY !== 'hidden' && (overflowY === 'scroll' || body.scrollHeight > window.innerHeight)) {
@@ -104,6 +107,7 @@ function apply (action) {
 
     body.classList.add('q-body--prevent-scroll')
     document.qScrollPrevented = true
+
     if (client.is.ios === true) {
       if (hasViewport === true) {
         window.scrollTo(0, 0)
@@ -140,7 +144,11 @@ function apply (action) {
     body.style.left = bodyLeft
     body.style.top = bodyTop
 
-    window.scrollTo(scrollPositionX, scrollPositionY)
+    // scroll back only if route has not changed
+    if (window.location.href === href) {
+      window.scrollTo(scrollPositionX, scrollPositionY)
+    }
+
     maxScrollTop = void 0
   }
 }

package/src/utils/is.js

@@ -36,20 +36,23 @@ export function isDeepEqual (a, b) {
         return false
       }
 
-      i = a.entries().next()
+      let iter = a.entries()
+
+      i = iter.next()
       while (i.done !== true) {
         if (b.has(i.value[0]) !== true) {
           return false
         }
-        i = i.next()
+        i = iter.next()
       }
 
-      i = a.entries().next()
+      iter = a.entries()
+      i = iter.next()
       while (i.done !== true) {
         if (isDeepEqual(i.value[1], b.get(i.value[0])) !== true) {
           return false
         }
-        i = i.next()
+        i = iter.next()
       }
 
       return true
@@ -60,12 +63,14 @@ export function isDeepEqual (a, b) {
         return false
       }
 
-      i = a.entries().next()
+      const iter = a.entries()
+
+      i = iter.next()
       while (i.done !== true) {
         if (b.has(i.value[0]) !== true) {
           return false
         }
-        i = i.next()
+        i = iter.next()
       }
 
       return true

package/src/utils/private/position-engine.js

@@ -48,11 +48,6 @@ export function parsePosition (pos, rtl) {
   }
 }
 
-export function validateCover (val) {
-  if (val === true || val === false) { return true }
-  return validatePosition(val)
-}
-
 export function getAnchorProps (el, offset) {
   let { top, left, right, bottom, width, height } = el.getBoundingClientRect()
 
@@ -67,17 +62,32 @@ export function getAnchorProps (el, offset) {
   }
 
   return {
-    top,
-    left,
-    right,
-    bottom,
-    width,
-    height,
+    top, bottom, height,
+    left, right, width,
     middle: left + (right - left) / 2,
     center: top + (bottom - top) / 2
   }
 }
 
+function getAbsoluteAnchorProps (el, absoluteOffset, offset) {
+  let { top, left } = el.getBoundingClientRect()
+
+  top += absoluteOffset.top
+  left += absoluteOffset.left
+
+  if (offset !== void 0) {
+    top += offset[ 1 ]
+    left += offset[ 0 ]
+  }
+
+  return {
+    top, bottom: top + 1, height: 1,
+    left, right: left + 1, width: 1,
+    middle: left,
+    center: top
+  }
+}
+
 export function getTargetProps (el) {
   return {
     top: 0,
@@ -89,6 +99,13 @@ export function getTargetProps (el) {
   }
 }
 
+function getTopLeftProps (anchorProps, targetProps, cfg) {
+  return {
+    top: anchorProps[ cfg.anchorOrigin.vertical ] - targetProps[ cfg.selfOrigin.vertical ],
+    left: anchorProps[ cfg.anchorOrigin.horizontal ] - targetProps[ cfg.selfOrigin.horizontal ]
+  }
+}
+
 // cfg: { el, anchorEl, anchorOrigin, selfOrigin, offset, absoluteOffset, cover, fit, maxHeight, maxWidth }
 export function setPosition (cfg) {
   if (client.is.ios === true && window.visualViewport !== void 0) {
@@ -107,25 +124,15 @@ export function setPosition (cfg) {
     }
   }
 
-  let anchorProps
-
   // scroll position might change
   // if max-height/-width changes, so we
   // need to restore it after we calculate
   // the new positioning
   const { scrollLeft, scrollTop } = cfg.el
 
-  if (cfg.absoluteOffset === void 0) {
-    anchorProps = getAnchorProps(cfg.anchorEl, cfg.cover === true ? [0, 0] : cfg.offset)
-  }
-  else {
-    const
-      { top: anchorTop, left: anchorLeft } = cfg.anchorEl.getBoundingClientRect(),
-      top = anchorTop + cfg.absoluteOffset.top,
-      left = anchorLeft + cfg.absoluteOffset.left
-
-    anchorProps = { top, left, width: 1, height: 1, right: left + 1, center: top, middle: left, bottom: top + 1 }
-  }
+  const anchorProps = cfg.absoluteOffset === void 0
+    ? getAnchorProps(cfg.anchorEl, cfg.cover === true ? [ 0, 0 ] : cfg.offset)
+    : getAbsoluteAnchorProps(cfg.anchorEl, cfg.absoluteOffset, cfg.offset)
 
   let elStyle = {
     maxHeight: cfg.maxHeight,
@@ -142,14 +149,44 @@ export function setPosition (cfg) {
 
   Object.assign(cfg.el.style, elStyle)
 
-  const
-    targetProps = getTargetProps(cfg.el),
-    props = {
-      top: anchorProps[cfg.anchorOrigin.vertical] - targetProps[cfg.selfOrigin.vertical],
-      left: anchorProps[cfg.anchorOrigin.horizontal] - targetProps[cfg.selfOrigin.horizontal]
+  const targetProps = getTargetProps(cfg.el)
+  let props = getTopLeftProps(anchorProps, targetProps, cfg)
+
+  if (cfg.absoluteOffset === void 0 || cfg.offset === void 0) {
+    applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin)
+  }
+  else { // we have touch position or context menu with offset
+    const { top, left } = props // cache initial values
+
+    // apply initial boundaries
+    applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin)
+
+    let hasChanged = false
+
+    // did it flip vertically?
+    if (props.top !== top) {
+      hasChanged = true
+      const offsetY = 2 * cfg.offset[ 1 ]
+      anchorProps.center = anchorProps.top -= offsetY
+      anchorProps.bottom -= offsetY + 2
+    }
+
+    // did it flip horizontally?
+    if (props.left !== left) {
+      hasChanged = true
+      const offsetX = 2 * cfg.offset[ 0 ]
+      anchorProps.middle = anchorProps.left -= offsetX
+      anchorProps.right -= offsetX + 2
     }
 
-  applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin)
+    if (hasChanged === true) {
+      // re-calculate props with the new anchor
+      props = getTopLeftProps(anchorProps, targetProps, cfg)
+
+      // and re-apply boundaries
+      applyBoundaries(props, anchorProps, targetProps, cfg.anchorOrigin, cfg.selfOrigin)
+    }
+  }
 
   elStyle = {
     top: props.top + 'px',