Skip to content
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

Jump to bottom

RN Mobile - Upload media file ios #13421

Merged
merged 4 commits into from
Jan 23, 2019
Merged

RN Mobile - Upload media file ios #13421

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
124503e
Add serverID to finish media upload with success event.
SergioEstevao Jan 22, 2019
0fe4cf8
Refactor code to have early exit.
SergioEstevao Jan 22, 2019
08802b8
Support setting id when selecting from media library.
SergioEstevao Jan 22, 2019
6afb5e4
Merge branch 'rnmobile/upload_media_file' into rnmobile/upload_media_…
SergioEstevao Jan 22, 2019
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
48 changes: 33 additions & 15 deletions packages/block-library/src/image/edit.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { MediaPlaceholder, RichText, BlockControls } from '@wordpress/editor';
import { Toolbar, ToolbarButton, Spinner } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
import ImageSize from './image-size';
import { isURL } from '@wordpress/url'
import { isURL } from '@wordpress/url';

const MEDIA_ULOAD_STATE_UPLOADING = 1;
const MEDIA_ULOAD_STATE_SUCCEEDED = 2;
Expand All @@ -34,13 +34,14 @@ export default class ImageEdit extends React.Component {
this.mediaUpload = this.mediaUpload.bind( this );
this.addMediaUploadListener = this.addMediaUploadListener.bind( this );
this.removeMediaUploadListener = this.removeMediaUploadListener.bind( this );
this.finishMediaUploading = this.finishMediaUploading.bind( this );
this.finishMediaUploadWithSuccess = this.finishMediaUploadWithSuccess.bind( this );
this.finishMediaUploadWithFailure = this.finishMediaUploadWithFailure.bind( this );
}

componentDidMount() {
const { attributes } = this.props;
if ( attributes.id && !isURL( attributes.url )) {

if ( attributes.id && ! isURL( attributes.url ) ) {
this.addMediaUploadListener();
}
}
Expand All @@ -52,31 +53,48 @@ export default class ImageEdit extends React.Component {
mediaUpload( payload ) {
const { attributes } = this.props;

if ( payload.mediaId === attributes.id ) {
if ( payload.state === MEDIA_ULOAD_STATE_UPLOADING ) {
if ( payload.mediaId !== attributes.id ) {
return;
}

switch ( payload.state ) {
case MEDIA_ULOAD_STATE_UPLOADING:
this.setState( { progress: payload.progress, isUploadInProgress: true } );
} else if ( payload.state === MEDIA_ULOAD_STATE_SUCCEEDED || payload.state === MEDIA_ULOAD_STATE_FAILED ) {
this.finishMediaUploading( payload );
}
break;
case MEDIA_ULOAD_STATE_SUCCEEDED:
this.finishMediaUploadWithSuccess( payload );
break;
case MEDIA_ULOAD_STATE_FAILED:
this.finishMediaUploadWithFailure( payload );
break;
}
}

finishMediaUploading( payload ) {
finishMediaUploadWithSuccess( payload ) {
const { setAttributes } = this.props;

setAttributes( { url: payload.mediaUrl, id: payload.mediaServerId } );
this.setState( { isUploadInProgress: false } );

this.removeMediaUploadListener();
}

finishMediaUploadWithFailure( payload ) {
const { setAttributes } = this.props;

setAttributes( { url: payload.mediaUrl, id: payload.mediaId } );
this.setState( { isUploadInProgress: false } );

this.removeMediaUploadListener( payload.mediaId );
this.removeMediaUploadListener();
}

addMediaUploadListener( ) {
addMediaUploadListener() {
this.subscriptionParentMediaUpload = subscribeMediaUpload( ( payload ) => {
this.mediaUpload( payload );
} );
}

removeMediaUploadListener( ) {
removeMediaUploadListener() {
if ( this.subscriptionParentMediaUpload ) {
this.subscriptionParentMediaUpload.remove();
}
Expand All @@ -87,9 +105,9 @@ export default class ImageEdit extends React.Component {
const { url, caption, height, width } = attributes;

const onMediaLibraryButtonPressed = () => {
onMediaLibraryPressed( ( mediaUrl ) => {
onMediaLibraryPressed( ( mediaId, mediaUrl ) => {
if ( mediaUrl ) {
setAttributes( { url: mediaUrl } );
setAttributes( { id: mediaId, url: mediaUrl } );
}
} );
};
Expand Down