Merge pull request #232 from Jinntec/feature/fix-race

Fix race with sub-fores
Jinntec · Oct 19, 2023 · 02f2472 · 02f2472
2 parents f7faa14 + 733254f
commit 02f2472
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/ui/fx-control.js b/src/ui/fx-control.js
@@ -446,9 +446,12 @@ export default class FxControl extends XfAbstractControl {
                 'model-construct-done',
                 e => {
                     const defaultInst = imported.querySelector('fx-instance');
-                    if (this.initialNode) {
+                    if (this.initial) {
                         const doc = new DOMParser().parseFromString('<data></data>', 'application/xml');
                         // Note: Clone the input to prevent the inner fore from editing the outer node
+						// Also update the `initialNode` to make sure we have an up-to-date version
+						this.initialNode = evaluateXPathToFirstNode(this.initial, this.nodeset, this);
+
                         doc.firstElementChild.appendChild(this.initialNode.cloneNode(true));
                         defaultInst.setInstanceData(doc);
                     }