fix(cssClasses): Fixed duplication of classNames

As a consequence, replaced now useless `require('classnames/dedupe`) with `require('classnames')`. Closes #388
algolia · Nov 2, 2015 · e193f45 · e193f45
1 parent 84dca16
commit e193f45
Show file tree

Hide file tree

Showing 10 changed files with 90 additions and 90 deletions.
diff --git a/decorators/headerFooter.js b/decorators/headerFooter.js
@@ -3,7 +3,7 @@
 
 var React = require('react');
 
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 
 var Template = require('../components/Template');
 

diff --git a/widgets/hierarchical-menu/hierarchical-menu.js b/widgets/hierarchical-menu/hierarchical-menu.js
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
 
 var utils = require('../../lib/utils.js');
 var bem = utils.bemHelper('ais-hierarchical-menu');
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 var autoHideContainer = require('../../decorators/autoHideContainer');
 var headerFooter = require('../../decorators/headerFooter');
 
@@ -40,7 +40,7 @@ function hierarchicalMenu({
     separator,
     limit = 100,
     sortBy = ['name:asc'],
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     hideContainerWhenNoResults = true,
     templates = defaultTemplates,
     transformData
@@ -81,17 +81,17 @@ function hierarchicalMenu({
         templates
       });
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        header: cx(bem('header'), cssClasses.header),
-        body: cx(bem('body'), cssClasses.body),
-        footer: cx(bem('footer'), cssClasses.footer),
-        list: cx(bem('list'), cssClasses.list),
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        header: cx(bem('header'), userCssClasses.header),
+        body: cx(bem('body'), userCssClasses.body),
+        footer: cx(bem('footer'), userCssClasses.footer),
+        list: cx(bem('list'), userCssClasses.list),
         depth: bem('list', 'lvl'),
-        item: cx(bem('item'), cssClasses.item),
-        active: cx(bem('item', 'active'), cssClasses.active),
-        link: cx(bem('link'), cssClasses.link),
-        count: cx(bem('count'), cssClasses.count)
+        item: cx(bem('item'), userCssClasses.item),
+        active: cx(bem('item', 'active'), userCssClasses.active),
+        link: cx(bem('link'), userCssClasses.link),
+        count: cx(bem('count'), userCssClasses.count)
       };
 
       ReactDOM.render(

diff --git a/widgets/hits-per-page-selector/hits-per-page-selector.js b/widgets/hits-per-page-selector/hits-per-page-selector.js
@@ -23,7 +23,7 @@ var autoHideContainer = require('../../decorators/autoHideContainer');
 function hitsPerPageSelector({
     container,
     options,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     hideContainerWhenNoResults = false
   }) {
   var containerNode = utils.getContainerNode(container);
@@ -58,9 +58,9 @@ function hitsPerPageSelector({
       let hasNoResults = results.nbHits === 0;
       let setHitsPerPage = this.setHitsPerPage.bind(this, helper);
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        item: cx(bem('item'), cssClasses.item)
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        item: cx(bem('item'), userCssClasses.item)
       };
       ReactDOM.render(
         <Selector

diff --git a/widgets/hits/hits.js b/widgets/hits/hits.js
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
 
 var utils = require('../../lib/utils.js');
 var bem = utils.bemHelper('ais-hits');
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 
 var Hits = require('../../components/Hits');
 var defaultTemplates = require('./defaultTemplates');
@@ -26,7 +26,7 @@ var defaultTemplates = require('./defaultTemplates');
  */
 function hits({
     container,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     templates = defaultTemplates,
     transformData,
     hitsPerPage = 20
@@ -38,10 +38,10 @@ function hits({
     throw new Error(usage);
   }
 
-  cssClasses = {
-    root: cx(bem(null), cssClasses.root),
-    item: cx(bem('item'), cssClasses.item),
-    empty: cx(bem(null, 'empty'), cssClasses.empty)
+  var cssClasses = {
+    root: cx(bem(null), userCssClasses.root),
+    item: cx(bem('item'), userCssClasses.item),
+    empty: cx(bem(null, 'empty'), userCssClasses.empty)
   };
 
   return {

diff --git a/widgets/index-selector/index-selector.js b/widgets/index-selector/index-selector.js
@@ -23,7 +23,7 @@ var autoHideContainer = require('../../decorators/autoHideContainer');
 function indexSelector({
     container,
     indices,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     hideContainerWhenNoResults = false
   }) {
   var containerNode = utils.getContainerNode(container);
@@ -61,9 +61,9 @@ function indexSelector({
       let hasNoResults = results.nbHits === 0;
       let setIndex = this.setIndex.bind(this, helper);
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        item: cx(bem('item'), cssClasses.item)
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        item: cx(bem('item'), userCssClasses.item)
       };
       ReactDOM.render(
         <Selector

diff --git a/widgets/menu/menu.js b/widgets/menu/menu.js
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
 
 var utils = require('../../lib/utils.js');
 var bem = utils.bemHelper('ais-menu');
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 var autoHideContainer = require('../../decorators/autoHideContainer');
 var headerFooter = require('../../decorators/headerFooter');
 
@@ -38,7 +38,7 @@ function menu({
     facetName,
     sortBy = ['count:desc'],
     limit = 100,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     templates = defaultTemplates,
     transformData,
     hideContainerWhenNoResults = true
@@ -77,16 +77,16 @@ function menu({
         templates
       });
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        header: cx(bem('header'), cssClasses.header),
-        body: cx(bem('body'), cssClasses.body),
-        footer: cx(bem('footer'), cssClasses.footer),
-        list: cx(bem('list'), cssClasses.list),
-        item: cx(bem('item'), cssClasses.item),
-        active: cx(bem('item', 'active'), cssClasses.active),
-        link: cx(bem('link'), cssClasses.link),
-        count: cx(bem('count'), cssClasses.count)
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        header: cx(bem('header'), userCssClasses.header),
+        body: cx(bem('body'), userCssClasses.body),
+        footer: cx(bem('footer'), userCssClasses.footer),
+        list: cx(bem('list'), userCssClasses.list),
+        item: cx(bem('item'), userCssClasses.item),
+        active: cx(bem('item', 'active'), userCssClasses.active),
+        link: cx(bem('link'), userCssClasses.link),
+        count: cx(bem('count'), userCssClasses.count)
       };
 
       ReactDOM.render(

diff --git a/widgets/price-ranges/price-ranges.js b/widgets/price-ranges/price-ranges.js
@@ -10,7 +10,7 @@ let autoHideContainer = require('../../decorators/autoHideContainer');
 let headerFooter = require('../../decorators/headerFooter');
 
 let bem = utils.bemHelper('ais-price-ranges');
-let cx = require('classnames/dedupe');
+let cx = require('classnames');
 
 /**
  * Instantiate a price ranges on a numerical facet
@@ -43,7 +43,7 @@ let cx = require('classnames/dedupe');
 function priceRanges({
     container,
     facetName,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     templates = defaultTemplates,
     labels = {
       currency: '$',
@@ -129,21 +129,21 @@ function priceRanges({
         templates
       });
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        header: cx(bem('header'), cssClasses.header),
-        body: cx(bem('body'), cssClasses.body),
-        list: cx(bem('list'), cssClasses.list),
-        link: cx(bem('link'), cssClasses.link),
-        item: cx(bem('item'), cssClasses.item),
-        active: cx(bem('item', 'active'), cssClasses.active),
-        form: cx(bem('form'), cssClasses.form),
-        label: cx(bem('label'), cssClasses.label),
-        input: cx(bem('input'), cssClasses.input),
-        currency: cx(bem('currency'), cssClasses.currency),
-        button: cx(bem('button'), cssClasses.button),
-        separator: cx(bem('separator'), cssClasses.separator),
-        footer: cx(bem('footer'), cssClasses.footer)
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        header: cx(bem('header'), userCssClasses.header),
+        body: cx(bem('body'), userCssClasses.body),
+        list: cx(bem('list'), userCssClasses.list),
+        link: cx(bem('link'), userCssClasses.link),
+        item: cx(bem('item'), userCssClasses.item),
+        active: cx(bem('item', 'active'), userCssClasses.active),
+        form: cx(bem('form'), userCssClasses.form),
+        label: cx(bem('label'), userCssClasses.label),
+        input: cx(bem('input'), userCssClasses.input),
+        currency: cx(bem('currency'), userCssClasses.currency),
+        button: cx(bem('button'), userCssClasses.button),
+        separator: cx(bem('separator'), userCssClasses.separator),
+        footer: cx(bem('footer'), userCssClasses.footer)
       };
 
       ReactDOM.render(

diff --git a/widgets/refinement-list/refinement-list.js b/widgets/refinement-list/refinement-list.js
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
 
 var utils = require('../../lib/utils.js');
 var bem = utils.bemHelper('ais-refinement-list');
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 
 var autoHideContainer = require('../../decorators/autoHideContainer');
 var headerFooter = require('../../decorators/headerFooter');
@@ -42,7 +42,7 @@ function refinementList({
     operator = 'or',
     sortBy = ['count:desc'],
     limit = 1000,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     templates = defaultTemplates,
     transformData,
     hideContainerWhenNoResults = true
@@ -92,17 +92,17 @@ function refinementList({
 
       var hasNoResults = facetValues.length === 0;
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        header: cx(bem('header'), cssClasses.header),
-        body: cx(bem('body'), cssClasses.body),
-        footer: cx(bem('footer'), cssClasses.footer),
-        list: cx(bem('list'), cssClasses.list),
-        item: cx(bem('item'), cssClasses.item),
-        active: cx(bem('item', 'active'), cssClasses.active),
-        label: cx(bem('label'), cssClasses.label),
-        checkbox: cx(bem('checkbox'), cssClasses.checkbox),
-        count: cx(bem('count'), cssClasses.count)
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        header: cx(bem('header'), userCssClasses.header),
+        body: cx(bem('body'), userCssClasses.body),
+        footer: cx(bem('footer'), userCssClasses.footer),
+        list: cx(bem('list'), userCssClasses.list),
+        item: cx(bem('item'), userCssClasses.item),
+        active: cx(bem('item', 'active'), userCssClasses.active),
+        label: cx(bem('label'), userCssClasses.label),
+        checkbox: cx(bem('checkbox'), userCssClasses.checkbox),
+        count: cx(bem('count'), userCssClasses.count)
       };
 
       ReactDOM.render(

diff --git a/widgets/stats/stats.js b/widgets/stats/stats.js
@@ -5,7 +5,7 @@ var utils = require('../../lib/utils.js');
 var autoHideContainer = require('../../decorators/autoHideContainer');
 var headerFooter = require('../../decorators/headerFooter');
 var bem = require('../../lib/utils').bemHelper('ais-stats');
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 
 var defaultTemplates = require('./defaultTemplates.js');
 
@@ -28,7 +28,7 @@ var defaultTemplates = require('./defaultTemplates.js');
  */
 function stats({
     container,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     hideContainerWhenNoResults = true,
     templates = defaultTemplates,
     transformData
@@ -54,12 +54,12 @@ function stats({
         templates
       });
 
-      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)
+      var cssClasses = {
+        body: cx(bem('body'), userCssClasses.body),
+        footer: cx(bem('footer'), userCssClasses.footer),
+        header: cx(bem('header'), userCssClasses.header),
+        root: cx(bem(null), userCssClasses.root),
+        time: cx(bem('time'), userCssClasses.time)
       };
 
       ReactDOM.render(

diff --git a/widgets/toggle/toggle.js b/widgets/toggle/toggle.js
@@ -4,7 +4,7 @@ var ReactDOM = require('react-dom');
 
 var utils = require('../../lib/utils.js');
 var bem = utils.bemHelper('ais-toggle');
-var cx = require('classnames/dedupe');
+var cx = require('classnames');
 
 var autoHideContainer = require('../../decorators/autoHideContainer');
 var headerFooter = require('../../decorators/headerFooter');
@@ -42,7 +42,7 @@ function toggle({
     facetName,
     label,
     templates = defaultTemplates,
-    cssClasses = {},
+    cssClasses: userCssClasses = {},
     transformData,
     hideContainerWhenNoResults = true
   } = {}) {
@@ -80,17 +80,17 @@ function toggle({
         count: values && values.count || null
       };
 
-      cssClasses = {
-        root: cx(bem(null), cssClasses.root),
-        header: cx(bem('header'), cssClasses.header),
-        body: cx(bem('body'), cssClasses.body),
-        footer: cx(bem('footer'), cssClasses.footer),
-        list: cx(bem('list'), cssClasses.list),
-        item: cx(bem('item'), cssClasses.item),
-        active: cx(bem('item', 'active'), cssClasses.active),
-        label: cx(bem('label'), cssClasses.label),
-        checkbox: cx(bem('checkbox'), cssClasses.checkbox),
-        count: cx(bem('count'), cssClasses.count)
+      var cssClasses = {
+        root: cx(bem(null), userCssClasses.root),
+        header: cx(bem('header'), userCssClasses.header),
+        body: cx(bem('body'), userCssClasses.body),
+        footer: cx(bem('footer'), userCssClasses.footer),
+        list: cx(bem('list'), userCssClasses.list),
+        item: cx(bem('item'), userCssClasses.item),
+        active: cx(bem('item', 'active'), userCssClasses.active),
+        label: cx(bem('label'), userCssClasses.label),
+        checkbox: cx(bem('checkbox'), userCssClasses.checkbox),
+        count: cx(bem('count'), userCssClasses.count)
       };
 
       ReactDOM.render(