quasar 2.9.2 → 2.10.0

package/dist/quasar.umd.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.
  */
@@ -1398,6 +1398,8 @@
   const tabsKey = '_q_tabs_';
   const uploaderKey = '_q_u_';
 
+  const emptyRenderFn = () => {};
+
   const globalConfig = {};
   let globalConfigIsFrozen = false;
 
@@ -1610,7 +1612,7 @@
   }
 
   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) {
@@ -2369,7 +2371,7 @@
       return () => vue.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 ] : []))
     }
@@ -3300,7 +3302,7 @@
       }
   );
 
-  const padding = {
+  const btnPadding = {
     none: 0,
     xs: 4,
     sm: 8,
@@ -3320,6 +3322,21 @@
   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,
@@ -3333,13 +3350,14 @@
     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,
@@ -3389,7 +3407,7 @@
         ? 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'
@@ -3409,13 +3427,7 @@
       isActionable.value === true ? props.tabindex || 0 : -1
     ));
 
-    const design = vue.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 = vue.computed(() => getBtnDesign(props, 'standard'));
 
     const attributes = vue.computed(() => {
       const acc = { tabindex: tabIndex.value };
@@ -5667,11 +5679,32 @@
       + 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,
@@ -5712,7 +5745,7 @@
       const menuRef = vue.ref(null);
       const targetUid = uid$3();
 
-      const attributes = vue.computed(() => {
+      const ariaAttrs = vue.computed(() => {
         const acc = {
           'aria-expanded': showing.value === true ? 'true' : 'false',
           'aria-haspopup': 'true',
@@ -5740,6 +5773,9 @@
         + (props.split === false ? ' q-btn-dropdown__arrow-container' : '')
       );
 
+      const btnDesignAttr = vue.computed(() => getBtnDesignAttr(props));
+      const btnProps = vue.computed(() => passBtnProps(props));
+
       vue.watch(() => props.modelValue, val => {
         menuRef.value !== null && menuRef.value[ val ? 'show' : 'hide' ]();
       });
@@ -5820,6 +5856,9 @@
             self: props.menuSelf,
             offset: props.menuOffset,
             separateClosePopup: true,
+            transitionShow: props.transitionShow,
+            transitionHide: props.transitionHide,
+            transitionDuration: props.transitionDuration,
             onBeforeShow,
             onShow,
             onBeforeHide,
@@ -5830,11 +5869,11 @@
         if (props.split === false) {
           return vue.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),
@@ -5844,21 +5883,17 @@
 
         return vue.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
         }, () => [
           vue.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
           }, {
@@ -5868,16 +5903,15 @@
 
           vue.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)
         ])
@@ -5984,6 +6018,14 @@
 
       const injectFormInput = useFormInject(formAttrs);
 
+      const btnDesignAttr = vue.computed(() => getBtnDesignAttr(props));
+
+      const btnOptionDesign = vue.computed(() => ({
+        rounded: props.rounded,
+        dense: props.dense,
+        ...btnDesignAttr.value
+      }));
+
       const btnOptions = vue.computed(() => props.options.map((item, i) => {
         const { attrs, value, slot, ...opt } = item;
 
@@ -5991,19 +6033,11 @@
           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,
 
@@ -6021,7 +6055,9 @@
             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); }
           }
         }
       }));
@@ -6060,12 +6096,9 @@
 
       return () => vue.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)
