Add a control to reset pattern overrides #57845
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
|
Size Change: +855 B (0%) Total Size: 1.7 MB
ℹ️ View Unchanged
|
49 tasks
talldan
reviewed
Jan 15, 2024
Comment on lines
343
to
351
| { overrides ? ( | ||
| <BlockControls> | ||
| <ToolbarGroup> | ||
| <ToolbarButton onClick={ resetOverrides }> | ||
| { __( 'Reset overrides' ) } | ||
| </ToolbarButton> | ||
| </ToolbarGroup> | ||
| </BlockControls> | ||
| ) : null } |
There was a problem hiding this comment.
Actually, one thing is that selecting the button causes a focus loss due to the way it's no longer rendered, so it should probably have a aria-disabled state instead (one that is focusable).
There was a problem hiding this comment.
Good catch! Or should we move the focus to the pattern block instead? Not sure which is better atm.
There was a problem hiding this comment.
Most of the accessibility feedback I see is that focus shouldn't be moved unexpectedly if there's an alternative, so that's why I feel that a disabled state would be the way to go. There's also a lot of precedence for this in the block editor, like the undo/redo buttons that retain focus when they become disabled.
It does introduce the caveat around patterns without overrides, should they have a visible button or should it be disabled? My feeling is that there probably shouldn't be a button at all since it would never become enabled.
There was a problem hiding this comment.
The problem is that patterns without overrides have the same state as after resetting the overrides 🤔. Unless we keep the previous state somehow, but I think that's more confusing than always showing the disabled button. Am I misunderstanding something here?
There was a problem hiding this comment.
The problem is that patterns without overrides have the same state as after resetting the overrides
We do look through the inner blocks to check for any that can have overrides here:
gutenberg/packages/block-library/src/block/edit.js
Lines 141 to 148 in f6d29bd
So given we do that we could also derive whether the pattern has any override attributes within it at the same time and use that to control visibility of the button. I think you end up with three states:
- Pattern has inner blocks that can be overriden but has no override state - show the button but disabled
- Pattern has inner blocks that can be overriden and has override state - show the button enabled
- None of the pattern's inner blocks can be overriden - don't show the button
There was a problem hiding this comment.
Oh I see what you mean now! I was only considering the (1) and the (2) states.
talldan
reviewed
Jan 16, 2024
| <BlockControls> | ||
| <ToolbarGroup> | ||
| <ToolbarButton onClick={ resetOverrides }> | ||
| { __( 'Reset overrides' ) } |
There was a problem hiding this comment.
A thought. I wonder if 'Reset to original' might be a slight improvement on the copy. It fits nicely with the 'Edit original' button next to it, and is slightly less technical.
|
Yep fine for now. We can move into ellipsis menu later if needed |
…lbar button so that it maintains focus
talldan
reviewed
Jan 17, 2024
| <ToolbarGroup> | ||
| <ToolbarButton | ||
| onClick={ resetOverrides } | ||
| aria-disabled={ overrides ? 'false' : 'true' } |
There was a problem hiding this comment.
I remember that Buttons are a bit unusual in that you have to pass disabled and __experimentalIsFocusable in order for it to retain focus.
Pushed a commit that does that.
talldan
approved these changes
Jan 17, 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. Close #57751.
Why?
See #57751.
How?
Add a block control to reset the pattern overrides.
Testing Instructions
Follow the instructions in #53705 (comment) to create a pattern with overrides and add it to a post.
Screenshots or screencast
For patterns that can be overridden but no overrides.
For patterns that can be overridden and with overrides.
For patterns that cannot be overridden.
