Convert list components to composites (#249)

* convert mathList, numberList, textList, booleanList * correctly shadow composites that shadow prop variables * numberLists merge math lists with single child * inverse definition of text will attempt to update a composite-generated list * list props on text, textInput, math, mathInput
Doenet · Oct 30, 2024 · 0909ca2 · 0909ca2
1 parent 3f1bfe8
commit 0909ca2
Show file tree

Hide file tree

Showing 65 changed files with 10,004 additions and 14,413 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -101,7 +101,7 @@
         "tabWidth": 4
     },
     "dependencies": {
-        "math-expressions": "^2.0.0-alpha70",
+        "math-expressions": "^2.0.0-alpha71",
         "react-router-dom": "^6.26.2"
     }
 }
diff --git a/packages/doenetml-iframe/package.json b/packages/doenetml-iframe/package.json
@@ -2,7 +2,7 @@
     "name": "@doenet/doenetml-iframe",
     "type": "module",
     "description": "A renderer for DoenetML contained in an iframe",
-    "version": "0.7.0-alpha20",
+    "version": "0.7.0-alpha21",
     "license": "AGPL-3.0-or-later",
     "homepage": "https://github.com/Doenet/DoenetML#readme",
     "private": true,

diff --git a/packages/doenetml-worker/src/Core.js b/packages/doenetml-worker/src/Core.js
diff --git a/packages/doenetml-worker/src/CoreWorker.js b/packages/doenetml-worker/src/CoreWorker.js
@@ -183,6 +183,7 @@ async function createCore(args) {
             }
             queuedRequestActions = [];
         } catch (e) {
+            // throw e;
             postMessage({
                 messageType: "inErrorState",
                 coreId: coreArgs.coreId,

diff --git a/packages/doenetml-worker/src/components/Aliases.js b/packages/doenetml-worker/src/components/Aliases.js
@@ -36,13 +36,11 @@ export class Ylabel extends Label {
 
 export class MatrixRow extends MathList {
     static componentType = "matrixRow";
-    static rendererType = "mathList";
     static excludeFromSchema = true;
 }
 
 export class MatrixColumn extends MathList {
     static componentType = "matrixColumn";
-    static rendererType = "mathList";
     static excludeFromSchema = true;
 }
 

diff --git a/packages/doenetml-worker/src/components/Answer.js b/packages/doenetml-worker/src/components/Answer.js
@@ -167,6 +167,8 @@ export default class Answer extends InlineComponent {
         };
         attributes.type = {
             createPrimitiveOfType: "string",
+            createStateVariable: "type",
+            defaultValue: null,
         };
 
         attributes.disableAfterCorrect = {
@@ -251,8 +253,8 @@ export default class Answer extends InlineComponent {
             componentAttributes,
             componentInfoObjects,
         }) {
-            // if chidren are strings and macros
-            // wrap with award and type
+            // if children are strings and macros
+            // wrap with award
 
             function checkForResponseDescendant(components) {
                 for (let component of components) {
@@ -355,7 +357,7 @@ export default class Answer extends InlineComponent {
                             } else if (
                                 componentIsSpecifiedType(grandChild, "when")
                             ) {
-                                // have to test for when before boolean, sincd when is derived from boolean!
+                                // have to test for `when` before `boolean`, since `when` is derived from `boolean`!
                             } else if (
                                 componentIsSpecifiedType(grandChild, "math") ||
                                 componentIsSpecifiedType(
@@ -596,28 +598,7 @@ export default class Answer extends InlineComponent {
                     ...childrenToNotWrapEnd,
                 ];
             } else {
-                // if have one child and it has a specified componentType
-                // then no need to wrap with componentType
-
-                let needToWrapWithComponentType =
-                    childrenToWrap.length > 1 ||
-                    (componentInfoObjects.isInheritedComponentType({
-                        inheritedComponentType: childrenToWrap[0].componentType,
-                        baseComponentType: "_composite",
-                    }) &&
-                        !childrenToWrap[0].props?.componentType);
-
-                let awardChildren;
-                if (needToWrapWithComponentType) {
-                    awardChildren = [
-                        {
-                            componentType: type,
-                            children: childrenToWrap,
-                        },
-                    ];
-                } else {
-                    awardChildren = childrenToWrap;
-                }
+                let awardChildren = childrenToWrap;
                 newChildren = [
                     ...childrenToNotWrapBegin,
                     {