Locked Templates: blocks with contentOnly locking should not be transformable #64917
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
ramonjd
added
[Type] Enhancement
ramonjd
commented
Aug 30, 2024
|
Size Change: +665 B (+0.04%) Total Size: 1.78 MB
ℹ️ View Unchanged
|
|
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 If 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 7293615. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/10738765593
|
talldan
reviewed
Sep 3, 2024
| @@ -252,7 +264,8 @@ export const BlockSwitcher = ( { clientIds, disabled, isUsingBindings } ) => { | |||
| clientId: clientIds?.[ 0 ], | |||
| maximumLength: 35, | |||
| } ); | |||
| if ( invalidBlocks ) { | |||
|
|
|||
| if ( invalidBlocks || selectedHasTemplateLock ) { | |||
There was a problem hiding this comment.
I think this results in no block icon, which doesn't seem like the right thing to do:
Instead there's this block indicator component that's the block icon without a dropdown that could be rendered:
gutenberg/packages/block-editor/src/components/block-switcher/index.js
Lines 266 to 283 in 84b48f7
There was a problem hiding this comment.
Whoops, I missed that. Good spotting. I'll check out your suggestion. 🙇🏻
| @@ -120,6 +126,7 @@ export function PrivateBlockToolbar( { | |||
| _isDefaultEditingMode, | |||
| isUsingBindings: _isUsingBindings, | |||
| canRemove: canRemoveBlock( selectedBlockClientId ), | |||
| selectedHasTemplateLock: _hasTemplateLock, | |||
There was a problem hiding this comment.
Nit: Naming thing (also applies to other files) - selected isn't needed as the toolbar only shows for selected blocks. hasTemplateLock implies any kind of template lock (that it could also be 'all'), but that isn't the case.
Maybe it can be simplified to isContentOnly or hasContentOnlyLocking
ramonjd
force-pushed
the
try/deactivate-block-variation-switcher
branch
from
6edcde7
to
c8ec66f
Compare
getdave
reviewed
Sep 6, 2024
…-switcher, only hide the drop down if a selected block is content locked.
getdave
force-pushed
the
try/deactivate-block-variation-switcher
branch
from
c8ec66f
to
7293615
Compare
getdave
approved these changes
Sep 6, 2024
|
Thanks a lot @getdave! Yes, all good. I appreciate you keeping it up to date. |
Co-authored-by: Dave Smith <getdavemail@gmail.com>
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.
Maybe, one day #64661
What?
Where a block has content locking, do not show the block transformation/variations picker in the block tools popover or the block tools inspector.
Why?
Switching variations or to other block variations transforms the block and, therefore, potentially the content inside.
Blocks that a locked with
contentOnlyshould theoretically only allow editing of content (text, images etc).How?
Checking for
contentOnlystatus and not rendering the variation tools.Testing Instructions
Example HTML
Click on a locked group. Check that the transformation/variation options in the toolbar and inspector are not available.
Unlock the block group by right clicking and selecting "Modify" - you should see the regular transformation/variation options in the toolbar and inspector.
Select several locked blocks. The toolbar/inspector should not display any block transform options.
Screenshots or screencast
Kapture.2024-08-30.at.15.05.27.mp4