Lock post saving during image uploads

packages/editor/src/utils/media-upload/index.js

@@ -1,7 +1,12 @@
+/**
+ * External dependencies
+ */
+import { noop, uniqueId } from 'lodash';
+
 /**
  * WordPress dependencies
  */
-import { select } from '@wordpress/data';
+import { select, dispatch } from '@wordpress/data';
 import { uploadMedia } from '@wordpress/media-utils';
 
 /**
@@ -32,20 +37,38 @@ export default function mediaUpload( {
 	onFileChange,
 } ) {
 	const { getCurrentPostId, getEditorSettings } = select( editorStore );
+	const { lockPostSaving, unlockPostSaving } = dispatch( editorStore );
 	const wpAllowedMimeTypes = getEditorSettings().allowedMimeTypes;
+	const locakKeyID = uniqueId();
+	const lockKey = `image-upload-${ locakKeyID }`;
+	let postSaveLocked = false;
 	maxUploadFileSize =
 		maxUploadFileSize || getEditorSettings().maxUploadFileSize;
 
 	uploadMedia( {
 		allowedTypes,
 		filesList,
-		onFileChange,
+		onFileChange: ( file ) => {
+			const remainingUploads = file.filter( ( f ) => ! f.id );
+			if ( ! postSaveLocked && remainingUploads ) {
+				lockPostSaving( lockKey );
+				postSaveLocked = true;
+			} else {
+				unlockPostSaving( lockKey );
+				postSaveLocked = false;
+			}
+			onFileChange( file );
+		},
 		additionalData: {
 			post: getCurrentPostId(),
 			...additionalData,
 		},
 		maxUploadFileSize,
-		onError: ( { message } ) => onError( message ),
+		onError: ( { message } ) => {
+			unlockPostSaving( lockKey );
+			postSaveLocked = false;
+			onError( message );
+		},
 		wpAllowedMimeTypes,
 	} );
 }