Skip to content

Commit 92c81bd

Browse files
committed
defalt z: null for redundant color encoding
1 parent 530d063 commit 92c81bd

4 files changed

Lines changed: 2498 additions & 8 deletions

File tree

src/marks/area.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ export function area(data, options) {
7777
}
7878

7979
export function areaX(data, options) {
80-
const {y = indexOf, ...rest} = maybeDenseIntervalY(options);
81-
return new Area(data, maybeStackX(maybeIdentityX({...rest, y1: y, y2: undefined}, y === indexOf ? "x2" : "x")));
80+
const {x, y = indexOf, fill, z = x === fill ? null : undefined, ...rest} = maybeDenseIntervalY(options);
81+
return new Area(data, maybeStackX(maybeIdentityX({...rest, x, y1: y, y2: undefined, z, fill}, y === indexOf ? "x2" : "x")));
8282
}
8383

8484
export function areaY(data, options) {
85-
const {x = indexOf, ...rest} = maybeDenseIntervalX(options);
86-
return new Area(data, maybeStackY(maybeIdentityY({...rest, x1: x, x2: undefined}, x === indexOf ? "y2" : "y")));
85+
const {x = indexOf, y, fill, z = y === fill ? null : undefined, ...rest} = maybeDenseIntervalX(options);
86+
return new Area(data, maybeStackY(maybeIdentityY({...rest, x1: x, x2: undefined, y, z, fill}, x === indexOf ? "y2" : "y")));
8787
}

src/marks/line.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ export function line(data, {x, y, ...options} = {}) {
103103
return new Line(data, {...options, x, y});
104104
}
105105

106-
export function lineX(data, {x = identity, y = indexOf, ...options} = {}) {
107-
return new Line(data, maybeDenseIntervalY({...options, x, y}));
106+
export function lineX(data, {x = identity, y = indexOf, stroke, z = stroke === x ? null : undefined, ...options} = {}) {
107+
return new Line(data, maybeDenseIntervalY({...options, x, y, z, stroke}));
108108
}
109109

110-
export function lineY(data, {x = indexOf, y = identity, ...options} = {}) {
111-
return new Line(data, maybeDenseIntervalX({...options, x, y}));
110+
export function lineY(data, {x = indexOf, y = identity, stroke, z = stroke === y ? null : undefined, ...options} = {}) {
111+
return new Line(data, maybeDenseIntervalX({...options, x, y, z, stroke}));
112112
}

0 commit comments

Comments
 (0)