quasar 1.18.8 → 1.18.9

package/dist/types/index.d.ts

@@ -2584,8 +2584,9 @@ export interface QDialog extends Vue {
     toggle (evt? : LooseDictionary): void
     /**
      * Focus dialog; if you have content with autofocus attribute, it will directly focus it
+     * @param selector Optional CSS selector to override default focusable element
      */
-    focus (): void
+    focus (selector? : string): void
     /**
      * Shakes dialog
      */

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

@@ -2,7 +2,7 @@
   "$schema": "",
   "framework": "vue",
   "name": "quasar",
-  "version": "1.18.8",
+  "version": "1.18.9",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "1.18.8",
+  "version": "1.18.9",
   "description": "Build high-performance VueJS user interfaces (SPA, PWA, SSR, Mobile and Desktop) in record time",
   "module": "src/index.esm.js",
   "typings": "dist/types/index.d.ts",

package/src/components/dialog/QDialog.js

@@ -151,7 +151,7 @@ export default Vue.extend({
   },
 
   methods: {
-    focus () {
+    focus (selector) {
       addFocusFn(() => {
         let node = this.__getInnerNode()
 
@@ -159,7 +159,7 @@ export default Vue.extend({
           return
         }
 
-        node = node.querySelector('[autofocus], [data-autofocus]') || node
+        node = node.querySelector(selector || '[autofocus], [data-autofocus]') || node
         node.focus({ preventScroll: true })
       })
     },
@@ -331,7 +331,7 @@ export default Vue.extend({
         this.__portal !== void 0 &&
         childHasFocus(this.__portal.$el, e.target) !== true
       ) {
-        this.focus()
+        this.focus('[tabindex]:not([tabindex="-1"])')
       }
     },
 

package/src/components/dialog/QDialog.json

@@ -123,7 +123,16 @@
 
   "methods": {
     "focus": {
-      "desc": "Focus dialog; if you have content with autofocus attribute, it will directly focus it"
+      "desc": "Focus dialog; if you have content with autofocus attribute, it will directly focus it",
+      "params": {
+        "selector": {
+          "type": "String",
+          "required": false,
+          "desc": "Optional CSS selector to override default focusable element",
+          "examples": [ "[tabindex]:not([tabindex=\"-1\"])" ],
+          "addedIn": "v1.18.9"
+        }
+      }
     },
 
     "shake": {

package/src/components/dialog-plugin/DialogPlugin.js

@@ -210,18 +210,18 @@ export default Vue.extend({
     getButtons (h) {
       const child = []
 
-      this.ok && child.push(h(QBtn, {
-        props: this.okProps,
-        attrs: { 'data-autofocus': this.focus === 'ok' && this.hasForm !== true },
-        on: cache(this, 'ok', { click: this.onOk })
-      }))
-
       this.cancel && child.push(h(QBtn, {
         props: this.cancelProps,
         attrs: { 'data-autofocus': this.focus === 'cancel' && this.hasForm !== true },
         on: cache(this, 'cancel', { click: this.onCancel })
       }))
 
+      this.ok && child.push(h(QBtn, {
+        props: this.okProps,
+        attrs: { 'data-autofocus': this.focus === 'ok' && this.hasForm !== true },
+        on: cache(this, 'ok', { click: this.onOk })
+      }))
+
       if (child.length > 0) {
         return h(QCardActions, {
           staticClass: this.stackButtons === true ? 'items-end' : null,