quasar 2.18.7 → 2.19.0

package/src/plugins/lang/Lang.test.js

@@ -127,7 +127,9 @@ describe('[Lang API]', () => {
       })
 
       test('can be set', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
 
         Lang.props.nativeName = 'new-lang'
         expect(Lang.props.nativeName).toBe('new-lang')
@@ -164,14 +166,48 @@ describe('[Lang API]', () => {
               search: 'Search',
               filter: 'Filter',
               refresh: 'Refresh',
-              expand: label => (label ? `Expand '${ label }'` : 'Expand'),
-              collapse: label => (label ? `Collapse '${ label }'` : 'Collapse')
+              expand: label => (label ? `Expand '${label}'` : 'Expand'),
+              collapse: label => (label ? `Collapse '${label}'` : 'Collapse')
             },
             date: {
-              days: [ 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday' ],
-              daysShort: [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ],
-              months: [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ],
-              monthsShort: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
+              days: [
+                'Sunday',
+                'Monday',
+                'Tuesday',
+                'Wednesday',
+                'Thursday',
+                'Friday',
+                'Saturday'
+              ],
+              daysShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
+              months: [
+                'January',
+                'February',
+                'March',
+                'April',
+                'May',
+                'June',
+                'July',
+                'August',
+                'September',
+                'October',
+                'November',
+                'December'
+              ],
+              monthsShort: [
+                'Jan',
+                'Feb',
+                'Mar',
+                'Apr',
+                'May',
+                'Jun',
+                'Jul',
+                'Aug',
+                'Sep',
+                'Oct',
+                'Nov',
+                'Dec'
+              ],
               firstDayOfWeek: 0,
               format24h: true,
               pluralDay: 'days',
@@ -187,10 +223,11 @@ describe('[Lang API]', () => {
               noData: 'No data available',
               noResults: 'No matching records found',
               loading: 'Loading...',
-              selectedRecords: rows => `${ rows } records selected`,
+              selectedRecords: rows => `${rows} records selected`,
               recordsPerPage: 'Records per page:',
               allRows: 'All',
-              pagination: (start, end, total) => start + '-' + end + ' of ' + total,
+              pagination: (start, end, total) =>
+                start + '-' + end + ' of ' + total,
               columns: 'Columns'
             },
             pagination: {
@@ -256,7 +293,9 @@ describe('[Lang API]', () => {
       })
 
       test('should work with an imported lang pack', async () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         const { default: deLang } = await import('quasar/lang/de-DE.js')
 
         Lang.set(deLang)
@@ -274,18 +313,11 @@ describe('[Lang API]', () => {
       test('should be callable', () => {
         const wrapper = mountPlugin()
 
-        expect(
-          Lang.getLocale()
-        ).$any([
-          expect.any(String),
-          undefined
-        ])
+        expect(Lang.getLocale()).$any([expect.any(String), void 0])
 
-        expect(
-          wrapper.vm.$q.lang.getLocale()
-        ).$any([
+        expect(wrapper.vm.$q.lang.getLocale()).$any([
           expect.any(String),
-          undefined
+          void 0
         ])
       })
     })

package/src/plugins/loading/Loading.js

@@ -5,12 +5,14 @@ import QSpinner from '../../components/spinner/QSpinner.js'
 import { createChildApp } from '../../install-quasar.js'
 
 import { createReactivePlugin } from '../../utils/private.create/create.js'
-import { createGlobalNode, removeGlobalNode } from '../../utils/private.config/nodes.js'
+import {
+  createGlobalNode,
+  removeGlobalNode
+} from '../../utils/private.config/nodes.js'
 import preventScroll from '../../utils/scroll/prevent-scroll.js'
 import { isObject } from '../../utils/is/is.js'
 
-let
-  app,
+let app,
   vm,
   uid = 0,
   timeout = null,
@@ -33,175 +35,205 @@ const originalDefaults = {
 
 const defaults = { ...originalDefaults }
 
-function registerProps (opts) {
-  if (opts?.group !== void 0 && activeGroups[ opts.group ] !== void 0) {
-    return Object.assign(activeGroups[ opts.group ], opts)
+function registerProps(opts) {
+  if (opts?.group !== void 0 && activeGroups[opts.group] !== void 0) {
+    return Object.assign(activeGroups[opts.group], opts)
   }
 
-  const newProps = isObject(opts) === true && opts.ignoreDefaults === true
-    ? { ...originalDefaults, ...opts }
-    : { ...defaults, ...opts }
+  const newProps =
+    isObject(opts) === true && opts.ignoreDefaults === true
+      ? { ...originalDefaults, ...opts }
+      : { ...defaults, ...opts }
 
-  activeGroups[ newProps.group ] = newProps
+  activeGroups[newProps.group] = newProps
   return newProps
 }
 
-const Plugin = createReactivePlugin({
-  isActive: false
-}, {
-  show (opts) {
-    if (__QUASAR_SSR_SERVER__) return
+const Plugin = createReactivePlugin(
+  {
+    isActive: false
+  },
+  {
+    show(opts) {
+      if (__QUASAR_SSR_SERVER__) return
 
-    props = registerProps(opts)
-    const { group } = props
+      props = registerProps(opts)
+      const { group } = props
 
-    Plugin.isActive = true
+      Plugin.isActive = true
 
-    if (app !== void 0) {
-      props.uid = uid
-      vm.$forceUpdate()
-    }
-    else {
-      props.uid = ++uid
-      timeout !== null && clearTimeout(timeout)
-
-      timeout = setTimeout(() => {
-        timeout = null
-
-        const el = createGlobalNode('q-loading')
-
-        app = createChildApp({
-          name: 'QLoading',
-
-          setup () {
-            onMounted(() => {
-              preventScroll(true)
-            })
-
-            function onAfterLeave () {
-              // might be called to finalize
-              // previous leave, even if it was cancelled
-              if (Plugin.isActive !== true && app !== void 0) {
-                preventScroll(false)
-                app.unmount(el)
-                removeGlobalNode(el)
-                app = void 0
-                vm = void 0
-              }
-            }
+      if (app !== void 0) {
+        props.uid = uid
+        vm.$forceUpdate()
+      } else {
+        props.uid = ++uid
+        if (timeout !== null) clearTimeout(timeout)
 
-            function getContent () {
-              if (Plugin.isActive !== true) {
-                return null
-              }
+        timeout = setTimeout(() => {
+          timeout = null
 
-              const content = [
-                h(props.spinner, {
-                  class: 'q-loading__spinner',
-                  color: props.spinnerColor,
-                  size: props.spinnerSize
-                })
-              ]
+          const el = createGlobalNode('q-loading')
+
+          app = createChildApp(
+            {
+              name: 'QLoading',
 
-              props.message && content.push(
-                h('div', {
-                  class: 'q-loading__message'
-                    + (props.messageColor ? ` text-${ props.messageColor }` : ''),
-                  [ props.html === true ? 'innerHTML' : 'textContent' ]: props.message
+              setup() {
+                onMounted(() => {
+                  preventScroll(true)
                 })
-              )
-
-              return h('div', {
-                class: 'q-loading fullscreen flex flex-center z-max ' + props.customClass.trim(),
-                key: props.uid
-              }, [
-                h('div', {
-                  class: 'q-loading__backdrop'
-                    + (props.backgroundColor ? ` bg-${ props.backgroundColor }` : '')
-                }),
-
-                h('div', {
-                  class: 'q-loading__box column items-center ' + props.boxClass
-                }, content)
-              ])
-            }
-
-            return () => h(Transition, {
-              name: 'q-transition--fade',
-              appear: true,
-              onAfterLeave
-            }, getContent)
-          }
-        }, Plugin.__parentApp)
 
-        vm = app.mount(el)
-      }, props.delay)
-    }
+                function onAfterLeave() {
+                  // might be called to finalize
+                  // previous leave, even if it was cancelled
+                  if (Plugin.isActive !== true && app !== void 0) {
+                    preventScroll(false)
+                    app.unmount(el)
+                    removeGlobalNode(el)
+                    app = void 0
+                    vm = void 0
+                  }
+                }
+
+                function getContent() {
+                  if (Plugin.isActive !== true) {
+                    return null
+                  }
+
+                  const content = [
+                    h(props.spinner, {
+                      class: 'q-loading__spinner',
+                      color: props.spinnerColor,
+                      size: props.spinnerSize
+                    })
+                  ]
+
+                  if (props.message) {
+                    content.push(
+                      h('div', {
+                        class:
+                          'q-loading__message' +
+                          (props.messageColor
+                            ? ` text-${props.messageColor}`
+                            : ''),
+                        [props.html === true ? 'innerHTML' : 'textContent']:
+                          props.message
+                      })
+                    )
+                  }
+
+                  return h(
+                    'div',
+                    {
+                      class:
+                        'q-loading fullscreen flex flex-center z-max ' +
+                        props.customClass.trim(),
+                      key: props.uid
+                    },
+                    [
+                      h('div', {
+                        class:
+                          'q-loading__backdrop' +
+                          (props.backgroundColor
+                            ? ` bg-${props.backgroundColor}`
+                            : '')
+                      }),
+
+                      h(
+                        'div',
+                        {
+                          class:
+                            'q-loading__box column items-center ' +
+                            props.boxClass
+                        },
+                        content
+                      )
+                    ]
+                  )
+                }
+
+                return () =>
+                  h(
+                    Transition,
+                    {
+                      name: 'q-transition--fade',
+                      appear: true,
+                      onAfterLeave
+                    },
+                    getContent
+                  )
+              }
+            },
+            Plugin.__parentApp
+          )
 
-    return paramProps => {
-      // if we don't have params (or not an Object param) then we need to hide this group
-      if (paramProps === void 0 || Object(paramProps) !== paramProps) {
-        Plugin.hide(group)
-        return
+          vm = app.mount(el)
+        }, props.delay)
       }
 
-      // else we have params so we need to update this group
-      Plugin.show({ ...paramProps, group })
-    }
-  },
+      return paramProps => {
+        // if we don't have params (or not an Object param) then we need to hide this group
+        if (paramProps === void 0 || Object(paramProps) !== paramProps) {
+          Plugin.hide(group)
+          return
+        }
 
-  hide (group) {
-    if (__QUASAR_SSR_SERVER__ !== true && Plugin.isActive === true) {
-      if (group === void 0) {
-        // clear out any active groups
-        activeGroups = {}
+        // else we have params so we need to update this group
+        Plugin.show({ ...paramProps, group })
       }
-      else if (activeGroups[ group ] === void 0) {
-        // we've already hidden it so nothing to do
-        return
-      }
-      else {
-        // remove active group
-        delete activeGroups[ group ]
-
-        const keys = Object.keys(activeGroups)
-
-        // if there are other groups registered then
-        // show last registered one since that one is still active
-        if (keys.length !== 0) {
-          // get last registered group
-          const lastGroup = keys[ keys.length - 1 ]
-          Plugin.show({ group: lastGroup })
+    },
+
+    hide(group) {
+      if (__QUASAR_SSR_SERVER__ !== true && Plugin.isActive === true) {
+        if (group === void 0) {
+          // clear out any active groups
+          activeGroups = {}
+        } else if (activeGroups[group] === void 0) {
+          // we've already hidden it so nothing to do
           return
+        } else {
+          // remove active group
+          delete activeGroups[group]
+
+          const keys = Object.keys(activeGroups)
+
+          // if there are other groups registered then
+          // show last registered one since that one is still active
+          if (keys.length !== 0) {
+            // get last registered group
+            const lastGroup = keys[keys.length - 1]
+            Plugin.show({ group: lastGroup })
+            return
+          }
         }
-      }
 
-      if (timeout !== null) {
-        clearTimeout(timeout)
-        timeout = null
-      }
+        if (timeout !== null) {
+          clearTimeout(timeout)
+          timeout = null
+        }
 
-      Plugin.isActive = false
-    }
-  },
+        Plugin.isActive = false
+      }
+    },
 
-  setDefaults (opts) {
-    if (__QUASAR_SSR_SERVER__ !== true) {
-      isObject(opts) === true && Object.assign(defaults, opts)
-    }
-  },
+    setDefaults(opts) {
+      if (__QUASAR_SSR_SERVER__ !== true) {
+        if (isObject(opts) === true) Object.assign(defaults, opts)
+      }
+    },
 
-  install ({ $q, parentApp }) {
-    $q.loading = this
+    install({ $q, parentApp }) {
+      $q.loading = this
 
-    if (__QUASAR_SSR_SERVER__ !== true) {
-      Plugin.__parentApp = parentApp
+      if (__QUASAR_SSR_SERVER__ !== true) {
+        Plugin.__parentApp = parentApp
 
-      if ($q.config.loading !== void 0) {
-        this.setDefaults($q.config.loading)
+        if ($q.config.loading !== void 0) {
+          this.setDefaults($q.config.loading)
+        }
       }
     }
   }
-})
+)
 
 export default Plugin

package/src/plugins/loading/Loading.json

@@ -12,18 +12,18 @@
       "delay": {
         "type": "Number",
         "desc": "Wait a number of millisecond before showing; Not worth showing for 100ms for example then hiding it, so wait until you're sure it's a process that will take some considerable amount of time",
-        "examples": [ "400" ]
+        "examples": ["400"]
       },
       "message": {
         "type": "String",
         "desc": "Message to display",
-        "examples": [ "'Processing your request'" ]
+        "examples": ["'Processing your request'"]
       },
       "group": {
         "type": "String",
         "desc": "Default Loading group name",
         "default": "'__default_quasar_group__'",
-        "examples": [ "'default-group-name'" ],
+        "examples": ["'default-group-name'"],
         "addedIn": "v2.8"
       },
       "html": {
@@ -33,7 +33,7 @@
       "boxClass": {
         "type": "String",
         "desc": "Content wrapped element custom classes",
-        "examples": [ "'bg-amber text-black'", "'q-pa-xl'" ]
+        "examples": ["'bg-amber text-black'", "'q-pa-xl'"]
       },
       "spinnerSize": {
         "type": "Number",
@@ -55,12 +55,12 @@
         "type": "Component",
         "configFileType": "String",
         "desc": "One of the QSpinners",
-        "examples": [ "QSpinnerAudio" ]
+        "examples": ["QSpinnerAudio"]
       },
       "customClass": {
         "type": "String",
         "desc": "Add a CSS class to the container element to easily customize the component",
-        "examples": [ "'my-class'" ]
+        "examples": ["'my-class'"]
       }
     }
   },
@@ -90,12 +90,12 @@
             "message": {
               "type": "String",
               "desc": "Message to display",
-              "examples": [ "'Processing your request'" ]
+              "examples": ["'Processing your request'"]
             },
             "group": {
               "type": "String",
               "desc": "Loading group name",
-              "examples": [ "'some-api-call'" ],
+              "examples": ["'some-api-call'"],
               "addedIn": "v2.8"
             },
             "html": {
@@ -105,7 +105,7 @@
             "boxClass": {
               "type": "String",
               "desc": "Content wrapped element custom classes",
-              "examples": [ "'bg-amber text-black'", "'q-pa-xl'" ]
+              "examples": ["'bg-amber text-black'", "'q-pa-xl'"]
             },
             "spinnerSize": {
               "type": "Number",
@@ -130,7 +130,7 @@
             "customClass": {
               "type": "String",
               "desc": "Add a CSS class to easily customize the component",
-              "examples": [ "'my-class'" ]
+              "examples": ["'my-class'"]
             },
             "ignoreDefaults": {
               "type": "Boolean",
@@ -148,7 +148,7 @@
             "tsType": "QLoadingUpdateOptions",
             "required": false,
             "desc": "Loading properties that will be shallow merged to the group ones; (See 'opts' param of 'show()' for object properties, except 'group')",
-            "__exemption": [ "definition" ]
+            "__exemption": ["definition"]
           }
         },
         "returns": null,
@@ -163,7 +163,7 @@
           "type": "String",
           "desc": "Optional Loading group name to hide instead of hiding all groups",
           "required": false,
-          "examples": [ "'some-api-call'" ],
+          "examples": ["'some-api-call'"],
           "addedIn": "v2.8"
         }
       },
@@ -185,13 +185,13 @@
             "message": {
               "type": "String",
               "desc": "Message to display",
-              "examples": [ "'Processing your request'" ]
+              "examples": ["'Processing your request'"]
             },
             "group": {
               "type": "String",
               "desc": "Default Loading group name",
               "default": "'__default_quasar_group__'",
-              "examples": [ "'default-group-name'" ],
+              "examples": ["'default-group-name'"],
               "addedIn": "v2.8"
             },
             "spinnerSize": {
@@ -217,7 +217,7 @@
             "customClass": {
               "type": "String",
               "desc": "Add a CSS class to easily customize the component",
-              "examples": [ "'my-class'" ]
+              "examples": ["'my-class'"]
             }
           }
         }