Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(checkbox): pass disabled prop to input #2800

Merged
merged 3 commits into from
May 18, 2018
Merged

fix(checkbox): pass disabled prop to input #2800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1987b1e
fix(checkbox): applying disable attribute to input component if exist…
ofir-shapira-como May 15, 2018
4a7f9ab
Merge branch 'master' into master
ofir-shapira-como May 18, 2018
9488713
test(checkbox): testing the underlying input have disabled attribute …
ofir-shapira-como May 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 18 additions & 30 deletions src/modules/Checkbox/Checkbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,7 @@ export default class Checkbox extends Component {
fitted: PropTypes.bool,

/** A unique identifier. */
id: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
]),
id: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),

/** Whether or not checkbox is indeterminate. */
indeterminate: PropTypes.bool,
Expand Down Expand Up @@ -86,50 +83,32 @@ export default class Checkbox extends Component {
onMouseDown: PropTypes.func,

/** Format as a radio element. This means it is an exclusive option. */
radio: customPropTypes.every([
PropTypes.bool,
customPropTypes.disallow(['slider', 'toggle']),
]),
radio: customPropTypes.every([PropTypes.bool, customPropTypes.disallow(['slider', 'toggle'])]),

/** A checkbox can be read-only and unable to change states. */
readOnly: PropTypes.bool,

/** Format to emphasize the current selection state. */
slider: customPropTypes.every([
PropTypes.bool,
customPropTypes.disallow(['radio', 'toggle']),
]),
slider: customPropTypes.every([PropTypes.bool, customPropTypes.disallow(['radio', 'toggle'])]),

/** A checkbox can receive focus. */
tabIndex: PropTypes.oneOfType([
PropTypes.number,
PropTypes.string,
]),
tabIndex: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),

/** Format to show an on or off choice. */
toggle: customPropTypes.every([
PropTypes.bool,
customPropTypes.disallow(['radio', 'slider']),
]),
toggle: customPropTypes.every([PropTypes.bool, customPropTypes.disallow(['radio', 'slider'])]),

/** HTML input type, either checkbox or radio. */
type: PropTypes.oneOf(['checkbox', 'radio']),

/** The HTML input value. */
value: PropTypes.oneOfType([
PropTypes.string,
PropTypes.number,
]),
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
}

static defaultProps = {
type: 'checkbox',
}

static autoControlledProps = [
'checked',
'indeterminate',
]
static autoControlledProps = ['checked', 'indeterminate']

