[rnmobile] Release 1.16.0 to master (#18261)

* Force block inserter to re-render on device rotation (#18101)

* Force block inserter to re-render on device rotation

* Dummy

* Revert "Dummy"

This reverts commit 037f076.

* Add left right borders to inner blocks (#18109)

* [Mobile]Remove alignment options from Media & Text until they are fixed (#18112)

* Remove alignment options temporarily

* Dummy commit

* Fix: remove getItemLayout which causes scroll position issue (#18060)

* Fix: Media & Text Loses upload status if post is closed/reopened during the upload (#18137)

* Prevent deleting mediaType on upload progress

* Call onMediaUpdate instead of onSelectMedia

* Dummy commit

* Revert "Dummy commit"

This reverts commit 5ce06d6.

* Limit requestMediaImport calls for only image type

* Update comment

* Dummy commit

* Revert "Dummy commit"

This reverts commit 99584e4.

* Fix handling of pasted images and prevent thumbnail uploads (#18215)

* Fix handling of pasted images and prevent thumbnail uploads

* Fix lint errors

* Remove check for image for sync.

* Include the RN mobile releases branch in Travis branches

Author: etoledom

.travis.yml

@@ -21,6 +21,7 @@ branches:
   only:
     - master
     - rnmobile/master
+    - rnmobile/releases
     - /wp\/.*/
 
 env:

packages/block-library/src/image/edit.native.js

@@ -104,14 +104,18 @@ export class ImageEdit extends React.Component {
 			console.warn( 'Attributes has id with no url.' );
 		}
 
+		// Detect any pasted image and start an upload
+		if ( ! attributes.id && attributes.url && attributes.url.indexOf( 'file:' ) === 0 ) {
+			requestMediaImport( attributes.url, ( id, url ) => {
+				if ( url ) {
+					setAttributes( { id, url } );
+				}
+			} );
+		}
+
+		// Make sure we mark any temporary images as failed if they failed while
+		// the editor wasn't open
 		if ( attributes.id && attributes.url && ! isURL( attributes.url ) ) {
-			if ( attributes.url.indexOf( 'file:' ) === 0 ) {
-				requestMediaImport( attributes.url, ( id, url ) => {
-					if ( url ) {
-						setAttributes( { id, url } );
-					}
-				} );
-			}
 			mediaUploadSync();
 		}
 	}

packages/block-library/src/media-text/media-container.native.js

@@ -3,7 +3,6 @@
  */
 import { View, ImageBackground, Text, TouchableWithoutFeedback } from 'react-native';
 import {
-	requestMediaImport,
 	mediaUploadSync,
 	requestImageFailedRetryDialog,
 	requestImageUploadCancelDialog,
@@ -62,17 +61,11 @@ class MediaContainer extends Component {
 	}
 
 	componentDidMount() {
-		const { mediaId, mediaUrl, onMediaUpdate, mediaType } = this.props;
-
-		if ( mediaId && mediaUrl && ! isURL( mediaUrl ) ) {
-			if ( mediaUrl.indexOf( 'file:' ) === 0 && mediaType === MEDIA_TYPE_IMAGE ) {
-				// We don't want to call this for video because it is starting a media upload for the cover url
-				requestMediaImport( mediaUrl, ( id, url ) => {
-					if ( url ) {
-						onMediaUpdate( { id, url } );
-					}
-				} );
-			}
+		const { mediaId, mediaUrl } = this.props;
+
+		// Make sure we mark any temporary images as failed if they failed while
+		// the editor wasn't open
+		if ( mediaId && mediaUrl && mediaUrl.indexOf( 'file:' ) === 0 ) {
 			mediaUploadSync();
 		}
 	}