@eturnity/eturnity_reusable_components 8.22.4 → 8.22.6

package/src/components/infoCard/index.vue

@@ -73,7 +73,12 @@
       type: {
         required: false,
         type: String,
-        default: 'info',
+        default: 'info_simple',
+        validator(value) {
+          return ['info_simple', 'warning', 'error_minor', 'info'].includes(
+            value
+          )
+        },
       },
       minWidth: {
         required: false,
@@ -112,8 +117,11 @@
       },
     },
     computed: {
-      isInfo() {
+      isInfoSimple() {
         // this property is used for tests
+        return this.type === 'info_simple'
+      },
+      isInfo() {
         return this.type === 'info'
       },
       isWarning() {
@@ -148,9 +156,13 @@
           stylesCollection.borderStyle = 'dashed'
           stylesCollection.borderColor = theme.colors.grey4
           stylesCollection.iconColor = theme.colors.red
-        } else {
+        } else if (this.isInfoSimple) {
           stylesCollection.borderStyle = 'dashed'
           stylesCollection.borderColor = theme.colors.grey4
+        } else {
+          stylesCollection.color = theme.semanticColors.teal[800]
+          stylesCollection.backgroundColor = theme.semanticColors.blue[300]
+          stylesCollection.iconColor = theme.semanticColors.teal[800]
         }
 
         return stylesCollection

package/src/components/infoCard/infoCard.spec.js

@@ -45,19 +45,19 @@ describe('RCInfoCard.vue', () => {
         },
       })
 
-      expect(wrapper.vm.isInfo).toBe(true)
+      expect(wrapper.vm.isInfoSimple).toBe(true)
       expect(wrapper.vm.isWarning).toBe(false)
       expect(wrapper.vm.isErrorMinor).toBe(false)
 
       await wrapper.setProps({ type: 'warning' })
 
-      expect(wrapper.vm.isInfo).toBe(false)
+      expect(wrapper.vm.isInfoSimple).toBe(false)
       expect(wrapper.vm.isWarning).toBe(true)
       expect(wrapper.vm.isErrorMinor).toBe(false)
 
       await wrapper.setProps({ type: 'error_minor' })
 
-      expect(wrapper.vm.isInfo).toBe(false)
+      expect(wrapper.vm.isInfoSimple).toBe(false)
       expect(wrapper.vm.isWarning).toBe(false)
       expect(wrapper.vm.isErrorMinor).toBe(true)
     })

package/src/components/infoText/index.vue

@@ -16,37 +16,40 @@
         :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"
-          :hovered-color="iconColor || computedIconColor"
-          :name="iconName"
-          :size="size"
-        />
-        <LabelWrapper
-          v-if="labelText && labelAlign === 'right'"
-          :color="iconColor || computedIconColor"
-          :size="labelSize"
-        >
-          {{ labelText }}
-        </LabelWrapper>
+        <template v-if="!$slots.trigger">
+          <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"
+            :hovered-color="iconColor || computedIconColor"
+            :name="iconName"
+            :size="size"
+          />
+          <LabelWrapper
+            v-if="labelText && labelAlign === 'right'"
+            :color="iconColor || computedIconColor"
+            :size="labelSize"
+          >
+            {{ labelText }}
+          </LabelWrapper>
+        </template>
+        <slot name="trigger"></slot>
       </IconWrapper>
     </div>
-    <Teleport v-if="isVisible" to="body">
+    <Teleport v-if="isVisible && !!text" to="body">
       <TextWrapper data-test-id="info_text_wrapper" :style="wrapperStyle">
         <TextOverlay
           ref="infoBox"
@@ -228,7 +231,7 @@
       },
       infoPosition: {
         required: false,
-        default: 'bottom',
+        default: null,
         type: String,
       },
       maxWidth: {
@@ -369,7 +372,9 @@
           { position: 'left', space: spaceLeft },
         ].sort((a, b) => b.space - a.space)
 
-        const bestPosition = positions[0].position
+        const bestPosition = props.infoPosition
+          ? props.infoPosition
+          : positions[0].position
 
         let top, left, arrowPosition
 

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

