Skip to content

Commit df857c5

Browse files
committed
Merge branch 'fil/brush-dataless' into fil/brush-across-facets
2 parents 51469a2 + 36cdeda commit df857c5

File tree

10 files changed

+10
-10
lines changed

10 files changed

+10
-10
lines changed

src/interactions/brush.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ export class Brush extends Mark {
148148
});
149149
}
150150

151-
const g = create("svg:g").attr("aria-label", "brush");
151+
const g = create("svg:g").attr("aria-label", this._dimension === "xy" ? "brush" : `brush-${this._dimension}`);
152152
g.call(this._brush);
153153
const node = g.node();
154154
this._brushNodes.push(node);

test/output/brushXDot.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<g aria-label="x-axis label" text-anchor="end" transform="translate(17.5,27.5)">
3535
<text transform="translate(620,140)">body_mass_g →</text>
3636
</g>
37-
<g aria-label="brush" fill="none" pointer-events="all">
37+
<g aria-label="brush-x" fill="none" pointer-events="all">
3838
<rect class="overlay" pointer-events="all" cursor="crosshair" x="19" y="10" width="602" height="130"></rect>
3939
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="103.333" y="10" width="266.667" height="130"></rect>
4040
<rect class="handle handle--w" cursor="ew-resize" style="" x="100.333" y="7" width="6" height="136"></rect>

test/output/brushXHistogram.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<g aria-label="x-axis label" text-anchor="end" transform="translate(17.5,27.5)">
6666
<text transform="translate(620,370)">body_mass_g →</text>
6767
</g>
68-
<g aria-label="brush" fill="none" pointer-events="all">
68+
<g aria-label="brush-x" fill="none" pointer-events="all">
6969
<rect class="overlay" pointer-events="all" cursor="crosshair" x="39" y="20" width="582" height="350"></rect>
7070
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="166.973" y="20" width="227.297" height="350"></rect>
7171
<rect class="handle handle--w" cursor="ew-resize" style="" x="163.973" y="17" width="6" height="356"></rect>

test/output/brushXHistogramFaceted.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<g aria-label="x-axis label" text-anchor="end" transform="translate(37.5,27.5)">
147147
<text transform="translate(600,449)">body_mass_g →</text>
148148
</g>
149-
<g aria-label="brush">
149+
<g aria-label="brush-x">
150150
<g fill="none" pointer-events="all" transform="translate(0,0)">
151151
<rect class="overlay" pointer-events="all" cursor="crosshair" x="39" y="20" width="562" height="133"></rect>
152152
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="161.081" y="20" width="227.027" height="133"></rect>

test/output/brushXLine.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<text y="0.71em" transform="translate(462.599,370)">2017</text>
6363
<text y="0.71em" transform="translate(578.662,370)">2018</text>
6464
</g>
65-
<g aria-label="brush" fill="none" pointer-events="all">
65+
<g aria-label="brush-x" fill="none" pointer-events="all">
6666
<rect class="overlay" pointer-events="all" cursor="crosshair" x="39" y="20" width="582" height="350"></rect>
6767
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="230.154" y="20" width="164.397" height="350"></rect>
6868
<rect class="handle handle--w" cursor="ew-resize" style="" x="227.154" y="17" width="6" height="356"></rect>

test/output/brushXTemporal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<text y="0.71em" transform="translate(458.837,370)">2017</text>
6767
<text y="0.71em" transform="translate(572.838,370)">2018</text>
6868
</g>
69-
<g aria-label="brush" fill="none" pointer-events="all">
69+
<g aria-label="brush-x" fill="none" pointer-events="all">
7070
<rect class="overlay" pointer-events="all" cursor="crosshair" x="39" y="20" width="582" height="350"></rect>
7171
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="163.683" y="20" width="114.001" height="350"></rect>
7272
<rect class="handle handle--w" cursor="ew-resize" style="" x="160.683" y="17" width="6" height="356"></rect>

test/output/brushXTemporalReversed.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<text y="0.71em" transform="translate(429.478,370)">2015</text>
6767
<text y="0.71em" transform="translate(543.479,370)">2014</text>
6868
</g>
69-
<g aria-label="brush" fill="none" pointer-events="all">
69+
<g aria-label="brush-x" fill="none" pointer-events="all">
7070
<rect class="overlay" pointer-events="all" cursor="crosshair" x="39" y="20" width="582" height="350"></rect>
7171
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="382.316" y="20" width="114.001" height="350"></rect>
7272
<rect class="handle handle--w" cursor="ew-resize" style="" x="379.316" y="17" width="6" height="356"></rect>

test/output/brushYDot.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<g aria-label="x-axis label" text-anchor="end" transform="translate(17.5,27.5)">
5454
<text transform="translate(620,370)">culmen_length_mm →</text>
5555
</g>
56-
<g aria-label="brush" fill="none" pointer-events="all">
56+
<g aria-label="brush-y" fill="none" pointer-events="all">
5757
<rect class="overlay" pointer-events="all" cursor="crosshair" x="40" y="19" width="580" height="352"></rect>
5858
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="40" y="82.5" width="580" height="208.333"></rect>
5959
<rect class="handle handle--n" cursor="ns-resize" style="" x="37" y="79.5" width="586" height="6"></rect>

test/output/brushYHistogram.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<g aria-label="x-axis label" text-anchor="end" transform="translate(17.5,27.5)">
7777
<text transform="translate(620,370)">Frequency →</text>
7878
</g>
79-
<g aria-label="brush" fill="none" pointer-events="all">
79+
<g aria-label="brush-y" fill="none" pointer-events="all">
8080
<rect class="overlay" pointer-events="all" cursor="crosshair" x="40" y="19" width="580" height="352"></rect>
8181
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="40" y="175.556" width="580" height="116.667"></rect>
8282
<rect class="handle handle--n" cursor="ns-resize" style="" x="37" y="172.556" width="586" height="6"></rect>

test/output/brushYLine.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<g aria-label="x-axis label" text-anchor="end" transform="translate(17.5,27.5)">
4949
<text transform="translate(620,370)">Close →</text>
5050
</g>
51-
<g aria-label="brush" fill="none" pointer-events="all">
51+
<g aria-label="brush-y" fill="none" pointer-events="all">
5252
<rect class="overlay" pointer-events="all" cursor="crosshair" x="40" y="19" width="580" height="352"></rect>
5353
<rect class="selection" cursor="move" fill="#777" fill-opacity="0.3" stroke="#fff" shape-rendering="crispEdges" style="" x="40" y="156.047" width="580" height="99.205"></rect>
5454
<rect class="handle handle--n" cursor="ns-resize" style="" x="37" y="153.047" width="586" height="6"></rect>

0 commit comments

Comments
 (0)