quasar 1.20.2 → 1.21.0

package/src/mixins/router-link.js

@@ -1,4 +1,55 @@
-const routerLinkProps = {
+const trailingSlashRE = /\/?$/
+
+function equals (current, target) {
+  if (Object.keys(current).length !== Object.keys(target).length) {
+    return false
+  }
+
+  // route query and params are strings when read from URL
+  for (const key in target) {
+    if (!(key in current) || String(current[key]) !== String(target[key])) {
+      return false
+    }
+  }
+  return true
+}
+
+function includes (current, target) {
+  for (const key in target) {
+    if (!(key in current)) {
+      return false
+    }
+  }
+  return true
+}
+
+function isSameRoute (current, target) {
+  if (!target) {
+    return false
+  }
+
+  if (current.path && target.path) {
+    return (
+      current.path.replace(trailingSlashRE, '') === target.path.replace(trailingSlashRE, '') &&
+      current.hash === target.hash &&
+      equals(current.query, target.query)
+    )
+  }
+
+  return typeof current.name === 'string' &&
+    current.name === target.name &&
+    current.hash === target.hash &&
+    equals(current.query, target.query) === true &&
+    equals(current.params, target.params) === true
+}
+
+function isIncludedRoute (current, target) {
+  return current.path.replace(trailingSlashRE, '/').indexOf(target.path.replace(trailingSlashRE, '/')) === 0 &&
+    (typeof target.hash !== 'string' || target.hash.length < 2 || current.hash === target.hash) &&
+    includes(current.query, target.query) === true
+}
+
+export const routerLinkProps = {
   // router-link
   to: [String, Object],
   exact: Boolean,
@@ -32,6 +83,7 @@ export default {
       return this.disable !== true && this.href !== void 0
     },
 
+    // beware, it gets overwritten in QRouteTab
     hasRouterLinkProps () {
       return this.$router !== void 0 &&
         this.disable !== true &&
@@ -39,25 +91,14 @@ export default {
         this.to !== void 0 && this.to !== null && this.to !== ''
     },
 
-    linkRoute () {
-      if (this.hasRouterLinkProps === true) {
-        // we protect from accessing this.$route without
-        // actually needing it so that we won't trigger
-        // unnecessary updates
-
-        try {
-          return this.append === true
-            ? this.$router.resolve(this.to, this.$route, true)
-            : this.$router.resolve(this.to)
-        }
-        catch (err) {}
-      }
-
-      return null
+    resolvedLink () {
+      return this.hasRouterLinkProps === true
+        ? this.__getLink(this.to, this.append)
+        : null
     },
 
     hasRouterLink () {
-      return this.linkRoute !== null
+      return this.resolvedLink !== null
     },
 
     hasLink () {
@@ -65,41 +106,126 @@ export default {
     },
 
     linkTag () {
-      if (this.hasRouterLink === true) {
-        return 'router-link'
-      }
-
       return this.type === 'a' || this.hasLink === true
         ? 'a'
         : (this.tag || this.fallbackTag || 'div')
     },
 
-    linkProps () {
+    linkAttrs () {
       return this.hasHrefLink === true
         ? {
-          attrs: {
-            href: this.href,
-            target: this.target
-          }
+          href: this.href,
+          target: this.target
         }
         : (
           this.hasRouterLink === true
             ? {
-              props: {
-                to: this.to,
-                exact: this.exact,
-                append: this.append,
-                replace: this.replace,
-                activeClass: this.activeClass,
-                exactActiveClass: this.exactActiveClass
-              },
-              attrs: {
-                href: this.linkRoute.href,
-                target: this.target
-              }
+              href: this.resolvedLink.href,
+              target: this.target
             }
             : {}
         )
+    },
+
+    linkIsActive () {
+      return this.hasRouterLink === true &&
+        isIncludedRoute(this.$route, this.resolvedLink.route)
+    },
+
+    linkIsExactActive () {
+      return this.hasRouterLink === true &&
+        isSameRoute(this.$route, this.resolvedLink.route)
+    },
+
+    linkClass () {
+      return this.hasRouterLink === true
+        ? (
+          this.linkIsExactActive === true
+            ? ` ${this.exactActiveClass} ${this.activeClass}`
+            : (
+              this.exact === true
+                ? ''
+                : (this.linkIsActive === true ? ` ${this.activeClass}` : '')
+            )
+        )
+        : ''
+    }
+  },
+
+  methods: {
+    __getLink (to, append) {
+      // we protect from accessing this.$route without
+      // actually needing it so that we won't trigger
+      // unnecessary updates in computed props using this method
+      try {
+        return append === true
+          ? this.$router.resolve(to, this.$route, true)
+          : this.$router.resolve(to)
+      }
+      catch (_) {}
+
+      return null
+    },
+
+    /**
+     * @returns Promise<RouterLocation|RouterError|false> | Promise<RouterLocation|false|void>
+     */
+    __navigateToRouterLink (
+      e,
+      { returnRouterError, to, replace = this.replace, append } = {}
+    ) {
+      if (this.disable === true) {
+        // ensure native navigation is prevented in all cases,
+        // like in QRouteTab where hasRouterLinkProps does not care about disable state
+        e.preventDefault()
+        return Promise.resolve(false)
+      }
+
+      if (
+        // don't redirect with control keys;
+        // should match RouterLink from Vue Router
+        e.metaKey || e.altKey || e.ctrlKey || e.shiftKey ||
+
+        // don't redirect on right click
+        (e.button !== void 0 && e.button !== 0) ||
+
+        // don't redirect if it should open in a new window
+        this.target === '_blank'
+      ) {
+        return Promise.resolve(false)
+      }
+
+      e.preventDefault()
+
+      const resolvedLink = to === void 0
+        ? this.resolvedLink
+        : this.__getLink(to, append)
+
+      if (resolvedLink === null) {
+        return Promise[returnRouterError === true ? 'reject' : 'resolve'](false)
+      }
+
+      const promise = this.$router[replace === true ? 'replace' : 'push'](resolvedLink.location)
+
+      return returnRouterError === true
+        ? promise
+        : promise.catch(() => {})
+    },
+
+    __navigateOnClick (e) {
+      if (this.hasRouterLink === true) {
+        const go = opts => this.__navigateToRouterLink(e, opts)
+
+        this.$emit('click', e, go)
+
+        // for backward compatibility
+        e.navigate === false && e.preventDefault()
+
+        e.defaultPrevented !== true && go()
+      }
+      else {
+        this.$emit('click', e)
+      }
     }
   }
 }

package/src/mixins/timeout.js

@@ -1,37 +1,68 @@
 export default {
+  created () {
+    this.__tickFnList = []
+    this.__timeoutFnList = []
+  },
+
+  deactivated () {
+    this.__tickFnList.forEach(tick => { tick.removeTick() })
+    this.__timeoutFnList.forEach(tick => { tick.removeTimeout() })
+  },
+
+  beforeDestroy () {
+    this.__tickFnList.forEach(tick => { tick.removeTick() })
+    this.__tickFnList = void 0
+
+    this.__timeoutFnList.forEach(tick => { tick.removeTimeout() })
+    this.__timeoutFnList = void 0
+  },
+
   methods: {
-    __nextTick (fn) {
-      this.__tickFn = fn
-    },
+    __useTick (registerFnName, removeFnName) {
+      const tick = {
+        removeTick () {
+          tick.fn = void 0
+        },
 
-    __prepareTick () {
-      if (this.__tickFn !== void 0) {
-        const fn = this.__tickFn
-        this.$nextTick(() => {
-          if (this.__tickFn === fn) {
-            this.__tickFn()
-            this.__tickFn = void 0
-          }
-        })
+        registerTick: fn => {
+          tick.fn = fn
+
+          this.$nextTick(() => {
+            if (tick.fn === fn) {
+              // we also check if VM is destroyed, since if it
+              // got to trigger one nextTick() we cannot stop it
+              this._isDestroyed === false && tick.fn()
+              tick.fn = void 0
+            }
+          })
+        }
       }
-    },
 
-    __clearTick () {
-      this.__tickFn = void 0
-    },
+      this.__tickFnList.push(tick)
 
-    __setTimeout (fn, delay) {
-      clearTimeout(this.__timer)
-      this.__timer = setTimeout(fn, delay)
+      this[registerFnName] = tick.registerTick
+      removeFnName !== void 0 && (this[removeFnName] = tick.removeTick)
     },
 
-    __clearTimeout () {
-      clearTimeout(this.__timer)
-    }
-  },
+    __useTimeout (registerFnName, removeFnName) {
+      const timeout = {
+        removeTimeout () {
+          clearTimeout(timeout.timer)
+        },
 
-  beforeDestroy () {
-    this.__tickFn = void 0
-    clearTimeout(this.__timer)
+        registerTimeout: (fn, delay) => {
+          clearTimeout(timeout.timer)
+
+          if (this._isDestroyed === false) {
+            timeout.timer = setTimeout(fn, delay)
+          }
+        }
+      }
+
+      this.__timeoutFnList.push(timeout)
+
+      this[registerFnName] = timeout.registerTimeout
+      removeFnName !== void 0 && (this[removeFnName] = timeout.removeTimeout)
+    }
   }
 }

package/src/plugins/BottomSheet.js

@@ -1,5 +1,5 @@
 import BottomSheet from '../components/dialog-bottom-sheet/BottomSheet.js'
-import globalDialog from '../utils/global-dialog.js'
+import globalDialog from '../utils/private/global-dialog.js'
 
 export default {
   install ({ $q }) {

package/src/plugins/BottomSheet.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "utils/global-dialog" ],
+  "mixins": [ "utils/private/global-dialog" ],
 
   "meta": {
     "docsUrl": "https://v1.quasar.dev/quasar-plugins/bottom-sheet"

package/src/plugins/Dialog.js

@@ -1,5 +1,5 @@
 import DialogPlugin from '../components/dialog-plugin/DialogPlugin.js'
-import globalDialog from '../utils/global-dialog.js'
+import globalDialog from '../utils/private/global-dialog.js'
 
 export default {
   install ({ $q }) {

package/src/plugins/Dialog.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "utils/global-dialog" ],
+  "mixins": [ "utils/private/global-dialog" ],
 
   "meta": {
     "docsUrl": "https://v1.quasar.dev/quasar-plugins/dialog"

package/src/plugins/Loading.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 
 import QSpinner from '../components/spinner/QSpinner.js'
 import { isSSR } from './Platform.js'
-import cache from '../utils/cache.js'
+import cache from '../utils/private/cache.js'
 import { isObject } from '../utils/is.js'
 import { preventScroll } from '../mixins/prevent-scroll.js'
 

package/src/plugins/LocalStorage.js

@@ -1,5 +1,5 @@
 import { isSSR, client } from './Platform.js'
-import { getEmptyStorage, getStorage } from '../utils/web-storage.js'
+import { getEmptyStorage, getStorage } from '../utils/private/web-storage.js'
 
 export default {
   install ({ $q }) {

package/src/plugins/LocalStorage.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "utils/web-storage" ],
+  "mixins": [ "utils/private/web-storage" ],
 
   "injection": "$q.localStorage"
 }

package/src/plugins/SessionStorage.js

@@ -1,5 +1,5 @@
 import { isSSR, client } from './Platform.js'
-import { getEmptyStorage, getStorage } from '../utils/web-storage.js'
+import { getEmptyStorage, getStorage } from '../utils/private/web-storage.js'
 
 export default {
   install ({ $q }) {

package/src/plugins/SessionStorage.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "utils/web-storage" ],
+  "mixins": [ "utils/private/web-storage" ],
 
   "injection": "$q.sessionStorage"
 }

package/src/utils/date.js

@@ -2,7 +2,7 @@
 
 import { isDate } from './is.js'
 import { pad, capitalize } from './format.js'
-import { jalaaliMonthLength } from './date-persian.js'
+import { jalaaliMonthLength } from './private/date-persian.js'
 import lang, { defaultLang } from '../lang.js'
 
 const

package/src/utils/extend.js

@@ -1,24 +1,21 @@
 const
   toString = Object.prototype.toString,
   hasOwn = Object.prototype.hasOwnProperty,
-  class2type = {}
-
-'Boolean Number String Function Array Date RegExp Object'.split(' ').forEach(name => {
-  class2type['[object ' + name + ']'] = name.toLowerCase()
-})
-
-function type (obj) {
-  return obj === null ? String(obj) : class2type[toString.call(obj)] || 'object'
-}
+  notPlainObject = new Set(
+    ['Boolean', 'Number', 'String', 'Function', 'Array', 'Date', 'RegExp']
+      .map(name => '[object ' + name + ']')
+  )
 
 function isPlainObject (obj) {
-  if (!obj || type(obj) !== 'object') {
+  if (obj !== Object(obj) || notPlainObject.has(toString.call(obj)) === true) {
     return false
   }
 
-  if (obj.constructor &&
-    !hasOwn.call(obj, 'constructor') &&
-    !hasOwn.call(obj.constructor.prototype, 'isPrototypeOf')) {
+  if (
+    obj.constructor &&
+    hasOwn.call(obj, 'constructor') === false &&
+    hasOwn.call(obj.constructor.prototype, 'isPrototypeOf') === false
+  ) {
     return false
   }
 
@@ -42,7 +39,7 @@ export default function extend () {
     i = 2
   }
 
-  if (Object(target) !== target && type(target) !== 'function') {
+  if (Object(target) !== target && typeof target !== 'function') {
     target = {}
   }
 
@@ -61,13 +58,12 @@ export default function extend () {
           continue
         }
 
-        if (deep && copy && (isPlainObject(copy) === true || (copyIsArray = type(copy) === 'array'))) {
-          if (copyIsArray) {
-            copyIsArray = false
-            clone = src && type(src) === 'array' ? src : []
+        if (deep === true && copy && ((copyIsArray = Array.isArray(copy)) || isPlainObject(copy) === true)) {
+          if (copyIsArray === true) {
+            clone = Array.isArray(src) === true ? src : []
           }
           else {
-            clone = src && isPlainObject(src) === true ? src : {}
+            clone = isPlainObject(src) === true ? src : {}
           }
 
           target[name] = extend(deep, clone, copy)

package/src/utils/{cache.js → private/cache.js}

@@ -1,4 +1,4 @@
-import { isSSR } from '../plugins/Platform.js'
+import { isSSR } from '../../plugins/Platform.js'
 
 export default function cache (vm, key, obj) {
   if (isSSR === true) return obj

package/src/utils/{global-dialog.js → private/global-dialog.js}

@@ -1,6 +1,6 @@
 import Vue from 'vue'
 
-import { isSSR } from '../plugins/Platform.js'
+import { isSSR } from '../../plugins/Platform.js'
 
 const ssrAPI = {
   onOk: () => ssrAPI,

package/src/utils/private/inject-obj-prop.js

@@ -0,0 +1,15 @@
+export function injectProp (target, propName, get, set) {
+  Object.defineProperty(target, propName, {
+    get,
+    set,
+    enumerable: true
+  })
+  return target
+}
+
+export function injectMultipleProps (target, props) {
+  Object.keys(props).forEach(key => {
+    injectProp(target, key, props[ key ])
+  })
+  return target
+}

package/src/utils/{position-engine.js → private/position-engine.js}

@@ -1,5 +1,5 @@
-import { getScrollbarWidth } from './scroll.js'
-import { client } from '../plugins/Platform.js'
+import { getScrollbarWidth } from '../scroll.js'
+import { client } from '../../plugins/Platform.js'
 
 let vpLeft, vpTop
 

package/src/utils/{selection.js → private/selection.js}

@@ -1,4 +1,4 @@
-import Platform from '../plugins/Platform.js'
+import Platform from '../../plugins/Platform.js'
 
 export function clearSelection () {
   if (window.getSelection !== void 0) {

package/src/utils/{web-storage.js → private/web-storage.js}

@@ -1,5 +1,5 @@
-import { noop } from '../utils/event.js'
-import { isDate, isRegexp } from '../utils/is.js'
+import { noop } from '../event.js'
+import { isDate, isRegexp } from '../is.js'
 
 function encode (value) {
   if (isDate(value) === true) {

package/src/utils/run-sequential-promises.js

@@ -34,7 +34,7 @@ function parsePromises (sequentialPromises) {
  *                   Default: { threadsNumber: 1, abortOnFail: true }
  *                   When configuring threadsNumber AND using http requests, be
  *                       aware of the maximum threads that the hosting browser
- *                       supports (usually 3); any number of threads above that
+ *                       supports (usually 5); any number of threads above that
  *                       won't add any real benefits
  * @returns Promise<Array<Object> | Object>
  *    With opts.abortOnFail set to true (which is default):

package/src/utils.js

@@ -5,13 +5,13 @@ import date from './utils/date.js'
 import debounce from './utils/debounce.js'
 import dom from './utils/dom.js'
 import event, { noop } from './utils/event.js'
-import is from './utils/is.js'
 import exportFile from './utils/export-file.js'
 import extend from './utils/extend.js'
 import format from './utils/format.js'
 import frameDebounce from './utils/frame-debounce.js'
-import openURL from './utils/open-url.js'
+import is from './utils/is.js'
 import morph from './utils/morph.js'
+import openURL from './utils/open-url.js'
 import patterns from './utils/patterns.js'
 import runSequentialPromises from './utils/run-sequential-promises.js'
 import scroll from './utils/scroll.js'
@@ -26,14 +26,14 @@ export {
   debounce,
   dom,
   event,
+  noop,
   exportFile,
   extend,
   format,
   frameDebounce,
-  noop,
   is,
-  openURL,
   morph,
+  openURL,
   patterns,
   runSequentialPromises,
   scroll,

package/src/utils/router.js

@@ -1,50 +0,0 @@
-const trailingSlashRE = /\/?$/
-
-function equals (current, target) {
-  if (Object.keys(current).length !== Object.keys(target).length) {
-    return false
-  }
-
-  // route query and params are strings when read from URL
-  for (const key in target) {
-    if (!(key in current) || String(current[key]) !== String(target[key])) {
-      return false
-    }
-  }
-  return true
-}
-
-function includes (current, target) {
-  for (const key in target) {
-    if (!(key in current)) {
-      return false
-    }
-  }
-  return true
-}
-
-export function isSameRoute (current, target) {
-  if (!target) {
-    return false
-  }
-
-  if (current.path && target.path) {
-    return (
-      current.path.replace(trailingSlashRE, '') === target.path.replace(trailingSlashRE, '') &&
-      current.hash === target.hash &&
-      equals(current.query, target.query)
-    )
-  }
-
-  return typeof current.name === 'string' &&
-    current.name === target.name &&
-    current.hash === target.hash &&
-    equals(current.query, target.query) === true &&
-    equals(current.params, target.params) === true
-}
-
-export function isIncludedRoute (current, target) {
-  return current.path.replace(trailingSlashRE, '/').indexOf(target.path.replace(trailingSlashRE, '/')) === 0 &&
-    (typeof target.hash !== 'string' || target.hash.length < 2 || current.hash === target.hash) &&
-    includes(current.query, target.query) === true
-}