quasar 2.1.0 → 2.1.1

package/dist/types/ts-helpers.d.ts

@@ -1,4 +1,4 @@
-import { ComponentOptions, ComponentPublicInstance, ComputedOptions, MethodOptions } from 'vue';
+import { ComponentOptions, ComponentPublicInstance, ComputedOptions, MethodOptions, VNodeProps, AllowedComponentProps, ComponentCustomProps } from 'vue';
 
 export type LooseDictionary = { [index in string]: any };
 
@@ -19,4 +19,20 @@ export type DeepPartial<T> = {
 // especially into VTU to automatically infer Quasar components type when using `findComponent`
 // This type is compatible with the Vue private `ComponentPublicInstanceConstructor` type
 // https://github.com/vuejs/vue-next/blob/011dee8644bb52f5bdc6365c6e8404936d57e2cd/packages/runtime-core/src/componentPublicInstance.ts#L111
-export type ComponentConstructor<Component extends ComponentPublicInstance<Props, RawBindings, D, C, M> = ComponentPublicInstance<any>, Props = any, RawBindings = any, D = any, C extends ComputedOptions = ComputedOptions, M extends MethodOptions = MethodOptions > = { new(): Component } & ComponentOptions<Props, RawBindings, D, C, M>
+export type ComponentConstructor<Component extends ComponentPublicInstance<Props, RawBindings, D, C, M> = ComponentPublicInstance<any>, Props = any, RawBindings = any, D = any, C extends ComputedOptions = ComputedOptions, M extends MethodOptions = MethodOptions > = { new(): Component } & ComponentOptions<Props, RawBindings, D, C, M>
+
+// https://github.com/vuejs/vue-next/blob/d84d5ecdbdf709570122175d6565bb61fae877f2/packages/runtime-core/src/apiDefineComponent.ts#L29-L31
+// TODO: This can be imported from vue directly once this PR gets merged: https://github.com/vuejs/vue-next/pull/2403
+export type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps;
+
+// Can't use `DefineComponent` because of the false prop inferring behavior, it doesn't pick up the required types when an interface is passed
+// This PR will probably solve the problem as it moves the prop inferring behavior to `defineComponent` function: https://github.com/vuejs/vue-next/pull/4465
+// GlobalComponentConstructor helper is kind of like the ComponentConstructor type helper, but simpler and keeps the Volar errors simpler,
+// and also similar to the usage in official Vue packages: https://github.com/vuejs/vue-next/blob/d84d5ecdbdf709570122175d6565bb61fae877f2/packages/runtime-core/src/components/BaseTransition.ts#L258-L264 or https://github.com/vuejs/vue-router-next/blob/5dd5f47515186ce34efb9118dda5aad0bb773439/src/RouterView.ts#L160-L172 etc.
+// TODO: This can be replaced with `DefineComponent` once this PR gets merged: https://github.com/vuejs/vue-next/pull/4465
+export type GlobalComponentConstructor<Props = {}, Slots = {}> = {
+  new (): {
+    $props: PublicProps & Props
+    $slots: Slots
+  }
+}

package/dist/vetur/quasar-attributes.json

@@ -1267,6 +1267,10 @@
     "type": "boolean",
     "description": "(Accessibility) When Dialog gets shown, do not switch focus on it"
   },
+  "q-dialog/no-shake": {
+    "type": "boolean",
+    "description": "Do not shake up the Dialog to catch user's attention"
+  },
   "q-drawer/model-value": {
     "type": "boolean",
     "description": "Model of the component defining shown/hidden state; Either use this property (along with a listener for 'update:model-value' event) OR use v-model directive"
@@ -4613,7 +4617,7 @@
   },
   "q-table/loading": {
     "type": "boolean",
-    "description": "Put Table into 'loading' state; Notify the user something is happening under the covers"
+    "description": "Put Table into 'loading' state; Notify the user something is happening behind the scenes"
   },
   "q-table/title": {
     "type": "string",

package/dist/vetur/quasar-tags.json

@@ -432,7 +432,8 @@
       "transition-hide",
       "square",
       "no-refocus",
-      "no-focus"
+      "no-focus",
+      "no-shake"
     ],
     "description": ""
   },

package/dist/web-types/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "",
   "framework": "vue",
   "name": "quasar",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "contributions": {
     "html": {
       "types-syntax": "typescript",
@@ -3887,6 +3887,16 @@
               "description": "(Accessibility) When Dialog gets shown, do not switch focus on it",
               "doc-url": "https://v2.quasar.dev/vue-components/dialog",
               "type": "boolean"
+            },
+            {
+              "name": "no-shake",
+              "value": {
+                "kind": "expression",
+                "type": "boolean"
+              },
+              "description": "Do not shake up the Dialog to catch user's attention",
+              "doc-url": "https://v2.quasar.dev/vue-components/dialog",
+              "type": "boolean"
             }
           ],
           "events": [
@@ -3957,7 +3967,7 @@
             },
             {
               "name": "shake",
-              "description": "Shakes up the Dialog in order to catch user's attention",
+              "description": "Emitted when the Dialog shakes in order to catch user's attention, unless the 'no-shake' property is set",
               "doc-url": "https://v2.quasar.dev/vue-components/dialog"
             },
             {
@@ -15016,7 +15026,7 @@
                 "kind": "expression",
                 "type": "boolean"
               },
