Skip to content

unique channels #1551

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

Merged
merged 1 commit into from
May 14, 2023
Merged

unique channels #1551

Show file tree
Hide file tree
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
17 changes: 10 additions & 7 deletions src/marks/tip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ export class Tip extends Mark {
if (!defined(value) && channel.scale == null) continue;
const color = channel.scale === "color" ? channels[key][i] : undefined;
if (key === "x2" && "x1" in sources) {
yield [formatLabel(scales, channel) ?? "x", formatPair(sources.x1, channel, i)];
yield [formatLabel(scales, channel, "x"), formatPair(sources.x1, channel, i)];
} else if (key === "y2" && "y1" in sources) {
yield [formatLabel(scales, channel) ?? "y", formatPair(sources.y1, channel, i)];
yield [formatLabel(scales, channel, "y"), formatPair(sources.y1, channel, i)];
} else {
yield [formatLabel(scales, channel) ?? key, formatDefault(value), color];
yield [formatLabel(scales, channel, key), formatDefault(value), color];
}
}
if (index.fi != null && fx) yield [fx.label ?? "fx", formatFx(index.fx)];
if (index.fi != null && fy) yield [fy.label ?? "fy", formatFy(index.fy)];
if (index.fi != null && fx) yield [String(fx.label ?? "fx"), formatFx(index.fx)];
if (index.fi != null && fy) yield [String(fy.label ?? "fy"), formatFy(index.fy)];
}

// We don’t call applyChannelStyles because we only use the channels to
Expand All @@ -159,7 +159,10 @@ export class Tip extends Mark {
this.setAttribute("fill-opacity", 1);
this.setAttribute("stroke", "none");
// iteratively render each channel value
const names = new Set();
for (const [name, value, color] of format(sources, i)) {
if (name && names.has(name)) continue;
else names.add(name);
renderLine(that, name, value, color);
}
})
Expand Down Expand Up @@ -316,6 +319,6 @@ function formatPair(c1, c2, i) {
: `${formatDefault(c1.value[i])}–${formatDefault(c2.value[i])}`;
}

function formatLabel(scales, c) {
return scales[c.scale]?.label ?? c?.label;
function formatLabel(scales, c, defaultLabel) {
return String(scales[c.scale]?.label ?? c?.label ?? defaultLabel);
}
Loading