Chrome: Clear Post edits on save success

editor/effects.js

@@ -32,13 +32,13 @@ export default {
 			toSend.id = postId;
 		}
 
-		dispatch( { type: 'CLEAR_POST_EDITS' } );
 		new wp.api.models.Post( toSend ).save().done( ( newPost ) => {
 			dispatch( {
 				type: 'REQUEST_POST_UPDATE_SUCCESS',
 				post: newPost,
 				isNew,
 			} );
+			dispatch( { type: 'CLEAR_POST_EDITS', edits } );
 		} ).fail( ( err ) => {
 			dispatch( {
 				type: 'REQUEST_POST_UPDATE_FAILURE',

editor/state.js

@@ -46,12 +46,20 @@ export const editor = combineUndoableReducers( {
 				}, state );
 
 			case 'CLEAR_POST_EDITS':
-				// Don't return a new object if there's not any edits
-				if ( ! Object.keys( state ).length ) {
+				// if we made other edits while saving, these new edits are kept in the store.
+				const keysToClear = reduce( action.edits, ( memo, value, key ) => {
+					if ( value === state[ key ] ) {
+						memo.push( key );
+					}
+					return memo;
+				}, [] );
+
+				// Don't return a new object if there are no keys to clear
+				if ( ! keysToClear.length ) {
 					return state;
 				}
 
-				return {};
+				return omit( state, keysToClear );
 		}
 
 		return state;

editor/test/state.js

@@ -398,15 +398,21 @@ describe( 'state', () => {
 
 				const state = editor( original, {
 					type: 'CLEAR_POST_EDITS',
+					edits: {
+						status: 'draft',
+						title: 'post title',
+					},
 				} );
 
-				expect( state.edits ).to.eql( {} );
+				expect( state.edits ).to.eql( { tags: [ 1 ] } );
 			} );
 
 			it( 'should return same reference if clearing non-edited', () => {
 				const original = editor( undefined, {
 					type: 'EDIT_POST',
-					edits: {},
+					edits: {
+						status: 'draft',
+					},
 				} );
 
 				const state = editor( original, {