@eturnity/eturnity_reusable_components 1.2.19-EPDM-5262.5 → 1.2.19-EPDM-5262.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.19-EPDM-5262.5",
+  "version": "1.2.19-EPDM-5262.6",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/App.vue

@@ -101,7 +101,7 @@ export default {
         number_format_precision: 4,
         number_min_allowed: 0,
         number_max_allowed: 10,
-        unit_short_name: 'cm'
+        unit_short_name: 'cm',
       },
       dropdownOpen: false,
       isChecked: false,
@@ -109,47 +109,47 @@ export default {
         {
           name: 'Option 1',
           value: 'option_1',
-          disabled: true
+          disabled: true,
         },
         {
           name: 'Option 2',
-          value: 'option_2'
+          value: 'option_2',
         },
         {
           name: 'Option 3',
-          value: 'option_3'
+          value: 'option_3',
         },
         {
           name: 'Option 4',
-          value: 'option_4'
-        }
+          value: 'option_4',
+        },
       ],
       itemOptions: [
         {
           display_name: 'Test 1',
           company_item_number: '123',
           model: 'BTB-2145 Long Text Long Text Long Text Long Text Long Text',
-          id: 1
+          id: 1,
         },
         {
           display_name: 'Test 2',
           company_item_number: '1234',
           model: 'BTB-123',
-          id: 2
+          id: 2,
         },
         {
           display_name: 'Test 3',
           company_item_number: '12345',
           model: 'BTB-543',
-          id: 3
+          id: 3,
         },
         {
           display_name: 'Test 4',
           company_item_number: '123456',
           model: 'BTB-4930',
-          id: 4
-        }
-      ]
+          id: 4,
+        },
+      ],
     }
   },
   methods: {
@@ -174,21 +174,21 @@ export default {
         {
           value: this.getComponentInfo({
             row: this.itemOptions[0],
-            value: 'display_name'
-          })
+            value: 'display_name',
+          }),
         },
         {
           value: this.getComponentInfo({
             row: this.itemOptions[0],
-            value: 'company_item_number'
-          })
+            value: 'company_item_number',
+          }),
         },
         {
           value: this.getComponentInfo({
             row: this.itemOptions[0],
-            value: 'model'
-          })
-        }
+            value: 'model',
+          }),
+        },
       ]
       return items
     },
@@ -202,8 +202,8 @@ export default {
         item = '-'
       }
       return item
-    }
-  }
+    },
+  },
 }
 </script>
 

package/src/assets/theme.js

@@ -1,34 +1,34 @@
 const theme = {
   colors: {
-    primary: "#48a2d0",
-    secondary: "#fdb813",
-    tertiary: "#d5d5d5",
-    black: "#353535",
-    yellow: "#fdb813",
-    darkGray: "#818181",
-    gray1: "#666",
-    mediumGray: "#d5d5d5",
-    lightGray: "#f2f2f2",
-    white: "#fff",
-    blue: "#48a2d0",
-    red: "#ff5656",
-    blue1: "#e4efff",
-    grey1: "#666",
-    grey2: "#c4c4c4",
-    grey3: "#b2b9c5",
-    grey4: "#ebeef4",
-    grey5: "#fafafa",
-    green: "#99db0c",
-    disabled: "#dfe1e1",
+    primary: '#48a2d0',
+    secondary: '#fdb813',
+    tertiary: '#d5d5d5',
+    black: '#353535',
+    yellow: '#fdb813',
+    darkGray: '#818181',
+    gray1: '#666',
+    mediumGray: '#d5d5d5',
+    lightGray: '#f2f2f2',
+    white: '#fff',
+    blue: '#48a2d0',
+    red: '#ff5656',
+    blue1: '#e4efff',
+    grey1: '#666',
+    grey2: '#c4c4c4',
+    grey3: '#b2b9c5',
+    grey4: '#dee2eb',
+    grey5: '#fafafa',
+    green: '#99db0c',
+    disabled: '#dfe1e1'
   },
   screen: {
-    mobileSmall: "345px",
-    mobile: "425px",
-    mobileLarge: "530px",
-    tablet: "768px",
-    tabletLarge: "950px",
+    mobileSmall: '345px',
+    mobile: '425px',
+    mobileLarge: '530px',
+    tablet: '768px',
+    tabletLarge: '950px'
   },
-  borderRadius: "4px",
+  borderRadius: '4px'
 }
 
 export default theme

