@eturnity/eturnity_reusable_components 7.2.0 → 7.2.2-EPDM-9012.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.2.0",
+  "version": "7.2.2-EPDM-9012.0",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

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
@@ -111,10 +108,6 @@ export default {
     text: {
       required: false
     },
-    borderColor: {
-      required: false,
-      default: null
-    },
     size: {
       required: false,
       default: '14px'
@@ -156,11 +149,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/InputNumber.stories.js

@@ -32,7 +32,6 @@ const Template = (args, { argTypes }) => ({
   //     fontSize="13px"
   //     labelText="Number of Modules"
   //     labelInfoText="Here is some information for you..."
-  //     labelInfoAlign="left"
   // />
 })
 
@@ -129,8 +128,7 @@ WithLabelInfo.args = {
   textAlign: "left",
   showLinearUnitName: false,
   labelText: "Number Input",
-  labelInfoText: "Here is some information for you...",
-  labelInfoAlign: "right",
+  labelInfoText: "Here is some information for you..."
 }
 
 export const LargerFont = Template.bind({})

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

@@ -16,13 +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>
     <input-wrapper>
@@ -97,7 +94,6 @@
 //     fontSize="13px"
 //     labelText="Number of Modules"
 //     labelInfoText="Here is some information for you..."
-//     labelInfoAlign="left"
 //     :minNumber="0"
 //     fontColor="blue"
 // />
@@ -406,10 +402,6 @@ export default {
       required: false,
       default: null
     },
-    labelInfoAlign: {
-      required: false,
-      default: 'left'
-    },
     defaultNumber: {
       required: false,
       default: null

package/src/components/inputs/inputText/InputText.stories.js

@@ -21,7 +21,6 @@ const Template = (args, { argTypes }) => ({
   //   @input-change="onInputChange({ value: $event, type: 'companyName' })"
   //   :isError="checkErrors()"
   //   :errorMessage="This is my error message"
-  //   infoTextAlign="right" // left by default
   //   infoTextMessage="My info message"
   //   label="Question 5"
   //   alignItems="horizontal" // horizontal, vertical

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

@@ -17,9 +17,7 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
           :size="fontSize ? fontSize : '16px'"
-          :alignArrow="infoTextAlign"
         />
       </label-wrapper>
       <input-error-wrapper>
@@ -206,7 +204,6 @@ export default {
   //   @input-blur="onInputBlur($event)"
   //   :isError="checkErrors()"
   //   :errorMessage="This is my error message"
-  //   infoTextAlign="right" // left by default
   //   infoTextMessage="My info message"
   //   label="Question 5"
   //   alignItems="horizontal" // horizontal, vertical
@@ -270,9 +267,6 @@ export default {
     infoTextMessage: {
       required: false
     },
-    infoTextAlign: {
-      required: false
-    },
     label: {
       required: false
     },

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

@@ -22,9 +22,7 @@
         <info-text
           v-if="infoTextMessage"
           :text="infoTextMessage"
-          borderColor="#ccc"
           :size="fontSize ? fontSize : '16px'"
-          :alignText="infoTextAlign"
         />
       </label-wrapper>
       <select-button-wrapper :disabled="disabled">
@@ -315,9 +313,6 @@ export default {
     infoTextMessage: {
       required: false
     },
-    infoTextAlign: {
-      required: false
-    },
     selectWidth: {
       required: false,
       default: null

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/navigationTabs/index.vue

@@ -4,11 +4,11 @@
       v-for="(tab, index) in tabsData"
       :key="tab.id"
       :isDisabled="!!tab['isDisabled']"
-      :hasDisabledLook="!!tab['hasDisabledLook']"
+      :textColor="tab['textColor']"
       :active="isIndexKey ? index === activeTab : tab[tabKey] === activeTab"
       @click="$emit('tab-click', isIndexKey ? index : tab[tabKey])"
     >
-        <Option :isDisabled="!!tab['isDisabled']" :hasDisabledLook="!!tab['hasDisabledLook']">
+        <Option :isDisabled="!!tab['isDisabled']" :textColor="tab['textColor']">
             <Uppercase>{{ tab[tabLabel] }}</Uppercase>
             <info-text
                 v-if="tab['labelInfoText']"
@@ -29,7 +29,7 @@ import InfoText from '../infoText'
 const TabAttr = {
   active: Boolean,
   isDisabled: Boolean,
-  hasDisabledLook: Boolean
+  textColor: String
 }
 
 const bottomLine = styled('div')`
@@ -57,17 +57,19 @@ const Option = styled('div',TabAttr)`
     justify-content: center;
     flex-direction: row;
     gap: 10px;
-    color: ${props=>props.hasDisabledLook ? props.theme.colors.grey2 : props.theme.colors.black};
+    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};
   `
 const Tab = styled('div', TabAttr)`
   padding: 16px 10px;
   margin-right: 5px;
   position: relative;
-  top: ${(props) => (props.hasDisabledLook ? '-1px' : '0')};
+  top: ${(props) => (props.isDisabled ? '-1px' : '0')};
   z-index: 10;
   border-bottom: 2px solid
     ${(props) => (props.active ? props.theme.colors.primary : 'transparent')};
-  background-color: ${(props) => (props.hasDisabledLook ? props.theme.colors.grey5 : 'transparent')};
+  background-color: ${(props) => (props.isDisabled ? props.theme.colors.grey5 : 'transparent')};
   transition: 0.2s ease;
   cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
   min-width: 140px;
@@ -76,7 +78,7 @@ const Tab = styled('div', TabAttr)`
   justify-content: space-between;
   min-height: 55px;
   &:hover {
-    border-color: ${(props) => props.hasDisabledLook ? props.theme.colors.grey2 : props.theme.colors.primary};
+    border-color: ${(props) => props.isDisabled ? props.theme.colors.grey2 : props.theme.colors.primary};
   }
 `
 

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,13 @@
 <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"
+    />
+  </title-wrap>
 </template>
 
 <script>
@@ -19,33 +18,41 @@
 //   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: {
       required: true,
     },
+    infoText: {
+      required: false,
+      default: null,
+    },
     color: {
       required: false,
     },
@@ -56,13 +63,7 @@ export default {
     uppercase: {
       required: false,
       default: true
-    },
-    infoText: {
-      required: false,
-    },
-    infoAlign: {
-      required: false,
-    },
+    }
   },
 }
 </script>

package/src/helpers/numberConverter.js

@@ -38,7 +38,7 @@ export const stringToNumber = ({
         .replace(/[.\s]/g, '')
         .replace(/[,\s]/, '.')
     }
-  } else if (selectedLang === 'en-us') {
+  } else if (selectedLang === 'en-us' || selectedLang === 'en-gb') {
     // replace commas with blank: 1,234.56 --> 1234.56
     if (allowNegative) {
       newVal = newVal.replace(/[^\d-.,']/g, '').replace(/[,\s]/g, '')