quasar 2.6.4 → 2.6.5

package/dist/types/index.d.ts

@@ -3119,8 +3119,9 @@ export interface QDialog extends ComponentPublicInstance<QDialogProps> {
   toggle: (evt?: Event) => 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": "2.6.4",
+  "version": "2.6.5",
   "contributions": {
     "html": {
       "types-syntax": "typescript",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quasar",
-  "version": "2.6.4",
+  "version": "2.6.5",
   "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",

package/src/components/dialog/QDialog.js

@@ -248,7 +248,7 @@ export default createComponent({
       }, props.transitionDuration)
     }
 
-    function focus () {
+    function focus (selector) {
       addFocusFn(() => {
         let node = innerRef.value
 
@@ -256,7 +256,7 @@ export default createComponent({
           return
         }
 
-        node = node.querySelector('[autofocus], [data-autofocus]') || node
+        node = node.querySelector(selector || '[autofocus], [data-autofocus]') || node
         node.focus({ preventScroll: true })
       })
     }
@@ -354,7 +354,7 @@ export default createComponent({
         && portalIsActive.value === true
         && childHasFocus(innerRef.value, evt.target) !== true
       ) {
-        focus()
+        focus('[tabindex]:not([tabindex="-1"])')
       }
     }
 

package/src/components/dialog/QDialog.json

@@ -107,7 +107,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": "v2.6.5"
+        }
+      }
     },
 
     "shake": {

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

@@ -239,14 +239,14 @@ export default createComponent({
     function getButtons () {
       const child = []
 
-      props.ok && child.push(
-        h(QBtn, okProps.value)
-      )
-
       props.cancel && child.push(
         h(QBtn, cancelProps.value)
       )
 
+      props.ok && child.push(
+        h(QBtn, okProps.value)
+      )
+
       return h(QCardActions, {
         class: props.stackButtons === true ? 'items-end' : '',
         vertical: props.stackButtons,