@eturnity/eturnity_reusable_components 7.4.4-EPDM-7260.27 → 7.4.4-EPDM-7260.29

package/package.json

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

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

@@ -83,11 +83,7 @@
           >
             <slot name="selector" :selectedValue="selectedValue"></slot>
           </selector>
-<<<<<<< HEAD
-          <Caret @click.stop="toggleCaretDropdown" v-if="dropDownArrowVisible">
-=======
           <Caret @click.stop="toggleCaretDropdown" class="caret_dropdown">
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
             <icon
               v-if="isDropdownOpen"
               name="arrow_up"
@@ -228,12 +224,7 @@ const optionalLabel = styled.span`
 const inputProps = {
   selectWidth: String,
   optionWidth: String,
-<<<<<<< HEAD
-  minWidth: String,
-  maxWidth: String
-=======
   noRelative: Boolean
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
 }
 const Container = styled('div', inputProps)`
   width: ${(props) => props.selectWidth};
@@ -272,12 +263,7 @@ const selectButtonAttrs = {
   showDisabledBackground: Boolean
 }
 const selectButton = styled('div', selectButtonAttrs)`
-<<<<<<< HEAD
-  font-size: ${(props) => (props.fontSize ? props.fontSize : '13px')};
-  position: relative;
-=======
   position: ${(props) => (props.noRelative ? 'static' : 'relative')};
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
   box-sizing: border-box;
   border-radius: 4px;
   max-width: ${(props) => (props.selectWidth ? props.selectWidth : '100%')};
@@ -385,15 +371,11 @@ const DropdownAttrs = { noRelative: Boolean }
 const DropdownWrapper = styled('div', DropdownAttrs)`
   position: ${(props) => (props.noRelative ? 'static' : 'relative')};
 `
-<<<<<<< HEAD
-const inputAttrs = { alignItems: String, hasLabel: Boolean, minWidth: String }
-=======
 const inputAttrs = {
   alignItems: String,
   hasLabel: Boolean,
   noRelative: Boolean
 }
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
 const InputWrapper = styled('div', inputAttrs)`
   position: ${(props) => (props.noRelative ? 'static' : 'relative')};
   display: grid;
@@ -468,9 +450,6 @@ export default {
       required: false,
       default: '36px'
     },
-    minWidth: {
-      required: false
-    },
     optionWidth: {
       required: false,
       default: null
@@ -550,18 +529,16 @@ export default {
       type: Boolean,
       default: false
     },
-<<<<<<< HEAD
     leftPadding: {
       type: String,
       default: '15px'
-=======
+    },
     tablePaddingLeft: {
       required: false
     },
     showDisabledBackground: {
       required: false,
       default: true
->>>>>>> 815539e19f2883b2a6c7d813c6c2799ce3cb0993
     },
     minOptionLength: {
       type: Number,

package/src/components/rangeSlider/Slider.vue

@@ -58,7 +58,7 @@ let eventsFor = events.mouse
 
 export default {
   replace: true,
-  name: 'slider',
+  name: 'SliderComponent',
   props: {
     dataId: {
       type: String,

package/src/components/rangeSlider/index.vue

@@ -36,29 +36,19 @@
                 :stepCount="stepCount"
                 :subStepCount="subStepCount"
                 @dragStop="
-                  onChange(
-                    'drag',
-                    {
-                      itemId: bar.id,
-                      parentId: bar.parentId,
-                      entityId: label.id,
-                      ...$event
-                    },
-                    label.id,
-                    label.selectedTariffs
-                  )
+                  onChange('drag', {
+                    itemId: bar.id,
+                    parentId: bar.parentId,
+                    entityId: label.id,
+                    ...$event
+                  })
                 "
                 @resizeStop="
-                  onChange(
-                    'resize',
-                    {
-                      itemId: bar.id,
-                      entityId: label.id,
-                      ...$event
-                    },
-                    label.id,
-                    label.selectedTariffs
-                  )
+                  onChange('resize', {
+                    itemId: bar.id,
+                    entityId: label.id,
+                    ...$event
+                  })
                 "
                 @click.native.stop="
                   onBarTariffClick({ item: bar, type: 'delete', label })
@@ -372,21 +362,8 @@ export default {
     }
   },
   methods: {
-    onChange(type, value, entityId, tariffs) {
+    onChange(type, value) {
       this.$emit(type, value)
-
-      this.hasOverlap = this.checkOverlap(value, tariffs)
-
-      if (this.hasOverlap) {
-        const existing = this.OverlapId.find((id) => id === entityId)
-
-        if (!existing) this.OverlapId.push(entityId)
-      } else
-        this.OverlapId = this.OverlapId
-          ? this.OverlapId.filter((id) => id !== entityId)
-          : []
-
-      this.$emit('has-overlap', this.hasOverlap)
     },
     checkOverlap(value, tariffs) {
       // Check if the tariffs overlap
@@ -446,10 +423,6 @@ export default {
 
       this.activeLabel = label
       this.barOptionsType = type
-      this.hasOverlap = this.checkOverlap(
-        item,
-        this.activeLabel.selectedTariffs
-      )
       this.showBarOptions = false
     },
     setBarOptions(bar) {
@@ -522,23 +495,21 @@ export default {
                 label.selectedTariffs
               )
 
-              overlapContainer.push(hasOverlap)
-
-              if (hasOverlap) {
-                const existing = this.OverlapId.find((id) => id === label.id)
-
-                if (!existing) this.OverlapId.push(label.id)
-              }
+              if (hasOverlap) overlapContainer.push(label.id)
             })
           })
         }
 
-        if (!overlapContainer.includes(true)) {
+        const hasOverlap = overlapContainer.length > 0
+
+        if (!hasOverlap) {
           this.OverlapId = []
+        } else {
+          this.OverlapId = [...new Set(overlapContainer)]
         }
 
-        this.hasOverlap = overlapContainer.includes(true)
-        this.$emit('has-overlap', overlapContainer.includes(true))
+        this.hasOverlap = hasOverlap
+        this.$emit('has-overlap', hasOverlap)
       }
     }
   }