@eturnity/eturnity_reusable_components 7.10.0-EPDM-10285.1 → 7.10.0-EPDM-10285.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.10.0-EPDM-10285.1",
+  "version": "7.10.0-EPDM-10285.2",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

package/src/App.vue

@@ -14,87 +14,42 @@
         textAlign="left"
         :isInteractive="true"
         :interactionStep="1"
-        @on-input="value = $event"
+        @on-input="inputHandler"
         @input-change="changeHandler"
         @input-focus="focusHandler"
         @input-blur="blurHandler"
       >
         <template v-slot:label>
-          <div>Interactive Label</div>
+          <div>Interactive Label 1</div>
         </template>
       </input-number>
 
-      <dropdown-component openingMode="hover" gap="30px">
-        <template #trigger><i>Click Me</i></template>
-        <template #dropdown>
-          <div>
-            <a href="">test1</a>
-            <button href="">test2</button>
-            <br />
-            <p>Text</p>
-          </div>
-        </template>
-      </dropdown-component>
-
-      <videoThumbnail
-        src="https://musicart.xboxlive.com/6/cfaf1e9d-0000-0000-0000-000000000009/504/image.jpg?w=1920&h=1080"
-        playIconColor="red"
-        playIconSize="20px"
-        width="400px"
-        height="600px"
-      />
+      <hr>
 
-      <SwitchField
-        @on-switch-change="onInputChange($event)"
-        :options="[
-          { value: 0, content: 'zero' },
-          { value: 1, content: 'one' },
-          { value: 2, content: 'two' }
-        ]"
-        :value="value"
-        label="label"
-        toggleColor="red"
-        size="large"
-        backgroundColor="blue"
-        labelAlign="left"
-        fontColor="black"
-        :disabled="false"
-      />
-      <icon
-        name="opacity"
-        color="red"
-        hoveredColor="blue"
-        size="60px"
-        cursor="default"
-        isStriked="true"
-      />
-      <Select
+      <input-number
         :value="value"
-        selectWidth="100%"
-        optionWidth="50%"
-        label="that is a label"
-        alignItems="vertical"
-        colorMode="dark"
-        isSearchable="true"
-        @input-change="value = $event"
-        @search-change="searchValue = $event"
+        :minNumber="0"
+        unitName="mm"
+        :numberPrecision="0"
+        backgroundColor="transparent"
+        borderColor="eturnityGrey"
+        inputHeight="34px"
+        inputWidth="420px"
+        textAlign="left"
+        :isInteractive="true"
+        :interactionStep="1"
+        @on-input="inputHandler"
+        @input-change="changeHandler"
+        @input-focus="focusHandler"
+        @input-blur="blurHandler"
       >
-        <template #selector="{ selectedValue }">
-          value selected: {{ selectedValue }}
-        </template>
-        <template #dropdown>
-          <Option
-            v-for="opt in filteredOptionList"
-            :key="opt.id"
-            :value="opt.val"
-            >{{ opt.lookFor }}
-          </Option>
+        <template v-slot:label>
+          <div>Interactive Label 2</div>
         </template>
-      </Select>
-
-      {{ filteredOptionList }}
+      </input-number>
 
-      <iconCollection color="red" />
+      <hr>
+      <button @click="value=42">Click to set at 42</button>
     </page-container>
   </ThemeProvider>
 </template>
@@ -104,64 +59,24 @@ import { ThemeProvider } from 'vue-styled-components'
 import theme from './assets/theme'
 import styled from 'vue-styled-components'
 import InputNumber from '@/components/inputs/inputNumber'
-import Select from '@/components/inputs/select'
-import SwitchField from '@/components/inputs/switchField'
-import Option from '@/components/inputs/select/option'
-import iconCollection from '@/components/icon/iconCollection'
-import dropdownComponent from '@/components/dropdown'
-import videoThumbnail from '@/components/videoThumbnail'
-import icon from '@/components/icon'
-// import infoCard from '@/components/infoCard'
-// import TableDropdown from "@/components/tableDropdown"
 
 const PageContainer = styled.div`
   padding: 40px;
 `
 
