@mathscan/math-exercise-engine 1.1.11 → 1.1.12

package/dist/index.mjs

@@ -17674,26 +17674,42 @@ const NumberLineRenderer = ({
     positions,
     cursors
   } = item;
-  const [counterCount, setCounterCount] = useState(
-    counter !== void 0 ? counter.default ?? counter.min : 0
-  );
+  const [counterCount, setCounterCount] = useState(() => {
+    if (counter === void 0) return 0;
+    const raw = values[counter.id];
+    const n = typeof raw === "string" && raw !== "" ? Number(raw) : NaN;
+    return Number.isFinite(n) ? Math.min(counter.max, Math.max(counter.min, n)) : counter.default ?? counter.min;
+  });
   const defaultCounterCount = counter !== void 0 ? counter.default ?? counter.min : 0;
+  const prevCounterKey = useRef(null);
   useEffect(() => {
-    setCounterCount(defaultCounterCount);
-  }, [counter]);
+    const key2 = counter ? `${counter.id}:${defaultCounterCount}` : "";
+    const changed = prevCounterKey.current !== null && prevCounterKey.current !== key2;
+    prevCounterKey.current = key2;
+    if (changed) setCounterCount(defaultCounterCount);
+  }, [counter, defaultCounterCount]);
   const onChangeRef = useRef(onChange);
   onChangeRef.current = onChange;
+  const valuesRef = useRef(values);
+  valuesRef.current = values;
   useEffect(() => {
-    if (counter !== void 0) {
-      onChangeRef.current(counter.id, String(counterCount));
+    if (counter === void 0) return;
+    const next = String(counterCount);
+    if (valuesRef.current[counter.id] !== next) {
+      onChangeRef.current(counter.id, next);
     }
   }, [counterCount, counter?.id]);
   const cursorKeys = useMemo(
     () => (cursors ?? []).map((c) => `${c.id}:${c.value}`).join(","),
     [cursors]
   );
+  const prevCursorKeys = useRef(null);
   useEffect(() => {
+    const isDefinitionChange = prevCursorKeys.current !== null && prevCursorKeys.current !== cursorKeys;
+    prevCursorKeys.current = cursorKeys;
     for (const cursor of cursors ?? []) {
+      const existing = valuesRef.current[cursor.id];
+      if (!isDefinitionChange && existing !== void 0 && existing !== "") continue;
       onChangeRef.current(cursor.id, String(cursor.value));
     }
   }, [cursorKeys]);
@@ -18445,6 +18461,44 @@ function buildInitialValues(json) {
   }
   return initial;
 }
