fix(twig): make sure twig has finished rendering before setting the form data

src/modules/types/display/template-twig/view.js

@@ -89,8 +89,9 @@ define([
     },
 
     rerender() {
+      const data = this.getForm();
       this.render(() => {
-        this.resetForm();
+        this.form.setData(data);
       });
     },
 
@@ -104,10 +105,6 @@ define([
       });
     },
 
-    setForm(data) {
-      this.form.setData(data);
-    },
-
     resetForm() {
       this.form.setData(this.currentForm);
     },
@@ -141,9 +138,8 @@ define([
       return this.currentForm;
     },
 
-    submitChange(event, noChange) {
+    submitChange(event) {
       if (!event) return;
-      event = event || { target: {} };
       const toSend = {
         data: this.getForm(),
       };
@@ -157,7 +153,7 @@ define([
         this._changedJpaths.add(event.target.name);
       }
 
-      this.module.controller.onFormChanged(toSend, noChange);
+      this.module.controller.onFormChanged(toSend);
       return null;
     },
 
@@ -209,15 +205,6 @@ define([
         this._values[name] = DataObject.resurrect(value.get());
 
         this.rerender();
-
-        if (
-          this.module.getConfigurationCheckbox(
-            'formOptions',
-            'rerenderIfValueChanges',
-          )
-        ) {
-          this.render(() => this.fillForm(true));
-        }
       },
       tpl(value) {
         var tpl = value.get().toString();
@@ -245,15 +232,17 @@ define([
         // It doesn't make sense otherwise
         await this.hasTemplate;
 
-        this.fillForm(true);
         if (
           this.module.getConfigurationCheckbox(
             'formOptions',
             'rerenderIfFormValueChanges',
           )
         ) {
-          this.rerender();
+          await this.rerender();
+        } else {
+          await this.renderPromise;
         }
+        this.setDataAndTrackChanges();
       },
 
       style(value) {
@@ -275,17 +264,16 @@ define([
             'setForm invalid arguments. Must be object with data property.',
           );
         }
-        this.setForm(options.data);
+        this.form.setData(options.data);
         if (options.submitChange) {
           this.submitChange();
         }
       },
     },
 
-    fillForm(noChange) {
+    setDataAndTrackChanges() {
       const changed = this.form.setData(this.formObject);
       for (const c of changed) this._changedJpaths.add(c);
-      this.submitChange(null, noChange);
     },
 
     render(cb) {