Merge pull request #22 from hnrchrdl/bug/usedselectors

fix: consider media query when filtering used selectors
theKashey · Jun 7, 2020 · 925e932 · 925e932
2 parents 7136138 + 5c4d37b
commit 925e932
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ node_modules/
 /dist/
 coverage
 .DS_Store
-.nyc_output
+.nyc_output
+.yalc
diff --git 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);
 };