Skip to content

Commit

Permalink
fix(cssClasses): Fixed duplication of classNames
Browse files Browse the repository at this point in the history
As a consequence, replaced now useless `require('classnames/dedupe`)
with `require('classnames')`.

Closes #388
  • Loading branch information
Jerska committed Oct 30, 2015
1 parent 33a4280 commit 9e88b8c
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
12 changes: 6 additions & 6 deletions decorators/headerFooter.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

var React = require('react');

var cx = require('classnames/dedupe');
var cx = require('classnames');

var Template = require('../components/Template');

Expand All @@ -14,15 +14,15 @@ function headerFooter(ComposedComponent) {
if (!templates || !templates[type]) {
return null;
}
let className = cx(this.props.cssClasses[type], `ais-${type}`);
let cssClass = cx(this.props.cssClasses[type], `ais-${type}`);
return (
<div className={className}>
<div className={cssClass}>
<Template templateKey={type} {...this.props.templateProps} transformData={null} />
</div>
);
}
render() {
var classNames = {
var cssClasses = {
root: cx(this.props.cssClasses.root),
body: cx(this.props.cssClasses.body)
};
Expand All @@ -32,9 +32,9 @@ function headerFooter(ComposedComponent) {
var footer = this.getTemplate('footer');

return (
<div className={classNames.root}>
<div className={cssClasses.root}>
{header}
<div className={classNames.body}>
<div className={cssClasses.body}>
<ComposedComponent {...this.props} />
</div>
{footer}
Expand Down
6 changes: 3 additions & 3 deletions widgets/hierarchical-menu/hierarchical-menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
var RefinementList = autoHideContainer(headerFooter(require('../../components/RefinementList/RefinementList.js')));
Expand Down Expand Up @@ -76,7 +76,7 @@ function hierarchicalMenu({
templates
});

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
header: cx(bem('header'), cssClasses.header),
body: cx(bem('body'), cssClasses.body),
Expand All @@ -92,7 +92,7 @@ function hierarchicalMenu({
ReactDOM.render(
<RefinementList
createURL={(facetValue) => createURL(state.toggleRefinement(hierarchicalFacetName, facetValue))}
cssClasses={cssClasses}
cssClasses={_cssClasses}
facetNameKey="path"
facetValues={facetValues}
hasResults={facetValues.length > 0}
Expand Down
4 changes: 2 additions & 2 deletions widgets/hits-per-page-selector/hits-per-page-selector.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ function hitsPerPageSelector({
let setHitsPerPage = this.setHitsPerPage.bind(this, helper);
var Selector = autoHideContainer(require('../../components/Selector'));

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
item: cx(bem('item'), cssClasses.item)
};
ReactDOM.render(
<Selector
cssClasses={cssClasses}
cssClasses={_cssClasses}
currentValue={currentValue}
hasResults={hasResults}
hideContainerWhenNoResults={hideContainerWhenNoResults}
Expand Down
6 changes: 3 additions & 3 deletions widgets/hits/hits.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -38,7 +38,7 @@ function hits({
throw new Error(usage);
}

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
item: cx(bem('item'), cssClasses.item),
empty: cx(bem(null, 'empty'), cssClasses.empty)
Expand All @@ -56,7 +56,7 @@ function hits({

ReactDOM.render(
<Hits
cssClasses={cssClasses}
cssClasses={_cssClasses}
hits={results.hits}
results={results}
templateProps={templateProps}
Expand Down
4 changes: 2 additions & 2 deletions widgets/index-selector/index-selector.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ function indexSelector({
let setIndex = this.setIndex.bind(this, helper);
var Selector = autoHideContainer(require('../../components/Selector'));

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
item: cx(bem('item'), cssClasses.item)
};
ReactDOM.render(
<Selector
cssClasses={cssClasses}
cssClasses={_cssClasses}
currentValue={currentIndex}
hasResults={hasResults}
hideContainerWhenNoResults={hideContainerWhenNoResults}
Expand Down
6 changes: 3 additions & 3 deletions widgets/menu/menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
var RefinementList = autoHideContainer(headerFooter(require('../../components/RefinementList/RefinementList.js')));
Expand Down Expand Up @@ -72,7 +72,7 @@ function menu({
templates
});

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
header: cx(bem('header'), cssClasses.header),
body: cx(bem('body'), cssClasses.body),
Expand All @@ -87,7 +87,7 @@ function menu({
ReactDOM.render(
<RefinementList
createURL={(facetValue) => createURL(state.toggleRefinement(hierarchicalFacetName, facetValue))}
cssClasses={cssClasses}
cssClasses={_cssClasses}
facetValues={facetValues}
hasResults={facetValues.length > 0}
hideContainerWhenNoResults={hideContainerWhenNoResults}
Expand Down
6 changes: 3 additions & 3 deletions widgets/price-ranges/price-ranges.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var autoHideContainer = require('../../decorators/autoHideContainer');
var headerFooter = require('../../decorators/headerFooter');

var bem = utils.bemHelper('ais-price-ranges');
var cx = require('classnames/dedupe');
var cx = require('classnames');

/**
* Instantiate a price ranges on a numerical facet
Expand Down Expand Up @@ -119,7 +119,7 @@ function priceRanges({
templates
});

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
header: cx(bem('header'), cssClasses.header),
body: cx(bem('body'), cssClasses.body),
Expand All @@ -145,7 +145,7 @@ function priceRanges({
}
return createURL(newState);
}}
cssClasses={cssClasses}
cssClasses={_cssClasses}
facetValues={facetValues}
hasResults={results.hits.length > 0}
hideContainerWhenNoResults={hideContainerWhenNoResults}
Expand Down
6 changes: 3 additions & 3 deletions widgets/refinement-list/refinement-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -86,7 +86,7 @@ function refinementList({

var facetValues = results.getFacetValues(facetName, {sortBy: sortBy}).slice(0, limit);

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
header: cx(bem('header'), cssClasses.header),
body: cx(bem('body'), cssClasses.body),
Expand All @@ -102,7 +102,7 @@ function refinementList({
ReactDOM.render(
<RefinementList
createURL={(facetValue) => createURL(state.toggleRefinement(facetName, facetValue))}
cssClasses={cssClasses}
cssClasses={_cssClasses}
facetValues={facetValues}
hasResults={facetValues.length > 0}
hideContainerWhenNoResults={hideContainerWhenNoResults}
Expand Down
6 changes: 3 additions & 3 deletions widgets/stats/stats.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down Expand Up @@ -50,7 +50,7 @@ function stats({

var Stats = autoHideContainer(headerFooter(require('../../components/Stats/Stats.js')));

cssClasses = {
var _cssClasses = {
body: cx(bem('body'), cssClasses.body),
footer: cx(bem('footer'), cssClasses.footer),
header: cx(bem('header'), cssClasses.header),
Expand All @@ -60,7 +60,7 @@ function stats({

ReactDOM.render(
<Stats
cssClasses={cssClasses}
cssClasses={_cssClasses}
hasResults={results.hits.length > 0}
hideContainerWhenNoResults={hideContainerWhenNoResults}
hitsPerPage={results.hitsPerPage}
Expand Down
6 changes: 3 additions & 3 deletions widgets/toggle/toggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -75,7 +75,7 @@ function toggle({
count: values && values.count || null
};

cssClasses = {
var _cssClasses = {
root: cx(bem(null), cssClasses.root),
header: cx(bem('header'), cssClasses.header),
body: cx(bem('body'), cssClasses.body),
Expand All @@ -91,7 +91,7 @@ function toggle({
ReactDOM.render(
<RefinementList
createURL={() => createURL(state.toggleRefinement(facetName, facetValue.isRefined))}
cssClasses={cssClasses}
cssClasses={_cssClasses}
facetValues={[facetValue]}
hasResults={results.hits.length > 0}
hideContainerWhenNoResults={hideContainerWhenNoResults}
Expand Down

0 comments on commit 9e88b8c

Please sign in to comment.