quasar 2.10.1 → 2.10.2

package/dist/quasar.css

@@ -2115,7 +2115,7 @@ body.q-ios-padding .q-dialog__inner > div {
 }
 .q-fab__actions--opened {
   opacity: 1;
-  transform: scale(1) translate(0, 0);
+  transform: scale(1) translate(0.1px, 0);
   pointer-events: all;
 }
 .q-fab--align-left > .q-fab__actions--up, .q-fab--align-left > .q-fab__actions--down {

package/dist/quasar.esm.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.
  */
@@ -1610,7 +1610,7 @@ function prepareApp (app, uiOpts, pluginOpts) {
 }
 
 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) {
@@ -5494,7 +5494,10 @@ var QMenu = createComponent({
           || evt.qClickOutside !== true
         )
       ) {
-        refocusTarget.focus();
+        ((evt && evt.type.indexOf('key') === 0
+          ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])')
+          : void 0
+        ) || refocusTarget).focus();
         refocusTarget = null;
       }
 
@@ -5753,7 +5756,6 @@ var QBtnDropdown = createComponent({
         '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)
       };
 
@@ -13717,7 +13719,9 @@ var QDate = createComponent({
     });
 
     watch(view, () => {
-      blurTargetRef.value !== null && blurTargetRef.value.focus();
+      if (blurTargetRef.value !== null && proxy.$el.contains(document.activeElement) === true) {
+        blurTargetRef.value.focus();
+      }
     });
 
     watch(() => viewModel.value.year, year => {
@@ -14912,7 +14916,10 @@ var QDialog = createComponent({
       hidePortal();
 
       if (refocusTarget !== null) {
-        refocusTarget.focus();
+        ((evt && evt.type.indexOf('key') === 0
+          ? refocusTarget.closest('[tabindex]:not([tabindex^="-"])')
+          : void 0
+        ) || refocusTarget).focus();
         refocusTarget = null;
       }
 
@@ -14941,9 +14948,9 @@ var QDialog = createComponent({
       });
     }
 
-    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();
@@ -17882,7 +17889,6 @@ var QExpansionItem = createComponent({
       return {
         role: 'button',
         'aria-expanded': showing.value === true ? 'true' : 'false',
-        'aria-owns': targetUid,
         'aria-controls': targetUid,
         'aria-label': toggleAriaLabel
       }
@@ -18263,13 +18269,11 @@ var QFab = createComponent({
 
     const actionAttrs = 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';
       }
 
@@ -18338,7 +18342,6 @@ var QFab = createComponent({
         'aria-expanded': showing.value === true ? 'true' : 'false',
         'aria-haspopup': 'true',
         'aria-controls': targetUid,
-        'aria-owns': targetUid,
         onClick: toggle
       }, getTriggerContent),
 
@@ -20523,7 +20526,7 @@ var QImg = createComponent({
 
     const images = [
       ref(null),
-      ref(props.placeholderSrc !== void 0 ? { src: props.placeholderSrc } : null)
+      ref(getPlaceholderSrc())
     ];
 
     const position = ref(0);
@@ -20563,18 +20566,24 @@ var QImg = createComponent({
         : 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;
     }
 
@@ -20609,7 +20618,7 @@ var QImg = createComponent({
       // 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;
@@ -20620,19 +20629,11 @@ var QImg = createComponent({
       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 h(
-        'div',
-        { class: 'q-img__container absolute-full', key },
-        child
-      )
-    }
-
     function getImage (index) {
       const img = images[ index ].value;
 
@@ -20660,7 +20661,11 @@ var QImg = createComponent({
         data.class += ' q-img__image--loaded';
       }
 
-      return getContainer('img' + index, h('img', data))
+      return h(
+        'div',
+        { class: 'q-img__container absolute-full', key: 'img' + index },
+        h('img', data)
+      )
     }
 
     function getContent () {
@@ -20691,7 +20696,7 @@ var QImg = createComponent({
     }
 
     {
-      if (__QUASAR_SSR_CLIENT__ && isRuntimeSsrPreHydration.value === true) {
+      if (__QUASAR_SSR_CLIENT__) {
         onMounted(() => {
           addImage(getCurrentSrc());
         });
@@ -21456,6 +21461,8 @@ function useMask (props, emit, emitValue, inputRef) {
   };
 
   function onMaskedKeydown (e) {
+    emit('keydown', e);
+
     if (shouldIgnoreKey(e) === true) {
       return
     }
@@ -21635,7 +21642,8 @@ var QInput = createComponent({
 
   emits: [
     ...useFieldEmits,
-    'paste', 'change'
+    'paste', 'change',
+    'keydown', 'animationend'
   ],
 
   setup (props, { emit, attrs }) {
@@ -21693,7 +21701,7 @@ var QInput = createComponent({
       }
 
       if (props.autogrow === true) {
-        evt.onAnimationend = adjustHeight;
+        evt.onAnimationend = onAnimationend;
       }
 
       return evt
@@ -21848,6 +21856,11 @@ var QInput = createComponent({
       props.autogrow === true && adjustHeight();
     }
 
+    function onAnimationend (e) {
+      emit('animationend', e);
+      adjustHeight();
+    }
+
     function emitValue (val, stopWatcher) {
       emitValueFn = () => {
         if (
@@ -22235,7 +22248,7 @@ var QList = createComponent({
       + (props.padding === true ? ' q-list--padding' : '')
     );
 
-    return () => h(props.tag, { class: classes.value, role: 'list' }, hSlot(slots.default))
+    return () => h(props.tag, { class: classes.value }, hSlot(slots.default))
   }
 });
 
@@ -24587,6 +24600,11 @@ var QPopupProxy = createComponent({
       toggle (evt) { popupRef.value.toggle(evt); }
     });
 
+    injectProp(proxy, 'currentComponent', () => ({
+      type: type.value,
+      ref: popupRef.value
+    }));
+
     return () => {
       const data = {
         ref: popupRef,
@@ -27046,6 +27064,11 @@ var QSelect = createComponent({
         .join(', ')
     );
 
+    const ariaCurrentValue = computed(() => (props.displayValue !== void 0
+      ? props.displayValue
+      : selectedString.value
+    ));
+
     const needsHtmlFn = computed(() => (
       props.optionsHtml === true
         ? () => true
@@ -27063,22 +27086,15 @@ var QSelect = createComponent({
 
     const tabindex = computed(() => (state.focused.value === true ? props.tabindex : -1));
 
-    const comboboxAttrs = 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 = computed(() => {
+    const comboboxAttrs = 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) {
@@ -27088,6 +27104,12 @@ var QSelect = createComponent({
       return attrs
     });
 
+    const listboxAttrs = computed(() => ({
+      id: `${ state.targetUid.value }_lb`,
+      role: 'listbox',
+      'aria-multiselectable': props.multiple === true ? 'true' : 'false'
+    }));
+
     const selectedScope = computed(() => {
       return innerValue.value.map((opt, i) => ({
         index: i,
@@ -27583,7 +27605,9 @@ var QSelect = createComponent({
         && 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);
@@ -27730,9 +27754,7 @@ var QSelect = createComponent({
 
       return [
         h('span', {
-          [ valueAsHtml.value === true ? 'innerHTML' : 'textContent' ]: props.displayValue !== void 0
-            ? props.displayValue
-            : selectedString.value
+          [ valueAsHtml.value === true ? 'innerHTML' : 'textContent' ]: ariaCurrentValue.value
         })
       ]
     }
@@ -27787,7 +27809,7 @@ var QSelect = createComponent({
         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
@@ -28287,8 +28309,9 @@ var QSelect = createComponent({
               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,
@@ -40296,7 +40319,7 @@ function runSequentialPromises (
  */
 
 const Quasar = {
-  version: '2.10.1',
+  version: '2.10.2',
   install: installQuasar,
   lang: Plugin$8,
   iconSet: Plugin$7