Skip to content

waffle stroke #2204

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 4 commits into from
Nov 21, 2024
Merged

waffle stroke #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76a9826
fix waffle stroke (when constant)
Fil Oct 19, 2024
aa8a463
fix tests
Fil Oct 21, 2024
71a755e
Merge branch 'main' into fil/waffle-stroke
mbostock Nov 21, 2024
fd52983
Merge branch 'fil/waffle-stroke' of github.com:observablehq/plot into…
mbostock Nov 21, 2024
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
2 changes: 1 addition & 1 deletion src/marks/waffle.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function waffleRender({render, ...options}) {
.attr("transform", template`translate(${x0},${y0})`)
.attr("d", (i) => `M${polygon[i].join("L")}Z`)
.attr("fill", (i) => `url(#${patternId}-${i})`)
.attr("stroke", this.stroke == null ? null : (i) => `url(#${patternId}-${i})`)
.attr("stroke", this.stroke == null ? null : "none")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just noting that this is visually equivalent to saying:

            .attr("stroke", "none")

I.e., there’s never a stroke applied to the path element, it’s just that sometimes we have to suppress it when it would otherwise be inherited from the parent G element.

.call(applyChannelStyles, this, {ariaLabel, href, title})
)
.node();
Expand Down
40 changes: 20 additions & 20 deletions test/output/waffleShapes.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 12 additions & 12 deletions test/output/waffleStroke.svg
View file
Open in desktop
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this test and the other ones below have a small visible difference, but for the best

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions test/output/waffleStrokeMixed.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading