fixup! Feat(icons): Do not remove colors from icons with -colored s…

…uffix #DS-990
lmc-eu · Nov 9, 2023 · 115a48f · 115a48f
1 parent 680350f
commit 115a48f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/packages/icons/README.md b/packages/icons/README.md
@@ -20,6 +20,12 @@ or
 npm install --save @lmc-eu/spirit-icons
 ```
 
+## Colors
+
+Icons with the suffix `-colored` come with predefined colors, so no additional coloring is needed.
+In contrast, icons without this suffix inherit the color from the `currentColor` CSS property of their parent element
+or themself.
+
 ## Usage
 
 ### SVG files

diff --git a/packages/icons/scripts/buildSvg.js b/packages/icons/scripts/buildSvg.js
@@ -5,6 +5,8 @@ const { filterSvgFiles } = require('./shared');
 const svgSrcDir = path.resolve(__dirname, `../src/svg`);
 const svgDistDir = path.resolve(__dirname, `../dist/svg`);
 
+const normalizeSvgColors = (svg, svgContent) => svg.endsWith('-colored.svg') ? svgContent : svgContent.replace(/fill="#\w+"/g, 'fill="currentColor"');
+
 const normalizeAndCopySvg = (srcDir, distDir) => {
   fs.readdir(srcDir, (err, files) => {
     const svgs = filterSvgFiles(files);
@@ -17,7 +19,7 @@ const normalizeAndCopySvg = (srcDir, distDir) => {
         const svgPath = path.join(srcDir, svg);
         const svgDistPath = path.join(distDir, svg);
         const svgContent = fs.readFileSync(svgPath, 'utf8');
-        const svgContentFixed = svg.endsWith('-colored.svg') ? svgContent : svgContent.replace(/fill="#\w+"/g, 'fill="currentColor"');
+        const svgContentFixed = normalizeSvgColors(svg, svgContent);
         const svgSpriteContent = svgContentFixed
           .replace(/<svg.*(viewBox="(\d+\s){3}\d+").*>/, `<symbol id="${svg.slice(0, -4)}" $1>`)
           .replace(/<\/svg>/g, '</symbol>');