Skip to content

Commit b0434aa

Browse files
mbostockFil
andauthored
fix clip: frame for band scales (#1204)
* fix clip: frame for band scales * Update test/plots/band-clip.js Co-authored-by: Philippe Rivière <[email protected]> * comment * lift aria attributes * comment Co-authored-by: Philippe Rivière <[email protected]>
1 parent c6865e9 commit b0434aa

32 files changed

+962
-420
lines changed

src/marks/area.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class Area extends Mark {
4646
render(index, scales, channels, dimensions, context) {
4747
const {x1: X1, y1: Y1, x2: X2 = X1, y2: Y2 = Y1} = channels;
4848
return create("svg:g", context)
49-
.call(applyIndirectStyles, this, scales, dimensions, context)
49+
.call(applyIndirectStyles, this, dimensions, context)
5050
.call(applyTransform, this, scales, 0, 0)
5151
.call((g) =>
5252
g

src/marks/arrow.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class Arrow extends Mark {
6666
const wingScale = headLength / 1.5;
6767

6868
return create("svg:g", context)
69-
.call(applyIndirectStyles, this, scales, dimensions, context)
69+
.call(applyIndirectStyles, this, dimensions, context)
7070
.call(applyTransform, this, scales)
7171
.call((g) =>
7272
g

src/marks/bar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class AbstractBar extends Mark {
2828
render(index, scales, channels, dimensions, context) {
2929
const {rx, ry} = this;
3030
return create("svg:g", context)
31-
.call(applyIndirectStyles, this, scales, dimensions, context)
31+
.call(applyIndirectStyles, this, dimensions, context)
3232
.call(this._transform, this, scales)
3333
.call((g) =>
3434
g

src/marks/delaunay.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class DelaunayLink extends Mark {
124124
}
125125

126126
return create("svg:g", context)
127-
.call(applyIndirectStyles, this, scales, dimensions, context)
127+
.call(applyIndirectStyles, this, dimensions, context)
128128
.call(applyTransform, this, {x: X && x, y: Y && y})
129129
.call(
130130
Z
@@ -174,7 +174,7 @@ class AbstractDelaunayMark extends Mark {
174174
}
175175

176176
return create("svg:g", context)
177-
.call(applyIndirectStyles, this, scales, dimensions, context)
177+
.call(applyIndirectStyles, this, dimensions, context)
178178
.call(applyTransform, this, {x: X && x, y: Y && y})
179179
.call(
180180
Z
@@ -245,7 +245,7 @@ class Voronoi extends Mark {
245245
}
246246

247247
return create("svg:g", context)
248-
.call(applyIndirectStyles, this, scales, dimensions, context)
248+
.call(applyIndirectStyles, this, dimensions, context)
249249
.call(applyTransform, this, {x: X && x, y: Y && y})
250250
.call(
251251
Z

src/marks/density.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class Density extends Mark {
5050
const {contours} = channels;
5151
const path = geoPath();
5252
return create("svg:g", context)
53-
.call(applyIndirectStyles, this, scales, dimensions, context)
53+
.call(applyIndirectStyles, this, dimensions, context)
5454
.call(applyTransform, this, {})
5555
.call((g) =>
5656
g

src/marks/dot.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class Dot extends Mark {
7373
const size = R ? undefined : r * r * Math.PI;
7474
if (negative(r)) index = [];
7575
return create("svg:g", context)
76-
.call(applyIndirectStyles, this, scales, dimensions, context)
76+
.call(applyIndirectStyles, this, dimensions, context)
7777
.call(applyTransform, this, {x: X && x, y: Y && y})
7878
.call((g) =>
7979
g

src/marks/frame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export class Frame extends Mark {
2424
const {marginTop, marginRight, marginBottom, marginLeft, width, height} = dimensions;
2525
const {insetTop, insetRight, insetBottom, insetLeft, rx, ry} = this;
2626
return create("svg:rect", context)
27-
.call(applyIndirectStyles, this, scales, dimensions, context)
27+
.call(applyIndirectStyles, this, dimensions, context)
2828
.call(applyDirectStyles, this)
2929
.call(applyTransform, this, {})
3030
.attr("x", marginLeft + insetLeft)

src/marks/geo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export class Geo extends Mark {
3737
if (negative(r)) index = [];
3838
else if (r !== undefined) path.pointRadius(r);
3939
return create("svg:g", context)
40-
.call(applyIndirectStyles, this, scales, dimensions, context)
40+
.call(applyIndirectStyles, this, dimensions, context)
4141
.call(applyTransform, this, scales)
4242
.call((g) => {
4343
g.selectAll()

src/marks/hexgrid.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class Hexgrid extends Mark {
4646
}
4747
}
4848
return create("svg:g", context)
49-
.call(applyIndirectStyles, this, scales, dimensions, context)
49+
.call(applyIndirectStyles, this, dimensions, context)
5050
.call(applyTransform, this, {}, offset + ox, offset + oy)
5151
.call((g) => g.append("path").call(applyDirectStyles, this).attr("d", d))
5252
.node();

src/marks/image.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ export class Image extends Mark {
7070
const {x: X, y: Y, width: W, height: H, src: S} = channels;
7171
const [cx, cy] = applyFrameAnchor(this, dimensions);
7272
return create("svg:g", context)
73-
.call(applyIndirectStyles, this, scales, dimensions, context)
73+
.call(applyIndirectStyles, this, dimensions, context)
7474
.call(applyTransform, this, {x: X && x, y: Y && y})
7575
.call((g) =>
7676
g

0 commit comments

Comments
 (0)