quasar 2.14.2 → 2.14.3

package/dist/quasar.esm.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.
  */
@@ -796,36 +796,13 @@ const Plugin$9 = defineReactivePlugin({
     }
   },
 
-  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);
     }
   }
 });
@@ -1651,7 +1628,7 @@ function prepareApp (app, uiOpts, pluginOpts) {
 }
 
 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) {
@@ -1915,13 +1892,23 @@ var QAjaxBar = createComponent({
 
       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;
       }
@@ -2280,13 +2267,13 @@ var QIcon = createComponent({
       }
 
       if (type.value.img === true) {
-        return h('span', data, hMergeSlot(slots.default, [
+        return h(props.tag, data, hMergeSlot(slots.default, [
           h('img', { src: type.value.src })
         ]))
       }
 
       if (type.value.svg === true) {
-        return h('span', data, hMergeSlot(slots.default, [
+        return h(props.tag, data, hMergeSlot(slots.default, [
           h('svg', {
             viewBox: type.value.viewBox || '0 0 24 24'
           }, type.value.nodes)
@@ -2294,7 +2281,7 @@ var QIcon = createComponent({
       }
 
       if (type.value.svguse === true) {
-        return h('span', data, hMergeSlot(slots.default, [
+        return h(props.tag, data, hMergeSlot(slots.default, [
           h('svg', {
             viewBox: type.value.viewBox
           }, [
@@ -5862,6 +5849,35 @@ function uid$3 () {
     + 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 = ref(initialId);
+
+    if (requiredId === true && initialId === void 0) {
+      onMounted(() => {
+        id.value = `f_${ uid$3() }`; // getId(void 0, true)
+      });
+    }
+
+    return id
+  }
+
+  return ref(
+    getId(initialId, requiredId)
+  )
+}
+
 const btnPropsList = Object.keys(useBtnProps);
 
 const passBtnProps = props => btnPropsList.reduce(
@@ -5919,13 +5935,13 @@ var QBtnDropdown = createComponent({
 
     const showing = ref(props.modelValue);
     const menuRef = ref(null);
-    const targetUid = uid$3();
+    const targetUid = useId();
 
     const ariaAttrs = 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)
       };
 
@@ -6019,7 +6035,7 @@ var QBtnDropdown = createComponent({
       props.disableDropdown !== true && Arrow.push(
         h(QMenu, {
           ref: menuRef,
-          id: targetUid,
+          id: targetUid.value,
           class: props.contentClass,
           style: props.contentStyle,
           cover: props.cover,
@@ -10506,7 +10522,7 @@ function useTab (props, slots, emit, routeData) {
               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 });
@@ -18072,7 +18088,7 @@ var QExpansionItem = createComponent({
     );
 
     const blurTargetRef = ref(null);
-    const targetUid = uid$3();
+    const targetUid = useId();
 
     const { show, hide, toggle } = useModelToggle({ showing });
 
@@ -18140,7 +18156,7 @@ var QExpansionItem = createComponent({
       return {
         role: 'button',
         'aria-expanded': showing.value === true ? 'true' : 'false',
-        'aria-controls': targetUid,
+        'aria-controls': targetUid.value,
         'aria-label': toggleAriaLabel
       }
     });
@@ -18317,7 +18333,7 @@ var QExpansionItem = createComponent({
           key: 'e-content',
           class: 'q-expansion-item__content relative-position',
           style: contentStyle.value,
-          id: targetUid
+          id: targetUid.value
         }, hSlot(slots.default)),
         [ [
           vShow,
@@ -18492,7 +18508,7 @@ var QFab = createComponent({
   setup (props, { slots }) {
     const triggerRef = ref(null);
     const showing = ref(props.modelValue === true);
-    const targetUid = uid$3();
+    const targetUid = useId();
 
     const { proxy: { $q } } = getCurrentInstance();
     const { formClass, labelProps } = useFab(props, showing);
@@ -18520,7 +18536,7 @@ var QFab = createComponent({
 
     const actionAttrs = computed(() => {
       const attrs = {
-        id: targetUid,
+        id: targetUid.value,
         role: 'menu'
       };
 
@@ -18592,7 +18608,7 @@ var QFab = createComponent({
         fab: true,
         'aria-expanded': showing.value === true ? 'true' : 'false',
         'aria-haspopup': 'true',
-        'aria-controls': targetUid,
+        'aria-controls': targetUid.value,
         onClick: toggle
       }, getTriggerContent),
 
@@ -18754,7 +18770,7 @@ function useValidate (focused, innerLoading) {
 
   const innerError = ref(false);
   const innerErrorMessage = ref(null);
-  const isDirtyModel = ref(null);
+  const isDirtyModel = ref(false);
 
   useFormChild({ validate, resetValidation });
 
@@ -18797,18 +18813,20 @@ function useValidate (focused, innerLoading) {
     }
   });
 
+  function onRulesChange () {
+    if (
+      props.lazyRules !== 'ondemand'
+      && canDebounceValidate.value === true
+      && isDirtyModel.value === true
+    ) {
+      debouncedValidate();
+    }
+  }
+
   watch(() => props.reactiveRules, val => {
     if (val === true) {
       if (unwatchRules === void 0) {
-        unwatchRules = watch(() => props.rules, () => {
-          if (
-            canDebounceValidate.value === true
-            && isDirtyModel.value === true
-            && props.lazyRules !== 'ondemand'
-          ) {
-            debouncedValidate();
-          }
-        }, { immediate: true });
+        unwatchRules = watch(() => props.rules, onRulesChange, { immediate: true, deep: true });
       }
     }
     else if (unwatchRules !== void 0) {
@@ -18817,30 +18835,15 @@ function useValidate (focused, innerLoading) {
     }
   }, { immediate: true });
 
-  watch(() => props.lazyRules, val => {
-    if (
-      val === false
-      && canDebounceValidate.value === true
-      && isDirtyModel.value === true
-    ) {
-      debouncedValidate();
-    }
-  });
+  watch(() => props.lazyRules, onRulesChange);
 
   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();
     }
@@ -18849,7 +18852,7 @@ function useValidate (focused, innerLoading) {
   function resetValidation () {
     validateIndex++;
     innerLoading.value = false;
-    isDirtyModel.value = null;
+    isDirtyModel.value = false;
     innerError.value = false;
     innerErrorMessage.value = null;
     debouncedValidate.cancel();
@@ -18956,12 +18959,6 @@ function useValidate (focused, innerLoading) {
   }
 }
 
-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
@@ -19022,6 +19019,7 @@ function useFieldState ({ requiredForAttr = true, tagProp } = {}) {
   const { props, attrs, proxy, vnode } = getCurrentInstance();
 
   const isDark = useDark(props, proxy.$q);
+  const targetUid = useId(props.for, requiredForAttr);
 
   return {
     requiredForAttr,
@@ -19040,9 +19038,7 @@ function useFieldState ({ requiredForAttr = true, tagProp } = {}) {
     hasPopupOpen: false,
 
     splitAttrs: useSplitAttrs(attrs, vnode),
-    targetUid: ref(
-      getTargetUid(props.for, requiredForAttr)
-    ),
+    targetUid,
 
     rootRef: ref(null),
     targetRef: ref(null),
@@ -19194,9 +19190,11 @@ function useField (state) {
   }));
 
   const attributes = 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';
@@ -19208,7 +19206,7 @@ function useField (state) {
   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 () {
@@ -19284,7 +19282,7 @@ function useField (state) {
       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
@@ -19295,11 +19293,9 @@ function useField (state) {
     emit('clear', props.modelValue);
 
     nextTick(() => {
+      const isDirty = isDirtyModel.value;
       resetValidation();
-
-      if ($q.platform.is.mobile !== true) {
-        isDirtyModel.value = false;
-      }
+      isDirtyModel.value = isDirty;
     });
   }
 
@@ -19492,16 +19488,8 @@ function useField (state) {
     shouldActivate === true && props.autofocus === true && proxy.focus();
   });
 
-  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 && onMounted(() => {
+    proxy.focus();
   });
 
   onBeforeUnmount(() => {
@@ -21285,7 +21273,7 @@ var QInfiniteScroll = createComponent({
     const vm = getCurrentInstance();
     Object.assign(vm.proxy, {
       poll: () => { poll !== void 0 && poll(); },
-      trigger, stop, reset, resume, setIndex
+      trigger, stop, reset, resume, setIndex, updateScrollTarget
     });
 
     return () => {
@@ -40873,7 +40861,7 @@ function runSequentialPromises (
  */
 
 const Quasar = {
-  version: '2.14.2',
+  version: '2.14.3',
   install: installQuasar,
   lang: Plugin$8,
   iconSet: Plugin$7