Skip to content

Commit b2b347e

Browse files
committed
cleanup
1 parent 08dd84a commit b2b347e

4 files changed

Lines changed: 7 additions & 11 deletions

File tree

src/modules/Dropdown/Dropdown.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import $ from 'jquery';
33
import classNames from 'classnames';
44
import React, {Component, PropTypes} from 'react';
55
import META from 'src/utils/Meta';
6-
import getUnhandledProps from 'src/utils/getUnhandledProps';
76

87
export default class Dropdown extends Component {
98
static propTypes = {
@@ -12,12 +11,11 @@ export default class Dropdown extends Component {
1211
value: PropTypes.string,
1312
text: PropTypes.string,
1413
})),
15-
settings: PropTypes.object,
1614
};
1715

1816
componentDidMount() {
1917
this.element = $(this.refs.select);
20-
this.element.dropdown(this.props.settings);
18+
this.element.dropdown();
2119
}
2220

2321
componentDidUpdate(prevProps, prevState) {
@@ -45,7 +43,8 @@ export default class Dropdown extends Component {
4543
'dropdown'
4644
);
4745

48-
const props = getUnhandledProps(this);
46+
const props = _.clone(this.props);
47+
delete props.options;
4948

5049
return (
5150
<select {...props} className={classes} ref='select'>

src/modules/Modal/Modal.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import React, {Component, PropTypes} from 'react';
22
import classNames from 'classnames';
33
import META from 'src/utils/Meta';
4-
import getUnhandledProps from 'src/utils/getUnhandledProps';
54

6-
export default class Modal extends Component {
5+
class Modal extends Component {
76
static propTypes = {
87
children: PropTypes.any,
98
className: PropTypes.string,
@@ -40,12 +39,12 @@ export default class Modal extends Component {
4039
{'transition visible active': this.state.isShown},
4140
);
4241

43-
const props = getUnhandledProps(this);
44-
4542
return (
46-
<div {...props} className={classes}>
43+
<div {...this.props} className={classes}>
4744
{this.props.children}
4845
</div>
4946
);
5047
}
5148
}
49+
50+
export default Modal;

src/modules/Modal/ModalHeader.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export default class ModalHeader extends Component {
66
static propTypes = {
77
children: PropTypes.any,
88
className: PropTypes.string,
9-
settings: PropTypes.object,
109
};
1110

1211
static _meta = {

test/specs/Conformance-test.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ describe('Conformance', () => {
9292

9393
hasSpreadProps.should.equal(true);
9494
});
95-
9695
describe('className', () => {
9796
it(`has props.className after "${sdClass}"`, () => {
9897
const renderedClasses = render(<SDComponent className={classes} />)

0 commit comments

Comments
 (0)