-              "description": "Put Table into 'loading' state; Notify the user something is happening under the covers",
+              "description": "Put Table into 'loading' state; Notify the user something is happening behind the scenes",
               "doc-url": "https://v2.quasar.dev/vue-components/table",
               "type": "boolean"
             },

package/lang/de.js

@@ -23,7 +23,7 @@ export default {
     monthsShort: 'Jan_Feb_Mar_Apr_Mai_Jun_Jul_Aug_Sep_Okt_Nov_Dez'.split('_'),
     firstDayOfWeek: 1, // 0-6, 0 - Sunday, 1 Monday, ...
     format24h: true,
-    pluralDay: 'tage'
+    pluralDay: 'Tage'
   },
   table: {
     noData: 'Keine Daten vorhanden.',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "main": "dist/quasar.cjs.prod.js",
   "module": "dist/quasar.esm.prod.js",
@@ -77,6 +77,7 @@
     "eslint-webpack-plugin": "^2.4.1",
     "json-beautify": "^1.1.1",
     "module-alias": "^2.2.2",
+    "prettier": "^2.4.1",
     "recast": "^0.18.5",
     "rimraf": "^3.0.1",
     "rollup": "^2.34.0",

package/src/components/breadcrumbs/QBreadcrumbs.json

@@ -50,8 +50,7 @@
     },
 
     "separator": {
-      "desc": "HTML or component you can slot in to separate the breadcrumbs",
-      "scope": {}
+      "desc": "HTML or component you can slot in to separate the breadcrumbs"
     }
   }
 }

package/src/components/dialog/QDialog.js

@@ -52,6 +52,7 @@ export default defineComponent({
     noRouteDismiss: Boolean,
     noRefocus: Boolean,
     noFocus: Boolean,
+    noShake: Boolean,
 
     seamless: Boolean,
 
@@ -279,7 +280,7 @@ export default defineComponent({
     function onEscapeKey () {
       if (props.seamless !== true) {
         if (props.persistent === true || props.noEscDismiss === true) {
-          props.maximized !== true && shake()
+          props.maximized !== true && props.noShake !== true && shake()
         }
         else {
           emit('escape-key')
@@ -332,7 +333,7 @@ export default defineComponent({
       if (props.persistent !== true && props.noBackdropDismiss !== true) {
         hide(e)
       }
-      else {
+      else if (props.noShake !== true) {
         shake()
       }
     }

package/src/components/dialog/QDialog.json

@@ -95,12 +95,18 @@
       "type": "Boolean",
       "desc": "(Accessibility) When Dialog gets shown, do not switch focus on it",
       "category": "behavior"
+    },
+
+    "no-shake": {
+      "type": "Boolean",
+      "desc": "Do not shake up the Dialog to catch user's attention",
+      "category": "behavior"
     }
   },
 
   "events": {
     "shake": {
-      "desc": "Shakes up the Dialog in order to catch user's attention"
+      "desc": "Emitted when the Dialog shakes in order to catch user's attention, unless the 'no-shake' property is set"
     },
 
     "escape-key": {

package/src/components/table/QTable.json

@@ -268,7 +268,7 @@
 
     "loading": {
       "type": "Boolean",
-      "desc": "Put Table into 'loading' state; Notify the user something is happening under the covers",
+      "desc": "Put Table into 'loading' state; Notify the user something is happening behind the scenes",
       "category": "behavior|content"
     },
 

package/src/utils/dom.js

@@ -74,7 +74,7 @@ export function getElement (el) {
 
 // internal
 export function childHasFocus (el, focusedEl) {
-  if (el === void 0 || el.contains(focusedEl) === true) {
+  if (el === void 0 || el === null || el.contains(focusedEl) === true) {
     return true
   }
 

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

@@ -69,9 +69,21 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
           return API
         },
         hide () {
-          if (dialogRef.value !== null) {
+          if (dialogRef.value !== null && dialogRef.value.hide !== void 0) {
             dialogRef.value.hide()
           }
+          else if (
+            // account for "script setup" way of declaring component
+            vm.$.subTree &&
+            vm.$.subTree.component &&
+            vm.$.subTree.component.proxy &&
+            vm.$.subTree.component.proxy.hide
+          ) {
+            vm.$.subTree.component.proxy.hide();
+          }
+          else {
+            console.error("[Quasar] Incorrectly defined Dialog component");
+          }
           return API
         },
         update (componentProps) {
@@ -131,7 +143,7 @@ export default function (DefaultComponent, supportsCustomComponent, parentApp) {
     let vm = app.mount(el)
 
     function show () {
-      if (dialogRef.value.show !== void 0) {
+      if (dialogRef.value !== null && dialogRef.value.show !== void 0) {
         dialogRef.value.show()
       }
       else if ( // account for "script setup" way of declaring component