revert(icons): handle country flag colors

adevinta · Jul 13, 2023 · 93e45ff · 93e45ff
1 parent 22b1f0c
commit 93e45ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 18 deletions.
diff --git a/packages/components/icons/scripts/build.mjs b/packages/components/icons/scripts/build.mjs
@@ -23,16 +23,11 @@ const main = async (pattern = 'assets/**/*.svg') => {
 
       const relativeDir = path.relative('assets', dir)
 
-      // Handle flags differently
-      const isCountryFlag = /^Flag[A-Z]{2}$/.test(name)
-      const svgFill = isCountryFlag ? 'none' : 'currentColor'
-
       const tsxIconCode = componentize({
         componentName: pascalCase(name),
         node: optimize(svgData, {
-          attributes: [{ fill: svgFill }, { stroke: 'none' }],
+          attributes: [{ fill: 'currentColor' }, { stroke: 'none' }],
           title: name,
-          isCountryFlag,
         }).trim(),
         name,
         tags: relativeDir.split('/'),

diff --git a/packages/components/icons/scripts/utils/optimize.mjs b/packages/components/icons/scripts/utils/optimize.mjs
@@ -1,24 +1,19 @@
 import { optimize as optimizeSVGO } from 'svgo'
 
-const optimize = (svgString, { attributes = [], title, isCountryFlag = false } = {}) => {
+const optimize = (svgString, { attributes = [], title } = {}) => {
   return optimizeSVGO(svgString, {
     multipass: true, // boolean. false by default
     js2svg: {
       indent: 2, // string with spaces or number of spaces. 4 by default
       pretty: true, // boolean, false by default
     },
     plugins: [
-      // Exclude removeAttrs plugin for country flags
-      ...(isCountryFlag
-        ? []
-        : [
-            {
-              name: 'removeAttrs',
-              params: {
-                attrs: '(fill|stroke|stroke-width)',
-              },
-            },
-          ]),
+      {
+        name: 'removeAttrs',
+        params: {
+          attrs: '(fill|stroke)',
+        },
+      },
       {
         name: 'addAttributesToSVGElement',
         params: {