Fix collapseGroups plugin affecting switch and subgroups

Fix #1020
svg · Sep 16, 2018 · 7a07b84 · 7a07b84
1 parent 5800635
commit 7a07b84
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/plugins/collapseGroups.js b/plugins/collapseGroups.js
@@ -42,7 +42,7 @@ function hasAnimatedAttr(item) {
 exports.fn = function(item) {
 
     // non-empty elements
-    if (item.isElem() && (!item.isElem('switch') || isFeaturedSwitch(item)) && !item.isEmpty()) {
+    if (item.isElem() && !item.isElem('switch') && !item.isEmpty()) {
         item.content.forEach(function(g, i) {
             // non-empty groups
             if (g.isElem('g') && !g.isEmpty()) {
@@ -81,15 +81,7 @@ exports.fn = function(item) {
                 if (!g.hasAttr() && !g.content.some(function(item) { return item.isElem(animationElems) })) {
                     item.spliceContent(i, 1, g.content);
                 }
-            } else if (isFeaturedSwitch(g)) {
-                item.spliceContent(i, 1, g.content);
             }
         });
     }
 };
-
-function isFeaturedSwitch(elem) {
-    return elem.isElem('switch') && !elem.isEmpty() && !elem.content.some(child =>
-        child.hasAttr('systemLanguage') || child.hasAttr('requiredFeatures') || child.hasAttr('requiredExtensions')
-    );
-}
diff --git a/test/plugins/collapseGroups.14.svg b/test/plugins/collapseGroups.14.svg