@eturnity/eturnity_reusable_components 8.7.5-EPDM-6306.0 → 8.7.5-EPIC-8593

package/src/components/infoText/index.vue

@@ -1,25 +1,48 @@
 <template>
-  <PageContainer ref="container" :type="type">
-    <div
-      ref="icon"
-      data-test-id="infoText_trigger"
-      @click=";(isMobile || openTrigger === 'onClick') && toggleInfo()"
-      @mouseenter="!isMobile && openTrigger === 'onHover' && showInfo()"
-      @mouseleave="!isMobile && openTrigger === 'onHover' && hideInfo()"
-    >
-      <Dot
-        v-if="type === 'dot'"
-        :color="dotColor"
-        data-test-id="infoText_dot"
-      />
-      <IconComponent
-        v-else
-        :color="iconColor || computedIconColor"
-        :cursor="isDisabled ? 'not-allowed' : 'pointer'"
-        :disabled="isDisabled"
-        :name="iconName"
-        :size="size"
-      />
+  <PageContainer
+    ref="container"
+    :type="type"
+    @click=";(isMobile || openTrigger === 'onClick') && toggleInfo()"
+    @mouseenter="!isMobile && openTrigger === 'onHover' && showInfo()"
+    @mouseleave="!isMobile && openTrigger === 'onHover' && hideInfo()"
+  >
+    <div ref="icon" data-test-id="infoText_trigger">
+      <IconWrapper
+        :background-color="backgroundColor"
+        :border-radius="borderRadius"
+        :hovered-icon="hoveredIcon"
+        :is-active="isActive"
+        :is-disabled="isDisabled"
+        :padding="padding"
+      >
+        <LabelWrapper
+          v-if="labelText && labelAlign === 'left'"
+          :color="iconColor || computedIconColor"
+          :size="labelSize"
+        >
+          {{ labelText }}
+        </LabelWrapper>
+        <Dot
+          v-if="type === 'dot'"
+          :color="dotColor"
+          data-test-id="infoText_dot"
+        />
+        <IconComponent
+          v-else-if="!noIcon"
+          :color="iconColor || computedIconColor"
+          :cursor="isDisabled ? 'not-allowed' : 'pointer'"
+          :disabled="isDisabled"
+          :name="iconName"
+          :size="size"
+        />
+        <LabelWrapper
+          v-if="labelText && labelAlign === 'right'"
+          :color="iconColor || computedIconColor"
+          :size="labelSize"
+        >
+          {{ labelText }}
+        </LabelWrapper>
+      </IconWrapper>
     </div>
     <Teleport v-if="isVisible" to="body">
       <TextWrapper :style="wrapperStyle">
@@ -36,13 +59,13 @@
             :src="image"
             @load="onImageLoad"
           />
-          <span ref="textContent" :style="textStyle">
+          <span v-if="!hideInfoText" ref="textContent" :style="textStyle">
             <slot>
               <span v-html="text"></span>
             </slot>
           </span>
         </TextOverlay>
-        <Arrow :image="image" :style="arrowStyle" />
+        <!-- <Arrow :image="image" :style="arrowStyle" /> -->
       </TextWrapper>
     </Teleport>
   </PageContainer>
@@ -63,7 +86,12 @@
   import styled from 'vue3-styled-components'
   import theme from '../../assets/theme.js'
 
-  const TextOverlay = styled('div')`
+  const TextOverlayAttrs = {
+    appTheme: String,
+    image: Boolean,
+    width: Number,
+  }
+  const TextOverlay = styled('div', TextOverlayAttrs)`
     background-color: ${(props) =>
       props.image ? props.theme.colors.white : props.theme.colors.black};
     color: ${(props) =>
@@ -88,16 +116,16 @@
     }
   `
 
-  const Arrow = styled('div')`
-    position: absolute;
-    width: 0;
-    height: 0;
-    border: 8px solid transparent;
-    border-top-color: ${(props) =>
-      props.image ? props.theme.colors.white : props.theme.colors.black};
-    filter: ${(props) =>
-      props.image ? 'drop-shadow(0 2px 2px rgba(0, 0, 0, 0.1))' : 'none'};
-  `
+  // const Arrow = styled('div')`
+  //   position: absolute;
+  //   width: 0;
+  //   height: 0;
+  //   border: 8px solid transparent;
+  //   border-top-color: ${(props) =>
+  //     props.image ? props.theme.colors.white : props.theme.colors.black};
+  //   filter: ${(props) =>
+  //     props.image ? 'drop-shadow(0 2px 2px rgba(0, 0, 0, 0.1))' : 'none'};
+  // `
 
   const PageContainer = styled('div')`
     display: ${(props) => (props.type === 'dot' ? 'unset' : 'inline-block')};
@@ -121,16 +149,57 @@
     border-radius: 50%;
   `
 
