Skip to content

Commit e193f45

Browse files
JerskaJerska
committed
fix(cssClasses): Fixed duplication of classNames
As a consequence, replaced now useless `require('classnames/dedupe`) with `require('classnames')`. Closes #388
1 parent 84dca16 commit e193f45

File tree

10 files changed

+90
-90
lines changed

10 files changed

+90
-90
lines changed

‎decorators/headerFooter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
var React = require('react');
55

6-
var cx = require('classnames/dedupe');
6+
var cx = require('classnames');
77

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

‎widgets/hierarchical-menu/hierarchical-menu.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
33

44
var utils = require('../../lib/utils.js');
55
var bem = utils.bemHelper('ais-hierarchical-menu');
6-
var cx = require('classnames/dedupe');
6+
var cx = require('classnames');
77
var autoHideContainer = require('../../decorators/autoHideContainer');
88
var headerFooter = require('../../decorators/headerFooter');
99

@@ -40,7 +40,7 @@ function hierarchicalMenu({
4040
separator,
4141
limit = 100,
4242
sortBy = ['name:asc'],
43-
cssClasses = {},
43+
cssClasses: userCssClasses = {},
4444
hideContainerWhenNoResults = true,
4545
templates = defaultTemplates,
4646
transformData
@@ -81,17 +81,17 @@ function hierarchicalMenu({
8181
templates
8282
});
8383

84-
cssClasses = {
85-
root: cx(bem(null), cssClasses.root),
86-
header: cx(bem('header'), cssClasses.header),
87-
body: cx(bem('body'), cssClasses.body),
88-
footer: cx(bem('footer'), cssClasses.footer),
89-
list: cx(bem('list'), cssClasses.list),
84+
var cssClasses = {
85+
root: cx(bem(null), userCssClasses.root),
86+
header: cx(bem('header'), userCssClasses.header),
87+
body: cx(bem('body'), userCssClasses.body),
88+
footer: cx(bem('footer'), userCssClasses.footer),
89+
list: cx(bem('list'), userCssClasses.list),
9090
depth: bem('list', 'lvl'),
91-
item: cx(bem('item'), cssClasses.item),
92-
active: cx(bem('item', 'active'), cssClasses.active),
93-
link: cx(bem('link'), cssClasses.link),
94-
count: cx(bem('count'), cssClasses.count)
91+
item: cx(bem('item'), userCssClasses.item),
92+
active: cx(bem('item', 'active'), userCssClasses.active),
93+
link: cx(bem('link'), userCssClasses.link),
94+
count: cx(bem('count'), userCssClasses.count)
9595
};
9696

9797
ReactDOM.render(

‎widgets/hits-per-page-selector/hits-per-page-selector.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var autoHideContainer = require('../../decorators/autoHideContainer');
2323
function hitsPerPageSelector({
2424
container,
2525
options,
26-
cssClasses = {},
26+
cssClasses: userCssClasses = {},
2727
hideContainerWhenNoResults = false
2828
}) {
2929
var containerNode = utils.getContainerNode(container);
@@ -58,9 +58,9 @@ function hitsPerPageSelector({
5858
let hasNoResults = results.nbHits === 0;
5959
let setHitsPerPage = this.setHitsPerPage.bind(this, helper);
6060

61-
cssClasses = {
62-
root: cx(bem(null), cssClasses.root),
63-
item: cx(bem('item'), cssClasses.item)
61+
var cssClasses = {
62+
root: cx(bem(null), userCssClasses.root),
63+
item: cx(bem('item'), userCssClasses.item)
6464
};
6565
ReactDOM.render(
6666
<Selector

‎widgets/hits/hits.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
33

44
var utils = require('../../lib/utils.js');
55
var bem = utils.bemHelper('ais-hits');
6-
var cx = require('classnames/dedupe');
6+
var cx = require('classnames');
77

88
var Hits = require('../../components/Hits');
99
var defaultTemplates = require('./defaultTemplates');
@@ -26,7 +26,7 @@ var defaultTemplates = require('./defaultTemplates');
2626
*/
2727
function hits({
2828
container,
29-
cssClasses = {},
29+
cssClasses: userCssClasses = {},
3030
templates = defaultTemplates,
3131
transformData,
3232
hitsPerPage = 20
@@ -38,10 +38,10 @@ function hits({
3838
throw new Error(usage);
3939
}
4040

41-
cssClasses = {
42-
root: cx(bem(null), cssClasses.root),
43-
item: cx(bem('item'), cssClasses.item),
44-
empty: cx(bem(null, 'empty'), cssClasses.empty)
41+
var cssClasses = {
42+
root: cx(bem(null), userCssClasses.root),
43+
item: cx(bem('item'), userCssClasses.item),
44+
empty: cx(bem(null, 'empty'), userCssClasses.empty)
4545
};
4646

4747
return {

‎widgets/index-selector/index-selector.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var autoHideContainer = require('../../decorators/autoHideContainer');
2323
function indexSelector({
2424
container,
2525
indices,
26-
cssClasses = {},
26+
cssClasses: userCssClasses = {},
2727
hideContainerWhenNoResults = false
2828
}) {
2929
var containerNode = utils.getContainerNode(container);
@@ -61,9 +61,9 @@ function indexSelector({
6161
let hasNoResults = results.nbHits === 0;
6262
let setIndex = this.setIndex.bind(this, helper);
6363

64-
cssClasses = {
65-
root: cx(bem(null), cssClasses.root),
66-
item: cx(bem('item'), cssClasses.item)
64+
var cssClasses = {
65+
root: cx(bem(null), userCssClasses.root),
66+
item: cx(bem('item'), userCssClasses.item)
6767
};
6868
ReactDOM.render(
6969
<Selector

‎widgets/menu/menu.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
33

44
var utils = require('../../lib/utils.js');
55
var bem = utils.bemHelper('ais-menu');
6-
var cx = require('classnames/dedupe');
6+
var cx = require('classnames');
77
var autoHideContainer = require('../../decorators/autoHideContainer');
88
var headerFooter = require('../../decorators/headerFooter');
99

@@ -38,7 +38,7 @@ function menu({
3838
facetName,
3939
sortBy = ['count:desc'],
4040
limit = 100,
41-
cssClasses = {},
41+
cssClasses: userCssClasses = {},
4242
templates = defaultTemplates,
4343
transformData,
4444
hideContainerWhenNoResults = true
@@ -77,16 +77,16 @@ function menu({
7777
templates
7878
});
7979

80-
cssClasses = {
81-
root: cx(bem(null), cssClasses.root),
82-
header: cx(bem('header'), cssClasses.header),
83-
body: cx(bem('body'), cssClasses.body),
84-
footer: cx(bem('footer'), cssClasses.footer),
85-
list: cx(bem('list'), cssClasses.list),
86-
item: cx(bem('item'), cssClasses.item),
87-
active: cx(bem('item', 'active'), cssClasses.active),
88-
link: cx(bem('link'), cssClasses.link),
89-
count: cx(bem('count'), cssClasses.count)
80+
var cssClasses = {
81+
root: cx(bem(null), userCssClasses.root),
82+
header: cx(bem('header'), userCssClasses.header),
83+
body: cx(bem('body'), userCssClasses.body),
84+
footer: cx(bem('footer'), userCssClasses.footer),
85+
list: cx(bem('list'), userCssClasses.list),
86+
item: cx(bem('item'), userCssClasses.item),
87+
active: cx(bem('item', 'active'), userCssClasses.active),
88+
link: cx(bem('link'), userCssClasses.link),
89+
count: cx(bem('count'), userCssClasses.count)
9090
};
9191

9292
ReactDOM.render(

‎widgets/price-ranges/price-ranges.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ let autoHideContainer = require('../../decorators/autoHideContainer');
1010
let headerFooter = require('../../decorators/headerFooter');
1111

1212
let bem = utils.bemHelper('ais-price-ranges');
13-
let cx = require('classnames/dedupe');
13+
let cx = require('classnames');
1414

1515
/**
1616
* Instantiate a price ranges on a numerical facet
@@ -43,7 +43,7 @@ let cx = require('classnames/dedupe');
4343
function priceRanges({
4444
container,
4545
facetName,
46-
cssClasses = {},
46+
cssClasses: userCssClasses = {},
4747
templates = defaultTemplates,
4848
labels = {
4949
currency: '$',
@@ -129,21 +129,21 @@ function priceRanges({
129129
templates
130130
});
131131

132-
cssClasses = {
133-
root: cx(bem(null), cssClasses.root),
134-
header: cx(bem('header'), cssClasses.header),
135-
body: cx(bem('body'), cssClasses.body),
136-
list: cx(bem('list'), cssClasses.list),
137-
link: cx(bem('link'), cssClasses.link),
138-
item: cx(bem('item'), cssClasses.item),
139-
active: cx(bem('item', 'active'), cssClasses.active),
140-
form: cx(bem('form'), cssClasses.form),
141-
label: cx(bem('label'), cssClasses.label),
142-
input: cx(bem('input'), cssClasses.input),
143-
currency: cx(bem('currency'), cssClasses.currency),
144-
button: cx(bem('button'), cssClasses.button),
145-
separator: cx(bem('separator'), cssClasses.separator),
146-
footer: cx(bem('footer'), cssClasses.footer)
132+
var cssClasses = {
133+
root: cx(bem(null), userCssClasses.root),
134+
header: cx(bem('header'), userCssClasses.header),
135+
body: cx(bem('body'), userCssClasses.body),
136+
list: cx(bem('list'), userCssClasses.list),
137+
link: cx(bem('link'), userCssClasses.link),
138+
item: cx(bem('item'), userCssClasses.item),
139+
active: cx(bem('item', 'active'), userCssClasses.active),
140+
form: cx(bem('form'), userCssClasses.form),
141+
label: cx(bem('label'), userCssClasses.label),
142+
input: cx(bem('input'), userCssClasses.input),
143+
currency: cx(bem('currency'), userCssClasses.currency),
144+
button: cx(bem('button'), userCssClasses.button),
145+
separator: cx(bem('separator'), userCssClasses.separator),
146+
footer: cx(bem('footer'), userCssClasses.footer)
147147
};
148148

149149
ReactDOM.render(

‎widgets/refinement-list/refinement-list.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ var ReactDOM = require('react-dom');
33

44
var utils = require('../../lib/utils.js');
55
var bem = utils.bemHelper('ais-refinement-list');
6-
var cx = require('classnames/dedupe');
6+
var cx = require('classnames');
77

88
var autoHideContainer = require('../../decorators/autoHideContainer');
99
var headerFooter = require('../../decorators/headerFooter');
@@ -42,7 +42,7 @@ function refinementList({
4242
operator = 'or',
4343
sortBy = ['count:desc'],
4444
limit = 1000,
45-
cssClasses = {},
45+
cssClasses: userCssClasses = {},
4646
templates = defaultTemplates,
4747
transformData,
4848
hideContainerWhenNoResults = true
@@ -92,17 +92,17 @@ function refinementList({
9292

9393
var hasNoResults = facetValues.length === 0;
9494

95-
cssClasses = {
96-
root: cx(bem(null), cssClasses.root),
97-
header: cx(bem('header'), cssClasses.header),
98-
body: cx(bem('body'), cssClasses.body),
99-
footer: cx(bem('footer'), cssClasses.footer),
100-
list: cx(bem('list'), cssClasses.list),
101-
item: cx(bem('item'), cssClasses.item),
102-
active: cx(bem('item', 'active'), cssClasses.active),
103-
label: cx(bem('label'), cssClasses.label),
104-
checkbox: cx(bem('checkbox'), cssClasses.checkbox),
105-
count: cx(bem('count'), cssClasses.count)
95+
var cssClasses = {
96+
root: cx(bem(null), userCssClasses.root),
97+
header: cx(bem('header'), userCssClasses.header),
98+
body: cx(bem('body'), userCssClasses.body),
99+
footer: cx(bem('footer'), userCssClasses.footer),
100+
list: cx(bem('list'), userCssClasses.list),
101+
item: cx(bem('item'), userCssClasses.item),
102+
active: cx(bem('item', 'active'), userCssClasses.active),
103+
label: cx(bem('label'), userCssClasses.label),
104+
checkbox: cx(bem('checkbox'), userCssClasses.checkbox),
105+
count: cx(bem('count'), userCssClasses.count)
106106
};
107107

108108
ReactDOM.render(

‎widgets/stats/stats.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var utils = require('../../lib/utils.js');
55
var autoHideContainer = require('../../decorators/autoHideContainer');
66
var headerFooter = require('../../decorators/headerFooter');
77
var bem = require('../../lib/utils').bemHelper('ais-stats');
8-
var cx = require('classnames/dedupe');
8+
var cx = require('classnames');
99

1010
var defaultTemplates = require('./defaultTemplates.js');
1111

@@ -28,7 +28,7 @@ var defaultTemplates = require('./defaultTemplates.js');
2828
*/
2929
function stats({
3030
container,
31-
cssClasses = {},
31+
cssClasses: userCssClasses = {},
3232
hideContainerWhenNoResults = true,
3333
templates = defaultTemplates,
3434
transformData
@@ -54,12 +54,12 @@ function stats({
5454
templates
5555
});
5656

57-
cssClasses = {
58-
body: cx(bem('body'), cssClasses.body),
59-
footer: cx(bem('footer'), cssClasses.footer),
60-
header: cx(bem('header'), cssClasses.header),
61-
root: cx(bem(null), cssClasses.root),
62-
time: cx(bem('time'), cssClasses.time)
57+
var cssClasses = {
58+
body: cx(bem('body'), userCssClasses.body),
59+
footer: cx(bem('footer'), userCssClasses.footer),
60+
header: cx(bem('header'), userCssClasses.header),
61+
root: cx(bem(null), userCssClasses.root),
62+
time: cx(bem('time'), userCssClasses.time)
6363
};
6464

6565
ReactDOM.render(

‎widgets/toggle/toggle.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ var ReactDOM = require('react-dom');
44

55
var utils = require('../../lib/utils.js');
66
var bem = utils.bemHelper('ais-toggle');
7-
var cx = require('classnames/dedupe');
7+
var cx = require('classnames');
88

99
var autoHideContainer = require('../../decorators/autoHideContainer');
1010
var headerFooter = require('../../decorators/headerFooter');
@@ -42,7 +42,7 @@ function toggle({
4242
facetName,
4343
label,
4444
templates = defaultTemplates,
45-
cssClasses = {},
45+
cssClasses: userCssClasses = {},
4646
transformData,
4747
hideContainerWhenNoResults = true
4848
} = {}) {
@@ -80,17 +80,17 @@ function toggle({
8080
count: values && values.count || null
8181
};
8282

83-
cssClasses = {
84-
root: cx(bem(null), cssClasses.root),
85-
header: cx(bem('header'), cssClasses.header),
86-
body: cx(bem('body'), cssClasses.body),
87-
footer: cx(bem('footer'), cssClasses.footer),
88-
list: cx(bem('list'), cssClasses.list),
89-
item: cx(bem('item'), cssClasses.item),
90-
active: cx(bem('item', 'active'), cssClasses.active),
91-
label: cx(bem('label'), cssClasses.label),
92-
checkbox: cx(bem('checkbox'), cssClasses.checkbox),
93-
count: cx(bem('count'), cssClasses.count)
83+
var cssClasses = {
84+
root: cx(bem(null), userCssClasses.root),
85+
header: cx(bem('header'), userCssClasses.header),
86+
body: cx(bem('body'), userCssClasses.body),
87+
footer: cx(bem('footer'), userCssClasses.footer),
88+
list: cx(bem('list'), userCssClasses.list),
89+
item: cx(bem('item'), userCssClasses.item),
90+
active: cx(bem('item', 'active'), userCssClasses.active),
91+
label: cx(bem('label'), userCssClasses.label),
92+
checkbox: cx(bem('checkbox'), userCssClasses.checkbox),
93+
count: cx(bem('count'), userCssClasses.count)
9494
};
9595

9696
ReactDOM.render(

0 commit comments

Comments
 (0)