Merge branch 'master' into schema-mehek

1 files changed, 7 insertions, 1 deletions

diff --git a/src/fields/List.ts b/src/fields/List.ts
index 5cc4ca543..edaa16003 100644
--- a/src/fields/List.ts
+++ b/src/fields/List.ts
@@ -278,7 +278,13 @@ class ListImpl<T extends Field> extends ObjectField {
             const batchPromise = DocServer.GetRefFields(promised.map(p => p.promisedFieldId));
             // as soon as we get the fields from the server, set all the list values in one
             // action to generate one React dom update.
-            batchPromise.then(pfields => promised.forEach(p => p.field.setValue(pfields[p.promisedFieldId])));
+            batchPromise.then(
+                action(pfields => {
+                    for (let i = 0; i < promised.length; i++) {
+                        promised[i].field.setValue(pfields[promised[i].promisedFieldId]);
+                    }
+                })
+            );
             // we also have to mark all lists items with this promise so that any calls to them
             // will await the batch request and return the requested field value.
             // This assumes the handler for 'promise' in the call above being invoked before the