quasar 2.14.2 → 2.14.3

package/dist/quasar.sass

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.14.2
+ * Quasar Framework v2.14.3
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */

package/dist/quasar.umd.js

@@ -1,5 +1,5 @@
 /*!
- * Quasar Framework v2.14.2
+ * Quasar Framework v2.14.3
  * (c) 2015-present Razvan Stoenescu
  * Released under the MIT License.
  */
@@ -798,36 +798,13 @@
       }
     },
 
-    install ({ $q, onSSRHydrated, ssrContext }) {
+    install ({ $q, ssrContext }) {
       const { dark } = $q.config;
 
       $q.dark = this;
 
-      if (this.__installed === true && dark === void 0) {
-        return
-      }
-
-      this.isActive = dark === true;
-
-      const initialVal = dark !== void 0 ? dark : false;
-
-      if (isRuntimeSsrPreHydration.value === true) {
-        const ssrSet = val => {
-          this.__fromSSR = val;
-        };
-
-        const originalSet = this.set;
-
-        this.set = ssrSet;
-        ssrSet(initialVal);
-
-        onSSRHydrated.push(() => {
-          this.set = originalSet;
-          this.set(this.__fromSSR);
-        });
-      }
-      else {
-        this.set(initialVal);
+      if (this.__installed !== true) {
+        this.set(dark !== void 0 ? dark : false);
       }
     }
   });
