@mathscan/math-exercise-engine 1.1.13 → 1.1.15

package/dist/index.mjs

@@ -748,6 +748,11 @@ class MathExerciseParser extends CstParser {
         this.OR([{ ALT: () => this.CONSUME(Space) }, { ALT: () => this.CONSUME(Newline) }]);
       });
       this.CONSUME(ROW);
+      this.OPTION(() => {
+        this.CONSUME(LBracket);
+        this.SUBRULE(this.parameterList);
+        this.CONSUME(RBracket);
+      });
       this.MANY2(() => {
         this.OR2([{ ALT: () => this.CONSUME2(Space) }, { ALT: () => this.CONSUME2(Newline) }]);
       });
@@ -2059,22 +2064,28 @@ function createNumberLineBlock(min, max, positions, step, minorTicks, style, lab
 const TableCellSchema = z.object({
   type: z.literal(AST_TYPES.TABLE_CELL),
   colspan: z.number().int().positive().optional(),
+  rowspan: z.number().int().positive().optional(),
+  backgroundColor: z.string().optional(),
   inlines: z.array(InlineNodeSchema)
 });
-function createTableCell(inlines, colspan) {
+function createTableCell(inlines, colspan, rowspan, backgroundColor) {
   return TableCellSchema.parse({
     type: AST_TYPES.TABLE_CELL,
     colspan,
+    rowspan,
+    backgroundColor,
     inlines
   });
 }
 const TableRowSchema = z.object({
   type: z.literal(AST_TYPES.TABLE_ROW),
+  backgroundColor: z.string().optional(),
   cells: z.array(TableCellSchema).min(1)
 });
-function createTableRow(cells) {
+function createTableRow(cells, backgroundColor) {
   return TableRowSchema.parse({
     type: AST_TYPES.TABLE_ROW,
+    backgroundColor,
     cells
   });
 }
@@ -2674,14 +2685,18 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     return createTableBlock(cols, rows);
   }
   row(ctx) {
+    const params = ctx.parameterList ? this.visit(ctx.parameterList) : {};
+    const backgroundColor = params.bgcolor;
     const cells = ctx.cell.map((c) => this.visit(c));
-    return createTableRow(cells);
+    return createTableRow(cells, backgroundColor);
   }
   cell(ctx) {
     const params = ctx.parameterList ? this.visit(ctx.parameterList) : {};
     const colspan = params.colspan;
+    const rowspan = params.rowspan;
+    const backgroundColor = params.bgcolor;
     const inlines = ctx.inlineElement ? ctx.inlineElement.map((elem) => this.visit(elem)) : [];
-    return createTableCell(inlines, colspan);
+    return createTableCell(inlines, colspan, rowspan, backgroundColor);
   }
   // ═══════════════════════════════════════════════════════════════════════════
   // Number Line Block
@@ -3382,11 +3397,14 @@ const TableCellItemSchema = z.object({
   id: z.string(),
   type: z.literal(JSON_TYPES.TABLE_CELL),
   colspan: z.number().int().positive().optional(),
+  rowspan: z.number().int().positive().optional(),
+  backgroundColor: z.string().optional(),
   items: z.array(LayoutItemSchema)
 });
 const TableRowItemSchema = z.object({
   id: z.string(),
   type: z.literal(JSON_TYPES.TABLE_ROW),
+  backgroundColor: z.string().optional(),
   cells: z.array(TableCellItemSchema)
 });
 const TableItemSchema = z.object({
@@ -9668,13 +9686,23 @@ function transformTable(table, idGenerator, inlineDragIds) {
       if (cell.colspan !== void 0) {
         cellItem.colspan = cell.colspan;
       }
+      if (cell.rowspan !== void 0) {
+        cellItem.rowspan = cell.rowspan;
+      }
+      if (cell.backgroundColor !== void 0) {
+        cellItem.backgroundColor = cell.backgroundColor;
+      }
       return cellItem;
     });
-    return {
+    const rowItem = {
       id: idGenerator.generate(JSON_TYPES.TABLE_ROW),
       type: JSON_TYPES.TABLE_ROW,
       cells
     };
+    if (row.backgroundColor !== void 0) {
+      rowItem.backgroundColor = row.backgroundColor;
+    }
+    return rowItem;
   });
   return {
     id: idGenerator.generate(JSON_TYPES.TABLE),
@@ -18273,29 +18301,37 @@ const LayoutRenderer = ({
         },
         subItem.id
       )) });
-    case JSON_TYPES.TABLE:
-      return /* @__PURE__ */ jsx("div", { className: "exercise-table-container", children: /* @__PURE__ */ jsx("table", { className: "exercise-table", children: /* @__PURE__ */ jsx("tbody", { children: item.rows.map((row) => /* @__PURE__ */ jsx("tr", { className: "exercise-table-row", children: row.cells.map((cell) => /* @__PURE__ */ jsx(
-        "td",
-        {
-          className: "exercise-table-cell",
-          colSpan: cell.colspan || 1,
-          children: cell.items.map((subItem) => /* @__PURE__ */ jsx(
-            LayoutRenderer,
-            {
-              item: subItem,
-              widgets,
-              values,
-              droppedInputs,
-              validationDetails,
-              onChange,
-              onInputFocus,
-              resetKey
-            },
-            subItem.id
-          ))
-        },
-        cell.id
-      )) }, row.id)) }) }) });
+    case JSON_TYPES.TABLE: {
+      const totalRows = item.rows.length;
+      return /* @__PURE__ */ jsx("div", { className: "exercise-table-container", children: /* @__PURE__ */ jsx("table", { className: "exercise-table", children: /* @__PURE__ */ jsx("tbody", { children: item.rows.map((row, rowIndex) => /* @__PURE__ */ jsx("tr", { className: "exercise-table-row", style: { backgroundColor: row.backgroundColor }, children: row.cells.map((cell) => {
+        const rowspan = cell.rowspan || 1;
+        const isLastRow = rowIndex + rowspan - 1 >= totalRows - 1;
+        return /* @__PURE__ */ jsx(
+          "td",
+          {
+            className: `exercise-table-cell${isLastRow ? " exercise-table-cell--last-row" : ""}`,
+            colSpan: cell.colspan || 1,
+            rowSpan: rowspan,
+            style: { backgroundColor: cell.backgroundColor },
+            children: cell.items.map((subItem) => /* @__PURE__ */ jsx(
+              LayoutRenderer,
+              {
+                item: subItem,
+                widgets,
+                values,
+                droppedInputs,
+                validationDetails,
+                onChange,
+                onInputFocus,
+                resetKey
+              },
+              subItem.id
+            ))
+          },
+          cell.id
+        );
+      }) }, row.id)) }) }) });
+    }
     case JSON_TYPES.NUMBER_LINE:
       return /* @__PURE__ */ jsx(
         NumberLineRenderer,