Skip to content

RichText: Add a format prop to allow HTML string values to be used in RichText components #6034

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
youknowriad merged 8 commits into from
Apr 19, 2018
Merged

RichText: Add a format prop to allow HTML string values to be used in RichText components #6034

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cf196aa
RichText: Add a format prop to allow HTML string values to be used in…
youknowriad Apr 6, 2018
d85b718
Don't align params and returns docs
youknowriad Apr 11, 2018
a3f4726
Add domToFormat function to factorize ternaries
youknowriad Apr 11, 2018
0bec108
Remove useless stringToElement
youknowriad Apr 11, 2018
dd9e099
Add valueToString to avoid ternaries when converting to strings
youknowriad Apr 11, 2018
2963b65
Avoid double isEmpty check
youknowriad Apr 13, 2018
665c59e
Use valid HTML in unit tests
youknowriad Apr 13, 2018
db26521
Fix splitting
ellatrix Apr 16, 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
Use valid HTML in unit tests
  • Loading branch information
@youknowriad @ellatrix
youknowriad authored and ellatrix committed Apr 16, 2018
commit 665c59e7e5227d6a5921eb023f0761a3079f338e
6 changes: 3 additions & 3 deletions blocks/rich-text/test/__snapshots__/format.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`createTinyMCEElement should render a TinyMCE element 1`] = `
<p
a-prop="hi"
<div
data-prop="hi"
>
<p>
Copy link
Member

@ellatrix ellatrix Apr 13, 2018

Choose a reason for hiding this comment

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

Hm, isn't this invalid HTML? Won't React warn on nesting paragraphs? Or do we not care here for these tests?

Copy link
Member

@aduth aduth Apr 13, 2018

Choose a reason for hiding this comment

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

Our new non-React serializer is much less noisy about issues it encounters. Not to say we shouldn't be using valid HTML here though.

Child
</p>
</p>
</div>
`;

exports[`domToElement should return the corresponding element 1`] = `
Expand Down
4 changes: 2 additions & 2 deletions blocks/rich-text/test/format.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
} from '../format';

describe( 'createTinyMCEElement', () => {
const type = 'p';
const type = 'div';
const children = <p>Child</p>;

test( 'should return null', () => {
Expand All @@ -41,7 +41,7 @@ describe( 'createTinyMCEElement', () => {

test( 'should render a TinyMCE element', () => {
const props = {
'a-prop': 'hi',
'data-prop': 'hi',
};

const wrapper = shallow( createTinyMCEElement( type, props, children ) );
Expand Down