Gallery block: Only show the gallery upload error message if mixed multiple files uploaded#35790
Merged
glendaviesnz merged 2 commits intotrunkfrom Oct 20, 2021
Merged
Conversation
|
Size Change: +1.18 kB (0%) Total Size: 1.07 MB
ℹ️ View Unchanged
|
andrewserong
approved these changes
Oct 20, 2021
Contributor
andrewserong
left a comment
There was a problem hiding this comment.
Nice simple fix @glendaviesnz! The logic looks good to me, and confirmed that beforehand, dragging a single video to the editor canvas threw the error. After, there's no error for dragging a single video.
| Before | After |
|---|---|
 |
 |
Also tested that the error message continues to display when dragging a list of mixed media files (video and image files) to the editor canvas — as on trunk, the files are inserted as File blocks with the error notice appearing.
Dragging image files to create a gallery (either directly into the editor canvas or dragged onto an empty Gallery block) still works correctly, as does dragging onto a gallery with images.
LGTM!
aaronrobertshaw
approved these changes
Oct 20, 2021
Contributor
aaronrobertshaw
left a comment
There was a problem hiding this comment.
Nice work @glendaviesnz 👍
This tests as advertised for me.
✅ Prior to applying this PR branch I could replicate the issue
✅ No error message is given when a single video is dropped onto the editor canvas
✅ Appropriate error shown when video dropped together with other images onto the canvas
Would it perhaps aid others, or our future selves, to add a tiny comment for this check explaining that it's only intended to catch non-image files when dropped together with images? There's not a lot of difference between the two conditions at a glance.
Completely optional. I'll leave the call up to you.
Contributor
Author
Good idea - have added that |
|
Thanks for the fix @glendaviesnz! |
fullofcaffeine
added a commit
that referenced
this pull request
Oct 21, 2021
* trunk: (494 commits) remove consecutive rc warning (#35855) Update Changelog for 11.8.0-rc.2 Bump plugin version to 11.8.0-rc.2 [RNMobile] Disable React Native E2E Tests (iOS) (#35844) Add section about using the schema during development (#35835) Add a method to disable auto-accepting dialogs (#35828) Wrap NavigationContainer with SafeAreaView. (#35570) Update Appium to 1.22.0 (#35829) Post Comment: Handle the case where a comment does not exist (#35810) Clear selected block when clicking on the gray background (#35816) Post excerpt: Don't print the wrapper when there is no excerpt (#35749) [Block] Navigation: Fix padding for social links on mobile (#35824) Fix issue with responsive navigation causing wrapping. (#35820) [Block Editor]: Fix displaying only `none` alignment option (#35822) Add API to access global settings, styles, and stylesheet (#34843) Mobile Release v1.64.1 (#35804) Add resizer to template part focus mode (#35728) Update Changelog for 11.7.1 Gallery block: Only show the gallery upload error message if mixed multiple files uploaded (#35790) Update Changelog for 11.8.0-rc.1 ...
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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
The error message that was added to cope with image uploads into the refactored gallery is showing even if single files are uploaded, eg. a single video file. This PR adds an additional check to make sure uploaded files are a mix of image and other formats before showing the error
Fixes: #35366
Testing
Screenshots
Before:
After:
