Skip to content

Commit 6dfcf36

Browse files
committed
[changed] Internal variables classSet to classNames
This has been causing a lot of confusion for folks since React has depricated `classSet`. We felt at the time that changing the require call to `require('classnames')` withing changing the variable name would be enough. It hasn't due to the confusion people are seeing. Fixes react-bootstrap#489
1 parent ee562c8 commit 6dfcf36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+109
-109
lines changed

docs/examples/.eslintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"globals": {
77
"mountNode",
88
"React",
9-
"classSet",
9+
"classNames",
1010
"Accordion",
1111
"Alert",
1212
"Badge",

docs/examples/CollapsableParagraph.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const CollapsableParagraph = React.createClass({
2020
return (
2121
<div>
2222
<Button onClick={this.onHandleToggle}>{text} Content</Button>
23-
<div ref='panel' className={classSet(styles)}>
23+
<div ref='panel' className={classNames(styles)}>
2424
{this.props.children}
2525
</div>
2626
</div>

docs/src/ReactPlayground.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable */
22
import React from 'react';
3-
import classSet from 'classnames';
3+
import classNames from 'classnames';
44
import Accordion from '../../src/Accordion';
55
import Alert from '../../src/Alert';
66
import Badge from '../../src/Badge';
@@ -198,11 +198,11 @@ const ReactPlayground = React.createClass({
198198
}
199199
return (
200200
<div className='playground'>
201-
<div className={classSet(classes)}>
201+
<div className={classNames(classes)}>
202202
<div ref='mount' />
203203
</div>
204204
{editor}
205-
<a className={classSet(toggleClasses)} onClick={this.handleCodeModeToggle} href='#'>{this.state.mode === this.MODES.NONE ? 'show code' : 'hide code'}</a>
205+
<a className={classNames(toggleClasses)} onClick={this.handleCodeModeToggle} href='#'>{this.state.mode === this.MODES.NONE ? 'show code' : 'hide code'}</a>
206206
</div>
207207
);
208208
},

src/Affix.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import classSet from 'classnames';
2+
import classNames from 'classnames';
33
import AffixMixin from './AffixMixin';
44
import domUtils from './utils/domUtils';
55

@@ -15,7 +15,7 @@ const Affix = React.createClass({
1515

1616
return (
1717
<div {...this.props}
18-
className={classSet(this.props.className, this.state.affixClass)}
18+
className={classNames(this.props.className, this.state.affixClass)}
1919
style={holderStyle}>
2020
{this.props.children}
2121
</div>

src/Alert.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import classSet from 'classnames';
2+
import classNames from 'classnames';
33
import BootstrapMixin from './BootstrapMixin';
44

55
const Alert = React.createClass({
@@ -36,7 +36,7 @@ const Alert = React.createClass({
3636
classes['alert-dismissable'] = isDismissable;
3737

3838
return (
39-
<div {...this.props} className={classSet(this.props.className, classes)}>
39+
<div {...this.props} className={classNames(this.props.className, classes)}>
4040
{isDismissable ? this.renderDismissButton() : null}
4141
{this.props.children}
4242
</div>

src/Badge.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import ValidComponentChildren from './utils/ValidComponentChildren';
3-
import classSet from 'classnames';
3+
import classNames from 'classnames';
44

55

66
const Badge = React.createClass({
@@ -22,7 +22,7 @@ const Badge = React.createClass({
2222
return (
2323
<span
2424
{...this.props}
25-
className={classSet(this.props.className, classes)}>
25+
className={classNames(this.props.className, classes)}>
2626
{this.props.children}
2727
</span>
2828
);

src/Button.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import classSet from 'classnames';
2+
import classNames from 'classnames';
33
import BootstrapMixin from './BootstrapMixin';
44

55
const Button = React.createClass({
@@ -54,7 +54,7 @@ const Button = React.createClass({
5454
<Component
5555
{...this.props}
5656
href={href}
57-
className={classSet(this.props.className, classes)}
57+
className={classNames(this.props.className, classes)}
5858
role="button">
5959
{this.props.children}
6060
</Component>
@@ -67,7 +67,7 @@ const Button = React.createClass({
6767
return (
6868
<Component
6969
{...this.props}
70-
className={classSet(this.props.className, classes)}>
70+
className={classNames(this.props.className, classes)}>
7171
{this.props.children}
7272
</Component>
7373
);
@@ -79,7 +79,7 @@ const Button = React.createClass({
7979
};
8080

8181
return (
82-
<li className={classSet(liClasses)}>
82+
<li className={classNames(liClasses)}>
8383
{this.renderAnchor(classes)}
8484
</li>
8585
);

src/ButtonGroup.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import classSet from 'classnames';
2+
import classNames from 'classnames';
33
import BootstrapMixin from './BootstrapMixin';
44

55
const ButtonGroup = React.createClass({
@@ -25,7 +25,7 @@ const ButtonGroup = React.createClass({
2525
return (
2626
<div
2727
{...this.props}
28-
className={classSet(this.props.className, classes)}>
28+
className={classNames(this.props.className, classes)}>
2929
{this.props.children}
3030
</div>
3131
);

src/ButtonToolbar.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import classSet from 'classnames';
2+
import classNames from 'classnames';
33
import BootstrapMixin from './BootstrapMixin';
44

55
const ButtonToolbar = React.createClass({
@@ -18,7 +18,7 @@ const ButtonToolbar = React.createClass({
1818
<div
1919
{...this.props}
2020
role="toolbar"
21-
className={classSet(this.props.className, classes)}>
21+
className={classNames(this.props.className, classes)}>
2222
{this.props.children}
2323
</div>
2424
);

src/Carousel.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { cloneElement } from 'react';
2-
import classSet from 'classnames';
2+
import classNames from 'classnames';
33
import BootstrapMixin from './BootstrapMixin';
44
import ValidComponentChildren from './utils/ValidComponentChildren';
55

@@ -142,7 +142,7 @@ const Carousel = React.createClass({
142142
return (
143143
<div
144144
{...this.props}
145-
className={classSet(this.props.className, classes)}
145+
className={classNames(this.props.className, classes)}
146146
onMouseOver={this.handleMouseOver}
147147
onMouseOut={this.handleMouseOut}>
148148
{this.props.indicators ? this.renderIndicators() : null}

0 commit comments

Comments
 (0)