quasar 2.5.0 → 2.5.4

package/src/components/table/QTable.json

@@ -1867,9 +1867,7 @@
       "desc": "Emitted when user clicks/taps on a row; Is not emitted when using body/row/item scoped slots",
       "params": {
         "evt": {
-          "type": "Object",
-          "desc": "JS event object",
-          "__exemption": [ "examples" ]
+          "extends": "evt"
         },
 
         "row": {
@@ -1890,9 +1888,7 @@
       "desc": "Emitted when user quickly double clicks/taps on a row; Is not emitted when using body/row/item scoped slots; Please check JS dblclick event support before using",
       "params": {
         "evt": {
-          "type": "Object",
-          "desc": "JS event object",
-          "__exemption": [ "examples" ]
+          "extends": "evt"
         },
 
         "row": {
@@ -1913,9 +1909,7 @@
       "desc": "Emitted when user right clicks/long taps on a row; Is not emitted when using body/row/item scoped slots",
       "params": {
         "evt": {
-          "type": "Object",
-          "desc": "JS event object",
-          "__exemption": [ "examples" ]
+          "extends": "evt"
         },
 
         "row": {
@@ -2075,10 +2069,8 @@
               "desc": "Were the rows added to selection (true) or removed from selection (false)"
             },
             "evt": {
-              "type": "Object",
-              "required": true,
-              "desc": "JS event object",
-              "__exemption": [ "examples" ]
+              "extends": "evt",
+              "required": true
             }
           }
         }

package/src/components/tabs/QRouteTab.json

@@ -10,9 +10,8 @@
       "desc": "Emitted when component is clicked (activated)",
       "params": {
         "evt": {
-          "type": "Object",
-          "desc": "JS event object; If you want to cancel navigation set synchronously 'evt.navigate' to false",
-          "__exemption": [ "examples" ]
+          "extends": "evt",
+          "desc": "JS event object; If you want to cancel navigation set synchronously 'evt.navigate' to false"
         },
         "navigateFn": {
           "type": "Function",

package/src/components/tabs/use-tab.js

@@ -108,9 +108,12 @@ export default function (props, slots, emit, routerProps) {
               $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 })
+                }
               })
             }
           }
@@ -167,12 +170,12 @@ export default function (props, slots, emit, routerProps) {
     props.alert !== false && content.push(
       props.alertIcon !== void 0
         ? 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
+        })
         : h('div', {
           class: 'q-tab__alert'
             + (props.alert !== true ? ` text-${ props.alert }` : '')

package/src/components/tree/QTree.js

@@ -542,34 +542,34 @@ export default createComponent({
 
           m.lazy === 'loading'
             ? h(QSpinner, {
-                class: 'q-tree__spinner',
-                color: computedControlColor.value
-              })
+              class: 'q-tree__spinner',
+              color: computedControlColor.value
+            })
             : (
                 isParent === true
                   ? h(QIcon, {
-                      class: 'q-tree__arrow'
+                    class: 'q-tree__arrow'
                     + (m.expanded === true ? ' q-tree__arrow--rotate' : ''),
-                      name: computedIcon.value,
-                      onClick (e) { onExpandClick(node, m, e) }
-                    })
+                    name: computedIcon.value,
+                    onClick (e) { onExpandClick(node, m, e) }
+                  })
                   : null
               ),
 
           m.hasTicking === true && m.noTick !== true
             ? h(QCheckbox, {
-                class: 'q-tree__tickbox',
-                modelValue: m.indeterminate === true ? null : m.ticked,
-                color: computedControlColor.value,
-                dark: isDark.value,
-                dense: true,
-                keepColor: true,
-                disable: m.tickable !== true,
-                onKeydown: stopAndPrevent,
-                'onUpdate:modelValue': v => {
-                  onTickedClick(m, v)
-                }
-              })
+              class: 'q-tree__tickbox',
+              modelValue: m.indeterminate === true ? null : m.ticked,
+              color: computedControlColor.value,
+              dark: isDark.value,
+              dense: true,
+              keepColor: true,
+              disable: m.tickable !== true,
+              onKeydown: stopAndPrevent,
+              'onUpdate:modelValue': v => {
+                onTickedClick(m, v)
+              }
+            })
             : null,
 
           h('div', {
@@ -587,22 +587,22 @@ export default createComponent({
 
         isParent === true
           ? h(QSlideTransition, {
-              duration: props.duration,
-              onShow,
-              onHide
-            }, () => withDirectives(
+            duration: props.duration,
+            onShow,
+            onHide
+          }, () => withDirectives(
+            h('div', {
+              class: 'q-tree__node-collapsible' + textColorClass.value,
+              key: `${ key }__q`
+            }, [
+              body,
               h('div', {
-                class: 'q-tree__node-collapsible' + textColorClass.value,
-                key: `${ key }__q`
-              }, [
-                body,
-                h('div', {
-                  class: 'q-tree__children'
+                class: 'q-tree__children'
                   + (m.disabled === true ? ' q-tree__node--disabled' : '')
-                }, children)
-              ]),
-              [ [ vShow, m.expanded ] ]
-            ))
+              }, children)
+            ]),
+            [ [ vShow, m.expanded ] ]
+          ))
           : body
       ])
     }
