From 5c4d37bfc304c85cce0f92a5d92b07f786996559 Mon Sep 17 00:00:00 2001 From: Hinrich Riedel Date: Sun, 7 Jun 2020 19:24:32 +0200 Subject: [PATCH] fix: consider media query when filtering used selectors --- .gitignore | 3 ++- src/parser/fromAst.ts | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e18ddf5..f14d1b1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ node_modules/ /dist/ coverage .DS_Store -.nyc_output \ No newline at end of file +.nyc_output +.yalc diff --git a/src/parser/fromAst.ts b/src/parser/fromAst.ts index 5de5b56..a08a8d0 100644 --- a/src/parser/fromAst.ts +++ b/src/parser/fromAst.ts @@ -44,8 +44,11 @@ const findUnmatchableSelectors = (selectors: StyleSelector[]): StyleSelector[] = export const fromAst = (rules: string[], def: SingleStyleAst, filter?: (selector: string) => boolean) => { const blocks: StyleSelector[] = []; const lookup: SelectorLookUp = new Set(rules); - - blocks.push(...findMatchingSelectors(lookup, def.selectors).filter(block => !filter || filter(block.selector))); + blocks.push( + ...findMatchingSelectors(lookup, def.selectors).filter( + block => !filter || filter(`${block.selector}${block.media.join('')}`) + ) + ); return convertToString(blocks, def); };