Port Android PR #3691.

Author: ehsannas

packages/firestore/src/local/local_documents_view.ts

@@ -94,7 +94,7 @@ export class LocalDocumentsView {
           mutationApplyToLocalView(
             overlay.mutation,
             document,
-            null,
+            FieldMask.empty(),
             Timestamp.now()
           );
         }
@@ -232,7 +232,12 @@ export class LocalDocumentsView {
         recalculateDocuments = recalculateDocuments.insert(doc.key, doc);
       } else if (overlay !== undefined) {
         mutatedFields.set(doc.key, overlay.mutation.getFieldMask());
-        mutationApplyToLocalView(overlay.mutation, doc, null, Timestamp.now());
+        mutationApplyToLocalView(
+          overlay.mutation,
+          doc,
+          overlay.mutation.getFieldMask(),
+          Timestamp.now()
+        );
       }
     });
 
@@ -453,7 +458,7 @@ export class LocalDocumentsView {
             mutationApplyToLocalView(
               overlay.mutation,
               document,
-              null,
+              FieldMask.empty(),
               Timestamp.now()
             );
           }

packages/firestore/test/unit/local/local_store.test.ts

@@ -1425,12 +1425,14 @@ function genericLocalStoreTests(
           )
         )
         .toReturnChanged(doc('foo/bar', 1, { sum: 0, arrayUnion: [] }))
-        .afterMutations([
-          patchMutation('foo/bar', { sum: increment(1) }),
-          patchMutation('foo/bar', {
-            arrayUnion: arrayUnion('foo')
-          })
-        ])
+        .after(patchMutation('foo/bar', { sum: increment(1) }))
+        .toReturnChanged(
+          doc('foo/bar', 1, {
+            sum: 1,
+            arrayUnion: []
+          }).setHasLocalMutations()
+        )
+        .after(patchMutation('foo/bar', { arrayUnion: arrayUnion('foo') }))
         .toReturnChanged(
           doc('foo/bar', 1, {
             sum: 1,
@@ -1454,8 +1456,19 @@ function genericLocalStoreTests(
         )
         .afterAcknowledgingMutation({
           documentVersion: 3,
+          transformResults: [{ integerValue: 1338 }]
+        })
+        .toReturnChanged(
+          doc('foo/bar', 3, {
+            sum: 1338,
+            arrayUnion: ['bar', 'foo']
+          })
+            .setReadTime(SnapshotVersion.fromTimestamp(new Timestamp(0, 3000)))
+            .setHasLocalMutations()
+        )
+        .afterAcknowledgingMutation({
+          documentVersion: 4,
           transformResults: [
-            { integerValue: 1338 },
             {
               arrayValue: {
                 values: [{ stringValue: 'bar' }, { stringValue: 'foo' }]
@@ -1464,11 +1477,11 @@ function genericLocalStoreTests(
           ]
         })
         .toReturnChanged(
-          doc('foo/bar', 3, {
+          doc('foo/bar', 4, {
             sum: 1338,
             arrayUnion: ['bar', 'foo']
           })
-            .setReadTime(SnapshotVersion.fromTimestamp(new Timestamp(0, 3000)))
+            .setReadTime(SnapshotVersion.fromTimestamp(new Timestamp(0, 4000)))
             .setHasCommittedMutations()
         )
         .finish()