quasar 2.10.1 → 2.10.2

package/dist/quasar.sass

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.10.1
+ * Quasar Framework v2.10.2
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -2192,7 +2192,8 @@ body.q-ios-padding .q-dialog__inner
       margin-left: -28px
     &--opened
       opacity: 1
-      transform: scale(1) translate(0, 0)
+      
+      transform: scale(1) translate(0.1px, 0)
       pointer-events: all
   &--align-left
     > .q-fab__actions

package/dist/quasar.umd.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.10.1
+ * Quasar Framework v2.10.2
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -1612,7 +1612,7 @@
   }
 
   var installQuasar = function (parentApp, opts = {}) {
-      const $q = { version: '2.10.1' };
+      const $q = { version: '2.10.2' };
 
       if (globalConfigIsFrozen === false) {
         if (opts.config !== void 0) {
@@ -5496,7 +5496,10 @@
             || evt.qClickOutside !== true
           )
         ) {
-          refocusTarget.focus();
+          ((evt && evt.type.indexOf('key') === 0
+            ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])')
+            : void 0
+          ) || refocusTarget).focus();
           refocusTarget = null;
         }
 
@@ -5755,7 +5758,6 @@
           'aria-expanded': showing.value === true ? 'true' : 'false',
           'aria-haspopup': 'true',
           'aria-controls': targetUid,
-          'aria-owns': targetUid,
           'aria-label': props.toggleAriaLabel || proxy.$q.lang.label[ showing.value === true ? 'collapse' : 'expand' ](props.label)
         };
 
@@ -13719,7 +13721,9 @@
       });
 
       vue.watch(view, () => {
-        blurTargetRef.value !== null && blurTargetRef.value.focus();
+        if (blurTargetRef.value !== null && proxy.$el.contains(document.activeElement) === true) {
+          blurTargetRef.value.focus();
+        }
       });
 
       vue.watch(() => viewModel.value.year, year => {
@@ -14914,7 +14918,10 @@
         hidePortal();
 
         if (refocusTarget !== null) {
-          refocusTarget.focus();
+          ((evt && evt.type.indexOf('key') === 0
+            ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])')
+            : void 0
+          ) || refocusTarget).focus();
           refocusTarget = null;
         }
 
@@ -14943,9 +14950,9 @@
         });
       }
 