package/src/components/icon/index.vue

@@ -37,7 +37,8 @@ const IconImage = styled('div', IconImageProps)`
     height: ${(props) => props.size};
   }
   svg > path {
-    ${(props) => props.color && `fill: ${props.color};`}
+    ${(props) =>
+      props.color && `fill: ${props.theme.colors[props.color] || props.color};`}
   }
   &:hover > svg > path {
     ${(props) => props.hoveredColor && `fill: ${props.hoveredColor};`}

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

@@ -33,7 +33,7 @@
 //     backgroundColor="red"
 //     :isDisabled="true"
 // />
-import styled from "vue-styled-components"
+import styled from 'vue-styled-components'
 
 const ComponentWrapper = styled.div`
   min-height: 18px;
@@ -45,34 +45,33 @@ const containerAttrs = {
   hasLabel: Boolean,
   backgroundColor: String,
   isChecked: Boolean,
-  isDisabled: Boolean,
+  isDisabled: Boolean
 }
-const Container = styled("label", containerAttrs)`
+const Container = styled('label', containerAttrs)`
   display: grid;
-  grid-template-columns: ${(props) => (props.hasLabel ? "18px auto" : "18px")};
+  grid-template-columns: ${(props) => (props.hasLabel ? '18px auto' : '18px')};
   grid-gap: 16px;
   align-content: center;
-  /* align-items: center; */
   color: ${(props) => props.theme.colors.black};
   position: relative;
-  cursor: ${(props) => (props.isDisabled ? "not-allowed" : "pointer")};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
   font-size: 16px;
   user-select: none;
 
   .checkmark {
     position: absolute;
     height: ${(props) =>
-      props.size === "medium"
-        ? "25px"
-        : props.size === "small"
-        ? "16px"
-        : "25px"};
+      props.size === 'medium'
+        ? '25px'
+        : props.size === 'small'
+        ? '16px'
+        : '25px'};
     width: ${(props) =>
-      props.size === "medium"
-        ? "25px"
-        : props.size === "small"
-        ? "16px"
-        : "25px"};
+      props.size === 'medium'
+        ? '25px'
+        : props.size === 'small'
+        ? '16px'
+        : '25px'};
     background-color: ${(props) =>
       props.isChecked
         ? props.backgroundColor
@@ -80,7 +79,7 @@ const Container = styled("label", containerAttrs)`
           : props.theme.colors.green
         : props.isDisabled
         ? props.theme.colors.lightGray
-        : "#fff"};
+        : '#fff'};
     border-radius: 4px;
     border: 1px solid
       ${(props) =>
@@ -91,34 +90,34 @@ const Container = styled("label", containerAttrs)`
           : props.theme.colors.mediumGray};
 
     &:after {
-      content: "";
+      content: '';
       position: absolute;
-      display: ${(props) => (props.isChecked ? "block" : "none")};
+      display: ${(props) => (props.isChecked ? 'block' : 'none')};
     }
   }
 
   .checkmark:after {
     left: ${(props) =>
-      props.size === "medium" ? "9px" : props.size === "small" ? "5px" : "9px"};
+      props.size === 'medium' ? '9px' : props.size === 'small' ? '5px' : '9px'};
     top: ${(props) =>
-      props.size === "medium" ? "5px" : props.size === "small" ? "2px" : "5px"};
+      props.size === 'medium' ? '5px' : props.size === 'small' ? '2px' : '5px'};
     width: ${(props) =>
-      props.size === "medium" ? "5px" : props.size === "small" ? "3px" : "5px"};
+      props.size === 'medium' ? '5px' : props.size === 'small' ? '3px' : '5px'};
     height: ${(props) =>
-      props.size === "medium"
-        ? "10px"
-        : props.size === "small"
-        ? "6px"
-        : "10px"};
+      props.size === 'medium'
+        ? '10px'
+        : props.size === 'small'
+        ? '6px'
+        : '10px'};
     border: solid
       ${(props) =>
         props.checkColor ? props.checkColor : props.theme.colors.white};
     border-width: ${(props) =>
-      props.size === "medium"
-        ? "0 3px 3px 0"
-        : props.size === "small"
-        ? "0 2px 2px 0"
-        : "0 3px 3px 0"};
+      props.size === 'medium'
+        ? '0 3px 3px 0'
+        : props.size === 'small'
+        ? '0 2px 2px 0'
+        : '0 3px 3px 0'};
     transform: rotate(45deg);
   }
 `
@@ -135,49 +134,49 @@ const InputCheckbox = styled.input`
 const LabelText = styled.div`
   font-size: 13px;
   display: grid;
-  align-items: center;
+  align-items: flex-start;
   min-height: 18px;
 `
 
 export default {
-  name: "checkbox",
+  name: 'checkbox',
   components: {
     ComponentWrapper,
     Container,
     InputCheckbox,
-    LabelText,
+    LabelText
   },
   props: {
     label: {
       required: false,
-      default: "",
+      default: ''
     },
     isChecked: {
       required: true,
-      default: false,
+      default: false
     },
     checkColor: {
-      required: false,
+      required: false
     },
     size: {
       required: false,
-      default: "medium", // small, medium
+      default: 'medium' // small, medium
     },
     backgroundColor: {
-      required: false,
+      required: false
     },
     isDisabled: {
       required: false,
-      default: false,
-    },
+      default: false
+    }
   },
   methods: {
     onChangeHandler(value) {
       if (this.isDisabled) {
         return
       }
-      this.$emit("on-event-handler", value)
-    },
-  },
+      this.$emit('on-event-handler', value)
+    }
+  }
 }
 </script>

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

