Don't collapse a group with element when both have classes.

Fixes svg#572 (comment)
ceoworks · Aug 24, 2016 · 6e9854a · 6e9854a
1 parent 44d6958
commit 6e9854a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/plugins/collapseGroups.js b/plugins/collapseGroups.js
@@ -51,16 +51,18 @@ exports.fn = function(item) {
                 if (g.hasAttr() && g.content.length === 1) {
                     var inner = g.content[0];
 
-                    if (inner.isElem() && !inner.hasAttr('id') && (
-                        !g.hasAttr('clip-path') && !g.hasAttr('mask') ||
-                        inner.isElem('g') && !g.hasAttr('transform') && !inner.hasAttr('transform')
-                    )) {
+                    if (inner.isElem() && !inner.hasAttr('id') &&
+                        !(g.hasAttr('class') && inner.hasAttr('class')) && (
+                            !g.hasAttr('clip-path') && !g.hasAttr('mask') ||
+                            inner.isElem('g') && !g.hasAttr('transform') && !inner.hasAttr('transform')
+                        )
+                    ) {
                         g.eachAttr(function(attr) {
                             if (g.content.some(hasAnimatedAttr, attr.name)) return;
 
                             if (!inner.hasAttr(attr.name)) {
                                 inner.addAttr(attr);
-                            } else if (attr.name == 'transform' || attr.name == 'class') {
+                            } else if (attr.name == 'transform') {
                                 inner.attr(attr.name).value = attr.value + ' ' + inner.attr(attr.name).value;
                             }
                             g.removeAttr(attr.name);

diff --git a/test/plugins/collapseGroups.12.svg b/test/plugins/collapseGroups.12.svg