@@ -615,14 +615,12 @@ export default createComponent({
     function onClick (node, meta, e, keyboard) {
       keyboard !== true && blur(meta.key)
 
-      if (hasSelection.value) {
-        if (meta.selectable) {
-          if (props.noSelectionUnset === false) {
-            emit('update:selected', meta.key !== props.selected ? meta.key : null)
-          }
-          else if (meta.key !== props.selected) {
-            emit('update:selected', meta.key || null)
-          }
+      if (hasSelection.value && meta.selectable) {
+        if (props.noSelectionUnset === false) {
+          emit('update:selected', meta.key !== props.selected ? meta.key : null)
+        }
+        else if (meta.key !== props.selected) {
+          emit('update:selected', meta.key || null)
         }
       }
       else {

package/src/composables/private/use-file.json

@@ -85,9 +85,7 @@
       "desc": "Trigger file pick; Must be called as a direct consequence of user interaction (eg. in a click handler), due to browsers security policy",
       "params": {
         "evt": {
-          "type": "Object",
-          "desc": "JS event object",
-          "__exemption": [ "examples" ]
+          "extends": "evt"
         }
       }
     },

package/src/composables/private/use-router-link.js

@@ -248,7 +248,7 @@ export default function (fallbackTag) {
     prevent(e)
 
     return proxy.$router[ props.replace === true ? 'replace' : 'push' ](props.to)
-      .catch(() => {})
+      .catch(err => err)
   }
 
   return {

package/src/composables/private/use-validate.js

@@ -84,7 +84,14 @@ export default function (focused, innerLoading) {
     else if (isDirtyModel.value === false) {
       isDirtyModel.value = true
 
-      if (hasActiveRules.value === true && props.lazyRules !== 'ondemand') {
+      if (
+        hasActiveRules.value === true
+        && props.lazyRules !== 'ondemand'
+        // Don't re-trigger if it's already in progress;
+        // It might mean that focus switched to submit btn and
+        // QForm's submit() has been called already (ENTER key)
+        && innerLoading.value === false
+      ) {
         debouncedValidate()
       }
     }
@@ -110,7 +117,7 @@ export default function (focused, innerLoading) {
       return true
     }
 
-    validateIndex++
+    const index = ++validateIndex
 
     if (innerLoading.value !== true && props.lazyRules !== true) {
       isDirtyModel.value = true
@@ -127,9 +134,7 @@ export default function (focused, innerLoading) {
         innerErrorMessage.value = m
       }
 
-      if (innerLoading.value !== false) {
-        innerLoading.value = false
-      }
+      innerLoading.value = false
     }
 
     const promises = []
@@ -159,35 +164,26 @@ export default function (focused, innerLoading) {
       return true
     }
 
-    if (innerLoading.value !== true) {
-      innerLoading.value = true
-    }
-
-    const index = validateIndex
+    innerLoading.value = true
 
     return Promise.all(promises).then(
       res => {
-        if (index !== validateIndex) {
-          return true
-        }
-
         if (res === void 0 || Array.isArray(res) === false || res.length === 0) {
-          update(false)
+          index === validateIndex && update(false)
           return true
         }
 
         const msg = res.find(r => r === false || typeof r === 'string')
-        update(msg !== void 0, msg)
+        index === validateIndex && update(msg !== void 0, msg)
         return msg === void 0
       },
       e => {
         if (index === validateIndex) {
           console.error(e)
           update(true)
-          return false
         }
 
-        return true
+        return false
       }
     )
   }

package/src/directives/TouchHold.json

@@ -12,9 +12,8 @@
         "desc": "Event details",
         "definition": {
           "evt": {
-            "type": "Object",
-            "desc": "Original JS event Object",
-            "__exemption": [ "examples" ]
+            "extends": "evt",
+            "desc": "Original JS event Object"
           },
           "touch": {
             "type": "Boolean",

package/src/directives/TouchPan.json

@@ -12,9 +12,8 @@
         "desc": "Event details",
         "definition": {
           "evt": {
-            "type": "Object",
-            "desc": "Original JS event Object",
-            "__exemption": [ "examples" ]
+            "extends": "evt",
+            "desc": "Original JS event Object"
           },
           "touch": {
             "type": "Boolean",

package/src/directives/TouchRepeat.json

@@ -12,9 +12,8 @@
         "desc": "Event details",
         "definition": {
           "evt": {
-            "type": "Object",
-            "desc": "Original JS event Object",
-            "__exemption": [ "examples" ]
+            "extends": "evt",
+            "desc": "Original JS event Object"
           },
           "touch": {
             "type": "Boolean",

package/src/directives/TouchSwipe.json

@@ -12,9 +12,8 @@
         "desc": "Event details",
         "definition": {
           "evt": {
-            "type": "Object",
-            "desc": "Original JS event Object",
-            "__exemption": [ "examples" ]
+            "extends": "evt",
+            "desc": "Original JS event Object"
           },
           "touch": {
             "type": "Boolean",

package/src/plugins/Screen.js

@@ -1,4 +1,4 @@
-import { isRuntimeSsrPreHydration } from './Platform.js'
+import { isRuntimeSsrPreHydration, client } from './Platform.js'
 
 import defineReactivePlugin from '../utils/private/define-reactive-plugin.js'
 import { listenOpts, noop } from '../utils/event.js'
@@ -60,11 +60,15 @@ export default defineReactivePlugin({
 
     const { visualViewport } = window
     const target = visualViewport || window
-    const getSize = visualViewport === void 0
-      ? () => [ window.innerWidth, window.innerHeight ]
+    const scrollingElement = document.scrollingElement || document.documentElement
+    const getSize = visualViewport === void 0 || client.is.mobile === true
+      ? () => [
+          Math.max(window.innerWidth, scrollingElement.clientWidth),
+          Math.max(window.innerHeight, scrollingElement.clientHeight)
+        ]
       : () => [
-          visualViewport.width * visualViewport.scale + window.innerWidth - document.scrollingElement.clientWidth,
-          visualViewport.height * visualViewport.scale + window.innerHeight - document.scrollingElement.clientHeight
+          visualViewport.width * visualViewport.scale + window.innerWidth - scrollingElement.clientWidth,
+          visualViewport.height * visualViewport.scale + window.innerHeight - scrollingElement.clientHeight
         ]
 
     const classes = $q.config.screen !== void 0 && $q.config.screen.bodyClasses === true

package/src/utils/date.js

@@ -174,15 +174,18 @@ function formatTimezone (offset, delimeter = '') {
 function applyYearMonthDayChange (date, mod, sign) {
   let
     year = date.getFullYear(),
-    month = date.getMonth(),
-    day = date.getDate()
+    month = date.getMonth()
 
-  if (mod.years !== void 0) {
-    year += sign * mod.years
+  const day = date.getDate()
+
+  if (mod.year !== void 0) {
+    year += sign * mod.year
+    delete mod.year
   }
 
-  if (mod.months !== void 0) {
-    month += sign * mod.months
+  if (mod.month !== void 0) {
+    month += sign * mod.month
+    delete mod.month
   }
 
   date.setDate(1)
@@ -192,30 +195,14 @@ function applyYearMonthDayChange (date, mod, sign) {
   date.setMonth(month)
   date.setDate(Math.min(day, daysInMonth(date)))
 
-  if (mod.days !== void 0) {
-    date.setDate(date.getDate() + sign * mod.days)
+  if (mod.date !== void 0) {
+    date.setDate(date.getDate() + sign * mod.date)
+    delete mod.date
   }
 
   return date
 }
 
-function getChange (date, mod, sign) {
-  const
-    d = new Date(date),
-    t = mod.years !== void 0 || mod.months !== void 0 || mod.days !== void 0
-      ? applyYearMonthDayChange(d, mod, sign)
-      : d
-
-  for (const key in mod) {
-    if (key !== 'years' && key !== 'months' && key !== 'days') {
-      const op = capitalize(key)
-      t[ `set${ op }` ](t[ `get${ op }` ]() + sign * mod[ key ])
-    }
-  }
-
-  return t
-}
-
 function applyYearMonthDay (date, mod, middle) {
   const
     year = mod.year !== void 0 ? mod.year : date[ `get${ middle }FullYear` ](),
@@ -230,22 +217,86 @@ function applyYearMonthDay (date, mod, middle) {
   date[ `set${ middle }Month` ](month)
   date[ `set${ middle }Date` ](day)
 
+  delete mod.year
+  delete mod.month
+  delete mod.date
+
   return date
 }
 
-export function adjustDate (date, mod, utc) {
+function getChange (date, rawMod, sign) {
   const
+    mod = normalizeMod(rawMod),
+    d = new Date(date),
+    t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
+      ? applyYearMonthDayChange(d, mod, sign) // removes year/month/day
+      : d
+
+  for (const key in mod) {
+    const op = capitalize(key)
+    t[ `set${ op }` ](t[ `get${ op }` ]() + sign * mod[ key ])
+  }
+
+  return t
+}
+
+function normalizeMod (mod) {
+  const acc = { ...mod }
+
+  if (mod.years !== void 0) {
+    acc.year = mod.years
+    delete acc.years
+  }
+
+  if (mod.months !== void 0) {
+    acc.month = mod.months
+    delete acc.months
+  }
+
+  if (mod.days !== void 0) {
+    acc.date = mod.days
+    delete acc.days
+  }
+  if (mod.day !== void 0) {
+    acc.date = mod.day
+    delete acc.day
+  }
+
+  if (mod.hour !== void 0) {
+    acc.hours = mod.hour
+    delete acc.hour
+  }
+
+  if (mod.minute !== void 0) {
+    acc.minutes = mod.minute
+    delete acc.minute
+  }
+
+  if (mod.second !== void 0) {
+    acc.seconds = mod.second
+    delete acc.second
+  }
+
+  if (mod.millisecond !== void 0) {
+    acc.milliseconds = mod.millisecond
+    delete acc.millisecond
+  }
+
+  return acc
+}
+
+export function adjustDate (date, rawMod, utc) {
+  const
+    mod = normalizeMod(rawMod),
     middle = utc === true ? 'UTC' : '',
     d = new Date(date),
     t = mod.year !== void 0 || mod.month !== void 0 || mod.date !== void 0
-      ? applyYearMonthDay(d, mod, middle)
+      ? applyYearMonthDay(d, mod, middle) // removes year/month/day
       : d
 
   for (const key in mod) {
-    if (key !== 'year' && key !== 'month' && key !== 'date') {
-      const op = key.charAt(0).toUpperCase() + key.slice(1)
-      t[ `set${ middle }${ op }` ](mod[ key ])
-    }
+    const op = key.charAt(0).toUpperCase() + key.slice(1)
+    t[ `set${ middle }${ op }` ](mod[ key ])
   }
 
   return t
@@ -479,16 +530,23 @@ export function startOfDate (date, unit, utc) {
 
   switch (unit) {
     case 'year':
+    case 'years':
       t[ `${ prefix }Month` ](0)
     case 'month':
+    case 'months':
       t[ `${ prefix }Date` ](1)
     case 'day':
+    case 'days':
+    case 'date':
       t[ `${ prefix }Hours` ](0)
     case 'hour':
+    case 'hours':
       t[ `${ prefix }Minutes` ](0)
     case 'minute':
+    case 'minutes':
       t[ `${ prefix }Seconds` ](0)
     case 'second':
+    case 'seconds':
       t[ `${ prefix }Milliseconds` ](0)
   }
   return t
@@ -501,16 +559,23 @@ export function endOfDate (date, unit, utc) {
 
   switch (unit) {
     case 'year':
+    case 'years':
       t[ `${ prefix }Month` ](11)
     case 'month':
+    case 'months':
       t[ `${ prefix }Date` ](daysInMonth(t))
     case 'day':
+    case 'days':
+    case 'date':
       t[ `${ prefix }Hours` ](23)
     case 'hour':
+    case 'hours':
       t[ `${ prefix }Minutes` ](59)
     case 'minute':
+    case 'minutes':
       t[ `${ prefix }Seconds` ](59)
     case 'second':
+    case 'seconds':
       t[ `${ prefix }Milliseconds` ](999)
   }
   return t
@@ -546,21 +611,28 @@ export function getDateDiff (date, subtract, unit = 'days') {
 
   switch (unit) {
     case 'years':
+    case 'year':
       return (t.getFullYear() - sub.getFullYear())
 
     case 'months':
+    case 'month':
       return (t.getFullYear() - sub.getFullYear()) * 12 + t.getMonth() - sub.getMonth()
 
     case 'days':
+    case 'day':
+    case 'date':
       return getDiff(startOfDate(t, 'day'), startOfDate(sub, 'day'), MILLISECONDS_IN_DAY)
 
     case 'hours':
+    case 'hour':
       return getDiff(startOfDate(t, 'hour'), startOfDate(sub, 'hour'), MILLISECONDS_IN_HOUR)
 
     case 'minutes':
+    case 'minute':
       return getDiff(startOfDate(t, 'minute'), startOfDate(sub, 'minute'), MILLISECONDS_IN_MINUTE)
 
     case 'seconds':
+    case 'second':
       return getDiff(startOfDate(t, 'second'), startOfDate(sub, 'second'), 1000)
   }
 }
@@ -606,26 +678,33 @@ export function isSameDate (date, date2, unit) {
 
   switch (unit) {
     case 'second':
+    case 'seconds':
       if (t.getSeconds() !== d.getSeconds()) {
         return false
       }
     case 'minute': // intentional fall-through
+    case 'minutes':
       if (t.getMinutes() !== d.getMinutes()) {
         return false
       }
     case 'hour': // intentional fall-through
+    case 'hours':
       if (t.getHours() !== d.getHours()) {
         return false
       }
     case 'day': // intentional fall-through
+    case 'days':
+    case 'date':
       if (t.getDate() !== d.getDate()) {
         return false
       }
     case 'month': // intentional fall-through
+    case 'months':
       if (t.getMonth() !== d.getMonth()) {
         return false
       }
     case 'year': // intentional fall-through
+    case 'years':
       if (t.getFullYear() !== d.getFullYear()) {
         return false
       }