Add block warning overwrite #8166
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
johngodley
force-pushed
the
add/block-warning-overwrite
branch
from
f53ed8c to
c5389dc
Compare
johngodley
added
[Status] In Progress
johngodley
force-pushed
the
add/block-warning-overwrite
branch
4 times, most recently
from
f3204d3 to
e6ff955
Compare
johngodley
force-pushed
the
add/block-warning-overwrite
branch
3 times, most recently
from
02c6ba8 to
654100d
Compare
johngodley
changed the title
johngodley
removed
the
[Status] In Progress
johngodley
force-pushed
the
add/block-warning-overwrite
branch
from
654100d to
f17c6af
Compare
There was a problem hiding this comment.
Hi @johngodley, that sounds like a good feature to have 👍 I tried to test this and I'm having some problems. Each time I press the action to overwrite nothing happens.
Am I doing something wrong?
|
Uhh, sorry - my merge conflict resolving went awry. I've fixed the stupid typo and it should now do something! |
johngodley
force-pushed
the
add/block-warning-overwrite
branch
from
d2ecb6a to
d9e238a
Compare
jorgefilipecosta
force-pushed
the
add/block-warning-overwrite
branch
from
d9e238a to
0ee3177
Compare
jorgefilipecosta
approved these changes
Oct 10, 2018
| @@ -90,6 +91,7 @@ const blockToBlocks = ( block ) => rawHandler( { | |||
| HTML: block.originalContent, | |||
| mode: 'BLOCKS', | |||
| } ); | |||
| const blockOverwrite = ( { name, attributes } ) => createBlock( name, attributes ); | |||
There was a problem hiding this comment.
I checked that on blocks with nested children we delete all the children content and we just restart the innerBlocks area.
That can be tested with block https://gist.github.com/jorgefilipecosta/7f0a54193f9d8d28c1514aa2e57a00fc.
this seems fixable with the following line:
const blockOverwrite = ( { name, attributes, innerBlocks } ) => createBlock( name, attributes, innerBlocks );
|
I wonder if this could be renamed to something like "Try to recover this block" or something? "Overwrite with valid block" isn't entirely clear (the "valid" bit in particular might be confusing). Love the idea though! |
|
Good point. I've changed the text to say 'Attempt block recovery'. If that still makes sense then I'll merge |
|
Pinging @karmatosed regarding the user experience/message. From the code point of view everything looks fine 👍 |
|
Attempt works for me :) |
|
Looks like this needs a rebase. Let's rebase and merge. |
This converts the invalid block to a single block of the same type, with any invalid HTML corrected by the block creation process
Also support inner blocks
jorgefilipecosta
force-pushed
the
add/block-warning-overwrite
branch
from
f2062ad to
0db0d39
Compare
youknowriad
pushed a commit
that referenced
this pull request
Mar 6, 2019
## Description Adds an option to the invalid block warning menu to fix the problem by re-creating the block with the current content, overwriting anything that is invalid. This was suggested in #7604 This is similar to the 'convert to blocks' option, but ensures the block stays of the same type. Contrast this with 'convert to blocks' which could convert to another block type, and could end in multiple blocks.  In a lot of situations 'overwrite' and 'convert to blocks' will result in the same conversion so it's debatable whether this is a useful enough conversion to include but I'm raising it here for opinion. This is the same overwrite function that used to exist in older versions of Gutenberg. ## How has this been tested? 1. Add a paragraph block 2. Edit block HTML and paste `<p>this is a paragraph</p><blockquote>invalid content</blockquote>` 3. Deselect the block to trigger invalid block warning 4. Pick 'Convert to blocks' 5. Verify that the invalid block is converted to two blocks - a corrected paragraph and a blockquote  6. Reset block HTML to (2) and pick 'Overwrite with valid block' 7. Verify that the invalid block is converted to the first paragraph 'this is a paragraph', with the blockquote removed ## Types of changes New feature for invalid block warning. Should not affect anything else ## Checklist: - [ ] My code is tested. - [ ] My code follows the WordPress code style. <!-- Check code: `npm run lint`, Guidelines: https://make.wordpress.org/core/handbook/best-practices/coding-standards/javascript/ --> - [ ] My code follows the accessibility standards. <!-- Guidelines: https://make.wordpress.org/core/handbook/best-practices/coding-standards/accessibility-coding-standards/ --> - [ ] My code has proper inline documentation. <!-- Guidelines: https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/javascript/ -->
youknowriad
pushed a commit
that referenced
this pull request
Mar 6, 2019
## Description Adds an option to the invalid block warning menu to fix the problem by re-creating the block with the current content, overwriting anything that is invalid. This was suggested in #7604 This is similar to the 'convert to blocks' option, but ensures the block stays of the same type. Contrast this with 'convert to blocks' which could convert to another block type, and could end in multiple blocks.  In a lot of situations 'overwrite' and 'convert to blocks' will result in the same conversion so it's debatable whether this is a useful enough conversion to include but I'm raising it here for opinion. This is the same overwrite function that used to exist in older versions of Gutenberg. ## How has this been tested? 1. Add a paragraph block 2. Edit block HTML and paste `<p>this is a paragraph</p><blockquote>invalid content</blockquote>` 3. Deselect the block to trigger invalid block warning 4. Pick 'Convert to blocks' 5. Verify that the invalid block is converted to two blocks - a corrected paragraph and a blockquote  6. Reset block HTML to (2) and pick 'Overwrite with valid block' 7. Verify that the invalid block is converted to the first paragraph 'this is a paragraph', with the blockquote removed ## Types of changes New feature for invalid block warning. Should not affect anything else ## Checklist: - [ ] My code is tested. - [ ] My code follows the WordPress code style. <!-- Check code: `npm run lint`, Guidelines: https://make.wordpress.org/core/handbook/best-practices/coding-standards/javascript/ --> - [ ] My code follows the accessibility standards. <!-- Guidelines: https://make.wordpress.org/core/handbook/best-practices/coding-standards/accessibility-coding-standards/ --> - [ ] My code has proper inline documentation. <!-- Guidelines: https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/javascript/ -->
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.
Description
Adds an option to the invalid block warning menu to fix the problem by re-creating the block with the current content, overwriting anything that is invalid. This was suggested in #7604
This is similar to the 'convert to blocks' option, but ensures the block stays of the same type. Contrast this with 'convert to blocks' which could convert to another block type, and could end in multiple blocks.
In a lot of situations 'overwrite' and 'convert to blocks' will result in the same conversion so it's debatable whether this is a useful enough conversion to include but I'm raising it here for opinion. This is the same overwrite function that used to exist in older versions of Gutenberg.
How has this been tested?
<p>this is a paragraph</p><blockquote>invalid content</blockquote>Types of changes
New feature for invalid block warning. Should not affect anything else
Checklist: