Skip to content

Element: Apply wrapper div for RawHTML with non-children props #6044

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
aduth merged 3 commits into from
Apr 12, 2018
Merged

Element: Apply wrapper div for RawHTML with non-children props #6044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ba86f3
Element: Apply wrapper div for RawHTML with props
aduth Apr 6, 2018
9285350
Element: Avoid rendering invalid dangerouslySetInnerHTML
aduth Apr 11, 2018
2d603c9
Element: Render RawHTML as fragment native component
aduth Apr 11, 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
Prev Previous commit
Next Next commit
Element: Avoid rendering invalid dangerouslySetInnerHTML
  • Loading branch information
@aduth
aduth committed Apr 11, 2018
commit 92853507e152ea4b0e4f379c6e6dd953466e9aeb
3 changes: 2 additions & 1 deletion element/serialize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,8 @@ export function renderNativeComponent( type, props, context = {} ) {
// as well.
content = renderChildren( [ props.value ], context );
props = omit( props, 'value' );
} else if ( props.dangerouslySetInnerHTML ) {
} else if ( props.dangerouslySetInnerHTML &&
typeof props.dangerouslySetInnerHTML.__html === 'string' ) {
// Dangerous content is left unescaped.
content = props.dangerouslySetInnerHTML.__html;
} else if ( typeof props.children !== 'undefined' ) {
Expand Down
6 changes: 6 additions & 0 deletions element/test/serialize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,12 @@ describe( 'renderNativeComponent()', () => {
expect( result ).toBe( '<div>&lt;img/></div>' );
} );

it( 'should not render invalid dangerouslySetInnerHTML', () => {
const result = renderNativeComponent( 'div', { dangerouslySetInnerHTML: { __html: undefined } } );

expect( result ).toBe( '<div></div>' );
} );

it( 'should not escape children with dangerouslySetInnerHTML', () => {
const result = renderNativeComponent( 'div', { dangerouslySetInnerHTML: { __html: '<img/>' } } );

Expand Down