Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/renderers/dom/shared/ReactDOMComponent.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,9 @@ function assertValidProps(component, props) {
'For more information, lookup documentation on `dangerouslySetInnerHTML`.'
);
warning(
!props.contentEditable || props.children == null,
props.suppressContentEditableWarning ||
!props.contentEditable ||
props.children == null,
'A component is `contentEditable` and contains `children` managed by ' +
'React. It is now your responsibility to guarantee that none of ' +
'those nodes are unexpectedly modified or duplicated. This is ' +
Expand Down
6 changes: 6 additions & 0 deletions src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,12 @@ describe('ReactDOMComponent', function() {
expect(console.error.argsForCall[0][0]).toContain('contentEditable');
});

it('should respect suppressContentEditableWarning', function() {
spyOn(console, 'error');
mountComponent({contentEditable: true, children: '', suppressContentEditableWarning: true});
expect(console.error.argsForCall.length).toBe(0);
});

it('should validate against invalid styles', function() {
expect(function() {
mountComponent({style: 'display: none'});
Expand Down