Keep Lock button it in the toolbar until unmounted #57229
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
|
Size Change: -99 B (0%) Total Size: 1.71 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in 7123d3a. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/7277638447
|
|
Probably best to hear from @WordPress/gutenberg-design folks for feedback on the newly proposed logic |
youknowriad
reviewed
Dec 20, 2023
|
|
||
| const shouldHideBlockLockUI = |
There was a problem hiding this comment.
I think there's a use-case where folks don't want people to be able to unlock and I believe there's a setting for that, so we need to make sure that this setting is still supported.
There was a problem hiding this comment.
The behavior on trunk is to not show the Lock Icon at all if canLockBlocks is false. So, the block is locked, but the user has no indicator. I'll match the behavior on trunk for now, then follow up with another PR that displays the lock icon without it opening a modal.
There was a problem hiding this comment.
Implemented the idea on showing a disabled lock icon for locked blocks when the user cannot edit it: #57274
There was a problem hiding this comment.
@jeryj, that's how I initially implemented the toolbar button but then reverted the change based on suggestion - #39566 (comment).
|
This seems like a good change to me. |
…ntil unmounted. If the block lock button has been shown, we don't want to remove it from the toolbar until the toolbar is rendered again without it. Removing it beforehand can cause focus loss issues, such as when unlocking the block from the modal. It needs to return focus from whence it came, and to do that, we need to leave the button in the toolbar.
jeryj
force-pushed
the
update/leave-unlock-in-toolbar
branch
from
7ec8d46
to
7123d3a
Compare
This was referenced Dec 20, 2023
Mamaduka
added
the
[Feature] Block Locking
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.
Fixes #51447 and #57139
Alternative to #57185
If the block lock button has been shown, we don't want to remove it from the toolbar until the toolbar is rendered again without it. Removing it beforehand can cause focus loss issues, such as when unlocking the block from the modal. It needs to return focus from whence it came, and to do that, we need to leave the button in the toolbar.
What?
If the Lock Button has rendered, force it to stay in the toolbar as a "lock" action button until the component is unmounted.
Clicking the "Unlocked" icon would trigger the lock modal again. Again, this would only show after unlocking the block. It would not show for all toolbars.
Why?
How?
hasLockButtonShownref set totrueif the Lock Button is rendered in the toolbar.hasLockButtonShownand the block becomes unlocked while the toolbar is showing, preserve the button with an unlock icon to open the lock modal.Testing Instructions
Repeat above steps starting from an unlocked block:
Repeat both of the above from the Top Toolbar
Testing Instructions for Keyboard
Repeat above using Keyboard
Screenshots or screencast
Screen.Recording.2023-12-19.at.10.52.44.AM.mov