From e193f4515a3ffa811325e6698d4cad19699a28ab Mon Sep 17 00:00:00 2001 From: Matthieu Dumont Date: Fri, 30 Oct 2015 12:07:23 +0100 Subject: [PATCH] fix(cssClasses): Fixed duplication of classNames As a consequence, replaced now useless `require('classnames/dedupe`) with `require('classnames')`. Closes #388 --- decorators/headerFooter.js | 2 +- .../hierarchical-menu/hierarchical-menu.js | 24 ++++++------- .../hits-per-page-selector.js | 8 ++--- widgets/hits/hits.js | 12 +++---- widgets/index-selector/index-selector.js | 8 ++--- widgets/menu/menu.js | 24 ++++++------- widgets/price-ranges/price-ranges.js | 34 +++++++++---------- widgets/refinement-list/refinement-list.js | 26 +++++++------- widgets/stats/stats.js | 16 ++++----- widgets/toggle/toggle.js | 26 +++++++------- 10 files changed, 90 insertions(+), 90 deletions(-) diff --git a/decorators/headerFooter.js b/decorators/headerFooter.js index e9cec8a354..a3d481eb70 100644 --- 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 index 9c7f9cece7..ab702f47c9 100644 --- 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 index b3d52c43bd..aaa41ebb6c 100644 --- 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(