brush bandwidth

Author: mbostock

src/marks/brush.js

@@ -28,7 +28,7 @@ export class Brush extends Mark {
     );
     this.currentElement = null;
   }
-  render(index, scales, {x: X, y: Y}, dimensions) {
+  render(index, {x, y}, {x: X, y: Y}, dimensions) {
     const {marginLeft, width, marginRight, marginTop, height, marginBottom} = dimensions;
     const {ariaLabel, ariaDescription, ariaHidden, ...options} = this;
     const left = marginLeft;
@@ -56,11 +56,13 @@ export class Brush extends Mark {
             if (selection) {
               S = index;
               if (X) {
-                const [x0, x1] = Y ? [selection[0][0], selection[1][0]] : selection;
+                let [x0, x1] = Y ? [selection[0][0], selection[1][0]] : selection;
+                if (x.bandwidth) x0 -= x.bandwidth();
                 S = S.filter(i => x0 <= X[i] && X[i] <= x1);
               }
               if (Y) {
-                const [y0, y1] = X ? [selection[0][1], selection[1][1]] : selection;
+                let [y0, y1] = X ? [selection[0][1], selection[1][1]] : selection;
+                if (y.bandwidth) y0 -= y.bandwidth();
                 S = S.filter(i => y0 <= Y[i] && Y[i] <= y1);
               }
             }