@eturnity/eturnity_reusable_components 1.1.96 → 1.1.99

package/.prettierrc

@@ -0,0 +1,7 @@
+{
+    "semi": false,
+    "singleQuote": true,
+    "useTabs": false,
+    "trailingComma": "none",
+    "printWidth": 80
+  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.1.96",
+  "version": "1.1.99",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -21,7 +21,6 @@
         :inputWidth="inputWidth"
         :minWidth="minWidth"
         :value="formatWithCurrency(value)"
-        :hasLength="!!value && !!value.length"
         @blur="onInputBlur($event)"
         @focus="focusInput()"
         @keyup.enter="$emit('on-enter-click')"
@@ -86,7 +85,6 @@ const inputProps = {
   hasUnit: Boolean,
   inputWidth: String,
   minWidth: String,
-  hasLength: Boolean,
   isDisabled: Boolean,
   noBorder: Boolean,
   textAlign: String,
@@ -99,8 +97,6 @@ const InputContainer = styled("input", inputProps)`
       ? "1px solid " + props.theme.colors.red
       : props.noBorder
       ? "none"
-      : props.hasLength
-      ? "1px solid " + props.theme.colors.black
       : "1px solid " + props.theme.colors.mediumGray};
   padding: ${(props) =>
     props.hasUnit ? "11px 40px 11px 10px" : "11px 5px 11px 10px"};
@@ -269,13 +265,13 @@ export default {
     },
     numberToStringEnabled: {
       required: false,
-      default: true
-    }
+      default: true,
+    },
   },
   methods: {
     onChangeHandler(event) {
       if (isNaN(event)) {
-        event = ""
+        event = this.minNumber || this.minNumber === 0 ? this.minNumber : event
       }
       this.$emit("input-change", event)
     },
@@ -298,22 +294,27 @@ export default {
         } else {
           let num = stringToNumber({
             value: item,
-            numberPrecision: this.numberPrecision,
+            numberPrecision: false,
           })
           return num
         }
       })
       let evaluated = eval(formatted.join(""))
+      evaluated = stringToNumber({
+        value: evaluated,
+        numberPrecision: this.numberPrecision,
+      })
       return evaluated
     },
     onInputBlur(e) {
       this.isFocused = false
       let value = e.target.value
       let evaluatedInput = this.onEvaluateCode(value)
-      this.onChangeHandler(evaluatedInput)
-      if ((value && value.length) || this.minNumber !== null) {
+      this.onChangeHandler(evaluatedInput ? evaluatedInput : value)
+      if ((evaluatedInput && value.length) || this.minNumber !== null) {
         this.textInput = numberToString({
-          value: value && value.length ? evaluatedInput : this.minNumber,
+          value:
+            evaluatedInput && value.length ? evaluatedInput : this.minNumber,
           numberPrecision: this.numberPrecision,
         })
       }
@@ -342,19 +343,23 @@ export default {
           ? this.minNumber
           : ""
       if ((adjustedMinValue || adjustedMinValue === 0) && !this.isFocused) {
-        let input =  this.numberToStringEnabled ? numberToString({
-          value: adjustedMinValue,
-          numberPrecision: this.numberPrecision,
-        }) : adjustedMinValue
+        let input = this.numberToStringEnabled
+          ? numberToString({
+              value: adjustedMinValue,
+              numberPrecision: this.numberPrecision,
+            })
+          : adjustedMinValue
         let unit = this.showLinearUnitName ? "" : this.unitName
         return input + " " + unit
       } else if (!adjustedMinValue && adjustedMinValue !== 0) {
         return ""
       } else {
-        return  this.numberToStringEnabled ? numberToString({
-          value: adjustedMinValue,
-          numberPrecision: this.numberPrecision,
-        }) : adjustedMinValue
+        return this.numberToStringEnabled
+          ? numberToString({
+              value: adjustedMinValue,
+              numberPrecision: this.numberPrecision,
+            })
+          : adjustedMinValue
       }
     },
   },

package/src/components/tableDropdown/index.vue

@@ -218,6 +218,7 @@ const ComponentItem = styled("td", ItemAttrs)`
   &.table-dropdown-item {
     background-clip: content-box;
     padding: 8px 0 7px 0 !important;
+    vertical-align: middle;
 
     @media not all and (min-resolution: 0.001dpcm) {
       @supports (-webkit-appearance: none) {

package/src/helpers/numberConverter.js

@@ -1,79 +1,88 @@
-export const stringToNumber = ({ value, numberPrecision, allowNegative }) => {
+export const stringToNumber = ({
+  value,
+  numberPrecision = false,
+  allowNegative
+}) => {
   // This is for saving. It converts our input string to a readable number
   let newVal = value.toString()
-  const selectedLang = localStorage.getItem("lang")
+  const selectedLang = localStorage.getItem('lang')
   // The first replace will replace not allowed characters with a blank
   if (
-    selectedLang === "de-DE" ||
-    selectedLang === "no-no" ||
-    selectedLang === "da-dk" ||
-    selectedLang === "de-lu" ||
-    selectedLang === "de-be" ||
-    selectedLang === "es-es" ||
-    selectedLang === "de"
+    selectedLang === 'de-DE' ||
+    selectedLang === 'no-no' ||
+    selectedLang === 'da-dk' ||
+    selectedLang === 'de-lu' ||
+    selectedLang === 'de-be' ||
+    selectedLang === 'es-es' ||
+    selectedLang === 'de'
   ) {
     // replace dots with blank, and commas with a dot: 1.234,56 --> 1234.56
     if (allowNegative) {
       newVal = newVal
-        .replace(/[^\d-.,']/g, "")
-        .replace(/[.\s]/g, "")
-        .replace(/[,\s]/, ".")
+        .replace(/[^\d-.,']/g, '')
+        .replace(/[.\s]/g, '')
+        .replace(/[,\s]/, '.')
     } else {
       newVal = newVal
-        .replace(/[^\d.,']/g, "")
-        .replace(/[.\s]/g, "")
-        .replace(/[,\s]/, ".")
+        .replace(/[^\d.,']/g, '')
+        .replace(/[.\s]/g, '')
+        .replace(/[,\s]/, '.')
     }
-  } else if (selectedLang === "en-us") {
+  } else if (selectedLang === 'en-us') {
     // replace commas with blank: 1,234.56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/[,\s]/g, '')
     }
   } else if (
-    selectedLang === "de-ch" ||
-    selectedLang === "fr-ch" ||
-    selectedLang === "it-ch"
+    selectedLang === 'de-ch' ||
+    selectedLang === 'fr-ch' ||
+    selectedLang === 'it-ch'
   ) {
     // replace ' with blank: 1'234.56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/['\s]/g, "")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/['\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/['\s]/g, "")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/['\s]/g, '')
     }
   } else if (
-    selectedLang === "fr-fr" ||
-    selectedLang === "fr-be" ||
-    selectedLang === "fr-lu" ||
-    selectedLang === "sv-se" ||
-    selectedLang === "pt-pt" ||
-    selectedLang === "fr"
+    selectedLang === 'fr-fr' ||
+    selectedLang === 'fr-be' ||
+    selectedLang === 'fr-lu' ||
+    selectedLang === 'sv-se' ||
+    selectedLang === 'pt-pt' ||
+    selectedLang === 'fr'
   ) {
     // replace space with blank, and commas with dot: 1 234,56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/[,\s]/g, ".")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '.')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/[,\s]/g, ".")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/[,\s]/g, '.')
     }
   } else {
     // en-US as default: 1,234.56 --> 1234.56
     if (allowNegative) {
-      newVal = newVal.replace(/[^\d-.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, "").replace(/[,\s]/g, "")
+      newVal = newVal.replace(/[^\d.,']/g, '').replace(/[,\s]/g, '')
     }
   }
-  newVal = parseFloat(newVal).toFixed(numberPrecision)
+  newVal = parseFloat(newVal)
+  if (numberPrecision !== false) {
+    newVal = newVal.toFixed(numberPrecision)
+  }
   return parseFloat(newVal)
 }
 
 export const numberToString = ({ value, numberPrecision }) => {
-  let selectedLang = localStorage.getItem("lang")
-    ? localStorage.getItem("lang") === 'fr-lu' ? 'fr-fr' : localStorage.getItem("lang")
-    : "en-US"
+  let selectedLang = localStorage.getItem('lang')
+    ? localStorage.getItem('lang') === 'fr-lu'
+      ? 'fr-fr'
+      : localStorage.getItem('lang')
+    : 'en-US'
   return value.toLocaleString(selectedLang, {
     minimumFractionDigits: numberPrecision,
-    maximumFractionDigits: numberPrecision,
+    maximumFractionDigits: numberPrecision
   })
 }