Don't trigger child updates when children unchanged

jaltekruse · Feb 27, 2023 · 786bb41 · 786bb41
1 parent 4b20665
commit 786bb41
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/cypress/e2e/DoenetML/tagSpecific/answer.cy.js b/cypress/e2e/DoenetML/tagSpecific/answer.cy.js
@@ -18288,7 +18288,7 @@ describe('Answer Tag Tests', function () {
       </choiceInput>
 
     </sideBySide>
-    <copy prop='selectedValue' target='choice1' />
+    <copy prop='selectedValue' target='choice1' assignNames="sv" />
 
     <answer>
       <award><when><copy prop='selectedValue' target='choice1' /> = 4</when></award>
@@ -18304,6 +18304,7 @@ describe('Answer Tag Tests', function () {
 
     cy.log("Select correct answer")
     cy.get('#\\/choice1').select(`4`);
+    cy.get('#\\/sv').should('have.text', '4');
     cy.get('#\\/_answer1_submit').invoke('text').then((text) => {
       expect(text.trim().toLowerCase()).equal('check work')
     })
@@ -18319,6 +18320,7 @@ describe('Answer Tag Tests', function () {
 
     cy.log("Select incorrect answer and submit")
     cy.get('#\\/choice1').select(`3`);
+    cy.get('#\\/sv').should('have.text', '3');
     cy.get('#\\/_answer1_submit').click();
     cy.get('#\\/_answer1_incorrect').invoke('text').then((text) => {
       expect(text.trim().toLowerCase()).equal('incorrect')

diff --git a/src/Core/Core.js b/src/Core/Core.js
@@ -1514,6 +1514,11 @@ export default class Core {
     parent.unexpandedCompositesReady = result.unexpandedCompositesReady;
     parent.unexpandedCompositesNotReady = result.unexpandedCompositesNotReady;
 
+    let previousActiveChildren;
+
+    if (parent.activeChildren) {
+      previousActiveChildren = parent.activeChildren.map(child => child.componentName ? child.componentName : child);
+    }
 
     parent.activeChildren = parent.definingChildren.slice(); // shallow copy
 
@@ -1575,7 +1580,13 @@ export default class Core {
 
 
     if (parent.constructor.renderChildren) {
-      this.componentsWithChangedChildrenToRender.add(parent.componentName);
+      let childrenUnchanged = previousActiveChildren && previousActiveChildren.length == parent.activeChildren.length
+        && parent.activeChildren.every(
+          (child, ind) => child.componentName ? child.componentName === previousActiveChildren[ind] : child === previousActiveChildren[ind]
+        );
+      if (!childrenUnchanged) {
+        this.componentsWithChangedChildrenToRender.add(parent.componentName);
+      }
     }
 
     return childGroupResults;
@@ -8407,7 +8418,7 @@ export default class Core {
     // as even if changes were prevented, the renderers need to be given that information
     // so they can revert if the showed the changes before hearing back from core
     if (!canSkipUpdatingRenderer) {
-      updateInstructions.forEach(comp => this.updateInfo.componentsToUpdateRenderers.add(comp.componentName));
+      updateInstructions.forEach(comp => { if (comp.componentName) { this.updateInfo.componentsToUpdateRenderers.add(comp.componentName) } });
     }
 
     let componentNamesToUpdate = [...this.updateInfo.componentsToUpdateRenderers];
@@ -8420,15 +8431,6 @@ export default class Core {
     });
 
 
-    if (this.updateInfo.componentsToUpdateRenderers.size > 0) {
-      // remove any names that were just updated
-      // (which can happen if tried to expand composites while updating renderers)
-
-      for (let cName of componentNamesToUpdate) {
-        this.updateInfo.componentsToUpdateRenderers.delete(cName);
-      }
-    }
-
 
     // updating renderer instructions could trigger more composite updates
     // (presumably from deriving child results)