Skip to content

[Mobile] Fix gallery upload sync #19941

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Feb 3, 2020
Merged

[Mobile] Fix gallery upload sync #19941

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d317452
Invoke mediaUploadSync for gallery in React hook
mkevins Jan 27, 2020
cc21065
Use integer type explicitly for gallery image id
mkevins Jan 27, 2020
4985f3f
Set state before attributes on upload success in gallery image
mkevins Jan 29, 2020
4aedce8
Use ref hook for concurrency in media placeholder
mkevins Jan 29, 2020
9effb79
Extract dedup function and add comments in media placeholder
mkevins Jan 29, 2020
f101c89
Fix lint
mkevins Jan 29, 2020
e36d4cf
Use explicit radix with parseInt
mkevins Jan 31, 2020
a0ba9ce
Import useRef from @wordpress/element
mkevins Jan 31, 2020
d6fe16a
Merge branch 'master' into fix/gallery-upload-sync
mkevins Jan 31, 2020
bc0ab82
Merge branch 'master' into fix/gallery-upload-sync
mkevins Jan 31, 2020
617ea83
Fix lint
mkevins Jan 31, 2020
7ef53dc
Merge branch 'master' into fix/gallery-upload-sync
mkevins Feb 3, 2020
09c7fd8
Fix lint / prettier
mkevins Feb 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix lint
  • Loading branch information
@mkevins
mkevins committed Jan 31, 2020
commit 617ea83862c54d8549b4395daaac887942691f8c
12 changes: 6 additions & 6 deletions packages/block-editor/src/components/media-placeholder/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ import { useRef } from '@wordpress/element';
import styles from './styles.scss';

// remove duplicates after gallery append
const dedupMedia = ( media ) => uniqWith( media, ( media1, media2 ) => {
return media1.id === media2.id || media1.url === media2.url;
} );
const dedupMedia = ( media ) =>
uniqWith( media, ( media1, media2 ) => media1.id === media2.id || media1.url === media2.url );

function MediaPlaceholder( props ) {
const {
Expand All @@ -42,9 +41,10 @@ function MediaPlaceholder( props ) {
mediaRef.current = value;

// append and deduplicate media array for gallery use case
const setMedia = multiple && addToGallery
? ( selected ) => onSelect( dedupMedia( [ ...mediaRef.current, ...selected ] ) )
: onSelect;
const setMedia =
multiple && addToGallery
? ( selected ) => onSelect( dedupMedia( [ ...mediaRef.current, ...selected ] ) )
: onSelect;

const isOneType = allowedTypes.length === 1;
const isImage = isOneType && allowedTypes.includes( MEDIA_TYPE_IMAGE );
Expand Down