@eturnity/eturnity_reusable_components 1.2.26-EPDM-3412.5 → 1.2.27

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,19 +8,17 @@
         v-if="labelInfoText"
         :text="labelInfoText"
         borderColor="#ccc"
-        size="14px"
+        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"
-        :inputHeight="inputHeight"
         :minWidth="minWidth"
         :value="formatWithCurrency(value)"
         @blur="onInputBlur($event)"
@@ -32,25 +30,13 @@
         :textAlign="textAlign"
         :fontSize="fontSize"
         :fontColor="fontColor"
-        v-on="$listeners"
-        :hasSlot="hasSlot"
-        :slotSize="slotSize"
       />
-      <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
       >
-      <icon
-        v-if="(isError || inputIcon) && !showLinearUnitName"
-        :class="inputIconImageClass"
-        :src="isError ? warningIcon : inputIconImage"
-      />
     </input-wrapper>
     <error-message v-if="isError">{{ errorMessage }}</error-message>
   </container>
@@ -88,8 +74,11 @@ import {
   numberToString
 } from '../../../helpers/numberConverter'
 import InfoText from '../../infoText'
-import ErrorMessage from '../../errorMessage'
-import warningIcon from '../../../assets/icons/error_icon.png'
+
+const Container = styled.div`
+  width: 100%;
+  position: relative;
+`
 
 const inputProps = {
   isError: Boolean,
@@ -100,17 +89,8 @@ const inputProps = {
   noBorder: Boolean,
   textAlign: String,
   fontSize: String,
-  fontColor: String,
-  hasSlot: Boolean,
-  slotSize: String,
-  inputHeight: 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
@@ -118,24 +98,15 @@ 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')};
   font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
   color: ${(props) =>
     props.isError
-      ? props.theme.colors.grey6
-      : props.isDisabled
-      ? props.theme.colors.grey2
+      ? props.theme.colors.red
       : props.fontColor
       ? props.fontColor + ' !important'
       : props.theme.colors.black};
@@ -144,7 +115,7 @@ const InputContainer = styled('input', inputProps)`
   background-color: ${(props) =>
     props.isDisabled ? props.theme.colors.grey5 : '#fff'};
   box-sizing: border-box;
-  max-height: ${(props) => props.inputHeight};
+
   &::placeholder {
     color: ${(props) =>
       props.isError ? props.theme.colors.red : props.theme.colors.darkGray};
@@ -154,15 +125,6 @@ const InputContainer = styled('input', inputProps)`
     outline: none;
   }
 `
-const IconProps = {
-  inputIconHeight: String
-}
-
-const Icon = styled('img', IconProps)`
-  position: absolute;
-  right: 10px;
-  top: 2px;
-`
 
 const InputWrapper = styled.span`
   position: relative;
@@ -180,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
@@ -189,27 +150,11 @@ 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};
+const ErrorMessage = styled.div`
+  font-size: 14px;
+  color: ${(props) => props.theme.colors.red};
   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};
+  top: calc(100% + 1px);
 `
 
 const LabelWrapper = styled.div`
@@ -219,9 +164,8 @@ const LabelWrapper = styled.div`
 `
 
 const LabelText = styled.div`
+  font-weight: bold;
   font-size: 13px;
