feat(emSize): add support for missing width/height

gregberge · Jan 21, 2018 · 2eacfd8 · 2eacfd8
1 parent 492e79d
commit 2eacfd8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/src/cli/__snapshots__/index.test.js.snap b/src/cli/__snapshots__/index.test.js.snap
@@ -4,7 +4,7 @@ exports[`cli --icon 1`] = `
 "import React from \\"react\\";
 
 const One = props => (
-  <svg width=\\"1em\\" height=\\"1em\\" viewBox=\\"0 0 48 1\\" {...props}>
+  <svg viewBox=\\"0 0 48 1\\" width=\\"1em\\" height=\\"1em\\" {...props}>
     <path d=\\"M0 0h48v1H0z\\" fill=\\"#063855\\" fillRule=\\"evenodd\\" />
   </svg>
 );

diff --git a/src/h2x/emSize.js b/src/h2x/emSize.js
@@ -1,13 +1,23 @@
+import { JSXAttribute } from 'h2x-plugin-jsx'
+
+const makeSizeAttr = name => {
+  const attr = new JSXAttribute()
+  attr.name = name
+  attr.value = '1em'
+  attr.litteral = false
+  return attr
+}
+
 const emSize = () => ({
   visitor: {
-    JSXAttribute: {
+    JSXElement: {
       enter(path) {
-        if (
-          path.parent.name === 'svg' &&
-          (path.node.name === 'width' || path.node.name === 'height')
-        ) {
-          path.node.value = '1em'
-          path.node.litteral = false
+        if (path.node.name === 'svg' && !path.node.attributes.some(attr => attr && attr.name === 'width' && attr.value === '1em') && !path.node.attributes.some(attr => attr && attr.name === 'height' && attr.value === '1em')) {
+          const nextAttrs = path.node.attributes.filter(attr => attr.name !== 'width' && attr.name !== 'height');
+          nextAttrs.push(makeSizeAttr('width'));
+          nextAttrs.push(makeSizeAttr('height'));
+          path.node.attributes = nextAttrs;
+          path.replace(path.node);
         }
       },
     },