@@ -351,10 +351,12 @@ export default {
         }
       })
       let evaluated = eval(formatted.join(''))
-      evaluated = stringToNumber({
-        value: evaluated,
-        numberPrecision: this.numberPrecision
-      })
+      if (typeof evaluated === 'string') {
+        evaluated = stringToNumber({
+          value: evaluated,
+          numberPrecision: this.numberPrecision
+        })
+      }
       return evaluated
     },
     onInputBlur(e) {

package/src/components/modals/modal/index.vue

@@ -3,15 +3,18 @@
     :isOpen="isOpen"
     :class="{ visible: isOpen, hidden: !isOpen }"
     @click.native="onOutsideClose()"
+    :backdrop="backdrop"
   >
     <modal-container @click.stop>
-      <spinner v-if="isLoading" size="50px" :fullWidth="true" />
+      <spinner v-if="isLoading" size="50px" :limitedToModal="true" />
+      <content-container :visible="!isLoading">
+        <slot />
+      </content-container>
       <close-button
         v-if="!hideClose"
         @click.native="onCloseModal()"
         class="close"
       />
-      <slot />
     </modal-container>
   </page-wrapper>
 </template>
@@ -28,7 +31,12 @@ import styled from 'vue-styled-components'
 import CloseButton from '../../buttons/closeButton'
 import Spinner from '../../spinner'
 
-const pageAttrs = { isOpen: Boolean }
+const contentAttrs = { visible: Boolean }
+const ContentContainer = styled('div', contentAttrs)`
+  visibility: ${(props) => (props.visible ? 'inherit' : 'hidden')};
+`
+
+const pageAttrs = { isOpen: Boolean, backdrop: String }
 const PageWrapper = styled('div', pageAttrs)`
   position: fixed;
   display: grid;
@@ -36,7 +44,10 @@ const PageWrapper = styled('div', pageAttrs)`
   left: 0;
   width: 100%;
   height: 100%;
-  background-color: rgba(255, 255, 255, 0.9);
+  background-color: ${(props) =>
+    props.backdrop == 'dark'
+      ? 'rgba(0, 0, 0, 0.4)'
+      : 'rgba(255, 255, 255, 0.9)'};
   z-index: 99999;
   overflow: auto;
 
@@ -98,7 +109,8 @@ export default {
     PageWrapper,
     ModalContainer,
     CloseButton,
-    Spinner
+    Spinner,
+    ContentContainer
   },
   props: {
     isOpen: {
@@ -116,6 +128,10 @@ export default {
     hideClose: {
       required: false,
       default: false
+    },
+    backdrop: {
+      required: false,
+      default: 'white'
     }
   },
   methods: {
@@ -135,4 +151,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/components/modals/modal/modal.stories.js

@@ -26,5 +26,6 @@ export const Default = Template.bind({
   preventOutsideClose: true,
   isLoading: false,
   hideClose: false,
-});
+  backdrop: 'dark',
+})
 Default.args = {};

package/src/components/spinner/index.vue

@@ -7,7 +7,7 @@
       />
     </container>
   </spinner-container>
-  <container v-else>
+  <container v-else :limitedToModal="limitedToModal">
     <spinner-wrapper
       :size="size"
       :src="require('../../assets/icons/black_spinner.svg')"
@@ -18,7 +18,7 @@
 <script>
 // import Spinner from "@eturnity/eturnity_reusable_components/src/components/spinner"
 // <spinner size="30px" />
-import styled from "vue-styled-components"
+import styled from 'vue-styled-components'
 
 const SpinnerContainer = styled.div`
   position: fixed;
@@ -32,34 +32,41 @@ const SpinnerContainer = styled.div`
   justify-items: center;
   z-index: 100;
 `
-
-const Container = styled.div`
+const containerAttrs = { limitedToModal: Boolean }
+const Container = styled('div', containerAttrs)`
   display: grid;
   align-items: center;
   justify-items: center;
+  position: ${(props) => (props.limitedToModal ? 'absolute' : 'inherit')};
+  height: ${(props) => (props.limitedToModal ? '100%' : 'inherit')};
+  width: ${(props) => (props.limitedToModal ? '100%' : 'inherit')};
 `
 
 const spinnerAttrs = { size: String }
-const SpinnerWrapper = styled("img", spinnerAttrs)`
-  width: ${(props) => (props.size ? props.size : "60px")};
+const SpinnerWrapper = styled('img', spinnerAttrs)`
+  width: ${(props) => (props.size ? props.size : '60px')};
 `
 
 export default {
-  name: "spinner",
+  name: 'spinner',
   components: {
     Container,
     SpinnerWrapper,
-    SpinnerContainer,
+    SpinnerContainer
   },
   props: {
     fullWidth: {
       required: false,
-      default: false,
+      default: false
     },
-    size: {
+    limitedToModal: {
       required: false,
-      default: null,
+      default: false
     },
-  },
+    size: {
+      required: false,
+      default: null
+    }
+  }
 }
-</script>
+</script>

package/src/helpers/numberConverter.js

@@ -12,12 +12,16 @@ export const stringToNumber = ({
   // The first replace will replace not allowed characters with a blank
   if (
     selectedLang === 'de-DE' ||
+    selectedLang === 'de-de' ||
     selectedLang === 'no-no' ||
     selectedLang === 'da-dk' ||
     selectedLang === 'de-lu' ||
     selectedLang === 'de-be' ||
     selectedLang === 'es-es' ||
-    selectedLang === 'de'
+    selectedLang === 'de' ||
+    selectedLang === 'it' ||
+    selectedLang === 'nl-nl' ||
+    selectedLang === 'nl-be'
   ) {
     // replace dots with blank, and commas with a dot: 1.234,56 --> 1234.56
     if (allowNegative) {
@@ -45,9 +49,15 @@ export const stringToNumber = ({
   ) {
     // 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]/, '')
+        .replace(/['\s]/g, '')
     } else {
-      newVal = newVal.replace(/[^\d.,']/g, '').replace(/['\s]/g, '')
+      newVal = newVal
+        .replace(/[^\d.,']/g, '')
+        .replace(/[,\s]/, '')
+        .replace(/['\s]/g, '')
     }
   } else if (
     selectedLang === 'fr-fr' ||