quasar 2.9.2 → 2.10.0

package/dist/quasar.esm.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.9.2
+ * Quasar Framework v2.10.0
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -1396,6 +1396,8 @@ const formKey = '_q_fo_';
 const tabsKey = '_q_tabs_';
 const uploaderKey = '_q_u_';
 
+const emptyRenderFn = () => {};
+
 const globalConfig = {};
 let globalConfigIsFrozen = false;
 
@@ -1608,7 +1610,7 @@ function prepareApp (app, uiOpts, pluginOpts) {
 }
 
 var installQuasar = function (parentApp, opts = {}) {
-    const $q = { version: '2.9.2' };
+    const $q = { version: '2.10.0' };
 
     if (globalConfigIsFrozen === false) {
       if (opts.config !== void 0) {
@@ -2367,7 +2369,7 @@ var QBadge = createComponent({
     return () => h('div', {
       class: classes.value,
       style: style.value,
-      role: 'alert',
+      role: 'status',
       'aria-label': props.label
     }, hMergeSlot(slots.default, props.label !== void 0 ? [ props.label ] : []))
   }
@@ -3298,7 +3300,7 @@ var Ripple = createDirective({
     }
 );
 
-const padding = {
+const btnPadding = {
   none: 0,
   xs: 4,
   sm: 8,
@@ -3318,6 +3320,21 @@ const defaultSizes$2 = {
 const formTypes = [ 'button', 'submit', 'reset' ];
 const mediaTypeRE = /[^\s]\/[^\s]/;
 
+const btnDesignOptions = [ 'flat', 'outline', 'push', 'unelevated' ];
+const getBtnDesign = (props, defaultValue) => {
+  if (props.flat === true) return 'flat'
+  if (props.outline === true) return 'outline'
+  if (props.push === true) return 'push'
+  if (props.unelevated === true) return 'unelevated'
+  return defaultValue
+};
+const getBtnDesignAttr = props => {
+  const design = getBtnDesign(props);
+  return design !== void 0
+    ? { [ design ]: true }
+    : {}
+};
+
 const useBtnProps = {
   ...useSizeProps,
   ...useRouterLinkProps,
@@ -3331,13 +3348,14 @@ const useBtnProps = {
   icon: String,
   iconRight: String,
 
-  round: Boolean,
+  ...btnDesignOptions.reduce(
+    (acc, val) => (acc[ val ] = Boolean) && acc,
+    {}
+  ),
+
   square: Boolean,
-  outline: Boolean,
-  flat: Boolean,
-  unelevated: Boolean,
+  round: Boolean,
   rounded: Boolean,
-  push: Boolean,
   glossy: Boolean,
 
   size: String,
@@ -3387,7 +3405,7 @@ function useBtn (props) {
       ? Object.assign({}, obj, {
         padding: props.padding
           .split(/\s+/)
-          .map(v => (v in padding ? padding[ v ] + 'px' : v))
+          .map(v => (v in btnPadding ? btnPadding[ v ] + 'px' : v))
           .join(' '),
         minWidth: '0',
         minHeight: '0'
@@ -3407,13 +3425,7 @@ function useBtn (props) {
     isActionable.value === true ? props.tabindex || 0 : -1
   ));
 
-  const design = computed(() => {
-    if (props.flat === true) return 'flat'
-    if (props.outline === true) return 'outline'
-    if (props.push === true) return 'push'
-    if (props.unelevated === true) return 'unelevated'
-    return 'standard'
-  });
+  const design = computed(() => getBtnDesign(props, 'standard'));
 
   const attributes = computed(() => {
     const acc = { tabindex: tabIndex.value };
@@ -5665,11 +5677,32 @@ function uid$3 () {
     + hexBytes[ b[ 14 ] ] + hexBytes[ b[ 15 ] ]
 }
 
+const btnPropsList = Object.keys(useBtnProps);
+
+// let's not duplicate type checking and prop validations
+// so just specify the props here with no type description
+const btnProps = btnPropsList.reduce(
+  (acc, key) => (acc[ key ] = {}) && acc,
+  {}
+);
+
+const passBtnProps = props => btnPropsList.reduce(
+  (acc, key) => {
+    const val = props[ key ];
+    if (val !== void 0) {
+      acc[ key ] = val;
+    }
+    return acc
+  },
+  {}
+);
+
 var QBtnDropdown = createComponent({
   name: 'QBtnDropdown',
 
   props: {
-    ...useBtnProps,
+    ...btnProps,
+    ...useTransitionProps,
 
     modelValue: Boolean,
     split: Boolean,
@@ -5710,7 +5743,7 @@ var QBtnDropdown = createComponent({
     const menuRef = ref(null);
     const targetUid = uid$3();
 
-    const attributes = computed(() => {
+    const ariaAttrs = computed(() => {
       const acc = {
         'aria-expanded': showing.value === true ? 'true' : 'false',
         'aria-haspopup': 'true',
@@ -5738,6 +5771,9 @@ var QBtnDropdown = createComponent({
       + (props.split === false ? ' q-btn-dropdown__arrow-container' : '')
     );
 
+    const btnDesignAttr = computed(() => getBtnDesignAttr(props));
+    const btnProps = computed(() => passBtnProps(props));
+
     watch(() => props.modelValue, val => {
       menuRef.value !== null && menuRef.value[ val ? 'show' : 'hide' ]();
     });
@@ -5818,6 +5854,9 @@ var QBtnDropdown = createComponent({
           self: props.menuSelf,
           offset: props.menuOffset,
           separateClosePopup: true,
+          transitionShow: props.transitionShow,
+          transitionHide: props.transitionHide,
+          transitionDuration: props.transitionDuration,
           onBeforeShow,
           onShow,
           onBeforeHide,
@@ -5828,11 +5867,11 @@ var QBtnDropdown = createComponent({
       if (props.split === false) {
         return h(QBtn, {
           class: 'q-btn-dropdown q-btn-dropdown--simple',
-          ...props,
+          ...btnProps.value,
+          ...ariaAttrs.value,
           disable: props.disable === true || props.disableMainBtn === true,
           noWrap: true,
           round: false,
-          ...attributes.value,
           onClick
         }, {
           default: () => hSlot(slots.label, []).concat(Arrow),
@@ -5842,21 +5881,17 @@ var QBtnDropdown = createComponent({
 
       return h(QBtnGroup, {
         class: 'q-btn-dropdown q-btn-dropdown--split no-wrap q-btn-item',
-        outline: props.outline,
-        flat: props.flat,
         rounded: props.rounded,
         square: props.square,
-        push: props.push,
-        unelevated: props.unelevated,
+        ...btnDesignAttr.value,
         glossy: props.glossy,
         stretch: props.stretch
       }, () => [
         h(QBtn, {
           class: 'q-btn-dropdown--current',
-          ...props,
+          ...btnProps.value,
           disable: props.disable === true || props.disableMainBtn === true,
           noWrap: true,
-          iconRight: props.iconRight,
           round: false,
           onClick: onClickHide
         }, {
@@ -5866,16 +5901,15 @@ var QBtnDropdown = createComponent({
 
         h(QBtn, {
           class: 'q-btn-dropdown__arrow-container q-anchor--skip',
-          ...attributes.value,
+          ...ariaAttrs.value,
+          ...btnDesignAttr.value,
           disable: props.disable === true || props.disableDropdown === true,
-          outline: props.outline,
-          flat: props.flat,
           rounded: props.rounded,
-          push: props.push,
-          size: props.size,
           color: props.color,
           textColor: props.textColor,
           dense: props.dense,
+          size: props.size,
+          padding: props.padding,
           ripple: props.ripple
         }, () => Arrow)
       ])
@@ -5982,6 +6016,14 @@ var QBtnToggle = createComponent({
 
     const injectFormInput = useFormInject(formAttrs);
 
+    const btnDesignAttr = computed(() => getBtnDesignAttr(props));
+
+    const btnOptionDesign = computed(() => ({
+      rounded: props.rounded,
+      dense: props.dense,
+      ...btnDesignAttr.value
+    }));
+
     const btnOptions = computed(() => props.options.map((item, i) => {
       const { attrs, value, slot, ...opt } = item;
 
@@ -5989,19 +6031,11 @@ var QBtnToggle = createComponent({
         slot,
         props: {
           key: i,
-          onClick (e) { set(value, item, e); },
 
           'aria-pressed': value === props.modelValue ? 'true' : 'false',
-
           ...attrs,
           ...opt,
-
-          outline: props.outline,
-          flat: props.flat,
-          rounded: props.rounded,
-          push: props.push,
-          unelevated: props.unelevated,
-          dense: props.dense,
+          ...btnOptionDesign.value,
 
           disable: props.disable === true || opt.disable === true,
 
@@ -6019,7 +6053,9 @@ var QBtnToggle = createComponent({
           padding: mergeOpt(opt, 'padding'),
           ripple: mergeOpt(opt, 'ripple'),
           stack: mergeOpt(opt, 'stack') === true,
-          stretch: mergeOpt(opt, 'stretch') === true
+          stretch: mergeOpt(opt, 'stretch') === true,
+
+          onClick (e) { set(value, item, e); }
         }
       }
     }));
@@ -6058,12 +6094,9 @@ var QBtnToggle = createComponent({
 
     return () => h(QBtnGroup, {
       class: 'q-btn-toggle',
-      outline: props.outline,
-      flat: props.flat,
+      ...btnDesignAttr.value,
       rounded: props.rounded,
-      push: props.push,
       stretch: props.stretch,
-      unelevated: props.unelevated,
       glossy: props.glossy,
       spread: props.spread
     }, getContent)
@@ -7504,7 +7537,7 @@ function useCheckbox (type, getInner) {
   const attributes = computed(() => {
     const attrs = {
       tabindex: tabindex.value,
-      role: 'checkbox',
+      role: type === 'toggle' ? 'switch' : 'checkbox',
       'aria-label': props.label,
       'aria-checked': isIndeterminate.value === true
         ? 'mixed'
@@ -7769,16 +7802,19 @@ var QChip = createComponent({
         + (isDark.value === true ? ' q-chip--dark q-dark' : '')
     });
 
-    const attributes = computed(() => (
-      props.disable === true
+    const attributes = computed(() => {
+      const chip = props.disable === true
         ? { tabindex: -1, 'aria-disabled': 'true' }
-        : {
-            tabindex: props.tabindex || 0,
-            role: 'button',
-            'aria-hidden': 'false',
-            'aria-label': props.removeAriaLabel || $q.lang.label.remove
-          }
-    ));
+        : { tabindex: props.tabindex || 0 };
+      const remove = {
+        ...chip,
+        role: 'button',
+        'aria-hidden': 'false',
+        'aria-label': props.removeAriaLabel || $q.lang.label.remove
+      };
+
+      return { chip, remove }
+    });
 
     function onKeyup (e) {
       e.keyCode === 13 /* ENTER */ && onClick(e);
@@ -7836,7 +7872,7 @@ var QChip = createComponent({
         h(QIcon, {
           class: 'q-chip__icon q-chip__icon--remove cursor-pointer',
           name: removeIcon.value,
-          ...attributes.value,
+          ...attributes.value.remove,
           onClick: onRemove,
           onKeyup: onRemove
         })
@@ -7855,7 +7891,7 @@ var QChip = createComponent({
 
       isClickable.value === true && Object.assign(
         data,
-        attributes.value,
+        attributes.value.chip,
         { onClick, onKeyup }
       );
 
@@ -9339,17 +9375,21 @@ var QResizeObserver = createComponent({
     if (hasObserver === true) {
       let observer;
 
-      onMounted(() => {
-        nextTick(() => {
-          targetEl = proxy.$el.parentNode;
+      // initialize as soon as possible
+      const init = stop => {
+        targetEl = proxy.$el.parentNode;
 
-          if (targetEl) {
-            observer = new ResizeObserver(trigger);
-            observer.observe(targetEl);
-            emitEvent();
-          }
-        });
-      });
+        if (targetEl) {
+          observer = new ResizeObserver(trigger);
+          observer.observe(targetEl);
+          emitEvent();
+        }
+        else if (stop !== true) {
+          nextTick(() => { init(true); });
+        }
+      };
+
+      onMounted(() => { init(); });
 
       onBeforeUnmount(() => {
         clearTimeout(timer);
@@ -10033,13 +10073,6 @@ var QTabs = createComponent({
       }
     }
 
-    /*
-     * Vue has an aggressive diff (in-place replacement) so we cannot
-     * ensure that the instance getting destroyed is the actual tab
-     * reported here. As a result, we cannot use its name or check
-     * if it's a route one to make the necessary updates. We need to
-     * always check the existing list again and infer the changes.
-     */
     function unregisterTab (tabData) {
       tabDataList.splice(tabDataList.indexOf(tabData), 1);
       tabDataListLen.value--;
@@ -10171,9 +10204,11 @@ const useTabProps = {
 };
 
 function useTab (props, slots, emit, routeData) {
-  const $tabs = inject(tabsKey, () => {
+  const $tabs = inject(tabsKey, emptyRenderFn);
+  if ($tabs === emptyRenderFn) {
     console.error('QTab/QRouteTab component needs to be child of QTabs');
-  });
+    return emptyRenderFn
+  }
 
   const { proxy } = getCurrentInstance();
 
@@ -10449,7 +10484,7 @@ var QTabPanel = createComponent({
   props: usePanelChildProps,
 
   setup (_, { slots }) {
-    return () => h('div', { class: 'q-tab-panel' }, hSlot(slots.default))
+    return () => h('div', { class: 'q-tab-panel', role: 'tabpanel' }, hSlot(slots.default))
   }
 });
 
@@ -15029,7 +15064,8 @@ var QDialog = createComponent({
 
     function renderPortalContent () {
       return h('div', {
-        'aria-modal': 'true',
+        role: 'dialog',
+        'aria-modal': useBackdrop.value === true ? 'true' : 'false',
         ...attrs,
         class: rootClasses.value
       }, [
@@ -15133,9 +15169,11 @@ var QDrawer = createComponent({
     const { preventBodyScroll } = usePreventScroll();
     const { registerTimeout, removeTimeout } = useTimeout();
 
-    const $layout = inject(layoutKey, () => {
+    const $layout = inject(layoutKey, emptyRenderFn);
+    if ($layout === emptyRenderFn) {
       console.error('QDrawer needs to be child of QLayout');
-    });
+      return emptyRenderFn
+    }
 
     let lastDesktopState, timerMini, layoutTotalWidthWatcher;
 
@@ -16387,7 +16425,7 @@ var QTooltip = createComponent({
             attrs.style,
             transitionStyle.value
           ],
-          role: 'complementary'
+          role: 'tooltip'
         }, hSlot(slots.default))
         : null
     }
@@ -16536,6 +16574,7 @@ var QItem = createComponent({
         ref: rootRef,
         class: classes.value,
         style: style.value,
+        role: 'listitem',
         onClick,
         onKeyup
       };
@@ -19440,7 +19479,14 @@ function useFile ({
 
   function onDragleave (e) {
     stopAndPrevent(e);
-    e.relatedTarget !== dndRef.value && (dnd.value = false);
+
+    // Safari bug: relatedTarget is null for over 10 years
+    // https://bugs.webkit.org/show_bug.cgi?id=66547
+    const gone = e.relatedTarget !== null || client.is.safari !== true
+      ? e.relatedTarget !== dndRef.value
+      : document.elementsFromPoint(e.clientX, e.clientY).includes(dndRef.value) === false;
+
+    gone === true && (dnd.value = false);
   }
 
   function onDrop (e) {
@@ -19474,6 +19520,7 @@ function useFile ({
     pickFiles,
     addFiles,
     onDragover,
+    onDragleave,
     processFiles,
     getDndNode,
 
@@ -19827,9 +19874,11 @@ var QFooter = createComponent({
   setup (props, { slots, emit }) {
     const { proxy: { $q } } = getCurrentInstance();
 
-    const $layout = inject(layoutKey, () => {
+    const $layout = inject(layoutKey, emptyRenderFn);
+    if ($layout === emptyRenderFn) {
       console.error('QFooter needs to be child of QLayout');
-    });
+      return emptyRenderFn
+    }
 
     const size = ref(parseInt(props.heightHint, 10));
     const revealed = ref(true);
@@ -20247,9 +20296,11 @@ var QHeader = createComponent({
   setup (props, { slots, emit }) {
     const { proxy: { $q } } = getCurrentInstance();
 
-    const $layout = inject(layoutKey, () => {
+    const $layout = inject(layoutKey, emptyRenderFn);
+    if ($layout === emptyRenderFn) {
       console.error('QHeader needs to be child of QLayout');
-    });
+      return emptyRenderFn
+    }
 
     const size = ref(parseInt(props.heightHint, 10));
     const revealed = ref(true);
@@ -21158,7 +21209,7 @@ function useMask (props, emit, emitValue, inputRef) {
         '^'
         + unmask.join('')
         + '(' + (unmaskChar === '' ? '.' : '[^' + unmaskChar + ']') + '+)?'
-        + '[' + unmaskChar + ']*$'
+        + (unmaskChar === '' ? '' : '[' + unmaskChar + ']*') + '$'
       ),
       extractLast = extract.length - 1,
       extractMatcher = extract.map((re, index) => {
@@ -22184,7 +22235,7 @@ var QList = createComponent({
       + (props.padding === true ? ' q-list--padding' : '')
     );
 
-    return () => h('div', { class: classes.value }, hSlot(slots.default))
+    return () => h('div', { class: classes.value, role: 'list' }, hSlot(slots.default))
   }
 });
 
@@ -23225,7 +23276,7 @@ var QOptionGroup = createComponent({
     );
 
     const attrs = computed(() => {
-      const attrs = {};
+      const attrs = { role: 'group' };
 
       if (props.type === 'radio') {
         attrs.role = 'radiogroup';
@@ -23290,10 +23341,17 @@ var QPage = createComponent({
   setup (props, { slots }) {
     const { proxy: { $q } } = getCurrentInstance();
 
-    const $layout = inject(layoutKey);
-    inject(pageContainerKey, () => {
+    const $layout = inject(layoutKey, emptyRenderFn);
+    if ($layout === emptyRenderFn) {
+      console.error('QPage needs to be a deep child of QLayout');
+      return emptyRenderFn
+    }
+
+    const $pageContainer = inject(pageContainerKey, emptyRenderFn);
+    if ($pageContainer === emptyRenderFn) {
       console.error('QPage needs to be child of QPageContainer');
-    });
+      return emptyRenderFn
+    }
 
     const style = computed(() => {
       const offset
@@ -23336,9 +23394,11 @@ var QPageContainer = createComponent({
   setup (_, { slots }) {
     const { proxy: { $q } } = getCurrentInstance();
 
-    const $layout = inject(layoutKey, () => {
+    const $layout = inject(layoutKey, emptyRenderFn);
+    if ($layout === emptyRenderFn) {
       console.error('QPageContainer needs to be child of QLayout');
-    });
+      return emptyRenderFn
+    }
 
     provide(pageContainerKey, true);
 
@@ -23388,9 +23448,11 @@ const usePageStickyProps = {
 function usePageSticky () {
   const { props, proxy: { $q } } = getCurrentInstance();
 
-  const $layout = inject(layoutKey, () => {
+  const $layout = inject(layoutKey, emptyRenderFn);
+  if ($layout === emptyRenderFn) {
     console.error('QPageSticky needs to be child of QLayout');
-  });
+    return emptyRenderFn
+  }
 
   const attach = computed(() => {
     const pos = props.position;
@@ -23603,6 +23665,12 @@ var QPageSticky = createComponent({
   }
 });
 
+function getBool (val, otherwise) {
+  return [ true, false ].includes(val)
+    ? val
+    : otherwise
+}
+
 var QPagination = createComponent({
   name: 'QPagination',
 
@@ -23614,22 +23682,20 @@ var QPagination = createComponent({
       required: true
     },
     min: {
-      type: Number,
+      type: [ Number, String ],
       default: 1
     },
     max: {
-      type: Number,
+      type: [ Number, String ],
       required: true
     },
-
-    color: {
-      type: String,
-      default: 'primary'
+    maxPages: {
+      type: [ Number, String ],
+      default: 0,
+      validator: v => (
+        (typeof v === 'string' ? parseInt(v, 10) : v) >= 0
+      )
     },
-    textColor: String,
-
-    activeColor: String,
-    activeTextColor: String,
 
     inputStyle: [ Array, String, Object ],
     inputClass: [ Array, String, Object ],
@@ -23663,11 +23729,6 @@ var QPagination = createComponent({
       type: Boolean,
       default: null
     },
-    maxPages: {
-      type: Number,
-      default: 0,
-      validator: v => v >= 0
-    },
 
     ripple: {
       type: [ Boolean, Object ],
@@ -23683,7 +23744,21 @@ var QPagination = createComponent({
     push: Boolean,
     glossy: Boolean,
 
-    dense: Boolean,
+    color: {
+      type: String,
+      default: 'primary'
+    },
+    textColor: String,
+
+    activeDesign: {
+      type: String,
+      default: '',
+      values: v => v === '' || btnDesignOptions.includes(v)
+    },
+    activeColor: String,
+    activeTextColor: String,
+
+    gutter: String,
     padding: {
       type: String,
       default: '3px 2px'
@@ -23698,6 +23773,16 @@ var QPagination = createComponent({
 
     const isDark = useDark(props, $q);
 
+    const minProp = computed(() => parseInt(props.min, 10));
+    const maxProp = computed(() => parseInt(props.max, 10));
+    const maxPagesProp = computed(() => parseInt(props.maxPages, 10));
+
+    const inputPlaceholder = computed(() => model.value + ' / ' + maxProp.value);
+    const boundaryLinksProp = computed(() => getBool(props.boundaryLinks, props.input));
+    const boundaryNumbersProp = computed(() => getBool(props.boundaryNumbers, !props.input));
+    const directionLinksProp = computed(() => getBool(props.directionLinks, props.input));
+    const ellipsesProp = computed(() => getBool(props.ellipses, !props.input));
+
     const newPage = ref(null);
     const model = computed({
       get: () => props.modelValue,
@@ -23706,32 +23791,33 @@ var QPagination = createComponent({
         if (props.disable || isNaN(val)) {
           return
         }
-        const value = between(val, props.min, props.max);
+        const value = between(val, minProp.value, maxProp.value);
         if (props.modelValue !== value) {
           emit('update:modelValue', value);
         }
       }
     });
 
-    watch(() => props.min + props.max, () => {
+    watch(() => `${ minProp.value }|${ maxProp.value }`, () => {
       model.value = props.modelValue;
     });
 
-    function getBool (val, otherwise) {
-      return [ true, false ].includes(val)
-        ? val
-        : otherwise
-    }
-
     const classes = computed(() =>
       'q-pagination row no-wrap items-center'
       + (props.disable === true ? ' disabled' : '')
     );
-    const inputPlaceholder = computed(() => model.value + ' / ' + props.max);
-    const __boundaryLinks = computed(() => getBool(props.boundaryLinks, props.input));
-    const __boundaryNumbers = computed(() => getBool(props.boundaryNumbers, !props.input));
-    const __directionLinks = computed(() => getBool(props.directionLinks, props.input));
-    const __ellipses = computed(() => getBool(props.ellipses, !props.input));
+
+    const gutterProp = computed(() => (
+      props.gutter in btnPadding
+        ? `${ btnPadding[ props.gutter ] }px`
+        : props.gutter || null
+    ));
+    const gutterStyle = computed(() => (
+      gutterProp.value !== null
+        ? `--q-pagination-gutter-parent:-${ gutterProp.value };--q-pagination-gutter-child:${ gutterProp.value }`
+        : null
+    ));
+
     const icons = computed(() => {
       const ico = [
         props.iconFirst || $q.iconSet.pagination.first,
@@ -23742,38 +23828,90 @@ var QPagination = createComponent({
       return $q.lang.rtl === true ? ico.reverse() : ico
     });
 
-    const attrs = computed(() => (
-      props.disable === true
-        ? { 'aria-disabled': 'true' }
-        : {}
-    ));
+    const attrs = computed(() => ({
+      'aria-disabled': props.disable === true ? 'true' : 'false',
+      role: 'navigation'
+    }));
 
+    const btnDesignProp = computed(() => getBtnDesign(props, 'flat'));
     const btnProps = computed(() => ({
+      [ btnDesignProp.value ]: true,
+
       round: props.round,
       rounded: props.rounded,
 
-      outline: props.outline,
-      unelevated: props.unelevated,
-      push: props.push,
-      glossy: props.glossy,
-
-      dense: props.dense,
       padding: props.padding,
 
       color: props.color,
-      flat: true,
+      textColor: props.textColor,
+
       size: props.size,
       ripple: props.ripple !== null
         ? props.ripple
         : true
     }));
 
+    const btnActiveDesignProp = computed(() => {
+      // we also reset non-active design
+      const acc = { [ btnDesignProp.value ]: false };
+      if (props.activeDesign !== '') {
+        acc[ props.activeDesign ] = true;
+      }
+      return acc
+    });
     const activeBtnProps = computed(() => ({
-      flat: props.flat,
+      ...btnActiveDesignProp.value,
       color: props.activeColor || props.color,
       textColor: props.activeTextColor || props.textColor
     }));
 
+    const btnConfig = computed(() => {
+      let maxPages = Math.max(
+        maxPagesProp.value,
+        1 + (ellipsesProp.value ? 2 : 0) + (boundaryNumbersProp.value ? 2 : 0)
+      );
+
+      const acc = {
+        pgFrom: minProp.value,
+        pgTo: maxProp.value,
+        ellipsesStart: false,
+        ellipsesEnd: false,
+        boundaryStart: false,
+        boundaryEnd: false,
+        marginalStyle: {
+          minWidth: `${ Math.max(2, String(maxProp.value).length) }em`
+        }
+      };
+
+      if (maxPagesProp.value && maxPages < (maxProp.value - minProp.value + 1)) {
+        maxPages = 1 + Math.floor(maxPages / 2) * 2;
+        acc.pgFrom = Math.max(minProp.value, Math.min(maxProp.value - maxPages + 1, props.modelValue - Math.floor(maxPages / 2)));
+        acc.pgTo = Math.min(maxProp.value, acc.pgFrom + maxPages - 1);
+
+        if (boundaryNumbersProp.value) {
+          acc.boundaryStart = true;
+          acc.pgFrom++;
+        }
+
+        if (ellipsesProp.value && acc.pgFrom > (minProp.value + (boundaryNumbersProp.value ? 1 : 0))) {
+          acc.ellipsesStart = true;
+          acc.pgFrom++;
+        }
+
+        if (boundaryNumbersProp.value) {
+          acc.boundaryEnd = true;
+          acc.pgTo--;
+        }
+
+        if (ellipsesProp.value && acc.pgTo < (maxProp.value - (boundaryNumbersProp.value ? 1 : 0))) {
+          acc.ellipsesEnd = true;
+          acc.pgTo--;
+        }
+      }
+
+      return acc
+    });
+
     function set (value) {
       model.value = value;
     }
@@ -23782,20 +23920,40 @@ var QPagination = createComponent({
       model.value = model.value + offset;
     }
 
-    function updateModel () {
-      model.value = newPage.value;
-      newPage.value = null;
-    }
+    const inputEvents = computed(() => {
+      function updateModel () {
+        model.value = newPage.value;
+        newPage.value = null;
+      }
+
+      return {
+        'onUpdate:modelValue': val => { newPage.value = val; },
+        onKeyup: e => { isKeyCode(e, 13) === true && updateModel(); },
+        onBlur: updateModel
+      }
+    });
 
-    function getBtn (cfg, page) {
-      const data = { ...btnProps.value, ...cfg };
+    function getBtn (cfg, page, active) {
+      const data = {
+        'aria-label': page,
+        'aria-current': 'false',
+        ...btnProps.value,
+        ...cfg
+      };
+
+      if (active === true) {
+        Object.assign(data, {
+          'aria-current': 'true',
+          ...activeBtnProps.value
+        });
+      }
 
       if (page !== void 0) {
         if (props.toFn !== void 0) {
           data.to = props.toFn(page);
         }
         else {
-          data.onClick = () => set(page);
+          data.onClick = () => { set(page); };
         }
       }
 
@@ -23806,147 +23964,107 @@ var QPagination = createComponent({
     Object.assign(proxy, { set, setByOffset });
 
     return () => {
-      const
-        contentStart = [],
-        contentEnd = [],
-        contentMiddle = [];
+      const contentStart = [];
+      const contentEnd = [];
+      let contentMiddle;
+
+      if (boundaryLinksProp.value === true) {
+        contentStart.push(
+          getBtn({
+            key: 'bls',
+            disable: props.disable || props.modelValue <= minProp.value,
+            icon: icons.value[ 0 ]
+          }, minProp.value)
+        );
 
-      if (__boundaryLinks.value) {
-        contentStart.push(getBtn({
-          key: 'bls',
-          disable: props.disable || props.modelValue <= props.min,
-          icon: icons.value[ 0 ]
-        }, props.min));
-        contentEnd.unshift(getBtn({
-          key: 'ble',
-          disable: props.disable || props.modelValue >= props.max,
-          icon: icons.value[ 3 ]
-        }, props.max));
-      }
-
-      if (__directionLinks.value) {
-        contentStart.push(getBtn({
-          key: 'bdp',
-          disable: props.disable || props.modelValue <= props.min,
-          icon: icons.value[ 1 ]
-        }, props.modelValue - 1));
-        contentEnd.unshift(getBtn({
-          key: 'bdn',
-          disable: props.disable || props.modelValue >= props.max,
-          icon: icons.value[ 2 ]
-        }, props.modelValue + 1));
-      }
-
-      if (props.input === true) {
-        contentMiddle.push(h(QInput, {
-          class: 'inline',
-          style: {
-            width: `${ inputPlaceholder.value.length / 1.5 }em`
-          },
-          type: 'number',
-          dense: true,
-          value: newPage.value,
-          disable: props.disable,
-          dark: isDark.value,
-          borderless: true,
-          inputClass: props.inputClass,
-          inputStyle: props.inputStyle,
-          placeholder: inputPlaceholder.value,
-          min: props.min,
-          max: props.max,
-          'onUpdate:modelValue' (value) { newPage.value = value; },
-          onKeyup (e) { isKeyCode(e, 13) === true && updateModel(); },
-          onBlur: updateModel
-        }));
+        contentEnd.unshift(
+          getBtn({
+            key: 'ble',
+            disable: props.disable || props.modelValue >= maxProp.value,
+            icon: icons.value[ 3 ]
+          }, maxProp.value)
+        );
       }
-      else { // is type select
-        let
-          maxPages = Math.max(
-            props.maxPages,
-            1 + (__ellipses.value ? 2 : 0) + (__boundaryNumbers.value ? 2 : 0)
-          ),
-          pgFrom = props.min,
-          pgTo = props.max,
-          ellipsesStart = false,
-          ellipsesEnd = false,
-          boundaryStart = false,
-          boundaryEnd = false;
-
-        if (props.maxPages && maxPages < (props.max - props.min + 1)) {
-          maxPages = 1 + Math.floor(maxPages / 2) * 2;
-          pgFrom = Math.max(props.min, Math.min(props.max - maxPages + 1, props.modelValue - Math.floor(maxPages / 2)));
-          pgTo = Math.min(props.max, pgFrom + maxPages - 1);
-          if (__boundaryNumbers.value) {
-            boundaryStart = true;
-            pgFrom += 1;
-          }
-          if (__ellipses.value && pgFrom > (props.min + (__boundaryNumbers.value ? 1 : 0))) {
-            ellipsesStart = true;
-            pgFrom += 1;
-          }
-          if (__boundaryNumbers.value) {
-            boundaryEnd = true;
-            pgTo -= 1;
-          }
-          if (__ellipses.value && pgTo < (props.max - (__boundaryNumbers.value ? 1 : 0))) {
-            ellipsesEnd = true;
-            pgTo -= 1;
-          }
+
+      if (directionLinksProp.value === true) {
+        contentStart.push(
+          getBtn({
+            key: 'bdp',
+            disable: props.disable || props.modelValue <= minProp.value,
+            icon: icons.value[ 1 ]
+          }, props.modelValue - 1)
+        );
+
+        contentEnd.unshift(
+          getBtn({
+            key: 'bdn',
+            disable: props.disable || props.modelValue >= maxProp.value,
+            icon: icons.value[ 2 ]
+          }, props.modelValue + 1)
+        );
+      }
+
+      if (props.input !== true) { // has buttons instead of inputbox
+        contentMiddle = [];
+        const { pgFrom, pgTo, marginalStyle: style } = btnConfig.value;
+
+        if (btnConfig.value.boundaryStart === true) {
+          const active = minProp.value === props.modelValue;
+          contentStart.push(
+            getBtn({
+              key: 'bns',
+              style,
+              disable: props.disable,
+              label: minProp.value
+            }, minProp.value, active)
+          );
         }
-        const style = {
-          minWidth: `${ Math.max(2, String(props.max).length) }em`
-        };
-        if (boundaryStart) {
-          const active = props.min === props.modelValue;
-          contentStart.push(getBtn({
-            key: 'bns',
-            style,
-            disable: props.disable,
-            flat: !active,
-            label: props.min,
-            ...(active ? activeBtnProps.value : {})
-          }, props.min));
-        }
-        if (boundaryEnd) {
-          const active = props.max === props.modelValue;
-          contentEnd.unshift(getBtn({
-            key: 'bne',
-            style,
-            disable: props.disable,
-            flat: !active,
-            label: props.max,
-            ...(active ? activeBtnProps.value : {})
-          }, props.max));
-        }
-        if (ellipsesStart) {
-          contentStart.push(getBtn({
-            key: 'bes',
-            style,
-            disable: props.disable,
-            label: '…',
-            ripple: false
-          }, pgFrom - 1));
-        }
-        if (ellipsesEnd) {
-          contentEnd.unshift(getBtn({
-            key: 'bee',
-            style,
-            disable: props.disable,
-            label: '…',
-            ripple: false
-          }, pgTo + 1));
+
+        if (btnConfig.value.boundaryEnd === true) {
+          const active = maxProp.value === props.modelValue;
+          contentEnd.unshift(
+            getBtn({
+              key: 'bne',
+              style,
+              disable: props.disable,
+              label: maxProp.value
+            }, maxProp.value, active)
+          );
         }
+
+        if (btnConfig.value.ellipsesStart === true) {
+          contentStart.push(
+            getBtn({
+              key: 'bes',
+              style,
+              disable: props.disable,
+              label: '…',
+              ripple: false
+            }, pgFrom - 1)
+          );
+        }
+
+        if (btnConfig.value.ellipsesEnd === true) {
+          contentEnd.unshift(
+            getBtn({
+              key: 'bee',
+              style,
+              disable: props.disable,
+              label: '…',
+              ripple: false
+            }, pgTo + 1)
+          );
+        }
+
         for (let i = pgFrom; i <= pgTo; i++) {
-          const btn = {
-            key: `bpg${ i }`,
-            style,
-            disable: props.disable,
-            label: i
-          };
-          if (i === props.modelValue) {
-            Object.assign(btn, activeBtnProps.value);
-          }
-          contentMiddle.push(getBtn(btn, i));
+          contentMiddle.push(
+            getBtn({
+              key: `bpg${ i }`,
+              style,
+              disable: props.disable,
+              label: i
+            }, i, i === props.modelValue)
+          );
         }
       }
 
@@ -23954,15 +24072,35 @@ var QPagination = createComponent({
         class: classes.value,
         ...attrs.value
       }, [
-        contentStart,
-
         h('div', {
-          class: 'row justify-center'
+          class: 'q-pagination__content row no-wrap items-center',
+          style: gutterStyle.value
         }, [
-          contentMiddle
-        ]),
+          ...contentStart,
+
+          props.input === true
+            ? h(QInput, {
+              class: 'inline',
+              style: { width: `${ inputPlaceholder.value.length / 1.5 }em` },
+              type: 'number',
+              dense: true,
+              value: newPage.value,
+              disable: props.disable,
+              dark: isDark.value,
+              borderless: true,
+              inputClass: props.inputClass,
+              inputStyle: props.inputStyle,
+              placeholder: inputPlaceholder.value,
+              min: minProp.value,
+              max: maxProp.value,
+              ...inputEvents.value
+            })
+            : h('div', {
+              class: 'q-pagination__middle row justify-center'
+            }, contentMiddle),
 
-        contentEnd
+          ...contentEnd
+        ])
       ])
     }
   }
@@ -30881,9 +31019,11 @@ var QStep = createComponent({
   setup (props, { slots, emit }) {
     const { proxy: { $q } } = getCurrentInstance();
 
-    const $stepper = inject(stepperKey, () => {
-      console.error('QStep needs to be child of QStepper');
-    });
+    const $stepper = inject(stepperKey, emptyRenderFn);
+    if ($stepper === emptyRenderFn) {
+      console.error('QStep needs to be a child of QStepper');
+      return emptyRenderFn
+    }
 
     const { getCacheWithFn } = useCache();
 
@@ -30941,7 +31081,7 @@ var QStep = createComponent({
 
     return () => h(
       'div',
-      { ref: rootRef, class: 'q-stepper__step', ...scrollEvent.value },
+      { ref: rootRef, class: 'q-stepper__step', role: 'tabpanel', ...scrollEvent.value },
       $stepper.value.vertical === true
         ? [
             h(StepHeader, {
@@ -34006,9 +34146,11 @@ var QTimelineEntry = createComponent({
   },
 
   setup (props, { slots }) {
-    const $timeline = inject(timelineKey, () => {
+    const $timeline = inject(timelineKey, emptyRenderFn);
+    if ($timeline === emptyRenderFn) {
       console.error('QTimelineEntry needs to be child of QTimeline');
-    });
+      return emptyRenderFn
+    }
 
     const classes = computed(() =>
       `q-timeline__entry q-timeline__entry--${ props.side }`
@@ -34097,7 +34239,7 @@ var QToolbar = createComponent({
       + (props.inset === true ? ' q-toolbar--inset' : '')
     );
 
-    return () => h('div', { class: classes.value }, hSlot(slots.default))
+    return () => h('div', { class: classes.value, role: 'toolbar' }, hSlot(slots.default))
   }
 });
 
@@ -35585,9 +35727,13 @@ var QUploaderAddTrigger = createComponent({
   name: 'QUploaderAddTrigger',
 
   setup () {
-    return inject(uploaderKey, () => {
+    const $trigger = inject(uploaderKey, emptyRenderFn);
+
+    if ($trigger === emptyRenderFn) {
       console.error('QUploaderAddTrigger needs to be child of QUploader');
-    })
+    }
+
+    return $trigger
   }
 });
 
@@ -37765,6 +37911,7 @@ var BottomSheet$1 = createComponent({
               action.class
             ],
             tabindex: 0,
+            role: 'listitem',
             onClick () { onOk(action); },
             onKeyup (e) { e.keyCode === 13 && onOk(action); }
           }, [
@@ -37840,9 +37987,12 @@ var BottomSheet$1 = createComponent({
       child.push(
         props.grid === true
           ? h('div', {
-            class: 'row items-stretch justify-start'
+            class: 'row items-stretch justify-start',
+            role: 'list'
           }, getGrid())
-          : h('div', getList())
+          : h('div', {
+            role: 'list'
+          }, getList())
       );
 
       return child
@@ -40138,7 +40288,7 @@ function runSequentialPromises (
  */
 
 const Quasar = {
-  version: '2.9.2',
+  version: '2.10.0',
   install: installQuasar,
   lang: Plugin$8,
   iconSet: Plugin$7