@doenet/v06-to-v07 0.7.0-beta4 → 0.7.0-beta6

package/index.js

@@ -80628,9 +80628,8 @@ class SectioningComponent extends BlockComponent {
     let attributes = super.createAttributesObject();
     attributes.aggregateScores = {
       createComponentOfType: "boolean",
-      createStateVariable: "aggregateScores",
-      defaultValue: false,
-      public: true
+      createStateVariable: "aggregateScoresPreliminary",
+      defaultValue: false
     };
     attributes.weight = {
       createComponentOfType: "number",
@@ -81088,6 +81087,29 @@ class SectioningComponent extends BlockComponent {
         return { setValue: { level } };
       }
     };
+    stateVariableDefinitions.aggregateScores = {
+      public: true,
+      shadowingInstructions: {
+        createComponentOfType: "boolean"
+      },
+      returnDependencies: () => ({
+        aggregateScoresPreliminary: {
+          dependencyType: "stateVariable",
+          variableName: "aggregateScoresPreliminary"
+        },
+        sectionWideCheckWork: {
+          dependencyType: "stateVariable",
+          variableName: "sectionWideCheckWork"
+        }
+      }),
+      definition({ dependencyValues }) {
+        return {
+          setValue: {
+            aggregateScores: dependencyValues.aggregateScoresPreliminary || dependencyValues.sectionWideCheckWork
+          }
+        };
+      }
+    };
     stateVariableDefinitions.creditAchieved = {
       public: true,
       shadowingInstructions: {
@@ -81371,10 +81393,6 @@ class SectioningComponent extends BlockComponent {
           dependencyType: "stateVariable",
           variableName: "sectionWideCheckWork"
         },
-        aggregateScores: {
-          dependencyType: "stateVariable",
-          variableName: "aggregateScores"
-        },
         sectionAncestor: {
           dependencyType: "ancestor",
           componentType: "_sectioningComponent",
@@ -81386,22 +81404,15 @@ class SectioningComponent extends BlockComponent {
           variableNames: ["suppressAnswerSubmitButtons"]
         }
       }),
-      definition({ dependencyValues, componentIdx: componentIdx2 }) {
+      definition({ dependencyValues }) {
         let warnings = [];
         let createSubmitAllButton = false;
         let suppressAnswerSubmitButtons = false;
         if (dependencyValues.documentAncestor.stateValues.suppressAnswerSubmitButtons || dependencyValues.sectionAncestor && dependencyValues.sectionAncestor.stateValues.suppressAnswerSubmitButtons) {
           suppressAnswerSubmitButtons = true;
         } else if (dependencyValues.sectionWideCheckWork) {
-          if (dependencyValues.aggregateScores) {
-            createSubmitAllButton = true;
-            suppressAnswerSubmitButtons = true;
-          } else {
-            warnings.push({
-              message: `Cannot create submit all button for <section> because it doesn't aggregate scores.`,
-              level: 1
-            });
-          }
+          createSubmitAllButton = true;
+          suppressAnswerSubmitButtons = true;
         }
         return {
           setValue: {
@@ -100352,6 +100363,8 @@ class Input extends InlineComponent {
             "justSubmitted",
             "creditAchieved",
             "showCorrectness",
+            "submitLabel",
+            "submitLabelNoCorrectness",
             "numAttemptsLeft",
             "creditIsReducedByAttempt",
             "numIncorrectSubmissions",
@@ -100482,6 +100495,42 @@ class Input extends InlineComponent {
         return { setValue: { showCorrectness } };
       }
     };
+    stateVariableDefinitions.submitLabel = {
+      forRenderer: true,
+      returnDependencies: () => ({
+        answerAncestor: {
+          dependencyType: "stateVariable",
+          variableName: "answerAncestor"
+        }
+      }),
+      definition({ dependencyValues }) {
+        let submitLabel;
+        if (dependencyValues.answerAncestor) {
+          submitLabel = dependencyValues.answerAncestor.stateValues.submitLabel;
+        } else {
+          submitLabel = "";
+        }
+        return { setValue: { submitLabel } };
+      }
+    };
+    stateVariableDefinitions.submitLabelNoCorrectness = {
+      forRenderer: true,
+      returnDependencies: () => ({
+        answerAncestor: {
+          dependencyType: "stateVariable",
+          variableName: "answerAncestor"
+        }
+      }),
+      definition({ dependencyValues }) {
+        let submitLabelNoCorrectness;
+        if (dependencyValues.answerAncestor) {
+          submitLabelNoCorrectness = dependencyValues.answerAncestor.stateValues.submitLabelNoCorrectness;
+        } else {
+          submitLabelNoCorrectness = "";
+        }
+        return { setValue: { submitLabelNoCorrectness } };
+      }
+    };
     stateVariableDefinitions.numAttemptsLeft = {
       forRenderer: true,
       returnDependencies: () => ({
@@ -123221,7 +123270,7 @@ function returnStandardAnswerAttributes() {
     disableAfterCorrect: {
       createComponentOfType: "boolean",
       createStateVariable: "disableAfterCorrect",
-      defaultValue: false,
+      defaultValue: true,
       public: true
     },
     submitLabel: {
@@ -130669,10 +130718,8 @@ let Graph$1 = class Graph extends BlockComponent {
     };
     attributes.fixAxes = {
       createComponentOfType: "boolean",
-      createStateVariable: "fixAxes",
-      defaultValue: false,
-      public: true,
-      forRenderer: true
+      createStateVariable: "fixAxesPreliminary",
+      defaultValue: false
     };
     attributes.grid = {
       createComponentOfType: "text",
@@ -130692,6 +130739,13 @@ let Graph$1 = class Graph extends BlockComponent {
       defaultValue: false,
       public: true
     };
+    attributes.description = {
+      createComponentOfType: "text",
+      createStateVariable: "description",
+      defaultValue: "",
+      public: true,
+      forRenderer: true
+    };
     return attributes;
   }
   static returnChildGroups() {
@@ -130740,6 +130794,30 @@ let Graph$1 = class Graph extends BlockComponent {
       stateVariableDefinitions,
       returnRoundingStateVariableDefinitions()
     );
+    stateVariableDefinitions.fixAxes = {
+      forRenderer: true,
+      public: true,
+      shadowingInstructions: {
+        createComponentOfType: "boolean"
+      },
+      returnDependencies: () => ({
+        fixAxesPreliminary: {
+          dependencyType: "stateVariable",
+          variableName: "fixAxesPreliminary"
+        },
+        fixed: {
+          dependencyType: "stateVariable",
+          variableName: "fixed"
+        }
+      }),
+      definition({ dependencyValues }) {
+        return {
+          setValue: {
+            fixAxes: dependencyValues.fixAxesPreliminary || dependencyValues.fixed
+          }
+        };
+      }
+    };
     stateVariableDefinitions.xLabel = {
       forRenderer: true,
       public: true,
@@ -205463,14 +205541,16 @@ let PublicDoenetMLCore$1 = class PublicDoenetMLCore2 {
     this.core?.handleNavigatingToComponent({ componentIdx: componentIdx2, hash });
   }
   /**
-   * Call submitAnswer on all answers in the document
+   * Call submitAnswer on all answers in the document,
+   * then immediately save all document state to the database
    */
   async submitAllAnswers() {
-    return await this.core?.requestAction({
+    await this.core?.requestAction({
       componentIdx: this.core.documentIdx,
       actionName: "submitAllAnswers",
       args: {}
     });
+    await this.core?.saveImmediately();
   }
   /**
    * Immediately save all document state to the database,