-      function shake (refocusTarget) {
-        if (refocusTarget && typeof refocusTarget.focus === 'function') {
-          refocusTarget.focus({ preventScroll: true });
+      function shake (focusTarget) {
+        if (focusTarget && typeof focusTarget.focus === 'function') {
+          focusTarget.focus({ preventScroll: true });
         }
         else {
           focus();
@@ -17884,7 +17891,6 @@
         return {
           role: 'button',
           'aria-expanded': showing.value === true ? 'true' : 'false',
-          'aria-owns': targetUid,
           'aria-controls': targetUid,
           'aria-label': toggleAriaLabel
         }
@@ -18265,13 +18271,11 @@
 
       const actionAttrs = vue.computed(() => {
         const attrs = {
-          id: targetUid
+          id: targetUid,
+          role: 'menu'
         };
 
-        if (showing.value === true) {
-          attrs.role = 'menu';
-        }
-        else {
+        if (showing.value !== true) {
           attrs[ 'aria-hidden' ] = 'true';
         }
 
@@ -18340,7 +18344,6 @@
           'aria-expanded': showing.value === true ? 'true' : 'false',
           'aria-haspopup': 'true',
           'aria-controls': targetUid,
-          'aria-owns': targetUid,
           onClick: toggle
         }, getTriggerContent),
 
@@ -20525,7 +20528,7 @@
 
       const images = [
         vue.ref(null),
-        vue.ref(props.placeholderSrc !== void 0 ? { src: props.placeholderSrc } : null)
+        vue.ref(getPlaceholderSrc())
       ];
 
       const position = vue.ref(0);
@@ -20565,18 +20568,24 @@
           : null
       }
 
+      function getPlaceholderSrc () {
+        return props.placeholderSrc !== void 0
+          ? { src: props.placeholderSrc }
+          : null
+      }
+
       function addImage (imgProps) {
         clearTimeout(loadTimer);
         hasError.value = false;
 
         if (imgProps === null) {
           isLoading.value = false;
-          images[ 0 ].value = null;
-          images[ 1 ].value = null;
-          return
+          images[ position.value ^ 1 ].value = getPlaceholderSrc();
+        }
+        else {
+          isLoading.value = true;
         }
 
-        isLoading.value = true;
         images[ position.value ].value = imgProps;
       }
 
@@ -20611,7 +20620,7 @@
         // if component has been already destroyed
         if (loadTimer === null) { return }
 
-        position.value = position.value === 1 ? 0 : 1;
+        position.value = position.value ^ 1;
         images[ position.value ].value = null;
         isLoading.value = false;
         hasError.value = false;
@@ -20622,19 +20631,11 @@
         clearTimeout(loadTimer);
         isLoading.value = false;
         hasError.value = true;
-        images[ 0 ].value = null;
-        images[ 1 ].value = null;
+        images[ position.value ].value = null;
+        images[ position.value ^ 1 ].value = getPlaceholderSrc();
         emit('error', err);
       }
 
-      function getContainer (key, child) {
-        return vue.h(
-          'div',
-          { class: 'q-img__container absolute-full', key },
-          child
-        )
-      }
-
       function getImage (index) {
         const img = images[ index ].value;
 
@@ -20662,7 +20663,11 @@
           data.class += ' q-img__image--loaded';
         }
 
-        return getContainer('img' + index, vue.h('img', data))
+        return vue.h(
+          'div',
+          { class: 'q-img__container absolute-full', key: 'img' + index },
+          vue.h('img', data)
+        )
       }
 
       function getContent () {
@@ -21453,6 +21458,8 @@
     };
 
     function onMaskedKeydown (e) {
+      emit('keydown', e);
+
       if (shouldIgnoreKey(e) === true) {
         return
       }
@@ -21632,7 +21639,8 @@
 
     emits: [
       ...useFieldEmits,
-      'paste', 'change'
+      'paste', 'change',
+      'keydown', 'animationend'
     ],
 
     setup (props, { emit, attrs }) {
@@ -21690,7 +21698,7 @@
         }
 
         if (props.autogrow === true) {
-          evt.onAnimationend = adjustHeight;
+          evt.onAnimationend = onAnimationend;
         }
 
         return evt
@@ -21845,6 +21853,11 @@
         props.autogrow === true && adjustHeight();
       }
 
+      function onAnimationend (e) {
+        emit('animationend', e);
+        adjustHeight();
+      }
+
       function emitValue (val, stopWatcher) {
         emitValueFn = () => {
           if (
@@ -22232,7 +22245,7 @@
         + (props.padding === true ? ' q-list--padding' : '')
       );
 
-      return () => vue.h(props.tag, { class: classes.value, role: 'list' }, hSlot(slots.default))
+      return () => vue.h(props.tag, { class: classes.value }, hSlot(slots.default))
     }
   });
 
@@ -24584,6 +24597,11 @@
         toggle (evt) { popupRef.value.toggle(evt); }
       });
 
