@eturnity/eturnity_reusable_components 7.18.0-qa-dev03.0 → 7.20.0

package/src/components/icon/index.vue

@@ -1,20 +1,13 @@
 <template>
-  <Wrapper :isDisabled="disabled" :size="size" :cursor="cursor">
-    <icon-image
-      :disabled="disabled"
-      :size="size"
-      :color="color"
-      :hoveredColor="hoveredColor"
-      :backgroundColor="backgroundColor"
-      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>
+  <wrapper>
+    <icon-image>
+      <i v-html="icon.html" />
+    </icon-image>
+    <striked-line v-if="isStriked"></striked-line>
+  </wrapper>
 </template>
 
-<script>
+<script setup>
 // import Icon from "@eturnity/eturnity_reusable_components/src/components/icon"
 //  How to use:
 //<icon
@@ -26,40 +19,71 @@
 //   isStriked = "true"
 // />
 
-import styled from 'vue-styled-components'
+import { onMounted, reactive, watch } from 'vue'
+import styled from 'vue3-styled-components'
+import { fetchIcon } from './iconCache'
 
-const wrapperAttrs = { isDisabled: Boolean, size: String, cursor: String }
-const Wrapper = styled('div', wrapperAttrs)`
+const props = defineProps({
+  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
+  }
+})
+
+const Wrapper = styled('div')`
   display: flex;
   position: relative;
   align-content: center;
   justify-content: center;
