@eturnity/eturnity_reusable_components 8.26.11--EPDM-16005.1 → 8.26.11-EPDM-15023.0

package/src/components/buttons/mainButton/index.vue

@@ -7,11 +7,13 @@
       :data-id="dataId"
       :data-qa-id="dataQaId"
       :height="height"
+      :is-active="isActive"
       :is-disabled="isDisabled"
       :min-width="minWidth"
       :no-wrap="noWrap"
       :type="type"
       :variant="variant"
+      :width="width"
     >
       <LabelComponent :has-icon="Boolean(icon)">
         <Icon
@@ -50,11 +52,13 @@
     type: String,
     isDisabled: Boolean,
     minWidth: String,
+    width: String,
     noWrap: Boolean,
     height: String,
     variant: String,
     buttonSize: String,
     appTheme: String,
+    isActive: Boolean,
   }
   const ButtonContainer = styled('div', ButtonAttrs)`
     display: flex;
@@ -73,6 +77,9 @@
       props.isDisabled
         ? props.theme.mainButton[props.appTheme][props.type][props.variant]
             .disabled.backgroundColor
+        : props.isActive
+        ? props.theme.mainButton[props.appTheme][props.type][props.variant]
+            .active.backgroundColor
         : props.theme.mainButton[props.appTheme][props.type][props.variant]
             .default.backgroundColor};
     border: ${(props) => {
@@ -91,7 +98,7 @@
     ${(props) => (props.noWrap ? `white-space: nowrap;` : '')};
     height: ${(props) => props.height};
     line-height: 1;
-
+    width: ${(props) => props.width};
     &:hover {
       background-color: ${(props) =>
         props.isDisabled
@@ -170,6 +177,11 @@
         default: false,
         type: Boolean,
       },
+      isActive: {
+        required: false,
+        default: false,
+        type: Boolean,
+      },
       icon: {
         required: false,
         default: null,
@@ -204,6 +216,11 @@
         default: null,
         type: String,
       },
+      width: {
+        required: false,
+        default: 'auto',
+        type: String,
+      },
       height: {
         required: false,
         default: 'auto',

package/src/components/infoText/index.vue

@@ -49,7 +49,10 @@
         <slot name="trigger"></slot>
       </IconWrapper>
     </div>
-    <Teleport v-if="isVisible && (!!text || $slots.default)" to="body">
+    <Teleport
+      v-if="!hideInfoText && isVisible && (!!text || $slots.default)"
+      to="body"
+    >
       <TextWrapper data-test-id="info_text_wrapper" :style="wrapperStyle">
         <TextOverlay
           ref="infoBox"

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

@@ -799,6 +799,10 @@
         type: Boolean,
         default: false,
       },
+      hasSpaceBetweenUnit: {
+        type: Boolean,
+        default: true,
+      },
     },
     data() {
       return {
@@ -812,8 +816,12 @@
       displayedPlaceholder() {
         if (this.placeholder) return this.placeholder
         if (this.defaultNumber)
-          return `${this.defaultNumber} ${this.unitName ? this.unitName : ''}`
-        return `${this.minNumber || 0} ${this.unitName ? this.unitName : ''}`
+          return `${this.defaultNumber}${this.hasSpaceBetweenUnit ? ' ' : ''}${
+            this.unitName ? this.unitName : ''
+          }`
+        return `${this.minNumber || 0}${this.hasSpaceBetweenUnit ? ' ' : ''}${
+          this.unitName ? this.unitName : ''
+        }`
       },
       hasSlot() {
         return !!this.$slots.default
@@ -1027,8 +1035,9 @@
           return
         }
         this.textInput = this.formatWithCurrency(this.value)
+        const textInputWithoutUnit = this.formatWithoutUnit(this.value)
         this.enteredValue = stringToNumber({
-          value: this.textInput,
+          value: textInputWithoutUnit,
           numberPrecision: this.numberPrecision,
           minDecimals: this.minDecimals,
         })
@@ -1049,6 +1058,38 @@
           this.$refs.inputField1.$el.blur()
         })
       },
+      formatWithoutUnit(value) {
+        let adjustedMinValue =
+          value || value === 0
+            ? value
+            : this.defaultNumber
+            ? this.defaultNumber
+            : this.minNumber || this.minNumber === 0
+            ? this.minNumber
+            : ''
+        if (adjustedMinValue || adjustedMinValue === 0) {
+          let input = this.numberToStringEnabled
+            ? numberToString({
+                value: adjustedMinValue,
+                numberPrecision: this.numberPrecision,
+                minDecimals: this.minDecimals,
+              })
+            : adjustedMinValue
+          return input
+        } else if (!adjustedMinValue && adjustedMinValue !== 0) {
+          return ''
+        } else if (this.isFocused) {
+          return value
+        } else {
+          return this.numberToStringEnabled
+            ? numberToString({
+                value: adjustedMinValue,
+                numberPrecision: this.numberPrecision,
+                minDecimals: this.minDecimals,
+              })
+            : adjustedMinValue
+        }
+      },
       formatWithCurrency(value) {
         let adjustedMinValue =
           value || value === 0
@@ -1069,7 +1110,7 @@
           let unit = this.showLinearUnitName ? '' : this.unitName
           //return input + ' ' + unit
           if (unit) {
-            return input + ' ' + unit
+            return `${input}${this.hasSpaceBetweenUnit ? ' ' : ''}${unit}`
           }
           return input
         } else if (!adjustedMinValue && adjustedMinValue !== 0) {

package/src/components/tableDropdown/index.vue

@@ -16,11 +16,7 @@
         :is-nested="isNested"
         :show-archived="showArchived"
       >
-        <NestedContainer
-          :data-id="getRowDataId({ inputType: item.inputType })"
-          :data-qa-id="getRowDataId({ inputType: item.inputType })"
-          :is-nested="isNested"
-        >
+        <NestedContainer :is-nested="isNested">
           <NestedIcon
             v-if="
               isNested &&
@@ -552,11 +548,6 @@
         required: false,
         default: '',
       },
-      rowDataId: {
-        required: false,
-        default: null,
-        type: [Array],
-      },
     },
     data() {
       return {
@@ -598,17 +589,6 @@
       },
     },
     methods: {
-      getRowDataId({ inputType }) {
-        if (!this.rowDataId) {
-          return null
-        }
-
-        const rowDataId = this.rowDataId.find(
-          (item) => item.inputType === inputType
-        )
-
-        return rowDataId ? rowDataId.dataId : null
-      },
       toggleOpen(event) {
         if (
           this.disabled ||