@eturnity/eturnity_reusable_components 1.2.16-QA03-23092022.4 → 1.2.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "1.2.16-QA03-23092022.4",
+  "version": "1.2.17",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",
@@ -13,8 +13,7 @@
     "@vueform/slider": "1.0.5",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
-    "vue-styled-components": "^1.6.0",
-    "html-loader": "^0.5.5"
+    "vue-styled-components": "^1.6.0"
   },
   "devDependencies": {
     "@storybook/addon-actions": "^6.2.8",
@@ -29,7 +28,8 @@
     "babel-eslint": "^10.1.0",
     "eslint": "^6.7.2",
     "eslint-plugin-vue": "^6.2.2",
-    "vue-template-compiler": "^2.6.11"
+    "vue-template-compiler": "^2.6.11",
+    "html-loader": "^0.5.5"
   },
   "eslintConfig": {
     "root": true,

package/src/App.vue

@@ -1,14 +1,57 @@
 <template>
   <ThemeProvider :theme="getTheme()" :style="{ height: '100%' }">
     <page-container>
+      <main-table titleText="My Table">
+        <thead>
+          <tr>
+            <th>Column 1</th>
+            <th>Column 2</th>
+            <th>Column 3</th>
+            <div />
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <!-- <table-dropdown
+              :colSpan="3"
+              :tableItems="getDropdownValues()"
+              @toggle-dropdown-open="toggleDropdownOpen()"
+              @item-selected="onItemSelected({ item: $event, index })"
+              :isOpen="isDropdownOpen()"
+              :optionItems="itemOptions"
+              :optionsDisplay="['display_name', 'company_item_number', 'model']"
+            /> -->
+            <td>Test</td>
+            <div class="icons-container">
+              <three-dots :options="listOptions" :isLoading="false" />
+            </div>
+          </tr>
+        </tbody>
+      </main-table>
+      <br />
+      <br />
+      <toggle
+        @on-toggle-change="onInputChange($event)"
+        :isChecked="inputValue"
+        label="My Label Text"
+        infoTextMessage="This is my test message"
+        infoTextAlign="right"
+        labelAlign="right"
+        :disabled="false"
+      />
+      <br />
       <input-number
-        :value="num"
-        @input-change="num = $event"
-        unitName="t"
-        id="biebie"
-        test="koko"
-        @keydown="keydownHandler"
+        placeholder="Enter distance"
+        :numberPrecision="2"
+        :value="inputValue"
+        @input-change="onInputChange($event)"
       />
+      <br />
+
+      <icon name="info" color="red" size="50px" />
+      <icon name="info" color="#F00" size="50px" />
+      <icon name="info" color="blue1" size="50px" />
+      <icon name="info" color="#00F" size="50px" />
     </page-container>
   </ThemeProvider>
 </template>
@@ -17,6 +60,7 @@
 import { ThemeProvider } from 'vue-styled-components'
 import theme from './assets/theme'
 import styled from 'vue-styled-components'
+import icon from '@/components/icon'
 import InputNumber from '@/components/inputs/inputNumber'
 
 const PageContainer = styled.div`
@@ -28,12 +72,11 @@ export default {
   components: {
     ThemeProvider,
     PageContainer,
-    InputNumber
-    // TableDropdown,
+    InputNumber,
+    icon
   },
   data() {
     return {
-      num: 42,
       inputValue: null,
       checkedOption: 'button_1',
       question: {
@@ -92,9 +135,6 @@ export default {
     }
   },
   methods: {
-    keydownHandler(e) {
-      console.log('test', e)
-    },
     getTheme() {
       return theme
     },
@@ -155,4 +195,4 @@ body {
   height: 100%;
   margin: 0;
 }
-</style>
+</style>

package/src/components/icon/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <wrapper :size="size">
+  <wrapper :isDisabled="isDisabled" :size="size">
     <icon-image
       :size="size"
       :color="color"
@@ -23,11 +23,12 @@
 
 import styled from 'vue-styled-components'
 
-const wrapperAttrs = { size: String }
+const wrapperAttrs = { isDisabled: Boolean, size: String }
 const Wrapper = styled('div', wrapperAttrs)`
   display: inline-block;
   width: ${(props) => props.size};
   height: ${(props) => props.size};
+  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
 `
 const IconImageProps = { color: String, hoveredColor: String, size: String }
 const IconImage = styled('div', IconImageProps)`
@@ -51,6 +52,10 @@ export default {
     IconImage
   },
   props: {
+    isDisabled: {
+      required: false,
+      default: false
+    },
     name: {
       required: true
     },

package/src/components/infoText/index.vue

@@ -1,6 +1,6 @@
 <template>
   <component-wrapper>
-    <icon-wrapper :size="size">
+    <icon-wrapper>
       <icon-img
         :isActive="showInfo"
         :size="size"
@@ -9,7 +9,20 @@
         @mouseenter="toggleShowInfo()"
         @mouseleave="toggleShowInfo()"
       >
-        <icon :size="size + 'px'" name="info" :color="iconColor" />
+        <svg
+          class="img-icon"
+          :width="size"
+          :height="size"
+          viewBox="0 0 24 24"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            class="img-icon"
+            d="M20.4853 3.51469C18.2188 1.24823 15.2053 0 12 0C8.79469 0 5.78123 1.24823 3.51469 3.51469C1.24823 5.78123 0 8.79469 0 12C0 15.2053 1.24823 18.2188 3.51469 20.4853C5.78123 22.7518 8.79469 24 12 24C15.2053 24 18.2188 22.7518 20.4853 20.4853C22.7518 18.2188 24 15.2053 24 12C24 8.79469 22.7518 5.78123 20.4853 3.51469ZM12 3.28125C13.4216 3.28125 14.5781 4.4378 14.5781 5.85938C14.5781 7.28095 13.4216 8.4375 12 8.4375C10.5784 8.4375 9.42188 7.28095 9.42188 5.85938C9.42188 4.4378 10.5784 3.28125 12 3.28125ZM15.2812 19.6875H8.71875V18.2812H10.125V11.9167H8.71875V10.5104H13.875V18.2812H15.2812V19.6875Z"
+            fill="#D5D5D5"
+          />
+        </svg>
       </icon-img>
       <text-overlay
         v-if="showInfo"
@@ -31,16 +44,19 @@
 //     size="20"
 //     alignText="right" // default is left
 // />
-import theme from '@/assets/theme.js'
-import styled from 'vue-styled-components'
-import icon from '../icon'
+
+import styled from "vue-styled-components"
+
+const IconWrapper = styled.div`
+  position: relative;
+`
 
 const textAttrs = { borderColor: String, alignText: String }
-const TextOverlay = styled('div', textAttrs)`
+const TextOverlay = styled("div", textAttrs)`
   position: absolute;
   top: 26px;
-  right: ${(props) => (props.alignText === 'left' ? '-10px' : 'inherit')};
-  left: ${(props) => (props.alignText === 'left' ? 'inherit' : '-10px')};
+  right: ${(props) => (props.alignText === "left" ? "-10px" : "inherit")};
+  left: ${(props) => (props.alignText === "left" ? "inherit" : "-10px")};
   background: ${(props) => props.theme.colors.black};
   padding: 10px;
   width: max-content;
@@ -52,12 +68,12 @@ const TextOverlay = styled('div', textAttrs)`
   color: ${(props) => props.theme.colors.white};
 
   :before {
-    content: '';
+    content: "";
     background-color: ${(props) => props.theme.colors.black};
     position: absolute;
     top: 2px;
-    right: ${(props) => (props.alignText === 'left' ? '-12px' : 'inherit')};
-    left: ${(props) => (props.alignText === 'left' ? 'inherit' : '40px')};
+    right: ${(props) => (props.alignText === "left" ? "-12px" : "inherit")};
+    left: ${(props) => (props.alignText === "left" ? "inherit" : "40px")};
     height: 8px;
     width: 8px;
     transform-origin: center center;
@@ -66,15 +82,18 @@ const TextOverlay = styled('div', textAttrs)`
 `
 
 const iconAttrs = { isActive: Boolean, size: String, borderColor: String }
-
-const IconWrapper = styled('div', iconAttrs)`
-  position: relative;
-  top: 1px;
-  height: ${(props) => props.size}px;
-`
-const IconImg = styled('div', iconAttrs)`
+const IconImg = styled("div", iconAttrs)`
   cursor: pointer;
-  height: ${(props) => props.size}px;
+  height: ${(props) => props.size + "px"};
+
+  .img-icon {
+    fill: ${(props) =>
+      props.isActive
+        ? props.borderColor
+          ? props.borderColor
+          : props.theme.colors.secondary
+        : props.theme.colors.mediumGray};
+  }
 `
 
 const ComponentWrapper = styled.div`
@@ -82,39 +101,38 @@ const ComponentWrapper = styled.div`
 `
 
 export default {
-  name: 'info-text',
+  name: "info-text",
   components: {
     IconWrapper,
     TextOverlay,
     ComponentWrapper,
     IconImg,
-    icon
   },
   props: {
     text: {
-      required: true
+      required: true,
     },
     borderColor: {
       required: false,
-      default: null
+      default: null,
     },
     size: {
       required: false,
-      default: '14'
+      default: "20",
     },
     alignText: {
       required: false,
-      default: 'left' // "left" or "right"
-    }
+      default: "left", // "left" or "right"
+    },
   },
   methods: {
     toggleShowInfo() {
       this.showInfo = !this.showInfo
 
       if (this.showInfo) {
-        document.addEventListener('click', this.clickOutside)
+        document.addEventListener("click", this.clickOutside)
       } else {
-        document.removeEventListener('click', this.clickOutside)
+        document.removeEventListener("click", this.clickOutside)
       }
     },
     clickOutside(event) {
@@ -122,21 +140,12 @@ export default {
         return
       }
       this.toggleShowInfo()
-    }
+    },
   },
   data() {
     return {
-      showInfo: false
+      showInfo: false,
     }
   },
-  computed: {
-    iconColor() {
-      return this.isActive
-        ? this.borderColor
-          ? this.borderColor
-          : theme.colors.secondary
-        : theme.colors.mediumGray
-    }
-  }
 }
-</script>
+</script>

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

@@ -1,5 +1,5 @@
 <template>
-  <container :inputWidth="inputWidth">
+  <container>
     <label-wrapper v-if="labelText">
       <label-text>
         {{ labelText }}
@@ -8,16 +8,15 @@
         v-if="labelInfoText"
         :text="labelInfoText"
         borderColor="#ccc"
-        size="14"
+        size="13"
         :alignText="labelInfoAlign"
       />
     </label-wrapper>
     <input-wrapper>
       <input-container
-        v-bind="$attrs"
         ref="inputField1"
         :hasUnit="unitName && !!unitName.length"
-        :placeholder="displayedPlaceholder"
+        :placeholder="placeholder"
         :isError="isError"
         :inputWidth="inputWidth"
         :minWidth="minWidth"
@@ -31,16 +30,9 @@
         :textAlign="textAlign"
         :fontSize="fontSize"
         :fontColor="fontColor"
-        :hasSlot="hasSlot"
-        :slotSize="slotSize"
-        v-on="$listeners"
       />
-      <slot-container v-if="hasSlot" :slotSize="slotSize" :isError="isError">
-        <slot></slot>
-      </slot-container>
-
       <unit-container
-        v-if="unitName && showLinearUnitName && !hasSlot"
+        v-if="unitName && showLinearUnitName"
         :hasLength="!!textInput.length"
         :isError="isError"
         >{{ unitName }}</unit-container
@@ -83,6 +75,11 @@ import {
 } from '../../../helpers/numberConverter'
 import InfoText from '../../infoText'
 
+const Container = styled.div`
+  width: 100%;
+  position: relative;
+`
+
 const inputProps = {
   isError: Boolean,
   hasUnit: Boolean,
@@ -92,16 +89,8 @@ const inputProps = {
   noBorder: Boolean,
   textAlign: String,
   fontSize: String,
-  fontColor: String,
-  hasSlot: Boolean,
-  slotSize: String
+  fontColor: String
 }
-
-const Container = styled('div', inputProps)`
-  width: ${(props) => (props.inputWidth ? props.inputWidth : '100%')};
-  position: relative;
-`
-
 const InputContainer = styled('input', inputProps)`
   border: ${(props) =>
     props.isError
@@ -109,15 +98,8 @@ const InputContainer = styled('input', inputProps)`
       : props.noBorder
       ? 'none'
       : '1px solid ' + props.theme.colors.mediumGray};
-  padding-top: 11px;
-  padding-bottom: 11px;
-  padding-left: 10px;
-  padding-right: ${(props) =>
-    props.slotSize
-      ? 'calc(' + props.slotSize + ' + 10px)'
-      : props.hasUnit
-      ? '40px'
-      : '5px'};
+  padding: ${(props) =>
+    props.hasUnit ? '11px 40px 11px 10px' : '11px 5px 11px 10px'};
   border-radius: 4px;
   text-align: ${(props) => props.textAlign};
   cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'auto')};
@@ -160,7 +142,6 @@ const UnitContainer = styled('span', inputProps)`
   right: 10px;
   top: 0;
   padding-left: 10px;
-  text-align: right;
   color: ${(props) =>
     props.isError
       ? props.theme.colors.red
@@ -169,28 +150,6 @@ const UnitContainer = styled('span', inputProps)`
       : props.theme.colors.mediumGray};
 `
 
-const SlotContainer = styled('span', inputProps)`
-  text-align: right;
-  border-left: 1px solid
-    ${(props) =>
-      props.isError
-        ? props.theme.colors.red
-        : props.hasLength
-        ? props.theme.colors.black
-        : props.theme.colors.mediumGray};
-  position: absolute;
-  width: ${(props) =>
-    props.slotSize ? 'calc(' + props.slotSize + ' - 10px)' : 'fit-content'};
-  right: 10px;
-  top: 0;
-  padding-left: 10px;
-  color: ${(props) =>
-    props.isError
-      ? props.theme.colors.red
-      : props.hasLength
-      ? props.theme.colors.black
-      : props.theme.colors.mediumGray};
-`
 const ErrorMessage = styled.div`
   font-size: 14px;
   color: ${(props) => props.theme.colors.red};
@@ -219,10 +178,8 @@ export default {
     ErrorMessage,
     LabelWrapper,
     LabelText,
-    SlotContainer,
     InfoText
   },
-  inheritAttrs: false,
   data() {
     return {
       textInput: '',
@@ -309,22 +266,6 @@ export default {
     numberToStringEnabled: {
       required: false,
       default: true
-    },
-    slotSize: {
-      required: false
-    }
-  },
-  computed: {
-    hasSlot() {
-      console.log(this.$slots.default)
-      return !!this.$slots.default
-    },
-    computedSlotSize() {
-      return this.slotSize || this.$slots['default'][0].elm.clientWidth
-    },
-    displayedPlaceholder() {
-      if (this.placeholder) return this.placeholder
-      return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
     }
   },
   methods: {
@@ -358,11 +299,13 @@ export default {
           return num
         }
       })
-      let evaluated = eval(formatted.join('')) || ''
-      evaluated = stringToNumber({
-        value: evaluated,
-        numberPrecision: this.numberPrecision
-      })
+      let evaluated = eval(formatted.join(''))
+      if (typeof evaluated === 'string') {
+        evaluated = stringToNumber({
+          value: evaluated,
+          numberPrecision: this.numberPrecision
+        })
+      }
       return evaluated
     },
     onInputBlur(e) {
@@ -444,4 +387,4 @@ export default {
     }
   }
 }
-</script>
+</script>

package/src/helpers/numberConverter.js

@@ -4,20 +4,21 @@ export const stringToNumber = ({
   allowNegative
 }) => {
   // This is for saving. It converts our input string to a readable number
-  if (value === undefined) {
-    value = ''
-  }
   let newVal = value.toString()
   const selectedLang = localStorage.getItem('lang')
   // 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 +46,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' ||

package/src/assets/svgIcons/info.svg

@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 -1.04907e-06C14.3734 -8.41587e-07 16.6934 0.703787 18.6668 2.02236C20.6402 3.34094 22.1783 5.21509 23.0865 7.4078C23.9948 9.60051 24.2324 12.0133 23.7694 14.3411C23.3064 16.6689 22.1635 18.8071 20.4853 20.4853C18.807 22.1635 16.6688 23.3064 14.3411 23.7694C12.0133 24.2324 9.6005 23.9948 7.40779 23.0866C5.21508 22.1783 3.34093 20.6402 2.02236 18.6668C0.703782 16.6935 -6.97861e-06 14.3734 -6.77112e-06 12C-6.49289e-06 8.8174 1.26428 5.76515 3.51471 3.51472C5.76515 1.26428 8.8174 -1.32731e-06 12 -1.04907e-06ZM9.74999 19.81L14.25 19.81L14.25 10.81L9.74999 10.81L9.74999 19.81ZM12 8.69C12.445 8.69 12.88 8.55804 13.25 8.31081C13.62 8.06357 13.9084 7.71217 14.0787 7.30104C14.249 6.8899 14.2936 6.4375 14.2068 6.00105C14.1199 5.56459 13.9057 5.16368 13.591 4.84901C13.2763 4.53434 12.8754 4.32005 12.4389 4.23323C12.0025 4.14642 11.5501 4.19097 11.139 4.36127C10.7278 4.53157 10.3764 4.81996 10.1292 5.18997C9.88195 5.55998 9.74999 5.99499 9.74999 6.44C9.75079 7.03649 9.98809 7.60833 10.4099 8.03011C10.8317 8.4519 11.4035 8.68921 12 8.69Z" fill="#B2B9C5"/>
-</svg>