Skip to content

[Tooltip] Suppress disabled button warning when controlled #15304

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

Merged
merged 3 commits into from
Apr 11, 2019
Merged

[Tooltip] Suppress disabled button warning when controlled #15304

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
ae21bfa
[Tooltip] Suppress warning if button is disabled and we are controlle…
Apr 10, 2019
f49e02b
Green.
oliviertassinari Apr 10, 2019
b889b95
fix lint error
oliviertassinari Apr 10, 2019
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
1 change: 1 addition & 0 deletions packages/material-ui/src/Tooltip/Tooltip.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class Tooltip extends React.Component {
componentDidMount() {
warning(
!this.childrenRef.disabled ||
(this.childrenRef.disabled && this.isControlled) ||
(this.childrenRef.disabled && this.props.title === '') ||
this.childrenRef.tagName.toLowerCase() !== 'button',
[
Expand Down
17 changes: 14 additions & 3 deletions packages/material-ui/src/Tooltip/Tooltip.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ describe('<Tooltip />', () => {
});

describe('disabled button warning', () => {
before(() => {
beforeEach(() => {
consoleErrorMock.spy();
});

after(() => {
afterEach(() => {
consoleErrorMock.reset();
});

Expand All @@ -273,7 +273,7 @@ describe('<Tooltip />', () => {
assert.strictEqual(consoleErrorMock.callCount(), 0, 'should not call console.error');
});

it('should raise a warning when we can listen to events', () => {
it('should raise a warning when we are uncontrolled and can not listen to events', () => {
mount(
<Tooltip title="Hello World">
<button type="submit" disabled>
Expand All @@ -287,6 +287,17 @@ describe('<Tooltip />', () => {
/Material-UI: you are providing a disabled `button` child to the Tooltip component/,
);
});

it('should not raise a warning when we are controlled', () => {
mount(
<Tooltip title="Hello World" open>
<button type="submit" disabled>
Hello World
</button>
</Tooltip>,
);
assert.strictEqual(consoleErrorMock.callCount(), 0);
});
});

describe('prop: interactive', () => {
Expand Down