Skip to content

Commit ea2439e

Browse files
eddywashereeddywashere
authored
fix(className): update "in" to "active" for stateful components (#241)
1 parent 3e9eb91 commit ea2439e

11 files changed

Lines changed: 25 additions & 25 deletions

File tree

‎src/Alert.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ const Alert = (props) => {
6767
component={FirstChild}
6868
transitionName={{
6969
appear: 'fade',
70-
appearActive: 'in',
70+
appearActive: 'active',
7171
enter: 'fade',
72-
enterActive: 'in',
72+
enterActive: 'active',
7373
leave: 'fade',
7474
leaveActive: 'out'
7575
}}

‎src/Collapse.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class Collapse extends Component {
8989
collapseClass = 'collapsing';
9090
break;
9191
case SHOWN:
92-
collapseClass = 'collapse in';
92+
collapseClass = 'collapse active';
9393
break;
9494
case HIDE:
9595
collapseClass = 'collapsing';

‎src/Dropdown.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const childContextTypes = {
3535

3636
const defaultTetherConfig = {
3737
classPrefix: 'bs-tether',
38-
classes: { element: 'dropdown', enabled: 'open' },
38+
classes: { element: 'dropdown', enabled: 'active' },
3939
constraints: [
4040
{ to: 'scrollParent', attachment: 'together none' },
4141
{ to: 'window', attachment: 'together none' }
@@ -178,7 +178,7 @@ class Dropdown extends React.Component {
178178
'btn-group': group,
179179
[`btn-group-${size}`]: !!size,
180180
dropdown: !group,
181-
open: isOpen,
181+
active: isOpen,
182182
dropup: dropup
183183
}
184184
), cssModule);

‎src/Fade.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const propTypes = {
2222
const defaultProps = {
2323
tag: 'div',
2424
baseClass: 'fade',
25-
baseClassIn: 'in',
25+
baseClassIn: 'active',
2626
transitionAppearTimeout: 0,
2727
transitionEnterTimeout: 0,
2828
transitionLeaveTimeout: 0,

‎src/Popover.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const defaultTetherConfig = {
2525
classPrefix: 'bs-tether',
2626
classes: {
2727
element: false,
28-
enabled: 'in'
28+
enabled: 'active',
2929
},
3030
constraints: [
3131
{ to: 'scrollParent', attachment: 'together none' },

‎src/Tooltip.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ const defaultTetherConfig = {
3838
classPrefix: 'bs-tether',
3939
classes: {
4040
element: false,
41-
enabled: 'in',
41+
enabled: 'active',
4242
},
4343
constraints: [
4444
{ to: 'scrollParent', attachment: 'together none' },

‎src/__tests__/Alert.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ describe('Alert', () => {
1212
const alert = shallow(<Alert>Yo!</Alert>);
1313
expect(alert.prop('transitionName')).toEqual({
1414
appear: 'fade',
15-
appearActive: 'in',
15+
appearActive: 'active',
1616
enter: 'fade',
17-
enterActive: 'in',
17+
enterActive: 'active',
1818
leave: 'fade',
1919
leaveActive: 'out'
2020
});

‎src/__tests__/Collapse.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ describe('Collapse', () => {
3333
expect(wrapper.hasClass('collapse')).toEqual(true);
3434
});
3535

36-
it('should render with class "in" when isOpen is true', () => {
36+
it('should render with class "active" when isOpen is true', () => {
3737
const wrapper = shallow(<Collapse isOpen />);
38-
expect(wrapper.hasClass('in')).toEqual(true);
38+
expect(wrapper.hasClass('active')).toEqual(true);
3939
});
4040

4141
it('should set height to null when isOpen is true', () => {

‎src/__tests__/Fade.spec.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('Fade', () => {
3939
jasmine.clock().uninstall();
4040
});
4141

42-
it('should transition classes from "fade" to "fade in" on appear', () => {
42+
it('should transition classes from "fade" to "fade active" on appear', () => {
4343
let isOpen = true;
4444
const wrapper = mount(
4545
<Helper showItem={isOpen} >
@@ -49,17 +49,17 @@ describe('Fade', () => {
4949
);
5050

5151
expect(wrapper.find('div.fade').length).toBe(2);
52-
expect(wrapper.find('div.fade.in').length).toBe(1);
52+
expect(wrapper.find('div.fade.active').length).toBe(1);
5353

5454
jasmine.clock().tick(300);
5555

56-
expect(wrapper.find('div.fade.in').length).toBe(2);
56+
expect(wrapper.find('div.fade.active').length).toBe(2);
5757

5858
wrapper.find('.trigger').simulate('click');
59-
expect(wrapper.find('div.fade.in').length).toBe(0);
59+
expect(wrapper.find('div.fade.active').length).toBe(0);
6060
});
6161

62-
it('should transition classes from "fade" to "fade in" on enter', () => {
62+
it('should transition classes from "fade" to "fade active" on enter', () => {
6363
const onEnter = jasmine.createSpy('spy');
6464
const onLeave = jasmine.createSpy('spy');
6565
let isOpen = false;
@@ -71,21 +71,21 @@ describe('Fade', () => {
7171
);
7272

7373
expect(wrapper.find('div.fade').length).toBe(0);
74-
expect(wrapper.find('div.fade.in').length).toBe(0);
74+
expect(wrapper.find('div.fade.active').length).toBe(0);
7575

7676
wrapper.find('.trigger').simulate('click');
7777

7878
expect(wrapper.find('div.fade').length).toBe(2);
79-
expect(wrapper.find('div.fade.in').length).toBe(1);
79+
expect(wrapper.find('div.fade.active').length).toBe(1);
8080
expect(onEnter).not.toHaveBeenCalled();
8181

8282
jasmine.clock().tick(300);
8383

8484
expect(onEnter).toHaveBeenCalled();
8585
expect(onLeave).not.toHaveBeenCalled();
86-
expect(wrapper.find('div.fade.in').length).toBe(2);
86+
expect(wrapper.find('div.fade.active').length).toBe(2);
8787

8888
wrapper.find('.trigger').simulate('click');
89-
expect(wrapper.find('div.fade.in').length).toBe(0);
89+
expect(wrapper.find('div.fade.active').length).toBe(0);
9090
});
9191
});

‎src/__tests__/Popover.spec.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ describe('Popover', () => {
6868
expect(isOpen).toBe(false);
6969

7070
expect(wrapper.find(TetherContent).length).toBe(0);
71-
expect(document.body.querySelectorAll('.popover.in').length).toBe(0);
71+
expect(document.body.querySelectorAll('.popover.active').length).toBe(0);
7272
expect(document.getElementsByClassName('popover').length).toBe(0);
7373
expect(document.getElementsByClassName('popover-inner').length).toBe(0);
7474
expect(document.getElementsByClassName('popover-title').length).toBe(0);
@@ -81,7 +81,7 @@ describe('Popover', () => {
8181

8282
expect(isOpen).toBe(true);
8383
expect(wrapper.find(TetherContent).length).toBe(1);
84-
expect(document.body.querySelectorAll('.popover.in').length).toBe(1);
84+
expect(document.body.querySelectorAll('.popover.active').length).toBe(1);
8585
expect(document.getElementsByClassName('popover').length).toBe(1);
8686
expect(document.getElementsByClassName('popover-inner').length).toBe(1);
8787
expect(document.getElementsByClassName('popover-title').length).toBe(1);

0 commit comments

Comments
 (0)