quasar 2.5.3 → 2.6.0

package/dist/quasar.umd.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.5.3
+ * Quasar Framework v2.6.0
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -502,9 +502,9 @@
 
     const fn = status === true
       ? el => {
-          el.__dragPrevented = true;
-          el.addEventListener('dragstart', prevent, listenOpts.notPassiveCapture);
-        }
+        el.__dragPrevented = true;
+        el.addEventListener('dragstart', prevent, listenOpts.notPassiveCapture);
+      }
       : el => {
         delete el.__dragPrevented;
         el.removeEventListener('dragstart', prevent, listenOpts.notPassiveCapture);
@@ -1401,6 +1401,146 @@
     globalConfigIsFrozen = true;
   }
 
+  const
+    hasMap = typeof Map === 'function',
+    hasSet = typeof Set === 'function',
+    hasArrayBuffer = typeof ArrayBuffer === 'function';
+
+  function isDeepEqual (a, b) {
+    if (a === b) {
+      return true
+    }
+
+    if (a !== null && b !== null && typeof a === 'object' && typeof b === 'object') {
+      if (a.constructor !== b.constructor) {
+        return false
+      }
+
+      let length, i;
+
+      if (a.constructor === Array) {
+        length = a.length;
+
+        if (length !== b.length) {
+          return false
+        }
+
+        for (i = length; i-- !== 0;) {
+          if (isDeepEqual(a[ i ], b[ i ]) !== true) {
+            return false
+          }
+        }
+
+        return true
+      }
+
+      if (hasMap === true && a.constructor === Map) {
+        if (a.size !== b.size) {
+          return false
+        }
+
+        i = a.entries().next();
+        while (i.done !== true) {
+          if (b.has(i.value[ 0 ]) !== true) {
+            return false
+          }
+          i = i.next();
+        }
+
+        i = a.entries().next();
+        while (i.done !== true) {
+          if (isDeepEqual(i.value[ 1 ], b.get(i.value[ 0 ])) !== true) {
+            return false
+          }
+          i = i.next();
+        }
+
+        return true
+      }
+
+      if (hasSet === true && a.constructor === Set) {
+        if (a.size !== b.size) {
+          return false
+        }
+
+        i = a.entries().next();
+        while (i.done !== true) {
+          if (b.has(i.value[ 0 ]) !== true) {
+            return false
+          }
+          i = i.next();
+        }
+
+        return true
+      }
+
+      if (hasArrayBuffer === true && a.buffer != null && a.buffer.constructor === ArrayBuffer) {
+        length = a.length;
+
+        if (length !== b.length) {
+          return false
+        }
+
+        for (i = length; i-- !== 0;) {
+          if (a[ i ] !== b[ i ]) {
+            return false
+          }
+        }
+
+        return true
+      }
+
+      if (a.constructor === RegExp) {
+        return a.source === b.source && a.flags === b.flags
+      }
+
+      if (a.valueOf !== Object.prototype.valueOf) {
+        return a.valueOf() === b.valueOf()
+      }
+
+      if (a.toString !== Object.prototype.toString) {
+        return a.toString() === b.toString()
+      }
+
+      const keys = Object.keys(a).filter(key => a[ key ] !== void 0);
+      length = keys.length;
+
+      if (length !== Object.keys(b).filter(key => b[ key ] !== void 0).length) {
+        return false
+      }
+
+      for (i = length; i-- !== 0;) {
+        const key = keys[ i ];
+        if (isDeepEqual(a[ key ], b[ key ]) !== true) {
+          return false
+        }
+      }
+
+      return true
+    }
+
+    // true if both NaN, false otherwise
+    return a !== a && b !== b // eslint-disable-line no-self-compare
+  }
+
+  // not perfect, but what we ARE interested is for Arrays not to slip in
+  // as spread operator will mess things up in various areas
+  function isObject (v) {
+    return v !== null && typeof v === 'object' && Array.isArray(v) !== true
+  }
+
+  function isDate (v) {
+    return Object.prototype.toString.call(v) === '[object Date]'
+  }
+
+  function isRegexp (v) {
+    return Object.prototype.toString.call(v) === '[object RegExp]'
+  }
+
+  function isNumber (v) {
+    return typeof v === 'number' && isFinite(v)
+  }
+
   const autoInstalledPlugins = [
     Platform,
     Body,
@@ -1436,13 +1576,13 @@
     installPlugins(pluginOpts, autoInstalledPlugins);
 
     uiOpts.components !== void 0 && Object.values(uiOpts.components).forEach(c => {
-      if (Object(c) === c && c.name !== void 0) {
+      if (isObject(c) === true && c.name !== void 0) {
         app.component(c.name, c);
       }
     });
 
     uiOpts.directives !== void 0 && Object.values(uiOpts.directives).forEach(d => {
-      if (Object(d) === d && d.name !== void 0) {
+      if (isObject(d) === true && d.name !== void 0) {
         app.directive(d.name, d);
       }
     });
@@ -1463,7 +1603,7 @@
   }
 
   var installQuasar = function (parentApp, opts = {}) {
-      const $q = { version: '2.5.3' };
+      const $q = { version: '2.6.0' };
 
       if (globalConfigIsFrozen === false) {
         if (opts.config !== void 0) {
@@ -1926,6 +2066,7 @@
   const svgUseRE = /^svguse:/;
   const ionRE = /^ion-/;
   const faLaRE = /^[lf]a[srlbdk]? /;
+  const fa6RE = /^fa-(brand|regular|solid)/;
 
   var QIcon = createComponent({
     name: 'QIcon',
@@ -1959,7 +2100,7 @@
         let cls;
         let icon = props.name;
 
-        if (!icon) {
+        if (icon === 'none' || !icon) {
           return { none: true }
         }
 
@@ -1968,6 +2109,9 @@
           if (res !== void 0) {
             if (res.icon !== void 0) {
               icon = res.icon;
+              if (icon === 'none' || !icon) {
+                return { none: true }
+              }
             }
             else {
               return {
@@ -2016,7 +2160,7 @@
         if (matches !== null) {
           cls = libMap[ matches[ 1 ] ](icon);
         }
-        else if (faLaRE.test(icon) === true) {
+        else if (faLaRE.test(icon) === true || fa6RE.test(icon) === true) {
           cls = icon;
         }
         else if (ionRE.test(icon) === true) {
@@ -2647,8 +2791,8 @@
         // avoid comparing the child with its parent
         && currentMatched[ currentMatched.length - 1 ].path !== parentRecordPath
           ? currentMatched.findIndex(
-              isSameRouteRecord.bind(null, matched[ length - 2 ])
-            )
+            isSameRouteRecord.bind(null, matched[ length - 2 ])
+          )
           : index
       )
     });
@@ -2704,7 +2848,7 @@
       prevent(e);
 
       return proxy.$router[ props.replace === true ? 'replace' : 'push' ](props.to)
-        .catch(() => {})
+        .catch(err => err)
     }
 
     return {
@@ -3167,13 +3311,13 @@
 
       return props.padding !== void 0
         ? Object.assign({}, obj, {
-            padding: props.padding
-              .split(/\s+/)
-              .map(v => (v in padding ? padding[ v ] + 'px' : v))
-              .join(' '),
-            minWidth: '0',
-            minHeight: '0'
-          })
+          padding: props.padding
+            .split(/\s+/)
+            .map(v => (v in padding ? padding[ v ] + 'px' : v))
+            .join(' '),
+          minWidth: '0',
+          minHeight: '0'
+        })
         : obj
     });
 
@@ -3352,7 +3496,7 @@
             onClick,
             onKeydown,
             onMousedown,
-            onTouchstartPassive
+            onTouchstart
           }
         }
 
@@ -3421,12 +3565,12 @@
         // is it already destroyed?
         if (rootRef.value === null) { return }
 
-        if (isKeyCode(e, [ 13, 32 ]) === true) {
-          stopAndPrevent(e);
+        emit('keydown', e);
 
-          if (keyboardTarget !== rootRef.value) {
-            keyboardTarget !== null && cleanup();
+        if (isKeyCode(e, [ 13, 32 ]) === true && keyboardTarget !== rootRef.value) {
+          keyboardTarget !== null && cleanup();
 
+          if (e.defaultPrevented !== true) {
             // focus external button if the focus helper was focused before
             rootRef.value.focus();
 
@@ -3435,15 +3579,19 @@
             document.addEventListener('keyup', onPressEnd, true);
             rootRef.value.addEventListener('blur', onPressEnd, passiveCapture);
           }
-        }
 
-        emit('keydown', e);
+          stopAndPrevent(e);
+        }
       }
 
-      function onTouchstartPassive (e) {
+      function onTouchstart (e) {
         // is it already destroyed?
         if (rootRef.value === null) { return }
 
+        emit('touchstart', e);
+
+        if (e.defaultPrevented === true) { return }
+
         if (touchTarget !== rootRef.value) {
           touchTarget !== null && cleanup();
           touchTarget = rootRef.value;
@@ -3460,23 +3608,21 @@
         mouseTimer = setTimeout(() => {
           avoidMouseRipple = false;
         }, 200);
-
-        emit('touchstart', e);
       }
 
       function onMousedown (e) {
         // is it already destroyed?
         if (rootRef.value === null) { return }
 
-        if (mouseTarget !== rootRef.value) {
+        e.qSkipRipple = avoidMouseRipple === true;
+        emit('mousedown', e);
+
+        if (e.defaultPrevented !== true && mouseTarget !== rootRef.value) {
           mouseTarget !== null && cleanup();
           mouseTarget = rootRef.value;
           rootRef.value.classList.add('q-btn--active');
           document.addEventListener('mouseup', onPressEnd, passiveCapture);
         }
-
-        e.qSkipRipple = avoidMouseRipple === true;
-        emit('mousedown', e);
       }
 
       function onPressEnd (e) {
@@ -5312,19 +5458,19 @@
           () => (
             showing.value === true
               ? vue.h('div', {
-                  ...attrs,
-                  ref: innerRef,
-                  tabindex: -1,
-                  class: [
-                    'q-menu q-position-engine scroll' + menuClass.value,
-                    attrs.class
-                  ],
-                  style: [
-                    attrs.style,
-                    transitionStyle.value
-                  ],
-                  ...onEvents.value
-                }, hSlot(slots.default))
+                ...attrs,
+                ref: innerRef,
+                tabindex: -1,
+                class: [
+                  'q-menu q-position-engine scroll' + menuClass.value,
+                  attrs.class
+                ],
+                style: [
+                  attrs.style,
+                  transitionStyle.value
+                ],
+                ...onEvents.value
+              }, hSlot(slots.default))
               : null
           )
         )
@@ -6519,136 +6665,6 @@
     }
   }
 
-  const
-    hasMap = typeof Map === 'function',
-    hasSet = typeof Set === 'function',
-    hasArrayBuffer = typeof ArrayBuffer === 'function';
-
-  function isDeepEqual (a, b) {
-    if (a === b) {
-      return true
-    }
-
-    if (a !== null && b !== null && typeof a === 'object' && typeof b === 'object') {
-      if (a.constructor !== b.constructor) {
-        return false
-      }
-
-      let length, i;
-
-      if (a.constructor === Array) {
-        length = a.length;
-
-        if (length !== b.length) {
-          return false
-        }
-
-        for (i = length; i-- !== 0;) {
-          if (isDeepEqual(a[ i ], b[ i ]) !== true) {
-            return false
-          }
-        }
-
-        return true
-      }
-
-      if (hasMap === true && a.constructor === Map) {
-        if (a.size !== b.size) {
-          return false
-        }
-
-        i = a.entries().next();
-        while (i.done !== true) {
-          if (b.has(i.value[ 0 ]) !== true) {
-            return false
-          }
-          i = i.next();
-        }
-
-        i = a.entries().next();
-        while (i.done !== true) {
-          if (isDeepEqual(i.value[ 1 ], b.get(i.value[ 0 ])) !== true) {
-            return false
-          }
-          i = i.next();
-        }
-
-        return true
-      }
-
-      if (hasSet === true && a.constructor === Set) {
-        if (a.size !== b.size) {
-          return false
-        }
-
-        i = a.entries().next();
-        while (i.done !== true) {
-          if (b.has(i.value[ 0 ]) !== true) {
-            return false
-          }
-          i = i.next();
-        }
-
-        return true
-      }
-
-      if (hasArrayBuffer === true && a.buffer != null && a.buffer.constructor === ArrayBuffer) {
-        length = a.length;
-
-        if (length !== b.length) {
-          return false
-        }
-
-        for (i = length; i-- !== 0;) {
-          if (a[ i ] !== b[ i ]) {
-            return false
-          }
-        }
-
-        return true
-      }
-
-      if (a.constructor === RegExp) {
-        return a.source === b.source && a.flags === b.flags
-      }
-
-      if (a.valueOf !== Object.prototype.valueOf) {
-        return a.valueOf() === b.valueOf()
-      }
-
-      if (a.toString !== Object.prototype.toString) {
-        return a.toString() === b.toString()
-      }
-
-      const keys = Object.keys(a).filter(key => a[ key ] !== void 0);
-      length = keys.length;
-
-      if (length !== Object.keys(b).filter(key => b[ key ] !== void 0).length) {
-        return false
-      }
-
-      for (i = length; i-- !== 0;) {
-        const key = keys[ i ];
-        if (isDeepEqual(a[ key ], b[ key ]) !== true) {
-          return false
-        }
-      }
-
-      return true
-    }
-
-    // true if both NaN, false otherwise
-    return a !== a && b !== b // eslint-disable-line no-self-compare
-  }
-
-  function isDate (v) {
-    return Object.prototype.toString.call(v) === '[object Date]'
-  }
-
-  function isNumber (v) {
-    return typeof v === 'number' && isFinite(v)
-  }
-
   const navigationPositionOptions = [ 'top', 'right', 'bottom', 'left' ];
   const controlTypeOptions = [ 'regular', 'flat', 'outline', 'push', 'unelevated' ];
 
@@ -8564,7 +8580,7 @@
       if (typeof def === 'function') {
         return markerTicks.value.map(value => {
           const item = def(value);
-          return Object(item) === item ? { ...item, value } : { value, label: item }
+          return isObject(item) === true ? { ...item, value } : { value, label: item }
         })
       }
 
@@ -8572,14 +8588,14 @@
 
       if (Array.isArray(def) === true) {
         return def
-          .map(item => (Object(item) === item ? item : { value: item }))
+          .map(item => (isObject(item) === true ? item : { value: item }))
           .filter(filterFn)
       }
 
       return Object.keys(def).map(key => {
         const item = def[ key ];
         const value = Number(key);
-        return Object(item) === item ? { ...item, value } : { value, label: item }
+        return isObject(item) === true ? { ...item, value } : { value, label: item }
       }).filter(filterFn)
     }
 
@@ -9611,11 +9627,11 @@
         let wasItActive = wasActive === true
           ? emptyFn
           : tab => {
-              if (model === tab.name.value) {
-                wasActive = true;
-                wasItActive = emptyFn;
-              }
-            };
+            if (model === tab.name.value) {
+              wasActive = true;
+              wasItActive = emptyFn;
+            }
+          };
 
         const tabList = getRouteList();
 
