Merge branch 'dev' into fix-default-prop-function-dectection

jacobmllr95 · web-flow · commit 7a64080c4256 · 2020-11-24T23:59:51.000+01:00
diff --git a/src/mixins/form-text.js b/src/mixins/form-text.js
@@ -72,9 +72,10 @@ export default {
   },
   props,
   data() {
+    const { value } = this
     return {
-      localValue: toString(this.value),
-      vModelValue: this.value
+      localValue: toString(value),
+      vModelValue: this.modifyValue(value)
     }
   },
   computed: {
@@ -115,14 +116,15 @@ export default {
     }
   },
   watch: {
-    value(newVal) {
-      const stringifyValue = toString(newVal)
-      if (stringifyValue !== this.localValue && newVal !== this.vModelValue) {
+    value(newValue) {
+      const stringifyValue = toString(newValue)
+      const modifiedValue = this.modifyValue(newValue)
+      if (stringifyValue !== this.localValue || modifiedValue !== this.vModelValue) {
         // Clear any pending debounce timeout, as we are overwriting the user input
         this.clearDebounce()
         // Update the local values
         this.localValue = stringifyValue
-        this.vModelValue = newVal
+        this.vModelValue = modifiedValue
       }
     }
   },
@@ -133,14 +135,6 @@ export default {
   mounted() {
     // Set up destroy handler
     this.$on('hook:beforeDestroy', this.clearDebounce)
-    // Preset the internal state
-    const value = this.value
-    const stringifyValue = toString(value)
-    /* istanbul ignore next */
-    if (stringifyValue !== this.localValue && value !== this.vModelValue) {
-      this.localValue = stringifyValue
-      this.vModelValue = value
-    }
   },
   methods: {
     clearDebounce() {
@@ -155,6 +149,7 @@ export default {
       return value
     },
     modifyValue(value) {
+      value = toString(value)
       // Emulate `.trim` modifier behaviour
       if (this.trim) {
         value = value.trim()
@@ -166,7 +161,7 @@ export default {
       return value
     },
     updateValue(value, force = false) {
-      const lazy = this.lazy
+      const { lazy } = this
       if (lazy && !force) {
         return
       }
