Zoom Out: Use the block editor for insertion point data #63934
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
scruffian
added
[Type] Bug
|
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. |
|
Size Change: +22 B (0%) Total Size: 1.76 MB
ℹ️ View Unchanged
|
MaggieCabrera
approved these changes
Jul 25, 2024
Mamaduka
reviewed
Jul 25, 2024
| @@ -86,6 +79,8 @@ function ZoomOutModeInserters() { | |||
| hoveredBlockClientId === previousClientId || | |||
| hoveredBlockClientId === nextClientId; | |||
|
|
|||
| const { showInsertionPoint } = unlock( blockEditorDispatch ); | |||
There was a problem hiding this comment.
I think we can unlock the action once instead of doing it in a loop.
This should also work:
const { showInsertionPoint } = unlock( useDispatch( blockEditorStore ) );
Edit: The showInsertionPoint looks to be a public action. Why are we unlocking it?
There was a problem hiding this comment.
When I did it earlier in the component I got this error from the linter:
Variables should not be assigned until just prior its first reference. An early return statement may leave this variable unused
And when it's later I get:
React Hook "useDispatch" is called conditionally. React Hooks must be called in the exact same order in every component render. Did you accidentally call a React Hook after an early return?
That's why I split it in two!
There was a problem hiding this comment.
I think it only triggers that error when using unlock. It doesn't do it without it. Probably worth investigating separately.
Now that unlocking isn't needed, you can safely do const { showInsertionPoint } = useDispatch( blockEditorStore ); earlier in the component.
There was a problem hiding this comment.
@scruffian, it looks like you already merged PR, so here's the quick follow-up - #63936
I'm also curious if you tested this with page content focus - #63934 (comment).
|
Btw, the |
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?
We should be using the insertion point information from the block editor store, not the editor store.
Why?
I'm not sure why it was done this way, but getting it from the block editor store means that we can respond to drag and drop events which will help with #63896.
How?
Replace
insertionPointfrom the editor store withgetBlockInsertionPointfrom the block editor store.Testing Instructions
Screenshot