@@ -9911,9 +9927,12 @@
                 $tabs.avoidRouteWatcher = false;
               }
               else {
-                res.then(() => {
+                res.then(err => {
                   $tabs.avoidRouteWatcher = false;
-                  $tabs.updateModel({ name: props.name, fromRoute: true });
+
+                  if (err === void 0) {
+                    $tabs.updateModel({ name: props.name, fromRoute: true });
+                  }
                 });
               }
             };
@@ -9970,12 +9989,12 @@
       props.alert !== false && content.push(
         props.alertIcon !== void 0
           ? vue.h(QIcon, {
-              class: 'q-tab__alert-icon',
-              color: props.alert !== true
-                ? props.alert
-                : void 0,
-              name: props.alertIcon
-            })
+            class: 'q-tab__alert-icon',
+            color: props.alert !== true
+              ? props.alert
+              : void 0,
+            name: props.alertIcon
+          })
           : vue.h('div', {
             class: 'q-tab__alert'
               + (props.alert !== true ? ` text-${ props.alert }` : '')
@@ -11575,7 +11594,9 @@
     });
 
     function getLocale () {
-      return props.locale || $q.lang.date
+      return props.locale !== void 0
+        ? { ...$q.lang.date, ...props.locale }
+        : $q.lang.date
     }
 
     function getCurrentDate (dateOnly) {
@@ -12767,7 +12788,7 @@
       const rangeModel = vue.computed(() => {
         const fn = date => decodeString(date, innerMask.value, innerLocale.value);
         return normalizedModel.value
-          .filter(date => Object(date) === date && date.from !== void 0 && date.to !== void 0)
+          .filter(date => isObject(date) === true && date.from !== void 0 && date.to !== void 0)
           .map(range => ({ from: fn(range.from), to: fn(range.to) }))
           .filter(range => range.from.dateHash !== null && range.to.dateHash !== null && range.from.dateHash < range.to.dateHash)
       });
@@ -13820,24 +13841,24 @@
               }, days.value.map(day => vue.h('div', { class: day.classes }, [
                 day.in === true
                   ? vue.h(
-                      QBtn, {
-                        class: day.today === true ? 'q-date__today' : '',
-                        dense: true,
-                        flat: day.flat,
-                        unelevated: day.unelevated,
-                        color: day.color,
-                        textColor: day.textColor,
-                        label: day.i,
-                        tabindex: tabindex.value,
-                        ...getCache('day#' + day.i, {
-                          onClick: () => { onDayClick(day.i); },
-                          onMouseover: () => { onDayMouseover(day.i); }
-                        })
-                      },
-                      day.event !== false
-                        ? () => vue.h('div', { class: 'q-date__event bg-' + day.event })
-                        : null
-                    )
+                    QBtn, {
+                      class: day.today === true ? 'q-date__today' : '',
+                      dense: true,
+                      flat: day.flat,
+                      unelevated: day.unelevated,
+                      color: day.color,
+                      textColor: day.textColor,
+                      label: day.i,
+                      tabindex: tabindex.value,
+                      ...getCache('day#' + day.i, {
+                        onClick: () => { onDayClick(day.i); },
+                        onMouseover: () => { onDayMouseover(day.i); }
+                      })
+                    },
+                    day.event !== false
+                      ? () => vue.h('div', { class: 'q-date__event bg-' + day.event })
+                      : null
+                  )
                   : vue.h('div', '' + day.i)
               ]))))
             ])
