Skip to content
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

Jump to bottom

fix: useless path collapsing for segments that are not start and end #1755

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: useless path collapsing for segments that are not start and end #1755

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da88bf0
fix: useless path collapsing for segments that are not start and end
jguddas Mar 3, 2023
a016143
fix: don't remove useless path segments when there are mid markers
jguddas Mar 3, 2023
9e18f07
feat: remove useless move segments
jguddas Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions plugins/convertPathData.js
View file
Open in desktop
Expand Up @@ -766,11 +766,18 @@ function filters(path, params, { maybeHasStrokeAndLinecap, hasMarkerMid }) {
}
}

// remove useless non-first path segments
if (params.removeUseless && !maybeHasStrokeAndLinecap) {
// l 0,0 / h 0 / v 0 / q 0,0 0,0 / t 0,0 / c 0,0 0,0 0,0 / s 0,0 0,0
// remove useless non-start/end path segments
var isStart = !path[index - 1] || path[index - 1].command === 'm';
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this be command === 'm', not testing if the previous one is m?

var isEnd = !path[index + 1] || path[index + 1].command === 'm';
Copy link
Contributor

Choose a reason for hiding this comment

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

If I understand what I'm reading correctly, this current version doesn't remove move statements at the very end of the path, which are completely useless. It should.

if (
params.removeUseless &&
!hasMarkerMid &&
(!maybeHasStrokeAndLinecap || !(isStart || isEnd))
) {
Comment on lines +772 to +776
Copy link
Author

Choose a reason for hiding this comment

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

hasRoundLinejoinAndLinecap from #1751 could also be included.

Suggested change
if (
params.removeUseless &&
!hasMarkerMid &&
(!maybeHasStrokeAndLinecap || !(isStart || isEnd))
) {
if (
params.removeUseless &&
!hasMarkerMid &&
(hasRoundLinejoinAndLinecap || !maybeHasStrokeAndLinecap || !(isStart || isEnd))
) {

Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't make sense as these do fundamentally different things.
If it has a linecap, we can't remove segments off the end. We can only remove segments in between.
If it doesn't have a linecap, we can remove all useless segments.
What you're proposing is that if it has a round linejoin, we can change M5 5h0 to nothing. That would cause incorrect behavior, because the original shows up as a dot.

*I would personally write this as maybeHasStrokeAndLinecap ? !isStart && !isEnd : true as I find that way easier to read and understand, but style is personal.

// m 0,0 / l 0,0 / h 0 / v 0 / q 0,0 0,0 / t 0,0 / c 0,0 0,0 0,0 / s 0,0 0,0
if (
(command === 'l' ||
(command === 'm' ||
command === 'l' ||
command === 'h' ||
command === 'v' ||
command === 'q' ||
Expand Down