fix CamelCase issue

hallee9000 · Nov 7, 2019 · 67ae557 · 67ae557
1 parent c8a580f
commit 67ae557
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bin/build.js b/bin/build.js
@@ -44,10 +44,11 @@ const generateIndex = () => {
 }
 
 // generate attributes code
-const attrsToString = (attrs) => {
+const attrsToString = (attrs, style) => {
+  console.log(style)
   return Object.keys(attrs).map((key) => {
     // should distinguish fill or stroke
-    if (key === 'width' || key === 'height' || key === 'fill' || key === 'stroke') {
+    if (key === 'width' || key === 'height' || key === style) {
       return key + '={' + attrs[key] + '}';
     }
     if (key === 'otherProps') {
@@ -66,7 +67,7 @@ const generateIconCode = async ({name}) => {
   const code = fs.readFileSync(location)
   const svgCode = await processSvg(code)
   const ComponentName = names.componentName
-  const element = getElementCode(ComponentName, attrsToString(getAttrs(names.style)), svgCode)
+  const element = getElementCode(ComponentName, attrsToString(getAttrs(names.style), names.style), svgCode)
   const component = format({
     text: element,
     eslintConfig: {

diff --git a/bin/processSvg.js b/bin/processSvg.js
@@ -50,8 +50,8 @@ async function processSvg(svg) {
     // remove semicolon inserted by prettier
     // because prettier thinks it's formatting JSX not HTML
     .then(svg => svg.replace(/;/g, ''))
-    .then(svg => svg.replace(/([a-z]+)-([a-z]+)=/g, (_, a, b) => `${a}${CamelCase(b)}=`))
     .then(removeSVGElement)
+    .then(svg => svg.replace(/([a-z]+)-([a-z]+)=/g, (_, a, b) => `${a}${CamelCase(b)}=`))
   return optimized;
 }
 

diff --git a/bin/template.js b/bin/template.js
@@ -10,6 +10,7 @@ const getAttrs = (style) => {
     otherProps: '...otherProps'
   }
   const strokeAttrs = {
+    fill: 'none',
     stroke: 'color',
     strokeWidth: 2,
     strokeLinecap: 'round',