@@ -14667,11 +14688,11 @@
           }, () => (
             useBackdrop.value === true
               ? vue.h('div', {
-                  class: 'q-dialog__backdrop fixed-full',
-                  style: transitionStyle.value,
-                  'aria-hidden': 'true',
-                  onMousedown: onBackdropClick
-                })
+                class: 'q-dialog__backdrop fixed-full',
+                style: transitionStyle.value,
+                'aria-hidden': 'true',
+                onMousedown: onBackdropClick
+              })
               : null
           )),
 
@@ -14681,12 +14702,12 @@
             () => (
               showing.value === true
                 ? vue.h('div', {
-                    ref: innerRef,
-                    class: classes.value,
-                    style: transitionStyle.value,
-                    tabindex: -1,
-                    ...onEvents.value
-                  }, hSlot(slots.default))
+                  ref: innerRef,
+                  class: classes.value,
+                  style: transitionStyle.value,
+                  tabindex: -1,
+                  ...onEvents.value
+                }, hSlot(slots.default))
                 : null
             )
           )
@@ -16007,18 +16028,18 @@
       function getTooltipContent () {
         return showing.value === true
           ? vue.h('div', {
-              ...attrs,
-              ref: innerRef,
-              class: [
-                'q-tooltip q-tooltip--style q-position-engine no-pointer-events',
-                attrs.class
-              ],
-              style: [
-                attrs.style,
-                transitionStyle.value
-              ],
-              role: 'complementary'
-            }, hSlot(slots.default))
+            ...attrs,
+            ref: innerRef,
+            class: [
+              'q-tooltip q-tooltip--style q-position-engine no-pointer-events',
+              attrs.class
+            ],
+            style: [
+              attrs.style,
+              transitionStyle.value
+            ],
+            role: 'complementary'
+          }, hSlot(slots.default))
           : null
       }
 
