Core Data: Merge in new edits when restoring state after a failure.

WordPress · Sep 24, 2019 · 7476ed3 · 7476ed3
1 parent 91a4ddf
commit 7476ed3
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/packages/core-data/src/actions.js b/packages/core-data/src/actions.js
@@ -367,7 +367,16 @@ export function* saveEntityRecord(
 		// we need to roll it back here.
 		if ( persistedEntity && currentEdits ) {
 			yield receiveEntityRecords( kind, name, persistedEntity, undefined, true );
-			yield editEntityRecord( kind, name, recordId, currentEdits, { undoIgnore: true } );
+			yield editEntityRecord(
+				kind,
+				name,
+				recordId,
+				{
+					...currentEdits,
+					...( yield select( 'getEntityRecordEdits', kind, name, recordId ) ),
+				},
+				{ undoIgnore: true }
+			);
 		}
 	}
 	yield {