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

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

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

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

@@ -1,5 +1,5 @@
 <template>
-  <container :inputWidth="inputWidth">
+  <container>
     <label-wrapper v-if="labelText">
       <label-text>
         {{ labelText }}
@@ -8,15 +8,16 @@
         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="placeholder"
+        :placeholder="displayedPlaceholder"
         :isError="isError"
         :inputWidth="inputWidth"
         :minWidth="minWidth"
@@ -30,19 +31,19 @@
         :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
       >
+      <icon
+        v-if="(isError || inputIcon) && !showLinearUnitName"
+        :class="inputIconImageClass"
+        :src="isError ? warningIcon : inputIconImage"
+      />
     </input-wrapper>
     <error-message v-if="isError">{{ errorMessage }}</error-message>
   </container>
@@ -80,6 +81,12 @@ 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,
@@ -90,16 +97,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
@@ -107,15 +106,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')};
@@ -141,6 +133,15 @@ 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;
@@ -158,7 +159,6 @@ const UnitContainer = styled('span', inputProps)`
   right: 10px;
   top: 0;
   padding-left: 10px;
-  text-align: right;
   color: ${(props) =>
     props.isError
       ? props.theme.colors.red
@@ -167,34 +167,14 @@ 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};
-  position: absolute;
-  top: calc(100% + 1px);
-`
+// const ErrorMessage = styled.div`
+//   margin-top: 5px;
+//   line-height: 1;
+//   text-transform: none;
+//   font-size: 10px;
+//   color: ${(props) => props.theme.colors.red};
+//   position: absolute;
+// `
 
 const LabelWrapper = styled.div`
   display: flex;
@@ -217,13 +197,21 @@ export default {
     ErrorMessage,
     LabelWrapper,
     LabelText,
-    SlotContainer,
-    InfoText
+    InfoText,
+    Icon
   },
+  inheritAttrs: false,
   data() {
     return {
       textInput: '',
-      isFocused: false
+      isFocused: false,
+      warningIcon: warningIcon
+    }
+  },
+  computed: {
+    displayedPlaceholder() {
+      if (this.placeholder) return this.placeholder
+      return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
     }
   },
   props: {
@@ -293,7 +281,7 @@ export default {
     },
     labelInfoAlign: {
       required: false,
-      default: 'left'
+      default: 'right'
     },
     minNumber: {
       required: false,
@@ -307,21 +295,25 @@ export default {
       required: false,
       default: true
     },
-    slotSize: {
-      required: false
-    }
-  },
-  computed: {
-    hasSlot() {
-      return !!this.$slots.default
+    inputIcon: {
+      require: false,
+      type: Boolean,
+      default: false
+    },
+    inputIconImage: {
+      require: false,
+      type: String,
+      default: ''
     },
-    computedSlotSize() {
-      return this.slotSize || this.$slots['default'][0].elm.clientWidth
+    inputIconImageClass: {
+      require: false,
+      type: Array,
+      default: () => []
     }
   },
   methods: {
     onChangeHandler(event) {
-      if (isNaN(event)) {
+      if (isNaN(event) || event=="") {
         event = this.minNumber || this.minNumber === 0 ? this.minNumber : event
       }
       this.$emit('input-change', event)
@@ -351,10 +343,12 @@ export default {
         }
       })
       let evaluated = eval(formatted.join(''))
-      evaluated = stringToNumber({
-        value: evaluated,
-        numberPrecision: this.numberPrecision
-      })
+      if (typeof evaluated === 'string') {
+        evaluated = stringToNumber({
+          value: evaluated,
+          numberPrecision: this.numberPrecision
+        })
+      }
       return evaluated
     },
     onInputBlur(e) {
@@ -385,6 +379,7 @@ export default {
       this.$nextTick(() => {
         this.$refs.inputField1.$el.select()
       })
+      this.$emit('input-focus')
     },
     formatWithCurrency(value) {
       let adjustedMinValue =

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

@@ -14,6 +14,7 @@
           :alignText="infoTextAlign"
         />
       </label-wrapper>
+      <input-error-wrapper>
       <input-container
         :placeholder="placeholder"
         :isError="isError"
@@ -26,20 +27,27 @@
         :isDisabled="disabled"
         :fontSize="fontSize"
       />
+      <error-message v-if="isError">{{ errorMessage }}</error-message>
+      </input-error-wrapper>
     </input-wrapper>
-    <error-message v-if="isError">{{ errorMessage }}</error-message>
   </container>
 </template>
 
 <script>
 import styled from "vue-styled-components"
 import InfoText from "../../infoText"
+import ErrorMessage from '../../errorMessage'
 
 const Container = styled.div`
   width: 100%;
   position: relative;
 `
-
+const InputErrorWrapper = styled.div`
+  display: inline-grid;
+  grid-template-row: auto auto;
+  grid-gap: 0px;
+  align-items: center;
+`
 const labelAttrs = { fontSize: String }
 const InputLabel = styled("div", labelAttrs)`
   font-weight: bold;
@@ -104,13 +112,6 @@ 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);
-`
-
 export default {
   // import InputText from "@eturnity/eturnity_reusable_components/src/components/inputs/inputText"
   // To use:
@@ -136,6 +137,7 @@ export default {
     ErrorMessage,
     InfoText,
     InputLabel,
+    InputErrorWrapper,
     LabelWrapper,
   },
   props: {

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

@@ -23,6 +23,7 @@
         :disabled="isDisabled"
         :fontSize="fontSize"
         @input="onChangeHandler"
+        :resize="resize"
       />
     </input-wrapper>
     <error-message v-if="isError && errorText">{{ errorText }}</error-message>
@@ -174,7 +175,11 @@ export default {
     },
     inputWidth: {
       required: false,
-      default: null
+      default: null,
+    },
+    resize:{
+      required:false,
+      default: "none"
     }
   },
   methods: {

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

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

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

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

package/src/components/spinner/index.vue

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