@mathscan/math-exercise-engine 1.2.3 → 1.2.5

package/dist/index.mjs

@@ -265,6 +265,10 @@ const HEX_COLOR_REGEX = /^#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$/;
 const isNumberLineHighlightColor = (value) => NUMBER_LINE_HIGHLIGHT_COLORS.includes(value) || HEX_COLOR_REGEX.test(value);
 const highlightColorMessage = (block) => `${block}: color must be one of ${NUMBER_LINE_HIGHLIGHT_COLORS.join(", ")} or a hex value (e.g. "#3B82F6")`;
 const NUMBER_LINE_DRAG_MODES = ["axis", "inputs"];
+const DEFAULT_TABLE_BORDER_COLOR = "#7c6cf2";
+const isTableBorderColor = (value) => value.toLowerCase() === "transparent" || HEX_COLOR_REGEX.test(value);
+const TABLE_BORDER_COLOR_ERROR = 'TABLE: bordercolor must be "transparent" or a hex value (e.g. "#E67E22" or "#F00")';
+const TableBorderColorSchema = z.string({ message: TABLE_BORDER_COLOR_ERROR }).refine(isTableBorderColor, { message: TABLE_BORDER_COLOR_ERROR }).default(DEFAULT_TABLE_BORDER_COLOR);
 function getFractionKey(widgetId, part) {
   return `${widgetId}__${part}`;
 }
