@eturnity/eturnity_reusable_components 8.22.16 → 8.22.18

package/src/components/inputs/inputNumber/index.vue

@@ -1002,12 +1002,23 @@
         this.textInput = evaluatedVal
       },
       onInputBlur(e) {
+        const defaultNumber =
+          this.defaultNumber || this.defaultNumber === 0
+            ? this.defaultNumber
+            : this.minNumber || this.minNumber === 0
+            ? this.minNumber
+            : null
         this.isFocused = false
-        const value = this.onEvaluateCode(this.enteredValue)
-        if (Number.isNaN(value) || value === undefined) {
-          this.$emit(EVENT_TYPES.INPUT_BLUR, this.inputValue)
-        } else {
-          this.$emit(EVENT_TYPES.INPUT_BLUR, value)
+        let evaluatedVal
+        try {
+          evaluatedVal = this.onEvaluateCode(this.enteredValue)
+        } finally {
+          this.inputValue = this.onChangeHandler(evaluatedVal)
+          if (isNaN(this.inputValue) && this.enteredval === undefined) {
+            this.$emit(EVENT_TYPES.INPUT_BLUR, defaultNumber)
+          } else if (!isNaN(this.inputValue)) {
+            this.$emit(EVENT_TYPES.INPUT_BLUR, this.inputValue)
+          }
         }
       },
       focusInput() {
@@ -1016,8 +1027,15 @@
         }
         this.isFocused = true
         this.textInput = this.formatWithCurrency(this.value)
-        this.inputValue = this.value
-        this.enteredValue = this.value
+
+        this.enteredValue = stringToNumber({
+          value: this.textInput,
+          numberPrecision: this.numberPrecision,
+          minDecimals: this.minDecimals,
+        })
+        if (isNaN(this.enteredValue)) {
+          this.enteredValue = ''
+        }
         this.$nextTick(() => {
           this.$refs.inputField1.$el.select()
         })
@@ -1051,7 +1069,10 @@
             : adjustedMinValue
           let unit = this.showLinearUnitName ? '' : this.unitName
           //return input + ' ' + unit
-          return input + ' ' + unit
+          if (unit) {
+            return input + ' ' + unit
+          }
+          return input
         } else if (!adjustedMinValue && adjustedMinValue !== 0) {
           return ''
         } else if (this.isFocused) {