Raw handling: fix block schema merging #56558
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ellatrix
added
[Type] Bug
|
Size Change: +562 B (0%) Total Size: 1.7 MB
ℹ️ View Unchanged
|
ellatrix
commented
Nov 27, 2023
| '<pre class="wp-block-preformatted">1\n2</pre>' | ||
| ); | ||
| expect( console ).toHaveLogged(); | ||
| } ); |
There was a problem hiding this comment.
The above test will fail in trunk.
tyxla
approved these changes
Nov 27, 2023
There was a problem hiding this comment.
Thanks for fixing it and for adding integration tests, @ellatrix 🙌
I confirm that the pre test fails in trunk, but passes here 👍
I also appreciate the readability your merging suggestion introduces - makes it much more predictable for someone who isn't aware of the existing schemas. 💯
Finally, so much cleaner than using a deep merging library that was not only not working in all cases but also likely to have been adding overhead. 🏋️
Should this be cherry-picked to a minor release? 🍒
In any case, 🚀 and thanks again!
Comment on lines
77
to
78
| // An tagName schema is an object with children, attributes, require, and | ||
| // isMatch properties. |
There was a problem hiding this comment.
Suggested change
| // An tagName schema is an object with children, attributes, require, and | |
| // isMatch properties. | |
| // A tagName schema is an object with children, attributes, require, and | |
| // isMatch properties. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What?
#50637 introduced a problem with schema merging. It seems the
isMatchfunctions are not properly merged. For some reason the custom merge function is not working, while it was working with the lodash function.How?
Just merge it ourselves.
Testing Instructions
Go to https://www.gutenberg.org/cache/epub/11/pg11.txt, select a few paragraphs, and paste it into GB. Instead of a Preformatted block, it's a paragraph with one giant text block.
Testing Instructions for Keyboard
Screenshots or screencast