-  width: ${(props) => props.size};
-  height: ${(props) => props.size};
-  min-width: ${(props) => props.size};
-  min-height: ${(props) => props.size};
-  cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursor)};
+  width: ${props.size};
+  height: ${props.size};
+  min-width: ${props.size};
+  min-height: ${props.size};
+  cursor: ${props.disabled ? '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`
   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: ${({ theme }) => theme.colors[props.color] || props.color};
   min-height: 0;
   line-height: 0;
   transform-origin: 0% 100%;
   transform: rotate(-45deg);
 `
-const IconImageProps = { color: String, hoveredColor: String, size: String, backgroundColor: String}
-const IconImage = styled('div', IconImageProps)`
+const IconImage = styled.div`
   width: 100%;
   svg {
     width: 100%;
@@ -68,56 +92,24 @@ const IconImage = styled('div', IconImageProps)`
     padding: ${(props) => props.backgroundColor ? '3px' : '0'};
   }
   svg path {
-    ${(props) =>
-      props.color && `fill: ${props.theme.colors[props.color] || props.color};`}
+    ${({ theme }) =>
+      props.color && `fill: ${theme.colors[props.color] || props.color};`}
   }
   &:hover > svg path {
-    ${(props) => props.hoveredColor && `fill: ${props.hoveredColor};`}
+    ${props.hoveredColor && `fill: ${props.hoveredColor};`}
   }
   &:hover + div {
-    background-color: ${(props)=>props.hoveredColor};
+    background-color: ${props.hoveredColor};
   }
 `
 
-export default {
-  name: 'icon',
-  components: {
-    IconImage,
-    Wrapper,
-    strikedLine
-  },
-  props: {
-    disabled: {
-      required: false,
-      default: false
-    },
-    name: {
-      required: true
-    },
-    color: {
-      required: false
-    },
-    backgroundColor: {
-      required: false
-    },
-    hoveredColor: {
-      required: false
-    },
-    size: {
-      required: false,
-      default: '30px'
-    },
-    cursor: {
-      required: false,
-      default: null
-    },
-    isStriked: {
-      required: false,
-      default: false
-    }
-  },
-  data() {
-    return {}
-  }
+const icon = reactive({ html: '' })
+
+const loadSvg = async () => {
+  icon.html = await fetchIcon(props.name.toLowerCase())
 }
+
+onMounted(() => loadSvg())
+
+watch(() => props.name, loadSvg)
 </script>

package/src/components/iconWrapper/index.vue

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

package/src/components/infoCard/index.vue

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

package/src/components/infoText/index.vue

@@ -30,7 +30,7 @@
 //     alignArrow="right" // which side the arrow should be on
 // />
 import theme from '../../assets/theme.js'
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import icon from '../icon'
 
 const textAttrs = {

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

@@ -3,7 +3,7 @@
     <container
       :checkColor="checkColor"
       :size="size"
-      :hasLabel="!!label.length"
+      :hasLabel="hasLabel"
       :backgroundColor="backgroundColor"
       :isChecked="isChecked"
       :isDisabled="isDisabled"
@@ -14,10 +14,10 @@
         :data-id="dataId"
         @change="onChangeHandler(!isChecked)"
       />
-      <div>
+      <check-wrapper :hasLabel="hasLabel">
         <span class="checkmark"></span>
-      </div>
-      <label-text v-if="!!label.length">{{ label }}</label-text>
+      </check-wrapper>
+      <label-text v-if="hasLabel">{{ label }}</label-text>
     </container>
   </component-wrapper>
 </template>
@@ -34,12 +34,21 @@
 //     backgroundColor="red"
 //     :isDisabled="true"
 // />
-import styled from 'vue-styled-components'
+import styled from 'vue3-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,
@@ -145,7 +154,8 @@ export default {
     ComponentWrapper,
     Container,
     InputCheckbox,
-    LabelText
+    LabelText,
+    CheckWrapper
   },
   props: {
     label: {
@@ -175,6 +185,11 @@ export default {
       default: ''
     }
   },
+  computed: {
+    hasLabel() {
+      return !!this.label.length
+    }
+  },
   methods: {
     onChangeHandler(value) {
       if (this.isDisabled) {

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

@@ -47,7 +47,6 @@
         :fontSize="fontSize"
         :fontColor="fontColor"
         :backgroundColor="backgroundColor"
-        v-on="$listeners"
         :hasSlot="hasSlot"
         :hasLabelSlot="hasLabelSlot"
         :slotSize="slotSize"
@@ -101,7 +100,7 @@
 // >
 //<template name=label><img>....</template>
 //</inputNumber>
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import {
   stringToNumber,
   numberToString
@@ -488,9 +487,10 @@ export default {
       // Need to return an integer rather than a string
       this.$emit('input-change', event)
     },
-    onEvaluateCode(val) {
+    onEvaluateCode(event) {
       // 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) => {
@@ -548,19 +548,19 @@ export default {
       }
       return array
     },
-    onInput(value) {
+    onInput(event) {
       if (this.isBlurred) {
         this.isBlurred = false
         return
       }
-      if (value === '' && this.isFocused) {
+      if (event.target.value === '') {
         this.$emit('on-input', '')
       }
       let evaluatedVal
       try {
-        evaluatedVal = this.onEvaluateCode(value)
+        evaluatedVal = this.onEvaluateCode(event)
       } finally {
-        if (evaluatedVal && this.isFocused && this.value != evaluatedVal) {
+        if (evaluatedVal) {
           this.$emit('on-input', evaluatedVal)
         }
       }
@@ -570,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(value)
+      let evaluatedInput = this.onEvaluateCode(e)
       this.onChangeHandler(evaluatedInput ? evaluatedInput : value)
       if ((evaluatedInput && value.length) || this.minNumber !== null) {
         this.textInput = numberToString({
@@ -646,10 +646,10 @@ export default {
       }
     },
     initInteraction(e) {
-      this.focusInput()
-      e.preventDefault()
       window.addEventListener('mousemove', this.interact, false)
       window.addEventListener('mouseup', this.stopInteract, false)
+      e.preventDefault()
+      this.focusInput()
     },
     interact(e) {
       e.preventDefault()

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

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

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

@@ -66,7 +66,7 @@
 </template>
 
 <script>
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import InfoText from '../../infoText'
 import Icon from '../../icon'
 import ErrorMessage from '../../errorMessage'
@@ -332,8 +332,8 @@ export default {
       this.$emit('on-enter-click')
       this.$refs.inputElement.$el.blur()
     },
-    onChangeHandler($event) {
-      this.$emit('input-change', $event)
+    onChangeHandler(event) {
+      this.$emit('input-change', event.target.value)
     },
     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 'vue-styled-components'
+import styled from 'vue3-styled-components'
 import Modal from '../../modals/modal'
 import InfoText from '../../infoText'
 

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

@@ -1,6 +1,7 @@
 <template>
   <container :inputWidth="inputWidth">
-    <input-wrapper>
+    <input-wrapper :iconPosition="iconPosition" :iconColor="iconColor">
+      <SearchIconSvg class="search-icn" />
       <input-container
         ref="inputElement"
         :placeholder="placeholder"
@@ -13,10 +14,6 @@
         :hasFocus="hasFocus"
         :data-id="dataId"
       />
-      <img
-        class="search-icn"
-        :src="require('../../../assets/icons/search_icon_black.svg')"
-      />
     </input-wrapper>
   </container>
 </template>
@@ -32,8 +29,11 @@
 //   @on-change="function($event)"
 //   :isFilter="true" // to set the height at 30px
 //   data-id="test-data-id"
+//   iconPosition="left"
+//   iconColor="grey2"
 // />
-import styled from 'vue-styled-components'
+import styled from 'vue3-styled-components'
+import SearchIconSvg from '../../../assets/icons/search_icon_black.svg'
 
 const inputAttrs = {
   isDisabled: Boolean,
@@ -68,11 +68,18 @@ const InputContainer = styled('input', inputAttrs)`
 const InputWrapper = styled.span`
   position: relative;
 
-  img {
+  svg {
     position: absolute;
-    right: 10px;
-    top: 50%;
     transform: translateY(-50%);
+    top: 50%;
+    ${(props) => (props.iconPosition === 'right' ? 'right' : 'left')}: 10px;
+
+    path {
+      fill: ${(props) =>
+        props.theme.colors[props.iconColor]
+          ? props.theme.colors[props.iconColor]
+          : props.iconColor};
+    }
   }
 `
 
@@ -81,7 +88,8 @@ export default {
   components: {
     InputContainer,
     InputWrapper,
-    Container
+    Container,
+    SearchIconSvg
   },
   props: {
     value: {
@@ -110,11 +118,20 @@ export default {
     dataId: {
       required: false,
       default: ''
+    },
+    iconPosition: {
+      type: String,
+      default: 'right'
+    },
+    iconColor: {
+      type: String,
+      default: 'black'
     }
   },
+  emits: ['on-change'],
   methods: {
     onChangeHandler(event) {
-      this.$emit('on-change', event)
+      this.$emit('on-change', event.target.value)
     },
     focusInputElement() {
       this.$nextTick(() => {