@@ -16233,8 +16254,8 @@
     if (btn.tip && eVm.$q.platform.is.desktop) {
       const Key = btn.key
         ? vue.h('div', [
-            vue.h('small', `(CTRL + ${ String.fromCharCode(btn.key) })`)
-          ])
+          vue.h('small', `(CTRL + ${ String.fromCharCode(btn.key) })`)
+        ])
         : null;
       child.push(
         vue.h(QTooltip, { delay: 1000 }, () => [
@@ -16520,36 +16541,6 @@
     return acc
   }
 
-  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'
-  }
-
-  function isPlainObject (obj) {
-    if (!obj || type(obj) !== 'object') {
-      return false
-    }
-
-    if (obj.constructor
-      && !hasOwn.call(obj, 'constructor')
-      && !hasOwn.call(obj.constructor.prototype, 'isPrototypeOf')) {
-      return false
-    }
-
-    let key;
-    for (key in obj) {} // eslint-disable-line
-
-    return key === undefined || hasOwn.call(obj, key)
-  }
-
   function extend () {
     let
       options, name, src, copy, copyIsArray, clone,
@@ -16564,7 +16555,7 @@
       i = 2;
     }
 
-    if (Object(target) !== target && type(target) !== 'function') {
+    if (Object(target) !== target && typeof target !== 'function') {
       target = {};
     }
 
@@ -16583,18 +16574,18 @@
             continue
           }
 
-          if (deep && copy && (isPlainObject(copy) || (copyIsArray = type(copy) === 'array'))) {
+          if (deep && copy && (isObject(copy) === true || (copyIsArray = Array.isArray(copy) === true))) {
             if (copyIsArray) {
               copyIsArray = false;
-              clone = src && type(src) === 'array' ? src : [];
+              clone = src && Array.isArray(src) === true ? src : [];
             }
             else {
-              clone = src && isPlainObject(src) ? src : {};
+              clone = src && isObject(src) === true ? src : {};
             }
 
             target[ name ] = extend(deep, clone, copy);
           }
-          else if (copy !== undefined) {
+          else if (copy !== void 0) {
             target[ name ] = copy;
           }
         }
@@ -16771,17 +16762,17 @@
         const userDef = props.definitions || {};
         const def = props.definitions || props.fonts
           ? extend(
-              true,
-              {},
-              buttonDef.value,
-              userDef,
-              getFonts(
-                defaultFont,
-                $q.lang.editor.defaultFont,
-                $q.iconSet.editor.font,
-                props.fonts
-              )
+            true,
+            {},
+            buttonDef.value,
+            userDef,
+            getFonts(
+              defaultFont,
+              $q.lang.editor.defaultFont,
+              $q.iconSet.editor.font,
+              props.fonts
             )
+          )
           : buttonDef.value;
 
         return props.toolbar.map(
@@ -17230,8 +17221,8 @@
 
         timer = setTimeout(() => {
           el.style.height = `${ el.scrollHeight }px`;
-          animListener = ev => {
-            if (Object(ev) !== ev || ev.target === el) {
+          animListener = evt => {
+            if (Object(evt) !== evt || evt.target === el) {
               end(el, 'show');
             }
           };
@@ -17256,8 +17247,8 @@
 
         timer = setTimeout(() => {
           el.style.height = 0;
-          animListener = ev => {
-            if (Object(ev) !== ev || ev.target === el) {
+          animListener = evt => {
+            if (Object(evt) !== evt || evt.target === el) {
               end(el, 'hide');
             }
           };
@@ -18454,18 +18445,20 @@
   }) {
     const { props, emit, proxy } = vue.getCurrentInstance();
 
+    const dndRef = vue.ref(null);
+
     const extensions = vue.computed(() => (
       props.accept !== void 0
         ? props.accept.split(',').map(ext => {
-            ext = ext.trim();
-            if (ext === '*') { // support "*"
-              return '*/'
-            }
-            else if (ext.endsWith('/*')) { // support "image/*" or "*/*"
-              ext = ext.slice(0, ext.length - 1);
-            }
-            return ext.toUpperCase()
-          })
+          ext = ext.trim();
+          if (ext === '*') { // support "*"
+            return '*/'
+          }
+          else if (ext.endsWith('/*')) { // support "image/*" or "*/*"
+            ext = ext.slice(0, ext.length - 1);
+          }
+          return ext.toUpperCase()
+        })
         : null
     ));
 
@@ -18530,7 +18523,7 @@
       // Cordova/iOS allows selecting multiple files even when the
       // multiple attribute is not specified. We also normalize drag'n'dropped
       // files here:
-      if (props.multiple !== true) {
+      if (props.multiple !== true && files.length > 0) {
         files = [ files[ 0 ] ];
       }
 
@@ -18595,7 +18588,7 @@
 
     function onDragleave (e) {
       stopAndPrevent(e);
-      dnd.value = false;
+      e.relatedTarget !== dndRef.value && (dnd.value = false);
     }
 
     function onDrop (e) {
@@ -18612,6 +18605,7 @@
     function getDndNode (type) {
       if (dnd.value === true) {
         return vue.h('div', {
+          ref: dndRef,
           class: `q-${ type }__dnd absolute-full`,
           onDragenter: stopAndPreventDrag,
           onDragover: stopAndPreventDrag,
@@ -18731,6 +18725,7 @@
       pickFiles,
       addFiles,
       onDragover,
+      onDragleave,
       processFiles,
       getDndNode,
       maxFilesNumber,
@@ -19010,10 +19005,10 @@
         }, [
           file.__status === 'failed'
             ? vue.h(QIcon, {
-                class: 'q-uploader__file-status',
-                name: $q.iconSet.type.negative,
-                color: 'negative'
-              })
+              class: 'q-uploader__file-status',
+              name: $q.iconSet.type.negative,
+              color: 'negative'
+            })
             : null,
 
           vue.h('div', { class: 'q-uploader__file-header-content col' }, [
@@ -19027,11 +19022,11 @@
 
           file.__status === 'uploading'
             ? vue.h(QCircularProgress, {
-                value: file.__progress,
-                min: 0,
-                max: 1,
-                indeterminate: file.__progress === 0
-              })
+              value: file.__progress,
+              min: 0,
+              max: 1,
+              indeterminate: file.__progress === 0
+            })
             : vue.h(QBtn, {
               round: true,
               dense: true,
@@ -19100,7 +19095,7 @@
       const data = { ref: rootRef, class: classes.value };
 
       if (canAddFiles.value === true) {
-        data.onDragover = onDragover;
+        Object.assign(data, { onDragover, onDragleave });
       }
 
       return vue.h('div', data, children)
@@ -19129,7 +19124,7 @@
       ...props
     },
 
-    emits: Object(emits) === emits
+    emits: isObject(emits) === true
       ? { ...coreEmitsObject, ...emits }
       : [ ...coreEmits, ...emits ],
 
@@ -19683,7 +19678,7 @@
         if (typeof options.style === 'string') {
           elTo.style.cssText += ' ' + options.style;
         }
-        else if (options.style === Object(options.style)) {
+        else if (isObject(options.style) === true) {
           for (const prop in options.style) {
             elTo.style[ prop ] = options.style[ prop ];
           }
@@ -20120,8 +20115,8 @@
           elToClone.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }-to`;
           elTo.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }`;
 
-          const cleanup = ev => {
-            if (ev === Object(ev) && ev.animationName !== qAnimId) {
+          const cleanup = evt => {
+            if (evt === Object(evt) && evt.animationName !== qAnimId) {
               return
             }
 
@@ -20184,24 +20179,24 @@
           : (
               options.waitFor === 'transitionend'
                 ? new Promise(resolve => {
-                    const timer = setTimeout(() => {
-                      endFn();
-                    }, 400);
+                  const timer = setTimeout(() => {
+                    endFn();
+                  }, 400);
 
-                    const endFn = ev => {
-                      clearTimeout(timer);
+                  const endFn = ev => {
+                    clearTimeout(timer);
 
-                      if (elTo) {
-                        elTo.removeEventListener('transitionend', endFn);
-                        elTo.removeEventListener('transitioncancel', endFn);
-                      }
+                    if (elTo) {
+                      elTo.removeEventListener('transitionend', endFn);
+                      elTo.removeEventListener('transitioncancel', endFn);
+                    }
 
-                      resolve();
-                    };
+                    resolve();
+                  };
 
-                    elTo.addEventListener('transitionend', endFn);
-                    elTo.addEventListener('transitioncancel', endFn);
-                  })
+                  elTo.addEventListener('transitionend', endFn);
+                  elTo.addEventListener('transitioncancel', endFn);
+                })
                 : options.waitFor
             );
 
@@ -20878,14 +20873,6 @@
         }, getControlContainer())
       );
 
-      slots.append !== void 0 && node.push(
-        vue.h('div', {
-          class: 'q-field__append q-field__marginal row no-wrap items-center',
-          key: 'append',
-          onClick: prevent
-        }, slots.append())
-      );
-
       hasError.value === true && props.noErrorIcon === false && node.push(
         getInnerAppendNode('error', [
           vue.h(QIcon, { name: $q.iconSet.field.error, color: 'negative' })
@@ -20919,6 +20906,14 @@
         );
       }
 
+      slots.append !== void 0 && node.push(
+        vue.h('div', {
+          class: 'q-field__append q-field__marginal row no-wrap items-center',
+          key: 'append',
+          onClick: prevent
+        }, slots.append())
+      );
+
       state.getInnerAppend !== void 0 && node.push(
         getInnerAppendNode('inner-append', state.getInnerAppend())
       );
@@ -21023,8 +21018,8 @@
 
         hasCounter === true
           ? vue.h('div', {
-              class: 'q-field__counter'
-            }, slots.counter !== void 0 ? slots.counter() : state.computedCounter.value)
+            class: 'q-field__counter'
+          }, slots.counter !== void 0 ? slots.counter() : state.computedCounter.value)
           : null
       ])
     }
@@ -21064,6 +21059,14 @@
     });
 
     return function renderField () {
+      const labelAttrs = state.getControl === void 0 && slots.control === void 0
+        ? {
+            ...state.splitAttrs.attributes.value,
+            'data-autofocus': props.autofocus,
+            ...attributes.value
+          }
+        : attributes.value;
+
       return vue.h('label', {
         ref: state.rootRef,
         class: [
@@ -21071,13 +21074,13 @@
           attrs.class
         ],
         style: attrs.style,
-        ...attributes.value
+        ...labelAttrs
       }, [
         slots.before !== void 0
           ? vue.h('div', {
-              class: 'q-field__before q-field__marginal row no-wrap items-center',
-              onClick: prevent
-            }, slots.before())
+            class: 'q-field__before q-field__marginal row no-wrap items-center',
+            onClick: prevent
+          }, slots.before())
           : null,
 
         vue.h('div', {
@@ -21097,9 +21100,9 @@
 
         slots.after !== void 0
           ? vue.h('div', {
-              class: 'q-field__after q-field__marginal row no-wrap items-center',
-              onClick: prevent
-            }, slots.after())
+            class: 'q-field__after q-field__marginal row no-wrap items-center',
+            onClick: prevent
+          }, slots.after())
           : null
       ])
     }
@@ -21153,12 +21156,12 @@
 
     return typeGuard === true
       ? vue.computed(() => {
-          if (props.type !== 'file') {
-            return
-          }
+        if (props.type !== 'file') {
+          return
+        }
 
-          return getFormDomProps()
-        })
+        return getFormDomProps()
+      })
       : vue.computed(getFormDomProps)
   }
 
@@ -21207,6 +21210,7 @@
       const {
         pickFiles,
         onDragover,
+        onDragleave,
         processFiles,
         getDndNode
       } = useFile({ editable: state.editable, dnd, getFileInput, addFilesToQueue });
@@ -21412,7 +21416,7 @@
           };
 
           if (state.editable.value === true) {
-            Object.assign(data, { onDragover, onKeydown, onKeyup });
+            Object.assign(data, { onDragover, onDragleave, onKeydown, onKeyup });
           }
 
           return vue.h('div', data, [ getInput() ].concat(getSelection()))
