Fix inlineStyles working on foreignObject content. Fixes #823

svg · Nov 3, 2017 · ceccf1f · strarsis · Nov 3, 2017 · ceccf1f
1 parent f03d832
commit ceccf1f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/lib/svgo/jsAPI.js b/lib/svgo/jsAPI.js
@@ -95,6 +95,20 @@ JSAPI.prototype.renameElem = function(name) {
 
 };
 
+/**
+ * Find the closest ancestor of the current element.
+ * @param elemName
+ *
+ * @return {?Object}
+ */
+ JSAPI.prototype.closestElem = function(elemName) {
+    var elem = this;
+
+    while ((elem = elem.parentNode) && !elem.isElem(elemName));
+
+    return elem;
+};
+
 /**
  * Changes content by removing elements and/or adding new elements.
  *

diff --git a/plugins/inlineStyles.js b/plugins/inlineStyles.js
@@ -55,10 +55,11 @@ exports.fn = function(document, opts) {
         selectors = [];
 
     for (var styleEl of styleEls) {
-        if (styleEl.isEmpty()) {
-            // skip empty <style/>s
+        if (styleEl.isEmpty() || styleEl.closestElem('foreignObject')) {
+            // skip empty <style/>s or <foreignObject> content.
             continue;
         }
+
         var cssStr = cssTools.getCssStr(styleEl);
 
         // collect <style/>s and their css ast

diff --git a/test/plugins/inlineStyles.17.svg b/test/plugins/inlineStyles.17.svg