Block conversion: Preserve "More" order #5538
Conversation
* Props @swissspidy * Properly replace nodes in rawHandler * Extend tests for rawHandler's `special-comment-converter` transform * Add rawHandler integration test `classic`
| @@ -71,3 +70,16 @@ function createMore( customText, noTeaser ) { | |||
| } | |||
| return node; | |||
| } | |||
|
|
|||
| function replace( processedNode, newNode ) { | |||
There was a problem hiding this comment.
Minor: Worth adding these to dom utils? We're doing these in a few places I think, even outside the paste component. Could be done separately though.
There was a problem hiding this comment.
To do: actually refactor elsewhere in the code base.
| @@ -0,0 +1,4 @@ | |||
| <p>First paragraph.</p> | |||
| <p><!--more--></p> | |||
There was a problem hiding this comment.
Would it be worth adding more tests here such as <p>First <!--more--> paragraph.</p>?
| @@ -14,6 +14,7 @@ import serialize from '../../../serializer'; | |||
|
|
|||
| const types = [ | |||
| 'plain', | |||
| 'classic', | |||
There was a problem hiding this comment.
I wonder if we could consolidate the other image and iframe test into one "classic" conversion test similar to the other integration tests.
There was a problem hiding this comment.
I'd like that, or something along those lines. Better left to another PR, though, no?
| return `<p>${ string }</p>`; | ||
| } | ||
|
|
||
| function withEmptyP( string ) { |
There was a problem hiding this comment.
I'm not sure if this is any create than without this function. withEmptyP leases me wondering where exactly that empty paragraph will be.
There was a problem hiding this comment.
Agreed; removing simplifies things.
| output.substr( start ), | ||
| '<wp-block data-block="core/more" data-no-teaser=""></wp-block>' | ||
| trimWhitespace( output ), | ||
| trimWhitespace( `<p>First paragraph.</p> |
There was a problem hiding this comment.
I don't understand why trimWhitespace is necessary. Shouldn't it be preserved?
There was a problem hiding this comment.
(I mean, isn't specialCommentConverter merely moving other nodes?)
There was a problem hiding this comment.
Yeah. As I was developing I wanted the tests to have these input/output strings neatly aligned with the rest of the code but that meant adding tab characters throughout. Not that that's wrong, but it made the tests more brittle. I'll probably remove this.
|
Thanks for the review, @iseulde. Mind having one last look? |
mcsf
force-pushed
the
fix/more-tag-block-conversion
branch
from
bd5cf9d
to
9874d43
Compare
Fixes the issue described by @swissspidy in #1467 (comment)
Kudos @swissspidy for the fix; I merely added tests.
(drive-by pull request; can provide further details later)
Description
How Has This Been Tested?
Screenshots (jpeg or gifs if applicable):
Types of changes
Checklist: