[Fix] Fix crash when svg has a style tag in the root element; pass pa…

…th to SVGO
airbnb · Sep 2, 2022 · a4c1c4c · a4c1c4c
1 parent 6e130a5
commit a4c1c4c
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/index.js b/src/index.js
@@ -75,7 +75,7 @@ export default declare(({
       const rawSource = readFileSync(svgPath, 'utf8');
       const optimizedSource = state.opts.svgo === false
         ? { data: rawSource }
-        : optimize(rawSource, state.opts.svgo);
+        : optimize(rawSource, { ...state.opts.svgo, path: svgPath });
 
       const escapeSvgSource = escapeBraces(optimizedSource);
 
@@ -103,6 +103,9 @@ export default declare(({
         svgCode.openingElement.attributes.forEach((prop) => {
           if (prop.type === 'JSXSpreadAttribute') {
             keepProps.push(prop);
+          } else if (prop.value.type === 'JSXExpressionContainer') {
+            const objectExpression = t.objectExpression(prop.value.expression.properties);
+            defaultProps.push(t.objectProperty(t.identifier(prop.name.name), objectExpression));
           } else {
             defaultProps.push(t.objectProperty(t.identifier(prop.name.name), prop.value));
           }

diff --git a/test/fixtures/root-styled.svg b/test/fixtures/root-styled.svg
diff --git a/test/fixtures/test-root-styled.jsx b/test/fixtures/test-root-styled.jsx
@@ -0,0 +1,11 @@
+import SVG from './root-styled.svg';
+
+export function MyFunctionIcon() {
+  return <SVG />;
+}
+
+export class MyClassIcon extends React.Component {
+  render() {
+    return <SVG />;
+  }
+}
diff --git a/test/sanity.js b/test/sanity.js
@@ -195,6 +195,16 @@ transformFile('test/fixtures/test-export-all-as.jsx', {
   console.log('test/fixtures/test-export-all-as.jsx', result.code);
 });
 
+transformFile('test/fixtures/test-root-styled.jsx', {
+  presets: ['airbnb'],
+  plugins: [
+    inlineReactSvgPlugin,
+  ],
+}, (err, result) => {
+  if (err) throw err;
+  console.log('test/fixtures/test-root-styled.jsx', result.code);
+});
+
 transformFile('test/fixtures/test-commented.jsx', {
   presets: ['airbnb'],
   plugins: [