@@ -23,13 +23,38 @@ describe('InfoText Component', () => {
     })
   })
 
-  test('renders InfoText component with default props', () => {
-    expect(wrapper.find('[data-test-id="infoText_container"]').exists()).toBe(
-      true
-    )
-    expect(wrapper.vm.text).toContain('default text')
-    expect(wrapper.vm.size).toContain('14px')
-    expect(wrapper.vm.infoPosition).toContain('bottom')
+  it('renders InfoText component with default props', async () => {
+    // Set isMobile to false to ensure hover works
+    wrapper.vm.isMobile = false
+    await wrapper.vm.$nextTick()
+
+    // Trigger hover to show the info text
+    await wrapper
+      .find('[data-test-id="infoText_trigger"]')
+      .trigger('mouseenter')
+    await wrapper.vm.$nextTick()
+
+    // Force isVisible to true to ensure the info text is shown
+    wrapper.vm.isVisible = true
+    await wrapper.vm.$nextTick()
+
+    const infoElement = wrapper.find('[data-test-id="info_text_wrapper"]')
+    expect(infoElement.exists()).toBe(true)
+    expect(wrapper.vm.text).toBe('default text')
+    expect(wrapper.vm.size).toBe('14px')
+    expect(wrapper.vm.infoPosition).toBe('bottom')
+  })
+
+  it('updates props correctly', async () => {
+    await wrapper.setProps({
+      text: 'updated text',
+      size: '16px',
+      infoPosition: 'top',
+    })
+
+    expect(wrapper.vm.text).toBe('updated text')
+    expect(wrapper.vm.size).toBe('16px')
+    expect(wrapper.vm.infoPosition).toBe('top')
   })
 
   test('openTrigger prop is set to onClick', async () => {

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

@@ -30,7 +30,61 @@
       />
     </LabelWrapper>
     <InputWrapper>
+      <InputInfoText
+        v-if="!!inputInfoText"
+        info-position="bottom"
+        :text="inputInfoText"
+      >
+        <template #trigger>
+          <InputContainer
+            v-bind="$attrs"
+            ref="inputField1"
+            :align-items="alignItems"
+            :background-color="
+              colorMode === 'transparent' ? 'transparent' : backgroundColor
+            "
+            :border-color="
+              colorMode === 'transparent' && !borderColor
+                ? 'white'
+                : borderColor
+            "
+            :color-mode="colorMode"
+            :data-id="inputDataId"
+            :data-qa-id="dataQaId"
+            :disabled="disabled && !isDisabledStyledOnly"
+            :font-color="colorMode === 'transparent' ? 'white' : fontColor"
+            :font-size="fontSize"
+            :has-label-slot="hasLabelSlot"
+            :has-slot="hasSlot"
+            :has-unit="unitName && !!unitName.length"
+            :input-height="inputHeight"
+            :is-border-error-only="isBorderErrorOnly"
+            :is-disabled="disabled"
+            :is-error="isError"
+            :is-info-border="isInfoBorder"
+            :is-interactive="isInteractive"
+            :min-width="minWidth"
+            :no-border="noBorder"
+            :placeholder="displayedPlaceholder"
+            :read-only="isReadOnly"
+            :readonly="isReadOnly"
+            :show-arrow-controls="showArrowControls"
+            :show-linear-unit-name="showLinearUnitName"
+            :slot-size="slotSize"
+            :text-align="textAlign"
+            :value="formatWithCurrency(value)"
+            @blur="onInputBlur($event)"
+            @focus="focusInput()"
+            @input="onInput($event)"
+            @keydown.down="decrementValue"
+            @keydown.up="incrementValue"
+            @keyup.enter="onEnterPress"
+          />
+        </template>
+      </InputInfoText>
+
       <InputContainer
+        v-else
         v-bind="$attrs"
         ref="inputField1"
         :align-items="alignItems"
@@ -43,20 +97,23 @@
         :color-mode="colorMode"
         :data-id="inputDataId"
         :data-qa-id="dataQaId"
-        :disabled="disabled"
+        :disabled="disabled && !isDisabledStyledOnly"
         :font-color="colorMode === 'transparent' ? 'white' : fontColor"
         :font-size="fontSize"
         :has-label-slot="hasLabelSlot"
         :has-slot="hasSlot"
         :has-unit="unitName && !!unitName.length"
         :input-height="inputHeight"
+        :is-border-error-only="isBorderErrorOnly"
         :is-disabled="disabled"
         :is-error="isError"
+        :is-info-border="isInfoBorder"
         :is-interactive="isInteractive"
         :min-width="minWidth"
         :no-border="noBorder"
         :placeholder="displayedPlaceholder"
         :read-only="isReadOnly"
+        :readonly="isReadOnly"
         :show-arrow-controls="showArrowControls"
         :show-linear-unit-name="showLinearUnitName"
         :slot-size="slotSize"
@@ -69,6 +126,7 @@
         @keydown.up="incrementValue"
         @keyup.enter="onEnterPress"
       />
+
       <SlotContainer v-if="hasSlot" :is-error="isError" :slot-size="slotSize">
         <slot></slot>
       </SlotContainer>
@@ -80,7 +138,7 @@
         >{{ unitName }}</UnitContainer
       >
       <IconWrapper
-        v-if="isError && !showLinearUnitName"
+        v-if="isError && !showLinearUnitName && !isBorderErrorOnly"
         :margin-right="showSelect ? selectWidth : 0"
         size="16px"
       >
@@ -134,7 +192,9 @@
         </ArrowButton>
       </ArrowControls>
     </InputWrapper>
-    <ErrorMessage v-if="isError">{{ errorMessage }}</ErrorMessage>
+    <ErrorMessage v-if="isError && errorMessage">{{
+      errorMessage
+    }}</ErrorMessage>
   </Container>
 </template>
 
@@ -205,6 +265,8 @@
     colorMode: String,
     showArrowControls: Boolean,
     readOnly: Boolean,
+    isBorderErrorOnly: Boolean,
+    isInfoBorder: Boolean,
   }
 
   const Container = styled('div', inputProps)`
@@ -217,7 +279,9 @@
 
   const InputContainer = styled('input', inputProps)`
     border: ${(props) =>
-      props.isError
+      props.isInfoBorder
+        ? '1px solid ' + props.theme.semanticColors.blue[500]
+        : props.isError
         ? '1px solid ' + props.theme.colors.red
         : props.noBorder
         ? 'none'
@@ -236,16 +300,17 @@
       showLinearUnitName,
       colorMode,
       showArrowControls,
+      isBorderErrorOnly,
     }) =>
       showArrowControls
         ? '40px'
         : colorMode === 'transparent'
         ? '0'
         : slotSize
-        ? isError && !showLinearUnitName
+        ? isError && !showLinearUnitName && !isBorderErrorOnly
           ? 'calc(' + slotSize + ' + 24px)'
           : 'calc(' + slotSize + ' + 10px)'
-        : isError && !showLinearUnitName
+        : isError && !showLinearUnitName && !isBorderErrorOnly
         ? '24px'
         : '5px'};
     border-radius: ${(props) =>
@@ -465,6 +530,9 @@
     INPUT_DRAG: 'on-input-drag',
     SELECT_CHANGE: 'select-change',
   }
+  const InputInfoText = styled(InfoText)`
+    width: 100%;
+  `
 
   export default {
     name: 'InputNumber',
@@ -490,6 +558,7 @@
       ArrowControls,
       ArrowButton,
       ArrowDivider,
+      InputInfoText,
     },
     inheritAttrs: false,
     props: {
@@ -709,6 +778,22 @@
         type: Boolean,
         default: false,
       },
+      isBorderErrorOnly: {
+        type: Boolean,
+        default: false,
+      },
+      isInfoBorder: {
+        type: Boolean,
+        default: false,
+      },
+      inputInfoText: {
+        type: String,
+        default: '',
+      },
+      isDisabledStyledOnly: {
+        type: Boolean,
+        default: false,
+      },
     },
     data() {
       return {