@eturnity/eturnity_reusable_components 7.8.6-EPDM-7951.0 → 7.10.0

package/src/components/icon/index.vue

@@ -1,18 +1,19 @@
 <template>
-  <wrapper :isDisabled="disabled" :size="size" :cursor="cursor">
-    <icon-image :size="size" :color="color" :hoveredColor="hoveredColor">
-      <i v-html="icon.html" />
-    </icon-image>
-    <striked-line
-      v-if="isStriked"
-      :color="color"
+  <Wrapper :isDisabled="disabled" :size="size" :cursor="cursor">
+    <icon-image
       :disabled="disabled"
+      :size="size"
+      :color="color"
       :hoveredColor="hoveredColor"
-    ></striked-line>
-  </wrapper>
+      v-html="
+        require(`!html-loader!./../../assets/svgIcons/${name.toLowerCase()}.svg`)
+      "
+    ></icon-image>
+    <striked-line v-if="isStriked" :color="color" :disabled="disabled" :hoveredColor="hoveredColor"></striked-line>
+  </Wrapper>
 </template>
 
-<script setup>
+<script>
 // import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
 //  How to use:
 //<icon
@@ -24,8 +25,8 @@
 //   isStriked = "true"
 // />
 
-import { onMounted, reactive } from 'vue'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
+
 const wrapperAttrs = { isDisabled: Boolean, size: String, cursor: String }
 const Wrapper = styled('div', wrapperAttrs)`
   display: flex;
@@ -39,22 +40,17 @@ 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)`
+const strikedAttrs = { isDisabled: Boolean, color: String, hoveredColor: String }
+const strikedLine = styled('div', strikedAttrs)`
   display: flex;
   position: absolute;
-  bottom: 0;
-  left: 0;
+  bottom:0;
+  left:0;
   align-content: center;
   justify-content: center;
   width: 143%;
-  height: 8%;
-  background-color: ${(props) =>
-    props.theme.colors[props.color] || props.color};
+  height:8%;
+  background-color: ${(props)=>props.theme.colors[props.color] || props.color};
   min-height: 0;
   line-height: 0;
   transform-origin: 0% 100%;
@@ -75,44 +71,46 @@ const IconImage = styled('div', IconImageProps)`
     ${(props) => props.hoveredColor && `fill: ${props.hoveredColor};`}
   }
   &:hover + div {
-    background-color: ${(props) => props.hoveredColor};
+    background-color: ${(props)=>props.hoveredColor};
   }
 `
 
-const props = defineProps({
-  disabled: {
-    required: false,
-    default: false
-  },
-  name: {
-    required: true
-  },
-  color: {
-    required: false
+export default {
+  name: 'icon',
+  components: {
+    IconImage,
+    Wrapper,
+    strikedLine
   },
-  hoveredColor: {
-    required: false
+  props: {
+    disabled: {
+      required: false,
+      default: false
+    },
+    name: {
+      required: true
+    },
+    color: {
+      required: false
+    },
+    hoveredColor: {
+      required: false
+    },
+    size: {
+      required: false,
+      default: '30px'
+    },
+    cursor: {
+      required: false,
+      default: null
+    },
+    isStriked: {
+      required: false,
+      default: false
+    }
   },
-  size: {
-    required: false,
-    default: '30px'
-  },
-  cursor: {
-    required: false,
-    default: null
-  },
-  isStriked: {
-    required: false,
-    default: false
+  data() {
+    return {}
   }
-})
-
-const icon = reactive({ html: '' })
-
-onMounted(async () => {
-  const iconPath = `../../assets/svgIcons/${props.name.toLowerCase()}.svg?raw`
-  const module = await import(/* @vite-ignore */ iconPath)
-
-  icon.html = module.default
-})
+}
 </script>

package/src/components/iconWrapper/index.vue

@@ -42,7 +42,7 @@
 //   size="60px" by default, this is 30px
 // />
 
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import icon from '../icon'
 const wrapperAttrs = {
   color: String,
@@ -118,7 +118,7 @@ export default {
     },
     hoveredBackgroundColor: {
       required: false,
-      default: 'transparentWhite1'
+      default: 'transparentWhite2'
     },
     size: {
       required: false,
@@ -148,6 +148,9 @@ export default {
       required: false,
       default: false
     }
+  },
+  data() {
+    return {}
   }
 }
 </script>

package/src/components/infoCard/index.vue

@@ -8,7 +8,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import Icon from '../icon'
 
 const InfoContainer = styled.div`