-  color: ${(props) => props.theme.colors.eturnityGrey};
-  font-weight: 700;
 `
 
 export default {
@@ -234,16 +178,12 @@ export default {
     ErrorMessage,
     LabelWrapper,
     LabelText,
-    InfoText,
-    Icon,
-    SlotContainer
+    InfoText
   },
-  inheritAttrs: false,
   data() {
     return {
       textInput: '',
-      isFocused: false,
-      warningIcon: warningIcon
+      isFocused: false
     }
   },
   props: {
@@ -263,10 +203,6 @@ export default {
       required: false,
       default: null
     },
-    inputHeight: {
-      required: false,
-      default: null
-    },
     value: {
       required: true,
       default: null
@@ -317,7 +253,7 @@ export default {
     },
     labelInfoAlign: {
       required: false,
-      default: 'left'
+      default: 'right'
     },
     minNumber: {
       required: false,
@@ -330,50 +266,13 @@ export default {
     numberToStringEnabled: {
       required: false,
       default: true
-    },
-    inputIcon: {
-      require: false,
-      type: Boolean,
-      default: false
-    },
-    inputIconImage: {
-      require: false,
-      type: String,
-      default: ''
-    },
-    allowNegative: {
-      required: false,
-      default: true
-    },
-    inputIconImageClass: {
-      require: false,
-      type: Array,
-      default: () => []
-    },
-    slotSize: {
-      required: false
-    }
-  },
-  computed: {
-    displayedPlaceholder() {
-      if (this.placeholder) return this.placeholder
-      return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
-    },
-    hasSlot() {
-      return !!this.$slots.default
-    },
-    computedSlotSize() {
-      return this.slotSize || this.$slots['default'][0].elm.clientWidth
     }
   },
   methods: {
     onChangeHandler(event) {
-      if (isNaN(event) || event == '') {
+      if (isNaN(event)) {
         event = this.minNumber || this.minNumber === 0 ? this.minNumber : event
       }
-      if (!this.allowNegative) {
-        event = Math.abs(event)
-      }
       this.$emit('input-change', event)
     },
     onEvaluateCode(val) {
@@ -406,8 +305,6 @@ export default {
           value: evaluated,
           numberPrecision: this.numberPrecision
         })
-      } else if (typeof evaluated === 'number') {
-        evaluated = evaluated.toFixed(this.numberPrecision)
       }
       return evaluated
     },
@@ -424,8 +321,8 @@ export default {
         })
       }
       let adjustedMinValue =
-        evaluatedInput && evaluatedInput.length
-          ? evaluatedInput
+        value && value.length
+          ? value
           : this.minNumber || this.minNumber === 0
           ? this.minNumber
           : ''
@@ -439,7 +336,6 @@ export default {
       this.$nextTick(() => {
         this.$refs.inputField1.$el.select()
       })
-      this.$emit('input-focus')
     },
     formatWithCurrency(value) {
       let adjustedMinValue =
@@ -456,7 +352,6 @@ export default {
             })
           : adjustedMinValue
         let unit = this.showLinearUnitName ? '' : this.unitName
-        //return input + ' ' + unit
         return input + ' ' + unit
       } else if (!adjustedMinValue && adjustedMinValue !== 0) {
         return ''

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

@@ -10,42 +10,38 @@
           v-if="infoTextMessage"
           :text="infoTextMessage"
           borderColor="#ccc"
-          :size="fontSize ? fontSize : '16px'"
+          :size="fontSize ? fontSize : '16'"
           :alignText="infoTextAlign"
         />
       </label-wrapper>
-      <input-error-wrapper>
-        <icon-container>
-          <input-container
-            :placeholder="placeholder"
-            :isError="isError"
-            :inputWidth="inputWidth"
-            :minWidth="minWidth"
-            :value="value"
-            @input="onChangeHandler"
-            :noBorder="noBorder"
-            :disabled="disabled"
-            :isDisabled="disabled"
-            :fontSize="fontSize"
-            :inputType="inputType"
-            :type="inputTypeData"
-          />
-          <icon-wrapper
-            v-if="inputType === 'password' && !isError"
-            @click="toggleShowPassword()"
-            size="20px"
-          >
-            <icon name="current_variant" size="20px" />
-          </icon-wrapper>
-          <icon-wrapper v-if="isError" size="16px">
-            <icon name="warning" size="16px" cursor="default" />
-          </icon-wrapper>
-        </icon-container>
-        <error-message v-if="isError && errorMessage">{{
-          errorMessage
-        }}</error-message>
-      </input-error-wrapper>
+      <icon-container>
+        <input-container
+          :placeholder="placeholder"
+          :isError="isError"
+          :inputWidth="inputWidth"
+          :minWidth="minWidth"
+          :value="value"
+          @input="onChangeHandler"
+          :noBorder="noBorder"
+          :disabled="disabled"
+          :isDisabled="disabled"
+          :fontSize="fontSize"
+          :inputType="inputType"
+          :type="inputTypeData"
+        />
+        <icon-wrapper
+          v-if="inputType === 'password' && !isError"
+          @click="toggleShowPassword()"
+          size="20px"
+        >
+          <icon name="current_variant" size="20px" />
+        </icon-wrapper>
+        <icon-wrapper v-if="isError" size="16px">
+          <icon name="warning" size="16px" cursor="default" />
+        </icon-wrapper>
+      </icon-container>
     </input-wrapper>
+    <error-message v-if="isError">{{ errorMessage }}</error-message>
   </container>
 </template>
 
@@ -53,7 +49,6 @@
 import styled from 'vue-styled-components'
 import InfoText from '../../infoText'
 import Icon from '../../icon'
-import ErrorMessage from '../../errorMessage'
 
 const Container = styled.div`
   width: 100%;
