fix(stats): Move CSS classes definition to widget from component

pixelastic · pixelastic · commit 99073cd0b949 · 2015-10-20T11:40:36.000+02:00
We can now easily spot in default.css which widget are not yet
BEMified (yeah, that's a verb now).

- Moved the BEM definition to widget instead of component
- Updated the tests
- This widget is using the headerFooter decorator, I updated the docs
- The initial root class was added twice because we already used it in the default template. I removed the wrapping div in the template.

BREAKING CHANGE: `cssClasses.root` now applies to the main root
element (above header and footer) and no longer to the template
wrapper. To style the template wrapper, use `cssClasses.body`
diff --git a/README.md b/README.md
@@ -352,26 +352,22 @@ search.addWidget(
 /**
  * Display various stats about the current search state
  * @param  {String|DOMElement} options.container CSS Selector or DOMElement to insert the widget
- * @param  {Object} [options.cssClasses] CSS classes to add to the default template
+ * @param  {Object} [options.cssClasses] CSS classes to add
  * @param  {String} [options.cssClasses.root] CSS class to add to the root element
+ * @param  {String} [options.cssClasses.header] CSS class to add to the header element
+ * @param  {String} [options.cssClasses.body] CSS class to add to the body element
+ * @param  {String} [options.cssClasses.footer] CSS class to add to the footer element
  * @param  {String} [options.cssClasses.time] CSS class to add to the element wrapping the time processingTimeMs
  * @param  {Object} [options.templates] Templates to use for the widget
  * @param  {String|Function} [options.templates.header=''] Header template
- * @param  {String|Function} [options.templates.body='<div class="{{cssClasses.root}}">
-  {{#hasNoResults}}No results{{/hasNoResults}}
-  {{#hasOneResult}}1 result{{/hasOneResult}}
-  {{#hasManyResults}}{{#helpers.formatNumber}}{{nbHits}}{{/helpers.formatNumber}} results{{/hasManyResults}}
-  <span class="{{cssClasses.time}}">found in {{processingTimeMS}}ms</span>
-</div>'] Body template
+ * @param  {String|Function} [options.templates.body] Body template
  * @param  {String|Function} [options.templates.footer=''] Footer template
  * @param  {Function} [options.transformData] Function to change the object passed to the `body` template
  * @param  {boolean} [hideWhenNoResults=true] Hide the container when there's no results
  * @return {Object}
  */
 ```
 
-
-
 #### Usage
 
 ```html
@@ -389,6 +385,32 @@ search.addWidget(
 );
 ```
 
+### Styling
+
+```html
+<div class="ais-stats">
+  <div class="ais-stats--header ais-header">[custom header template]</div>
+  <div class="ais-stats--body">
+    42 results found in <span class="ais-stats--time">42ms</span>
+  </div>
+  <div class="ais-stats--footer ais-footer">[custom footer template]</div>
+</div>
+```
+
+```css
+.ais-stats {
+}
+.ais-stats--header {
+}
+.ais-stats--body {
+}
+.ais-stats--time {
+  font-size: small;
+}
+.ais-stats--footer {
+}
+```
+
 ### indexSelector
 
 ![Example of the indexSelector widget][indexSelector]
@@ -623,7 +645,7 @@ search.addWidget(
  * @param  {String} [options.operator='or'] How to apply refinements. Possible values: `or`, `and`
  * @param  {String[]} [options.sortBy=['count:desc']] How to sort refinements. Possible values: `count|isRefined|name:asc|desc`
  * @param  {String} [options.limit=1000] How much facet values to get
- * @param  {Object} [options.cssClasses] CSS classes to add to the wrapping elements: root, list, item
+ * @param  {Object} [options.cssClasses] CSS classes to add
  * @param  {String|String[]} [options.cssClasses.root] CSS class to add to the root element
  * @param  {String|String[]} [options.cssClasses.header] CSS class to add to the header element
  * @param  {String|String[]} [options.cssClasses.body] CSS class to add to the body element
diff --git a/components/Stats/Stats.js b/components/Stats/Stats.js
@@ -1,8 +1,6 @@
 var React = require('react');
 
 var Template = require('../Template');
-var bem = require('../../lib/utils').bemHelper('ais-stats');
-var cx = require('classnames');
 
 class Stats extends React.Component {
   render() {
@@ -16,10 +14,7 @@ class Stats extends React.Component {
       page: this.props.page,
       processingTimeMS: this.props.processingTimeMS,
       query: this.props.query,
-      cssClasses: {
-        root: cx(bem(null), this.props.cssClasses.root),
-        time: cx(bem('time'), this.props.cssClasses.time)
-      }
+      cssClasses: this.props.cssClasses
     };
 
     return (
@@ -29,6 +24,12 @@ class Stats extends React.Component {
 }
 
 Stats.propTypes = {
+  cssClasses: React.PropTypes.shape({
+    time: React.PropTypes.oneOfType([
+      React.PropTypes.string,
+      React.PropTypes.arrayOf(React.PropTypes.string)
+    ])
+  }),
   hitsPerPage: React.PropTypes.number,
   nbHits: React.PropTypes.number,
   nbPages: React.PropTypes.number,
diff --git a/components/Stats/__tests__/Stats-test.js b/components/Stats/__tests__/Stats-test.js
@@ -6,9 +6,6 @@ import TestUtils from 'react-addons-test-utils';
 import Stats from '../Stats';
 import Template from '../../Template';
 
-var bem = require('../../../lib/utils').bemHelper('ais-stats');
-var cx = require('classnames');
-
 describe('Stats', () => {
   var renderer;
 
@@ -21,10 +18,7 @@ describe('Stats', () => {
   it('should render <Template data= />', () => {
     var out = render();
     var defaultProps = {
-      cssClasses: {
-        root: cx(bem(null)),
-        time: cx(bem('time'))
-      },
+      cssClasses: {},
       hasManyResults: true,
       hasNoResults: false,
       hasOneResult: false
diff --git a/themes/default/default.css b/themes/default/default.css
@@ -27,9 +27,15 @@
 /* STATS */
 .ais-stats {
 }
+.ais-stats--header {
+}
+.ais-stats--body {
+}
 .ais-stats--time {
   font-size: small;
 }
+.ais-stats--footer {
+}
 
 /* INDEX SELECTOR */
 .ais-index-selector {
@@ -51,7 +57,7 @@
 }
 .ais-pagination--item-previous {
 }
-.ais-pagination--item-page {
+.ais-pagination--item-page { 
 }
 .ais-pagination--item-page__active {
 }
diff --git a/widgets/stats/__tests__/stats-test.js b/widgets/stats/__tests__/stats-test.js
@@ -51,7 +51,13 @@ describe('stats()', () => {
     expect(headerFooter.calledOnce).toBe(true, 'headerFooter called once');
     expect(ReactDOM.render.firstCall.args[0]).toEqualJSX(
     <Stats
-      cssClasses={{}}
+      cssClasses={{
+        body: 'ais-stats--body',
+        header: 'ais-stats--header',
+        footer: 'ais-stats--footer',
+        root: 'ais-stats',
+        time: 'ais-stats--time'
+      }}
       hasResults={true}
       hideWhenNoResults={true}
       hitsPerPage={2}
diff --git a/widgets/stats/defaultTemplates.js b/widgets/stats/defaultTemplates.js
@@ -1,10 +1,8 @@
 module.exports = {
   header: '',
-  body: `<div class="{{cssClasses.root}}">
-  {{#hasNoResults}}No results{{/hasNoResults}}
+  body: `{{#hasNoResults}}No results{{/hasNoResults}}
   {{#hasOneResult}}1 result{{/hasOneResult}}
   {{#hasManyResults}}{{#helpers.formatNumber}}{{nbHits}}{{/helpers.formatNumber}} results{{/hasManyResults}}
-  <span class="{{cssClasses.time}}">found in {{processingTimeMS}}ms</span>
-</div>`,
+  <span class="{{cssClasses.time}}">found in {{processingTimeMS}}ms</span>`,
   footer: ''
 };
diff --git a/widgets/stats/stats.js b/widgets/stats/stats.js
@@ -4,23 +4,23 @@ var ReactDOM = require('react-dom');
 var utils = require('../../lib/utils.js');
 var autoHide = require('../../decorators/autoHide');
 var headerFooter = require('../../decorators/headerFooter');
+var bem = require('../../lib/utils').bemHelper('ais-stats');
+var cx = require('classnames/dedupe');
 
 var defaultTemplates = require('./defaultTemplates.js');
 
 /**
  * Display various stats about the current search state
  * @param  {String|DOMElement} options.container CSS Selector or DOMElement to insert the widget
- * @param  {Object} [options.cssClasses] CSS classes to add to the default template
+ * @param  {Object} [options.cssClasses] CSS classes to add
  * @param  {String} [options.cssClasses.root] CSS class to add to the root element
+ * @param  {String} [options.cssClasses.header] CSS class to add to the header element
+ * @param  {String} [options.cssClasses.body] CSS class to add to the body element
+ * @param  {String} [options.cssClasses.footer] CSS class to add to the footer element
  * @param  {String} [options.cssClasses.time] CSS class to add to the element wrapping the time processingTimeMs
  * @param  {Object} [options.templates] Templates to use for the widget
  * @param  {String|Function} [options.templates.header=''] Header template
- * @param  {String|Function} [options.templates.body='<div class="{{cssClasses.root}}">
-  {{#hasNoResults}}No results{{/hasNoResults}}
-  {{#hasOneResult}}1 result{{/hasOneResult}}
-  {{#hasManyResults}}{{#helpers.formatNumber}}{{nbHits}}{{/helpers.formatNumber}} results{{/hasManyResults}}
-  <span class="{{cssClasses.time}}">found in {{processingTimeMS}}ms</span>
-</div>'] Body template
+ * @param  {String|Function} [options.templates.body] Body template
  * @param  {String|Function} [options.templates.footer=''] Footer template
  * @param  {Function} [options.transformData] Function to change the object passed to the `body` template
  * @param  {boolean} [hideWhenNoResults=true] Hide the container when there's no results
@@ -49,6 +49,15 @@ function stats({
       });
 
       var Stats = autoHide(headerFooter(require('../../components/Stats/Stats.js')));
+
+      cssClasses = {
+        body: cx(bem('body'), cssClasses.body),
+        footer: cx(bem('footer'), cssClasses.footer),
+        header: cx(bem('header'), cssClasses.header),
+        root: cx(bem(null), cssClasses.root),
+        time: cx(bem('time'), cssClasses.time)
+      };
+
       ReactDOM.render(
         <Stats
           cssClasses={cssClasses}

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,15 @@`
`27`	`27`	`/* STATS */`
`28`	`28`	`.ais-stats {`
`29`	`29`	`}`
	`30`	`+.ais-stats--header {`
	`31`	`+}`
	`32`	`+.ais-stats--body {`
	`33`	`+}`
`30`	`34`	`.ais-stats--time {`
`31`	`35`	`font-size: small;`
`32`	`36`	`}`
	`37`	`+.ais-stats--footer {`
	`38`	`+}`
`33`	`39`
`34`	`40`	`/* INDEX SELECTOR */`
`35`	`41`	`.ais-index-selector {`
`@@ -51,7 +57,7 @@`
`51`	`57`	`}`
`52`	`58`	`.ais-pagination--item-previous {`
`53`	`59`	`}`
`54`		`-.ais-pagination--item-page {`
	`60`	`+.ais-pagination--item-page {`
`55`	`61`	`}`
`56`	`62`	`.ais-pagination--item-page__active {`
`57`	`63`	`}`