Fix #32 (left slider goes past right slider)

johnwalley · May 26, 2019 · 018af64 · 018af64
1 parent efef27e
commit 018af64
Showing 1 changed file with 17 additions and 18 deletions.
diff --git a/src/slider.js b/src/slider.js
@@ -356,6 +356,21 @@ function slider(orientation, scale) {
 
     fadeTickText();
 
+    function computeDragNewValue(pos) {
+      var adjustedValue = alignedValue(scale.invert(pos));
+      return value.map(function(d, i) {
+        if (value.length === 2) {
+          return i === handleIndex
+            ? handleIndex === 0
+            ? Math.min(adjustedValue, alignedValue(value[1]))
+            : Math.max(adjustedValue, alignedValue(value[0]))
+          : d;
+        } else {
+          return i === handleIndex ? adjustedValue : d;
+        }
+      });
+    }
+
     function dragstarted() {
       select(this).classed('active', true);
 
@@ -386,20 +401,7 @@ function slider(orientation, scale) {
       var pos = identityClamped(
         orientation === bottom || orientation === top ? event.x : event.y
       );
-
-      var adjustedValue = alignedValue(scale.invert(pos));
-
-      var newValue = value.map(function(d, i) {
-        if (value.length === 2) {
-          return i === handleIndex
-            ? handleIndex === 0
-              ? Math.min(adjustedValue, alignedValue(value[1]))
-              : Math.max(adjustedValue, alignedValue(value[0]))
-            : d;
-        } else {
-          return i === handleIndex ? adjustedValue : d;
-        }
-      });
+      var newValue = computeDragNewValue(pos);
 
       updateHandle(newValue);
       listeners.call(
@@ -416,10 +418,7 @@ function slider(orientation, scale) {
       var pos = identityClamped(
         orientation === bottom || orientation === top ? event.x : event.y
       );
-
-      var newValue = value.map(function(d, i) {
-        return i === handleIndex ? alignedValue(scale.invert(pos)) : d;
-      });
+      var newValue = computeDragNewValue(pos);
 
       updateHandle(newValue);
       listeners.call(