agerix/iconify
2
0
Fork 0
mirror of https://github.com/iconify/iconify.git synced 2025-01-22 14:48:24 +00:00
Code Issues Releases Activity

fix(utils): in generated css merge identical selectors

Browse Source
This commit is contained in:
Vjacheslav Trushkin 2023-01-06 21:01:51 +02:00
parent bba91bc538
commit a742cf1d94
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/utils/src/css/icons.ts
View File

@ -120,11 +120,21 @@ export function getIconsCSS(
const selector = Array.from(commonSelectors).join( const selector = Array.from(commonSelectors).join(
newOptions.format === 'compressed' ? ',' : ', ' newOptions.format === 'compressed' ? ',' : ', '
); );
// Check for same selector
if (css.length === 1 && css[0].selector === selector) {
css[0].rules = {
// Common first, override later
...commonRules,
...css[0].rules,
};
} else {
css.unshift({ css.unshift({
selector, selector,
rules: commonRules, rules: commonRules,
}); });
} }
}
// Format // Format
return ( return (

6
packages/utils/tests/icons-to-css-test.ts
View File

@ -320,17 +320,13 @@ describe('Testing CSS for multiple icons', () => {
}) })
).toBe(`.test--activity { ).toBe(`.test--activity {
display: inline-block; display: inline-block;
width: 1em; width: 1.5em;
height: 1em; height: 1em;
background-color: currentColor; background-color: currentColor;
-webkit-mask: no-repeat center / 100%; -webkit-mask: no-repeat center / 100%;
mask: no-repeat center / 100%; mask: no-repeat center / 100%;
-webkit-mask-image: var(--svg); -webkit-mask-image: var(--svg);
mask-image: var(--svg); mask-image: var(--svg);
}
.test--activity {
width: 1.5em;
--svg: ${expectedURL('activity')}; --svg: ${expectedURL('activity')};
} }
`); `);