Drag & Drop: Fix unexpected row/gallery creation logic #64241
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
t-hamano
added
[Type] Bug
|
Size Change: +81 B (0%) Total Size: 1.77 MB
ℹ️ View Unchanged
|
|
Flaky tests detected in 7856402. 🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/10241148533
|
t-hamano
commented
Aug 5, 2024
| if ( operation === 'replace' ) { | ||
| replaceBlocks( clientId, blocks, undefined, initialPosition ); | ||
| } else if ( operation === 'group' && areGroupableBlocks ) { |
There was a problem hiding this comment.
At this point, it is guaranteed that at least one of the Row block or Gallery block can be created, so areGroupableBlocks is not necessary.
There was a problem hiding this comment.
Just double-checking, is that because this check is now happening in the throttle'd function instead, prior to displaying the drop indicator and setting the drop target?
It looks like that other code also calls isGroupable, too 👍. From memory the other thing we needed to check was that the hovered over block can be removed, so as long as the check is happening somewhere that sounds good to me!
There was a problem hiding this comment.
Just double-checking, is that because this check is now happening in the "throttle"'d function instead, prior to displaying the drop indicator and setting the drop target?
Yes. If the areGroupableBlocks check is present here, the gallery block will not be created when the following conditions are met:
- The Group block is unregistered
- he dragged blocks and the target block are all images
There was a problem hiding this comment.
Thanks for clarifying!
t-hamano
commented
Aug 5, 2024
| * @param {boolean} canInsertRow | ||
| * @return {boolean} Whether Row block or Gallery can be created. | ||
| */ | ||
| function canCreateRowOrGallery( |
There was a problem hiding this comment.
This process might not even need to be made into a function.
There was a problem hiding this comment.
"Either or" I think.
It doesn't abstract much and could be inline and just as neat. Unless it needs unit testing.
There was a problem hiding this comment.
Same. Since it's only used in one place, I'd lean slightly toward inlining unless it needs unit testing.
There was a problem hiding this comment.
I removed the function and inlined it here 👍
|
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. |
ramonjd
reviewed
Aug 5, 2024
There was a problem hiding this comment.
I did a smoke test on trunk and this PR and things are working as you describe. Thanks for the PR!
In trunk, adding a button block to a vertical row of button completely smashed by browser 😅
I'm not an expert in this area, so it might be good to see if @andrewserong or @kevin940726 have time to run their eyes over it.
| * @param {boolean} canInsertRow | ||
| * @return {boolean} Whether Row block or Gallery can be created. | ||
| */ | ||
| function canCreateRowOrGallery( |
There was a problem hiding this comment.
"Either or" I think.
It doesn't abstract much and could be inline and just as neat. Unless it needs unit testing.
| } | ||
| dropTargetPosition; | ||
|
|
||
| // Checks if it is creatable either a Row variation or a Gallery block from |
There was a problem hiding this comment.
Just checking, so this condition checks if a Row (Group) block or a Gallery block can be created after drop?
There was a problem hiding this comment.
No, it checks if it can be created before the drop. This prevents unintended inserters from appearing.
andrewserong
approved these changes
Aug 6, 2024
There was a problem hiding this comment.
Nice work @t-hamano, this is testing great for me and I could reproduce each of the issues in trunk and those cases behaved as expected with this PR applied 👍
✅ Dragging a Button to the side of the vertical Buttons block no longer shows the dropzone
✅ The dropzone is not displayed when dragging a paragraph and the Row variation is not registered
✅ The dropzone is not displayed when dragging a paragraph and the Group block is not registered
✅ The dropzone is not displayed when dragging an image onto another image and the Gallery block and Row variations are not registered
✅ The dropzone is not displayed when dragging an image onto another image and the Gallery block, Group block and Row variations are not registered
Smoke tested dragging and dropping in the post and site editors, and otherwise all appears to be working well for me.
LGTM! 🚀
talldan
changed the title
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 #64227
What?
This PR prevents the unintended appearance of the dropzone (vertical inserter) for creating rows or galleries in certain scenarios.
Why?
We need to consider the following scenarios:
For example, if the Gallery block, Group block, and Row variation are not all registered, the dropzone itself should not be displayed.
How?
Check in advance whether the Row block or the Gallery block can be created. If there are no creatable blocks, the dropzone itself will not be displayed.
Testing Instructions
Test the following scenarios:
Default
Row variation is not registered
layout.typeasflexappears to be created correctly, but the block name remains Group.Group block is not registered
Gallery block and Row variation are not registered
layout.typeasflexappears to be created correctly, but the block name remains Group.Gallery block, Group block, and Row variations are not registered