@@ -1653,7 +1630,7 @@
   }
 
   var installQuasar = function (parentApp, opts = {}) {
-      const $q = { version: '2.14.2' };
+      const $q = { version: '2.14.3' };
 
       if (globalConfigIsFrozen === false) {
         if (opts.config !== void 0) {
@@ -1917,13 +1894,23 @@
 
         progress.value = 0;
 
+        /**
+         * We're trying to avoid side effects if start() is called inside a watchEffect()
+         * so we're accessing the _value property directly (under the covers implementation detail of ref())
+         *
+         * Otherwise, any refs() accessed here would be marked as deps for the watchEffect()
+         * -- and we are changing them below, which would cause an infinite loop
+         */
+
         timer = setTimeout(() => {
           timer = null;
           animate.value = true;
           newSpeed > 0 && planNextStep();
-        }, onScreen.value === true ? 500 : 1);
+          // eslint-disable-next-line vue/no-ref-as-operand
+        }, onScreen._value === true ? 500 : 1);
 
-        if (onScreen.value !== true) {
+        // eslint-disable-next-line vue/no-ref-as-operand
+        if (onScreen._value !== true) {
           onScreen.value = true;
           animate.value = false;
         }
@@ -2282,13 +2269,13 @@
         }
 
         if (type.value.img === true) {
-          return vue.h('span', data, hMergeSlot(slots.default, [
+          return vue.h(props.tag, data, hMergeSlot(slots.default, [
             vue.h('img', { src: type.value.src })
           ]))
         }
 
         if (type.value.svg === true) {
-          return vue.h('span', data, hMergeSlot(slots.default, [
+          return vue.h(props.tag, data, hMergeSlot(slots.default, [
             vue.h('svg', {
               viewBox: type.value.viewBox || '0 0 24 24'
             }, type.value.nodes)
@@ -2296,7 +2283,7 @@
         }
 
         if (type.value.svguse === true) {
-          return vue.h('span', data, hMergeSlot(slots.default, [
+          return vue.h(props.tag, data, hMergeSlot(slots.default, [
             vue.h('svg', {
               viewBox: type.value.viewBox
             }, [
@@ -5864,6 +5851,35 @@
       + hexBytes[ b[ 14 ] ] + hexBytes[ b[ 15 ] ]
   }
 
+  function getId (val, requiredId) {
+    return val === void 0
+      ? (requiredId === true ? `f_${ uid$3() }` : void 0)
+      : val
+  }
+
+  /**
+   * Returns an "id" which is a ref() that can be used as a unique identifier.
+   * On SSR, it takes care of generating the id on the client side (only) to
+   * avoid hydration errors.
+   */
+  function useId (initialId, requiredId = true) {
+    if (isRuntimeSsrPreHydration.value === true) {
+      const id = vue.ref(initialId);
+
+      if (requiredId === true && initialId === void 0) {
+        vue.onMounted(() => {
+          id.value = `f_${ uid$3() }`; // getId(void 0, true)
+        });
+      }
+
+      return id
+    }
+
+    return vue.ref(
+      getId(initialId, requiredId)
+    )
+  }
+
   const btnPropsList = Object.keys(useBtnProps);
 
   const passBtnProps = props => btnPropsList.reduce(
@@ -5921,13 +5937,13 @@
 
       const showing = vue.ref(props.modelValue);
       const menuRef = vue.ref(null);
-      const targetUid = uid$3();
+      const targetUid = useId();
 
       const ariaAttrs = vue.computed(() => {
         const acc = {
           'aria-expanded': showing.value === true ? 'true' : 'false',
           'aria-haspopup': 'true',
-          'aria-controls': targetUid,
+          'aria-controls': targetUid.value,
           'aria-label': props.toggleAriaLabel || proxy.$q.lang.label[ showing.value === true ? 'collapse' : 'expand' ](props.label)
         };
 
@@ -6021,7 +6037,7 @@
         props.disableDropdown !== true && Arrow.push(
           vue.h(QMenu, {
             ref: menuRef,
-            id: targetUid,
+            id: targetUid.value,
             class: props.contentClass,
             style: props.contentStyle,
             cover: props.cover,
@@ -10508,7 +10524,7 @@
                 if (
                   hardError === void 0 && (
                     softError === void 0
-                    || softError.message.startsWith('Avoided redundant navigation') === true
+                    || (softError.message !== void 0 && softError.message.startsWith('Avoided redundant navigation') === true)
                   )
                 ) {
                   $tabs.updateModel({ name: props.name });
@@ -18074,7 +18090,7 @@
       );
 
       const blurTargetRef = vue.ref(null);
-      const targetUid = uid$3();
+      const targetUid = useId();
 
       const { show, hide, toggle } = useModelToggle({ showing });
 
@@ -18142,7 +18158,7 @@
         return {
           role: 'button',
           'aria-expanded': showing.value === true ? 'true' : 'false',
-          'aria-controls': targetUid,
+          'aria-controls': targetUid.value,
           'aria-label': toggleAriaLabel
         }
       });
@@ -18319,7 +18335,7 @@
             key: 'e-content',
             class: 'q-expansion-item__content relative-position',
             style: contentStyle.value,
-            id: targetUid
+            id: targetUid.value
           }, hSlot(slots.default)),
           [ [
             vue.vShow,
@@ -18494,7 +18510,7 @@
     setup (props, { slots }) {
       const triggerRef = vue.ref(null);
       const showing = vue.ref(props.modelValue === true);
-      const targetUid = uid$3();
+      const targetUid = useId();
 
       const { proxy: { $q } } = vue.getCurrentInstance();
       const { formClass, labelProps } = useFab(props, showing);
@@ -18522,7 +18538,7 @@
 
       const actionAttrs = vue.computed(() => {
         const attrs = {
-          id: targetUid,
+          id: targetUid.value,
           role: 'menu'
         };
 
@@ -18594,7 +18610,7 @@
           fab: true,
           'aria-expanded': showing.value === true ? 'true' : 'false',
           'aria-haspopup': 'true',
-          'aria-controls': targetUid,
+          'aria-controls': targetUid.value,
           onClick: toggle
         }, getTriggerContent),
 
@@ -18756,7 +18772,7 @@
 
     const innerError = vue.ref(false);
     const innerErrorMessage = vue.ref(null);
-    const isDirtyModel = vue.ref(null);
+    const isDirtyModel = vue.ref(false);
 
     useFormChild({ validate, resetValidation });
 
@@ -18799,18 +18815,20 @@
       }
     });
 
+    function onRulesChange () {
+      if (
+        props.lazyRules !== 'ondemand'
+        && canDebounceValidate.value === true
+        && isDirtyModel.value === true
+      ) {
+        debouncedValidate();
+      }
+    }
+
     vue.watch(() => props.reactiveRules, val => {
       if (val === true) {
         if (unwatchRules === void 0) {
-          unwatchRules = vue.watch(() => props.rules, () => {
-            if (
-              canDebounceValidate.value === true
-              && isDirtyModel.value === true
-              && props.lazyRules !== 'ondemand'
-            ) {
-              debouncedValidate();
-            }
-          }, { immediate: true });
+          unwatchRules = vue.watch(() => props.rules, onRulesChange, { immediate: true, deep: true });
         }
       }
       else if (unwatchRules !== void 0) {
@@ -18819,30 +18837,15 @@
       }
     }, { immediate: true });
 
-    vue.watch(() => props.lazyRules, val => {
-      if (
-        val === false
-        && canDebounceValidate.value === true
-        && isDirtyModel.value === true
-      ) {
-        debouncedValidate();
-      }
-    });
+    vue.watch(() => props.lazyRules, onRulesChange);
 
     vue.watch(focused, val => {
       if (val === true) {
-        if (isDirtyModel.value === null) {
-          isDirtyModel.value = props.lazyRules === true;
-        }
+        isDirtyModel.value = true;
       }
       else if (
         canDebounceValidate.value === true
-        && (
-          // props.lazyRules can also be 'ondemand',
-          // hence the following form:
-          props.lazyRules === false
-          || (props.lazyRules === true && isDirtyModel.value === true)
-        )
+        && props.lazyRules !== 'ondemand'
       ) {
         debouncedValidate();
       }
@@ -18851,7 +18854,7 @@
     function resetValidation () {
       validateIndex++;
       innerLoading.value = false;
-      isDirtyModel.value = null;
+      isDirtyModel.value = false;
       innerError.value = false;
       innerErrorMessage.value = null;
       debouncedValidate.cancel();
@@ -18958,12 +18961,6 @@
     }
   }
 
-  function getTargetUid (val, requiredForAttr) {
-    return val === void 0
-      ? (requiredForAttr === true ? `f_${ uid$3() }` : void 0)
-      : val
-  }
-
   function fieldValueIsFilled (val) {
     return val !== void 0
       && val !== null
@@ -19024,6 +19021,7 @@
     const { props, attrs, proxy, vnode } = vue.getCurrentInstance();
 
     const isDark = useDark(props, proxy.$q);
+    const targetUid = useId(props.for, requiredForAttr);
 
     return {
       requiredForAttr,
@@ -19042,9 +19040,7 @@
       hasPopupOpen: false,
 
       splitAttrs: useSplitAttrs(attrs, vnode),
-      targetUid: vue.ref(
-        getTargetUid(props.for, requiredForAttr)
-      ),
+      targetUid,
 
       rootRef: vue.ref(null),
       targetRef: vue.ref(null),
@@ -19196,9 +19192,11 @@
     }));
 
     const attributes = vue.computed(() => {
-      const acc = {
-        for: state.targetUid.value
-      };
+      const acc = {};
+
+      if (state.targetUid.value) {
+        acc.for = state.targetUid.value;
+      }
 
       if (props.disable === true) {
         acc[ 'aria-disabled' ] = 'true';
@@ -19210,7 +19208,7 @@
     vue.watch(() => props.for, val => {
       // don't transform targetUid into a computed
       // prop as it will break SSR
-      state.targetUid.value = getTargetUid(val, state.requiredForAttr);
+      state.targetUid.value = getId(val, state.requiredForAttr);
     });
 
     function focusHandler () {
@@ -19286,7 +19284,7 @@
         document.activeElement.blur();
       }
 
-      if (props.type === 'file') { // TODO vue3
+      if (props.type === 'file') {
         // do not let focus be triggered
         // as it will make the native file dialog
         // appear for another selection
@@ -19297,11 +19295,9 @@
       emit('clear', props.modelValue);
 
       vue.nextTick(() => {
+        const isDirty = isDirtyModel.value;
         resetValidation();
-
-        if ($q.platform.is.mobile !== true) {
-          isDirtyModel.value = false;
-        }
+        isDirtyModel.value = isDirty;
       });
     }
 
@@ -19494,16 +19490,8 @@
       shouldActivate === true && props.autofocus === true && proxy.focus();
     });
 
-    vue.onMounted(() => {
-      if (
-        isRuntimeSsrPreHydration.value === true
-        && state.requiredForAttr === true
-        && props.for === void 0
-      ) {
-        state.targetUid.value = `f_${ uid$3() }`; // getTargetUid(void 0, true)
-      }
-
-      props.autofocus === true && proxy.focus();
+    props.autofocus === true && vue.onMounted(() => {
+      proxy.focus();
     });
 
     vue.onBeforeUnmount(() => {
@@ -21282,7 +21270,7 @@
       const vm = vue.getCurrentInstance();
       Object.assign(vm.proxy, {
         poll: () => { poll !== void 0 && poll(); },
-        trigger, stop, reset, resume, setIndex
+        trigger, stop, reset, resume, setIndex, updateScrollTarget
       });
 
       return () => {
@@ -41060,7 +41048,7 @@
    */
 
   var index_umd = {
-    version: '2.14.2',
+    version: '2.14.3',
     install (app, opts) {
       installQuasar(app, {
         components,