Merge pull request #278 from mattkrick/addCSS

add multi-line support for addCSS
robinweser · May 2, 2016 · ab9d9aa · ab9d9aa
2 parents 6350655 + e36febf
commit ab9d9aa
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/packages/react-look/modules/api/StyleContainer.js b/packages/react-look/modules/api/StyleContainer.js
@@ -63,7 +63,7 @@ class StyleContainer {
    * @param {string} styles - as css string
    */
   addStatic(styles) {
-    this._addAndEmit(this.statics, styles)
+    this._addAndEmit(this.statics, styles.replace(/\s+/g, ''))
   }
 
   /**

diff --git a/packages/react-look/test/api/StyleContainer-test.js b/packages/react-look/test/api/StyleContainer-test.js
@@ -25,7 +25,22 @@ describe('Adding a static css string', () => {
   it('should add it to the statics set', () => {
     const css = '.h1 { color: red }'
     StyleContainer.addStatic(css)
-    expect(StyleContainer.statics.has(css)).to.eql(true)
+    expect(StyleContainer.statics.has('.h1{color:red}')).to.eql(true)
+  })
+})
+
+describe('Adding a static css string with spaces and comments', () => {
+  it('should add it to the statics set', () => {
+    const css = `
+    /*!
+     *  Banner
+     */
+    .h1 { 
+      color: red;
+      margin: 10px 10px 10px 10px;
+    }`
+    StyleContainer.addStatic(css)
+    expect(StyleContainer.statics.has(css.replace(/\s+/g, ''))).to.eql(true)
   })
 })
 

diff --git a/packages/react-look/test/api/StyleSheet-test.js b/packages/react-look/test/api/StyleSheet-test.js
@@ -50,13 +50,13 @@ describe('Generating global CSS', () => {
   it('should treat strings as static css', () => {
     const css = 'h1 { color: blue }'
     StyleSheet.addCSS(css)
-    expect(StyleContainer.statics.has(css)).to.eql(true)
+    expect(StyleContainer.statics.has('h1{color:blue}')).to.eql(true)
   })
 
   it('toCSS should just call addCSS', () => {
     const css = 'h1 { color: blue }'
     StyleSheet.toCSS(css)
-    expect(StyleContainer.statics.has(css)).to.eql(true)
+    expect(StyleContainer.statics.has('h1{color:blue}')).to.eql(true)
   })
 })