@@ -7506,7 +7539,7 @@
     const attributes = vue.computed(() => {
       const attrs = {
         tabindex: tabindex.value,
-        role: 'checkbox',
+        role: type === 'toggle' ? 'switch' : 'checkbox',
         'aria-label': props.label,
         'aria-checked': isIndeterminate.value === true
           ? 'mixed'
@@ -7771,16 +7804,19 @@
           + (isDark.value === true ? ' q-chip--dark q-dark' : '')
       });
 
-      const attributes = vue.computed(() => (
-        props.disable === true
+      const attributes = vue.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);
@@ -7838,7 +7874,7 @@
           vue.h(QIcon, {
             class: 'q-chip__icon q-chip__icon--remove cursor-pointer',
             name: removeIcon.value,
-            ...attributes.value,
+            ...attributes.value.remove,
             onClick: onRemove,
             onKeyup: onRemove
           })
@@ -7857,7 +7893,7 @@
 
         isClickable.value === true && Object.assign(
           data,
-          attributes.value,
+          attributes.value.chip,
           { onClick, onKeyup }
         );
 
@@ -9341,17 +9377,21 @@
       if (hasObserver === true) {
         let observer;
 
-        vue.onMounted(() => {
-          vue.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) {
+            vue.nextTick(() => { init(true); });
+          }
+        };
+
+        vue.onMounted(() => { init(); });
 
         vue.onBeforeUnmount(() => {
           clearTimeout(timer);
@@ -10035,13 +10075,6 @@
         }
       }
 
-      /*
-       * 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--;
@@ -10173,9 +10206,11 @@
   };
 
   function useTab (props, slots, emit, routeData) {
-    const $tabs = vue.inject(tabsKey, () => {
+    const $tabs = vue.inject(tabsKey, emptyRenderFn);
+    if ($tabs === emptyRenderFn) {
       console.error('QTab/QRouteTab component needs to be child of QTabs');
-    });
+      return emptyRenderFn
+    }
 
     const { proxy } = vue.getCurrentInstance();
 
@@ -10451,7 +10486,7 @@
     props: usePanelChildProps,
 
     setup (_, { slots }) {
-      return () => vue.h('div', { class: 'q-tab-panel' }, hSlot(slots.default))
+      return () => vue.h('div', { class: 'q-tab-panel', role: 'tabpanel' }, hSlot(slots.default))
     }
   });
 
@@ -15031,7 +15066,8 @@
 
       function renderPortalContent () {
         return vue.h('div', {
-          'aria-modal': 'true',
+          role: 'dialog',
+          'aria-modal': useBackdrop.value === true ? 'true' : 'false',
           ...attrs,
           class: rootClasses.value
         }, [
@@ -15135,9 +15171,11 @@
       const { preventBodyScroll } = usePreventScroll();
       const { registerTimeout, removeTimeout } = useTimeout();
 
-      const $layout = vue.inject(layoutKey, () => {
+      const $layout = vue.inject(layoutKey, emptyRenderFn);
+      if ($layout === emptyRenderFn) {
         console.error('QDrawer needs to be child of QLayout');
-      });
+        return emptyRenderFn
+      }
 
       let lastDesktopState, timerMini, layoutTotalWidthWatcher;
 
@@ -16389,7 +16427,7 @@
               attrs.style,
               transitionStyle.value
             ],
-            role: 'complementary'
+            role: 'tooltip'
           }, hSlot(slots.default))
           : null
       }
@@ -16538,6 +16576,7 @@
           ref: rootRef,
           class: classes.value,
           style: style.value,
+          role: 'listitem',
           onClick,
           onKeyup
         };
@@ -19442,7 +19481,14 @@
 
     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) {
@@ -19476,6 +19522,7 @@
       pickFiles,
       addFiles,
       onDragover,
+      onDragleave,
       processFiles,
       getDndNode,
 
@@ -19829,9 +19876,11 @@
     setup (props, { slots, emit }) {
       const { proxy: { $q } } = vue.getCurrentInstance();
 
-      const $layout = vue.inject(layoutKey, () => {
+      const $layout = vue.inject(layoutKey, emptyRenderFn);
+      if ($layout === emptyRenderFn) {
         console.error('QFooter needs to be child of QLayout');
-      });
+        return emptyRenderFn
+      }
 
       const size = vue.ref(parseInt(props.heightHint, 10));
       const revealed = vue.ref(true);
@@ -20249,9 +20298,11 @@
     setup (props, { slots, emit }) {
       const { proxy: { $q } } = vue.getCurrentInstance();
 
-      const $layout = vue.inject(layoutKey, () => {
+      const $layout = vue.inject(layoutKey, emptyRenderFn);
+      if ($layout === emptyRenderFn) {
         console.error('QHeader needs to be child of QLayout');
-      });
+        return emptyRenderFn
+      }
 
       const size = vue.ref(parseInt(props.heightHint, 10));
       const revealed = vue.ref(true);
@@ -21155,7 +21206,7 @@
           '^'
           + unmask.join('')
           + '(' + (unmaskChar === '' ? '.' : '[^' + unmaskChar + ']') + '+)?'
-          + '[' + unmaskChar + ']*$'
+          + (unmaskChar === '' ? '' : '[' + unmaskChar + ']*') + '$'
         ),
         extractLast = extract.length - 1,
         extractMatcher = extract.map((re, index) => {
@@ -22181,7 +22232,7 @@
         + (props.padding === true ? ' q-list--padding' : '')
       );
 
-      return () => vue.h('div', { class: classes.value }, hSlot(slots.default))
+      return () => vue.h('div', { class: classes.value, role: 'list' }, hSlot(slots.default))
     }
   });
 
@@ -23222,7 +23273,7 @@
       );
 
       const attrs = vue.computed(() => {
-        const attrs = {};
+        const attrs = { role: 'group' };
 
         if (props.type === 'radio') {
           attrs.role = 'radiogroup';
@@ -23287,10 +23338,17 @@
     setup (props, { slots }) {
       const { proxy: { $q } } = vue.getCurrentInstance();
 
-      const $layout = vue.inject(layoutKey);
-      vue.inject(pageContainerKey, () => {
+      const $layout = vue.inject(layoutKey, emptyRenderFn);
+      if ($layout === emptyRenderFn) {
+        console.error('QPage needs to be a deep child of QLayout');
+        return emptyRenderFn
+      }
+
+      const $pageContainer = vue.inject(pageContainerKey, emptyRenderFn);
+      if ($pageContainer === emptyRenderFn) {
         console.error('QPage needs to be child of QPageContainer');
-      });
+        return emptyRenderFn
+      }
 
       const style = vue.computed(() => {
         const offset
@@ -23333,9 +23391,11 @@
     setup (_, { slots }) {
       const { proxy: { $q } } = vue.getCurrentInstance();
 
-      const $layout = vue.inject(layoutKey, () => {
+      const $layout = vue.inject(layoutKey, emptyRenderFn);
+      if ($layout === emptyRenderFn) {
         console.error('QPageContainer needs to be child of QLayout');
-      });
+        return emptyRenderFn
+      }
 
       vue.provide(pageContainerKey, true);
 
@@ -23385,9 +23445,11 @@
   function usePageSticky () {
     const { props, proxy: { $q } } = vue.getCurrentInstance();
 
-    const $layout = vue.inject(layoutKey, () => {
+    const $layout = vue.inject(layoutKey, emptyRenderFn);
+    if ($layout === emptyRenderFn) {
       console.error('QPageSticky needs to be child of QLayout');
-    });
+      return emptyRenderFn
+    }
 
     const attach = vue.computed(() => {
       const pos = props.position;
@@ -23600,6 +23662,12 @@
     }
   });
 
+  function getBool (val, otherwise) {
+    return [ true, false ].includes(val)
+      ? val
+      : otherwise
+  }
+
   var QPagination = createComponent({
     name: 'QPagination',
 
@@ -23611,22 +23679,20 @@
         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 ],
@@ -23660,11 +23726,6 @@
         type: Boolean,
         default: null
       },
-      maxPages: {
-        type: Number,
-        default: 0,
-        validator: v => v >= 0
-      },
 
       ripple: {
         type: [ Boolean, Object ],
@@ -23680,7 +23741,21 @@
       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'
@@ -23695,6 +23770,16 @@
 
       const isDark = useDark(props, $q);
 
+      const minProp = vue.computed(() => parseInt(props.min, 10));
+      const maxProp = vue.computed(() => parseInt(props.max, 10));
+      const maxPagesProp = vue.computed(() => parseInt(props.maxPages, 10));
+
+      const inputPlaceholder = vue.computed(() => model.value + ' / ' + maxProp.value);
+      const boundaryLinksProp = vue.computed(() => getBool(props.boundaryLinks, props.input));
+      const boundaryNumbersProp = vue.computed(() => getBool(props.boundaryNumbers, !props.input));
+      const directionLinksProp = vue.computed(() => getBool(props.directionLinks, props.input));
+      const ellipsesProp = vue.computed(() => getBool(props.ellipses, !props.input));
+
       const newPage = vue.ref(null);
       const model = vue.computed({
         get: () => props.modelValue,
@@ -23703,32 +23788,33 @@
           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);
           }
         }
       });
 
-      vue.watch(() => props.min + props.max, () => {
+      vue.watch(() => `${ minProp.value }|${ maxProp.value }`, () => {
         model.value = props.modelValue;
       });
 
-      function getBool (val, otherwise) {
-        return [ true, false ].includes(val)
-          ? val
-          : otherwise
-      }
-
       const classes = vue.computed(() =>
         'q-pagination row no-wrap items-center'
         + (props.disable === true ? ' disabled' : '')
       );
-      const inputPlaceholder = vue.computed(() => model.value + ' / ' + props.max);
-      const __boundaryLinks = vue.computed(() => getBool(props.boundaryLinks, props.input));
-      const __boundaryNumbers = vue.computed(() => getBool(props.boundaryNumbers, !props.input));
-      const __directionLinks = vue.computed(() => getBool(props.directionLinks, props.input));
-      const __ellipses = vue.computed(() => getBool(props.ellipses, !props.input));
+
+      const gutterProp = vue.computed(() => (
+        props.gutter in btnPadding
+          ? `${ btnPadding[ props.gutter ] }px`
+          : props.gutter || null
+      ));
+      const gutterStyle = vue.computed(() => (
+        gutterProp.value !== null
+          ? `--q-pagination-gutter-parent:-${ gutterProp.value };--q-pagination-gutter-child:${ gutterProp.value }`
+          : null
+      ));
+
       const icons = vue.computed(() => {
         const ico = [
           props.iconFirst || $q.iconSet.pagination.first,
@@ -23739,38 +23825,90 @@
         return $q.lang.rtl === true ? ico.reverse() : ico
       });
 
-      const attrs = vue.computed(() => (
-        props.disable === true
-          ? { 'aria-disabled': 'true' }
-          : {}
-      ));
+      const attrs = vue.computed(() => ({
+        'aria-disabled': props.disable === true ? 'true' : 'false',
+        role: 'navigation'
+      }));
 
+      const btnDesignProp = vue.computed(() => getBtnDesign(props, 'flat'));
       const btnProps = vue.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 = vue.computed(() => {
+        // we also reset non-active design
+        const acc = { [ btnDesignProp.value ]: false };
+        if (props.activeDesign !== '') {
+          acc[ props.activeDesign ] = true;
+        }
+        return acc
+      });
       const activeBtnProps = vue.computed(() => ({
-        flat: props.flat,
+        ...btnActiveDesignProp.value,
         color: props.activeColor || props.color,
         textColor: props.activeTextColor || props.textColor
       }));
 
+      const btnConfig = vue.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;
       }
@@ -23779,20 +23917,40 @@
         model.value = model.value + offset;
       }
 
-      function updateModel () {
-        model.value = newPage.value;
-        newPage.value = null;
-      }
+      const inputEvents = vue.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); };
           }
         }
 
@@ -23803,147 +23961,107 @@
       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(vue.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)
+            );
           }
         }
 
@@ -23951,15 +24069,35 @@
           class: classes.value,
           ...attrs.value
         }, [
-          contentStart,
-
           vue.h('div', {
-            class: 'row justify-center'
+            class: 'q-pagination__content row no-wrap items-center',
+            style: gutterStyle.value
           }, [
-            contentMiddle
-          ]),
+            ...contentStart,
+
+            props.input === true
+              ? vue.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
+              })
+              : vue.h('div', {
+                class: 'q-pagination__middle row justify-center'
+              }, contentMiddle),
 
-          contentEnd
+            ...contentEnd
+          ])
         ])
       }
     }
@@ -30878,9 +31016,11 @@
     setup (props, { slots, emit }) {
       const { proxy: { $q } } = vue.getCurrentInstance();
 
-      const $stepper = vue.inject(stepperKey, () => {
-        console.error('QStep needs to be child of QStepper');
-      });
+      const $stepper = vue.inject(stepperKey, emptyRenderFn);
+      if ($stepper === emptyRenderFn) {
+        console.error('QStep needs to be a child of QStepper');
+        return emptyRenderFn
+      }
 
       const { getCacheWithFn } = useCache();
 
@@ -30938,7 +31078,7 @@
 
       return () => vue.h(
         'div',
-        { ref: rootRef, class: 'q-stepper__step', ...scrollEvent.value },
+        { ref: rootRef, class: 'q-stepper__step', role: 'tabpanel', ...scrollEvent.value },
         $stepper.value.vertical === true
           ? [
               vue.h(StepHeader, {
@@ -34003,9 +34143,11 @@
     },
 
     setup (props, { slots }) {
-      const $timeline = vue.inject(timelineKey, () => {
+      const $timeline = vue.inject(timelineKey, emptyRenderFn);
+      if ($timeline === emptyRenderFn) {
         console.error('QTimelineEntry needs to be child of QTimeline');
-      });
+        return emptyRenderFn
+      }
 
       const classes = vue.computed(() =>
         `q-timeline__entry q-timeline__entry--${ props.side }`
@@ -34094,7 +34236,7 @@
         + (props.inset === true ? ' q-toolbar--inset' : '')
       );
 
-      return () => vue.h('div', { class: classes.value }, hSlot(slots.default))
+      return () => vue.h('div', { class: classes.value, role: 'toolbar' }, hSlot(slots.default))
     }
   });
 
@@ -35582,9 +35724,13 @@
     name: 'QUploaderAddTrigger',
 
     setup () {
-      return vue.inject(uploaderKey, () => {
+      const $trigger = vue.inject(uploaderKey, emptyRenderFn);
+
+      if ($trigger === emptyRenderFn) {
         console.error('QUploaderAddTrigger needs to be child of QUploader');
-      })
+      }
+
+      return $trigger
     }
   });
 
@@ -37904,6 +38050,7 @@
                 action.class
               ],
               tabindex: 0,
+              role: 'listitem',
               onClick () { onOk(action); },
               onKeyup (e) { e.keyCode === 13 && onOk(action); }
             }, [
@@ -37979,9 +38126,12 @@
         child.push(
           props.grid === true
             ? vue.h('div', {
-              class: 'row items-stretch justify-start'
+              class: 'row items-stretch justify-start',
+              role: 'list'
             }, getGrid())
-            : vue.h('div', getList())
+            : vue.h('div', {
+              role: 'list'
+            }, getList())
         );
 
         return child
@@ -40325,7 +40475,7 @@
    */
 
   var index_umd = {
-    version: '2.9.2',
+    version: '2.10.0',
     install (app, opts) {
       installQuasar(app, {
         components,