quasar 2.14.1 → 2.14.3

package/src/composables/private/use-validate.js

@@ -21,6 +21,7 @@ export const useValidateProps = {
   reactiveRules: Boolean,
   lazyRules: {
     type: [ Boolean, String ],
+    default: false, // statement unneeded but avoids future vue implementation changes
     validator: v => lazyRulesValues.includes(v)
   }
 }
@@ -30,7 +31,7 @@ export default function (focused, innerLoading) {
 
   const innerError = ref(false)
   const innerErrorMessage = ref(null)
-  const isDirtyModel = ref(null)
+  const isDirtyModel = ref(false)
 
   useFormChild({ validate, resetValidation })
 
@@ -42,10 +43,14 @@ export default function (focused, innerLoading) {
     && props.rules.length !== 0
   )
 
-  const hasActiveRules = computed(() =>
+  const canDebounceValidate = computed(() => (
     props.disable !== true
     && hasRules.value === true
-  )
+    // Should not have a validation in progress already;
+    // It might mean that focus switched to submit btn and
+    // QForm's submit() has been called already (ENTER key)
+    && innerLoading.value === false
+  ))
 
   const hasError = computed(() =>
     props.error === true || innerError.value === true
@@ -58,15 +63,31 @@ export default function (focused, innerLoading) {
   ))
 
   watch(() => props.modelValue, () => {
-    validateIfNeeded()
+    isDirtyModel.value = true
+
+    if (
+      canDebounceValidate.value === true
+      // trigger validation if not using any kind of lazy-rules
+      && props.lazyRules === false
+    ) {
+      debouncedValidate()
+    }
   })
 
+  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, () => {
-          validateIfNeeded(true)
-        })
+        unwatchRules = watch(() => props.rules, onRulesChange, { immediate: true, deep: true })
       }
     }
     else if (unwatchRules !== void 0) {
@@ -75,32 +96,24 @@ export default function (focused, innerLoading) {
     }
   }, { immediate: true })
 
+  watch(() => props.lazyRules, onRulesChange)
+
   watch(focused, val => {
     if (val === true) {
-      if (isDirtyModel.value === null) {
-        isDirtyModel.value = false
-      }
-    }
-    else if (isDirtyModel.value === false) {
       isDirtyModel.value = true
-
-      if (
-        hasActiveRules.value === true
-        && props.lazyRules !== 'ondemand'
-        // Don't re-trigger if it's already in progress;
-        // It might mean that focus switched to submit btn and
-        // QForm's submit() has been called already (ENTER key)
-        && innerLoading.value === false
-      ) {
-        debouncedValidate()
-      }
+    }
+    else if (
+      canDebounceValidate.value === true
+      && props.lazyRules !== 'ondemand'
+    ) {
+      debouncedValidate()
     }
   })
 
   function resetValidation () {
     validateIndex++
     innerLoading.value = false
-    isDirtyModel.value = null
+    isDirtyModel.value = false
     innerError.value = false
     innerErrorMessage.value = null
     debouncedValidate.cancel()
@@ -113,7 +126,10 @@ export default function (focused, innerLoading) {
    *   - Promise (pending async validation)
    */
   function validate (val = props.modelValue) {
-    if (hasActiveRules.value !== true) {
+    if (
+      props.disable === true
+      || hasRules.value === false
+    ) {
       return true
     }
 
@@ -182,16 +198,6 @@ export default function (focused, innerLoading) {
     )
   }
 
-  function validateIfNeeded (changedRules) {
-    if (
-      hasActiveRules.value === true
-      && props.lazyRules !== 'ondemand'
-      && (isDirtyModel.value === true || (props.lazyRules !== true && changedRules !== true))
-    ) {
-      debouncedValidate()
-    }
-  }
-
   const debouncedValidate = debounce(validate, 0)
 
   onBeforeUnmount(() => {

package/src/plugins/Dark.js

@@ -1,5 +1,4 @@
 import defineReactivePlugin from '../utils/private/define-reactive-plugin.js'
-import { isRuntimeSsrPreHydration } from './Platform.js'
 
 const Plugin = defineReactivePlugin({
   isActive: false,
@@ -38,7 +37,7 @@ const Plugin = defineReactivePlugin({
     }
   },
 
-  install ({ $q, onSSRHydrated, ssrContext }) {
+  install ({ $q, ssrContext }) {
     const { dark } = $q.config
 
     if (__QUASAR_SSR_SERVER__) {
@@ -66,31 +65,8 @@ const Plugin = defineReactivePlugin({
 
     $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)
     }
   }
 })

package/src/plugins/Notify.js

@@ -19,6 +19,7 @@ const notificationsList = {}
 const positionClass = {}
 const emptyRE = /^\s*$/
 const notifRefs = []
+const invalidTimeoutValues = [ void 0, null, true, false, '' ]
 
 const positionList = [
   'top-left', 'top-right',
@@ -112,15 +113,15 @@ function addNotification (config, $q, originalApi) {
     notif.position = 'bottom'
   }
 
-  if (notif.timeout === void 0) {
+  if (invalidTimeoutValues.includes(notif.timeout) === true) {
     notif.timeout = 5000
   }
   else {
-    const t = parseInt(notif.timeout, 10)
+    const t = Number(notif.timeout) // we catch exponential notation too with Number() casting
     if (isNaN(t) || t < 0) {
       return logError('wrong timeout', config)
     }
-    notif.timeout = t
+    notif.timeout = Number.isFinite(t) ? t : 0
   }
 
   if (notif.timeout === 0) {

package/src/plugins/Notify.json

@@ -166,7 +166,7 @@
 
       "timeout": {
         "type": "Number",
-        "desc": "Amount of time to display (in milliseconds)",
+        "desc": "Amount of time to display (in milliseconds). Set to 0 to never dismiss automatically.",
         "default": 5000
       },
 
@@ -392,7 +392,7 @@
 
             "timeout": {
               "type": "Number",
-              "desc": "Amount of time to display (in milliseconds)",
+              "desc": "Amount of time to display (in milliseconds). Set to 0 to never dismiss automatically.",
               "default": 5000,
               "examples": [ 2500 ]
             },

package/src/utils/copy-to-clipboard.js

@@ -1,4 +1,3 @@
-
 import { addFocusout, removeFocusout } from './private/focusout.js'
 
 function fallback (text) {

package/src/utils/get-css-var.js

@@ -1,4 +1,3 @@
-
 export default function getCssVar (propName, element = document.body) {
   if (typeof propName !== 'string') {
     throw new TypeError('Expected a string as propName')

package/src/utils/is.js

@@ -1,4 +1,3 @@
-
 export function isDeepEqual (a, b) {
   if (a === b) {
     return true

package/src/utils/private/define-reactive-plugin.js

@@ -1,4 +1,3 @@
-
 import { reactive } from 'vue'
 import { injectProp } from './inject-obj-prop.js'
 

package/src/utils/private/global-config.js

@@ -1,4 +1,3 @@
-
 export const globalConfig = {}
 export let globalConfigIsFrozen = false
 

package/src/utils/private/touch.js

@@ -1,4 +1,3 @@
-
 const modifiersAll = {
   left: true,
   right: true,

package/src/utils/private/vm.js

@@ -1,4 +1,3 @@
-
 // copied to docs too
 export function getParentProxy (proxy) {
   if (Object(proxy.$parent) === proxy.$parent) {

package/src/utils/run-sequential-promises.js

@@ -1,4 +1,3 @@
-
 function parsePromises (sequentialPromises) {
   const isList = Array.isArray(sequentialPromises)