@@ -22425,7 +22429,9 @@
           isWorking.value = false;
           isFetching.value = false;
           localScrollTarget.removeEventListener('scroll', poll, passive$3);
-          poll !== void 0 && poll.cancel();
+          if (poll !== void 0 && poll.cancel !== void 0) {
+            poll.cancel();
+          }
         }
       }
 
@@ -22570,7 +22576,7 @@
 
       const labelClass = vue.computed(() =>
         'q-inner-loading__label'
-        + (props.labelClass !== void 0 ? ` ${ props.labelClass}` : '')
+        + (props.labelClass !== void 0 ? ` ${ props.labelClass }` : '')
       );
 
       function getInner () {
@@ -22596,12 +22602,12 @@
       function getContent () {
         return props.showing === true
           ? vue.h(
-              'div',
-              { class: classes.value, style: transitionStyle.value },
-              slots.default !== void 0
-                ? slots.default()
-                : getInner()
-            )
+            'div',
+            { class: classes.value, style: transitionStyle.value },
+            slots.default !== void 0
+              ? slots.default()
+              : getInner()
+          )
           : null
       }
 
@@ -22907,7 +22913,7 @@
         ? unmaskValue(masked)
         : masked;
 
-      props.modelValue !== val && emitValue(val, true);
+      String(props.modelValue) !== val && emitValue(val, true);
     }
 
     function moveCursorForPaste (inp, start, end) {
@@ -23307,7 +23313,10 @@
         if (hasMask.value === true) {
           if (stopValueWatcher === true) {
             stopValueWatcher = false;
-            return
+
+            if (String(v) === emitCachedValue) {
+              return
+            }
           }
 
           updateMaskValue(v);
@@ -23802,6 +23811,9 @@
         required: true
       },
 
+      innerMin: Number,
+      innerMax: Number,
+
       step: {
         type: Number,
         default: 1,
@@ -23826,27 +23838,33 @@
       const model = vue.ref(props.modelValue);
       const dragging = vue.ref(false);
 
-      let centerPosition, $el;
+      const innerMin = vue.computed(() => (
+        isNaN(props.innerMin) === true || props.innerMin < props.min
+          ? props.min
+          : props.innerMin
+      ));
+      const innerMax = vue.computed(() => (
+        isNaN(props.innerMax) === true || props.innerMax > props.max
+          ? props.max
+          : props.innerMax
+      ));
 
-      vue.watch(() => props.modelValue, val => {
-        if (val < props.min) {
-          model.value = props.min;
-        }
-        else if (val > props.max) {
-          model.value = props.max;
-        }
-        else {
-          if (val !== model.value) {
-            model.value = val;
-          }
-          return
-        }
+      let centerPosition;
 
-        if (model.value !== props.modelValue) {
-          emit('update:modelValue', model.value);
-          emit('change', model.value);
-        }
-      });
+      function normalizeModel () {
+        model.value = props.modelValue === null
+          ? innerMin.value
+          : between(props.modelValue, innerMin.value, innerMax.value);
+
+        updateValue(true);
+      }
+
+      vue.watch(
+        () => `${ props.modelValue }|${ innerMin.value }|${ innerMax.value }`,
+        normalizeModel
+      );
+
+      normalizeModel();
 
       const editable = vue.computed(() => props.disable === false && props.readonly === false);
 
@@ -23914,7 +23932,7 @@
       });
 
       function updateCenterPosition () {
-        const { top, left, width, height } = $el.getBoundingClientRect();
+        const { top, left, width, height } = proxy.$el.getBoundingClientRect();
         centerPosition = {
           top: top + height / 2,
           left: left + width / 2
@@ -23944,8 +23962,8 @@
 
         model.value = between(
           parseFloat((model.value + offset).toFixed(decimals.value)),
-          props.min,
-          props.max
+          innerMin.value,
+          innerMax.value
         );
 
         updateValue();
@@ -23969,11 +23987,14 @@
           angle = centerPosition.left < pos.left ? angle + 90 : 270 - angle;
         }
 
-        if (props.angle) {
+        if ($q.lang.rtl === true) {
+          angle = normalizeToInterval(-angle - props.angle, 0, 360);
+        }
+        else if (props.angle) {
           angle = normalizeToInterval(angle - props.angle, 0, 360);
         }
 
-        if ($q.lang.rtl === true) {
+        if (props.reverse === true) {
           angle = 360 - angle;
         }
 
@@ -23988,7 +24009,7 @@
           newModel = parseFloat(newModel.toFixed(decimals.value));
         }
 
-        newModel = between(newModel, props.min, props.max);
+        newModel = between(newModel, innerMin.value, innerMax.value);
 
         emit('drag-value', newModel);
 
@@ -24016,16 +24037,12 @@
         return vue.h('input', formAttrs.value)
       }
 
-      vue.onMounted(() => {
-        $el = proxy.$el;
-      });
-
       return () => {
         const data = {
           class: classes.value,
           role: 'slider',
-          'aria-valuemin': props.min,
-          'aria-valuemax': props.max,
+          'aria-valuemin': innerMin.value,
+          'aria-valuemax': innerMax.value,
           'aria-valuenow': props.modelValue,
           ...attrs.value,
           ...circularProps.value,
@@ -24038,18 +24055,18 @@
           default: slots.default
         };
 
-        if (editable.value === true) {
-          if (props.name !== void 0) {
-            child.internal = getNameInput;
-          }
-
-          return vue.withDirectives(
-            vue.h(QCircularProgress, data, child),
-            directives.value
-          )
+        if (editable.value === true && props.name !== void 0) {
+          child.internal = getNameInput;
         }
 
-        return vue.h(QCircularProgress, data, child)
+        return hDir(
+          QCircularProgress,
+          data,
+          child,
+          'knob',
+          editable.value,
+          () => directives.value
+        )
       }
     }
   });
