quasar 2.19.3 → 2.20.1

package/src/plugins/notify/Notify.js

@@ -1,4 +1,4 @@
-import { h, ref, markRaw, TransitionGroup } from 'vue'
+import { TransitionGroup, h, markRaw, ref } from 'vue'
 
 import QAvatar from '../../components/avatar/QAvatar.js'
 import QIcon from '../../components/icon/QIcon.js'
@@ -74,11 +74,9 @@ function addNotification(config, $q, originalApi) {
   let Api
   const notif = { textColor: 'white' }
 
-  if (config.ignoreDefaults !== true) {
-    Object.assign(notif, defaults)
-  }
+  if (!config.ignoreDefaults) Object.assign(notif, defaults)
 
-  if (isObject(config) === false) {
+  if (!isObject(config)) {
     if (notif.type) {
       Object.assign(notif, notifTypes[notif.type])
     }
@@ -95,39 +93,37 @@ function addNotification(config, $q, originalApi) {
   if (!notif.spinner) {
     notif.spinner = false
   } else {
-    if (notif.spinner === true) {
-      notif.spinner = QSpinner
-    }
-
-    notif.spinner = markRaw(notif.spinner)
+    notif.spinner = notif.spinner === true ? QSpinner : markRaw(notif.spinner)
   }
 
   notif.meta = {
-    hasMedia: Boolean(notif.spinner !== false || notif.icon || notif.avatar),
+    hasMedia: Boolean(notif.spinner || notif.icon || notif.avatar),
     hasText: hasContent(notif.message) || hasContent(notif.caption)
   }
 
   if (notif.position) {
-    if (positionList.includes(notif.position) === false) {
+    if (!positionList.includes(notif.position)) {
       return logError('wrong position', config)
     }
   } else {
     notif.position = 'bottom'
   }
 
-  if (invalidTimeoutValues.includes(notif.timeout) === true) {
+  if (invalidTimeoutValues.includes(notif.timeout)) {
     notif.timeout = 5000
   } else {
-    const t = Number(notif.timeout) // we catch exponential notation too with Number() casting
-    if (isNaN(t) || t < 0) {
+    // we catch exponential notation too
+    const t = Number.parseFloat(notif.timeout)
+    if (!Number.isFinite(t) || t < 0) {
       return logError('wrong timeout', config)
     }
-    notif.timeout = Number.isFinite(t) ? t : 0
+
+    notif.timeout = t
   }
 
   if (notif.timeout === 0) {
     notif.progress = false
-  } else if (notif.progress === true) {
+  } else if (notif.progress) {
     notif.meta.progressClass =
       'q-notification__progress' +
       (notif.progressClass ? ` ${notif.progressClass}` : '')
@@ -137,17 +133,15 @@ function addNotification(config, $q, originalApi) {
     }
   }
 
-  const actions = (Array.isArray(config.actions) === true ? config.actions : [])
-    .concat(
-      config.ignoreDefaults !== true && Array.isArray(defaults.actions) === true
-        ? defaults.actions
-        : []
-    )
-    .concat(
-      Array.isArray(notifTypes[config.type]?.actions) === true
-        ? notifTypes[config.type].actions
-        : []
-    )
+  const actions = [
+    ...(Array.isArray(config.actions) ? config.actions : []),
+    ...(!config.ignoreDefaults && Array.isArray(defaults.actions)
+      ? defaults.actions
+      : []),
+    ...(Array.isArray(notifTypes[config.type]?.actions)
+      ? notifTypes[config.type].actions
+      : [])
+  ]
 
   const { closeBtn } = notif
   if (closeBtn) {
@@ -163,7 +157,7 @@ function addNotification(config, $q, originalApi) {
       typeof handler === 'function'
         ? () => {
             handler()
-            if (noDismiss !== true) dismiss()
+            if (!noDismiss) dismiss()
           }
         : () => {
             dismiss()
@@ -177,22 +171,20 @@ function addNotification(config, $q, originalApi) {
   Object.assign(notif.meta, {
     class:
       'q-notification row items-stretch' +
-      ` q-notification--${notif.multiLine === true ? 'multi-line' : 'standard'}` +
+      ` q-notification--${notif.multiLine ? 'multi-line' : 'standard'}` +
       (notif.color !== void 0 ? ` bg-${notif.color}` : '') +
       (notif.textColor !== void 0 ? ` text-${notif.textColor}` : '') +
       (notif.classes !== void 0 ? ` ${notif.classes}` : ''),
 
     wrapperClass:
       'q-notification__wrapper col relative-position border-radius-inherit ' +
-      (notif.multiLine === true
-        ? 'column no-wrap justify-center'
-        : 'row items-center'),
+      (notif.multiLine ? 'column no-wrap justify-center' : 'row items-center'),
 
     contentClass:
       'q-notification__content row items-center' +
-      (notif.multiLine === true ? '' : ' col'),
+      (notif.multiLine ? '' : ' col'),
 
-    leftClass: notif.meta.hasText === true ? 'additional' : 'single',
+    leftClass: notif.meta.hasText ? 'additional' : 'single',
 
     attrs: {
       role: 'alert',
@@ -206,9 +198,12 @@ function addNotification(config, $q, originalApi) {
   } else {
     if (notif.group === void 0 || notif.group === true) {
       // do not replace notifications with different buttons
-      notif.group = [notif.message, notif.caption, notif.multiline]
-        .concat(notif.actions.map(props => `${props.label}*${props.icon}`))
-        .join('|')
+      notif.group = [
+        notif.message,
+        notif.caption,
+        notif.multiline,
+        ...notif.actions.map(props => `${props.label}*${props.icon}`)
+      ].join('|')
     }
 
     notif.meta.group = notif.group + '|' + notif.position
@@ -219,10 +214,8 @@ function addNotification(config, $q, originalApi) {
   } else {
     notif.meta.actionsClass =
       'q-notification__actions row items-center ' +
-      (notif.multiLine === true ? 'justify-end' : 'col-auto') +
-      (notif.meta.hasMedia === true
-        ? ' q-notification__actions--with-media'
-        : '')
+      (notif.multiLine ? 'justify-end' : 'col-auto') +
+      (notif.meta.hasMedia ? ' q-notification__actions--with-media' : '')
   }
 
   if (originalApi !== void 0) {
@@ -248,14 +241,14 @@ function addNotification(config, $q, originalApi) {
       notif.meta.uid = uid++
       notif.meta.badge = 1
 
-      if (['left', 'right', 'center'].indexOf(notif.position) !== -1) {
+      if (['left', 'right', 'center'].includes(notif.position)) {
         notificationsList[notif.position].value.splice(
           Math.floor(notificationsList[notif.position].value.length / 2),
           0,
           notif
         )
       } else {
-        const action = notif.position.indexOf('top') !== -1 ? 'unshift' : 'push'
+        const action = notif.position.includes('top') ? 'unshift' : 'push'
         notificationsList[notif.position].value[action](notif)
       }
 
@@ -272,11 +265,11 @@ function addNotification(config, $q, originalApi) {
       }
 
       if (notif.badgePosition !== void 0) {
-        if (badgePositions.includes(notif.badgePosition) === false) {
+        if (!badgePositions.includes(notif.badgePosition)) {
           return logError('wrong badgePosition', config)
         }
       } else {
-        notif.badgePosition = `top-${notif.position.indexOf('left') !== -1 ? 'right' : 'left'}`
+        notif.badgePosition = `top-${notif.position.includes('left') ? 'right' : 'left'}`
       }
 
       notif.meta.uid = original.meta.uid
@@ -339,10 +332,12 @@ function addNotification(config, $q, originalApi) {
       }
       // otherwise we're updating it
       else {
-        const newNotif = Object.assign({}, Api.config, props, {
+        const newNotif = {
+          ...Api.config,
+          ...props,
           group: false,
           position: notif.position
-        })
+        }
 
         addNotification(newNotif, $q, Api)
       }
@@ -381,7 +376,7 @@ function removeNotification(notif) {
 }
 
 function hasContent(str) {
-  return str !== void 0 && str !== null && emptyRE.test(str) !== true
+  return str !== void 0 && str !== null && !emptyRE.test(str)
 }
 
 function logError(error, config) {
@@ -415,8 +410,8 @@ function getComponent() {
                   const meta = notif.meta
                   const mainChild = []
 
-                  if (meta.hasMedia === true) {
-                    if (notif.spinner !== false) {
+                  if (meta.hasMedia) {
+                    if (notif.spinner) {
                       mainChild.push(
                         h(notif.spinner, {
                           class:
@@ -457,11 +452,11 @@ function getComponent() {
                     }
                   }
 
-                  if (meta.hasText === true) {
+                  if (meta.hasText) {
                     let msgChild
                     const msgData = { class: 'q-notification__message col' }
 
-                    if (notif.html === true) {
+                    if (notif.html) {
                       msgData.innerHTML = notif.caption
                         ? `<div>${notif.message}</div><div class="q-notification__caption">${notif.caption}</div>`
                         : notif.message
@@ -484,7 +479,7 @@ function getComponent() {
                     h('div', { class: meta.contentClass }, mainChild)
                   ]
 
-                  if (notif.progress === true) {
+                  if (notif.progress) {
                     child.push(
                       h('div', {
                         key: `${meta.uid}|p|${meta.badge}`,
@@ -494,7 +489,7 @@ function getComponent() {
                     )
                   }
 
-                  if (notif.actions !== void 0) {
+                  if (notif.actions) {
                     child.push(
                       h(
                         'div',
@@ -542,13 +537,13 @@ function getComponent() {
 
 export default {
   setDefaults(opts) {
-    if (__QUASAR_SSR_SERVER__ !== true) {
-      if (isObject(opts) === true) Object.assign(defaults, opts)
+    if (!__QUASAR_SSR_SERVER__ && isObject(opts)) {
+      Object.assign(defaults, opts)
     }
   },
 
   registerType(typeName, typeOpts) {
-    if (__QUASAR_SSR_SERVER__ !== true && isObject(typeOpts) === true) {
+    if (!__QUASAR_SSR_SERVER__ && isObject(typeOpts)) {
       notifTypes[typeName] = typeOpts
     }
   },
@@ -565,27 +560,27 @@ export default {
       this.setDefaults($q.config.notify)
     }
 
-    if (__QUASAR_SSR_SERVER__ !== true && this.__installed !== true) {
+    if (!__QUASAR_SSR_SERVER__ && !this.__installed) {
       positionList.forEach(pos => {
         notificationsList[pos] = ref([])
 
         const vert =
-            ['left', 'center', 'right'].includes(pos) === true
+            pos === 'left' || pos === 'center' || pos === 'right'
               ? 'center'
-              : pos.indexOf('top') !== -1
+              : pos.includes('top')
                 ? 'top'
                 : 'bottom',
-          align =
-            pos.indexOf('left') !== -1
-              ? 'start'
-              : pos.indexOf('right') !== -1
-                ? 'end'
-                : 'center',
-          classes = ['left', 'right'].includes(pos)
-            ? `items-${pos === 'left' ? 'start' : 'end'} justify-center`
-            : pos === 'center'
-              ? 'flex-center'
-              : `items-${align}`
+          align = pos.includes('left')
+            ? 'start'
+            : pos.includes('right')
+              ? 'end'
+              : 'center',
+          classes =
+            pos === 'left' || pos === 'right'
+              ? `items-${pos === 'left' ? 'start' : 'end'} justify-center`
+              : pos === 'center'
+                ? 'flex-center'
+                : `items-${align}`
 
         positionClass[pos] =
           `q-notifications__list q-notifications__list--${vert} fixed column no-wrap ${classes}`

package/src/plugins/platform/Platform.js

@@ -1,6 +1,6 @@
 // oxlint-disable no-useless-escape
 
-import { ref, reactive } from 'vue'
+import { reactive, ref } from 'vue'
 import { injectProp } from '../../utils/private.inject-obj-prop/inject-obj-prop.js'
 
 /**
@@ -15,9 +15,7 @@ export const isRuntimeSsrPreHydration = __QUASAR_SSR_SERVER__
   ? { value: true }
   : ref(
       __QUASAR_SSR_CLIENT__ &&
-        (__QUASAR_SSR_PWA__
-          ? document.body.getAttribute('data-server-rendered') !== null
-          : true)
+        (__QUASAR_SSR_PWA__ ? 'serverRendered' in document.body.dataset : true)
     )
 
 let preHydrationBrowser
@@ -117,7 +115,7 @@ function getPlatform(UA) {
   if (matched.browser) {
     browser[matched.browser] = true
     browser.version = matched.version
-    browser.versionNumber = parseInt(matched.version, 10)
+    browser.versionNumber = Number.parseInt(matched.version, 10)
   }
 
   if (matched.platform) {
@@ -138,7 +136,7 @@ function getPlatform(UA) {
     browser['windows phone']
 
   // These are all considered mobile platforms, meaning they run a mobile browser
-  if (knownMobiles === true || userAgent.indexOf('mobile') !== -1) {
+  if (knownMobiles === true || userAgent.includes('mobile')) {
     browser.mobile = true
   }
   // If it's not mobile we should consider it's desktop platform, meaning it runs a desktop browser
@@ -184,7 +182,7 @@ function getPlatform(UA) {
     browser.safari ||
     browser.vivaldi ||
     // we expect unknown, non iOS mobile browsers to be webkit based
-    (browser.mobile === true && browser.ios !== true && knownMobiles !== true)
+    (browser.mobile && !browser.ios && !knownMobiles)
   ) {
     browser.webkit = true
   }
@@ -219,10 +217,10 @@ function getPlatform(UA) {
   browser.name = matched.browser
   browser.platform = matched.platform
 
-  if (__QUASAR_SSR_SERVER__ !== true) {
-    if (userAgent.indexOf('electron') !== -1) {
+  if (!__QUASAR_SSR_SERVER__) {
+    if (userAgent.includes('electron')) {
       browser.electron = true
-    } else if (document.location.href.indexOf('-extension://') !== -1) {
+    } else if (document.location.href.includes('-extension://')) {
       browser.bex = true
     } else {
       if (window.Capacitor !== void 0) {
@@ -238,7 +236,7 @@ function getPlatform(UA) {
         browser.nativeMobileWrapper = 'cordova'
       }
 
-      if (isRuntimeSsrPreHydration.value === true) {
+      if (isRuntimeSsrPreHydration.value) {
         /*
          * We need to remember the current state as
          * everything that follows can only be corrected client-side,
@@ -257,13 +255,13 @@ function getPlatform(UA) {
        */
 
       if (
-        hasTouch === true &&
-        browser.mac === true &&
-        ((browser.desktop === true && browser.safari === true) ||
-          (browser.nativeMobile === true &&
-            browser.android !== true &&
-            browser.ios !== true &&
-            browser.ipad !== true))
+        hasTouch &&
+        browser.mac &&
+        ((browser.desktop && browser.safari) ||
+          (browser.nativeMobile &&
+            !browser.android &&
+            !browser.ios &&
+            !browser.ipad))
       ) {
         /*
          * Correction needed for iOS since the default
@@ -290,7 +288,7 @@ function getPlatform(UA) {
       }
 
       if (
-        browser.mobile !== true &&
+        !browser.mobile &&
         window.navigator.userAgentData &&
         window.navigator.userAgentData.mobile
       ) {
@@ -344,7 +342,7 @@ const Platform = {
 
     if (__QUASAR_SSR_SERVER__) {
       $q.platform = this.parseSSR(opts.ssrContext)
-    } else if (isRuntimeSsrPreHydration.value === true) {
+    } else if (isRuntimeSsrPreHydration.value) {
       // takeover should increase accuracy for
       // the rest of the props; we also avoid
       // hydration errors
@@ -399,7 +397,7 @@ if (__QUASAR_SSR_SERVER__) {
 
   Object.assign(Platform, client)
 
-  if (isRuntimeSsrPreHydration.value === true) {
+  if (isRuntimeSsrPreHydration.value) {
     // must match with server-side before
     // client taking over in order to prevent
     // hydration errors

package/src/plugins/platform/Platform.test.js

@@ -3,7 +3,7 @@
  * [(method)parseSSR]
  */
 
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import { mount } from '@vue/test-utils'
 
 import Platform from './Platform.js'

package/src/plugins/private.body/Body.js

@@ -2,43 +2,40 @@ import setCssVar from '../../utils/css-var/set-css-var.js'
 import { noop } from '../../utils/event/event.js'
 import { onKeyDownComposition } from '../../utils/private.keyboard/key-composition.js'
 
-import { isRuntimeSsrPreHydration, client } from '../platform/Platform.js'
+import { client, isRuntimeSsrPreHydration } from '../platform/Platform.js'
 
 function getMobilePlatform(is) {
-  if (is.ios === true) return 'ios'
-  if (is.android === true) return 'android'
+  if (is.ios) return 'ios'
+  if (is.android) return 'android'
 }
 
 function getBodyClasses({ is, has, within }, cfg) {
   const cls = [
-    is.desktop === true ? 'desktop' : 'mobile',
-    `${has.touch === false ? 'no-' : ''}touch`
+    is.desktop ? 'desktop' : 'mobile',
+    `${has.touch ? '' : 'no-'}touch`
   ]
 
-  if (is.mobile === true) {
+  if (is.mobile) {
     const mobile = getMobilePlatform(is)
     if (mobile !== void 0) cls.push('platform-' + mobile)
   }
 
-  if (is.nativeMobile === true) {
+  if (is.nativeMobile) {
     const type = is.nativeMobileWrapper
 
     cls.push(type)
     cls.push('native-mobile')
 
-    if (
-      is.ios === true &&
-      (cfg[type] === void 0 || cfg[type].iosStatusBarPadding !== false)
-    ) {
+    if (is.ios && (cfg[type] === void 0 || cfg[type].iosStatusBarPadding)) {
       cls.push('q-ios-padding')
     }
-  } else if (is.electron === true) {
+  } else if (is.electron) {
     cls.push('electron')
-  } else if (is.bex === true) {
+  } else if (is.bex) {
     cls.push('bex')
   }
 
-  if (within.iframe === true) cls.push('within-iframe')
+  if (within.iframe) cls.push('within-iframe')
 
   return cls
 }
@@ -47,15 +44,15 @@ function applyClientSsrCorrections() {
   const { is } = client
   const classes = document.body.className
 
-  const classList = new Set(classes.replace(/ {2}/g, ' ').split(' '))
+  const classList = new Set(classes.replaceAll(/ {2}/g, ' ').split(' '))
 
-  if (is.nativeMobile !== true && is.electron !== true && is.bex !== true) {
-    if (is.desktop === true) {
+  if (!is.nativeMobile && !is.electron && !is.bex) {
+    if (is.desktop) {
       classList.delete('mobile')
       classList.delete('platform-ios')
       classList.delete('platform-android')
       classList.add('desktop')
-    } else if (is.mobile === true) {
+    } else if (is.mobile) {
       classList.delete('desktop')
       classList.add('mobile')
 
@@ -69,20 +66,18 @@ function applyClientSsrCorrections() {
     }
   }
 
-  if (client.has.touch === true) {
+  if (client.has.touch) {
     classList.delete('no-touch')
     classList.add('touch')
   }
 
-  if (client.within.iframe === true) {
+  if (client.within.iframe) {
     classList.add('within-iframe')
   }
 
-  const newCls = Array.from(classList).join(' ')
+  const newCls = [...classList].join(' ')
 
-  if (classes !== newCls) {
-    document.body.className = newCls
-  }
+  if (classes !== newCls) document.body.className = newCls
 }
 
 function setColors(brand) {
@@ -115,20 +110,19 @@ export default {
       return
     }
 
-    if (this.__installed === true) return
+    if (this.__installed) return
 
-    if (isRuntimeSsrPreHydration.value === true) {
+    if (isRuntimeSsrPreHydration.value) {
       applyClientSsrCorrections()
     } else {
       const { $q } = opts
 
       if ($q.config.brand !== void 0) setColors($q.config.brand)
 
-      const cls = getBodyClasses(client, $q.config)
-      document.body.classList.add.apply(document.body.classList, cls)
+      document.body.classList.add(...getBodyClasses(client, $q.config))
     }
 
-    if (client.is.ios === true) {
+    if (client.is.ios) {
       // needed for iOS button active state
       document.body.addEventListener('touchstart', noop)
     }

package/src/plugins/private.body/Body.test.js

@@ -1,4 +1,4 @@
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import { mount } from '@vue/test-utils'
 
 import Body from './Body.js'

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

@@ -10,26 +10,21 @@ function filterInvalidPath(path) {
 }
 
 function normalizeExitPath(path) {
-  if (path.startsWith('#') === true) path = path.substring(1)
-  if (path.startsWith('/') === false) path = '/' + path
-  if (path.endsWith('/') === true) path = path.substring(0, path.length - 1)
+  if (path.startsWith('#')) path = path.slice(1)
+  if (!path.startsWith('/')) path = '/' + path
+  if (path.endsWith('/')) path = path.slice(0, -1)
   return '#' + path
 }
 
 function getShouldExitFn(cfg) {
-  if (cfg.backButtonExit === false) {
-    return () => false
-  }
-
-  if (cfg.backButtonExit === '*') {
-    return getTrue
-  }
+  if (cfg.backButtonExit === false) return () => false
+  if (cfg.backButtonExit === '*') return getTrue
 
   // Add default root path
   const exitPaths = ['#/']
 
   // Add custom exit paths
-  if (Array.isArray(cfg.backButtonExit) === true) {
+  if (Array.isArray(cfg.backButtonExit)) {
     exitPaths.push(
       ...cfg.backButtonExit.filter(filterInvalidPath).map(normalizeExitPath)
     )
@@ -44,13 +39,12 @@ export default {
   remove: noop,
 
   install({ $q }) {
-    if (__QUASAR_SSR_SERVER__ || this.__installed === true) return
+    if (__QUASAR_SSR_SERVER__ || this.__installed) return
 
     const { cordova, capacitor } = client.is
+    if (!cordova && !capacitor) return
 
-    if (cordova !== true && capacitor !== true) return
-
-    const qConf = $q.config[cordova === true ? 'cordova' : 'capacitor']
+    const qConf = $q.config[cordova ? 'cordova' : 'capacitor']
 
     if (qConf?.backButton === false) return
 
@@ -58,7 +52,7 @@ export default {
     // then we got nothing to do
     if (
       // if we're on Capacitor mode
-      capacitor === true &&
+      capacitor &&
       // and it's also not in Capacitor's main instance
       (window.Capacitor === void 0 || window.Capacitor.Plugins.App === void 0)
     ) {
@@ -74,31 +68,29 @@ export default {
 
     this.remove = entry => {
       const index = this.__history.indexOf(entry)
-      if (index >= 0) {
+      if (index !== -1) {
         this.__history.splice(index, 1)
       }
     }
 
-    const shouldExit = getShouldExitFn(
-      Object.assign({ backButtonExit: true }, qConf)
-    )
+    const shouldExit = getShouldExitFn({ backButtonExit: true, ...qConf })
 
     const backHandler = () => {
-      if (this.__history.length) {
-        const entry = this.__history[this.__history.length - 1]
+      if (this.__history.length !== 0) {
+        const entry = this.__history.at(-1)
 
-        if (entry.condition() === true) {
+        if (entry.condition()) {
           this.__history.pop()
           entry.handler()
         }
-      } else if (shouldExit() === true) {
+      } else if (shouldExit()) {
         navigator.app.exitApp()
       } else {
         window.history.back()
       }
     }
 
-    if (cordova === true) {
+    if (cordova) {
       document.addEventListener('deviceready', () => {
         document.addEventListener('backbutton', backHandler, false)
       })

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

@@ -1,4 +1,4 @@
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 
 import History from './History.js'