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.

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

feat(removeUnknownsAndDefaults): remove x/y="0" from <use>. #76

Merged
merged 1 commit into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 28 additions & 20 deletions plugins/removeUnknownsAndDefaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,21 +158,27 @@ export const fn = (root, params, info) => {
},
},
element: {
enter: (node, parentNode, parentInfo) => {
enter: (element, parentNode, parentInfo) => {
// skip namespaced elements
if (node.name.includes(':')) {
if (element.name.includes(':')) {
return;
}
// skip visiting foreignObject subtree
if (node.name === 'foreignObject') {
if (element.name === 'foreignObject') {
return visitSkip;
}

if (node.name === 'use') {
const id = getHrefId(node);
if (element.name === 'use') {
const id = getHrefId(element);
if (id) {
usedIDs.add(id);
}
// x="0" and y="0" can be removed; otherwise leave attributes alone.
['x', 'y'].forEach((attName) => {
if (element.attributes[attName] === '0') {
delete element.attributes[attName];
}
});
return;
}

Expand All @@ -184,31 +190,33 @@ export const fn = (root, params, info) => {
if (!allowedChildren || allowedChildren.size === 0) {
// TODO: DO WE NEED THIS CHECK? SHOULDN'T IT HAVE BEEN HANDLED BY THE PARENT IN THE ELSE BLOCK BELOW?
// remove unknown elements
if (allowedChildrenPerElement.get(node.name) == null) {
detachNodeFromParent(node, parentNode);
if (allowedChildrenPerElement.get(element.name) == null) {
detachNodeFromParent(element);
return;
}
} else {
// remove not allowed children
if (allowedChildren.has(node.name) === false) {
detachNodeFromParent(node, parentNode);
if (allowedChildren.has(element.name) === false) {
detachNodeFromParent(element);
return;
}
}
}

const allowedAttributes = allowedAttributesPerElement.get(node.name);
const attributesDefaults = attributesDefaultsPerElement.get(node.name);
const allowedAttributes = allowedAttributesPerElement.get(element.name);
const attributesDefaults = attributesDefaultsPerElement.get(
element.name,
);
/** @type {Map<string, string | null>} */
const computedStyle = styleData.computeStyle(node, parentInfo);
const computedStyle = styleData.computeStyle(element, parentInfo);

// Remove any unnecessary style properties.
const styleProperties = getStyleDeclarations(node);
const styleProperties = getStyleDeclarations(element);
if (styleProperties) {
// Delete the associated attributes, since they will always be overridden by the style property.
for (let p of styleProperties.keys()) {
if (p === 'transform') {
switch (node.name) {
switch (element.name) {
case 'linearGradient':
case 'radialGradient':
p = 'gradientTransform';
Expand All @@ -218,12 +226,12 @@ export const fn = (root, params, info) => {
break;
}
}
delete node.attributes[p];
delete element.attributes[p];
}

// Calculate the style if we remove all properties.
const newComputedStyle = styleData.computeStyle(
node,
element,
parentInfo,
new Map(),
);
Expand All @@ -243,13 +251,13 @@ export const fn = (root, params, info) => {
}
}
if (propsToDelete.length > 0) {
propsToDeleteIfUnused.set(node, propsToDelete);
propsToDeleteIfUnused.set(element, propsToDelete);
}
}

// remove element's unknown attrs and attrs with default values
const attsToDelete = [];
for (const [name, value] of Object.entries(node.attributes)) {
for (const [name, value] of Object.entries(element.attributes)) {
if (keepDataAttrs && name.startsWith('data-')) {
continue;
}
Expand All @@ -276,7 +284,7 @@ export const fn = (root, params, info) => {
allowedAttributes &&
!allowedAttributes.has(name)
) {
delete node.attributes[name];
delete element.attributes[name];
continue;
}

Expand Down Expand Up @@ -304,7 +312,7 @@ export const fn = (root, params, info) => {
}
}
if (attsToDelete.length > 0) {
attsToDeleteIfUnused.set(node, attsToDelete);
attsToDeleteIfUnused.set(element, attsToDelete);
}
},
},
Expand Down
20 changes: 20 additions & 0 deletions test/plugins/removeUnknownsAndDefaults.31.svg.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Remove x="0" and y="0" from <use>.

===

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128.66954 142.59889">
<path style="fill:none;stroke:#000;stroke-width:1;stroke-dasharray:none" d="M58.75 77.5186 40.0609 45.1482" id="a"/>
<use x="0" y="0" href="#a"/>
<use x="0" y="0" transform="rotate(10 61.0575 103.89346)" href="#a"/>
<use transform="rotate(60 72.595001 101.49886)" href="#a"/>
</svg>

@@@

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128.66954 142.59889">
<path style="fill:none;stroke:#000;stroke-width:1;stroke-dasharray:none" d="M58.75 77.5186 40.0609 45.1482" id="a"/>
<use href="#a"/>
<use transform="rotate(10 61.0575 103.89346)" href="#a"/>
<use transform="rotate(60 72.595001 101.49886)" href="#a"/>
</svg>