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

Jump to bottom

fix(SelectableTile): sync selected prop and state #8279

Merged
merged 8 commits into from
Apr 12, 2021
Merged

fix(SelectableTile): sync selected prop and state #8279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d0dd6c
docs(Tile): update deprecation warning
emyarod Apr 1, 2021
c260d00
fix(Tile): sync props and state when uncontrolled
emyarod Apr 1, 2021
943568b
test(Tile): update SelectableTile tests
emyarod Apr 1, 2021
812e523
chore: update snapshots
emyarod Apr 1, 2021
8ea3b21
docs(Tile): add temp example story
emyarod Apr 1, 2021
d52f7d2
refactor(Tile): use hoisted functions instead of expressions
emyarod Apr 5, 2021
479fb55
docs(Tile): remove test story
emyarod Apr 12, 2021
df08693
Merge branch 'main' into 7759-selectabletile-controlled-mode
kodiakhq[bot] Apr 12, 2021
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
17 changes: 8 additions & 9 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5836,10 +5836,7 @@ Map {
},
"SelectableTile" => Object {
"defaultProps": Object {
"handleClick": [Function],
"handleKeyDown": [Function],
"light": false,
"onChange": [Function],
"selected": false,
"tabIndex": 0,
"title": "title",
Expand All @@ -5855,12 +5852,8 @@ Map {
"disabled": Object {
"type": "bool",
},
"handleClick": Object {
"type": "func",
},
"handleKeyDown": Object {
"type": "func",
},
"handleClick": [Function],
"handleKeyDown": [Function],
"iconDescription": [Function],
"id": Object {
"type": "string",
Expand All @@ -5874,6 +5867,12 @@ Map {
"onChange": Object {
"type": "func",
},
"onClick": Object {
"type": "func",
},
"onKeyDown": Object {
"type": "func",
},
"selected": Object {
"type": "bool",
},
Expand Down
40 changes: 24 additions & 16 deletions packages/react/src/components/Tile/Tile-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,10 @@ describe('Tile', () => {

beforeEach(() => {
wrapper = mount(
<SelectableTile className="extra-class">
<SelectableTile className="extra-class" onClick={jest.fn()}>
<div className="child">Test</div>
</SelectableTile>
);
wrapper.state().selected = false;
label = wrapper.find('label');
});

Expand All @@ -155,42 +154,51 @@ describe('Tile', () => {
});

it('toggles the selectable state on click', () => {
expect(wrapper.state().selected).toEqual(false);
expect(wrapper.hasClass(`${prefix}--tile--is-selected`)).toEqual(false);
label.simulate('click');
expect(wrapper.state().selected).toEqual(true);
expect(wrapper.props().onClick).toHaveBeenCalledTimes(1);
expect(wrapper.render().hasClass(`${prefix}--tile--is-selected`)).toEqual(
true
);
});

it('toggles the selectable state when using enter or space', () => {
expect(wrapper.state().selected).toEqual(false);
expect(wrapper.hasClass(`${prefix}--tile--is-selected`)).toEqual(false);
label.simulate('keydown', { which: 32 });
expect(wrapper.state().selected).toEqual(true);
expect(wrapper.render().hasClass(`${prefix}--tile--is-selected`)).toEqual(
true
);
label.simulate('keydown', { which: 13 });
expect(wrapper.state().selected).toEqual(false);
expect(wrapper.render().hasClass(`${prefix}--tile--is-selected`)).toEqual(
false
);
});

it('the input should be checked when state is selected', () => {
wrapper.setState({ selected: true });
label.simulate('click');
expect(wrapper.find('input').props().checked).toEqual(true);
});

it('supports setting initial selected state from props', () => {
expect(shallow(<SelectableTile selected />).state().selected).toEqual(
true
);
expect(
shallow(<SelectableTile selected />)
.render()
.hasClass(`${prefix}--tile--is-selected`)
).toEqual(true);
});

it('supports setting selected state from props', () => {
wrapper.setProps({ selected: true });
wrapper.setState({ selected: true });
wrapper.setProps({ selected: false });
expect(wrapper.state().selected).toEqual(false);
expect(wrapper.render().hasClass(`${prefix}--tile--is-selected`)).toEqual(
true
);
});

it('avoids changing selected state upon setting props, unless actual value change is detected', () => {
wrapper.setProps({ selected: true });
wrapper.setState({ selected: false });
label.simulate('click');
wrapper.setProps({ selected: true });
expect(wrapper.state().selected).toEqual(false);
expect(wrapper.hasClass(`${prefix}--tile--is-selected`)).toEqual(false);
});

it('supports light version', () => {
Expand Down
Loading