JavaScriptCollection
diff --git a/‎d3.js‎
Lines changed: 16 additions & 2 deletions b/‎d3.js‎
Lines changed: 16 additions & 2 deletions
diff --git a/‎d3.min.js‎
Lines changed: 2 additions & 2 deletions b/‎d3.min.js‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/svg/brush.js‎
Lines changed: 19 additions & 2 deletions b/‎src/svg/brush.js‎
Lines changed: 19 additions & 2 deletions
diff --git a/‎test/svg/brush-test.js‎
Lines changed: 10 additions & 0 deletions b/‎test/svg/brush-test.js‎
Lines changed: 10 additions & 0 deletions
@@ -7570,7 +7570,7 @@ d3 = function() {
     return subticks;
   }
   d3.svg.brush = function() {
-    var event = d3_eventDispatch(brush, "brushstart", "brush", "brushend"), x = null, y = null, resizes = d3_svg_brushResizes[0], extent = [ [ 0, 0 ], [ 0, 0 ] ], extentDomain;
+    var event = d3_eventDispatch(brush, "brushstart", "brush", "brushend"), x = null, y = null, resizes = d3_svg_brushResizes[0], extent = [ [ 0, 0 ], [ 0, 0 ] ], clamp = true, extentDomain;
     function brush(g) {
       g.each(function() {
         var g = d3.select(this), bg = g.selectAll(".background").data([ 0 ]), fg = g.selectAll(".extent").data([ 0 ]), tz = g.selectAll(".resize").data(resizes, String), e;
@@ -7691,7 +7691,16 @@ d3 = function() {
           r0 -= position;
           r1 -= size + position;
         }
-        min = Math.max(r0, Math.min(r1, point[i]));
+        if (typeof clamp === "boolean") {
+          apply_clamp = clamp;
+        } else {
+          apply_clamp = clamp[i];
+        }
+        if (apply_clamp || !dragging) {
+          min = Math.max(r0, Math.min(r1, point[i]));
+        } else {
+          min = point[i];
+        }
         if (dragging) {
           max = (min += position) + size;
         } else {
@@ -7733,6 +7742,11 @@ d3 = function() {
       resizes = d3_svg_brushResizes[!x << 1 | !y];
       return brush;
     };
+    brush.clamp = function(z) {
+      if (!arguments.length) return clamp;
+      clamp = z;
+      return brush;
+    };
     brush.extent = function(z) {
       var x0, x1, y0, y1, t;
       if (!arguments.length) {
 
@@ -14,6 +14,7 @@ d3.svg.brush = function() {
       y = null, // y-scale, optional
       resizes = d3_svg_brushResizes[0],
       extent = [[0, 0], [0, 0]], // [x0, y0], [x1, y1], in pixels (integers)
+      clamp = true, // whether or not to clamp the extent to the range
       extentDomain; // the extent in data space, lazily created
 
   function brush(g) {
@@ -223,8 +224,18 @@ d3.svg.brush = function() {
         r1 -= size + position;
       }
 
-      // Clamp the point so that the extent fits within the range extent.
-      min = Math.max(r0, Math.min(r1, point[i]));
+      if (typeof clamp === 'boolean') {
+        apply_clamp = clamp
+      } else {
+        apply_clamp = clamp[i]
+      }
+      if (apply_clamp || !dragging) {
+        // Clamp the point so that the extent fits within the range extent.
+        min = Math.max(r0, Math.min(r1, point[i]));
+      } else {
+        // No clamping
+        min = point[i];
+      }
 
       // Compute the new extent bounds.
       if (dragging) {
@@ -285,6 +296,12 @@ d3.svg.brush = function() {
     return brush;
   };
 
+  brush.clamp = function(z) {
+    if (!arguments.length) return clamp;
+    clamp = z;
+    return brush;
+  };
+
   brush.extent = function(z) {
     var x0, x1, y0, y1, t;
 
 
@@ -21,6 +21,16 @@ suite.addBatch({
       }
     },
 
+    "clamp": {
+      "defaults to true": function(brush) {
+        assert.isTrue(brush().clamp());
+      },
+      "returns one-dimensional array when clamp is defined for x and y": function(brush) {
+        var b = brush().clamp([true, false])
+        assert.deepEqual(b.clamp(), [true, false]);
+      }
+    },
+
     "extent": {
       "returns null when no scales are attached": function(brush) {
         assert.isNull(brush().extent());