-// const RowContainer = styled.div`
-//   display: inline-flex;
-//   gap: 10px;
-//   flex-wrap: wrap;
-// `
-
 export default {
   name: 'App',
   components: {
     ThemeProvider,
     PageContainer,
     InputNumber,
-    Option,
-    Select,
-    SwitchField,
-    iconCollection,
-    dropdownComponent,
-    videoThumbnail,
-    icon,
   },
   data() {
     return {
       value: 42,
-      value2: 42,
-      companyName: 'toto',
-      optionList: [
-        { id: 'a', val: 'A', lookFor: 'babababa' },
-        { id: 'b', val: 'B', lookFor: 'abab' },
-        { id: 'c', val: 'C', lookFor: 'ccc' },
-        { id: 'd', val: 'D', lookFor: 'ddd' },
-        { id: 'e', val: 'E', lookFor: 'dddee' },
-        { id: 'f', val: 'F', lookFor: 'ddfff' },
-        { id: 'g', val: 'G', lookFor: 'dggg' },
-        { id: 'h', val: 'H', lookFor: 'dddhhh' }
-      ],
-      searchValue: ''
     }
   },
   computed: {
-    filteredOptionList() {
-      return this.optionList.filter((opt) =>
-        opt.lookFor.includes(this.searchValue)
-      )
-    }
   },
   methods: {
     blurHandler(e) {
@@ -174,64 +89,12 @@ export default {
       console.log('focus', e)
     },
     inputHandler(e) {
-      this.value2 = e
       console.log('input', e)
-    },
-    keydownHandler(e) {
-      console.log('test', e)
+      //this.value = e
+      setTimeout(()=>{this.value = e},1000)
     },
     getTheme() {
       return theme
-    },
-    onInputChange(event) {
-      this.inputValue = event
-    },
-    onInputBlur(event) {
-      console.log(event)
-    },
-    isDropdownOpen() {
-      return this.dropdownOpen
-    },
-    onClickButton() {
-      console.log('Test')
-    },
-    toggleDropdownOpen() {
-      this.dropdownOpen = !this.dropdownOpen
-    },
-    getDropdownValues() {
-      let items = []
-      items = [
-        {
-          value: this.getComponentInfo({
-            row: this.itemOptions[0],
-            value: 'display_name'
-          })
-        },
-        {
-          value: this.getComponentInfo({
-            row: this.itemOptions[0],
-            value: 'company_item_number'
-          })
-        },
-        {
-          value: this.getComponentInfo({
-            row: this.itemOptions[0],
-            value: 'model'
-          })
-        }
-      ]
-      return items
-    },
-    getComponentInfo({ row, value }) {
-      let item
-      if (row.selectedValue && row.selectedValue[value]) {
-        item = row.selectedValue[value]
-      } else if (row[value]) {
-        item = row[value]
-      } else {
-        item = '-'
-      }
-      return item
     }
   }
 }

package/src/assets/svgIcons/charger_icon_white.svg

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 24.3.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 20 20" style="enable-background:new 0 0 20 20;" xml:space="preserve">
+<style type="text/css">
+	.st0{display:none;}
+	.st1{display:inline;}
+	.st2{fill:#FFFFFF;}
+</style>
+<g class="st0">
+	<g class="st1">
+		<rect x="-312.013" y="-258.339" class="st2" width="2" height="16"/>
+	</g>
+	<g class="st1">
+		<polygon class="st2" points="-303.346,-242.339 -303.346,-248.339 -312.013,-248.426 -312.013,-242.339 		"/>
+	</g>
+	<g class="st1">
+		<rect x="-311.673" y="-258.339" class="st2" width="8" height="2"/>
+	</g>
+	<g class="st1">
+		<path class="st2" d="M-294.833-255.839v-2.5h-7v2.5c0,1.933,1.567,3.5,3.5,3.5l0,0
+			C-296.4-252.339-294.833-253.906-294.833-255.839z"/>
+	</g>
+	<g class="st1">
+		<rect x="-305.346" y="-258.339" class="st2" width="2" height="16"/>
+	</g>
+	<g class="st1">
+		<rect x="-299.333" y="-258.339" class="st2" width="2" height="12"/>
+	</g>
+	<g class="st1">
+		<rect x="-303.346" y="-248.339" class="st2" width="6" height="2"/>
+	</g>
+	<g class="st1">
+		<rect x="-301.346" y="-260.339" class="st2" width="2" height="2"/>
+	</g>
+	<g class="st1">
+		<rect x="-297.346" y="-260.339" class="st2" width="2" height="2"/>
+	</g>
+</g>
+<g>
+	<path class="st2" d="M15.777,8.974h3v-2h-3V6h-1c-1.857,0-3.404,1.272-3.855,2.987H8.889V3V1h-2H3.223h-2v2v14v2h2h5.667v-1v-1
+		v-6.013h2.025C11.356,12.716,12.911,14,14.777,14h1v-1.026h3v-2h-3V8.987V8.974z M6.889,17H3.223V3h3.667v5.987v2V17z"/>
+</g>
+</svg>

package/src/assets/svgIcons/energy_meter.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Creator: CorelDRAW 2021 (64-Bit) -->
+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="462px" height="512px" version="1.1" shape-rendering="geometricPrecision" text-rendering="geometricPrecision" image-rendering="optimizeQuality" fill-rule="evenodd" clip-rule="evenodd"
+viewBox="0 0 462 511.93"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:xodm="http://www.corel.com/coreldraw/odm/2003">
+ <g id="Layer_x0020_1">
+  <metadata id="CorelCorpID_0Corel-Layer"/>
+  <path fill="white" d="M22.37 0l417.26 0c12.31,0 22.37,10.06 22.37,22.37l0 400.73c0,12.3 -10.06,22.37 -22.37,22.37l-32.27 0 0 19.01c0,6.2 -5.06,11.27 -11.26,11.27l-25.1 0 0 32.03c0,2.28 -1.87,4.15 -4.15,4.15l-32.33 0c-4.56,0 -8.29,-3.73 -8.29,-8.29l0 -27.89 -33.43 0 0 32.03c0,2.28 -1.86,4.15 -4.14,4.15l-32.34 0c-4.56,0 -8.28,-3.73 -8.28,-8.29l0 -27.89 -33.43 0 0 32.03c0,2.28 -1.86,4.15 -4.14,4.15l-32.34 0c-4.56,0 -8.28,-3.73 -8.28,-8.29l0 -27.89 -33.43 0 0 32.03c0,2.28 -1.86,4.15 -4.14,4.15l-32.34 0c-4.56,0 -8.28,-3.73 -8.28,-8.29l0 -27.89 -25.76 0c-6.2,0 -11.26,-5.07 -11.26,-11.27l0 -19.01 -32.27 0c-12.31,0 -22.37,-10.07 -22.37,-22.37l0 -400.73c0,-12.31 10.06,-22.37 22.37,-22.37zm61.36 103.62l294.54 0c3.34,0 6.38,1.38 8.57,3.57 2.19,2.19 3.56,5.23 3.56,8.57l0 53.77c0,3.33 -1.37,6.37 -3.56,8.56 -2.2,2.2 -5.23,3.57 -8.57,3.57l-294.54 0c-3.34,0 -6.38,-1.37 -8.57,-3.57 -2.19,-2.19 -3.56,-5.23 -3.56,-8.56l0 -53.77c0,-3.34 1.36,-6.37 3.56,-8.57 2.2,-2.21 5.23,-3.57 8.57,-3.57zm159 210.98l15.79 0c2.29,0.01 4.15,1.87 4.15,4.16 0,0.83 -0.25,1.63 -0.7,2.32l-37.64 64.27c-0.75,1.23 -2.09,1.98 -3.53,1.98 -2.29,0 -4.15,-1.86 -4.15,-4.14 0,-0.28 0.02,-0.55 0.08,-0.81l5.55 -39.45 -18.73 0.32c-0.02,0 -0.05,0 -0.08,0 -2.25,0 -4.09,-1.81 -4.13,-4.06 0,-0.01 0,-0.01 0,-0.02 0,-0.75 0.2,-1.5 0.58,-2.15l37.06 -64.26c0.75,-1.24 2.1,-2 3.55,-2 2.29,0 4.15,1.85 4.15,4.15 0,0.18 -0.02,0.36 -0.04,0.54l-1.91 39.15zm151.34 -255.93c5.79,0 10.49,4.95 10.49,11.06 0,6.1 -4.7,11.05 -10.49,11.05 -5.8,0 -10.5,-4.95 -10.5,-11.05 0,-6.11 4.7,-11.06 10.5,-11.06zm-326.13 0c5.8,0 10.5,4.95 10.5,11.06 0,6.1 -4.7,11.05 -10.5,11.05 -5.8,0 -10.5,-4.95 -10.5,-11.05 0,-6.11 4.7,-11.06 10.5,-11.06zm0 307.96c5.8,0 10.5,4.96 10.5,11.06 0,6.11 -4.7,11.06 -10.5,11.06 -5.8,0 -10.5,-4.95 -10.5,-11.06 0,-6.1 4.7,-11.06 10.5,-11.06zm326.13 0c5.79,0 10.49,4.96 10.49,11.06 0,6.11 -4.7,11.06 -10.49,11.06 -5.8,0 -10.5,-4.95 -10.5,-11.06 0,-6.1 4.7,-11.06 10.5,-11.06zm-38.94 -206.03c-3.07,0 -5.53,-0.96 -7.39,-2.88 -1.85,-1.92 -2.77,-4.45 -2.77,-7.59l0 -14.98c0,-3.15 0.92,-5.67 2.77,-7.59 1.86,-1.92 4.32,-2.88 7.39,-2.88 3.08,0 5.55,0.96 7.4,2.88 1.85,1.92 2.78,4.44 2.78,7.59l0 14.98c0,3.14 -0.93,5.67 -2.78,7.59 -1.85,1.92 -4.32,2.88 -7.4,2.88zm0 -7.1c0.6,0 1.08,-0.26 1.42,-0.79 0.35,-0.53 0.52,-1.22 0.52,-2.08l0 -15.98c0,-0.86 -0.17,-1.56 -0.52,-2.09 -0.34,-0.52 -0.82,-0.79 -1.42,-0.79 -0.59,0 -1.06,0.27 -1.41,0.79 -0.34,0.53 -0.52,1.23 -0.52,2.09l0 15.98c0,0.86 0.18,1.55 0.52,2.08 0.35,0.53 0.82,0.79 1.41,0.79zm-61.12 7.1c-3.07,0 -5.54,-0.96 -7.39,-2.88 -1.85,-1.92 -2.78,-4.45 -2.78,-7.59l0 -14.98c0,-3.15 0.93,-5.67 2.78,-7.59 1.85,-1.92 4.32,-2.88 7.39,-2.88 3.08,0 5.55,0.96 7.4,2.88 1.85,1.92 2.77,4.44 2.77,7.59l0 14.98c0,3.14 -0.92,5.67 -2.77,7.59 -1.85,1.92 -4.32,2.88 -7.4,2.88zm0 -7.1c0.6,0 1.07,-0.26 1.42,-0.79 0.35,-0.53 0.52,-1.22 0.52,-2.08l0 -15.98c0,-0.86 -0.17,-1.56 -0.52,-2.09 -0.35,-0.52 -0.82,-0.79 -1.42,-0.79 -0.59,0 -1.07,0.27 -1.41,0.79 -0.35,0.53 -0.52,1.23 -0.52,2.09l0 15.98c0,0.86 0.17,1.55 0.52,2.08 0.34,0.53 0.82,0.79 1.41,0.79zm-63.81 7.1c-3.07,0 -5.54,-0.96 -7.39,-2.88 -1.85,-1.92 -2.77,-4.45 -2.77,-7.59l0 -14.98c0,-3.15 0.92,-5.67 2.77,-7.59 1.85,-1.92 4.32,-2.88 7.39,-2.88 3.08,0 5.54,0.96 7.4,2.88 1.85,1.92 2.77,4.44 2.77,7.59l0 14.98c0,3.14 -0.92,5.67 -2.77,7.59 -1.86,1.92 -4.32,2.88 -7.4,2.88zm0 -7.1c0.6,0 1.07,-0.26 1.42,-0.79 0.35,-0.53 0.52,-1.22 0.52,-2.08l0 -15.98c0,-0.86 -0.17,-1.56 -0.52,-2.09 -0.35,-0.52 -0.82,-0.79 -1.42,-0.79 -0.59,0 -1.06,0.27 -1.41,0.79 -0.35,0.53 -0.52,1.23 -0.52,2.09l0 15.98c0,0.86 0.17,1.55 0.52,2.08 0.35,0.53 0.82,0.79 1.41,0.79zm-61.33 7.1c-3.07,0 -5.54,-0.96 -7.39,-2.88 -1.85,-1.92 -2.77,-4.45 -2.77,-7.59l0 -14.98c0,-3.15 0.92,-5.67 2.77,-7.59 1.85,-1.92 4.32,-2.88 7.39,-2.88 3.08,0 5.55,0.96 7.4,2.88 1.85,1.92 2.77,4.44 2.77,7.59l0 14.98c0,3.14 -0.92,5.67 -2.77,7.59 -1.85,1.92 -4.32,2.88 -7.4,2.88zm0 -7.1c0.6,0 1.07,-0.26 1.42,-0.79 0.35,-0.53 0.52,-1.22 0.52,-2.08l0 -15.98c0,-0.86 -0.17,-1.56 -0.52,-2.09 -0.35,-0.52 -0.82,-0.79 -1.42,-0.79 -0.59,0 -1.06,0.27 -1.41,0.79 -0.35,0.53 -0.52,1.23 -0.52,2.09l0 15.98c0,0.86 0.17,1.55 0.52,2.08 0.35,0.53 0.82,0.79 1.41,0.79zm-61.16 7.1c-3.08,0 -5.54,-0.96 -7.39,-2.88 -1.85,-1.92 -2.78,-4.45 -2.78,-7.59l0 -14.98c0,-3.15 0.93,-5.67 2.78,-7.59 1.85,-1.92 4.31,-2.88 7.39,-2.88 3.07,0 5.54,0.96 7.39,2.88 1.85,1.92 2.78,4.44 2.78,7.59l0 14.98c0,3.14 -0.93,5.67 -2.78,7.59 -1.85,1.92 -4.32,2.88 -7.39,2.88zm0 -7.1c0.6,0 1.07,-0.26 1.41,-0.79 0.35,-0.53 0.53,-1.22 0.53,-2.08l0 -15.98c0,-0.86 -0.18,-1.56 -0.53,-2.09 -0.34,-0.52 -0.81,-0.79 -1.41,-0.79 -0.6,0 -1.07,0.27 -1.41,0.79 -0.35,0.53 -0.52,1.23 -0.52,2.09l0 15.98c0,0.86 0.17,1.55 0.52,2.08 0.34,0.53 0.81,0.79 1.41,0.79zm58.85 102.29c-4.25,0 -7.69,-3.45 -7.69,-7.69 0,-4.24 3.44,-7.68 7.69,-7.68l128.88 0c4.25,0 7.69,3.44 7.69,7.68 0,4.24 -3.44,7.69 -7.69,7.69l-128.88 0zm-50.58 -38.85c-4.24,0 -7.69,-3.44 -7.69,-7.68 0,-4.24 3.45,-7.69 7.69,-7.69l230.04 0c4.24,0 7.68,3.45 7.68,7.69 0,4.24 -3.44,7.68 -7.68,7.68l-230.04 0zm212.57 -103.71l0 58.82 49.72 0c0.69,0 1.32,-0.29 1.78,-0.75 0.46,-0.45 0.75,-1.09 0.75,-1.77l0 -53.77c0,-0.69 -0.29,-1.33 -0.75,-1.79 -0.45,-0.45 -1.09,-0.74 -1.78,-0.74l-49.72 0zm-9.61 58.82l0 -58.82 -52.26 0 0 58.82 52.26 0zm-61.87 0l0 -58.82 -52.14 0 0 58.82 52.14 0zm-61.75 0l0 -58.82 -52.3 0 0 58.82 52.3 0zm-61.91 0l0 -58.82 -49.68 0c-0.7,0 -1.33,0.29 -1.79,0.74 -0.45,0.46 -0.74,1.09 -0.74,1.79l0 53.77c0,0.69 0.29,1.32 0.74,1.77 0.46,0.46 1.1,0.75 1.79,0.75l49.68 0zm-74.08 -133.14l343.34 0c12.31,0 22.37,10.07 22.37,22.37l0 324.85c0,12.3 -10.07,22.37 -22.37,22.37l-343.34 0c-12.3,0 -22.37,-10.06 -22.37,-22.37l0 -324.85c0,-12.31 10.06,-22.37 22.37,-22.37z"/>
+ </g>
+</svg>

package/src/components/card/index.vue

@@ -0,0 +1,95 @@
+<template>
+    <Wrapper
+      v-show="!isLoading"
+      :class="viewCardClass"
+      :width="width"
+      :minWidth="minWidth"
+    >
+      <Spinner v-if="isLoading" size="50px" :limitedToModal="true" />
+      <CardWrapper v-else>
+        <CardTitle :class="titleClass" >
+          {{ $gettext(title) }}
+          <et-popover
+            v-if="showPopover && popoverText !== ''"
+            :text="popoverText"
+          ></et-popover>
+        </CardTitle>
+        <slot></slot>
+      </CardWrapper>
+    </Wrapper>
+</template>
+
+<script>
+import styled from 'vue-styled-components'
+import Spinner from '../spinner'
+
+const WrapperProps = { width: [Number, String], minWidth: [Number, String] }
+const Wrapper = styled('div', WrapperProps)`
+  max-width: ${(props) => props.width};
+  min-width: ${(props) => props.minWidth};
+  padding: 20px;
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12);
+  border-radius: 4px;
+  background-color: ${props => props.theme.colors.white};
+  height: 100%;
+`
+
+const CardWrapper = styled('div')`
+  height: 100%;
+  width: auto;
+`
+
+const CardTitle = styled('p')`
+  font-size: 14px;
+  line-height: 1;
+  color: ${props => props.theme.colors.black};
+  font-weight: 700;
+  margin-bottom: 10px;
+`
+
+export default {
+  name: 'Card',
+  props: {
+    title: {
+      type: String,
+      default: ''
+    },
+    width: {
+      type: [Number, String],
+      required: false,
+      default: '400px'
+    },
+    minWidth: {
+      type: [Number, String],
+      required: false,
+      default: null
+    },
+    titleClass: {
+      type: String,
+      default: ''
+    },
+    showPopover: {
+      type: Boolean,
+      default: false
+    },
+    viewCardClass: {
+      type: String,
+      default: ''
+    },
+    popoverText: {
+      type: String,
+      default: ''
+    },
+    isLoading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  components: {
+    Spinner,
+    Wrapper,
+    CardTitle,
+    CardWrapper,
+  }
+}
+</script>

package/src/components/errorMessage/index.vue

@@ -9,9 +9,7 @@
 <script>
 // import ErrorMessage from "@eturnity/eturnity_reusable_components/src/components/errorMessage"
 //To use:
-// <error-message
-//     alignText="right" // default is left
-// />
+// <error-message />
 
 import styled from 'vue-styled-components'
 

package/src/components/icon/index.vue

@@ -5,6 +5,7 @@
       :size="size"
       :color="color"
       :hoveredColor="hoveredColor"
+      :backgroundColor="backgroundColor"
       v-html="
         require(`!html-loader!./../../assets/svgIcons/${name.toLowerCase()}.svg`)
       "
@@ -40,6 +41,7 @@ const Wrapper = styled('div', wrapperAttrs)`
   cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursor)};
   line-height: 0;
 `
+
 const strikedAttrs = { isDisabled: Boolean, color: String, hoveredColor: String }
 const strikedLine = styled('div', strikedAttrs)`
   display: flex;
@@ -56,12 +58,14 @@ const strikedLine = styled('div', strikedAttrs)`
   transform-origin: 0% 100%;
   transform: rotate(-45deg);
 `
-const IconImageProps = { color: String, hoveredColor: String, size: String }
+const IconImageProps = { color: String, hoveredColor: String, size: String, backgroundColor: String}
 const IconImage = styled('div', IconImageProps)`
   width: 100%;
   svg {
     width: 100%;
     height: 100%;
+    background-color: ${(props) => props.backgroundColor};
+    padding: ${(props) => props.backgroundColor ? '3px' : '0'};
   }
   svg path {
     ${(props) =>
@@ -93,6 +97,9 @@ export default {
     color: {
       required: false
     },
+    backgroundColor: {
+      required: false
+    },
     hoveredColor: {
       required: false
     },

package/src/components/infoText/index.vue

@@ -10,7 +10,6 @@
       </icon-img>
       <text-overlay
         v-if="showInfo"
-        :borderColor="borderColor"
         :width="width"
         :halfComputedTextInfoWidth="halfComputedTextInfoWidth"
         :alignArrow="alignArrow"
@@ -27,7 +26,6 @@
 //To use:
 // <info-text
 //     text="Veritatis et quasi architecto beatae vitae"
-//     borderColor="#ccc"
 //     size="20"
 //     alignArrow="right" // which side the arrow should be on
 // />
@@ -37,7 +35,6 @@ import icon from '../icon'
 
 const textAttrs = {
   iconSize: String,
-  borderColor: String,
   alignArrow: String,
   width: String,
   halfComputedTextInfoWidth: Number
@@ -112,10 +109,6 @@ export default {
     text: {
       required: false
     },
-    borderColor: {
-      required: false,
-      default: null
-    },
     size: {
       required: false,
       default: '14px'
@@ -157,11 +150,7 @@ export default {
   },
   computed: {
     iconColor() {
-      return this.isActive
-        ? this.borderColor
-          ? this.borderColor
-          : theme.colors.secondary
-        : theme.colors.mediumGray
+      return theme.colors.mediumGray
     },
     halfComputedTextInfoWidth() {
       return parseInt(this.width) / 2

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

@@ -16,12 +16,10 @@
       <label-text :labelFontColor="labelFontColor" :data-id="labelDataId">
         {{ labelText }}
       </label-text>
-      
+
       <info-text
         v-if="labelInfoText"
         :text="labelInfoText"
-        borderColor="#ccc"
-        size="14px"
         :alignArrow="labelInfoAlign"
       />
     </label-wrapper>
@@ -100,7 +98,9 @@
 //     labelInfoAlign="left"
 //     :minNumber="0"
 //     fontColor="blue"
-// />
+// >
+//<template name=label><img>....</template>
+//</inputNumber>
 import styled from 'vue-styled-components'
 import {
   stringToNumber,
@@ -469,7 +469,7 @@ export default {
     }
   },
   methods: {
-    onEnterPress(event){
+    onEnterPress(){
       this.$emit('on-enter-click')
       this.$refs.inputField1.$el.blur()
     },
@@ -549,6 +549,9 @@ export default {
       return array
     },
     onInput(value) {
+      // if(!this.isFocused){
+      //   return
+      // }
       if (this.isBlurred) {
         this.isBlurred = false
         return

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

@@ -17,7 +17,6 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
           :size="fontSize ? fontSize : '16px'"
           :alignArrow="infoTextAlign"
         />

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

@@ -22,9 +22,7 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
           :size="infoTextSize"
-          :alignText="infoTextAlign"
         />
       </label-wrapper>
       <select-button-wrapper :disabled="disabled">
@@ -46,9 +44,12 @@
           @keydown.native="onKeyDown"
           :showBorder="showBorder"
           :data-id="dataId"
-          :isDraggable="isDraggable"
-        > 
-          <draggableInputHandle v-if="isDraggable && !isSearchBarVisible" :height="selectHeight" />
+          :paddingLeft="paddingLeft"
+        >
+          <draggableInputHandle
+            v-if="isDraggable && !isSearchBarVisible"
+            :height="selectHeight"
+          />
           <inputText
             v-if="isSearchBarVisible"
             ref="searchInput"
@@ -65,7 +66,12 @@
             @input-change="searchChange"
             @click.native.stop
           />
-          <selector v-else>
+          <selector
+            v-else
+            :showBorder="showBorder"
+            :selectWidth="selectWidth"
+            :paddingLeft="paddingLeft"
+          >
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
           <Caret @click.stop="toggleCaretDropdown">
@@ -145,20 +151,38 @@ import icon from '../../icon'
 import inputText from '../inputText'
 import draggableInputHandle from '../../draggableInputHandle'
 
+const CARET_WIDTH = '30px'
+const BORDER_WIDTH = '1px'
+
 const Caret = styled.div`
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 30px;
-  min-width: 30px;
+  width: ${CARET_WIDTH};
+  min-width: ${CARET_WIDTH};
   height: 100%;
-  align-items: stretch
+  align-items: stretch;
   cursor: pointer;
   margin-left: auto;
 `
 
-const Selector = styled.div`
-  width: 100%;
+const selectorProps = {
+  selectWidth: String,
+  paddingLeft: String,
+  showBorder: Boolean
+}
+const Selector = styled('div', selectorProps)`
+  ${(props) => props.selectWidth === '100%' ? 'width: 100%;' : `width: calc(${props.selectWidth} -
+      (
+        ${CARET_WIDTH} +
+        ${props.paddingLeft}
+        ${props.showBorder ? `+ (${BORDER_WIDTH} * 2)` : ''}
+      )
+    );
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;`
+  }
 `
 
 const labelAttrs = { fontSize: String, fontColor: String }
@@ -167,7 +191,7 @@ const InputLabel = styled('div', labelAttrs)`
     props.theme.colors[props.fontColor]
       ? props.theme.colors[props.fontColor]
       : props.fontColor};
-  font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
+  font-size: ${(props) => props.fontSize};
   font-weight: 700;
 `
 const optionalLabel = styled.span`
@@ -175,7 +199,7 @@ const optionalLabel = styled.span`
 `
 const inputProps = { selectWidth: String, optionWidth: String }
 const Container = styled('div', inputProps)`
-  width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
+  width: ${(props) => props.selectWidth};
   position: relative;
   display: inline-block;
 `
@@ -204,15 +228,15 @@ const selectButtonAttrs = {
   selectMinHeight: String,
   isSearchBarVisible: Boolean,
   showBorder: Boolean,
-  isDraggable: Boolean,
+  paddingLeft: String
 }
 const selectButton = styled('div', selectButtonAttrs)`
   position: relative;
   box-sizing: border-box;
   border-radius: 4px;
-  padding-left:${(props) => (props.isSearchBarVisible ? '0' : props.isDraggable?'30px':'15px')};
+  ${(props) =>
+    props.isSearchBarVisible ? '' : `padding-left: ${props.paddingLeft}`};
   text-align: left;
-  border-radius: 4px;
   min-height: ${(props) =>
     props.selectHeight
       ? props.selectHeight
@@ -227,7 +251,9 @@ const selectButton = styled('div', selectButtonAttrs)`
   ${({ showBorder, theme, hasError }) =>
     showBorder &&
     `
-    border:1px solid ${hasError ? theme.colors.red : theme.colors.grey4}
+    border: ${BORDER_WIDTH} solid ${
+      hasError ? theme.colors.red : theme.colors.grey4
+    }
   `}
   background-color:${(props) =>
     props.disabled
@@ -241,49 +267,50 @@ const selectButton = styled('div', selectButtonAttrs)`
       : props.fontColor};
   ${(props) => (props.disabled ? 'pointer-events: none' : '')};
   overflow: hidden;
-  & >.handle{
-    border-right:${(props) =>props.hasError ? props.theme.colors.red : props.theme.colors.grey4} 1px solid;
+  & > .handle {
+    border-right: ${(props) =>
+        props.hasError ? props.theme.colors.red : props.theme.colors.grey4}
+      1px solid;
   }
 `
 const selectDropdownAttrs = {
   hoveredBgColor: String,
   bgColor: String,
   fontColor: String,
-  selectWidth: String,
   optionWidth: String,
   hoveredIndex: Number,
   hoveredValue: Number | String,
   selectedValue: Number | String
 }
 const selectDropdown = styled('div', selectDropdownAttrs)`
-    box-sizing: border-box;
-    z-index:${(props) => (props.isActive ? '2' : '1')};
-    position:absolute;
-    top:5px;
-    border:1px solid ${(props) => props.theme.colors.grey4}
-    border-radius:4px;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    padding: 0px;
-    box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    width: ${(props) => (props.optionWidth ? props.optionWidth : '100%')};
-    background-color:${(props) =>
-      props.theme.colors[props.bgColor]
-        ? props.theme.colors[props.bgColor]
-        : props.bgColor};
-    color:${(props) =>
-      props.theme.colors[props.fontColor]
-        ? props.theme.colors[props.fontColor]
-        : props.fontColor};
-    max-height:300px;
-    overflow-y:auto;
-    &>div[data-value="${(props) => props.hoveredValue}"]{
-        background-color:${(props) =>
-          props.theme.colors[props.hoveredBgColor]
-            ? props.theme.colors[props.hoveredBgColor]
-            : props.hoveredBgColor};
-    }
+  box-sizing: border-box;
+  z-index: ${(props) => (props.isActive ? '2' : '1')};
+  position: absolute;
+  top: 5px;
+  border: ${BORDER_WIDTH} solid ${(props) => props.theme.colors.grey4};
+  border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  padding: 0px;
+  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  width: ${(props) => (props.optionWidth ? props.optionWidth : '100%')};
+  background-color: ${(props) =>
+    props.theme.colors[props.bgColor]
+      ? props.theme.colors[props.bgColor]
+      : props.bgColor};
+  color: ${(props) =>
+    props.theme.colors[props.fontColor]
+      ? props.theme.colors[props.fontColor]
+      : props.fontColor};
+  max-height: 300px;
+  overflow-y: auto;
+  & > div[data-value='${(props) => props.hoveredValue}'] {
+    background-color: ${(props) =>
+      props.theme.colors[props.hoveredBgColor]
+        ? props.theme.colors[props.hoveredBgColor]
+        : props.hoveredBgColor};
+  }
 `
 const DropdownWrapper = styled('div')`
   position: relative;
@@ -307,7 +334,7 @@ export default {
     },
     fontSize: {
       required: false,
-      default: null
+      default: '13px'
     },
     label: {
       required: false
@@ -323,12 +350,10 @@ export default {
     infoTextMessage: {
       required: false
     },
-    infoTextAlign: {
-      required: false
-    },
     selectWidth: {
+      type: String,
       required: false,
-      default: null
+      default: '100%'
     },
     selectHeight: {
       type: String,
@@ -437,6 +462,7 @@ export default {
   data() {
     return {
       selectedValue: null,
+      paddingLeft: this.isDraggable ? '30px' : '15px',
       isDropdownOpen: false,
       isActive: false,
       textSearch: '',
@@ -511,9 +537,6 @@ export default {
           }
         })
     },
-    onSelectSlotClick() {
-      this.toggleDropdown()
-    },
     clickOutside(event) {
       const dropdownRef = this.$refs.dropdown
       // we need to prevent closing on selecting an option, because in the case of
@@ -559,26 +582,21 @@ export default {
           this.$refs.dropdown.$el.scrollTop = topPos
         }
       }
+    },
+    clearSearch() {
+      this.textSearch = ''
     }
   },
   computed: {
     optionLength() {
       if (this.isDropdownOpen) {
-        // this filterRef is needed to check for the # of children on Filter dropdowns
-        const filterRef =
-          this.$refs.dropdown.$children &&
-          this.$refs.dropdown.$children.length > 1
-            ? this.$refs.dropdown.$children
-            : this.$refs.dropdown.$children[0].$children
-            ? this.$refs.dropdown.$children[0].$children
-            : this.$refs.dropdown.$children
-        return filterRef.length
-      } else {
-        return 0
+        return this.$refs.dropdown.$el.childElementCount
       }
+
+      return 0
     },
     isSearchBarVisible() {
-      return this.isSearchable && this.optionLength >= 5 && this.isDropdownOpen
+      return this.isSearchable && this.isDropdownOpen
     }
   },
   watch: {

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

@@ -17,9 +17,6 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
-          size="14px"
-          :alignText="infoTextAlign"
         />
       </label-container>
 
@@ -51,9 +48,6 @@
           @click.native.stop
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
-          size="14px"
-          :alignText="infoTextAlign"
         />
       </label-container>
     </flex-wrapper>
@@ -207,9 +201,6 @@ export default {
     infoTextMessage: {
       required: false
     },
-    infoTextAlign: {
-      required: false
-    },
     colorMode: {
       required: false,
       default: 'light'

package/src/components/inputs/textAreaInput/TextAreaInput.stories.js

@@ -22,7 +22,6 @@ const Template = (args, { argTypes }) => ({
   //     rowHeight="4" //optional
   //     :isError="false"
   //     :errorText="$gettext('field_required')"
-  //     infoTextAlign="right" // left by default
   //     infoTextMessage="My info message"
   //     label="Question 5"
   //     alignItems="horizontal" // horizontal, vertical
@@ -37,7 +36,6 @@ Default.args = {
   rowHeight: "2",
   isError: false,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "",
   label: "",
   value: "",
@@ -52,7 +50,6 @@ Disabled.args = {
   rowHeight: "2",
   isError: false,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "",
   label: "",
   value: "",
@@ -67,7 +64,6 @@ Error.args = {
   rowHeight: "2",
   isError: true,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "",
   label: "",
   value: "",
@@ -82,7 +78,6 @@ WithLabel.args = {
   rowHeight: "2",
   isError: false,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "Here is some information",
   label: "Description",
   value: "Here is my description!",
@@ -97,7 +92,6 @@ HorizontalLabel.args = {
   rowHeight: "2",
   isError: false,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "Here is some information",
   label: "Description",
   value: "Here is my description!",
@@ -112,7 +106,6 @@ LargerTextArea.args = {
   rowHeight: "5",
   isError: false,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "Here is some information",
   label: "Description",
   value: "Here is my description!",
@@ -127,7 +120,6 @@ LargerFontSize.args = {
   fontSize: "24px",
   isError: false,
   errorText: "This field is required",
-  infoTextAlign: "right",
   infoTextMessage: "Here is some information",
   label: "Description",
   value: "Here is my description!",

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

@@ -11,9 +11,7 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
           size="16px"
-          :alignText="infoTextAlign"
         />
       </label-wrapper>
       <input-container
@@ -47,7 +45,6 @@
 //     rowHeight="4" //optional
 //     :isError="false"
 //     :errorText="$gettext('field_required')"
-//     infoTextAlign="right" // left by default
 //     infoTextMessage="My info message"
 //     label="Question 5"
 //     alignItems="horizontal" // horizontal, vertical
@@ -167,9 +164,6 @@ export default {
     infoTextMessage: {
       required: false
     },
-    infoTextAlign: {
-      required: false
-    },
     label: {
       required: false
     },

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

@@ -14,9 +14,6 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
-          size="14px"
-          :alignText="infoTextAlign"
         />
       </label-container>
       <toggle-wrapper
@@ -50,9 +47,6 @@
           @click.native.stop
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
-          size="14px"
-          :alignText="infoTextAlign"
         />
       </label-container>
     </flex-wrapper>
@@ -72,7 +66,6 @@
 //   labelAlign="right"
 //   fontColor="black"
 //   :disabled="true"
-//   infoTextAlign="right" // left by default
 //   infoTextMessage="My info message"
 //   data-id="test_data_id"
 // />
@@ -193,7 +186,7 @@ const ToggleDot = styled('span', toggleProps)`
       : props.size === 'small'
       ? '10px'
       : '14px'};
-  left: 3px
+  left: 3px;
   bottom: ${(props) =>
     props.size === 'medium' ? '5px' : props.size === 'small' ? '2px' : '5px'};
   background-color: ${(props) =>
@@ -278,9 +271,6 @@ export default {
     infoTextMessage: {
       required: false
     },
-    infoTextAlign: {
-      required: false
-    },
     dataId: {
       type: String,
       default: ''

package/src/components/label/index.vue

@@ -13,7 +13,6 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
           :size="fontSize ? fontSize : '16px'"
           :alignArrow="infoTextAlign"
         />

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

@@ -5,7 +5,7 @@
     :class="{ visible: isOpen, hidden: !isOpen }"
     :backdrop="backdrop"
   >
-    <modal-container @click.stop>
+    <modal-container @click="onClickModalContainer">
       <spinner v-if="isLoading" size="50px" :limitedToModal="true" />
       <content-container :visible="!isLoading">
         <slot />
@@ -26,7 +26,7 @@
 // import Modal from "@eturnity/eturnity_reusable_components/src/components/modals/modal"
 // This is a more flexible modal box, where the parent can decide how the body of the modal looks
 // To use:
-// <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :isLoading="true" :hideClose="true">
+// <modal :isOpen="isOpen" @on-close="$emit('on-close-summary')" :isLoading="true" :hideClose="true" :stopPropagation="false">
 //   <div>Data....</div>
 // </modal>
 
@@ -151,6 +151,10 @@ export default {
     position: {
       required: false,
       default: 'fixed'
+    },
+    stopPropagation: {
+      type: Boolean,
+      default: true
     }
   },
   beforeDestroy() {
@@ -164,6 +168,11 @@ export default {
       if (key === 'Escape') {
         this.onCloseModal()
       }
+    },
+    onClickModalContainer(event) {
+      if (this.stopPropagation) {
+        event.stopPropagation()
+      }
     }
   },
   watch: {

package/src/components/navigationTabs/index.vue

@@ -13,8 +13,6 @@
             <info-text
                 v-if="tab['labelInfoText']"
                 :text="tab['labelInfoText']"
-                borderColor="#ccc"
-                size="14px"
                 :alignArrow="tab['labelInfoAlign']"
             />
         </Option>
@@ -57,7 +55,7 @@ const Option = styled('div',TabAttr)`
     justify-content: center;
     flex-direction: row;
     gap: 10px;
-    color: ${props=>props.textColor ? 
+    color: ${props=>props.textColor ?
         props.theme.colors[props.textColor] ? props.theme.colors[props.textColor] : props.textColor :
         props.isDisabled ? props.theme.colors.grey2 : props.theme.colors.black};
   `

package/src/components/pageSubtitle/index.vue

@@ -4,11 +4,8 @@
       {{ text }}
     </span>
     <info-text
-      :text="infoText"
       v-if="!!infoText"
-      size="14px"
-      borderColor="#ccc"
-      :alignText="alignInfoText"
+      :text="infoText"
     />
   </subtitle-text>
 </template>
@@ -55,10 +52,6 @@ export default {
       required: false,
       default: null,
     },
-    alignInfoText: {
-      required: false,
-      default: "left",
-    },
     marginBottom: {
       required: false,
       default: "30px",

package/src/components/pageTitle/index.vue

@@ -1,14 +1,14 @@
 <template>
-  <flex>
-    <title-text :color="color" :fontSize="fontSize" :uppercase="uppercase">{{ text }}</title-text>
+  <title-wrap :hasInfoText="!!infoText">
+    <title-text :color="color" :fontSize="fontSize" :uppercase="uppercase">
+      {{ text }}
+    </title-text>
     <info-text
-        v-if="infoText"
-        :text="infoText"
-        borderColor="#ccc"
-        size="14px"
-        :alignArrow="infoAlign"
-      />
-  </flex>
+      v-if="!!infoText"
+      :text="infoText"
+      :alignArrow="infoAlign"
+    />
+  </title-wrap>
 </template>
 
 <script>
@@ -19,28 +19,32 @@
 //   color="red"
 // />
 import styled from "vue-styled-components"
-import InfoText from '../infoText'
-const textAttrs = { color: String, fontSize: String, uppercase: Boolean }
-const TitleText = styled("div", textAttrs)`
+import InfoText from "../infoText"
+
+const wrapAttrs = { hasInfoText: Boolean }
+const TitleWrap = styled("div", wrapAttrs)`
+  display: grid;
+  align-items: center;
+  grid-gap: 12px;
+  grid-template-columns: ${(props) =>
+    props.hasInfoText ? "auto auto 1fr" : "1fr"};
+  margin-bottom: 20px;
+`
+
+const titleAttrs = { color: String, fontSize: String, uppercase: Boolean }
+const TitleText = styled('span', titleAttrs)`
   color: ${(props) => (props.color ? props.color : props.theme.colors.black)};
   font-weight: bold;
   font-size: ${(props) => (props.fontSize ? props.fontSize : '16px')};
   text-transform: ${(props) => (props.uppercase ? 'uppercase' : 'none')};
-  
-`
-const flex = styled("div", textAttrs)`
-  display: flex;
-  gap:10px;
-  margin-bottom: 20px;
-  align-items: center;
 `
 
 export default {
   name: "page-title",
   components: {
     TitleText,
-    InfoText,
-    flex
+    TitleWrap,
+    InfoText
   },
   props: {
     text: {
@@ -59,10 +63,11 @@ export default {
     },
     infoText: {
       required: false,
+      default: null,
     },
     infoAlign: {
       required: false,
-    },
+    }
   },
 }
 </script>

package/src/helpers/numberConverter.js

@@ -18,6 +18,7 @@ export const stringToNumber = ({
     selectedLang === 'de-lu' ||
     selectedLang === 'de-be' ||
     selectedLang === 'es-es' ||
+    selectedLang === 'ca-es' ||
     selectedLang === 'de' ||
     selectedLang === 'de-at' ||
     selectedLang === 'it' ||

package/src/helpers/translateLang.js

@@ -48,6 +48,8 @@ export const translateLang = (lang) => {
     return 'portuguese'
   } else if (lang === 'es-es') {
     return 'spanish'
+  } else if (lang === 'ca-es') {
+    return 'catalan_es'
   } else {
     return lang
   }
@@ -72,6 +74,8 @@ export const datePickerLang = (lang) => {
     return 'it'
   } else if (lang === 'en-us' || lang === 'en-gb') {
     return 'en'
+  } else if (lang === 'es-es' || lang === 'ca-es' || lang === 'pt-pt') {
+    return 'es'
   } else {
     return lang
   }
@@ -97,6 +101,8 @@ export const tinyLanguage = (lang) => {
     return 'fr_FR'
   } else if (lang === 'it' || lang === 'it-it' || lang === 'it-ch') {
     return 'it'
+  } else if (lang === 'es-es' || lang === 'ca-es') {
+    return 'es'
   } else if (lang === 'en-us') {
     return null
   } else {
@@ -114,7 +120,9 @@ export const langForLocaleString = () => {
           ? 'fr-fr'
           : localStorage.getItem('lang') === 'fr-ch'
               ? 'de-ch'
-              : localStorage.getItem('lang')
+              : localStorage.getItem('lang') === 'ca-es'
+                ? 'es-es'
+                : localStorage.getItem('lang')
       : 'en-US'
   return selectedLang !== 'null' ? selectedLang : 'en-US'
 }