Add a control per block to reset pattern overrides #57907
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
kevin940726
added
[Feature] Synced Patterns
kevin940726
commented
Jan 17, 2024
| attribute1 instanceof RichTextData && | ||
| attribute2 instanceof RichTextData | ||
| ) { | ||
| return attribute1.toString() === attribute2.toString(); |
There was a problem hiding this comment.
A bit of a gotcha here that if the attributes are different RichTextData instances then === won't be true even though we expect them to be most of the time. 🤔
There was a problem hiding this comment.
I can't really think of another way, so this looks ok to me.
|
Size Change: +401 B (0%) Total Size: 1.69 MB
ℹ️ View Unchanged
|
49 tasks
kevin940726
force-pushed
the
add/reset-pattern-overrides-per-block
branch
from
d8e58d6
to
71f815a
Compare
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the Core SVNCore Committers: Use this line as a base for the props when committing in SVN: GitHub Merge commitsIf you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
|
Flaky tests detected in 71f815a. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7775121664
|
talldan
force-pushed
the
add/reset-pattern-overrides-per-block
branch
from
71f815a
to
a5eb4fe
Compare
talldan
reviewed
Feb 6, 2024
There was a problem hiding this comment.
At the moment it's not quite working for me, the reset button always appears greyed out even after making edits:
I rebased and pushed a commit for an issue where the button wasn't showing at all (code needed to be updated for the new block bindings format), so it could be something similar.
I think it'd be good if the button could be moved to the end of the toolbar rather than the start, it's quite prominent at the moment.
| attribute1 instanceof RichTextData && | ||
| attribute2 instanceof RichTextData | ||
| ) { | ||
| return attribute1.toString() === attribute2.toString(); |
There was a problem hiding this comment.
I can't really think of another way, so this looks ok to me.
kevin940726
force-pushed
the
add/reset-pattern-overrides-per-block
branch
from
a5eb4fe
to
a2abc1b
Compare
|
Just fixed the issue and moved the reset button to the end.
I also added an e2e test. |
talldan
reviewed
Feb 6, 2024
Comment on lines
15
to
21
| return blocks.find( ( block ) => { | ||
| if ( block.attributes.metadata?.id === id ) { | ||
| return block; | ||
| } | ||
|
|
||
| return recursivelyFindBlockWithId( block.innerBlocks, id ); | ||
| } ); |
There was a problem hiding this comment.
@kevin940726 I don't think this does what's expected. blocks.find will only ever return a top-level block since it gets the value from the current array that the callback returns truthy for.
If you try a pattern where an overriden paragraph is nested in a group it doesn't work as expected.
There was a problem hiding this comment.
Oops! I don't know what I was thinking 😅. Fixed in 6ec77d7. Hopefully I'm not missing something obvious again! 🤞
kevin940726
force-pushed
the
add/reset-pattern-overrides-per-block
branch
from
6ec77d7
to
7421a50
Compare
glendaviesnz
approved these changes
Feb 7, 2024
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?
Part of #53705 and #57751. Continued from #57845.
Add a control per block to reset pattern overrides.
Why?
As mentioned in #57751.
How?
Add a control and conditionally render it.
Testing Instructions
Follow the instructions in #53705 (comment) to create a pattern with overrides and add it to a post.
Screenshots or screencast
Block without overrides
Block with overrides