+  const IconWrapperAttrs = {
+    backgroundColor: String,
+    borderRadius: String,
+    padding: String,
+    hoveredIcon: Boolean,
+    isActive: Boolean,
+    isDisabled: Boolean,
+  }
+  const IconWrapper = styled('div', IconWrapperAttrs)`
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+    white-space: nowrap;
+    background-color: ${(props) => props.backgroundColor};
+    border-radius: ${(props) =>
+      props.hoveredIcon ? '6px' : props.borderRadius};
+    padding: ${(props) => props.padding};
+    width: ${(props) => (props.hoveredIcon ? '32px' : '')};
+    height: ${(props) => (props.hoveredIcon ? '32px' : '')};
+    cursor: pointer;
+    background-color: ${(props) =>
+      props.isActive ? props.theme.colors.transparentWhite2 : ''};
+    cursor: ${(props) => (props.isDisabled ? 'not-allowed' : 'pointer')};
+    &:hover {
+      background-color: ${(props) =>
+        props.hoveredIcon ? props.theme.colors.transparentWhite2 : ''};
+    }
+  `
+
+  const LabelWrapperAttrs = {
+    size: String,
+    color: String,
+  }
+  const LabelWrapper = styled('div', LabelWrapperAttrs)`
+    font-size: ${(props) => props.size};
+    color: ${(props) => props.color};
+  `
+
   export default {
     name: 'InfoText',
     components: {
       IconComponent,
       TextOverlay,
-      Arrow,
+      // Arrow,
       Dot,
       PageContainer,
       TextWrapper,
       OverlayImage,
+      IconWrapper,
+      LabelWrapper,
     },
     props: {
       text: {
@@ -138,6 +207,16 @@
         default: '',
         type: String,
       },
+      isActive: {
+        required: false,
+        default: false,
+        type: Boolean,
+      },
+      labelText: {
+        required: false,
+        default: '',
+        type: String,
+      },
       size: {
         type: String,
         default: '14px',
@@ -189,6 +268,51 @@
         required: false,
         default: 'info', // info, dot
       },
+      appTheme: {
+        type: String,
+        default: 'light', // light or dark
+        required: false,
+      },
+      labelAlign: {
+        type: String,
+        default: 'right',
+        required: false,
+      },
+      backgroundColor: {
+        type: String,
+        default: '',
+        required: false,
+      },
+      borderRadius: {
+        type: String,
+        default: '',
+        required: false,
+      },
+      padding: {
+        type: String,
+        default: '',
+        required: false,
+      },
+      labelSize: {
+        type: String,
+        default: '12px',
+        required: false,
+      },
+      noIcon: {
+        type: Boolean,
+        default: false,
+        required: false,
+      },
+      hoveredIcon: {
+        type: Boolean,
+        default: false,
+        required: false,
+      },
+      hideInfoText: {
+        type: Boolean,
+        default: false,
+        required: false,
+      },
     },
     setup(props) {
       const isVisible = ref(false)
@@ -206,7 +330,11 @@
 
       const textStyle = computed(() => ({
         fontSize: props.image ? '12px' : '13px',
-        color: props.image ? theme.colors.grey1 : theme.colors.white,
+        color: props.image
+          ? theme.colors.grey1
+          : props.appTheme === 'dark'
+          ? theme.colors.black
+          : theme.colors.white,
         textAlign: props.image ? 'right' : 'left',
       }))
 
@@ -336,7 +464,9 @@
           overflowY: 'auto',
           backgroundColor: props.image
             ? theme.colors.white
-            : theme.colors.black,
+            : props.appTheme === 'light'
+            ? theme.colors.black
+            : theme.colors.grey5,
         }
       }
 
