quasar 2.2.3 → 2.3.2

package/dist/quasar.umd.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.2.3
+ * Quasar Framework v2.3.2
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -560,7 +560,7 @@
   }
 
   const SIZE_LIST = [ 'sm', 'md', 'lg', 'xl' ];
-  const { passive: passive$3 } = listenOpts;
+  const { passive: passive$4 } = listenOpts;
 
   var Screen = defineReactivePlugin({
     width: 0,
@@ -697,11 +697,11 @@
         };
 
         this.setDebounce = delay => {
-          updateEvt !== void 0 && target.removeEventListener('resize', updateEvt, passive$3);
+          updateEvt !== void 0 && target.removeEventListener('resize', updateEvt, passive$4);
           updateEvt = delay > 0
             ? debounce(this.__update, delay)
             : this.__update;
-          target.addEventListener('resize', updateEvt, passive$3);
+          target.addEventListener('resize', updateEvt, passive$4);
         };
 
         this.setDebounce(updateDebounce);
@@ -1170,16 +1170,16 @@
   var Body = {
     install (opts) {
 
-      const { $q } = opts;
-
-      $q.config.brand !== void 0 && setColors($q.config.brand);
-
       if (this.__installed === true) { return }
 
       if (isRuntimeSsrPreHydration.value === true) {
         applyClientSsrCorrections();
       }
       else {
+        const { $q } = opts;
+
+        $q.config.brand !== void 0 && setColors($q.config.brand);
+
         const cls = getBodyClasses(client, $q.config);
         document.body.classList.add.apply(document.body.classList, cls);
       }
@@ -1437,7 +1437,7 @@
   }
 
   var installQuasar = function (parentApp, opts = {}) {
-      const $q = { version: '2.2.3' };
+      const $q = { version: '2.3.2' };
 
       if (globalConfigIsFrozen === false) {
         if (opts.config !== void 0) {
@@ -1866,7 +1866,7 @@
   const imgRE = /^img:/;
   const svgUseRE = /^svguse:/;
   const ionRE = /^ion-/;
-  const faLaRE = /^[l|f]a[s|r|l|b|d]? /;
+  const faLaRE = /^[l|f]a[s|r|l|b|d|k]? /;
 
   var QIcon = createComponent({
     name: 'QIcon',
@@ -2271,14 +2271,14 @@
 
   // used directly by docs too
   function getParentVm (vm) {
-    if (vm.$parent !== void 0 && vm.$parent !== null) {
+    if (Object(vm.$parent) === vm.$parent) {
       return vm.$parent
     }
 
     vm = vm.$.parent;
 
-    while (vm !== void 0 && vm !== null) {
-      if (vm.proxy !== void 0 && vm.proxy !== null) {
+    while (Object(vm) === vm) {
+      if (Object(vm.proxy) === vm.proxy) {
         return vm.proxy
       }
 
@@ -3846,7 +3846,7 @@
       default: null
     },
 
-    'onUpdate:modelValue': Function
+    'onUpdate:modelValue': [ Function, Array ]
   };
 
   const useModelToggleEmits = [
@@ -7028,12 +7028,21 @@
     });
 
     function refocusTarget (e) {
+      const root = rootRef.value;
+
       if (e !== void 0 && e.type.indexOf('key') === 0) {
-        if (document.activeElement !== rootRef.value && rootRef.value.contains(document.activeElement) === true) {
-          rootRef.value.focus();
+        if (
+          root !== null
+          && document.activeElement !== root
+          && root.contains(document.activeElement) === true
+        ) {
+          root.focus();
         }
       }
-      else if ((e === void 0 || rootRef.value.contains(e.target) === true) && refocusRef.value !== null) {
+      else if (
+        refocusRef.value !== null
+        && (e === void 0 || (root !== null && root.contains(e.target) === true))
+      ) {
         refocusRef.value.focus();
       }
     }
@@ -7550,6 +7559,11 @@
         default: 0
       },
 
+      animationSpeed: {
+        type: [ String, Number ],
+        default: 600
+      },
+
       indeterminate: Boolean
     },
 
@@ -7569,7 +7583,7 @@
 
       const circleStyle = vue.computed(() => (
         props.instantFeedback !== true && props.indeterminate !== true
-          ? { transition: 'stroke-dashoffset 0.6s ease 0s, stroke 0.6s ease' }
+          ? { transition: `stroke-dashoffset ${ props.animationSpeed }ms ease 0s, stroke ${ props.animationSpeed }ms ease` }
           : ''
       ));
 
@@ -8281,7 +8295,7 @@
     }
 
     function onPan (event) {
-      if (event.isFinal) {
+      if (event.isFinal === true) {
         if (dragging.value !== void 0) {
           updatePosition(event.evt);
           // only if touch, because we also have mousedown/up:
@@ -8291,7 +8305,7 @@
         }
         active.value = false;
       }
-      else if (event.isFirst) {
+      else if (event.isFirst === true) {
         dragging.value = getDragging(event.evt);
         updatePosition(event.evt);
         updateValue();
@@ -8321,7 +8335,7 @@
     function onDeactivate () {
       preventFocus.value = false;
 
-      if (dragging.value === void 0) {
+      if (dragging.value === false) {
         active.value = false;
       }
 
@@ -8823,7 +8837,7 @@
 
       contentClass: String,
 
-      'onUpdate:modelValue': Function
+      'onUpdate:modelValue': [ Function, Array ]
     },
 
     setup (props, { slots, emit }) {
@@ -11490,7 +11504,7 @@
       }
     }
 
-    date.dateHash = date.year + '/' + pad(date.month) + '/' + pad(date.day);
+    date.dateHash = pad(date.year, 6) + '/' + pad(date.month) + '/' + pad(date.day);
     date.timeHash = pad(date.hour) + ':' + pad(date.minute) + ':' + pad(date.second) + tzString;
 
     return date
@@ -15878,7 +15892,7 @@
 
   const listenerRE = /^on[A-Z]/;
 
-  function useSplitAttrs (attrs) {
+  function useSplitAttrs (attrs, vnode) {
     const acc = {
       listeners: vue.ref({}),
       attributes: vue.ref({})
@@ -15897,6 +15911,12 @@
         }
       });
 
+      Object.keys(vnode.props).forEach(key => {
+        if (listenerRE.test(key) === true) {
+          listeners[ key ] = vnode.props[ key ];
+        }
+      });
+
       acc.listeners.value = listeners;
       acc.attributes.value = attributes;
     }
@@ -16059,12 +16079,12 @@
     ],
 
     setup (props, { slots, emit, attrs }) {
-      const { proxy } = vue.getCurrentInstance();
+      const { proxy, vnode } = vue.getCurrentInstance();
       const { $q } = proxy;
 
       const isDark = useDark(props, $q);
       const { inFullscreen, toggleFullscreen } = useFullscreen();
-      const splitAttrs = useSplitAttrs(attrs);
+      const splitAttrs = useSplitAttrs(attrs, vnode);
 
       const rootRef = vue.ref(null);
       const contentRef = vue.ref(null);
@@ -17747,7 +17767,7 @@
   const useFieldEmits = [ 'update:modelValue', 'clear', 'focus', 'blur', 'popup-show', 'popup-hide' ];
 
   function useFieldState () {
-    const { props, attrs, proxy } = vue.getCurrentInstance();
+    const { props, attrs, proxy, vnode } = vue.getCurrentInstance();
 
     const isDark = useDark(props, proxy.$q);
 
@@ -17760,9 +17780,9 @@
 
       innerLoading: vue.ref(false),
       focused: vue.ref(false),
-      hasPopupOpen: vue.ref(false),
+      hasPopupOpen: false,
 
-      splitAttrs: useSplitAttrs(attrs),
+      splitAttrs: useSplitAttrs(attrs, vnode),
       targetUid: vue.ref(getTargetUid(props.for)),
 
       rootRef: vue.ref(null),
@@ -17973,7 +17993,7 @@
       focusoutTimer = setTimeout(() => {
         if (
           document.hasFocus() === true && (
-            state.hasPopupOpen.value === true
+            state.hasPopupOpen === true
             || (
               state.controlRef !== void 0
               && (
@@ -18382,6 +18402,14 @@
         files = [ files[ 0 ] ];
       }
 
+      // Avoid duplicate files
+      const filenameMap = currentFileList.map(entry => entry.name);
+      files = filterFiles(files, rejectedFiles, 'duplicate', file => {
+        return filenameMap.includes(file.name) === false
+      });
+
+      if (files.length === 0) { return done() }
+
       if (props.maxTotalSize !== void 0) {
         let size = append === true
           ? currentFileList.reduce((total, file) => total + file.size, 0)
@@ -19645,6 +19673,8 @@
     }
   });
 
+  const { passive: passive$3 } = listenOpts;
+
   var QInfiniteScroll = createComponent({
     name: 'QInfiniteScroll',
 
@@ -19672,20 +19702,21 @@
     emits: [ 'load' ],
 
     setup (props, { slots, emit }) {
-      const fetching = vue.ref(false);
+      const isFetching = vue.ref(false);
+      const isWorking = vue.ref(true);
       const rootRef = vue.ref(null);
 
       let index = props.initialIndex || 0;
-      let isWorking = true;
+      let scrollPos = false;
       let localScrollTarget, poll;
 
       const classes = vue.computed(() =>
         'q-infinite-scroll__loading'
-        + (fetching.value === true ? '' : ' invisible')
+        + (isFetching.value === true ? '' : ' invisible')
       );
 
       function immediatePoll () {
-        if (props.disable === true || fetching.value === true || isWorking === false) {
+        if (props.disable === true || isFetching.value === true || isWorking.value === false) {
           return
         }
 
@@ -19707,18 +19738,18 @@
       }
 
       function trigger () {
-        if (props.disable === true || fetching.value === true || isWorking === false) {
+        if (props.disable === true || isFetching.value === true || isWorking.value === false) {
           return
         }
 
         index++;
-        fetching.value = true;
+        isFetching.value = true;
 
         const heightBefore = getScrollHeight(localScrollTarget);
 
         emit('load', index, isDone => {
-          if (isWorking === true) {
-            fetching.value = false;
+          if (isWorking.value === true) {
+            isFetching.value = false;
             vue.nextTick(() => {
               if (props.reverse === true) {
                 const
@@ -19745,31 +19776,31 @@
       }
 
       function resume () {
-        if (isWorking === false) {
-          isWorking = true;
-          localScrollTarget.addEventListener('scroll', poll, listenOpts.passive);
+        if (isWorking.value === false) {
+          isWorking.value = true;
+          localScrollTarget.addEventListener('scroll', poll, passive$3);
         }
 
         immediatePoll();
       }
 
       function stop () {
-        if (isWorking === true) {
-          isWorking = false;
-          fetching.value = false;
-          localScrollTarget.removeEventListener('scroll', poll, listenOpts.passive);
+        if (isWorking.value === true) {
+          isWorking.value = false;
+          isFetching.value = false;
+          localScrollTarget.removeEventListener('scroll', poll, passive$3);
         }
       }
 
       function updateScrollTarget () {
-        if (localScrollTarget && isWorking === true) {
-          localScrollTarget.removeEventListener('scroll', poll, listenOpts.passive);
+        if (localScrollTarget && isWorking.value === true) {
+          localScrollTarget.removeEventListener('scroll', poll, passive$3);
         }
 
         localScrollTarget = getScrollTarget(rootRef.value, props.scrollTarget);
 
-        if (isWorking === true) {
-          localScrollTarget.addEventListener('scroll', poll, listenOpts.passive);
+        if (isWorking.value === true) {
+          localScrollTarget.addEventListener('scroll', poll, passive$3);
         }
       }
 
@@ -19793,30 +19824,44 @@
           ? immediatePoll
           : debounce(immediatePoll, isNaN(val) === true ? 100 : val);
 
-        if (localScrollTarget && isWorking === true) {
+        if (localScrollTarget && isWorking.value === true) {
           if (oldPoll !== void 0) {
-            localScrollTarget.removeEventListener('scroll', oldPoll, listenOpts.passive);
+            localScrollTarget.removeEventListener('scroll', oldPoll, passive$3);
           }
 
-          localScrollTarget.addEventListener('scroll', poll, listenOpts.passive);
+          localScrollTarget.addEventListener('scroll', poll, passive$3);
         }
       }
 
       vue.watch(() => props.disable, val => {
-        if (val === true) {
-          stop();
-        }
-        else {
-          resume();
+        if (val === true) { stop(); }
+        else { resume(); }
+      });
+
+      vue.watch(() => props.reverse, val => {
+        if (isFetching.value === false && isWorking.value === true) {
+          immediatePoll();
         }
       });
 
       vue.watch(() => props.scrollTarget, updateScrollTarget);
       vue.watch(() => props.debounce, setDebounce);
 
+      vue.onActivated(() => {
+        if (localScrollTarget && scrollPos !== false) {
+          setVerticalScrollPosition(localScrollTarget, scrollPos);
+        }
+      });
+
+      vue.onDeactivated(() => {
+        scrollPos = localScrollTarget
+          ? getVerticalScrollPosition(localScrollTarget)
+          : false;
+      });
+
       vue.onBeforeUnmount(() => {
-        if (isWorking === true) {
-          localScrollTarget.removeEventListener('scroll', poll, listenOpts.passive);
+        if (isWorking.value === true) {
+          localScrollTarget.removeEventListener('scroll', poll, passive$3);
         }
       });
 
@@ -19839,7 +19884,7 @@
       return () => {
         const child = hUniqueSlot(slots.default, []);
 
-        if (props.disable !== true && isWorking === true) {
+        if (props.disable !== true && isWorking.value === true) {
           child[ props.reverse === false ? 'push' : 'unshift' ](
             vue.h('div', { class: classes.value }, hSlot(slots.loading))
           );
@@ -20977,6 +21022,10 @@
 
       once: Boolean,
       transition: String,
+      transitionDuration: {
+        type: [ String, Number ],
+        default: 300
+      },
 
       ssrPrerender: Boolean,
 
@@ -21022,6 +21071,10 @@
         ] ]
       });
 
+      const transitionStyle = vue.computed(
+        () => `--q-transition-duration: ${ props.transitionDuration }ms`
+      );
+
       function trigger (entry) {
         if (showing.value !== entry.isIntersecting) {
           showing.value = entry.isIntersecting;
@@ -21031,7 +21084,7 @@
 
       function getContent () {
         return showing.value === true
-          ? [ vue.h('div', { key: 'content' }, hSlot(slots.default)) ]
+          ? [ vue.h('div', { key: 'content', style: transitionStyle.value }, hSlot(slots.default)) ]
           : void 0
       }
 
@@ -23202,6 +23255,10 @@
 
       const type = vue.ref(getType());
 
+      const popupProps = vue.computed(() => (
+        type.value === 'menu' ? { maxHeight: '99vh' } : {})
+      );
+
       vue.watch(() => getType(), val => {
         if (showing.value !== true) {
           type.value = val;
@@ -23227,21 +23284,9 @@
       }
 
       return () => {
-        const def = hSlot(slots.default);
-
-        const popupProps = (
-          type.value === 'menu'
-          && def !== void 0
-          && def[ 0 ] !== void 0
-          && def[ 0 ].type !== void 0
-          && [ 'QDate', 'QTime', 'QCarousel', 'QColor' ].includes(
-            def[ 0 ].type.name
-          )
-        ) ? { cover: true, maxHeight: '99vh' } : {};
-
         const data = {
           ref: popupRef,
-          ...popupProps,
+          ...popupProps.value,
           ...attrs,
           onShow,
           onHide
@@ -23262,7 +23307,7 @@
           });
         }
 
-        return vue.h(component, data, () => def)
+        return vue.h(component, data, slots.default)
       }
     }
   });
@@ -23305,6 +23350,11 @@
       query: Boolean,
       rounded: Boolean,
 
+      animationSpeed: {
+        type: [ String, Number ],
+        default: 2100
+      },
+
       instantFeedback: Boolean
     },
 
@@ -23314,6 +23364,10 @@
       const sizeStyle = useSize(props, defaultSizes);
 
       const motion = vue.computed(() => props.indeterminate === true || props.query === true);
+      const style = vue.computed(() => ({
+        ...(sizeStyle.value !== null ? sizeStyle.value : {}),
+        '--q-linear-progress-speed': `${ props.animationSpeed }ms`
+      }));
 
       const classes = vue.computed(() =>
         'q-linear-progress'
@@ -23364,7 +23418,7 @@
 
         return vue.h('div', {
           class: classes.value,
-          style: sizeStyle.value,
+          style: style.value,
           role: 'progressbar',
           'aria-valuemin': 0,
           'aria-valuemax': 1,
@@ -24503,7 +24557,7 @@
       );
 
       const mainStyle = vue.computed(() => (
-        scroll.vertical.thumbHidden.value === true || scroll.horizontal.thumbHidden.value === true
+        scroll.vertical.thumbHidden.value === true && scroll.horizontal.thumbHidden.value === true
           ? props.contentStyle
           : props.contentActiveStyle
       ));
@@ -25451,6 +25505,22 @@
       setVirtualScrollSize();
     });
 
+    vue.onActivated(() => {
+      const scrollEl = getVirtualScrollTarget();
+
+      if (prevScrollStart !== void 0 && scrollEl !== void 0 && scrollEl !== null && scrollEl.nodeType !== 8) {
+        setScroll(
+          scrollEl,
+          prevScrollStart,
+          props.virtualScrollHorizontal,
+          $q.lang.rtl
+        );
+      }
+      else {
+        scrollTo(prevToIndex);
+      }
+    });
+
     setOverflowAnchor !== noop && vue.onBeforeUnmount(() => {
       const styleSheet = document.getElementById(vsId + '_ss');
       styleSheet !== null && styleSheet.remove();
@@ -26384,6 +26454,12 @@
       }
 
       function getAllOptions () {
+        if (noOptions.value === true) {
+          return slots[ 'no-option' ] !== void 0
+            ? slots[ 'no-option' ]({ inputValue: inputValue.value })
+            : void 0
+        }
+
         const fn = slots.option !== void 0
           ? slots.option
           : scope => {
@@ -26565,14 +26641,6 @@
       }
 
       function getMenu () {
-        const child = noOptions.value === true
-          ? (
-              slots[ 'no-option' ] !== void 0
-                ? () => slots[ 'no-option' ]({ inputValue: inputValue.value })
-                : void 0
-            )
-          : getAllOptions;
-
         return vue.h(QMenu, {
           ref: menuRef,
           class: menuContentClass.value,
@@ -26597,7 +26665,7 @@
           onBeforeShow: onControlPopupShow,
           onBeforeHide: onMenuBeforeHide,
           onShow: onMenuShow
-        }, child)
+        }, getAllOptions)
       }
 
       function onMenuBeforeHide (e) {
@@ -26626,7 +26694,7 @@
       function getDialog () {
         const content = [
           vue.h(QField, {
-            class: `col-auto ${ state.fieldClass }`,
+            class: `col-auto ${ state.fieldClass.value }`,
             ...innerFieldProps.value,
             for: state.targetUid.value,
             dark: isOptionsDark.value,
@@ -26654,15 +26722,7 @@
             ...listboxAttrs.value,
             onClick: prevent,
             onScrollPassive: onVirtualScrollEvt
-          }, (
-            noOptions.value === true
-              ? (
-                  slots[ 'no-option' ] !== void 0
-                    ? slots[ 'no-option' ]({ inputValue: inputValue.value })
-                    : null
-                )
-              : getAllOptions()
-          ))
+          }, getAllOptions())
         );
 
         return vue.h(QDialog, {
@@ -26800,14 +26860,14 @@
       function onControlPopupShow (e) {
         e !== void 0 && stop(e);
         emit('popup-show', e);
-        state.hasPopupOpen.value = true;
+        state.hasPopupOpen = true;
         state.onControlFocusin(e);
       }
 
       function onControlPopupHide (e) {
         e !== void 0 && stop(e);
         emit('popup-hide', e);
-        state.hasPopupOpen.value = false;
+        state.hasPopupOpen = false;
         state.onControlFocusout(e);
       }
 
@@ -26879,6 +26939,10 @@
           ) {
             return hasDialog === true ? getDialog() : getMenu()
           }
+          else if (state.hasPopupOpen === true) {
+            // explicitly set it otherwise TAB will not blur component
+            state.hasPopupOpen = false;
+          }
         },
 
         controlEvents: {
@@ -30246,7 +30310,7 @@
       default: () => [ 5, 7, 10, 15, 20, 25, 50, 0 ]
     },
 
-    'onUpdate:pagination': Function
+    'onUpdate:pagination': [ Function, Array ]
   };
 
   function useTablePaginationState (vm, getCellValue) {
@@ -30296,7 +30360,7 @@
         ...val
       });
 
-      if (samePagination(computedPagination.value, newPagination)) {
+      if (samePagination(computedPagination.value, newPagination) === true) {
         if (isServerSide.value === true && forceServerRequest === true) {
           sendServerRequest(newPagination);
         }
@@ -32439,21 +32503,22 @@
       function setHour (hour) {
         if (innerModel.value.hour !== hour) {
           innerModel.value.hour = hour;
-          innerModel.value.minute = null;
-          innerModel.value.second = null;
+          verifyAndUpdate();
         }
       }
 
       function setMinute (minute) {
         if (innerModel.value.minute !== minute) {
           innerModel.value.minute = minute;
-          innerModel.value.second = null;
-          props.withSeconds !== true && updateValue({ minute });
+          verifyAndUpdate();
         }
       }
 
       function setSecond (second) {
-        innerModel.value.second !== second && updateValue({ second });
+        if (innerModel.value.second !== second) {
+          innerModel.value.second = second;
+          verifyAndUpdate();
+        }
       }
 
       const setModel = {
@@ -32877,6 +32942,8 @@
     }
   });
 
+  const tickStrategyOptions = [ 'none', 'strict', 'leaf', 'leaf-filtered' ];
+
   var QTree = createComponent({
     name: 'QTree',
 
@@ -32900,6 +32967,8 @@
         default: 'children'
       },
 
+      dense: Boolean,
+
       color: String,
       controlColor: String,
       textColor: String,
@@ -32910,7 +32979,7 @@
       tickStrategy: {
         type: String,
         default: 'none',
-        validator: v => [ 'none', 'strict', 'leaf', 'leaf-filtered' ].includes(v)
+        validator: v => tickStrategyOptions.includes(v)
       },
       ticked: Array, // v-model:ticked
       expanded: Array, // v-model:expanded
@@ -32955,7 +33024,7 @@
       });
 
       const classes = vue.computed(() =>
-        'q-tree'
+        `q-tree q-tree--${ props.dense === true ? 'dense' : 'standard' }`
         + (props.noConnectors === true ? ' q-tree--no-connectors' : '')
         + (isDark.value === true ? ' q-tree--dark' : '')
         + (props.color !== void 0 ? ` text-${ props.color }` : '')
@@ -33397,13 +33466,13 @@
 
             m.lazy === 'loading'
               ? vue.h(QSpinner, {
-                  class: 'q-tree__spinner q-mr-xs',
+                  class: 'q-tree__spinner',
                   color: computedControlColor.value
                 })
               : (
                   isParent === true
                     ? vue.h(QIcon, {
-                        class: 'q-tree__arrow q-mr-xs'
+                        class: 'q-tree__arrow'
                       + (m.expanded === true ? ' q-tree__arrow--rotate' : ''),
                         name: computedIcon.value,
                         onClick (e) { onExpandClick(node, m, e); }
@@ -33413,7 +33482,7 @@
 
             m.hasTicking === true && m.noTick !== true
               ? vue.h(QCheckbox, {
-                  class: 'q-mr-xs',
+                  class: 'q-tree__tickbox',
                   modelValue: m.indeterminate === true ? null : m.ticked,
                   color: computedControlColor.value,
                   dark: isDark.value,
@@ -33805,20 +33874,15 @@
     }
 
     function addFilesToQueue (e, fileList) {
-      const processedFiles = processFiles(e, fileList, state.files.value, true);
-
-      if (processedFiles === void 0) { return }
+      const localFiles = processFiles(e, fileList, state.files.value, true);
 
-      const localFiles = processedFiles
-        .filter(file => state.files.value.findIndex(f => file.name === f.name) === -1);
+      if (localFiles === void 0) { return }
 
       const fileInput = getFileInput();
       if (fileInput !== void 0 && fileInput !== null) {
         fileInput.value = '';
       }
 
-      if (localFiles === void 0) { return }
-
       localFiles.forEach(file => {
         state.updateFileStatus(file, 'idle');
         uploadSize.value += file.size;
@@ -34025,6 +34089,20 @@
     }
   }
 
+  const trueFn = () => true;
+
+  function getEmitsObject (emitsArray) {
+    const emitsObject = {};
+
+    emitsArray.forEach(val => {
+      emitsObject[ val ] = trueFn;
+    });
+
+    return emitsObject
+  }
+
+  const coreEmitsObject = getEmitsObject(coreEmits);
+
   var createUploaderComponent = ({ name, props, emits, injectPlugin }) => createComponent({
     name,
 
@@ -34033,10 +34111,9 @@
       ...props
     },
 
-    emits: [
-      ...coreEmits,
-      ...emits
-    ],
+    emits: Object(emits) === emits
+      ? { ...coreEmitsObject, ...emits }
+      : [ ...coreEmits, ...emits ],
 
     setup () {
       return getRenderer(injectPlugin)
@@ -34070,7 +34147,7 @@
     factory: Function
   };
 
-  const emits = [ 'factory-failed', 'uploaded', 'failed', 'uploading' ];
+  const emits$1 = [ 'factory-failed', 'uploaded', 'failed', 'uploading' ];
 
   function injectPlugin ({ props, emit, helpers }) {
     const xhrs = vue.ref([]);
@@ -34296,7 +34373,7 @@
   var xhrUploaderPlugin = {
     name: 'QUploader',
     props: props$2,
-    emits,
+    emits: emits$1,
     injectPlugin
   };
 
@@ -38678,7 +38755,11 @@
     }
   }
 
-  useDialogPluginComponent.emits = [ 'ok', 'hide' ];
+  // Don't forget to update the types in "ui/types/composables.d.ts"
+  const emits = [ 'ok', 'hide' ];
+
+  useDialogPluginComponent.emits = emits;
+  useDialogPluginComponent.emitsObject = getEmitsObject(emits);
 
   function useMeta (metaOptions) {
     {
@@ -38734,7 +38815,7 @@
   });
 
   var index_umd = {
-    version: '2.2.3',
+    version: '2.3.2',
     install (app, opts) {
       installQuasar(app, {
         components,