feat: The fontSize config support boolean settings. (#210)

jaywcjlove · Aug 9, 2023 · 4ac523e · 4ac523e
1 parent d399a7f
commit 4ac523e
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   },
   "svgtofont": {
     "css": {
-      "fontSize": "12px"
+      "fontSize": false
     }
   },
   "keywords": [

diff --git a/src/generate.ts b/src/generate.ts
@@ -44,7 +44,7 @@ async function buildPathsObject(files: string[], options: SvgToFontOptions = {})
 
 const reactSource = (name: string, size: string, fontName: string, source: string) => `import React from 'react';
 export const ${name} = props => (
-  <svg viewBox="0 0 20 20" width="${size}" height="${size}" {...props} className={\`${fontName} \${props.className ? props.className : ''}\`}>${source}</svg>
+  <svg viewBox="0 0 20 20" ${size ? `width="${size}" height="${size}"` : ''} {...props} className={\`${fontName} \${props.className ? props.className : ''}\`}>${source}</svg>
 );
 `;
 
@@ -66,8 +66,9 @@ export async function generateReactIcons(options: SvgToFontOptions = {}) {
 }
 
 async function outputReactFile(files: string[], options: SvgToFontOptions = {}) {
-  const svgoOptions = options.svgoOptions || {}
-  const fontSize = options.css && typeof options.css !== 'boolean' && options.css.fontSize ? options.css.fontSize : '16px';
+  const svgoOptions = options.svgoOptions || {};
+  const fontSizeOpt = typeof options.css !== 'boolean' && options.css.fontSize
+  const fontSize = typeof fontSizeOpt === 'boolean' ? (fontSizeOpt === true ? '16px' : '') : fontSizeOpt;
   const fontName = options.classNamePrefix || options.fontName
   return Promise.all(
     files.map(async filepath => {

diff --git a/src/index.ts b/src/index.ts
@@ -237,7 +237,9 @@ export default async (options: SvgToFontOptions = {}) => {
   options.svgicons2svgfont.fontName = options.fontName;
   options.classNamePrefix = options.classNamePrefix || options.fontName;
 
-  const fontSize = options.css && typeof options.css !== 'boolean' && options.css.fontSize ? options.css.fontSize : '16px';
+  const fontSizeOpt = typeof options.css !== 'boolean' && options.css.fontSize;
+  const fontSize = typeof fontSizeOpt === 'boolean' ? (fontSizeOpt === true ? 'font-size: 16px;' : '') : `font-size: ${fontSizeOpt};`;
+  console.log('options:fontSize:', fontSize)
   // If you generate a font you need to generate a style.
   if (options.website && !options.css) options.css = true;
 

diff --git a/src/ligature-styles/_{{filename}}.css b/src/ligature-styles/_{{filename}}.css
@@ -9,8 +9,7 @@
 }
 
 .{{prefix}} {
-  font-family: '{{fontname}}' !important;
-  font-size:{{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/ligature-styles/_{{filename}}.less b/src/ligature-styles/_{{filename}}.less
@@ -8,8 +8,7 @@
 }
 
 .{{prefix}} {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/ligature-styles/_{{filename}}.module.less b/src/ligature-styles/_{{filename}}.module.less
@@ -8,8 +8,7 @@
 }
 
 .{{prefix}} {
-  font-family: '{{fontname}}' !important;
-  font-size:{{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/ligature-styles/_{{filename}}.scss b/src/ligature-styles/_{{filename}}.scss
@@ -8,8 +8,7 @@
 }
 
 .{{prefix}} {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/ligature-styles/_{{filename}}.styl b/src/ligature-styles/_{{filename}}.styl
@@ -8,8 +8,7 @@
 }
 
 .{{prefix}} {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/styles/_{{filename}}.css b/src/styles/_{{filename}}.css
@@ -9,8 +9,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size:{{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/styles/_{{filename}}.less b/src/styles/_{{filename}}.less
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/styles/_{{filename}}.module.less b/src/styles/_{{filename}}.module.less
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size:{{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/styles/_{{filename}}.scss b/src/styles/_{{filename}}.scss
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/styles/_{{filename}}.styl b/src/styles/_{{filename}}.styl
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/src/utils.ts b/src/utils.ts
@@ -267,7 +267,7 @@ export type CSSOptions = {
   /**
    * Setting font size.
    */
-  fontSize?: string;
+  fontSize?: string | boolean;
   /**
    * Set the path in the css file
    * https://github.com/jaywcjlove/svgtofont/issues/48#issuecomment-739547189

diff --git a/test/templates/styles/_{{filename}}.css.template b/test/templates/styles/_{{filename}}.css.template
@@ -10,8 +10,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size:{{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/test/templates/styles/_{{filename}}.less.template b/test/templates/styles/_{{filename}}.less.template
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/test/templates/styles/_{{filename}}.module.less.template b/test/templates/styles/_{{filename}}.module.less.template
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size:{{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/test/templates/styles/_{{filename}}.scss.template b/test/templates/styles/_{{filename}}.scss.template
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;

diff --git a/test/templates/styles/_{{filename}}.styl.template b/test/templates/styles/_{{filename}}.styl.template
@@ -8,8 +8,7 @@
 }
 
 [class^="{{prefix}}-"], [class*=" {{prefix}}-"] {
-  font-family: '{{fontname}}' !important;
-  font-size: {{fontSize}};
+  font-family: '{{fontname}}' !important;{{fontSize}}
   font-style:normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;