@@ -62,9 +57,8 @@ const Container = styled.div`
 
 const labelAttrs = { fontSize: String }
 const InputLabel = styled('div', labelAttrs)`
-  color: ${(props) => props.theme.colors.eturnityGrey};
+  font-weight: bold;
   font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
-  font-weight: 700;
 `
 
 const LabelWrapper = styled.div`
@@ -75,13 +69,6 @@ const LabelWrapper = styled.div`
   justify-content: start;
 `
 
-const InputErrorWrapper = styled.div`
-  display: inline-grid;
-  grid-template-row: auto auto;
-  grid-gap: 0px;
-  align-items: center;
-`
-
 const inputProps = {
   isError: Boolean,
   inputWidth: String,
@@ -110,11 +97,7 @@ const InputContainer = styled('input', inputProps)`
   position: relative;
   font-size: ${(props) => (props.fontSize ? props.fontSize : '16px')};
   color: ${(props) =>
-    props.isError
-      ? props.theme.colors.grey6
-      : props.isDisabled
-      ? props.theme.colors.grey2
-      : props.theme.colors.black};
+    props.isError ? props.theme.colors.red : props.theme.colors.black};
   width: ${(props) => (props.inputWidth ? props.inputWidth : '100%')};
   min-width: ${(props) => (props.minWidth ? props.minWidth : 'unset')};
   box-sizing: border-box; // to allow width of 100% with padding
@@ -143,6 +126,13 @@ const InputWrapper = styled('div', inputAttrs)`
     props.alignItems === 'vertical' || !props.hasLabel ? '1fr' : 'auto 1fr'};
 `
 
+const ErrorMessage = styled.div`
+  font-size: 14px;
+  color: ${(props) => props.theme.colors.red};
+  position: absolute;
+  top: calc(100% + 1px);
+`
+
 const IconAttrs = { size: String }
 const IconWrapper = styled('div', IconAttrs)`
   position: absolute;
