quasar 2.18.7 → 2.19.0

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

@@ -11,54 +11,59 @@ const ssrAPI = {
   update: () => ssrAPI
 }
 
-export function merge (target, source) {
+export function merge(target, source) {
   for (const key in source) {
-    if (key !== 'spinner' && Object(source[ key ]) === source[ key ]) {
-      target[ key ] = Object(target[ key ]) !== target[ key ]
-        ? {}
-        : { ...target[ key ] }
+    if (key !== 'spinner' && Object(source[key]) === source[key]) {
+      target[key] =
+        Object(target[key]) !== target[key] ? {} : { ...target[key] }
 
-      merge(target[ key ], source[ key ])
-    }
-    else {
-      target[ key ] = source[ key ]
+      merge(target[key], source[key])
+    } else {
+      target[key] = source[key]
     }
   }
 }
 
-export default function (DefaultComponent, supportsCustomComponent, parentApp) {
+export default 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 === true && pluginProps.component !== void 0
 
     if (isCustom === true) {
       const { component, componentProps } = pluginProps
 
-      DialogComponent = (typeof component === 'string')
-        ? parentApp.component(component)
-        : component
+      DialogComponent =
+        typeof component === 'string'
+          ? parentApp.component(component)
+          : component
 
       props = componentProps || {}
-    }
-    else {
+    } else {
       const { class: klass, style, ...otherProps } = pluginProps
 
       DialogComponent = DefaultComponent
       props = otherProps
-      klass !== void 0 && (otherProps.cardClass = klass)
-      style !== void 0 && (otherProps.cardStyle = style)
+      if (klass !== void 0) otherProps.cardClass = klass
+      if (style !== void 0) otherProps.cardStyle = style
     }
 
-    let vm, emittedOK = false
+    let vm,
+      emittedOK = false
     const dialogRef = ref(null)
     const el = createGlobalNode(false, 'dialog')
 
     const applyState = cmd => {
-      if (dialogRef.value?.[ cmd ] !== void 0) {
-        dialogRef.value[ cmd ]()
+      if (dialogRef.value?.[cmd] !== void 0) {
+        dialogRef.value[cmd]()
         return
       }
 
@@ -66,19 +71,19 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
 
       if (target?.component) {
         // account for "script setup" way of declaring component
-        if (target.component.proxy && target.component.proxy[ cmd ]) {
-          target.component.proxy[ cmd ]()
+        if (target.component.proxy && target.component.proxy[cmd]) {
+          target.component.proxy[cmd]()
           return
         }
 
         // account for "script setup" + async component way of declaring component
         if (
-          target.component.subTree
-          && target.component.subTree.component
-          && target.component.subTree.component.proxy
-          && target.component.subTree.component.proxy[ cmd ]
+          target.component.subTree &&
+          target.component.subTree.component &&
+          target.component.subTree.component.proxy &&
+          target.component.subTree.component.proxy[cmd]
         ) {
-          target.component.subTree.component.proxy[ cmd ]()
+          target.component.subTree.component.proxy[cmd]()
           return
         }
       }
@@ -86,37 +91,35 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
       console.error('[Quasar] Incorrectly defined Dialog component')
     }
 
-    const
-      okFns = [],
+    const okFns = [],
       cancelFns = [],
       API = {
-        onOk (fn) {
+        onOk(fn) {
           okFns.push(fn)
           return API
         },
-        onCancel (fn) {
+        onCancel(fn) {
           cancelFns.push(fn)
           return API
         },
-        onDismiss (fn) {
+        onDismiss(fn) {
           okFns.push(fn)
           cancelFns.push(fn)
           return API
         },
-        hide () {
+        hide() {
           applyState('hide')
           return API
         },
-        update (componentProps) {
+        update(componentProps) {
           if (vm !== null) {
             if (isCustom === true) {
               Object.assign(props, componentProps)
-            }
-            else {
+            } else {
               const { class: klass, style, ...cfg } = componentProps
 
-              klass !== void 0 && (cfg.cardClass = klass)
-              style !== void 0 && (cfg.cardStyle = style)
+              if (klass !== void 0) cfg.cardClass = klass
+              if (style !== void 0) cfg.cardStyle = style
               merge(props, cfg)
             }
 
@@ -129,7 +132,9 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
 
     const onOk = data => {
       emittedOK = true
-      okFns.forEach(fn => { fn(data) })
+      okFns.forEach(fn => {
+        fn(data)
+      })
     }
 
     const onHide = () => {
@@ -139,26 +144,32 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
       vm = null
 
       if (emittedOK !== true) {
-        cancelFns.forEach(fn => { fn() })
+        cancelFns.forEach(fn => {
+          fn()
+        })
       }
     }
 
-    let app = createChildApp({
-      name: 'QGlobalDialog',
-      setup: () => () => h(DialogComponent, {
-        ...props,
-        ref: dialogRef,
-        onOk,
-        onHide,
-        onVnodeMounted (...args) {
-          if (typeof props.onVnodeMounted === 'function') {
-            props.onVnodeMounted(...args)
-          }
-
-          nextTick(() => applyState('show'))
-        }
-      })
-    }, parentApp)
+    let app = createChildApp(
+      {
+        name: 'QGlobalDialog',
+        setup: () => () =>
+          h(DialogComponent, {
+            ...props,
+            ref: dialogRef,
+            onOk,
+            onHide,
+            onVnodeMounted(...args) {
+              if (typeof props.onVnodeMounted === 'function') {
+                props.onVnodeMounted(...args)
+              }
+
+              nextTick(() => applyState('show'))
+            }
+          })
+      },
+      parentApp
+    )
 
     vm = app.mount(el)
 

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

@@ -8,17 +8,17 @@
           "required": true,
           "definition": {
             "class": {
-              "type": [ "String", "Array", "Object" ],
+              "type": ["String", "Array", "Object"],
               "tsType": "VueClassProp",
               "desc": "CSS Class name to apply to the Dialog's QCard",
-              "examples": [ "'my-class'" ]
+              "examples": ["'my-class'"]
             },
 
             "style": {
-              "type": [ "String", "Array", "Object" ],
+              "type": ["String", "Array", "Object"],
               "tsType": "VueStyleProp",
               "desc": "CSS style to apply to the Dialog's QCard",
-              "examples": [ "'border: 2px solid black'" ]
+              "examples": ["'border: 2px solid black'"]
             }
           }
         }
@@ -44,11 +44,18 @@
                     "type": "Any",
                     "desc": "The payload if called onDialogOK with the parameter or emitted one with the 'ok' event",
                     "required": false,
-                    "examples": [ "'Quasar Framework'", "[ 1, 2, 6, 3 ]", "{ book: { id: 1, name: 'Lorem Ipsum' }, user: { name: 'Lorem J. Ipsum', role: 'admin' } }" ]
+                    "examples": [
+                      "'Quasar Framework'",
+                      "[1, 2, 6, 3]",
+                      "{ book: { id: 1, name: 'Lorem Ipsum' }, user: { name: 'Lorem J. Ipsum', role: 'admin' } }"
+                    ]
                   }
                 },
                 "returns": null,
-                "examples": [ "() => console.log('OK!')", "payload => Notify.create({ type: 'positive', message: `Successfully saved '${payload.book.name}' book!` })" ]
+                "examples": [
+                  "() => console.log('OK!')",
+                  "payload => Notify.create({ type: 'positive', message: `Successfully saved '${payload.book.name}' book!` })"
+                ]
               }
             },
             "returns": {

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

@@ -1,34 +1,33 @@
 let queue = []
 let waitFlags = []
 
-function clearFlag (flag) {
+function clearFlag(flag) {
   waitFlags = waitFlags.filter(entry => entry !== flag)
 }
 
-export function addFocusWaitFlag (flag) {
+export function addFocusWaitFlag(flag) {
   clearFlag(flag)
   waitFlags.push(flag)
 }
 
-export function removeFocusWaitFlag (flag) {
+export function removeFocusWaitFlag(flag) {
   clearFlag(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[queue.length - 1]()
     queue = []
   }
 }
 
-export function addFocusFn (fn) {
+export function addFocusFn(fn) {
   if (waitFlags.length === 0) {
     fn()
-  }
-  else {
+  } else {
     queue.push(fn)
   }
 }
 
-export function removeFocusFn (fn) {
+export function removeFocusFn(fn) {
   queue = queue.filter(entry => entry !== fn)
 }

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

@@ -1,6 +1,11 @@
 import { describe, test, expect, vi, afterEach } from 'vitest'
 
-import { addFocusWaitFlag, removeFocusWaitFlag, addFocusFn, removeFocusFn } from './focus-manager.js'
+import {
+  addFocusWaitFlag,
+  removeFocusWaitFlag,
+  addFocusFn,
+  removeFocusFn
+} from './focus-manager.js'
 
 let waitFlagList = []
 let fnList = []
@@ -18,13 +23,13 @@ afterEach(() => {
   fnList = []
 })
 
-function createTestFn () {
+function createTestFn() {
   const fn = vi.fn()
   fnList.push(fn)
   return fn
 }
 
-function createTestWaitFlag () {
+function createTestWaitFlag() {
   const obj = {}
   waitFlagList.push(obj)
   return obj
@@ -36,9 +41,7 @@ describe('[focusManager API]', () => {
       test('has correct return value', () => {
         const obj = createTestWaitFlag()
 
-        expect(
-          addFocusWaitFlag(obj)
-        ).toBeUndefined()
+        expect(addFocusWaitFlag(obj)).toBeUndefined()
       })
 
       test('can add multiple wait flags', () => {
@@ -52,9 +55,7 @@ describe('[focusManager API]', () => {
 
     describe('[(function)removeFocusWaitFlag]', () => {
       test('has correct return value', () => {
-        expect(
-          removeFocusWaitFlag({})
-        ).toBeUndefined()
+        expect(removeFocusWaitFlag({})).toBeUndefined()
       })
 
       test('calls only last registered fn when there is a wait flag', () => {
@@ -110,17 +111,13 @@ describe('[focusManager API]', () => {
       test('has correct return value', () => {
         const fn = createTestFn()
 
-        expect(
-          addFocusFn(fn)
-        ).toBeUndefined()
+        expect(addFocusFn(fn)).toBeUndefined()
       })
 
       test('triggers immediately if no wait flags', () => {
         const fn = createTestFn()
 
-        expect(
-          addFocusFn(fn)
-        ).toBeUndefined()
+        expect(addFocusFn(fn)).toBeUndefined()
 
         expect(fn).toHaveBeenCalledTimes(1)
         expect(fn).toHaveBeenCalledWith()
@@ -167,9 +164,7 @@ describe('[focusManager API]', () => {
 
     describe('[(function)removeFocusFn]', () => {
       test('works correctly', () => {
-        expect(
-          removeFocusFn({})
-        ).toBeUndefined()
+        expect(removeFocusFn({})).toBeUndefined()
       })
 
       test('should not call removed fn', () => {

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

@@ -2,11 +2,11 @@ import { client } from '../../plugins/platform/Platform.js'
 
 const handlers = []
 
-function trigger (e) {
-  handlers[ handlers.length - 1 ](e)
+function trigger(e) {
+  handlers[handlers.length - 1](e)
 }
 
-export function addFocusout (fn) {
+export function addFocusout(fn) {
   if (client.is.desktop === true) {
     handlers.push(fn)
 
@@ -16,7 +16,7 @@ export function addFocusout (fn) {
   }
 }
 
-export function removeFocusout (fn) {
+export function removeFocusout(fn) {
   const index = handlers.indexOf(fn)
   if (index !== -1) {
     handlers.splice(index, 1)

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

@@ -12,13 +12,13 @@ afterEach(() => {
   fnList = []
 })
 
-function createTestFn () {
+function createTestFn() {
   const fn = vi.fn()
   fnList.push(fn)
   return fn
 }
 
-function triggerEvt (name = 'focusin') {
+function triggerEvt(name = 'focusin') {
   const evt = new Event(name)
   document.body.dispatchEvent(evt)
 
@@ -28,12 +28,10 @@ function triggerEvt (name = 'focusin') {
 describe('[focusout API]', () => {
   describe('[Functions]', () => {
     describe('[(function)addFocusout]', () => {
-      test('registers correctly', async () => {
+      test('registers correctly', () => {
         const fn = createTestFn()
 
-        expect(
-          addFocusout(fn)
-        ).toBeUndefined()
+        expect(addFocusout(fn)).toBeUndefined()
 
         expect(fn).not.toHaveBeenCalled()
 
@@ -43,17 +41,13 @@ describe('[focusout API]', () => {
         expect(fn).toHaveBeenCalledWith(evt)
       })
 
-      test('calls only last registered fn', async () => {
+      test('calls only last registered fn', () => {
         const fnFirst = createTestFn()
         const fnLast = createTestFn()
 
-        expect(
-          addFocusout(fnFirst)
-        ).toBeUndefined()
+        expect(addFocusout(fnFirst)).toBeUndefined()
 
-        expect(
-          addFocusout(fnLast)
-        ).toBeUndefined()
+        expect(addFocusout(fnLast)).toBeUndefined()
 
         expect(fnFirst).not.toHaveBeenCalled()
         expect(fnLast).not.toHaveBeenCalled()
@@ -75,9 +69,7 @@ describe('[focusout API]', () => {
       test('triggers only on focusin evt', () => {
         const fn = createTestFn()
 
-        expect(
-          addFocusout(fn)
-        ).toBeUndefined()
+        expect(addFocusout(fn)).toBeUndefined()
 
         expect(fn).not.toHaveBeenCalled()
 
@@ -93,9 +85,7 @@ describe('[focusout API]', () => {
 
         addFocusout(fn)
 
-        expect(
-          removeFocusout(fn)
-        ).toBeUndefined()
+        expect(removeFocusout(fn)).toBeUndefined()
 
         triggerEvt()
 
@@ -105,9 +95,7 @@ describe('[focusout API]', () => {
       test('does not error out if fn is not registered', () => {
         const fn = createTestFn()
 
-        expect(
-          removeFocusout(fn)
-        ).toBeUndefined()
+        expect(removeFocusout(fn)).toBeUndefined()
       })
     })
   })

package/src/utils/private.get-emits-object/get-emits-object.js

@@ -1,10 +1,10 @@
 const trueFn = () => true
 
-export default function (emitsArray) {
+export default function getEmitsObject(emitsArray) {
   const emitsObject = {}
 
   emitsArray.forEach(val => {
-    emitsObject[ val ] = trueFn
+    emitsObject[val] = trueFn
   })
 
   return emitsObject

package/src/utils/private.get-emits-object/get-emits-object.test.js

@@ -6,23 +6,17 @@ describe('[getEmitsObject API]', () => {
   describe('[Functions]', () => {
     describe('[(function)default]', () => {
       test('has correct return value', () => {
-        const emitsArray = [ 'foo', 'bar' ]
+        const emitsArray = ['foo', 'bar']
         const result = getEmitsObject(emitsArray)
 
-        expect(
-          result
-        ).toStrictEqual({
+        expect(result).toStrictEqual({
           foo: expect.any(Function),
           bar: expect.any(Function)
         })
 
-        expect(
-          result.foo()
-        ).toBe(true)
+        expect(result.foo()).toBe(true)
 
-        expect(
-          result.bar()
-        ).toBe(true)
+        expect(result.bar()).toBe(true)
       })
     })
   })

package/src/utils/private.inject-obj-prop/inject-obj-prop.js

@@ -1,4 +1,4 @@
-export function injectProp (target, propName, get, set) {
+export function injectProp(target, propName, get, set) {
   Object.defineProperty(target, propName, {
     get,
     set,
@@ -7,9 +7,9 @@ export function injectProp (target, propName, get, set) {
   return target
 }
 
-export function injectMultipleProps (target, props) {
+export function injectMultipleProps(target, props) {
   for (const key in props) {
-    injectProp(target, key, props[ key ])
+    injectProp(target, key, props[key])
   }
   return target
 }

package/src/utils/private.inject-obj-prop/inject-obj-prop.test.js

@@ -9,25 +9,15 @@ describe('[injectObjProp API]', () => {
         const source = { a: 5 }
         const target = {}
 
-        const result = injectProp(
-          target,
-          'prop',
-          () => source.a
-        )
+        const result = injectProp(target, 'prop', () => source.a)
 
-        expect(
-          result
-        ).toBe(target)
+        expect(result).toBe(target)
 
-        expect(
-          result.prop
-        ).toBe(source.a)
+        expect(result.prop).toBe(source.a)
 
         source.a = 'str'
 
-        expect(
-          result.prop
-        ).toBe(source.a)
+        expect(result.prop).toBe(source.a)
       })
 
       test('attaches getter + setter correctly', () => {
@@ -38,28 +28,22 @@ describe('[injectObjProp API]', () => {
           target,
           'prop',
           () => source.a,
-          val => { source.a = val }
+          val => {
+            source.a = val
+          }
         )
 
-        expect(
-          result
-        ).toBe(target)
+        expect(result).toBe(target)
 
-        expect(
-          result.prop
-        ).toBe(source.a)
+        expect(result.prop).toBe(source.a)
 
         source.a = 'str'
 
-        expect(
-          result.prop
-        ).toBe(source.a)
+        expect(result.prop).toBe(source.a)
 
         result.prop = 10
 
-        expect(
-          result.prop
-        ).toBe(source.a)
+        expect(result.prop).toBe(source.a)
       })
     })
 
@@ -68,36 +52,23 @@ describe('[injectObjProp API]', () => {
         const source = { a: 5, b: 'str' }
         const target = {}
 
-        const result = injectMultipleProps(
-          target,
-          {
-            propA: () => source.a,
-            propB: () => source.b
-          }
-        )
+        const result = injectMultipleProps(target, {
+          propA: () => source.a,
+          propB: () => source.b
+        })
 
-        expect(
-          result
-        ).toBe(target)
+        expect(result).toBe(target)
 
-        expect(
-          result.propA
-        ).toBe(source.a)
+        expect(result.propA).toBe(source.a)
 
-        expect(
-          result.propB
-        ).toBe(source.b)
+        expect(result.propB).toBe(source.b)
 
         source.a = 'str'
         source.b = 10
 
-        expect(
-          result.propA
-        ).toBe(source.a)
+        expect(result.propA).toBe(source.a)
 
-        expect(
-          result.propB
-        ).toBe(source.b)
+        expect(result.propB).toBe(source.b)
       })
     })
   })