Fix insertion point displaying when there are no inserter items #32576
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
talldan
added
[Type] Bug
|
Size Change: +13 B (0%) Total Size: 1.03 MB
ℹ️ View Unchanged
|
|
Looks like I'll need to revisit this once #31896 is merged, as that removes the isHidden variable this uses. |
Could we check the setting directly, instead of inserter items? This component is also being used for drag and drop and could in the future be used for more things like the "Move to" feature. |
talldan
force-pushed
the
fix/insertion-indicator-in-locked-template-areas
branch
from
b4022c0
to
91d2a73
Compare
|
@ellatrix I've reworked this and added a template lock check to the selector. |
ellatrix
reviewed
Jun 11, 2021
| return false; | ||
| } | ||
|
|
||
| return true; |
There was a problem hiding this comment.
I never know what's the best layer to adjust here. Should we (also or instead) prevent insertion points to be set if the template is locked? And if so, in the component or reducer? I know that in a lot of other places we're doing a lot to prevent actions from even dispatching to the store if we know it won't change anything.
The question is a bit more general, but I think it would be good to see more consistency across the code base.
There was a problem hiding this comment.
For example, for the block drop zone, we are completely disabling it when the template is locked:
There was a problem hiding this comment.
So maybe we should disable the in-between inserter if the template is locked?
draganescu
approved these changes
Jun 14, 2021
youknowriad
removed
the
Backport to WP 6.7 Beta/RC
youknowriad
pushed a commit
that referenced
this pull request
Jun 21, 2021
youknowriad
pushed a commit
that referenced
this pull request
Jun 21, 2021
7 tasks
talldan
added a commit
that referenced
this pull request
Jul 2, 2021
youknowriad
pushed a commit
that referenced
this pull request
Jul 5, 2021
youknowriad
pushed a commit
that referenced
this pull request
Jul 6, 2021
youknowriad
pushed a commit
that referenced
this pull request
Jul 7, 2021
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
Fixes #28123
In locked template areas (and other between blocks places where blocks can't be inserted), the insertion point indicator was still being displayed, though just the blue line without an inserter button.
To solve this, the
isInsertionPointVisibleselector now checks whether the insertion point's root client id has a template lock.To solve this, theInsertionPointPopovercomponent needs to do its own check forhasInserterItemsto get around this issue. This matches what the inserter button does:gutenberg/packages/block-editor/src/components/inserter/index.js
Line 225 in 3c722bf
gutenberg/packages/block-editor/src/components/inserter/index.js
Lines 296 to 299 in 3c722bf
How has this been tested?
Types of changes
Bug fix (non-breaking change which fixes an issue)
Checklist:
*.native.jsfiles for terms that need renaming or removal).