quasar 2.19.3 → 2.20.1

package/src/utils/morph/morph.js

@@ -3,31 +3,35 @@ import { isObject } from '../is/is.js'
 let id = 0
 let offsetBase = void 0
 
+function defaultCancel() {
+  return false
+}
+
 function getAbsolutePosition(el, resize) {
   if (offsetBase === void 0) {
     offsetBase = document.createElement('div')
     offsetBase.style.cssText = 'position: absolute; left: 0; top: 0'
-    document.body.appendChild(offsetBase)
+    document.body.append(offsetBase)
   }
 
   const boundingRect = el.getBoundingClientRect()
   const baseRect = offsetBase.getBoundingClientRect()
   const { marginLeft, marginRight, marginTop, marginBottom } =
     window.getComputedStyle(el)
-  const marginH = parseInt(marginLeft, 10) + parseInt(marginRight, 10)
-  const marginV = parseInt(marginTop, 10) + parseInt(marginBottom, 10)
+  const marginH =
+    Number.parseInt(marginLeft, 10) + Number.parseInt(marginRight, 10)
+  const marginV =
+    Number.parseInt(marginTop, 10) + Number.parseInt(marginBottom, 10)
 
   return {
     left: boundingRect.left - baseRect.left,
     top: boundingRect.top - baseRect.top,
     width: boundingRect.right - boundingRect.left,
     height: boundingRect.bottom - boundingRect.top,
-    widthM:
-      boundingRect.right - boundingRect.left + (resize === true ? 0 : marginH),
-    heightM:
-      boundingRect.bottom - boundingRect.top + (resize === true ? 0 : marginV),
-    marginH: resize === true ? marginH : 0,
-    marginV: resize === true ? marginV : 0
+    widthM: boundingRect.right - boundingRect.left + (resize ? 0 : marginH),
+    heightM: boundingRect.bottom - boundingRect.top + (resize ? 0 : marginV),
+    marginH: resize ? marginH : 0,
+    marginV: resize ? marginV : 0
   }
 }
 