@@ -408,7 +538,7 @@
 
         // Calculate new width
         const calculatedWidth = Math.min(
-          Math.max(contentWidth, 200),
+          Math.max(contentWidth, 230),
           parseInt(props.maxWidth, 10)
         )
 

package/src/components/infoText/infoText.spec.js

@@ -5,7 +5,7 @@ import theme from '@/assets/theme'
 
 jest.mock('@/components/icon/iconCache.mjs', () => ({
   // need to mock this due to how jest handles import.meta
-  fetchIcon: jest.fn(() => Promise.resolve('close_for_modals,_tool_tips.svg')),
+  fetchIcon: jest.fn(() => Promise.resolve('close.svg')),
 }))
 
 describe('InfoText Component', () => {

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

@@ -5,6 +5,7 @@
       :check-color="checkColor"
       :cursor-type="cursorType"
       :data-test-id="dataId"
+      :font-color="fontColor"
       :has-label="hasLabel"
       :is-checked="isChecked"
       :is-disabled="isDisabled"
@@ -63,6 +64,7 @@
     isChecked: Boolean,
     isDisabled: Boolean,
     cursorType: String,
+    fontColor: String,
   }
   const Container = styled('label', containerAttrs)`
     display: grid;
@@ -70,7 +72,10 @@
       props.hasLabel ? '16px auto' : '16px'};
     grid-gap: 16px;
     align-content: center;
-    color: ${(props) => props.theme.colors.black};
+    color: ${(props) =>
+      props.theme.colors[props.fontColor]
+        ? props.theme.colors[props.fontColor]
+        : props.fontColor};
     position: relative;
     cursor: ${(props) => (props.isDisabled ? 'not-allowed' : props.cursorType)};
     font-size: 16px;
@@ -176,7 +181,7 @@
     align-items: center;
     min-height: 18px;
     color: ${(props) =>
-      props.isDisabled ? props.theme.colors.grey2 : props.theme.colors.black};
+      props.isDisabled ? props.theme.colors.grey2 : 'unset'};
   `
 
   export default {
@@ -193,6 +198,10 @@
         required: false,
         default: '',
       },
+      fontColor: {
+        required: false,
+        default: 'black',
+      },
       isChecked: {
         required: true,
         default: false,

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

@@ -59,7 +59,7 @@
         :show-linear-unit-name="showLinearUnitName"
         :slot-size="slotSize"
         :text-align="textAlign"
-        :value="formattedValue"
+        :value="formatWithCurrency(value)"
         @blur="onInputBlur($event)"
         @focus="focusInput()"
         @input="onInput($event)"
@@ -73,7 +73,7 @@
 
       <UnitContainer
         v-if="unitName && showLinearUnitName && !hasSlot"
-        :has-length="hasLength"
+        :has-length="!!textInput.length"
         :is-error="isError"
         >{{ unitName }}</UnitContainer
       >
@@ -90,7 +90,7 @@
           :disabled="isSelectDisabled"
           :select-width="`${selectWidth}px`"
           :show-border="false"
-          @input-change="handleSelectChange"
+          @input-change="$emit('select-change', $event)"
         >
           <template #selector>
             <SelectText>{{ getSelectValue }}</SelectText>
@@ -448,18 +448,8 @@
     background-color: ${({ theme }) => theme.colors.grey4};
   `
 
-  const EVENT_TYPES = {
-    INPUT_FOCUS: 'input-focus',
-    INPUT_CHANGE: 'input-change',
-    INPUT_BLUR: 'input-blur',
-    PRESS_ENTER: 'on-enter-click',
-    INPUT_DRAG: 'on-input-drag',
-    SELECT_CHANGE: 'select-change',
-  }
-
   export default {
     name: 'InputNumber',
-    emits: [...Object.values(EVENT_TYPES)],
     components: {
       Container,
       InputContainer,
@@ -694,10 +684,9 @@
     },
     data() {
       return {
+        textInput: '',
         isFocused: false,
         warningIcon: warningIcon,
-        inputValue: null,
-        enteredValue: null,
       }
     },
     computed: {
@@ -720,14 +709,6 @@
 
         return item ? item.label : '-'
       },
-      formattedValue() {
-        return this.isFocused
-          ? this.enteredValue
-          : this.formatWithCurrency(this.value)
-      },
-      hasLength() {
-        return this.formattedValue !== null && this.formattedValue.length > 0
-      },
     },
     watch: {
       focus(value) {
@@ -738,19 +719,30 @@
       clearInput: function (value) {
         if (value) {
           // If the value is typed, then we should clear the textInput on Continue
-          this.inputValue = ''
-          this.enteredValue = ''
+          this.textInput = ''
         }
       },
-      value: {
-        immediate: true,
-        handler(val) {
-          if (this.value !== this.inputValue && !Number.isNaN(this.value)) {
-            this.inputValue = this.value
-            this.enteredValue = this.value
-          }
-        },
-      },
+    },
+    created() {
+      if (this.value) {
+        this.textInput = numberToString({
+          value: this.value,
+          numberPrecision: this.numberPrecision,
+          minDecimals: this.minDecimals,
+        })
+      } else if (this.defaultNumber !== null) {
+        this.textInput = numberToString({
+          value: this.defaultNumber,
+          numberPrecision: this.numberPrecision,
+          minDecimals: this.minDecimals,
+        })
+      } else if (this.minNumber !== null) {
+        this.textInput = numberToString({
+          value: this.minNumber,
+          numberPrecision: this.numberPrecision,
+          minDecimals: this.minDecimals,
+        })
+      }
     },
     mounted() {
       if (this.focus) {
@@ -789,28 +781,29 @@
         }
       },
       onEnterPress() {
-        this.$emit(EVENT_TYPES.PRESS_ENTER)
+        this.$emit('on-enter-click')
         this.$refs.inputField1.$el.blur()
       },
-      onChangeHandler(value) {
-        if (isNaN(value) || value === '') {
-          value = this.defaultNumber
+      onChangeHandler(event) {
+        if (isNaN(event) || event === '') {
+          event = this.defaultNumber
             ? this.defaultNumber
             : this.minNumber || this.minNumber === 0
             ? this.minNumber
-            : value
+            : event
         }
         if (!this.allowNegative) {
-          value = Math.abs(value)
+          event = Math.abs(event)
         }
-        value = parseFloat(value)
+        event = parseFloat(event)
         // Need to return an integer rather than a string
-        return parseFloat(value)
+        this.$emit('input-change', event)
       },
-      onEvaluateCode(value) {
+      onEvaluateCode(event) {
         // function to perform math on the code
         // filter the string in case of any malicious content
-        let filtered = value.replace('(auto)', '').replace(/[^-()\d/*+.,]/g, '')
+        const val = event.target.value
+        let filtered = val.replace('(auto)', '').replace(/[^-()\d/*+.,]/g, '')
         filtered = filtered.split(/([-+*/()])/)
         let formatted = filtered.map((item) => {
           if (
@@ -868,29 +861,48 @@
         return array
       },
       onInput(event) {
-        this.enteredValue = event.target.value
-        if (!this.isFocused || this.enteredValue === this.inputValue) {
+        if (!this.isFocused) {
           return
         }
+        if (event.target.value === '') {
+          this.$emit('on-input', '')
+        }
         let evaluatedVal
         try {
-          evaluatedVal = this.onEvaluateCode(String(this.enteredValue))
+          evaluatedVal = this.onEvaluateCode(event)
         } finally {
-          this.inputValue = this.onChangeHandler(evaluatedVal)
-
-          if (this.isFocused && typeof this.enteredValue !== 'number') {
-            this.$emit(EVENT_TYPES.INPUT_CHANGE, this.inputValue)
+          if (evaluatedVal && this.value != evaluatedVal) {
+            this.$emit('on-input', evaluatedVal)
           }
         }
         this.textInput = evaluatedVal
       },
       onInputBlur(e) {
         this.isFocused = false
-        this.enteredValue = this.inputValue
-        this.$emit(
-          EVENT_TYPES.INPUT_BLUR,
-          this.onEvaluateCode(String(this.inputValue))
-        )
+        let value = e.target.value
+        let evaluatedInput = this.onEvaluateCode(e)
+        this.onChangeHandler(evaluatedInput ? evaluatedInput : value)
+        if ((evaluatedInput && value.length) || this.minNumber !== null) {
+          this.textInput = numberToString({
+            value:
+              evaluatedInput && value.length
+                ? evaluatedInput
+                : this.defaultNumber
+                ? this.defaultNumber
+                : this.minNumber,
+            numberPrecision: this.numberPrecision,
+            minDecimals: this.minDecimals,
+          })
+        }
+        let adjustedMinValue =
+          evaluatedInput && evaluatedInput.length
+            ? evaluatedInput
+            : this.defaultNumber
+            ? this.defaultNumber
+            : this.minNumber || this.minNumber === 0
+            ? this.minNumber
+            : ''
+        this.$emit('input-blur', adjustedMinValue)
       },
       focusInput() {
         if (this.disabled) {
@@ -900,7 +912,7 @@
         this.$nextTick(() => {
           this.$refs.inputField1.$el.select()
         })
-        this.$emit(EVENT_TYPES.INPUT_FOCUS, this.inputValue)
+        this.$emit('input-focus')
       },
       blurInput() {
         if (this.disabled) {
@@ -920,7 +932,7 @@
             : this.minNumber || this.minNumber === 0
             ? this.minNumber
             : ''
-        if (adjustedMinValue || adjustedMinValue === 0) {
+        if ((adjustedMinValue || adjustedMinValue === 0) && !this.isFocused) {
           let input = this.numberToStringEnabled
             ? numberToString({
                 value: adjustedMinValue,
@@ -933,8 +945,6 @@
           return input + ' ' + unit
         } else if (!adjustedMinValue && adjustedMinValue !== 0) {
           return ''
-        } else if (this.isFocused) {
-          return value
         } else {
           return this.numberToStringEnabled
             ? numberToString({
@@ -955,7 +965,14 @@
         e.preventDefault()
         let value = parseFloat(this.value || 0)
         value += parseFloat(this.interactionStep) * parseInt(e.movementX)
-        this.$emit(EVENT_TYPES.INPUT_DRAG, this.onChangeHandler(value))
+        this.$emit('on-input-drag', value)
+
+        this.textInput = numberToString({
+          value: value && value.length ? value : this.minNumber,
+          numberPrecision: this.numberPrecision,
+          minDecimals: this.minDecimals,
+        })
+        //this.value=value
       },
       stopInteract(e) {
         e.preventDefault()
@@ -963,9 +980,6 @@
         window.removeEventListener('mouseup', this.stopInteract, false)
         this.blurInput()
       },
-      handleSelectChange(value) {
-        this.$emit(EVENT_TYPES.SELECT_CHANGE, value)
-      },
     },
   }
 </script>

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

@@ -1,6 +1,7 @@
 <template>
   <PageWrapper
     v-if="isOpen"
+    :add-padding-top="addPaddingTop"
     :backdrop="backdrop"
     :is-open="isOpen"
     :position="position"
@@ -36,20 +37,25 @@
 
   const ContentContainer = styled.div``
 
-  const pageAttrs = { backdrop: String, position: String }
+  const pageAttrs = {
+    backdrop: String,
+    position: String,
+    addPaddingTop: Boolean,
+  }
   const PageWrapper = styled('div', pageAttrs)`
-    position: ${(props) => props.position}
-    display: grid;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: ${(props) =>
-      props.backdrop == 'dark'
-        ? 'rgba(0, 0, 0, 0.4)'
-        : 'rgba(255, 255, 255, 0.9)'};
-    z-index: 99999;
-    overflow: auto;
+  position: ${(props) => props.position}
+  display: grid;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: ${(props) =>
+    props.backdrop == 'dark'
+      ? 'rgba(0, 0, 0, 0.4)'
+      : 'rgba(255, 255, 255, 0.9)'};
+  z-index: 99999;
+  overflow: auto;
+  padding-top: ${(props) => (props.addPaddingTop ? '80px' : '0')};
 
   @media (max-width: 425px) {
     background: white;
@@ -147,6 +153,10 @@
         type: String,
         default: 'auto',
       },
+      addPaddingTop: {
+        type: Boolean,
+        default: false,
+      },
     },
     watch: {
       isOpen: {