Skip to content

Commit

Permalink
feat(dividers): dividers passthrough className, id and style
Browse files Browse the repository at this point in the history
adds functionality to passthrough style and tests for className, id
and style passthrough

[#87784030]
  • Loading branch information
Caroline Taymor and Kenny Wang authored and pivotal ui committed Jul 15, 2015
1 parent a164d9d commit 7d1db48
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion spec/pivotal-ui-react/divider/divider_spec.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
require('../spec_helper');

import {propagateAttributes} from '../spec_helper';

describe('Divider', function() {
var Divider;
beforeEach(function() {
Divider = require('../../../src/pivotal-ui-react/dividers/dividers').Divider;
React.render(<Divider/>, root);
React.render(<Divider className='test-class' id='test-id' style={{opacity: '1'}}/>, root);
});

afterEach(function() {
Expand All @@ -15,6 +17,7 @@ describe('Divider', function() {
expect('hr').toHaveClass('divider-alternate-1');
});

propagateAttributes('hr', {className: 'test-class', id: 'test-id', style: {opacity: '1'}});
describe('when large is set to true', function() {
beforeEach(function() {
React.render(<Divider size="large"/>, root);
Expand Down
14 changes: 7 additions & 7 deletions src/pivotal-ui-react/dividers/dividers.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var React = require('react');
var types = React.PropTypes;
var classnames = require('classnames');
import {mergeProps} from '../../../src/pivotal-ui-react/helpers/helpers';

var DividerProps = {
propTypes: {
Expand Down Expand Up @@ -37,18 +37,18 @@ var Divider = React.createClass({
mixins: [DividerProps],

render() {
var {inverse, size, className, ...others} = this.props;
var classes = classnames(
className,
var {inverse, size, ...others} = this.props;
var dividerClass =
{
'divider-1': inverse && size !== 'large',
'divider-2': inverse && size === 'large',
'divider-alternate-1': !inverse && size !== 'large',
'divider-alternate-2': !inverse && size === 'large'
}
);
};

return <hr {...others} className={classes}/>;
const props = mergeProps(others, {className: dividerClass});

return <hr {...props}/>;
}
});

Expand Down

0 comments on commit 7d1db48

Please sign in to comment.