Skip to content

fix: collapseGroups does not move attributes atomically #1930

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 5 commits into from
Jan 7, 2024
Merged

fix: collapseGroups does not move attributes atomically #1930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b744205
Added test case.
johnkenny54 Jan 5, 2024
ca769bc
Verify that all attributes can be moved to single child before starti…
johnkenny54 Jan 5, 2024
da55b52
Simplified test case.
johnkenny54 Jan 6, 2024
890419e
Updated test case.
johnkenny54 Jan 6, 2024
6d17e6d
Copy attributes while verifying that they can all be merged.
johnkenny54 Jan 7, 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
23 changes: 14 additions & 9 deletions plugins/collapseGroups.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { inheritableAttrs, elemsGroups } from './_collections.js';

/**
* @typedef {import('../lib/types.js').XastElement} XastElement
* @typedef {import('../lib/types.js').XastNode} XastNode
*/

Expand Down Expand Up @@ -80,26 +81,30 @@ export const fn = () => {
node.attributes.transform == null &&
firstChild.attributes.transform == null))
) {
const newChildElemAttrs = { ...firstChild.attributes };

for (const [name, value] of Object.entries(node.attributes)) {
// avoid copying to not conflict with animated attribute
if (hasAnimatedAttr(firstChild, name)) {
return;
}
if (firstChild.attributes[name] == null) {
firstChild.attributes[name] = value;

if (newChildElemAttrs[name] == null) {
newChildElemAttrs[name] = value;
} else if (name === 'transform') {
firstChild.attributes[name] =
value + ' ' + firstChild.attributes[name];
} else if (firstChild.attributes[name] === 'inherit') {
firstChild.attributes[name] = value;
newChildElemAttrs[name] = value + ' ' + newChildElemAttrs[name];
} else if (newChildElemAttrs[name] === 'inherit') {
newChildElemAttrs[name] = value;
} else if (
inheritableAttrs.has(name) === false &&
firstChild.attributes[name] !== value
!inheritableAttrs.has(name) &&
newChildElemAttrs[name] !== value
) {
return;
}
delete node.attributes[name];
}

node.attributes = {};
firstChild.attributes = newChildElemAttrs;
}
}

Expand Down
24 changes: 24 additions & 0 deletions test/plugins/collapseGroups.17.svg.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Don't collapse group with a single child unless all attributes can be moved to the child.
See issue #1928 for context.

===

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 88 88">
<filter id="a">
<feGaussianBlur stdDeviation="1"/>
</filter>
<g transform="matrix(0.6875,0,0,0.6875,20.34375,66.34375)" style="filter:url(#a)">
<path d="M 33.346591,-83.471591 L -10.744318,-36.471591 L -10.49989,-32.5" style="fill-opacity:1"/>
</g>
</svg>

@@@

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 88 88">
<filter id="a">
<feGaussianBlur stdDeviation="1"/>
</filter>
<g transform="matrix(0.6875,0,0,0.6875,20.34375,66.34375)" style="filter:url(#a)">
<path d="M 33.346591,-83.471591 L -10.744318,-36.471591 L -10.49989,-32.5" style="fill-opacity:1"/>
</g>
</svg>