@eturnity/eturnity_reusable_components 7.4.4-EPDM-7260.21 → 7.4.4-EPDM-7260.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eturnity/eturnity_reusable_components",
-  "version": "7.4.4-EPDM-7260.21",
+  "version": "7.4.4-EPDM-7260.23",
   "private": false,
   "scripts": {
     "dev": "vue-cli-service serve",

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

@@ -351,7 +351,7 @@ const inputAttrs = { alignItems: String, hasLabel: Boolean, minWidth: String }
 const InputWrapper = styled('div', inputAttrs)`
   position: relative;
   display: grid;
-  width: max-content;
+  width: 100%;
   min-width: ${(props) => (props.minWidth ? props.minWidth : '150px')};
   align-items: center;
   gap: 8px;
@@ -533,11 +533,7 @@ export default {
   data() {
     return {
       selectedValue: null,
-      paddingLeft: this.isDraggable
-        ? '30px'
-        : this.leftPadding
-        ? this.leftPadding
-        : '15px',
+      paddingLeft: this.isDraggable ? '30px' : this.leftPadding,
       isDropdownOpen: false,
       isActive: false,
       textSearch: '',
@@ -788,12 +784,9 @@ export default {
         return Number(item.replace('px', ''))
       }
 
-      const value =
-        this.selectWidth === '100%'
-          ? '100%'
-          : removePX(this.selectWidth) - removePX(CARET_WIDTH)
-
-      return value + 'px'
+      return this.selectWidth === '100%'
+        ? '100%'
+        : removePX(this.selectWidth) - removePX(CARET_WIDTH) + 'px'
     },
     getOptionWidth() {
       if (this.optionWidth) return this.optionWidth

package/src/components/rangeSlider/index.vue

@@ -508,6 +508,8 @@ export default {
   },
   watch: {
     labels(newVal, oldVal) {
+      const overlapContainer = []
+
       //check items for overlap
       if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
         const labels = newVal.find((label) => label.placement === 'left')
@@ -515,9 +517,14 @@ export default {
         if (labels) {
           labels.value.forEach((label) => {
             label.selectedTariffs.forEach((tariff) => {
-              this.hasOverlap = this.checkOverlap(tariff, label.selectedTariffs)
+              const hasOverlap = this.checkOverlap(
+                tariff,
+                label.selectedTariffs
+              )
+
+              overlapContainer.push(hasOverlap)
 
-              if (this.hasOverlap) {
+              if (hasOverlap) {
                 const existing = this.OverlapId.find((id) => id === label.id)
 
                 if (!existing) this.OverlapId.push(label.id)
@@ -530,7 +537,8 @@ export default {
           })
         }
 
-        this.$emit('has-overlap', this.hasOverlap)
+        this.hasOverlap = overlapContainer.includes(true)
+        this.$emit('has-overlap', overlapContainer.includes(true))
       }
     }
   }