@@ -61,15 +65,13 @@ function getComputedStyle(el, props) {
         let val = ''
 
         for (let styleIndex = 0; styleIndex < styleLen; styleIndex++) {
-          if (reStyleSkipKey.test(style[styleIndex]) !== true) {
+          if (!reStyleSkipKey.test(style[styleIndex])) {
             val += style[styleIndex] + ': ' + style[style[styleIndex]] + '; '
           }
         }
 
         fixed[prop] = val
-      } else if (
-        ['borderWidth', 'borderStyle', 'borderColor'].indexOf(prop) !== -1
-      ) {
+      } else if (['borderWidth', 'borderStyle', 'borderColor'].includes(prop)) {
         const suffix = prop.replace('border', '')
         let val = ''
         for (let j = 0; j < styleEdges.length; j++) {
@@ -92,7 +94,7 @@ function getComputedStyle(el, props) {
     } else if (prop === 'cssText') {
       fixed[prop] = style[prop]
         .split(';')
-        .filter(val => reStyleSkipRule.test(val) !== true)
+        .filter(val => !reStyleSkipRule.test(val))
         .join(';')
     } else {
       fixed[prop] = style[prop]
@@ -114,7 +116,7 @@ function getMaxZIndex(elStart) {
 
     if (
       zIndexNum > maxIndex &&
-      (el === elStart || zIndexPositions.includes(position) === true)
+      (el === elStart || zIndexPositions.includes(position))
     ) {
       maxIndex = zIndexNum
     }
@@ -132,6 +134,11 @@ function normalizeElements(opts) {
   }
 }
 
+function getOpacity(value, fallback) {
+  const parsed = Number.parseFloat(value)
+  return Number.isFinite(parsed) ? Math.max(0, Math.min(1, parsed)) : fallback
+}
+
 function normalizeOptions(options) {
   if (typeof options === 'number') {
     options = {
@@ -143,18 +150,20 @@ function normalizeOptions(options) {
     }
   }
 
+  const parsedDuration = Number.parseInt(options.duration, 10)
+  const parsedDelay = Number.parseInt(options.delay, 10)
+
   return {
     ...options,
 
     waitFor: options.waitFor === void 0 ? 0 : options.waitFor,
 
-    duration:
-      isNaN(options.duration) === true ? 300 : parseInt(options.duration, 10),
+    duration: Number.isNaN(parsedDuration) ? 300 : parsedDuration,
+    delay: Number.isNaN(parsedDelay) ? 0 : parsedDelay,
     easing:
       typeof options.easing === 'string' && options.easing.length !== 0
         ? options.easing
         : 'ease-in-out',
-    delay: isNaN(options.delay) === true ? 0 : parseInt(options.delay, 10),
     fill:
       typeof options.fill === 'string' && options.fill.length !== 0
         ? options.fill
@@ -171,14 +180,8 @@ function normalizeOptions(options) {
     keepToClone: options.keepToClone === true || options.keeptoclone === true,
 
     tween: options.tween === true,
-    tweenFromOpacity:
-      isNaN(options.tweenFromOpacity) === true
-        ? 0.6
-        : parseFloat(options.tweenFromOpacity),
-    tweenToOpacity:
-      isNaN(options.tweenToOpacity) === true
-        ? 0.5
-        : parseFloat(options.tweenToOpacity)
+    tweenFromOpacity: getOpacity(options.tweenFromOpacity, 0.6),
+    tweenToOpacity: getOpacity(options.tweenToOpacity, 0.5)
   }
 }
 
@@ -199,7 +202,7 @@ function isValidElement(element) {
 }
 
 export default function morph(_options) {
-  let cancel = () => false
+  let cancel = defaultCancel
   let cancelStatus = false
   let endElementTo = true
 
@@ -207,7 +210,7 @@ export default function morph(_options) {
   const options = normalizeOptions(_options)
 
   const elFrom = getElement(elements.from)
-  if (isValidElement(elFrom) !== true) {
+  if (!isValidElement(elFrom)) {
     // we return a cancel function that return false, meaning the cancel function failed
     return cancel
   }
@@ -259,7 +262,7 @@ export default function morph(_options) {
     elFromTween.className = elFromTween.classList
       .toString()
       .split(' ')
-      .filter(c => /^bg-/.test(c) === false)
+      .filter(c => !c.startsWith('bg-'))
       .join(' ')
   }
 
@@ -273,6 +276,8 @@ export default function morph(_options) {
   elFromClone.style.transition = 'none'
   elFromClone.style.animation = 'none'
   elFromClone.style.pointerEvents = 'none'
+
+  // oxlint-disable-next-line unicorn/prefer-modern-dom-apis
   elFromParent.insertBefore(elFromClone, elFromNext)
 
   // we mark the element with its cleanup function
@@ -294,7 +299,7 @@ export default function morph(_options) {
   // will be called after Vue catches up with the changes done by _options.onToggle() function
   const calculateFinalState = () => {
     const elTo = getElement(elements.to)
-    if (cancelStatus === true || isValidElement(elTo) !== true) {
+    if (cancelStatus === true || !isValidElement(elTo)) {
       if (typeof elFrom.qMorphCancel === 'function') elFrom.qMorphCancel()
       return
     }
@@ -393,6 +398,8 @@ export default function morph(_options) {
         elTo === elFrom && elFromParent === elToParent
           ? elFromClone
           : elTo.nextElementSibling
+
+      // oxlint-disable-next-line unicorn/prefer-modern-dom-apis
       elToParent.insertBefore(elToClone, elToNext)
 
       const {
@@ -425,7 +432,7 @@ export default function morph(_options) {
       // we strip the background classes (background color can no longer be animated if !important is used)
       elTo.className = elToClassSaved
         .split(' ')
-        .filter(c => /^bg-/.test(c) === false)
+        .filter(c => !c.startsWith('bg-'))
         .join(' ')
 
       const elToPosition = getAbsolutePosition(elTo, options.resize)
@@ -463,14 +470,14 @@ export default function morph(_options) {
 
       const elSharedSize =
         elFrom === elTo &&
-        ['absolute', 'fixed'].includes(elToPositioningType) === false &&
-        ['absolute', 'fixed'].includes(elFromPositioningType) === false
+        !['absolute', 'fixed'].includes(elToPositioningType) &&
+        !['absolute', 'fixed'].includes(elFromPositioningType)
 
       // if the final element has fixed position or if a parent
       // has fixed position we need to animate it as fixed
       let elToNeedsFixedPosition = elToPositioningType === 'fixed'
       let parent = elToParent
-      while (elToNeedsFixedPosition !== true && parent !== document) {
+      while (!elToNeedsFixedPosition && parent !== document) {
         elToNeedsFixedPosition =
           window.getComputedStyle(parent).position === 'fixed'
         parent = parent.parentNode
@@ -508,7 +515,7 @@ export default function morph(_options) {
       // we apply styles specified by user
       if (typeof options.style === 'string') {
         elTo.style.cssText += ' ' + options.style
-      } else if (isObject(options.style) === true) {
+      } else if (isObject(options.style)) {
         for (const prop in options.style) {
           elTo.style[prop] = options.style[prop]
         }
@@ -519,12 +526,10 @@ export default function morph(_options) {
 
       // we position the morphing element
       // if we use fixed position for the final element we need to adjust for scroll
-      const documentScroll =
-        elToNeedsFixedPosition === true
-          ? document.documentElement
-          : { scrollLeft: 0, scrollTop: 0 }
-      elTo.style.position =
-        elToNeedsFixedPosition === true ? 'fixed' : 'absolute'
+      const documentScroll = elToNeedsFixedPosition
+        ? document.documentElement
+        : { scrollLeft: 0, scrollTop: 0 }
+      elTo.style.position = elToNeedsFixedPosition ? 'fixed' : 'absolute'
       elTo.style.left = `${elToPosition.left - documentScroll.scrollLeft}px`
       elTo.style.right = 'unset'
       elTo.style.top = `${elToPosition.top - documentScroll.scrollTop}px`
@@ -540,7 +545,7 @@ export default function morph(_options) {
         elTo.style.overflowY = 'hidden'
       }
 
-      document.body.appendChild(elTo)
+      document.body.append(elTo)
 
       if (elFromTween !== void 0) {
         elFromTween.style.cssText = elFromCssText
@@ -565,7 +570,7 @@ export default function morph(_options) {
           elFromTween.style.overflowY = 'hidden'
         }
 
-        document.body.appendChild(elFromTween)
+        document.body.append(elFromTween)
       }
 
       const commonCleanup = aborted => {
@@ -580,7 +585,7 @@ export default function morph(_options) {
         }
 
         if (elToClone.parentNode === elToParent) {
-          elToParent.insertBefore(elTo, elToClone)
+          elToClone.before(elTo)
         }
 
         // we clean the spacers
@@ -589,7 +594,7 @@ export default function morph(_options) {
         elFromTween?.remove()
 
         // cancel will be no longer available
-        cancel = () => false
+        cancel = defaultCancel
 
         elFrom.qMorphCancel = void 0
         elTo.qMorphCancel = void 0
@@ -974,7 +979,7 @@ export default function morph(_options) {
 
           ${keyframesTo}
         `
-        document.head.appendChild(style)
+        document.head.append(style)
 
         let animationDirection = 'normal'
 
@@ -1046,7 +1051,9 @@ export default function morph(_options) {
     ) {
       const delayPromise =
         options.waitFor > 0
-          ? new Promise(resolve => setTimeout(resolve, options.waitFor))
+          ? new Promise(resolve => {
+              setTimeout(resolve, options.waitFor)
+            })
           : options.waitFor === 'transitionend'
             ? new Promise(resolve => {
                 const endFn = () => {
@@ -1060,7 +1067,9 @@ export default function morph(_options) {
                     elTo.removeEventListener('transitioncancel', endFn)
                   }
 
-                  resolve()
+                  // oxlint-disable-next-line promise/no-multiple-resolved
+                  resolve?.()
+                  resolve = null
                 }
 
                 let timer = setTimeout(endFn, 400)

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

@@ -4,7 +4,7 @@ import { noop } from '../event/event.js'
 import { isNumber } from '../is/is.js'
 
 function parseFeatures(winFeatures) {
-  const cfg = Object.assign({ noopener: true }, winFeatures)
+  const cfg = { noopener: true, ...winFeatures }
   const feat = []
   for (const key in cfg) {
     const value = cfg[key]
@@ -20,7 +20,7 @@ function parseFeatures(winFeatures) {
 function openWindow(url, reject, windowFeatures) {
   let open = window.open
 
-  if (Platform.is.cordova === true) {
+  if (Platform.is.cordova) {
     if (cordova?.InAppBrowser?.open !== void 0) {
       open = cordova.InAppBrowser.open
     } else if (navigator?.app !== void 0) {
@@ -35,21 +35,21 @@ function openWindow(url, reject, windowFeatures) {
   // also implies "noopener". Only reject if neither is in effect, so that the
   // null return can be treated as a blocked popup.
   // Note: parseFeatures() normalizes values to booleans, so strict === true is safe.
-  const cfg = Object.assign({ noopener: true }, windowFeatures)
-  const hasNoopener = cfg.noopener === true || cfg.noreferrer === true
+  const cfg = { noopener: true, ...windowFeatures }
+  const hasNoopener = cfg.noopener || cfg.noreferrer
 
   const win = open(url, '_blank', parseFeatures(windowFeatures))
 
   if (win) {
     if (Platform.is.desktop) win.focus()
     return win
-  } else if (hasNoopener === false) {
+  } else if (!hasNoopener) {
     reject?.()
   }
 }
 
-export default (url, reject, windowFeatures) => {
-  if (Platform.is.ios === true && window.SafariViewController !== void 0) {
+export default function openUrl(url, reject, windowFeatures) {
+  if (Platform.is.ios && window.SafariViewController !== void 0) {
     window.SafariViewController.isAvailable(available => {
       if (available) {
         window.SafariViewController.show({ url }, noop, reject)

package/src/utils/patterns/patterns.js

@@ -1,42 +1,45 @@
 // file referenced from docs
 
-const hex = /^#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?$/,
-  hexa = /^#[0-9a-fA-F]{4}([0-9a-fA-F]{4})?$/,
-  hexOrHexa =
+const hexRE = /^#[0-9a-fA-F]{3}([0-9a-fA-F]{3})?$/,
+  hexaRE = /^#[0-9a-fA-F]{4}([0-9a-fA-F]{4})?$/,
+  hexOrHexaRE =
     /^#([0-9a-fA-F]{3}|[0-9a-fA-F]{4}|[0-9a-fA-F]{6}|[0-9a-fA-F]{8})$/,
-  rgb =
+  rgbRE =
     /^rgb\(((0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),){2}(0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5])\)$/,
-  rgba =
-    /^rgba\(((0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),){2}(0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),(0|0\.[0-9]+[1-9]|0\.[1-9]+|1)\)$/
+  rgbaRE =
+    /^rgba\(((0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),){2}(0|[1-9][\d]?|1[\d]{0,2}|2[\d]?|2[0-4][\d]|25[0-5]),(0|0\.[0-9]+[1-9]|0\.[1-9]+|1)\)$/,
+  dateRE = /^-?[\d]+\/[0-1]\d\/[0-3]\d$/,
+  timeRE = /^([0-1]?\d|2[0-3]):[0-5]\d$/,
+  fulltimeRE = /^([0-1]?\d|2[0-3]):[0-5]\d:[0-5]\d$/,
+  timeOrFulltimeRE = /^([0-1]?\d|2[0-3]):[0-5]\d(:[0-5]\d)?$/,
+  emailRE =
+    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
 
 // Keep in sync with ui/types/api/validation.d.ts
 export const testPattern = {
-  date: v => /^-?[\d]+\/[0-1]\d\/[0-3]\d$/.test(v),
-  time: v => /^([0-1]?\d|2[0-3]):[0-5]\d$/.test(v),
-  fulltime: v => /^([0-1]?\d|2[0-3]):[0-5]\d:[0-5]\d$/.test(v),
-  timeOrFulltime: v => /^([0-1]?\d|2[0-3]):[0-5]\d(:[0-5]\d)?$/.test(v),
+  date: v => dateRE.test(v),
+  time: v => timeRE.test(v),
+  fulltime: v => fulltimeRE.test(v),
+  timeOrFulltime: v => timeOrFulltimeRE.test(v),
 
   // -- RFC 5322 --
   // -- Added in v2.6.6 --
   // This is a basic helper validation.
   // For something more complex (like RFC 822) you should write and use your own rule.
   // We won't be accepting PRs to enhance the one below because of the reason above.
-  email: v =>
-    /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(
-      v
-    ),
+  email: v => emailRE.test(v),
 
-  hexColor: v => hex.test(v),
-  hexaColor: v => hexa.test(v),
-  hexOrHexaColor: v => hexOrHexa.test(v),
+  hexColor: v => hexRE.test(v),
+  hexaColor: v => hexaRE.test(v),
+  hexOrHexaColor: v => hexOrHexaRE.test(v),
 
-  rgbColor: v => rgb.test(v),
-  rgbaColor: v => rgba.test(v),
-  rgbOrRgbaColor: v => rgb.test(v) || rgba.test(v),
+  rgbColor: v => rgbRE.test(v),
+  rgbaColor: v => rgbaRE.test(v),
+  rgbOrRgbaColor: v => rgbRE.test(v) || rgbaRE.test(v),
 
-  hexOrRgbColor: v => hex.test(v) || rgb.test(v),
-  hexaOrRgbaColor: v => hexa.test(v) || rgba.test(v),
-  anyColor: v => hexOrHexa.test(v) || rgb.test(v) || rgba.test(v)
+  hexOrRgbColor: v => hexRE.test(v) || rgbRE.test(v),
+  hexaOrRgbaColor: v => hexaRE.test(v) || rgbaRE.test(v),
+  anyColor: v => hexOrHexaRE.test(v) || rgbRE.test(v) || rgbaRE.test(v)
 }
 
 export default {

package/src/utils/patterns/patterns.test.js

@@ -1,6 +1,6 @@
 // oxlint-disable import/no-named-as-default-member
 
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 
 import patterns from './patterns.js'
 

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

@@ -17,7 +17,7 @@ function globalHandler(evt) {
   if (
     target === void 0 ||
     target.nodeType === 8 ||
-    target.classList.contains('no-pointer-events') === true
+    target.classList.contains('no-pointer-events')
   ) {
     return
   }
@@ -39,7 +39,7 @@ function globalHandler(evt) {
       break
     }
 
-    if (proxy.props.seamless !== true) return
+    if (!proxy.props.seamless) return
 
     portalIndex--
   }
@@ -49,10 +49,10 @@ function globalHandler(evt) {
 
     if (
       (state.anchorEl.value === null ||
-        state.anchorEl.value.contains(target) === false) &&
+        !state.anchorEl.value.contains(target)) &&
       (target === document.body ||
         (state.innerRef.value !== null &&
-          state.innerRef.value.contains(target) === false))
+          !state.innerRef.value.contains(target)))
     ) {
       // mark the event as being processed by clickOutside
       // used to prevent refocus after menu close
@@ -74,7 +74,7 @@ export function addClickOutside(clickOutsideProps) {
 }
 
 export function removeClickOutside(clickOutsideProps) {
-  const index = registeredList.findIndex(h => h === clickOutsideProps)
+  const index = registeredList.indexOf(clickOutsideProps)
 
   if (index !== -1) {
     registeredList.splice(index, 1)

package/src/utils/private.config/instance-config.js

@@ -1,4 +1,6 @@
 export const globalConfig = {}
+
+// oxlint-disable-next-line import/no-mutable-exports
 export let globalConfigIsFrozen = false
 
 export function freezeGlobalConfig() {

package/src/utils/private.config/instance-config.test.js

@@ -1,10 +1,10 @@
-import { describe, test, expect } from 'vitest'
-import { mount, config } from '@vue/test-utils'
+import { describe, expect, test } from 'vitest'
+import { config, mount } from '@vue/test-utils'
 
 import {
+  freezeGlobalConfig,
   globalConfig,
-  globalConfigIsFrozen,
-  freezeGlobalConfig
+  globalConfigIsFrozen
 } from './instance-config.js'
 
 // We override Quasar install so we have a custom $q.config

package/src/utils/private.config/nodes.js

@@ -19,7 +19,7 @@ export function createGlobalNode(id, portalType) {
     }
   }
 
-  target.appendChild(el)
+  target.append(el)
   nodesList.push(el)
   portalTypeList.push(portalType)
 
@@ -49,8 +49,8 @@ export function changeGlobalNodesTarget(newTarget) {
     ) < 2
   ) {
     nodesList.forEach(node => {
-      if (node.contains(target) === false) {
-        target.appendChild(node)
+      if (!node.contains(target)) {
+        target.append(node)
       }
     })
 
@@ -64,9 +64,9 @@ export function changeGlobalNodesTarget(newTarget) {
 
     if (
       (i === lastDialogIndex || portalTypeList[i] !== 'dialog') &&
-      el.contains(target) === false
+      !el.contains(target)
     ) {
-      target.appendChild(el)
+      target.append(el)
     }
   }
 }

package/src/utils/private.config/nodes.test.js

@@ -1,9 +1,9 @@
-import { describe, test, expect, afterEach } from 'vitest'
+import { afterEach, describe, expect, test } from 'vitest'
 
 import {
+  changeGlobalNodesTarget,
   createGlobalNode,
-  removeGlobalNode,
-  changeGlobalNodesTarget
+  removeGlobalNode
 } from './nodes.js'
 import { globalConfig } from './instance-config.js'
 
@@ -91,7 +91,7 @@ describe('[nodes API]', () => {
 
         const newTargetEl = document.createElement('div')
         newTargetEl.setAttribute('id', 'new-target')
-        document.body.appendChild(newTargetEl)
+        document.body.append(newTargetEl)
 
         expect(changeGlobalNodesTarget(newTargetEl)).toBeUndefined()
 

package/src/utils/private.create/create.test.js

@@ -1,4 +1,4 @@
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import { isReactive } from 'vue'
 
 import {

package/src/utils/private.dialog/create-dialog.js

@@ -1,4 +1,4 @@
-import { h, ref, nextTick } from 'vue'
+import { h, nextTick, ref } from 'vue'
 
 import { createChildApp } from '../../install-quasar.js'
 import { createGlobalNode, removeGlobalNode } from '../private.config/nodes.js'
@@ -24,21 +24,18 @@ export function merge(target, source) {
   }
 }
 
-export default function createDialog(
+export function createDialog(
   DefaultComponent,
   supportsCustomComponent,
   parentApp
 ) {
   return pluginProps => {
-    if (__QUASAR_SSR_SERVER__) {
-      return ssrAPI
-    }
+    if (__QUASAR_SSR_SERVER__) return ssrAPI
 
     let DialogComponent, props
-    const isCustom =
-      supportsCustomComponent === true && pluginProps.component !== void 0
+    const isCustom = supportsCustomComponent && pluginProps.component !== void 0
 
-    if (isCustom === true) {
+    if (isCustom) {
       const { component, componentProps } = pluginProps
 
       DialogComponent =
@@ -56,8 +53,8 @@ export default function createDialog(
       if (style !== void 0) otherProps.cardStyle = style
     }
 
-    let vm,
-      emittedOK = false
+    let vm
+    let emittedOK = false
     const dialogRef = ref(null)
     const el = createGlobalNode(false, 'dialog')
 
@@ -113,7 +110,7 @@ export default function createDialog(
         },
         update(componentProps) {
           if (vm !== null) {
-            if (isCustom === true) {
+            if (isCustom) {
               Object.assign(props, componentProps)
             } else {
               const { class: klass, style, ...cfg } = componentProps
@@ -143,7 +140,7 @@ export default function createDialog(
       app = null
       vm = null
 
-      if (emittedOK !== true) {
+      if (!emittedOK) {
         cancelFns.forEach(fn => {
           fn()
         })

package/src/utils/private.focus/focus-manager.js

@@ -15,7 +15,7 @@ export function removeFocusWaitFlag(flag) {
 
   if (waitFlags.length === 0 && queue.length !== 0) {
     // only call last focus handler (can't focus multiple things at once)
-    queue[queue.length - 1]()
+    queue.at(-1)()
     queue = []
   }
 }
@@ -24,6 +24,10 @@ export function addFocusFn(fn) {
   if (waitFlags.length === 0) {
     fn()
   } else {
+    /**
+     * While in the wait state, do not let focus be set on any element.
+     */
+    document.activeElement?.blur?.()
     queue.push(fn)
   }
 }

package/src/utils/private.focus/focus-manager.test.js

@@ -1,10 +1,10 @@
-import { describe, test, expect, vi, afterEach } from 'vitest'
+import { afterEach, describe, expect, test, vi } from 'vitest'
 
 import {
-  addFocusWaitFlag,
-  removeFocusWaitFlag,
   addFocusFn,
-  removeFocusFn
+  addFocusWaitFlag,
+  removeFocusFn,
+  removeFocusWaitFlag
 } from './focus-manager.js'
 
 let waitFlagList = []

package/src/utils/private.focus/focusout.js

@@ -3,11 +3,11 @@ import { client } from '../../plugins/platform/Platform.js'
 const handlers = []
 
 function trigger(e) {
-  handlers[handlers.length - 1](e)
+  handlers.at(-1)(e)
 }
 
 export function addFocusout(fn) {
-  if (client.is.desktop === true) {
+  if (client.is.desktop) {
     handlers.push(fn)
 
     if (handlers.length === 1) {

package/src/utils/private.focus/focusout.test.js

@@ -1,4 +1,4 @@
-import { describe, test, expect, vi, afterEach } from 'vitest'
+import { afterEach, describe, expect, test, vi } from 'vitest'
 
 import { addFocusout, removeFocusout } from './focusout.js'