quasar 2.17.4 → 2.17.6

package/src/components/tree/QTree.js

@@ -320,9 +320,7 @@ export default createComponent({
 
     function setExpanded (key, state, node = getNodeByKey(key), m = meta.value[ key ]) {
       if (m.lazy && m.lazy !== 'loaded') {
-        if (m.lazy === 'loading') {
-          return
-        }
+        if (m.lazy === 'loading') return
 
         lazy.value[ key ] = 'loading'
         if (Array.isArray(node[ props.childrenKey ]) !== true) {

package/src/components/uploader/uploader-core.js

@@ -203,9 +203,7 @@ export function getRenderer (getPlugin, expose) {
   }
 
   function batchRemoveFiles (statusList, cb) {
-    if (props.disable === true) {
-      return
-    }
+    if (props.disable === true) return
 
     const removed = {
       files: [],

package/src/components/uploader/xhr-uploader-plugin.js

@@ -183,9 +183,7 @@ function injectPlugin ({ props, emit, helpers }) {
     }, false)
 
     xhr.onreadystatechange = () => {
-      if (xhr.readyState < 4) {
-        return
-      }
+      if (xhr.readyState < 4) return
 
       if (xhr.status && xhr.status < 400) {
         helpers.uploadedFiles.value = helpers.uploadedFiles.value.concat(files)

package/src/components/virtual-scroll/use-virtual-scroll.js

@@ -20,18 +20,14 @@ const filterProto = Array.prototype.filter
 const setOverflowAnchor = __QUASAR_SSR__ || window.getComputedStyle(document.body).overflowAnchor === void 0
   ? noop
   : function (contentEl, index) {
-    if (contentEl === null) {
-      return
-    }
+    if (contentEl === null) return
 
     if (contentEl._qOverflowAnimationFrame !== void 0) {
       cancelAnimationFrame(contentEl._qOverflowAnimationFrame)
     }
 
     contentEl._qOverflowAnimationFrame = requestAnimationFrame(() => {
-      if (contentEl === null) {
-        return
-      }
+      if (contentEl === null) return
 
       contentEl._qOverflowAnimationFrame = void 0
       const children = contentEl.children || []
@@ -279,9 +275,11 @@ export function useVirtualScroll ({
   function scrollTo (toIndex, edge) {
     const scrollEl = getVirtualScrollTarget()
 
-    if (scrollEl === void 0 || scrollEl === null || scrollEl.nodeType === 8) {
-      return
-    }
+    if (
+      scrollEl === void 0
+      || scrollEl === null
+      || scrollEl.nodeType === 8
+    ) return
 
     const scrollDetails = getScrollDetails(
       scrollEl,
@@ -308,9 +306,11 @@ export function useVirtualScroll ({
   function localOnVirtualScrollEvt () {
     const scrollEl = getVirtualScrollTarget()
 
-    if (scrollEl === void 0 || scrollEl === null || scrollEl.nodeType === 8) {
-      return
-    }
+    if (
+      scrollEl === void 0
+      || scrollEl === null
+      || scrollEl.nodeType === 8
+    ) return
 
     const
       scrollDetails = getScrollDetails(
@@ -326,9 +326,7 @@ export function useVirtualScroll ({
       listLastIndex = virtualScrollLength.value - 1,
       listEndOffset = scrollDetails.scrollMaxSize - scrollDetails.offsetStart - scrollDetails.offsetEnd - virtualScrollPaddingAfter.value
 
-    if (prevScrollStart === scrollDetails.scrollStart) {
-      return
-    }
+    if (prevScrollStart === scrollDetails.scrollStart) return
 
     if (scrollDetails.scrollMaxSize <= 0) {
       setVirtualScrollSliceRange(scrollEl, scrollDetails, 0, 0)
@@ -456,9 +454,7 @@ export function useVirtualScroll ({
     requestAnimationFrame(() => {
       // if the scroll was changed give up
       // (another call to setVirtualScrollSliceRange before animation frame)
-      if (prevScrollStart !== scrollDetails.scrollStart) {
-        return
-      }
+      if (prevScrollStart !== scrollDetails.scrollStart) return
 
       if (rangeChanged === true) {
         updateVirtualScrollSizes(from)

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

@@ -73,9 +73,7 @@ export default function ({
       mobileTouch (evt) {
         anchorEvents.mobileCleanup(evt)
 
-        if (canShow(evt) !== true) {
-          return
-        }
+        if (canShow(evt) !== true) return
 
         proxy.hide(evt)
         anchorEl.value.classList.add('non-selectable')

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

@@ -311,9 +311,7 @@ export default function (state) {
           || state.controlRef.value === null
           || state.controlRef.value.contains(document.activeElement) !== false
         )
-      ) {
-        return
-      }
+      ) return
 
       if (state.focused.value === true) {
         state.focused.value = false
@@ -502,9 +500,11 @@ export default function (state) {
 
     const hasCounter = props.counter === true || slots.counter !== void 0
 
-    if (props.hideBottomSpace === true && hasCounter === false && msg === void 0) {
-      return
-    }
+    if (
+      props.hideBottomSpace === true
+      && hasCounter === false
+      && msg === void 0
+    ) return
 
     const main = h('div', {
       key,

package/src/composables/private.use-file/use-file-dom-props.js

@@ -34,10 +34,7 @@ export default function (props, typeGuard) {
 
   return typeGuard === true
     ? computed(() => {
-      if (props.type !== 'file') {
-        return
-      }
-
+      if (props.type !== 'file') return
       return getFormDomProps()
     })
     : computed(getFormDomProps)

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

@@ -44,9 +44,7 @@ export default function () {
   }
 
   function setFullscreen () {
-    if (inFullscreen.value === true) {
-      return
-    }
+    if (inFullscreen.value === true) return
 
     inFullscreen.value = true
     container = proxy.$el.parentNode
@@ -65,9 +63,7 @@ export default function () {
   }
 
   function exitFullscreen () {
-    if (inFullscreen.value !== true) {
-      return
-    }
+    if (inFullscreen.value !== true) return
 
     if (historyEntry !== void 0) {
       History.remove(historyEntry)

package/src/composables/private.use-model-toggle/use-model-toggle.js

@@ -44,9 +44,7 @@ export default function ({
       props.disable === true
       || (evt !== void 0 && evt.qAnchorHandled === true)
       || (canShow !== void 0 && canShow(evt) !== true)
-    ) {
-      return
-    }
+    ) return
 
     const listener = props[ 'onUpdate:modelValue' ] !== void 0
 
@@ -66,9 +64,7 @@ export default function ({
   }
 
   function processShow (evt) {
-    if (showing.value === true) {
-      return
-    }
+    if (showing.value === true) return
 
     showing.value = true
 
@@ -83,9 +79,7 @@ export default function ({
   }
 
   function hide (evt) {
-    if (__QUASAR_SSR_SERVER__ || props.disable === true) {
-      return
-    }
+    if (__QUASAR_SSR_SERVER__ || props.disable === true) return
 
     const listener = props[ 'onUpdate:modelValue' ] !== void 0
 
@@ -105,9 +99,7 @@ export default function ({
   }
 
   function processHide (evt) {
-    if (showing.value === false) {
-      return
-    }
+    if (showing.value === false) return
 
     showing.value = false
 

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

@@ -54,9 +54,18 @@ export default function () {
 
   let panels, forcedPanelTransition
 
-  const panelIndex = ref(null)
   const panelTransition = ref(null)
 
+  /*
+   * Should not be reactive because it's assigned on render
+   * and it will trigger a subsequent useless render.
+   *
+   * Should be an object though, because it is being exported.
+   * Otherwise, the current value would be exported and no subsequent
+   * updates will be reflected in the exported value.
+   */
+  const panelIndex = { value: null }
+
   function onSwipe (evt) {
     const dir = props.vertical === true ? 'up' : 'left'
     goToPanelByOffset((proxy.$q.lang.rtl === true ? -1 : 1) * (evt.direction === dir ? 1 : -1))
@@ -178,6 +187,7 @@ export default function () {
         setTimeout(() => {
           forcedPanelTransition = false
         })
+
         return
       }
 
@@ -227,9 +237,7 @@ export default function () {
   }
 
   function getPanelContent () {
-    if (panels.length === 0) {
-      return
-    }
+    if (panels.length === 0) return
 
     return props.animated === true
       ? [ h(Transition, { name: panelTransition.value }, getPanelContentChild) ]

package/src/directives/morph/Morph.js

@@ -21,9 +21,10 @@ function changeClass (ctx, action) {
 }
 
 function trigger (group) {
-  if (group.animating === true || group.queue.length < 2) {
-    return
-  }
+  if (
+    group.animating === true
+    || group.queue.length < 2
+  ) return
 
   const [ from, to ] = group.queue
 
@@ -45,9 +46,7 @@ function trigger (group) {
     onEnd (dir, aborted) {
       to.opts.onEnd !== void 0 && to.opts.onEnd(dir, aborted)
 
-      if (aborted === true) {
-        return
-      }
+      if (aborted === true) return
 
       from.animating = false
       to.animating = false

package/src/directives/ripple/Ripple.js

@@ -80,9 +80,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
       beforeMount (el, binding) {
         const cfg = binding.instance.$.appContext.config.globalProperties.$q.config || {}
 
-        if (cfg.ripple === false) {
-          return
-        }
+        if (cfg.ripple === false) return
 
         const ctx = {
           cfg,

package/src/directives/touch-hold/TouchHold.js

@@ -14,9 +14,10 @@ export default createDirective(__QUASAR_SSR_SERVER__
         const { modifiers } = binding
 
         // early return, we don't need to do anything
-        if (modifiers.mouse !== true && client.has.touch !== true) {
-          return
-        }
+        if (
+          modifiers.mouse !== true
+          && client.has.touch !== true
+        ) return
 
         const ctx = {
           handler: binding.value,

package/src/directives/touch-pan/TouchPan.js

@@ -126,9 +126,10 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
       beforeMount (el, { value, modifiers }) {
         // early return, we don't need to do anything
-        if (modifiers.mouse !== true && client.has.touch !== true) {
-          return
-        }
+        if (
+          modifiers.mouse !== true
+          && client.has.touch !== true
+        ) return
 
         function handleEvent (evt, mouseEvent) {
           if (modifiers.mouse === true && mouseEvent === true) {
@@ -232,9 +233,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
           },
 
           move (evt) {
-            if (ctx.event === void 0) {
-              return
-            }
+            if (ctx.event === void 0) return
 
             const
               pos = position(evt),
@@ -246,9 +245,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
             // https://bugs.chromium.org/p/chromium/issues/detail?id=161464
             // https://bugs.chromium.org/p/chromium/issues/detail?id=721341
             // https://github.com/quasarframework/quasar/issues/10721
-            if (distX === 0 && distY === 0) {
-              return
-            }
+            if (distX === 0 && distY === 0) return
 
             ctx.lastEvt = evt
 
@@ -352,9 +349,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
           },
 
           end (evt, abort) {
-            if (ctx.event === void 0) {
-              return
-            }
+            if (ctx.event === void 0) return
 
             cleanEvt(ctx, 'temp')
             client.is.firefox === true && preventDraggable(el, false)

package/src/directives/touch-repeat/TouchRepeat.js

@@ -46,9 +46,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
           modifiers.mouse !== true
           && client.has.touch !== true
           && keyboard.length === 0
-        ) {
-          return
-        }
+        ) return
 
         const durations = typeof arg === 'string' && arg.length !== 0
           ? arg.split(':').map(val => parseInt(val, 10))
@@ -77,9 +75,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
               if (durations[ 0 ] === 0 || ctx.event !== void 0) {
                 stopAndPrevent(evt)
                 el.focus()
-                if (ctx.event !== void 0) {
-                  return
-                }
+                if (ctx.event !== void 0) return
               }
 
               addEvt(ctx, 'temp', [
@@ -140,9 +136,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
             const fn = () => {
               ctx.timer = void 0
 
-              if (ctx.event === void 0) {
-                return
-              }
+              if (ctx.event === void 0) return
 
               if (ctx.event.repeatCount === 0) {
                 ctx.event.evt = evt
@@ -190,9 +184,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
           },
 
           end (evt) {
-            if (ctx.event === void 0) {
-              return
-            }
+            if (ctx.event === void 0) return
 
             ctx.styleCleanup !== void 0 && ctx.styleCleanup(true)
             evt !== void 0 && ctx.event.repeatCount > 0 && stopAndPrevent(evt)

package/src/directives/touch-swipe/TouchSwipe.js

@@ -29,9 +29,10 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
       beforeMount (el, { value, arg, modifiers }) {
         // early return, we don't need to do anything
-        if (modifiers.mouse !== true && client.has.touch !== true) {
-          return
-        }
+        if (
+          modifiers.mouse !== true
+          && client.has.touch !== true
+        ) return
 
         const mouseCapture = modifiers.mouseCapture === true ? 'Capture' : ''
 
@@ -79,9 +80,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
           },
 
           move (evt) {
-            if (ctx.event === void 0) {
-              return
-            }
+            if (ctx.event === void 0) return
 
             if (ctx.event.dir !== false) {
               stopAndPrevent(evt)
@@ -90,9 +89,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
 
             const time = Date.now() - ctx.event.time
 
-            if (time === 0) {
-              return
-            }
+            if (time === 0) return
 
             const
               pos = position(evt),
@@ -220,9 +217,7 @@ export default createDirective(__QUASAR_SSR_SERVER__
           },
 
           end (evt) {
-            if (ctx.event === void 0) {
-              return
-            }
+            if (ctx.event === void 0) return
 
             cleanEvt(ctx, 'temp')
             client.is.firefox === true && preventDraggable(el, false)

package/src/plugins/notify/Notify.json

@@ -187,7 +187,7 @@
           },
           "...": {
             "type": "Any",
-            "desc": "Any other QBtn prop expect 'onClick' (use 'handler' instead, only possible with UI config)",
+            "desc": "Any other QBtn prop except 'onClick' (use 'handler' instead, only possible with UI config)",
             "examples": [ "label: 'Learn more'", "color: 'primary'" ]
           }
         },
@@ -405,7 +405,7 @@
                 },
                 "...": {
                   "type": "Any",
-                  "desc": "Any other QBtn prop expect 'onClick' (use 'handler' instead)",
+                  "desc": "Any other QBtn prop except 'onClick' (use 'handler' instead)",
                   "examples": [ "label: 'Learn more'", "color: 'primary'" ]
                 }
               },

package/src/plugins/private.history/History.js

@@ -47,15 +47,11 @@ export default {
 
     const { cordova, capacitor } = client.is
 
-    if (cordova !== true && capacitor !== true) {
-      return
-    }
+    if (cordova !== true && capacitor !== true) return
 
     const qConf = $q.config[ cordova === true ? 'cordova' : 'capacitor' ]
 
-    if (qConf !== void 0 && qConf.backButton === false) {
-      return
-    }
+    if (qConf !== void 0 && qConf.backButton === false) return
 
     // if the '@capacitor/app' plugin is not installed
     // then we got nothing to do
@@ -64,9 +60,7 @@ export default {
       capacitor === true
       // and it's also not in Capacitor's main instance
       && (window.Capacitor === void 0 || window.Capacitor.Plugins.App === void 0)
-    ) {
-      return
-    }
+    ) return
 
     this.add = entry => {
       if (entry.condition === void 0) {

package/src/utils/date/date.js

@@ -979,15 +979,11 @@ export function formatDate (val, mask, dateLocale, __forcedYear, __forcedTimezon
     (val !== 0 && !val)
     || val === Infinity
     || val === -Infinity
-  ) {
-    return
-  }
+  ) return
 
   const date = new Date(val)
 
-  if (isNaN(date)) {
-    return
-  }
+  if (isNaN(date)) return
 
   if (mask === void 0) {
     mask = defaultMask

package/src/utils/dom/dom.js

@@ -37,9 +37,7 @@ export function cssBatch (elements, style) {
 }
 
 export function ready (fn) {
-  if (typeof fn !== 'function') {
-    return
-  }
+  if (typeof fn !== 'function') return
 
   if (document.readyState !== 'loading') {
     return fn()

package/src/utils/morph/morph.js

@@ -269,7 +269,6 @@ export default function morph (_options) {
     const elTo = getElement(elements.to)
     if (cancelStatus === true || isValidElement(elTo) !== true) {
       typeof elFrom.qMorphCancel === 'function' && elFrom.qMorphCancel()
-
       return
     }
     // we clean other morphs running on this element
@@ -318,7 +317,6 @@ export default function morph (_options) {
     const animate = () => {
       if (cancelStatus === true) {
         typeof elTo.qMorphCancel === 'function' && elTo.qMorphCancel()
-
         return
       }
 
@@ -887,9 +885,10 @@ export default function morph (_options) {
         elTo.style.animation = `${ options.duration }ms ${ options.easing } ${ options.delay }ms ${ animationDirection } ${ options.fill } ${ qAnimId }`
 
         const cleanup = evt => {
-          if (evt === Object(evt) && evt.animationName !== qAnimId) {
-            return
-          }
+          if (
+            evt === Object(evt)
+            && evt.animationName !== qAnimId
+          ) return
 
           elTo.removeEventListener('animationend', cleanup)
           elTo.removeEventListener('animationcancel', cleanup)

package/src/utils/open-url/open-url.js

@@ -60,6 +60,7 @@ export default (url, reject, windowFeatures) => {
         openWindow(url, reject, windowFeatures)
       }
     })
+
     return
   }
 

package/src/utils/private.click-outside/click-outside.js

@@ -19,9 +19,7 @@ function globalHandler (evt) {
     target === void 0
     || target.nodeType === 8
     || target.classList.contains('no-pointer-events') === true
-  ) {
-    return
-  }
+  ) return
 
   // check last portal vm if it's
   // a QDialog and not in seamless mode
@@ -40,9 +38,7 @@ function globalHandler (evt) {
       break
     }
 
-    if (proxy.props.seamless !== true) {
-      return
-    }
+    if (proxy.props.seamless !== true) return
 
     portalIndex--
   }

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

@@ -111,9 +111,7 @@ export function setPosition (cfg, retryNumber = 0) {
     cfg.targetEl === null
     || cfg.anchorEl === null
     || retryNumber > 5 // we should try only a few times
-  ) {
-    return
-  }
+  ) return
 
   // some browsers report zero height or width because
   // we are trying too early to get these dimensions

package/src/utils/scroll/prevent-scroll.js

@@ -60,9 +60,7 @@ function onAppleScroll (e) {
 }
 
 function onAppleResize (evt) {
-  if (vpPendingUpdate === true) {
-    return
-  }
+  if (vpPendingUpdate === true) return
 
   vpPendingUpdate = true
 
@@ -171,20 +169,14 @@ export default function (state) {
       return
     }
 
-    if (registered > 1) {
-      return
-    }
+    if (registered > 1) return
   }
   else {
-    if (registered === 0) {
-      return
-    }
+    if (registered === 0) return
 
     registered--
 
-    if (registered > 0) {
-      return
-    }
+    if (registered > 0) return
 
     action = 'remove'