@@ -185,8 +175,7 @@ export default {
     LabelWrapper,
     Icon,
     IconWrapper,
-    IconContainer,
-    InputErrorWrapper
+    IconContainer
   },
   data() {
     return {

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

@@ -12,7 +12,7 @@
         />
         <span class="checkmark"></span>
         <label-text :isDisabled="item.disabled">{{ item.label }}</label-text>
-        <info-text v-if="item.infoText" :text="item.infoText" size="16px" />
+        <info-text v-if="item.infoText" :text="item.infoText" size="16" />
       </label-container>
       <image-container v-if="item.img">
         <radio-image :src="item.img" />

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

@@ -25,9 +25,8 @@
 //   :value="companyName"
 //   :disabled="true"
 //   inputWidth="250px"
-//   @on-change="function($event)"
 // />
-import styled from 'vue-styled-components'
+import styled from "vue-styled-components"
 
 const Container = styled.div`
   width: 100%;
@@ -35,15 +34,15 @@ const Container = styled.div`
 `
 
 const inputAttrs = { isDisabled: Boolean, inputWidth: String }
-const InputContainer = styled('input', inputAttrs)`
+const InputContainer = styled("input", inputAttrs)`
   border: 1px solid ${(props) => props.theme.colors.mediumGray};
   padding: 11px 30px 11px 10px;
   border-radius: 4px;
-  font-size: 13px;
+  font-size: 16px;
   color: ${(props) => props.theme.colors.black};
-  width: ${(props) => (props.inputWidth ? props.inputWidth : '100%')};
+  width: ${(props) => (props.inputWidth ? props.inputWidth : "100%")};
   box-sizing: border-box;
-  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'auto')};
+  cursor: ${(props) => (props.isDisabled ? "not-allowed" : "auto")};
   background: ${(props) => props.theme.colors.white} !important;
   &::placeholder {
     color: ${(props) => props.theme.colors.darkGray};
@@ -66,33 +65,33 @@ const InputWrapper = styled.span`
 `
 
 export default {
-  name: 'search-input',
+  name: "search-input",
   components: {
     InputContainer,
     InputWrapper,
-    Container
+    Container,
   },
   props: {
     value: {
-      required: true
+      required: true,
     },
     disabled: {
       required: false,
-      default: false
+      default: false,
     },
     placeholder: {
       required: false,
-      default: ''
+      default: "",
     },
     inputWidth: {
       required: false,
-      default: null
-    }
+      default: null,
+    },
   },
   methods: {
     onChangeHandler(event) {
-      this.$emit('on-change', event)
-    }
-  }
+      this.$emit("on-change", event)
+    },
+  },
 }
 </script>

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

@@ -10,7 +10,7 @@
           v-if="infoTextMessage"
           :text="infoTextMessage"
           borderColor="#ccc"
-          size="16px"
+          size="16"
           :alignText="infoTextAlign"
         />
       </label-wrapper>
@@ -23,7 +23,6 @@
         :disabled="isDisabled"
         :fontSize="fontSize"
         @input="onChangeHandler"
-        :resize="resize"
       />
     </input-wrapper>
     <error-message v-if="isError && errorText">{{ errorText }}</error-message>
@@ -45,11 +44,9 @@
 //     label="Question 5"
 //     alignItems="horizontal" // horizontal, vertical
 //     :isDisabled="true"
-// .   fontSize="13px"
 // />
 import styled from 'vue-styled-components'
 import InfoText from '../../infoText'
-import ErrorMessage from '../../errorMessage'
 
 const containerProps = { inputWidth: String }
 const Container = styled('div', containerProps)`
@@ -110,6 +107,13 @@ const InputWrapper = styled('div', inputAttrs)`
       : 'auto 1fr'};
 `
 
+const ErrorMessage = styled.div`
+  font-size: 14px;
+  color: ${(props) => props.theme.colors.red};
+  position: absolute;
+  top: calc(100% + 1px);
+`
+
 const labelAttrs = { fontSize: String }
 const InputLabel = styled('div', labelAttrs)`
   font-weight: bold;
@@ -171,10 +175,6 @@ export default {
     inputWidth: {
       required: false,
       default: null
-    },
-    resize: {
-      required: false,
-      default: 'none'
     }
   },
   methods: {

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

@@ -10,7 +10,7 @@
           v-if="infoTextMessage"
           :text="infoTextMessage"
           borderColor="#ccc"
-          size="14px"
+          size="14"
           :alignText="infoTextAlign"
         />
       </label-container>
@@ -46,7 +46,7 @@
           v-if="infoTextMessage"
           :text="infoTextMessage"
           borderColor="#ccc"
-          size="14px"
+          size="14"
           :alignText="infoTextAlign"
         />
       </label-container>

package/src/components/pageSubtitle/index.vue

@@ -6,7 +6,7 @@
     <info-text
       :text="infoText"
       v-if="!!infoText"
-      size="14px"
+      size="14"
       borderColor="#ccc"
       :alignText="alignInfoText"
     />