@eturnity/eturnity_reusable_components 6.38.0 → 6.39.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "6.38.0",
+  "version": "6.39.1",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -60,4 +60,4 @@
   "author": "Aaron Enser",
   "license": "ISC",
   "homepage": "https://bitbucket.org/eturnitydevs/eturnity_reusable_components#readme"
-}
+}

package/src/components/buttons/mainButton/index.vue

@@ -5,6 +5,7 @@
       :minWidth="minWidth"
       :isDisabled="isDisabled"
       :customColor="customColor"
+      :noWrap="noWrap"
     >
       {{ text }}
     </button-container>
@@ -26,7 +27,7 @@ import styled from "vue-styled-components"
 
 const PageContainer = styled.div``
 
-const ButtonAttrs = { type: String, isDisabled: Boolean, minWidth: String, customColor: String }
+const ButtonAttrs = { type: String, isDisabled: Boolean, minWidth: String, customColor: String, noWrap: Boolean }
 const ButtonContainer = styled("div", ButtonAttrs)`
   padding: 7px 15px;
   font-size: 13px;
@@ -48,6 +49,7 @@ const ButtonContainer = styled("div", ButtonAttrs)`
   cursor: ${(props) => (props.isDisabled ? "not-allowed" : "pointer")};
   user-select: none;
   ${(props) => (props.minWidth ? `min-width: ${props.minWidth};` : '')};
+  ${(props) => (props.noWrap ? `white-space: nowrap;` : '')};
 
   &:hover {
     opacity: ${(props) => (props.isDisabled ? "1" : "0.8")};
@@ -80,6 +82,10 @@ export default {
       required: false,
       default: null,
     },
+    noWrap: {
+      required: false,
+      default: false
+    },
     minWidth: {
       required: false,
       default: null

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

@@ -311,7 +311,8 @@ export default {
     return {
       textInput: '',
       isFocused: false,
-      warningIcon: warningIcon
+      warningIcon: warningIcon,
+      isBlurred: false
     }
   },
   props: {
@@ -488,7 +489,9 @@ export default {
           return num
         }
       })
-      let evaluated = eval(formatted.join(''))
+      let evaluated
+      formatted = this.removeStringItemsAfterLastNumber(formatted)
+      evaluated = eval(formatted.join(' '))
       if (typeof evaluated === 'string') {
         evaluated = stringToNumber({
           value: evaluated,
@@ -499,7 +502,32 @@ export default {
       }
       return evaluated
     },
+    removeStringItemsAfterLastNumber(array) {
+      // fixed in EPDM-6487, in order to prevent 'Unexpected end of input'
+      let lastNumberIndex = -1
+      // Find the index of the last number in the array
+      for (let i = array.length - 1; i >= 0; i--) {
+        if (typeof array[i] === 'number') {
+          lastNumberIndex = i
+          break
+        }
+      }
+      // if there are no numbers, return an empty array
+      if (lastNumberIndex === -1) {
+        return []
+      }
+      // Remove non-numeric items after the last number
+      if (lastNumberIndex !== -1) {
+        const newArray = array.slice(0, lastNumberIndex + 1)
+        return newArray
+      }
+      return array
+    },
     onInput(value) {
+      if (this.isBlurred) {
+        this.isBlurred = false
+        return
+      }
       if (value === '') {
         this.$emit('on-input', '')
       }
@@ -514,6 +542,8 @@ export default {
     },
     onInputBlur(e) {
       this.isFocused = false
+      // setting isBlurred so we don't trigger onInput as well
+      this.isBlurred = true
       let value = e.target.value
       let evaluatedInput = this.onEvaluateCode(value)
       this.onChangeHandler(evaluatedInput ? evaluatedInput : value)

package/src/helpers/numberConverter.js

@@ -20,7 +20,9 @@ export const stringToNumber = ({
     selectedLang === 'de-be' ||
     selectedLang === 'es-es' ||
     selectedLang === 'de' ||
+    selectedLang === 'de-at' ||
     selectedLang === 'it' ||
+    selectedLang === 'it-it' ||
     selectedLang === 'nl-nl' ||
     selectedLang === 'nl-be'
   ) {

package/src/helpers/translateLang.js

@@ -8,6 +8,8 @@ export const translateLang = (lang) => {
     return 'english_uk'
   } else if (lang === 'de' || lang === 'de-de') {
     return 'german'
+  } else if (lang === 'de-at') {
+    return 'german_at'
   } else if (lang === 'de-ch') {
     return 'german_ch'
   } else if (lang === 'de-lu') {
@@ -34,8 +36,10 @@ export const translateLang = (lang) => {
     return 'swedish'
   } else if (lang === 'no-no' || lang === 'nb-no') {
     return 'norwegian'
-  } else if (lang === 'nl-nl' || lang === 'nl') {
-    return 'nl-nl'
+  } else if (lang === 'nl-nl') {
+    return 'dutch_nl'
+  } else if (lang === 'nl-be') {
+    return 'dutch_be'
   } else if (lang === 'cs') {
     return 'czech'
   } else if (lang === 'fi-fi') {