useOnBlockDrop: Fix the Gallery block check #58711
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
Mamaduka
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 Core SVNIf you're a Core Committer, use this list when committing to GitHub Merge commitsIf 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. |
Mamaduka
commented
Feb 6, 2024
| @@ -292,7 +295,8 @@ export default function useOnBlockDrop( | |||
| { | |||
| layout: { | |||
| type: 'flex', | |||
| flexWrap: areAllImages ? null : 'nowrap', | |||
| flexWrap: | |||
| areAllImages && galleryBlock ? null : 'nowrap', | |||
There was a problem hiding this comment.
I believe we only want to set null for the gallery block.
There was a problem hiding this comment.
Yes, I believe that's correct.
|
Size Change: 0 B Total Size: 1.69 MB ℹ️ View Unchanged
|
andrewserong
approved these changes
Feb 6, 2024
There was a problem hiding this comment.
Good catch, thanks for fixing this up @Mamaduka! Also, good to know that canInsertBlockType is the right check for this rather than just whether or not the Gallery block is registered 👍
✅ Confirmed that on trunk with the Gallery block disabled in preferences, the drag to the left / right behaviour resulted in nothing happening
✅ With this PR applied, if the Gallery block is disabled, then a Row block with nowrap is what gets used instead:
LGTM! ✨
| @@ -292,7 +295,8 @@ export default function useOnBlockDrop( | |||
| { | |||
| layout: { | |||
| type: 'flex', | |||
| flexWrap: areAllImages ? null : 'nowrap', | |||
| flexWrap: | |||
| areAllImages && galleryBlock ? null : 'nowrap', | |||
There was a problem hiding this comment.
Yes, I believe that's correct.
|
Thanks for the testing/review, @andrewserong 🙇 |
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?
This is a follow-up to #56186.
PR swaps block type existence check with
canInsertBlockType.Why?
There are multiple ways to disable block type; the
canInsertBlockTypeis the correct selector for this check.Testing Instructions
Testing Instructions for Keyboard
Same.
Screenshots or screencast
CleanShot.2024-02-06.at.08.19.44.mp4