Fix postcss#1196

fanich37 · Oct 7, 2019 · 622e8a3 · 622e8a3
1 parent 3795794
commit 622e8a3
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 11 deletions.
diff --git a/lib/selector.js b/lib/selector.js
@@ -3,10 +3,16 @@ let Prefixer = require('./prefixer')
 let Browsers = require('./browsers')
 let utils = require('./utils')
 
+const SELECTORS_CACHE = {}
+
 class Selector extends Prefixer {
   constructor (name, prefixes, all) {
     super(name, prefixes, all)
     this.regexpCache = {}
+    SELECTORS_CACHE[name] = {
+      possible: this.possible(),
+      replace: this.replace.bind(this)
+    }
   }
 
   /**
@@ -57,8 +63,29 @@ class Selector extends Prefixer {
     }
 
     let prefixeds = {}
-    for (let prefix of this.possible()) {
-      prefixeds[prefix] = this.replace(rule.selector, prefix)
+
+    if (rule.selector.includes(',')) {
+      let toProcess = rule.selector
+        .split(',')
+        .filter(el => el.includes(':'))
+        .map(el => el.trim())
+
+      Object.keys(SELECTORS_CACHE).forEach(name => {
+        let selector = toProcess.find(el => el.includes(name))
+        if (selector) {
+          prefixeds[name] = {}
+          SELECTORS_CACHE[name].possible.forEach(prefix => {
+            prefixeds[name][prefix] = SELECTORS_CACHE[name].replace(
+              selector, prefix)
+          })
+        }
+      })
+    } else {
+      prefixeds[this.name] = {}
+
+      for (let prefix of this.possible()) {
+        prefixeds[this.name][prefix] = this.replace(rule.selector, prefix)
+      }
     }
 
     rule._autoprefixerPrefixeds = prefixeds
@@ -79,8 +106,8 @@ class Selector extends Prefixer {
       }
 
       let some = false
-      for (let key in prefixeds) {
-        let prefixed = prefixeds[key]
+      for (let key in prefixeds[this.name]) {
+        let prefixed = prefixeds[this.name][key]
         if (before.selector === prefixed) {
           if (prefix === key) {
             return true
@@ -117,7 +144,7 @@ class Selector extends Prefixer {
       return
     }
 
-    let cloned = this.clone(rule, { selector: prefixeds[prefix] })
+    let cloned = this.clone(rule, { selector: prefixeds[this.name][prefix] })
     rule.parent.insertBefore(rule, cloned)
   }
 

diff --git a/test/selector.test.js b/test/selector.test.js
@@ -28,7 +28,7 @@ describe('regexp()', () => {
 })
 
 describe('check()', () => {
-  it('shecks rule selectors', () => {
+  it('checks rule selectors', () => {
     let css = parse('body .selection {}, ' +
             ':::selection {}, body ::selection {}')
     expect(selector.check(css.nodes[0])).toBeFalsy()
@@ -38,13 +38,15 @@ describe('check()', () => {
 })
 
 describe('prefixeds()', () => {
-  it('returns all avaiable prefixed selectors', () => {
+  it('returns all available prefixed selectors', () => {
     let css = parse('::selection {}')
     expect(selector.prefixeds(css.first)).toEqual({
-      '-webkit-': '::-webkit-selection',
-      '-moz-': '::-moz-selection',
-      '-ms-': '::-ms-selection',
-      '-o-': '::-o-selection'
+      '::selection': {
+        '-webkit-': '::-webkit-selection',
+        '-moz-': '::-moz-selection',
+        '-ms-': '::-ms-selection',
+        '-o-': '::-o-selection'
+      }
     })
   })
 })