@doenet/v06-to-v07 0.7.24-dev.480 → 0.7.24-dev.484

package/{index-CoQ1l7jN.js → index-vHOJ5L6p.js}

@@ -45857,7 +45857,7 @@ async function cidFromArrayBuffer(data) {
       await crypto.subtle.digest("SHA-256", new Uint8Array());
       digest = (data2) => crypto.subtle.digest("SHA-256", data2);
     } catch (e22) {
-      const sha256 = (await import("./sha256-DT5xJ2Hv-COfUNpbs-D3zfFexD.js").then((n2) => n2.s)).default;
+      const sha256 = (await import("./sha256-DT5xJ2Hv-DBPjDuPu-CHV4SZss.js").then((n2) => n2.s)).default;
       digest = (data2) => sha256(data2, {
         asBytes: true
       });
@@ -97343,6 +97343,36 @@ class SectioningComponent extends BlockComponent {
         return { setValue: { hideChildren } };
       }
     };
+    stateVariableDefinitions.hasCascadeMessageToShow = {
+      returnDependencies: () => ({
+        cascadeMessageChildren: {
+          dependencyType: "child",
+          childGroups: ["cascadeMessages"]
+        }
+      }),
+      definition({ dependencyValues }) {
+        return {
+          setValue: {
+            hasCascadeMessageToShow: dependencyValues.cascadeMessageChildren.length > 0
+          }
+        };
+      }
+    };
+    stateVariableDefinitions.showCascadeMessage = {
+      returnDependencies: () => ({
+        parentSectionToShowCascadeMessage: {
+          dependencyType: "parentStateVariable",
+          variableName: "sectionToShowCascadeMessage"
+        }
+      }),
+      definition({ dependencyValues, componentIdx }) {
+        return {
+          setValue: {
+            showCascadeMessage: dependencyValues.parentSectionToShowCascadeMessage === componentIdx
+          }
+        };
+      }
+    };
     stateVariableDefinitions.childIndicesToRender = {
       returnDependencies: () => ({
         titleChildren: {
@@ -97417,10 +97447,6 @@ class SectioningComponent extends BlockComponent {
             dependencyType: "stateVariable",
             variableName: "childIndicesToRender"
           },
-          hideChildren: {
-            dependencyType: "stateVariable",
-            variableName: "hideChildren"
-          },
           childrenToHide: {
             dependencyType: "stateVariable",
             variableName: "childrenToHide"
@@ -97429,7 +97455,7 @@ class SectioningComponent extends BlockComponent {
       },
       definition({ dependencyValues, componentInfoObjects: componentInfoObjects2 }) {
         let firstVisibleChild = null;
-        if (dependencyValues.childIndicesToRender && !dependencyValues.hideChildren) {
+        if (dependencyValues.childIndicesToRender) {
           for (const ind of dependencyValues.childIndicesToRender) {
             const child = dependencyValues.allChildren[ind];
             if (!dependencyValues.childrenToHide.includes(
@@ -97453,6 +97479,10 @@ class SectioningComponent extends BlockComponent {
         hideChildren: {
           dependencyType: "stateVariable",
           variableName: "hideChildren"
+        },
+        showCascadeMessage: {
+          dependencyType: "stateVariable",
+          variableName: "showCascadeMessage"
         }
       }),
       definition({ dependencyValues }) {
@@ -97461,10 +97491,10 @@ class SectioningComponent extends BlockComponent {
           dependencyValues
         )) {
           if (child.componentType === "cascadeMessage") {
-            if (!dependencyValues.hideChildren && typeof child === "object") {
+            if (!dependencyValues.showCascadeMessage) {
               childrenToHide.push(child.componentIdx);
             }
-          } else if (dependencyValues.hideChildren && typeof child === "object" && child.componentIdx !== dependencyValues.titleChildName && child.componentType !== "cascadeMessage") {
+          } else if (dependencyValues.hideChildren && typeof child === "object" && child.componentIdx !== dependencyValues.titleChildName) {
             childrenToHide.push(child.componentIdx);
           }
         }
@@ -230333,7 +230363,10 @@ class Cascade extends SectioningComponent {
       }
     };
     stateVariableDefinitions.childrenToHide = {
-      additionalStateVariablesDefined: ["childrenToHideChildren"],
+      additionalStateVariablesDefined: [
+        "childrenToHideChildren",
+        "sectionToShowCascadeMessage"
+      ],
       returnDependencies: () => ({
         hideFutureSections: {
           dependencyType: "stateVariable",
@@ -230345,7 +230378,9 @@ class Cascade extends SectioningComponent {
         },
         children: {
           dependencyType: "child",
-          childGroups: ["anything"]
+          childGroups: ["anything"],
+          variableNames: ["hasCascadeMessageToShow"],
+          variablesOptional: true
         },
         childrenWithCascadeMessages: {
           dependencyType: "child",
@@ -230358,6 +230393,10 @@ class Cascade extends SectioningComponent {
         hideChildren: {
           dependencyType: "stateVariable",
           variableName: "hideChildren"
+        },
+        showCascadeMessage: {
+          dependencyType: "stateVariable",
+          variableName: "showCascadeMessage"
         }
       }),
       definition({ dependencyValues, componentInfoObjects: componentInfoObjects2 }) {
@@ -230368,7 +230407,8 @@ class Cascade extends SectioningComponent {
           return {
             setValue: {
               childrenToHide: allContinuationComponentIndices,
-              childrenToHideChildren: []
+              childrenToHideChildren: [],
+              sectionToShowCascadeMessage: null
             }
           };
         }
@@ -230391,30 +230431,46 @@ class Cascade extends SectioningComponent {
             childrenToHide.push(child.componentIdx);
           }
         }
-        if (dependencyValues.numCompleted <= dependencyValues.children.length - 2) {
-          const lastShownChild = dependencyValues.children[dependencyValues.numCompleted].componentIdx;
-          const lastShownChildIdx = dependencyValues.childrenWithCascadeMessages.findIndex(
-            (child) => child.componentIdx === lastShownChild
-          );
-          const nextContinuation = dependencyValues.childrenWithCascadeMessages.slice(lastShownChildIdx + 1).find(
-            (child) => child.componentType === "cascadeMessage"
-          );
-          if (nextContinuation) {
-            childrenToHide.push(
-              ...allContinuationComponentIndices.filter(
-                (cIdx) => cIdx !== nextContinuation.componentIdx
-              )
-            );
-          } else {
-            childrenToHide.push(...allContinuationComponentIndices);
+        const nextStep = dependencyValues.children[dependencyValues.numCompleted + 1];
+        const sectionToShowCascadeMessage = nextStep && childrenToHideChildren.includes(nextStep.componentIdx) && nextStep.stateValues?.hasCascadeMessageToShow ? nextStep.componentIdx : null;
+        const continuationToShow = sectionToShowCascadeMessage === null && (!dependencyValues.hideChildren || dependencyValues.showCascadeMessage) ? nextOwnCascadeMessage(dependencyValues) : null;
+        childrenToHide.push(
+          ...allContinuationComponentIndices.filter(
+            (cIdx) => cIdx !== continuationToShow
+          )
+        );
+        return {
+          setValue: {
+            childrenToHide,
+            childrenToHideChildren,
+            sectionToShowCascadeMessage
           }
-        } else {
-          childrenToHide.push(...allContinuationComponentIndices);
+        };
+      }
+    };
+    stateVariableDefinitions.hasCascadeMessageToShow = {
+      returnDependencies: () => ({
+        numCompleted: {
+          dependencyType: "stateVariable",
+          variableName: "numCompleted"
+        },
+        children: {
+          dependencyType: "child",
+          childGroups: ["anything"]
+        },
+        childrenWithCascadeMessages: {
+          dependencyType: "child",
+          childGroups: ["anything", "cascadeMessages"]
+        },
+        revealAll: {
+          dependencyType: "stateVariable",
+          variableName: "revealAll"
         }
+      }),
+      definition({ dependencyValues }) {
         return {
           setValue: {
-            childrenToHide,
-            childrenToHideChildren
+            hasCascadeMessageToShow: nextOwnCascadeMessage(dependencyValues) !== null
           }
         };
       }
@@ -230422,6 +230478,16 @@ class Cascade extends SectioningComponent {
     return stateVariableDefinitions;
   }
 }
+function nextOwnCascadeMessage(dependencyValues) {
+  if (dependencyValues.revealAll || dependencyValues.numCompleted > dependencyValues.children.length - 2) {
+    return null;
+  }
+  const lastShownStep = dependencyValues.children[dependencyValues.numCompleted].componentIdx;
+  const lastShownStepIdx = dependencyValues.childrenWithCascadeMessages.findIndex(
+    (child) => child.componentIdx === lastShownStep
+  );
+  return dependencyValues.childrenWithCascadeMessages.slice(lastShownStepIdx + 1).find((child) => child.componentType === "cascadeMessage")?.componentIdx ?? null;
+}
 class DynamicChildren extends CompositeComponent {
   constructor(args) {
     super(args);
@@ -237290,4 +237356,4 @@ export {
   getDefaultExportFromCjs$1 as g,
   updateSyntaxFromV06toV07 as u
 };
-//# sourceMappingURL=index-CoQ1l7jN.js.map
+//# sourceMappingURL=index-vHOJ5L6p.js.map