+      injectProp(proxy, 'currentComponent', () => ({
+        type: type.value,
+        ref: popupRef.value
+      }));
+
       return () => {
         const data = {
           ref: popupRef,
@@ -27043,6 +27061,11 @@
           .join(', ')
       );
 
+      const ariaCurrentValue = vue.computed(() => (props.displayValue !== void 0
+        ? props.displayValue
+        : selectedString.value
+      ));
+
       const needsHtmlFn = vue.computed(() => (
         props.optionsHtml === true
           ? () => true
@@ -27060,22 +27083,15 @@
 
       const tabindex = vue.computed(() => (state.focused.value === true ? props.tabindex : -1));
 
-      const comboboxAttrs = vue.computed(() => ({
-        tabindex: props.tabindex,
-        role: 'combobox',
-        'aria-label': props.label,
-        'aria-readonly': props.readonly === true ? 'true' : 'false',
-        'aria-autocomplete': props.useInput === true ? 'list' : 'none',
-        'aria-expanded': menu.value === true ? 'true' : 'false',
-        'aria-owns': `${ state.targetUid.value }_lb`,
-        'aria-controls': `${ state.targetUid.value }_lb`
-      }));
-
-      const listboxAttrs = vue.computed(() => {
+      const comboboxAttrs = vue.computed(() => {
         const attrs = {
-          id: `${ state.targetUid.value }_lb`,
-          role: 'listbox',
-          'aria-multiselectable': props.multiple === true ? 'true' : 'false'
+          tabindex: props.tabindex,
+          role: 'combobox',
+          'aria-label': props.label,
+          'aria-readonly': props.readonly === true ? 'true' : 'false',
+          'aria-autocomplete': props.useInput === true ? 'list' : 'none',
+          'aria-expanded': menu.value === true ? 'true' : 'false',
+          'aria-controls': `${ state.targetUid.value }_lb`
         };
 
         if (optionIndex.value >= 0) {
@@ -27085,6 +27101,12 @@
         return attrs
       });
 
+      const listboxAttrs = vue.computed(() => ({
+        id: `${ state.targetUid.value }_lb`,
+        role: 'listbox',
+        'aria-multiselectable': props.multiple === true ? 'true' : 'false'
+      }));
+
       const selectedScope = vue.computed(() => {
         return innerValue.value.map((opt, i) => ({
           index: i,
@@ -27580,7 +27602,9 @@
           && props.useInput !== true
           && e.key !== void 0
           && e.key.length === 1 // printable char
-          && e.altKey === e.ctrlKey // not kbd shortcut
+          && e.altKey === false // not kbd shortcut
+          && e.ctrlKey === false // not kbd shortcut
+          && e.metaKey === false // not kbd shortcut, especially on macOS with Command key
           && (e.keyCode !== 32 || searchBuffer.length > 0) // space in middle of search
         ) {
           menu.value !== true && showPopup(e);
@@ -27727,9 +27751,7 @@
 
         return [
           vue.h('span', {
-            [ valueAsHtml.value === true ? 'innerHTML' : 'textContent' ]: props.displayValue !== void 0
-              ? props.displayValue
-              : selectedString.value
+            [ valueAsHtml.value === true ? 'innerHTML' : 'textContent' ]: ariaCurrentValue.value
           })
         ]
       }
@@ -27784,7 +27806,7 @@
           id: isTarget === true ? state.targetUid.value : void 0,
           maxlength: props.maxlength,
           autocomplete: props.autocomplete,
-          'data-autofocus': (fromDialog !== true && props.autofocus === true) || void 0,
+          'data-autofocus': fromDialog === true || props.autofocus === true || void 0,
           disabled: props.disable === true,
           readonly: props.readonly === true,
           ...inputControlEvents.value
@@ -28284,8 +28306,9 @@
                 key: 'd_t',
                 class: 'q-select__focus-target',
                 id: isTarget === true ? state.targetUid.value : void 0,
+                value: ariaCurrentValue.value,
                 readonly: true,
-                'data-autofocus': (fromDialog !== true && props.autofocus === true) || void 0,
+                'data-autofocus': fromDialog === true || props.autofocus === true || void 0,
                 ...attrs,
                 onKeydown: onTargetKeydown,
                 onKeyup: onTargetKeyup,
@@ -40483,7 +40506,7 @@
    */
 
   var index_umd = {
-    version: '2.10.1',
+    version: '2.10.2',
     install (app, opts) {
       installQuasar(app, {
         components,