@eturnity/eturnity_reusable_components 8.22.23-EPDM-15023.1 → 8.22.23-EPDM-15888.1

package/src/components/infoText/index.vue

@@ -49,10 +49,7 @@
         <slot name="trigger"></slot>
       </IconWrapper>
     </div>
-    <Teleport
-      v-if="!hideInfoText && isVisible && (!!text || $slots.default)"
-      to="body"
-    >
+    <Teleport v-if="isVisible && (!!text || $slots.default)" to="body">
       <TextWrapper data-test-id="info_text_wrapper" :style="wrapperStyle">
         <TextOverlay
           ref="infoBox"

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

@@ -230,6 +230,7 @@
   //</inputNumber>
   import styled from 'vue3-styled-components'
   import {
+    roundViaInteger,
     stringToNumber,
     numberToString,
   } from '../../../helpers/numberConverter'
@@ -798,10 +799,6 @@
         type: Boolean,
         default: false,
       },
-      hasSpaceBetweenUnit: {
-        type: Boolean,
-        default: true,
-      },
     },
     data() {
       return {
@@ -815,12 +812,8 @@
       displayedPlaceholder() {
         if (this.placeholder) return this.placeholder
         if (this.defaultNumber)
-          return `${this.defaultNumber}${this.hasSpaceBetweenUnit ? ' ' : ''}${
-            this.unitName ? this.unitName : ''
-          }`
-        return `${this.minNumber || 0}${this.hasSpaceBetweenUnit ? ' ' : ''}${
-          this.unitName ? this.unitName : ''
-        }`
+          return `${this.defaultNumber} ${this.unitName ? this.unitName : ''}`
+        return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
       },
       hasSlot() {
         return !!this.$slots.default
@@ -869,7 +862,7 @@
             this.inputValue = this.value
             this.enteredValue =
               typeof this.value === 'number' && !isNaN(this.value)
-                ? Number(this.value.toFixed(this.numberPrecision))
+                ? roundViaInteger(this.value, this.numberPrecision)
                 : this.value
           }
         },
@@ -973,7 +966,7 @@
             minDecimals: this.minDecimals,
           })
         } else if (typeof evaluated === 'number') {
-          evaluated = evaluated.toFixed(this.numberPrecision)
+          evaluated = roundViaInteger(evaluated, this.numberPrecision)
         }
         return evaluated
       },
@@ -1034,9 +1027,8 @@
           return
         }
         this.textInput = this.formatWithCurrency(this.value)
-        const textInputWithoutUnit = this.formatWithoutUnit(this.value)
         this.enteredValue = stringToNumber({
-          value: textInputWithoutUnit,
+          value: this.textInput,
           numberPrecision: this.numberPrecision,
           minDecimals: this.minDecimals,
         })
@@ -1057,38 +1049,6 @@
           this.$refs.inputField1.$el.blur()
         })
       },
-      formatWithoutUnit(value) {
-        let adjustedMinValue =
-          value || value === 0
-            ? value
-            : this.defaultNumber
-            ? this.defaultNumber
-            : this.minNumber || this.minNumber === 0
-            ? this.minNumber
-            : ''
-        if (adjustedMinValue || adjustedMinValue === 0) {
-          let input = this.numberToStringEnabled
-            ? numberToString({
-                value: adjustedMinValue,
-                numberPrecision: this.numberPrecision,
-                minDecimals: this.minDecimals,
-              })
-            : adjustedMinValue
-          return input
-        } else if (!adjustedMinValue && adjustedMinValue !== 0) {
-          return ''
-        } else if (this.isFocused) {
-          return value
-        } else {
-          return this.numberToStringEnabled
-            ? numberToString({
-                value: adjustedMinValue,
-                numberPrecision: this.numberPrecision,
-                minDecimals: this.minDecimals,
-              })
-            : adjustedMinValue
-        }
-      },
       formatWithCurrency(value) {
         let adjustedMinValue =
           value || value === 0
@@ -1109,7 +1069,7 @@
           let unit = this.showLinearUnitName ? '' : this.unitName
           //return input + ' ' + unit
           if (unit) {
-            return `${input}${this.hasSpaceBetweenUnit ? ' ' : ''}${unit}`
+            return input + ' ' + unit
           }
           return input
         } else if (!adjustedMinValue && adjustedMinValue !== 0) {

package/src/helpers/numberConverter.js

@@ -87,11 +87,20 @@ export const stringToNumber = ({
   }
   newVal = parseFloat(newVal)
   if (numberPrecision !== false) {
-    newVal = newVal.toFixed(numberPrecision)
+    newVal = roundViaInteger(newVal, numberPrecision)
   }
   return parseFloat(newVal)
 }
 
+export const roundViaInteger = (value, numberPrecision) => {
+  if (typeof value === 'string') {
+    value = parseFloat(value)
+  }
+  const factor = Math.pow(10, numberPrecision)
+  const roundedValue = Math.round(value * factor) / factor
+  return roundedValue
+}
+
 export const numberToString = ({ value, numberPrecision, minDecimals }) => {
   const minimumRounding = minDecimals ? minDecimals : 0
   value = !Number.isNaN(parseFloat(value)) ? parseFloat(value) : 0