static _meta = {
name: 'Checkbox',
Expand Down Expand Up @@ -178,7 +157,11 @@ export default class Checkbox extends Component {

if (!this.canToggle()) return

_.invoke(this.props, 'onClick', e, { ...this.props, checked: !checked, indeterminate: !!indeterminate })
_.invoke(this.props, 'onClick', e, {
...this.props,
checked: !checked,
indeterminate: !!indeterminate,
})
_.invoke(this.props, 'onChange', e, { ...this.props, checked: !checked, indeterminate: false })

this.trySetState({ checked: !checked, indeterminate: false })
Expand All @@ -188,7 +171,11 @@ export default class Checkbox extends Component {
debug('handleMouseDown()')
const { checked, indeterminate } = this.state

_.invoke(this.props, 'onMouseDown', e, { ...this.props, checked: !!checked, indeterminate: !!indeterminate })
_.invoke(this.props, 'onMouseDown', e, {
...this.props,
checked: !!checked,
indeterminate: !!indeterminate,
})
_.invoke(this.inputRef, 'focus')

e.preventDefault()
Expand Down Expand Up @@ -250,6 +237,7 @@ export default class Checkbox extends Component {
{...htmlInputProps}
checked={checked}
className='hidden'
disabled={disabled}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the actual change, passing disabled attribute to the input if set as a prop to Checkbox

id={id}
name={name}
onClick={this.handleInputClick}
Expand Down
109 changes: 51 additions & 58 deletions test/specs/modules/Checkbox/Checkbox-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,36 +65,24 @@ describe('Checkbox', () => {
it('can be checked and unchecked', () => {
wrapperShallow(<Checkbox />)

wrapper
.find('input')
.should.not.be.checked()
wrapper.find('input').should.not.be.checked()

wrapper.simulate('click')
wrapper
.find('input')
.should.be.checked()
wrapper.find('input').should.be.checked()

wrapper.simulate('click')
wrapper
.find('input')
.should.not.be.checked()
wrapper.find('input').should.not.be.checked()
})
it('can be checked but not unchecked when radio', () => {
wrapperShallow(<Checkbox radio />)

wrapper
.find('input')
.should.not.be.checked()
wrapper.find('input').should.not.be.checked()

wrapper.simulate('click')
wrapper
.find('input')
.should.be.checked()
wrapper.find('input').should.be.checked()

wrapper.simulate('click')
wrapper
.find('input')
.should.be.checked()
wrapper.find('input').should.be.checked()
})
})

Expand Down Expand Up @@ -154,17 +142,24 @@ describe('Checkbox', () => {
wrapperShallow(<Checkbox disabled />)

wrapper.simulate('click')
wrapper
.find('input')
.should.not.be.checked()
wrapper.find('input').should.not.be.checked()
})

it('cannot be unchecked', () => {
wrapperShallow(<Checkbox defaultChecked disabled />)

wrapper.simulate('click')
wrapper
wrapper.find('input').should.be.checked()
})

it('is applied to the underlying html input element', () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the tests, better to review in Split mode as GitHub did a diff mess because of the Lint

wrapperShallow(<Checkbox disabled />)
.find('input')
.should.be.checked()
.should.have.prop('disabled', true)

wrapperShallow(<Checkbox disabled={false} />)
.find('input')
.should.have.prop('disabled', false)
})
})

Expand Down Expand Up @@ -203,37 +198,35 @@ describe('Checkbox', () => {

describe('label', () => {
it('adds the "fitted" class when not present', () => {
shallow(<Checkbox name='firstName' />)
.should.have.className('fitted')
shallow(<Checkbox name='firstName' />).should.have.className('fitted')
})

it('adds the "fitted" class when is null', () => {
shallow(<Checkbox name='firstName' />)
.should.have.className('fitted')
shallow(<Checkbox name='firstName' />).should.have.className('fitted')
})

it('does not add the "fitted" class when is not nil', () => {
shallow(<Checkbox name='firstName' label='' />)
.should.not.have.className('fitted')
shallow(<Checkbox name='firstName' label='' />).should.not.have.className('fitted')

shallow(<Checkbox name='firstName' label={0} />)
.should.not.have.className('fitted')
shallow(<Checkbox name='firstName' label={0} />).should.not.have.className('fitted')
})
})

describe('onChange', () => {
it('is called with (event { name, value, !checked }) on click', () => {
const spy = sandbox.spy()
const expectProps = { name: 'foo', value: 'bar', checked: false, indeterminate: true }
mount(<Checkbox onChange={spy} {...expectProps} />)
.simulate('click')
mount(<Checkbox onChange={spy} {...expectProps} />).simulate('click')

spy.should.have.been.calledOnce()
spy.should.have.been.calledWithMatch({}, {
...expectProps,
checked: !expectProps.checked,
indeterminate: false,
})
spy.should.have.been.calledWithMatch(
{},
{
...expectProps,
checked: !expectProps.checked,
indeterminate: false,
},
)
})
it('is called once on input click when "id" prop is passed', () => {
const onChange = sandbox.spy()
Expand All @@ -260,15 +253,17 @@ describe('Checkbox', () => {
it('is called with (event { name, value, checked }) on label click', () => {
const spy = sandbox.spy()
const expectProps = { name: 'foo', value: 'bar', checked: false, indeterminate: true }
mount(<Checkbox onClick={spy} {...expectProps} />)
.simulate('click')
mount(<Checkbox onClick={spy} {...expectProps} />).simulate('click')

spy.should.have.been.calledOnce()
spy.should.have.been.calledWithMatch({}, {
...expectProps,
checked: !expectProps.checked,
indeterminate: expectProps.indeterminate,
})
spy.should.have.been.calledWithMatch(
{},
{
...expectProps,
checked: !expectProps.checked,
indeterminate: expectProps.indeterminate,
},
)
})
it('is called once on input click when "id" prop is passed', () => {
const onClick = sandbox.spy()
Expand All @@ -295,15 +290,17 @@ describe('Checkbox', () => {
it('is called with (event { name, value, checked }) on label mouse down', () => {
const onMousedDown = sandbox.spy()
const expectProps = { name: 'foo', value: 'bar', checked: false, indeterminate: true }
mount(<Checkbox onMouseDown={onMousedDown} {...expectProps} />)
.simulate('mousedown')
mount(<Checkbox onMouseDown={onMousedDown} {...expectProps} />).simulate('mousedown')

onMousedDown.should.have.been.calledOnce()
onMousedDown.should.have.been.calledWithMatch({}, {
...expectProps,
checked: expectProps.checked,
indeterminate: expectProps.indeterminate,
})
onMousedDown.should.have.been.calledWithMatch(
{},
{
...expectProps,
checked: expectProps.checked,
indeterminate: expectProps.indeterminate,
},
)
})
it('prevents default event', () => {
const preventDefault = sandbox.spy()
Expand All @@ -326,17 +323,13 @@ describe('Checkbox', () => {
wrapperShallow(<Checkbox readOnly />)

wrapper.simulate('click')
wrapper
.find('input')
.should.not.be.checked()
wrapper.find('input').should.not.be.checked()
})
it('cannot be unchecked', () => {
wrapperShallow(<Checkbox defaultChecked readOnly />)

wrapper.simulate('click')
wrapper
.find('input')
.should.be.checked()
wrapper.find('input').should.be.checked()
})
})

Expand Down