@@ -24,6 +24,7 @@ const TextContainer = styled.div`
   width: 100%;
 `
 
+
 export default {
   name: 'InfoCard',
   components: {
@@ -32,4 +33,4 @@ export default {
     TextContainer
   }
 }
-</script>
+</script>

package/src/components/infoText/index.vue

@@ -32,7 +32,7 @@
 //     alignArrow="right" // which side the arrow should be on
 // />
 import theme from '../../assets/theme.js'
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import icon from '../icon'
 
 const textAttrs = {
@@ -157,7 +157,11 @@ export default {
   },
   computed: {
     iconColor() {
-      return theme.colors.mediumGray
+      return this.isActive
+        ? this.borderColor
+          ? this.borderColor
+          : theme.colors.secondary
+        : theme.colors.mediumGray
     },
     halfComputedTextInfoWidth() {
       return parseInt(this.width) / 2

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

@@ -3,7 +3,7 @@
     <container
       :checkColor="checkColor"
       :size="size"
-      :hasLabel="hasLabel"
+      :hasLabel="!!label.length"
       :backgroundColor="backgroundColor"
       :isChecked="isChecked"
       :isDisabled="isDisabled"
@@ -14,10 +14,10 @@
         :data-id="dataId"
         @change="onChangeHandler(!isChecked)"
       />
-      <check-wrapper :hasLabel="hasLabel">
+      <div>
         <span class="checkmark"></span>
-      </check-wrapper>
-      <label-text v-if="hasLabel">{{ label }}</label-text>
+      </div>
+      <label-text v-if="!!label.length">{{ label }}</label-text>
     </container>
   </component-wrapper>
 </template>
@@ -34,21 +34,12 @@
 //     backgroundColor="red"
 //     :isDisabled="true"
 // />
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 
 const ComponentWrapper = styled.div`
   min-height: 18px;
 `
 
-const CheckWrapper = styled('div', { hasLabel: Boolean })`
-  ${(props) =>
-    props.hasLabel &&
-    `
-    display: flex;
-    align-items: center;
-  `}
-`
-
 const containerAttrs = {
   checkColor: String,
   size: String,
@@ -154,8 +145,7 @@ export default {
     ComponentWrapper,
     Container,
     InputCheckbox,
-    LabelText,
-    CheckWrapper
+    LabelText
   },
   props: {
     label: {
@@ -185,11 +175,6 @@ export default {
       default: ''
     }
   },
-  computed: {
-    hasLabel() {
-      return !!this.label.length
-    }
-  },
   methods: {
     onChangeHandler(value) {
       if (this.isDisabled) {

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

@@ -38,7 +38,7 @@
         :value="formatWithCurrency(value)"
         @blur="onInputBlur($event)"
         @focus="focusInput()"
-        @keyup.enter="$emit('on-enter-click')"
+        @keyup.enter="onEnterPress"
         @input="onInput($event)"
         :disabled="disabled"
         :isDisabled="disabled"
@@ -49,6 +49,7 @@
         :fontSize="fontSize"
         :fontColor="fontColor"
         :backgroundColor="backgroundColor"
+        v-on="$listeners"
         :hasSlot="hasSlot"
         :hasLabelSlot="hasLabelSlot"
         :slotSize="slotSize"
@@ -100,7 +101,7 @@
 //     :minNumber="0"
 //     fontColor="blue"
 // />
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import {
   stringToNumber,
   numberToString
@@ -468,6 +469,10 @@ export default {
     }
   },
   methods: {
+    onEnterPress(event){
+      this.$emit('on-enter-click')
+      this.$refs.inputField1.$el.blur()
+    },
     onChangeHandler(event) {
       if (isNaN(event) || event === '') {
         event = this.defaultNumber
@@ -483,10 +488,9 @@ export default {
       // Need to return an integer rather than a string
       this.$emit('input-change', event)
     },
-    onEvaluateCode(event) {
+    onEvaluateCode(val) {
       // function to perform math on the code
       // filter the string in case of any malicious content
-      const val = event.target.value
       let filtered = val.replace('(auto)', '').replace(/[^-()\d/*+.,]/g, '')
       filtered = filtered.split(/([-+*/()])/)
       let formatted = filtered.map((item) => {
@@ -544,17 +548,17 @@ export default {
       }
       return array
     },
-    onInput(event) {
+    onInput(value) {
       if (this.isBlurred) {
         this.isBlurred = false
         return
       }
-      if (event.target.value === '') {
+      if (value === '') {
         this.$emit('on-input', '')
       }
       let evaluatedVal
       try {
-        evaluatedVal = this.onEvaluateCode(event)
+        evaluatedVal = this.onEvaluateCode(value)
       } finally {
         if (evaluatedVal) {
           this.$emit('on-input', evaluatedVal)
@@ -566,7 +570,7 @@ export default {
       // setting isBlurred so we don't trigger onInput as well
       this.isBlurred = true
       let value = e.target.value
-      let evaluatedInput = this.onEvaluateCode(e)
+      let evaluatedInput = this.onEvaluateCode(value)
       this.onChangeHandler(evaluatedInput ? evaluatedInput : value)
       if ((evaluatedInput && value.length) || this.minNumber !== null) {
         this.textInput = numberToString({

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

@@ -44,7 +44,7 @@
 //   number_max_allowed: 10,
 //   unit_short_name: "cm",
 // },
-import styled from "vue3-styled-components"
+import styled from "vue-styled-components"
 import {
   stringToNumber,
   numberToString,

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

@@ -34,6 +34,7 @@
             :value="value"
             @input="onChangeHandler"
             @blur="onInputBlur"
+            @keyup.enter="onEnterPress"
             :noBorder="noBorder"
             :disabled="disabled"
             :isDisabled="disabled"
@@ -66,7 +67,7 @@
 </template>
 
 <script>
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import InfoText from '../../infoText'
 import Icon from '../../icon'
 import ErrorMessage from '../../errorMessage'
@@ -328,8 +329,12 @@ export default {
     }
   },
   methods: {
-    onChangeHandler(event) {
-      this.$emit('input-change', event.target.value)
+    onEnterPress(event){
+      this.$emit('on-enter-click')
+      this.$refs.inputElement.$el.blur()
+    },
+    onChangeHandler($event) {
+      this.$emit('input-change', $event)
     },
     onInputBlur($event) {
       this.$emit('input-blur', $event.target.value)

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

@@ -60,7 +60,7 @@
 //   { label: 'Button 4', value: 'button_4', disabled: true }
 // ]
 
-import styled from 'vue3-styled-components'
+import styled from 'vue-styled-components'
 import Modal from '../../modals/modal'
 import InfoText from '../../infoText'
 

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

@@ -13,7 +13,10 @@
         :hasFocus="hasFocus"
         :data-id="dataId"
       />
-      <SearchIconSvg class="search-icn" />
+      <img
+        class="search-icn"
+        :src="require('../../../assets/icons/search_icon_black.svg')"
+      />
     </input-wrapper>
   </container>
 </template>
@@ -30,8 +33,7 @@
 //   :isFilter="true" // to set the height at 30px
 //   data-id="test-data-id"
 // />
-import styled from 'vue3-styled-components'
-import SearchIconSvg from '../../../assets/icons/search_icon_black.svg'
+import styled from 'vue-styled-components'
 
 const inputAttrs = {
   isDisabled: Boolean,
@@ -66,7 +68,7 @@ const InputContainer = styled('input', inputAttrs)`
 const InputWrapper = styled.span`
   position: relative;
 
-  svg {
+  img {
     position: absolute;
     right: 10px;
     top: 50%;
@@ -79,8 +81,7 @@ export default {
   components: {
     InputContainer,
     InputWrapper,
-    Container,
-    SearchIconSvg
+    Container
   },
   props: {
     value: {
@@ -113,7 +114,7 @@ export default {
   },
   methods: {
     onChangeHandler(event) {
-      this.$emit('on-change', event.target.value)
+      this.$emit('on-change', event)
     },
     focusInputElement() {
       this.$nextTick(() => {