sysutils/svgo
1
0
Fork 0
mirror of https://github.com/svg/svgo.git synced 2025-07-29 20:21:14 +03:00
Code Activity

Convert attributes to xast with proxy fallback

Browse Source 
There is a lot of attributes manipulation which is hard to remove at
once. In this diff I added `attributes` object and wrapped it as proxy
for `attrs` field.
This commit is contained in:
Bogdan Chadkin
2021-03-10 23:11:09 +03:00
parent 685d9fa55e
commit 3e1bfd528d
6 changed files with 74 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/moveElemsAttrsToGroup.js
View File

@ -43,9 +43,12 @@ exports.fn = function (item) {
// don't mess with possible styles (hack until CSS parsing is implemented)
if (inner.hasAttr('class')) return false;
if (!Object.keys(intersection).length) {
intersection = inner.attrs;
intersection = inner.attributes;
} else {
intersection = intersectInheritableAttrs(intersection, inner.attrs);
intersection = intersectInheritableAttrs(
intersection,
inner.attributes
);
if (!intersection) return false;
}
@ -59,22 +62,22 @@ exports.fn = function (item) {
if (intersected) {
item.content.forEach(function (g) {
for (const [name, attr] of Object.entries(intersection)) {
for (const [name, value] of Object.entries(intersection)) {
if ((!allPath && !hasClip) || name !== 'transform') {
g.removeAttr(name);
if (name === 'transform') {
if (!hasTransform) {
if (item.hasAttr('transform')) {
item.attr('transform').value += ' ' + attr.value;
item.attr('transform').value += ' ' + value;
} else {
item.addAttr(attr);
item.addAttr({ name, value });
}
hasTransform = true;
}
} else {
item.addAttr(attr);
item.addAttr({ name, value });
}
}
}
@ -94,15 +97,14 @@ exports.fn = function (item) {
function intersectInheritableAttrs(a, b) {
var c = {};
for (const [n, attr] of Object.entries(a)) {
for (const [name, value] of Object.entries(a)) {
if (
// eslint-disable-next-line no-prototype-builtins
b.hasOwnProperty(n) &&
inheritableAttrs.indexOf(n) > -1 &&
attr.name === b[n].name &&
attr.value === b[n].value
b.hasOwnProperty(name) &&
inheritableAttrs.includes(name) &&
value === b[name]
) {
c[n] = attr;
c[name] = value;
}
}