Skip to content

Separate legends (including main axes) from marks. #299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Separate legends (including main axes) from marks. #299

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/plot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ export function plot(options = {}) {
}

// Flatten any nested marks.
const legends = options.legends === undefined ? [] : options.legends.flat(Infinity);
const marks = options.marks === undefined ? [] : options.marks.flat(Infinity);

// A Map from Mark instance to an object of named channel values.
Expand Down Expand Up @@ -62,8 +63,8 @@ export function plot(options = {}) {
// When faceting, render axes for fx and fy instead of x and y.
const x = facet !== undefined && scales.fx ? "fx" : "x";
const y = facet !== undefined && scales.fy ? "fy" : "y";
if (axes[x]) marks.unshift(axes[x]);
if (axes[y]) marks.unshift(axes[y]);
if (axes[x]) legends.unshift(axes[x]);
if (axes[y]) legends.unshift(axes[y]);

const {width, height} = dimensions;

Expand All @@ -79,6 +80,10 @@ export function plot(options = {}) {
else Object.assign(this.style, style);
});

for (const legend of legends) {
const node = legend.render([], scales, [], dimensions, axes);
if (node != null) svg.append(() => node);
}
for (const mark of marks) {
const channels = markChannels.get(mark);
const index = markIndex.get(mark);
Expand Down