@eturnity/eturnity_reusable_components 7.4.4-EPDM-7260.5 → 7.4.4-EPDM-7260.6

package/package.json

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

package/src/components/rangeSlider/Slider.vue

@@ -3,14 +3,14 @@
     :style="style"
     :class="className"
     @mousedown="elementMouseDown"
-    @touchstart="elementTouchDown"
+    @touchend="elementTouchDown"
   >
     <div
       v-for="handle in actualHandles"
       :key="handle"
       :style="{ display: enabled ? 'block' : 'none' }"
       @mousedown.stop.prevent="handleDown(handle, $event)"
-      @touchstart.stop.prevent="handleTouchDown(handle, $event)"
+      @touchend.stop.prevent="handleTouchDown(handle, $event)"
     >
       <slot :name="handle"></slot>
     </div>
@@ -443,8 +443,6 @@ export default {
     handleUp() {
       this.handle = null
 
-      this.resetBoundsAndMouseState()
-
       this.dragEnable = false
       this.resizeEnable = false
 
@@ -470,7 +468,7 @@ export default {
       const val = value / this.pxPerStep
 
       const int = 1.0 / this.step
-      return (Math.floor(val * int) / int).toFixed(2)
+      return (Math.round(val * int) / int).toFixed(2)
     }
   },
   computed: {

package/src/components/rangeSlider/index.vue

@@ -242,9 +242,9 @@ const VerticalLabel = styled.div`
 `
 
 const HandleIcon = styled(Icon)`
-  width: auto;
+  width: 12px;
   min-width: 0;
-  margin: -12px;
+  margin: -6px;
 `
 
 const BarOptionAttrs = { top: Number, left: Number }
@@ -375,12 +375,16 @@ export default {
     },
     checkOverlap(value, tariffs) {
       // Check if the tariffs overlap
-      const { itemId, min, max } = value
+      const { itemId } = value
+      const min = parseFloat(value.min)
+      const max = parseFloat(value.max)
 
       return tariffs.some((tariff) => {
         if (tariff.id === itemId) return false
 
         return (
+          (min === tariff.min ) ||
+          (max === tariff.max) ||
           (min > tariff.min && min < tariff.max) ||
           (max > tariff.min && max < tariff.max) ||
           (min < tariff.min && max > tariff.max)
@@ -421,6 +425,8 @@ export default {
         item,
         label: this.activeLabel
       })
+
+      this.hasOverlap = this.checkOverlap(item, this.activeLabel.selectedTariffs)
       this.showBarOptions = false
     },
     setBarOptions(bar) {