@@ -25163,10 +25180,10 @@
       function getContent () {
         return showing.value === true
           ? vue.h('div', {
-              ref: rootRef,
-              class: 'q-page-scroller',
-              onClick
-            }, getStickyContent(slots))
+            ref: rootRef,
+            class: 'q-page-scroller',
+            onClick
+          }, getStickyContent(slots))
           : null
       }
 
@@ -26175,7 +26192,7 @@
         }
 
         if (event.isFirst === true) {
-          if (getVerticalScrollPosition(localScrollTarget) !== 0 || event.direction !== "down") {
+          if (getVerticalScrollPosition(localScrollTarget) !== 0 || event.direction !== 'down') {
             if (pulling.value === true) {
               pulling.value = false;
               state.value = 'pull';
@@ -26288,10 +26305,10 @@
             }, [
               state.value !== 'refreshing'
                 ? vue.h(QIcon, {
-                    name: props.icon || $q.iconSet.pullToRefresh.icon,
-                    color: props.color,
-                    size: '32px'
-                  })
+                  name: props.icon || $q.iconSet.pullToRefresh.icon,
+                  color: props.color,
+                  size: '32px'
+                })
                 : vue.h(QSpinner, {
                   size: '24px',
                   color: props.color
@@ -28017,17 +28034,17 @@
       return [
         tag === 'tbody'
           ? vue.h(tag, {
-              class: 'q-virtual-scroll__padding',
-              key: 'before',
-              ref: beforeRef
-            }, [
-              vue.h('tr', [
-                vue.h('td', {
-                  style: { [ paddingSize ]: `${ virtualScrollPaddingBefore.value }px`, ...style },
-                  colspan: colspanAttr.value
-                })
-              ])
+            class: 'q-virtual-scroll__padding',
+            key: 'before',
+            ref: beforeRef
+          }, [
+            vue.h('tr', [
+              vue.h('td', {
+                style: { [ paddingSize ]: `${ virtualScrollPaddingBefore.value }px`, ...style },
+                colspan: colspanAttr.value
+              })
             ])
+          ])
           : vue.h(tag, {
             class: 'q-virtual-scroll__padding',
             key: 'before',
@@ -28045,17 +28062,17 @@
 
         tag === 'tbody'
           ? vue.h(tag, {
-              class: 'q-virtual-scroll__padding',
-              key: 'after',
-              ref: afterRef
-            }, [
-              vue.h('tr', [
-                vue.h('td', {
-                  style: { [ paddingSize ]: `${ virtualScrollPaddingAfter.value }px`, ...style },
-                  colspan: colspanAttr.value
-                })
-              ])
+            class: 'q-virtual-scroll__padding',
+            key: 'after',
+            ref: afterRef
+          }, [
+            vue.h('tr', [
+              vue.h('td', {
+                style: { [ paddingSize ]: `${ virtualScrollPaddingAfter.value }px`, ...style },
+                colspan: colspanAttr.value
+              })
             ])
+          ])
           : vue.h(tag, {
             class: 'q-virtual-scroll__padding',
             key: 'after',
@@ -28451,7 +28468,7 @@
             itemProps[ 'aria-selected' ] = itemProps.active === true ? 'true' : 'false';
 
             if ($q.platform.is.desktop === true) {
-              itemProps.onMousemove = () => { setOptionIndex(index); };
+              itemProps.onMousemove = () => { menu.value === true && setOptionIndex(index); };
             }
           }
 
@@ -28716,7 +28733,7 @@
 
         return typeof val === 'function'
           ? val
-          : opt => (Object(opt) === opt && val in opt ? opt[ val ] : opt)
+          : opt => (opt !== null && typeof opt === 'object' && val in opt ? opt[ val ] : opt)
       }
 
       function isOptionSelected (opt) {
@@ -29089,6 +29106,8 @@
       }
 
       function getInput (fromDialog, isTarget) {
+        const attrs = isTarget === true ? { ...comboboxAttrs.value, ...state.splitAttrs.attributes.value } : void 0;
+
         const data = {
           ref: isTarget === true ? targetRef : void 0,
           key: 'i_t',
@@ -29097,8 +29116,7 @@
           value: inputValue.value !== void 0 ? inputValue.value : '',
           // required for Android in order to show ENTER key when in form
           type: 'search',
-          ...comboboxAttrs.value,
-          ...state.splitAttrs.attributes.value,
+          ...attrs,
           id: isTarget === true ? state.targetUid.value : void 0,
           maxlength: props.maxlength,
           autocomplete: props.autocomplete,
@@ -29499,6 +29517,7 @@
       Object.assign(proxy, {
         showPopup, hidePopup,
         removeAtIndex, add, toggleOption,
+        getOptionIndex: () => optionIndex.value,
         setOptionIndex, moveOptionSelection,
         filter, updateMenuPosition, updateInputValue,
         isOptionSelected,
@@ -29577,13 +29596,16 @@
           }
           // there can be only one (when dialog is opened the control in dialog should be target)
           else if (state.editable.value === true) {
+            const attrs = isTarget === true ? comboboxAttrs.value : void 0;
+
             child.push(
-              vue.h('div', {
+              vue.h('input', {
                 ref: isTarget === true ? targetRef : void 0,
                 key: 'd_t',
                 class: 'q-select__focus-target',
                 id: isTarget === true ? state.targetUid.value : void 0,
-                ...comboboxAttrs.value,
+                readonly: true,
+                ...attrs,
                 onKeydown: onTargetKeydown,
                 onKeyup: onTargetKeyup,
                 onKeypress: onTargetKeypress
@@ -29613,9 +29635,11 @@
             );
           }
 
+          const attrs = props.useInput === true || isTarget !== true ? void 0 : state.splitAttrs.attributes.value;
+
           return vue.h('div', {
             class: 'q-field__native row items-center',
-            ...state.splitAttrs.attributes.value
+            ...attrs
           }, child)
         },
 
@@ -32134,23 +32158,36 @@
 
       const hasPrefix = vue.computed(() => {
         return props.step.prefix
-          && isActive.value === false
-          && isError.value === false
-          && isDone.value === false
+          && (isActive.value === false || props.stepper.activeIcon === 'none')
+          && (isError.value === false || props.stepper.errorIcon === 'none')
+          && (isDone.value === false || props.stepper.doneIcon === 'none')
       });
 
       const icon = vue.computed(() => {
+        const defaultIcon = props.step.icon || props.stepper.inactiveIcon;
+
         if (isActive.value === true) {
-          return props.step.activeIcon || props.stepper.activeIcon || $q.iconSet.stepper.active
+          const icon = props.step.activeIcon || props.stepper.activeIcon;
+          return icon === 'none'
+            ? defaultIcon
+            : icon || $q.iconSet.stepper.active
         }
+
         if (isError.value === true) {
-          return props.step.errorIcon || props.stepper.errorIcon || $q.iconSet.stepper.error
+          const icon = props.step.errorIcon || props.stepper.errorIcon;
+          return icon === 'none'
+            ? defaultIcon
+            : icon || $q.iconSet.stepper.error
         }
+
         if (isDisable.value === false && isDone.value === true) {
-          return props.step.doneIcon || props.stepper.doneIcon || $q.iconSet.stepper.done
+          const icon = props.step.doneIcon || props.stepper.doneIcon;
+          return icon === 'none'
+            ? defaultIcon
+            : icon || $q.iconSet.stepper.done
         }
 
-        return props.step.icon || props.stepper.inactiveIcon
+        return defaultIcon
       });
 
       const color = vue.computed(() => {
@@ -32177,7 +32214,9 @@
       const classes = vue.computed(() => {
         return 'q-stepper__tab col-grow flex items-center no-wrap relative-position'
           + (color.value !== void 0 ? ` text-${ color.value }` : '')
-          + (isError.value === true ? ' q-stepper__tab--error' : '')
+          + (isError.value === true
+            ? ' q-stepper__tab--error q-stepper__tab--error-with-' + (hasPrefix.value === true ? 'prefix' : 'icon')
+            : '')
           + (isActive.value === true ? ' q-stepper__tab--active' : '')
           + (isDone.value === true ? ' q-stepper__tab--done' : '')
           + (headerNav.value === true ? ' q-stepper__tab--navigation q-focusable q-hoverable' : '')
@@ -32318,14 +32357,14 @@
           || $stepper.value.vertical !== true
           ? {}
           : {
-            onScroll (e) {
-              const { target } = e;
-              if (target.scrollTop > 0) {
-                target.scrollTop = 0;
+              onScroll (e) {
+                const { target } = e;
+                if (target.scrollTop > 0) {
+                  target.scrollTop = 0;
+                }
+                attrs.onScroll !== void 0 && attrs.onScroll(e);
               }
-              attrs.onScroll !== void 0 && attrs.onScroll(e);
             }
-          }
       ));
 
       const contentKey = vue.computed(() => (
@@ -32719,9 +32758,9 @@
 
         return props.type === '__qtable'
           ? getTableMiddle(
-              { ref: rootRef, class: 'q-table__middle ' + classes.value },
-              __getVirtualChildren()
-            )
+            { ref: rootRef, class: 'q-table__middle ' + classes.value },
+            __getVirtualChildren()
+          )
           : vue.h(comps[ props.type ], {
             ...attrs,
             ref: rootRef,
@@ -32806,7 +32845,7 @@
     function sort (col /* String(col name) or Object(col definition) */) {
       let sortOrder = props.columnSortOrder;
 
-      if (col === Object(col)) {
+      if (isObject(col) === true) {
         if (col.sortOrder) {
           sortOrder = col.sortOrder;
         }
@@ -33262,12 +33301,12 @@
 
       return row !== void 0
         ? Object.keys(row).map(name => ({
-            name,
-            label: name.toUpperCase(),
-            field: name,
-            align: isNumber(row[ name ]) ? 'right' : 'left',
-            sortable: true
-          }))
+          name,
+          label: name.toUpperCase(),
+          field: name,
+          align: isNumber(row[ name ]) ? 'right' : 'left',
+          sortable: true
+        }))
         : []
     });
 
@@ -34518,12 +34557,14 @@
       const mask = vue.computed(() => getMask());
       const locale = vue.computed(() => getLocale());
 
+      const defaultDateModel = vue.computed(() => getDefaultDateModel());
+
       const model = __splitDate(
         props.modelValue,
-        getMask(),
-        getLocale(),
+        mask.value, // initial mask
+        locale.value, // initial locale
         props.calendar,
-        getDefaultDateModel()
+        defaultDateModel.value
       );
 
       const view = vue.ref(getViewByModel(model));
@@ -34563,8 +34604,6 @@
         }
       });
 
-      const defaultDateModel = vue.computed(() => getDefaultDateModel());
-
       const computedFormat24h = vue.computed(() => (
         props.format24h !== null
           ? props.format24h
@@ -37541,15 +37580,15 @@
       || client.is.webkit === true || client.is.vivaldi === true
     )
       ? hexColor => {
-          const val = hexColor || getCssVar('primary');
+        const val = hexColor || getCssVar('primary');
 
-          if (client.is.nativeMobile === true && window.StatusBar) {
-            window.StatusBar.backgroundColorByHexString(val);
-          }
-          else {
-            setColor(val);
-          }
+        if (client.is.nativeMobile === true && window.StatusBar) {
+          window.StatusBar.backgroundColorByHexString(val);
         }
+        else {
+          setColor(val);
+        }
+      }
       : noop,
 
     install ({ $q }) {
@@ -37756,9 +37795,9 @@
 
           return action.label === void 0
             ? vue.h(QSeparator, {
-                class: 'col-all',
-                dark: isDark.value
-              })
+              class: 'col-all',
+              dark: isDark.value
+            })
             : vue.h('div', {
               class: [
                 'q-bottom-sheet__item q-hoverable q-focusable cursor-pointer relative-position',
@@ -37775,9 +37814,9 @@
                 : (
                     img
                       ? vue.h('img', {
-                          class: action.avatar ? 'q-bottom-sheet__avatar' : '',
-                          src: img
-                        })
+                        class: action.avatar ? 'q-bottom-sheet__avatar' : '',
+                        src: img
+                      })
                       : vue.h('div', { class: 'q-bottom-sheet__empty-icon' })
                   ),
 
@@ -37809,9 +37848,9 @@
                     : (
                         img
                           ? vue.h('img', {
-                              class: action.avatar ? 'q-bottom-sheet__avatar' : '',
-                              src: img
-                            })
+                            class: action.avatar ? 'q-bottom-sheet__avatar' : '',
+                            src: img
+                          })
                           : null
                       )
                 )
@@ -37840,8 +37879,8 @@
         child.push(
           props.grid === true
             ? vue.h('div', {
-                class: 'row items-stretch justify-start'
-              }, getGrid())
+              class: 'row items-stretch justify-start'
+            }, getGrid())
             : vue.h('div', getList())
         );
 
@@ -38057,7 +38096,11 @@
     string = decode$1(string.replace(/\+/g, ' '));
 
     try {
-      string = JSON.parse(string);
+      const parsed = JSON.parse(string);
+
+      if (parsed === Object(parsed) || Array.isArray(parsed) === true) {
+        string = parsed;
+      }
     }
     catch (e) {}
 
@@ -38284,7 +38327,7 @@
         props.progress === false
           ? null
           : (
-              Object(props.progress) === props.progress
+              isObject(props.progress) === true
                 ? {
                     component: props.progress.spinner || QSpinner,
                     props: { color: props.progress.color || vmColor.value }
@@ -38313,7 +38356,7 @@
       });
 
       const okLabel = vue.computed(() => (
-        Object(props.ok) === props.ok
+        isObject(props.ok) === true
           ? $q.lang.label.ok
           : (
               props.ok === true
@@ -38323,7 +38366,7 @@
       ));
 
       const cancelLabel = vue.computed(() => (
-        Object(props.cancel) === props.cancel
+        isObject(props.cancel) === true
           ? $q.lang.label.cancel
           : (
               props.cancel === true
@@ -38349,7 +38392,7 @@
         label: okLabel.value,
         ripple: false,
         disable: okDisabled.value,
-        ...(Object(props.ok) === props.ok ? props.ok : { flat: true }),
+        ...(isObject(props.ok) === true ? props.ok : { flat: true }),
         'data-autofocus': (props.focus === 'ok' && hasForm.value !== true) || void 0,
         onClick: onOk
       }));
@@ -38358,7 +38401,7 @@
         color: vmColor.value,
         label: cancelLabel.value,
         ripple: false,
-        ...(Object(props.cancel) === props.cancel ? props.cancel : { flat: true }),
+        ...(isObject(props.cancel) === true ? props.cancel : { flat: true }),
         'data-autofocus': (props.focus === 'cancel' && hasForm.value !== true) || void 0,
         onClick: onCancel
       }));
@@ -38405,9 +38448,9 @@
       function getSection (classes, text) {
         return props.html === true
           ? vue.h(QCardSection, {
-              class: classes,
-              innerHTML: text
-            })
+            class: classes,
+            innerHTML: text
+          })
           : vue.h(QCardSection, { class: classes }, () => text)
       }
 
@@ -38562,6 +38605,14 @@
           : {}
       );
 
+      function onStart () {
+        Plugin$3.isActive = true;
+      }
+
+      function onStop () {
+        Plugin$3.isActive = false;
+      }
+
       const el = createGlobalNode('q-loading-bar');
 
       createChildApp({
@@ -38570,23 +38621,21 @@
         // hide App from Vue devtools
         devtools: { hide: true },
 
-        setup: () => () => vue.h(QAjaxBar, { ...props.value, ref: barRef })
+        setup: () => () => vue.h(QAjaxBar, { ...props.value, onStart, onStop, ref: barRef })
       }, parentApp).mount(el);
 
       Object.assign(this, {
         start (speed) {
           barRef.value.start(speed);
-          Plugin$3.isActive = true;
         },
         stop () {
-          const sessions = barRef.value.stop();
-          Plugin$3.isActive = sessions > 0;
+          barRef.value.stop();
         },
         increment () {
           barRef.value.increment.apply(null, arguments);
         },
         setDefaults (opts) {
-          if (opts === Object(opts)) {
+          if (isObject(opts) === true) {
             Object.assign(props.value, opts);
           }
         }
@@ -38621,7 +38670,7 @@
   }, {
     show (opts) {
 
-      props = opts === Object(opts) && opts.ignoreDefaults === true
+      props = isObject(opts) === true && opts.ignoreDefaults === true
         ? { ...originalDefaults, ...opts }
         : { ...defaults$1, ...opts };
 
@@ -38722,7 +38771,7 @@
 
     setDefaults (opts) {
       {
-        opts === Object(opts) && Object.assign(defaults$1, opts);
+        isObject(opts) === true && Object.assign(defaults$1, opts);
       }
     },
 
@@ -38797,7 +38846,7 @@
       Object.assign(notif, defaults);
     }
 
-    if (Object(config) !== config) {
+    if (isObject(config) === false) {
       if (notif.type) {
         Object.assign(notif, notifTypes[ notif.type ]);
       }
@@ -39121,7 +39170,11 @@
             if (meta.hasMedia === true) {
               if (notif.spinner !== false) {
                 mainChild.push(
-                  vue.h(notif.spinner, { class: 'q-notification__spinner q-notification__spinner--' + meta.leftClass })
+                  vue.h(notif.spinner, {
+                    class: 'q-notification__spinner q-notification__spinner--' + meta.leftClass,
+                    color: notif.spinnerColor,
+                    size: notif.spinnerSize
+                  })
                 );
               }
               else if (notif.icon) {
@@ -39129,6 +39182,8 @@
                   vue.h(QIcon, {
                     class: 'q-notification__icon q-notification__icon--' + meta.leftClass,
                     name: notif.icon,
+                    color: notif.iconColor,
+                    size: notif.iconSize,
                     role: 'img'
                   })
                 );
@@ -39209,12 +39264,12 @@
   var Notify = {
     setDefaults (opts) {
       {
-        opts === Object(opts) && Object.assign(defaults, opts);
+        isObject(opts) === true && Object.assign(defaults, opts);
       }
     },
 
     registerType (typeName, typeOpts) {
-      if (typeOpts === Object(typeOpts)) {
+      if (isObject(typeOpts) === true) {
         notifTypes[ typeName ] = typeOpts;
       }
     },
@@ -39248,10 +39303,10 @@
   };
 
   function encode (value) {
-    if (Object.prototype.toString.call(value) === '[object Date]') {
+    if (isDate(value) === true) {
       return '__q_date|' + value.toUTCString()
     }
-    if (Object.prototype.toString.call(value) === '[object RegExp]') {
+    if (isRegexp(value) === true) {
       return '__q_expr|' + value.source
     }
     if (typeof value === 'number') {
@@ -39518,7 +39573,7 @@
   });
 
   var index_umd = {
-    version: '2.5.3',
+    version: '2.6.0',
     install (app, opts) {
       installQuasar(app, {
         components,