quasar 1.18.8 → 1.18.9

package/dist/quasar.umd.modern.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v1.18.8
+ * Quasar Framework v1.18.9
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -12,7 +12,7 @@
 
   Vue = Vue && Object.prototype.hasOwnProperty.call(Vue, 'default') ? Vue['default'] : Vue;
 
-  var version = "1.18.8";
+  var version = "1.18.9";
 
   /* eslint-disable no-useless-escape */
 
@@ -14454,7 +14454,7 @@
     },
 
     methods: {
-      focus () {
+      focus (selector) {
         addFocusFn(() => {
           let node = this.__getInnerNode();
 
@@ -14462,7 +14462,7 @@
             return
           }
 
-          node = node.querySelector('[autofocus], [data-autofocus]') || node;
+          node = node.querySelector(selector || '[autofocus], [data-autofocus]') || node;
           node.focus({ preventScroll: true });
         });
       },
@@ -14634,7 +14634,7 @@
           this.__portal !== void 0 &&
           childHasFocus(this.__portal.$el, e.target) !== true
         ) {
-          this.focus();
+          this.focus('[tabindex]:not([tabindex="-1"])');
         }
       },
 
@@ -38888,18 +38888,18 @@
       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,