+function buildRevealedValues(json) {
+  const revealed = {};
+  const validation = json.validation;
+  if (!validation) return revealed;
+  const answers = validation.answers ?? {};
+  for (const [widgetId, expected] of Object.entries(answers)) {
+    const widget = json.widgets[widgetId];
+    if (widget?.type === JSON_TYPES.FRACTION && typeof expected === "string") {
+      const [num, den] = expected.split("/", 2);
+      if (widget.numerator === null && num !== void 0) revealed[getFractionKey(widgetId, "num")] = num;
+      if (widget.denominator === null && den !== void 0) revealed[getFractionKey(widgetId, "den")] = den;
+      continue;
+    }
+    revealed[widgetId] = typeof expected === "number" ? String(expected) : expected;
+  }
+  if ((validation.mode === VALIDATION_MODES.EXPRESSION || validation.mode === VALIDATION_MODES.MIXED) && validation.expression) {
+    const vars = validation.variables ?? [];
+    const freeVars = vars.filter((v) => !(v in answers));
+    if (freeVars.length > 0) {
+      const ranges = {};
+      for (const v of vars) {
+        if (v in answers) {
+          const pinned = Number(answers[v]);
+          if (Number.isFinite(pinned)) ranges[v] = { min: pinned, max: pinned, step: 1 };
+        } else {
+          ranges[v] = { min: 1, max: 100, step: 1 };
+        }
+      }
+      const combo = findValidCombination(validation.expression, ranges);
+      if (combo) {
+        for (const v of freeVars) {
+          if (combo[v] !== void 0) revealed[v] = String(combo[v]);
+        }
+      }
+    }
+  }
+  return revealed;
+}
 const ExerciseRenderer = forwardRef(({
   json,
   onSubmit,
@@ -18455,10 +18509,13 @@ const ExerciseRenderer = forwardRef(({
   sounds
 }, ref) => {
   const [values, setValues] = useState(() => buildInitialValues(json));
+  const valuesRef = useRef(values);
+  valuesRef.current = values;
   const [droppedSources, setDroppedSources] = useState(/* @__PURE__ */ new Map());
   const [focusedInputId, setFocusedInputId] = useState(null);
   const [validationDetails, setValidationDetails] = useState(null);
   const [resetKey, setResetKey] = useState(0);
+  const [revealed, setRevealed] = useState(false);
   const playSound = useSoundPlayer(soundEnabled, sounds);
   useImperativeHandle(ref, () => ({
     submit: () => {
@@ -18492,7 +18549,7 @@ const ExerciseRenderer = forwardRef(({
     getValues: () => values,
     getCompletion: () => {
       const answerable = getAnswerableInputs(json);
-      const missing = getMissingInputs(json, values);
+      const missing = getMissingInputs(json, valuesRef.current);
       const missingSet = new Set(missing);
       const filledIds = answerable.filter((id) => !missingSet.has(id));
       return {
@@ -18505,11 +18562,28 @@ const ExerciseRenderer = forwardRef(({
       };
     },
     reset: () => {
-      setValues(buildInitialValues(json));
+      const initial = buildInitialValues(json);
+      valuesRef.current = initial;
+      setValues(initial);
       setDroppedSources(/* @__PURE__ */ new Map());
       setFocusedInputId(null);
       setValidationDetails(null);
       setResetKey((k) => k + 1);
+      setRevealed(false);
+    },
+    revealAnswers: () => {
+      const revealedValues = buildRevealedValues(json);
+      const details = {};
+      for (const [widgetId, userValue] of Object.entries(revealedValues)) {
+        details[widgetId] = { widgetId, userValue, isCorrect: true };
+      }
+      const next = { ...valuesRef.current, ...revealedValues };
+      valuesRef.current = next;
+      setValues(next);
+      setDroppedSources(/* @__PURE__ */ new Map());
+      setValidationDetails(details);
+      setRevealed(true);
+      setResetKey((k) => k + 1);
     },
     focusFirstInput: () => {
       const container = document.querySelector(".math-exercise-renderer");
@@ -18520,17 +18594,20 @@ const ExerciseRenderer = forwardRef(({
     }
   }), [json, values, onSubmit, playSound]);
   const handleChange = (widgetId, value, fromDrop = false, sourceOptionId) => {
-    setValues((prev) => ({ ...prev, [widgetId]: value }));
+    setRevealed(false);
+    const next = { ...valuesRef.current, [widgetId]: value };
+    valuesRef.current = next;
+    setValues(next);
     setDroppedSources((prev) => {
-      const next = new Map(prev);
+      const next2 = new Map(prev);
       if (fromDrop && typeof value === "string" && value !== "" && sourceOptionId) {
-        next.set(widgetId, sourceOptionId);
+        next2.set(widgetId, sourceOptionId);
       } else {
-        next.delete(widgetId);
+        next2.delete(widgetId);
       }
-      return next;
+      return next2;
     });
-    onChange?.({ ...values, [widgetId]: value });
+    onChange?.(next);
   };
   const handleSubmit = () => {
     onSubmit?.(values);
@@ -18648,7 +18725,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(ExerciseDndProvider, { droppedSources, children: /* @__PURE__ */ jsxs("div", { className: `math-exercise-renderer ${className}`, children: [
+  return /* @__PURE__ */ jsx(SoundPlayerProvider, { play: playSound, children: /* @__PURE__ */ jsx(ExerciseDndProvider, { droppedSources, children: /* @__PURE__ */ jsxs("div", { className: `math-exercise-renderer ${revealed ? "revealed" : ""} ${className}`, children: [
     /* @__PURE__ */ jsxs(
       "div",
       {