@@ -2534,12 +2538,14 @@ function createTableRow(cells, backgroundColor) {
 const TableBlockSchema = z.object({
   type: z.literal(AST_TYPES.TABLE_BLOCK),
   cols: z.number().int().positive(),
+  borderColor: TableBorderColorSchema,
   rows: z.array(TableRowSchema).min(1)
 });
-function createTableBlock(cols, rows) {
+function createTableBlock(cols, rows, borderColor) {
   return TableBlockSchema.parse({
     type: AST_TYPES.TABLE_BLOCK,
     cols,
+    borderColor,
     rows
   });
 }
@@ -3484,8 +3490,10 @@ class NaturalDSLVisitor extends BaseCstVisitor {
   table(ctx) {
     const params = this.visit(ctx.parameterList);
     const cols = params.cols;
+    const borderColorParam = params.bordercolor;
+    const borderColor = borderColorParam === void 0 ? void 0 : String(borderColorParam);
     const rows = ctx.row.map((r) => this.visit(r));
-    return createTableBlock(cols, rows);
+    return createTableBlock(cols, rows, borderColor);
   }
   row(ctx) {
     const params = ctx.parameterList ? this.visit(ctx.parameterList) : {};
@@ -4280,6 +4288,7 @@ const TableItemSchema = z.object({
   id: z.string(),
   type: z.literal(JSON_TYPES.TABLE),
   cols: z.number().int().positive(),
+  borderColor: TableBorderColorSchema,
   rows: z.array(TableRowItemSchema)
 });
 const NumberLinePositionItemSchema = z.object({
@@ -10864,6 +10873,7 @@ function transformTable(table, idGenerator, inlineDragIds) {
     id: idGenerator.generate(JSON_TYPES.TABLE),
     type: JSON_TYPES.TABLE,
     cols: table.cols,
+    borderColor: table.borderColor,
     rows
   };
 }
@@ -11906,7 +11916,7 @@ function getEventCoordinates(event) {
   }
   return null;
 }
-const CSS = /* @__PURE__ */ Object.freeze({
+const CSS$1 = /* @__PURE__ */ Object.freeze({
   Translate: {
     toString(transform) {
       if (!transform) {
@@ -11936,7 +11946,7 @@ const CSS = /* @__PURE__ */ Object.freeze({
       if (!transform) {
         return;
       }
-      return [CSS.Translate.toString(transform), CSS.Scale.toString(transform)].join(" ");
+      return [CSS$1.Translate.toString(transform), CSS$1.Scale.toString(transform)].join(" ");
     }
   },
   Transition: {
@@ -15055,7 +15065,7 @@ const PositionedOverlay = /* @__PURE__ */ forwardRef((_ref, ref) => {
     height: rect.height,
     top: rect.top,
     left: rect.left,
-    transform: CSS.Transform.toString(scaleAdjustedTransform),
+    transform: CSS$1.Transform.toString(scaleAdjustedTransform),
     transformOrigin: adjustScale2 && activatorEvent ? getRelativeTransformOrigin(activatorEvent, rect) : void 0,
     transition: typeof transition === "function" ? transition(activatorEvent) : transition,
     ...style
@@ -15116,9 +15126,9 @@ const defaultKeyframeResolver = (_ref2) => {
     }
   } = _ref2;
   return [{
-    transform: CSS.Transform.toString(initial)
+    transform: CSS$1.Transform.toString(initial)
   }, {
-    transform: CSS.Transform.toString(final)
+    transform: CSS$1.Transform.toString(final)
   }];
 };
 const defaultDropAnimationConfiguration = {
@@ -15551,7 +15561,7 @@ const Draggable = ({
     disabled
   });
   const style = {
-    transform: CSS.Translate.toString(transform),
+    transform: CSS$1.Translate.toString(transform),
     cursor: disabled ? "default" : "grab",
     touchAction: "none"
   };
@@ -17911,7 +17921,7 @@ const CHART_TYPE_COMPONENTS = {
 const Chart = (props) => {
   const ChartComponent = CHART_TYPE_COMPONENTS[props.item.chartType];
   if (!ChartComponent) {
-    return /* @__PURE__ */ jsx("div", { className: "chart chart--unsupported", children: /* @__PURE__ */ jsx("span", { style: { color: "var(--exercise-incorrect, #ef4444)", fontSize: "0.85rem" }, children: `Chart type "${props.item.chartType}" is not yet supported.` }) });
+    return /* @__PURE__ */ jsx("div", { className: "chart chart--unsupported", children: /* @__PURE__ */ jsx("span", { style: { color: "var(--exercise-error, #ef4444)", fontSize: "0.85rem" }, children: `Chart type "${props.item.chartType}" is not yet supported.` }) });
   }
   return /* @__PURE__ */ jsx(ChartComponent, { ...props });
 };
@@ -20625,7 +20635,10 @@ const LayoutRenderer = ({
       )) });
     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 tableStyle = {
+        "--exercise-table-border-color": item.borderColor ?? DEFAULT_TABLE_BORDER_COLOR
+      };
+      return /* @__PURE__ */ jsx("div", { className: "exercise-table-container", style: tableStyle, 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(
@@ -20828,6 +20841,15 @@ const TOOL_ASPECT_RATIO = {
   "set-square": SET_SQUARE_ASPECT_RATIO
 };
 const FLIP_BTN_EXTRA = 44;
+function warnOnInvalidThemeColors(theme) {
+  if (process.env.NODE_ENV === "production" || !theme) return;
+  if (typeof CSS === "undefined" || typeof CSS.supports !== "function") return;
+  for (const [key2, value] of Object.entries(theme)) {
+    if (value && !CSS.supports("color", value)) {
+      console.warn(`[ExerciseRenderer] theme.${key2} is not a valid CSS color: "${value}"`);
+    }
+  }
+}
 function buildInitialValues(json) {
   const initial = {};
   for (const [id, widget] of Object.entries(json.widgets)) {
@@ -20900,7 +20922,8 @@ const ExerciseRenderer = forwardRef(({
   showSubmitButton = false,
   className = "",
   soundEnabled = true,
-  sounds
+  sounds,
+  theme
 }, ref) => {
   const initialValuesSignature = useMemo(() => buildInitialValuesSignature(json), [json]);
   const [values, setValues] = useState(() => buildInitialValues(json));
@@ -20914,6 +20937,15 @@ const ExerciseRenderer = forwardRef(({
   const rootRef = useRef(null);
   const [resetKey, setResetKey] = useState(0);
   const [revealed, setRevealed] = useState(false);
+  const themeStyle = useMemo(() => {
+    const style = {};
+    if (theme?.correct) style["--exercise-correct"] = theme.correct;
+    if (theme?.incorrect) style["--exercise-incorrect"] = theme.incorrect;
+    return Object.keys(style).length > 0 ? style : void 0;
+  }, [theme?.correct, theme?.incorrect]);
+  useEffect(() => {
+    warnOnInvalidThemeColors({ correct: theme?.correct, incorrect: theme?.incorrect });
+  }, [theme?.correct, theme?.incorrect]);
   const playSound = useSoundPlayer(soundEnabled, sounds);
   const externallyLocked = useExerciseLocked();
   useLayoutEffect(() => {
@@ -21170,7 +21202,7 @@ const ExerciseRenderer = forwardRef(({
     if (setSquareWidget) add2("set-square-1", "set-square", Math.round(getSize(setSquareWidget) * 160));
     return { tools: list, toolsMinHeight: maxH };
   }, [rulerWidget, protractorWidget, setSquareWidget]);
-  return /* @__PURE__ */ jsx(SoundPlayerProvider, { play: playSound, children: /* @__PURE__ */ jsx(ExerciseLockProvider, { locked, children: /* @__PURE__ */ jsx(ExerciseDndProvider, { droppedSources, children: /* @__PURE__ */ jsxs("div", { ref: rootRef, className: `math-exercise-renderer ${revealed ? "revealed" : ""} ${locked ? "locked" : ""} ${className}`, children: [
+  return /* @__PURE__ */ jsx(SoundPlayerProvider, { play: playSound, children: /* @__PURE__ */ jsx(ExerciseLockProvider, { locked, children: /* @__PURE__ */ jsx(ExerciseDndProvider, { droppedSources, children: /* @__PURE__ */ jsxs("div", { ref: rootRef, className: `math-exercise-renderer ${revealed ? "revealed" : ""} ${locked ? "locked" : ""} ${className}`, style: themeStyle, children: [
     /* @__PURE__ */ jsxs(
       "div",
       {
@@ -21332,6 +21364,7 @@ export {
   ColorTextInlineSchema,
   ColorTextSchema,
   ContentBlockSchema,
+  DEFAULT_TABLE_BORDER_COLOR,
   DisplayInlineNodeSchema,
   DragOptionsJSONSchema,
   DragOptionsToolSchema,