@khanacademy/perseus 35.0.0 → 35.1.1

package/dist/index.js

@@ -3254,7 +3254,7 @@ function constrainedTickStepsFromTickSteps(tickSteps, ranges) {
 /**
  * Approximate equality on numbers and primitives.
  */
-function eq$3(x, y) {
+function eq$4(x, y) {
   if (typeof x === "number" && typeof y === "number") {
     return Math.abs(x - y) < 1e-9;
   }
@@ -3281,7 +3281,7 @@ function deepEq$5(x, y) {
     return false;
   }
   if (typeof x === "function" && typeof y === "function") {
-    return eq$3(x, y);
+    return eq$4(x, y);
   }
   if (typeof x === "function" || typeof y === "function") {
     return false;
@@ -3298,7 +3298,7 @@ function deepEq$5(x, y) {
   if (typeof x === "object" && !!x || typeof y === "object" && !!y) {
     return false;
   }
-  return eq$3(x, y);
+  return eq$4(x, y);
 }
 
 /**
@@ -3596,7 +3596,7 @@ const Util = {
   gridStepFromTickStep,
   tickStepFromNumTicks,
   constrainedTickStepsFromTickSteps,
-  eq: eq$3,
+  eq: eq$4,
   deepEq: deepEq$5,
   parseQueryString,
   updateQueryString: updateQueryString$2,
@@ -10921,7 +10921,7 @@ class WrappedLine extends WrappedDrawing {
  * A collection of geomtry-related utility functions
  */
 const {
-  eq: eq$2,
+  eq: eq$3,
   deepEq: deepEq$4
 } = Util;
 
@@ -10931,7 +10931,7 @@ const {
 
 // Given a number, return whether it is positive (1), negative (-1), or zero (0)
 function sign(val) {
-  if (eq$2(val, 0)) {
+  if (eq$3(val, 0)) {
     return 0;
   }
   return val > 0 ? 1 : -1;
@@ -10943,7 +10943,7 @@ function ccw(a, b, c) {
   return (b[0] - a[0]) * (c[1] - a[1]) - (c[0] - a[0]) * (b[1] - a[1]);
 }
 function collinear(a, b, c) {
-  return eq$2(ccw(a, b, c), 0);
+  return eq$3(ccw(a, b, c), 0);
 }
 
 // Given rect bounding points A and B, whether point C is inside the rect
@@ -11088,7 +11088,7 @@ function similar(coords1, coords2, tolerance) {
         return pair[0] / pair[1];
       });
       const same = ___default["default"].all(factors, function (factor) {
-        return eq$2(factors[0], factor);
+        return eq$3(factors[0], factor);
       });
       const congruentEnough = ___default["default"].all(sidePairs, function (pair) {
         return kmath.number.equal(pair[0], pair[1], tolerance);
@@ -11141,7 +11141,7 @@ function rotate(array, n) {
   return array.slice(n).concat(array.slice(0, n));
 }
 function getLineEquation(first, second) {
-  if (eq$2(first[0], second[0])) {
+  if (eq$3(first[0], second[0])) {
     return "x = " + first[0].toFixed(3);
   }
   const m = (second[1] - first[1]) / (second[0] - first[0]);
@@ -24914,6 +24914,31 @@ const parseUrl = url => new URL(url, location().origin);
  */
 const toAbsoluteUrl = url => parseUrl(url).href;
 
+function csProgramValidator(state) {
+  // The iframe can tell us whether it's correct or incorrect,
+  //  and pass an optional message
+  if (state.status === "correct") {
+    return {
+      type: "points",
+      earned: 1,
+      total: 1,
+      message: state.message || null
+    };
+  }
+  if (state.status === "incorrect") {
+    return {
+      type: "points",
+      earned: 0,
+      total: 1,
+      message: state.message || null
+    };
+  }
+  return {
+    type: "invalid",
+    message: "Keep going, you're not there yet!"
+  };
+}
+
 /**
  * This widget is for embedding Khan Academy CS programs.
  */
@@ -24946,29 +24971,8 @@ class CSProgram extends React__namespace.Component {
   };
 
   // The widget's grading function
-  static validate(state, rubric) {
-    // The iframe can tell us whether it's correct or incorrect,
-    //  and pass an optional message
-    if (state.status === "correct") {
-      return {
-        type: "points",
-        earned: 1,
-        total: 1,
-        message: state.message || null
-      };
-    }
-    if (state.status === "incorrect") {
-      return {
-        type: "points",
-        earned: 0,
-        total: 1,
-        message: state.message || null
-      };
-    }
-    return {
-      type: "invalid",
-      message: "Keep going, you're not there yet!"
-    };
+  static validate(state) {
+    return csProgramValidator(state);
   }
   componentDidMount() {
     $__default["default"](window).on("message", this.handleMessageEvent);
@@ -25005,11 +25009,11 @@ class CSProgram extends React__namespace.Component {
       return change.apply(_this, args);
     };
   })();
-  simpleValidate(rubric) {
-    return CSProgram.validate({
+  simpleValidate() {
+    return csProgramValidator({
       status: this.props.status,
       message: this.props.message
-    }, rubric);
+    });
   }
   render() {
     if (!this.props.programID) {
@@ -26612,49 +26616,6 @@ function functionForType(
 type) {
   return functionTypeMapping[type];
 }
-const validate$1 = (state, rubric) => {
-  if (state.type !== rubric.correct.type) {
-    return {
-      type: "points",
-      earned: 0,
-      total: 1,
-      message: null
-    };
-  }
-
-  // We haven't moved the coords
-  if (state.coords == null) {
-    return {
-      type: "invalid",
-      message: null
-    };
-  }
-
-  // Get new function handler for grading
-  const grader = functionForType(state.type);
-  const guessCoeffs = grader.getCoefficients(state.coords, state.asymptote);
-  const correctCoeffs = grader.getCoefficients(rubric.correct.coords, rubric.correct.asymptote);
-  if (guessCoeffs == null || correctCoeffs == null) {
-    return {
-      type: "invalid",
-      message: null
-    };
-  }
-  if (grader.areEqual(guessCoeffs, correctCoeffs)) {
-    return {
-      type: "points",
-      earned: 1,
-      total: 1,
-      message: null
-    };
-  }
-  return {
-    type: "points",
-    earned: 0,
-    total: 1,
-    message: null
-  };
-};
 const getEquationString = props => {
   const plot = props.plot;
   if (plot.type && plot.coords) {
@@ -26772,7 +26733,6 @@ var util = /*#__PURE__*/Object.freeze({
   DEFAULT_BACKGROUND_IMAGE: DEFAULT_BACKGROUND_IMAGE,
   allTypes: allTypes,
   functionForType: functionForType,
-  validate: validate$1,
   getEquationString: getEquationString,
   pointsFromNormalized: pointsFromNormalized,
   maybePointsFromNormalized: maybePointsFromNormalized,
@@ -26783,6 +26743,52 @@ var util = /*#__PURE__*/Object.freeze({
   typeToButton: typeToButton
 });
 
+function grapherValidator(state, rubric) {
+  if (state.type !== rubric.correct.type) {
+    return {
+      type: "points",
+      earned: 0,
+      total: 1,
+      message: null
+    };
+  }
+
+  // We haven't moved the coords
+  if (state.coords == null) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+
+  // Get new function handler for grading
+  const grader = functionForType(state.type);
+  const guessCoeffs = grader.getCoefficients(state.coords, state.asymptote);
+  const correctCoeffs = grader.getCoefficients(rubric.correct.coords,
+  // @ts-expect-error - TS(2339) - Property 'asymptote' does not exist on type '{ type: "absolute_value"; coords: [Coord, Coord]; }'
+  rubric.correct.asymptote);
+  if (guessCoeffs == null || correctCoeffs == null) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  if (grader.areEqual(guessCoeffs, correctCoeffs)) {
+    return {
+      type: "points",
+      earned: 1,
+      total: 1,
+      message: null
+    };
+  }
+  return {
+    type: "points",
+    earned: 0,
+    total: 1,
+    message: null
+  };
+}
+
 // @ts-expect-error - TS2339 - Property 'MovablePoint' does not exist on type 'typeof Graphie'.
 const MovablePoint$3 = Graphie.MovablePoint;
 // @ts-expect-error - TS2339 - Property 'MovableLine' does not exist on type 'typeof Graphie'.
@@ -26986,7 +26992,7 @@ class Grapher extends React__namespace.Component {
   vertHairline;
   static defaultProps = DEFAULT_GRAPHER_PROPS;
   static validate(state, rubric) {
-    return validate$1(state, rubric);
+    return grapherValidator(state, rubric);
   }
   static getUserInputFromProps(props) {
     return props.plot;
@@ -27091,7 +27097,7 @@ class Grapher extends React__namespace.Component {
     }
   };
   simpleValidate(rubric) {
-    return validate$1(this.getUserInput(), rubric);
+    return grapherValidator(this.getUserInput(), rubric);
   }
   getUserInput() {
     return Grapher.getUserInputFromProps(this.props);
@@ -27334,6 +27340,31 @@ var Group$1 = {
   isLintable: true
 };
 
+function iframeValidator(state) {
+  // The iframe can tell us whether it's correct or incorrect,
+  //  and pass an optional message
+  if (state.status === "correct") {
+    return {
+      type: "points",
+      earned: 1,
+      total: 1,
+      message: state.message || null
+    };
+  }
+  if (state.status === "incorrect") {
+    return {
+      type: "points",
+      earned: 0,
+      total: 1,
+      message: state.message || null
+    };
+  }
+  return {
+    type: "invalid",
+    message: "Keep going, you're not there yet!"
+  };
+}
+
 /**
  * This is an iframe widget. It is used for rendering an iframe that
  *  then communicates its state via window.postMessage
@@ -27354,6 +27385,9 @@ class Iframe extends React__namespace.Component {
     allowFullScreen: false,
     allowTopNavigation: false
   };
+  static validate(state) {
+    return iframeValidator(state);
+  }
   componentDidMount() {
     $__default["default"](window).on("message", this.handleMessageEvent);
   }
@@ -27395,10 +27429,9 @@ class Iframe extends React__namespace.Component {
       return change.apply(_this, args);
     };
   })();
-  simpleValidate = rubric => {
-    // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Iframe'.
-    return Iframe.validate(this.getUserInput(), rubric);
-  };
+  simpleValidate() {
+    return iframeValidator(this.getUserInput());
+  }
   render() {
     const style = {
       width: String(this.props.width),
@@ -27461,36 +27494,6 @@ class Iframe extends React__namespace.Component {
     });
   }
 }
-
-/**
- * This is the widget's grading function
- */
-___default["default"].extend(Iframe, {
-  validate: function (state, rubric) {
-    // The iframe can tell us whether it's correct or incorrect,
-    //  and pass an optional message
-    if (state.status === "correct") {
-      return {
-        type: "points",
-        earned: 1,
-        total: 1,
-        message: state.message || null
-      };
-    }
-    if (state.status === "incorrect") {
-      return {
-        type: "points",
-        earned: 0,
-        total: 1,
-        message: state.message || null
-      };
-    }
-    return {
-      type: "invalid",
-      message: "Keep going, you're not there yet!"
-    };
-  }
-});
 var Iframe$1 = {
   name: "iframe",
   displayName: "Iframe (deprecated)",
@@ -29023,7 +29026,8 @@ const tickLabelSize = 14;
 const YGridTick = _ref => {
   let {
     y,
-    range
+    range,
+    tickStep
   } = _ref;
   // If the graph requires out-of-bounds labels, we want to make sure to set the
   // coordinates to the edge of the visible range of the graph. Otherwise,
@@ -29058,9 +29062,10 @@ const YGridTick = _ref => {
 
   // If the graph displays both the y and x axis lines within the graph, we want
   // to hide the label at -1 on the y-axis to prevent overlap with the x-axis label
-  const showLabel = shouldShowLabel(y, range);
+  const showLabel = shouldShowLabel(y, range, tickStep);
   return /*#__PURE__*/React__namespace.createElement("g", {
-    className: "tick"
+    className: "tick",
+    "aria-hidden": true
   }, /*#__PURE__*/React__namespace.createElement("line", {
     x1: x1,
     y1: y1,
@@ -29120,7 +29125,8 @@ const XGridTick = _ref2 => {
   const xPositionText = xPosition + xAdjustment;
   const yPositionText = yPosition + yAdjustment;
   return /*#__PURE__*/React__namespace.createElement("g", {
-    className: "tick"
+    className: "tick",
+    "aria-hidden": true
   }, /*#__PURE__*/React__namespace.createElement("line", {
     x1: x1,
     y1: y1,
@@ -29139,13 +29145,13 @@ const XGridTick = _ref2 => {
 };
 
 // Determines whether to show the label for the given tick
-// Currently, the only condition is to hide the label at -1
-// on the y-axis when the x-axis is within the graph
-const shouldShowLabel = (number, range) => {
+// Currently, the only condition is to hide the label at -tickStep
+// on the y-axis when the y-axis is within the graph bounds
+const shouldShowLabel = (currentTick, range, tickStep) => {
   let showLabel = true;
 
-  // If the x-axis is within the graph and the y-axis is at -1, hide the label
-  if (range[X][MIN] < -1 && range[X][MAX] > 0 && number === -1) {
+  // If the y-axis is within the graph and currentTick equals -tickStep, hide the label
+  if (range[X][MIN] < -tickStep && range[X][MAX] > 0 && currentTick === -tickStep) {
     showLabel = false;
   }
   return showLabel;
@@ -29187,7 +29193,8 @@ const AxisTicks = () => {
     return /*#__PURE__*/React__namespace.createElement(YGridTick, {
       y: y,
       key: `y-grid-tick-${y}`,
-      range: range
+      range: range,
+      tickStep: tickStep[Y]
     });
   })), /*#__PURE__*/React__namespace.createElement("g", {
     className: "x-axis-ticks"
@@ -29942,7 +29949,8 @@ function LockedLabel(props) {
       color: lockedFigureColors[color],
       fontSize: wonderBlocksTokens.font.size[size],
       backgroundColor: "rgba(255, 255, 255, 0.8)"
-    }
+    },
+    "aria-hidden": true
   }, /*#__PURE__*/React__namespace.createElement(TeX, null, text));
 }
 
@@ -29966,6 +29974,8 @@ function GraphLockedLabelsLayer(props) {
     flags?.["mafs"]?.["locked-vector-labels"] && figure.type === "vector" ||
     // Ellipse flag + ellipse type
     flags?.["mafs"]?.["locked-ellipse-labels"] && figure.type === "ellipse" ||
+    // Polygon flag + polygon type
+    flags?.["mafs"]?.["locked-polygon-labels"] && figure.type === "polygon" ||
     // Function flag + function type
     flags?.["mafs"]?.["locked-function-labels"] && figure.type === "function") {
       return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, {
@@ -29989,9 +29999,16 @@ const LockedEllipse = props => {
     angle,
     color,
     fillStyle,
-    strokeStyle
+    strokeStyle,
+    ariaLabel,
+    flags
   } = props;
-  return /*#__PURE__*/React__namespace.createElement(mafs.Ellipse, {
+  const hasAria = ariaLabel && flags?.["mafs"]?.["locked-figures-aria"];
+  return /*#__PURE__*/React__namespace.createElement("g", {
+    className: "locked-ellipse",
+    "aria-label": hasAria ? ariaLabel : undefined,
+    "aria-hidden": !hasAria
+  }, /*#__PURE__*/React__namespace.createElement(mafs.Ellipse, {
     center: center,
     radius: radius,
     angle: angle,
@@ -30007,7 +30024,7 @@ const LockedEllipse = props => {
         fill: fillStyle === "white" ? wonderBlocksTokens.color.white : lockedFigureColors[color]
       }
     }
-  });
+  }));
 };
 
 const LockedFunction = props => {
@@ -30023,6 +30040,7 @@ const LockedFunction = props => {
     style: strokeStyle,
     domain
   };
+  const hasAria = props.ariaLabel && props.flags?.["mafs"]?.["locked-figures-aria"];
   React.useEffect(() => {
     // Parsing the equation in a "useEffect" hook saves about 2ms each frame
     //    when the learner is interacting with the graph (i.e. moving points).
@@ -30032,7 +30050,9 @@ const LockedFunction = props => {
     return null;
   }
   return /*#__PURE__*/React__namespace.createElement("g", {
-    className: "locked-function"
+    className: "locked-function",
+    "aria-label": hasAria ? props.ariaLabel : undefined,
+    "aria-hidden": !hasAria
   }, directionalAxis === "x" && /*#__PURE__*/React__namespace.createElement(mafs.Plot.OfX, _extends({
     y: x => equation.eval({
       x
@@ -30132,9 +30152,12 @@ const LockedLine = props => {
     points,
     showPoint1,
     showPoint2,
+    ariaLabel,
+    flags,
     range
   } = props;
   const [point1, point2] = points;
+  const hasAria = ariaLabel && flags?.["mafs"]?.["locked-figures-aria"];
   let line;
   if (kind === "ray") {
     // Rays extend to the end of the graph in one direction.
@@ -30174,7 +30197,9 @@ const LockedLine = props => {
     }), endArrowHead);
   }
   return /*#__PURE__*/React__namespace.createElement("g", {
-    className: kind === "ray" ? "locked-ray" : "locked-line"
+    className: kind === "ray" ? "locked-ray" : "locked-line",
+    "aria-label": hasAria ? ariaLabel : undefined,
+    "aria-hidden": !hasAria
   }, line, showPoint1 && /*#__PURE__*/React__namespace.createElement(mafs.Point, {
     x: point1.coord[X],
     y: point1.coord[Y],
@@ -30200,12 +30225,19 @@ const LockedLine = props => {
 
 const LockedPoint = props => {
   const {
+    flags,
     color,
     coord,
-    filled
+    filled,
+    ariaLabel
   } = props;
   const [x, y] = coord;
-  return /*#__PURE__*/React__namespace.createElement(mafs.Point, {
+  const hasAria = ariaLabel && flags?.["mafs"]?.["locked-figures-aria"];
+  return /*#__PURE__*/React__namespace.createElement("g", {
+    className: "locked-point",
+    "aria-label": hasAria ? ariaLabel : undefined,
+    "aria-hidden": !hasAria
+  }, /*#__PURE__*/React__namespace.createElement(mafs.Point, {
     x: x,
     y: y,
     svgCircleProps: {
@@ -30215,7 +30247,7 @@ const LockedPoint = props => {
         strokeWidth: wonderBlocksTokens.spacing.xxxxSmall_2
       }
     }
-  });
+  }));
 };
 
 const LockedPolygon = props => {
@@ -30226,8 +30258,11 @@ const LockedPolygon = props => {
     fillStyle,
     strokeStyle
   } = props;
+  const hasAria = props.ariaLabel && props.flags?.["mafs"]?.["locked-figures-aria"];
   return /*#__PURE__*/React__namespace.createElement("g", {
-    className: "locked-polygon"
+    className: "locked-polygon",
+    "aria-label": hasAria ? props.ariaLabel : undefined,
+    "aria-hidden": !hasAria
   }, /*#__PURE__*/React__namespace.createElement(mafs.Polygon, {
     points: [...points],
     fillOpacity: lockedFigureFillStyles[fillStyle],
@@ -30253,11 +30288,16 @@ const LockedPolygon = props => {
 const LockedVector = props => {
   const {
     color,
-    points
+    points,
+    ariaLabel,
+    flags
   } = props;
   const [tail, tip] = points;
+  const hasAria = ariaLabel && flags?.["mafs"]?.["locked-figures-aria"];
   return /*#__PURE__*/React__namespace.createElement("g", {
-    className: "locked-vector"
+    className: "locked-vector",
+    "aria-label": hasAria ? ariaLabel : undefined,
+    "aria-hidden": !hasAria
   }, /*#__PURE__*/React__namespace.createElement(Vector, {
     tail: tail,
     tip: tip,
@@ -30267,6 +30307,7 @@ const LockedVector = props => {
 
 const GraphLockedLayer = props => {
   const {
+    flags,
     lockedFigures
   } = props;
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, lockedFigures.map((figure, index) => {
@@ -30274,28 +30315,40 @@ const GraphLockedLayer = props => {
       case "point":
         return /*#__PURE__*/React__namespace.createElement(LockedPoint, _extends({
           key: `point-${index}`
-        }, figure));
+        }, figure, {
+          flags: flags
+        }));
       case "line":
         return /*#__PURE__*/React__namespace.createElement(LockedLine, _extends({
           key: `line-${index}`,
           range: props.range
-        }, figure));
+        }, figure, {
+          flags: flags
+        }));
       case "vector":
         return /*#__PURE__*/React__namespace.createElement(LockedVector, _extends({
           key: `vector-${index}`
-        }, figure));
+        }, figure, {
+          flags: flags
+        }));
       case "ellipse":
         return /*#__PURE__*/React__namespace.createElement(LockedEllipse, _extends({
           key: `ellipse-${index}`
-        }, figure));
+        }, figure, {
+          flags: flags
+        }));
       case "polygon":
         return /*#__PURE__*/React__namespace.createElement(LockedPolygon, _extends({
           key: `polygon-${index}`
-        }, figure));
+        }, figure, {
+          flags: flags
+        }));
       case "function":
         return /*#__PURE__*/React__namespace.createElement(LockedFunction, _extends({
           key: `function-${index}`
-        }, figure));
+        }, figure, {
+          flags: flags
+        }));
       case "label":
         // This is rendered outside the SVG element, since
         // TeX cannot be rendered inside an SVG.
@@ -31782,7 +31835,7 @@ function QuadraticGraph(props) {
   // to content creators the currently selected "correct answer". ex: y = 0.200x^2 + 0.000x + 0.000
   // While we should technically never have invalid coordinates, we want to ensure that we have a fallback
   const coeffRef = React__namespace.useRef([0, 0, 0]);
-  const coeffs = getQuadraticCoefficients(coords);
+  const coeffs = getQuadraticCoefficients$1(coords);
   if (coeffs !== undefined) {
     coeffRef.current = coeffs;
   }
@@ -31806,7 +31859,7 @@ function QuadraticGraph(props) {
 // These equations were originally set up in 2013 and may require some
 // additional comments to help clarify the quadratic formula manipulations
 // Origin: https://phabricator.khanacademy.org/D2413
-const getQuadraticCoefficients = coords => {
+const getQuadraticCoefficients$1 = coords => {
   const p1 = coords[0];
   const p2 = coords[1];
   const p3 = coords[2];
@@ -31846,7 +31899,7 @@ function SinusoidGraph(props) {
     phase: 1,
     verticalOffset: 0
   });
-  const coeffs = getSinusoidCoefficients(coords);
+  const coeffs = getSinusoidCoefficients$1(coords);
 
   // If the coefficients are valid, update the reference
   if (coeffs !== undefined) {
@@ -31875,7 +31928,7 @@ sinusoidCoefficients) {
   } = sinusoidCoefficients;
   return a * Math.sin(b * x - c) + d;
 };
-const getSinusoidCoefficients = coords => {
+const getSinusoidCoefficients$1 = coords => {
   // It's assumed that p1 is the root and p2 is the first peak
   const p1 = coords[0];
   const p2 = coords[1];
@@ -32334,6 +32387,7 @@ const MafsGraph = props => {
   })),
   // Only render the axis ticks and arrows if the markings are set to a full "graph"
   props.markings === "graph" && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(AxisTicks, null), /*#__PURE__*/React__namespace.createElement(AxisArrows, null)), /*#__PURE__*/React__namespace.createElement("svg", nestedSVGAttributes, props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
+    flags: props.flags,
     lockedFigures: props.lockedFigures,
     range: state.range
   }))), props.flags?.["mafs"]?.["interactive-graph-locked-features-labels"] && props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLabelsLayer, {
@@ -32589,6 +32643,95 @@ const renderGraph = props => {
   }
 };
 
+// Converts the state of a StatefulMafsGraph back to the format used to
+// represent graph state in the widget JSON.
+//
+// Rather than be tightly bound to how data was structured in
+// the legacy interactive graph, this lets us store state
+// however we want and we just transform it before handing it off
+// the the parent InteractiveGraph.
+//
+// The transformed data is used in the interactive graph widget editor, to
+// set the `correct` field of the graph options. In the learner-facing UI, the
+// data is also stored by the Renderer, and passed back down to the graph
+// widget via the `graph` prop. Because the data returned by this function
+// completely replaces the Renderer's representation of the widget, rather than
+// being merged into it, we take it upon ourselves to merge in the original
+// widget data here. If we didn't do this merging, the graph's configuration
+// would reset to the defaults when the learner interacted with it.
+function mafsStateToInteractiveGraph(state, originalGraph) {
+  switch (state.type) {
+    case "angle":
+      invariant(originalGraph.type === "angle");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "quadratic":
+      invariant(originalGraph.type === "quadratic");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "circle":
+      invariant(originalGraph.type === "circle");
+      return {
+        ...originalGraph,
+        center: state.center,
+        radius: getRadius(state)
+      };
+    case "linear":
+      invariant(originalGraph.type === "linear");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "ray":
+      invariant(originalGraph.type === "ray");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "sinusoid":
+      invariant(originalGraph.type === "sinusoid");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "segment":
+      invariant(originalGraph.type === "segment");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "linear-system":
+      invariant(originalGraph.type === "linear-system");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "polygon":
+      invariant(originalGraph.type === "polygon");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "point":
+      invariant(originalGraph.type === "point");
+      return {
+        ...originalGraph,
+        coords: state.coords
+      };
+    case "none":
+      invariant(originalGraph.type === "none");
+      return {
+        ...originalGraph
+      };
+    default:
+      throw new wonderStuffCore.UnreachableCaseError(state);
+  }
+}
+
 function initializeGraphState(params) {
   const {
     graph,
@@ -33237,7 +33380,7 @@ function doMovePoint(state, action) {
         // Bind the new destination to the graph range/snapStep and then get the quadratic coefficients
         const boundDestination = boundAndSnapToGrid(action.destination, state);
         newCoords[action.index] = boundDestination;
-        const QuadraticCoefficients = getQuadraticCoefficients(newCoords);
+        const QuadraticCoefficients = getQuadraticCoefficients$1(newCoords);
 
         // If the new destination results in an invalid quadratic equation, we don't want to move the point
         if (QuadraticCoefficients === undefined) {
@@ -33393,11 +33536,11 @@ const getChange = (coords, delta, constraintOpts) => {
   const [dx, dy] = getDeltaVertex(maxMoves, minMoves, delta);
   return [dx, dy];
 };
-const eq$1 = Util.eq;
+const eq$2 = Util.eq;
 
 // Less than or approximately equal
 function leq$1(a, b) {
-  return a < b || eq$1(a, b);
+  return a < b || eq$2(a, b);
 }
 function boundAndSnapToGrid(point, _ref) {
   let {
@@ -33709,24 +33852,6 @@ function setAtIndex(args) {
   return copy;
 }
 
-// Rather than be tightly bound to how data was structured in
-// the legacy interactive graph, this lets us store state
-// however we want and we just transform it before handing it off
-// the the parent InteractiveGraph
-function mafsStateToInteractiveGraph(state) {
-  if (state.graph.type === "circle") {
-    return {
-      ...state,
-      graph: {
-        ...state.graph,
-        radius: getRadius(state.graph)
-      }
-    };
-  }
-  return {
-    ...state
-  };
-}
 const StatefulMafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
   const {
     onChange,
@@ -33739,12 +33864,12 @@ const StatefulMafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref)
   const prevState = React.useRef(state);
   React.useEffect(() => {
     if (prevState.current !== state) {
-      onChange(mafsStateToInteractiveGraph({
-        graph: state
-      }));
+      onChange({
+        graph: mafsStateToInteractiveGraph(state, graph)
+      });
     }
     prevState.current = state;
-  }, [onChange, state]);
+  }, [onChange, state, graph]);
 
   // Destructuring first to keep useEffect from making excess calls
   const [xSnap, ySnap] = props.snapStep;
@@ -33797,12 +33922,232 @@ const StatefulMafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref)
   }));
 });
 
+const eq$1 = Util.eq;
+const deepEq$1 = Util.deepEq;
+function interactiveGraphValidator(userInput, rubric) {
+  // None-type graphs are not graded
+  if (userInput.type === "none" && rubric.correct.type === "none") {
+    return {
+      type: "points",
+      earned: 0,
+      total: 0,
+      message: null
+    };
+  }
+
+  // When nothing has moved, there will neither be coords nor the
+  // circle's center/radius fields. When those fields are absent, skip
+  // all these checks; just go mark the answer as empty.
+  const hasValue = Boolean(
+  // @ts-expect-error - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'.
+  userInput.coords ||
+  // @ts-expect-error - TS2339 - Property 'center' does not exist on type 'PerseusGraphType'. | TS2339 - Property 'radius' does not exist on type 'PerseusGraphType'.
+  userInput.center && userInput.radius);
+  if (userInput.type === rubric.correct.type && hasValue) {
+    if (userInput.type === "linear" && rubric.correct.type === "linear" && userInput.coords != null) {
+      const guess = userInput.coords;
+      const correct = rubric.correct.coords;
+
+      // If both of the guess points are on the correct line, it's
+      // correct.
+      if (
+      // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+      collinear(correct[0], correct[1], guess[0]) &&
+      // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+      collinear(correct[0], correct[1], guess[1])) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "linear-system" && rubric.correct.type === "linear-system" && userInput.coords != null) {
+      const guess = userInput.coords;
+      const correct = rubric.correct.coords;
+      if (collinear(correct[0][0], correct[0][1], guess[0][0]) && collinear(correct[0][0], correct[0][1], guess[0][1]) && collinear(correct[1][0], correct[1][1], guess[1][0]) && collinear(correct[1][0], correct[1][1], guess[1][1]) || collinear(correct[0][0], correct[0][1], guess[1][0]) && collinear(correct[0][0], correct[0][1], guess[1][1]) && collinear(correct[1][0], correct[1][1], guess[0][0]) && collinear(correct[1][0], correct[1][1], guess[0][1])) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "quadratic" && rubric.correct.type === "quadratic" && userInput.coords != null) {
+      // If the parabola coefficients match, it's correct.
+      const guessCoeffs = getQuadraticCoefficients(userInput.coords);
+      const correctCoeffs = getQuadraticCoefficients(
+      // @ts-expect-error - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
+      rubric.correct.coords);
+      if (deepEq$1(guessCoeffs, correctCoeffs)) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "sinusoid" && rubric.correct.type === "sinusoid" && userInput.coords != null) {
+      const guessCoeffs = getSinusoidCoefficients(userInput.coords);
+      const correctCoeffs = getSinusoidCoefficients(
+      // @ts-expect-error - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
+      rubric.correct.coords);
+      const canonicalGuessCoeffs = canonicalSineCoefficients$1(guessCoeffs);
+      const canonicalCorrectCoeffs = canonicalSineCoefficients$1(correctCoeffs);
+      // If the canonical coefficients match, it's correct.
+      if (deepEq$1(canonicalGuessCoeffs, canonicalCorrectCoeffs)) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "circle" && rubric.correct.type === "circle") {
+      if (deepEq$1(userInput.center, rubric.correct.center) && eq$1(userInput.radius, rubric.correct.radius)) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "point" && rubric.correct.type === "point" && userInput.coords != null) {
+      let correct = rubric.correct.coords;
+      if (correct == null) {
+        throw new Error("Point graph rubric has null coords");
+      }
+      const guess = userInput.coords.slice();
+      correct = correct.slice();
+      // Everything's already rounded so we shouldn't need to do an
+      // eq() comparison but _.isEqual(0, -0) is false, so we'll use
+      // eq() anyway. The sort should be fine because it'll stringify
+      // it and -0 converted to a string is "0"
+      guess?.sort();
+      // @ts-expect-error - TS2339 - Property 'sort' does not exist on type 'readonly Coord[]'.
+      correct.sort();
+      if (deepEq$1(guess, correct)) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "polygon" && rubric.correct.type === "polygon" && userInput.coords != null) {
+      const guess = userInput.coords?.slice();
+      // @ts-expect-error - TS2322 - Type 'Coord[] | undefined' is not assignable to type 'Coord[]'.
+      const correct = rubric.correct.coords?.slice();
+      let match;
+      if (rubric.correct.match === "similar") {
+        match = similar(guess, correct, Number.POSITIVE_INFINITY);
+      } else if (rubric.correct.match === "congruent") {
+        match = similar(guess, correct, kmath.number.DEFAULT_TOLERANCE);
+      } else if (rubric.correct.match === "approx") {
+        match = similar(guess, correct, 0.1);
+      } else {
+        /* exact */
+        guess.sort();
+        correct.sort();
+        match = deepEq$1(guess, correct);
+      }
+      if (match) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "segment" && rubric.correct.type === "segment" && userInput.coords != null) {
+      let guess = Util.deepClone(userInput.coords);
+      let correct = Util.deepClone(rubric.correct?.coords);
+      guess = ___default["default"].invoke(guess, "sort").sort();
+      // @ts-expect-error - TS2345 - Argument of type '(readonly Coord[])[] | undefined' is not assignable to parameter of type 'Collection<any>'.
+      correct = ___default["default"].invoke(correct, "sort").sort();
+      if (deepEq$1(guess, correct)) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "ray" && rubric.correct.type === "ray" && userInput.coords != null) {
+      const guess = userInput.coords;
+      const correct = rubric.correct.coords;
+      if (
+      // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
+      deepEq$1(guess[0], correct[0]) &&
+      // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+      collinear(correct[0], correct[1], guess[1])) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    } else if (userInput.type === "angle" && rubric.correct.type === "angle") {
+      const guess = userInput.coords;
+      const correct = rubric.correct.coords;
+      let match;
+      if (rubric.correct.match === "congruent") {
+        const angles = ___default["default"].map([guess, correct], function (coords) {
+          const angle = GraphUtils.findAngle(
+          // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
+          coords[2],
+          // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
+          coords[0],
+          // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
+          coords[1]);
+          return (angle + 360) % 360;
+        });
+        // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
+        match = eq$1(...angles);
+      } else {
+        /* exact */
+        match =
+        // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+        deepEq$1(guess[1], correct[1]) &&
+        // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+        collinear(correct[1], correct[0], guess[0]) &&
+        // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+        collinear(correct[1], correct[2], guess[2]);
+      }
+      if (match) {
+        return {
+          type: "points",
+          earned: 1,
+          total: 1,
+          message: null
+        };
+      }
+    }
+  }
+
+  // The input wasn't correct, so check if it's a blank input or if it's
+  // actually just wrong
+  if (!hasValue || ___default["default"].isEqual(userInput, rubric.graph)) {
+    // We're where we started.
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  return {
+    type: "points",
+    earned: 0,
+    total: 1,
+    message: null
+  };
+}
+
 const TRASH_ICON_URI = "https://ka-perseus-graphie.s3.amazonaws.com/b1452c0d79fd0f7ff4c3af9488474a0a0decb361.png";
 const defaultBackgroundImage = {
   url: null
 };
 const eq = Util.eq;
-const deepEq$1 = Util.deepEq;
 const UNLIMITED = "unlimited";
 
 // Sample background image:
@@ -33843,6 +34188,39 @@ const makeInvalidTypeError = (functionName, graphType) => {
 
 // There's no transform function in exports
 
+// TODO: there's another, very similar getSinusoidCoefficients function
+// they should probably be merged
+function getSinusoidCoefficients(coords) {
+  // It's assumed that p1 is the root and p2 is the first peak
+  const p1 = coords[0];
+  const p2 = coords[1];
+
+  // Resulting coefficients are canonical for this sine curve
+  const amplitude = p2[1] - p1[1];
+  const angularFrequency = Math.PI / (2 * (p2[0] - p1[0]));
+  const phase = p1[0] * angularFrequency;
+  const verticalOffset = p1[1];
+  return [amplitude, angularFrequency, phase, verticalOffset];
+}
+
+// TODO: there's another, very similar getQuadraticCoefficients function
+// they should probably be merged
+function getQuadraticCoefficients(coords) {
+  const p1 = coords[0];
+  const p2 = coords[1];
+  const p3 = coords[2];
+  const denom = (p1[0] - p2[0]) * (p1[0] - p3[0]) * (p2[0] - p3[0]);
+  if (denom === 0) {
+    // Many of the callers assume that the return value is always defined.
+    // @ts-expect-error - TS2322 - Type 'undefined' is not assignable to type 'QuadraticCoefficient'.
+    return;
+  }
+  const a = (p3[0] * (p2[1] - p1[1]) + p2[0] * (p1[1] - p3[1]) + p1[0] * (p3[1] - p2[1])) / denom;
+  const b = (p3[0] * p3[0] * (p1[1] - p2[1]) + p2[0] * p2[0] * (p3[1] - p1[1]) + p1[0] * p1[0] * (p2[1] - p3[1])) / denom;
+  const c = (p2[0] * p3[0] * (p2[0] - p3[0]) * p1[1] + p3[0] * p1[0] * (p3[0] - p1[0]) * p2[1] + p1[0] * p2[0] * (p1[0] - p2[0]) * p3[1]) / denom;
+  return [a, b, c];
+}
+
 // (LEMS-2190): Move the Mafs Angle Graph coordinate reversal logic in interactive-graph-state.ts
 // to this file when we remove the legacy graph. This logic allows us to support bi-directional angles
 // for the new (non-reflexive) Mafs graphs, while maintaining the same scoring behaviour as the legacy graph.
@@ -34963,7 +35341,6 @@ class LegacyInteractiveGraph extends React__namespace.Component {
     });
     $__default["default"](this.angle).on("move", () => {
       this.onChange({
-        // @ts-expect-error Type '{ coords: any; type: "angle"; showAngles?: boolean | undefined; allowReflexAngles?: boolean | undefined; angleOffsetDeg?: number | undefined; snapDegrees?: number | undefined; match?: "congruent" | undefined; }' is not assignable to type 'InteractiveGraphState | undefined'.
         graph: {
           ...graph,
           coords: this.angle?.getClockwiseCoords()
@@ -34990,7 +35367,7 @@ class LegacyInteractiveGraph extends React__namespace.Component {
     return InteractiveGraph.getUserInputFromProps(this.props);
   }
   simpleValidate(rubric) {
-    return InteractiveGraph.validate(this.getUserInput(), rubric, this);
+    return interactiveGraphValidator(this.getUserInput(), rubric);
   }
   focus = $__default["default"].noop;
   render() {
@@ -35065,7 +35442,7 @@ class InteractiveGraph extends React__namespace.Component {
     throw new perseusCore.PerseusError("Cannot getUserInput from a graph that has never rendered", perseusCore.Errors.NotAllowed);
   }
   simpleValidate(rubric) {
-    return InteractiveGraph.validate(this.getUserInput(), rubric, this);
+    return interactiveGraphValidator(this.getUserInput(), rubric);
   }
   render() {
     // Mafs shim
@@ -35088,33 +35465,6 @@ class InteractiveGraph extends React__namespace.Component {
       ref: this.legacyGraphRef
     }, this.props));
   }
-  static getQuadraticCoefficients(coords) {
-    const p1 = coords[0];
-    const p2 = coords[1];
-    const p3 = coords[2];
-    const denom = (p1[0] - p2[0]) * (p1[0] - p3[0]) * (p2[0] - p3[0]);
-    if (denom === 0) {
-      // Many of the callers assume that the return value is always defined.
-      // @ts-expect-error - TS2322 - Type 'undefined' is not assignable to type 'QuadraticCoefficient'.
-      return;
-    }
-    const a = (p3[0] * (p2[1] - p1[1]) + p2[0] * (p1[1] - p3[1]) + p1[0] * (p3[1] - p2[1])) / denom;
-    const b = (p3[0] * p3[0] * (p1[1] - p2[1]) + p2[0] * p2[0] * (p3[1] - p1[1]) + p1[0] * p1[0] * (p2[1] - p3[1])) / denom;
-    const c = (p2[0] * p3[0] * (p2[0] - p3[0]) * p1[1] + p3[0] * p1[0] * (p3[0] - p1[0]) * p2[1] + p1[0] * p2[0] * (p1[0] - p2[0]) * p3[1]) / denom;
-    return [a, b, c];
-  }
-  static getSinusoidCoefficients(coords) {
-    // It's assumed that p1 is the root and p2 is the first peak
-    const p1 = coords[0];
-    const p2 = coords[1];
-
-    // Resulting coefficients are canonical for this sine curve
-    const amplitude = p2[1] - p1[1];
-    const angularFrequency = Math.PI / (2 * (p2[0] - p1[0]));
-    const phase = p1[0] * angularFrequency;
-    const verticalOffset = p1[1];
-    return [amplitude, angularFrequency, phase, verticalOffset];
-  }
 
   /**
    * @param {object} graph Like props.graph or props.correct
@@ -35328,7 +35678,7 @@ class InteractiveGraph extends React__namespace.Component {
     const coords =
     // @ts-expect-error - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'.
     props.graph.coords || InteractiveGraph.defaultQuadraticCoords(props);
-    return InteractiveGraph.getQuadraticCoefficients(coords);
+    return getQuadraticCoefficients(coords);
   }
   static defaultQuadraticCoords(props) {
     const coords = [[0.25, 0.75], [0.5, 0.25], [0.75, 0.75]];
@@ -35343,7 +35693,7 @@ class InteractiveGraph extends React__namespace.Component {
     const coords =
     // @ts-expect-error - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'.
     props.graph.coords || InteractiveGraph.defaultSinusoidCoords(props);
-    return InteractiveGraph.getSinusoidCoefficients(coords);
+    return getSinusoidCoefficients(coords);
   }
   static defaultSinusoidCoords(props) {
     const coords = [[0.5, 0.5], [0.65, 0.6]];
@@ -35423,220 +35773,8 @@ class InteractiveGraph extends React__namespace.Component {
     const angle = GraphUtils.findAngle(coords[2], coords[0], coords[1]);
     return angle.toFixed(0) + "\u00B0 angle" + " at (" + coords[1].join(", ") + ")";
   }
-  static validate(userInput, rubric, component) {
-    // None-type graphs are not graded
-    if (userInput.type === "none" && rubric.correct.type === "none") {
-      return {
-        type: "points",
-        earned: 0,
-        total: 0,
-        message: null
-      };
-    }
-
-    // When nothing has moved, there will neither be coords nor the
-    // circle's center/radius fields. When those fields are absent, skip
-    // all these checks; just go mark the answer as empty.
-    const hasValue = Boolean(
-    // @ts-expect-error - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'.
-    userInput.coords ||
-    // @ts-expect-error - TS2339 - Property 'center' does not exist on type 'PerseusGraphType'. | TS2339 - Property 'radius' does not exist on type 'PerseusGraphType'.
-    userInput.center && userInput.radius);
-    if (userInput.type === rubric.correct.type && hasValue) {
-      if (userInput.type === "linear" && rubric.correct.type === "linear" && userInput.coords != null) {
-        const guess = userInput.coords;
-        const correct = rubric.correct.coords;
-
-        // If both of the guess points are on the correct line, it's
-        // correct.
-        if (
-        // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-        collinear(correct[0], correct[1], guess[0]) &&
-        // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-        collinear(correct[0], correct[1], guess[1])) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "linear-system" && rubric.correct.type === "linear-system" && userInput.coords != null) {
-        const guess = userInput.coords;
-        const correct = rubric.correct.coords;
-        if (collinear(correct[0][0], correct[0][1], guess[0][0]) && collinear(correct[0][0], correct[0][1], guess[0][1]) && collinear(correct[1][0], correct[1][1], guess[1][0]) && collinear(correct[1][0], correct[1][1], guess[1][1]) || collinear(correct[0][0], correct[0][1], guess[1][0]) && collinear(correct[0][0], correct[0][1], guess[1][1]) && collinear(correct[1][0], correct[1][1], guess[0][0]) && collinear(correct[1][0], correct[1][1], guess[0][1])) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "quadratic" && rubric.correct.type === "quadratic" && userInput.coords != null) {
-        // If the parabola coefficients match, it's correct.
-        const guessCoeffs = this.getQuadraticCoefficients(userInput.coords);
-        const correctCoeffs = this.getQuadraticCoefficients(
-        // @ts-expect-error - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
-        rubric.correct.coords);
-        if (deepEq$1(guessCoeffs, correctCoeffs)) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "sinusoid" && rubric.correct.type === "sinusoid" && userInput.coords != null) {
-        const guessCoeffs = this.getSinusoidCoefficients(userInput.coords);
-        const correctCoeffs = this.getSinusoidCoefficients(
-        // @ts-expect-error - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
-        rubric.correct.coords);
-        const canonicalGuessCoeffs = canonicalSineCoefficients$1(guessCoeffs);
-        const canonicalCorrectCoeffs = canonicalSineCoefficients$1(correctCoeffs);
-        // If the canonical coefficients match, it's correct.
-        if (deepEq$1(canonicalGuessCoeffs, canonicalCorrectCoeffs)) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "circle" && rubric.correct.type === "circle") {
-        if (deepEq$1(userInput.center, rubric.correct.center) && eq(userInput.radius, rubric.correct.radius)) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "point" && rubric.correct.type === "point" && userInput.coords != null) {
-        let correct = InteractiveGraph.getPointCoords(rubric.correct, component);
-        const guess = userInput.coords.slice();
-        correct = correct.slice();
-        // Everything's already rounded so we shouldn't need to do an
-        // eq() comparison but _.isEqual(0, -0) is false, so we'll use
-        // eq() anyway. The sort should be fine because it'll stringify
-        // it and -0 converted to a string is "0"
-        guess?.sort();
-        // @ts-expect-error - TS2339 - Property 'sort' does not exist on type 'readonly Coord[]'.
-        correct.sort();
-        if (deepEq$1(guess, correct)) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "polygon" && rubric.correct.type === "polygon" && userInput.coords != null) {
-        const guess = userInput.coords?.slice();
-        // @ts-expect-error - TS2322 - Type 'Coord[] | undefined' is not assignable to type 'Coord[]'.
-        const correct = rubric.correct.coords?.slice();
-        let match;
-        if (rubric.correct.match === "similar") {
-          match = similar(guess, correct, Number.POSITIVE_INFINITY);
-        } else if (rubric.correct.match === "congruent") {
-          match = similar(guess, correct, kmath.number.DEFAULT_TOLERANCE);
-        } else if (rubric.correct.match === "approx") {
-          match = similar(guess, correct, 0.1);
-        } else {
-          /* exact */
-          guess.sort();
-          correct.sort();
-          match = deepEq$1(guess, correct);
-        }
-        if (match) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "segment" && rubric.correct.type === "segment" && userInput.coords != null) {
-        let guess = Util.deepClone(userInput.coords);
-        let correct = Util.deepClone(rubric.correct?.coords);
-        guess = ___default["default"].invoke(guess, "sort").sort();
-        // @ts-expect-error - TS2345 - Argument of type '(readonly Coord[])[] | undefined' is not assignable to parameter of type 'Collection<any>'.
-        correct = ___default["default"].invoke(correct, "sort").sort();
-        if (deepEq$1(guess, correct)) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "ray" && rubric.correct.type === "ray" && userInput.coords != null) {
-        const guess = userInput.coords;
-        const correct = rubric.correct.coords;
-        if (
-        // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
-        deepEq$1(guess[0], correct[0]) &&
-        // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-        collinear(correct[0], correct[1], guess[1])) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      } else if (userInput.type === "angle" && rubric.correct.type === "angle") {
-        const guess = userInput.coords;
-        const correct = rubric.correct.coords;
-        let match;
-        if (rubric.correct.match === "congruent") {
-          const angles = ___default["default"].map([guess, correct], function (coords) {
-            const angle = GraphUtils.findAngle(
-            // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
-            coords[2],
-            // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
-            coords[0],
-            // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
-            coords[1]);
-            return (angle + 360) % 360;
-          });
-          // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
-          match = eq(...angles);
-        } else {
-          /* exact */
-          match =
-          // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-          deepEq$1(guess[1], correct[1]) &&
-          // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-          collinear(correct[1], correct[0], guess[0]) &&
-          // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
-          collinear(correct[1], correct[2], guess[2]);
-        }
-        if (match) {
-          return {
-            type: "points",
-            earned: 1,
-            total: 1,
-            message: null
-          };
-        }
-      }
-    }
-
-    // The input wasn't correct, so check if it's a blank input or if it's
-    // actually just wrong
-    if (!hasValue || ___default["default"].isEqual(userInput, rubric.graph)) {
-      // We're where we started.
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    return {
-      type: "points",
-      earned: 0,
-      total: 1,
-      message: null
-    };
+  static validate(userInput, rubric) {
+    return interactiveGraphValidator(userInput, rubric);
   }
   static getUserInputFromProps(props) {
     return props.graph;
@@ -38335,6 +38473,16 @@ const styles$d = aphrodite.StyleSheet.create({
   }
 });
 
+function matcherValidator(state, rubric) {
+  const correct = ___default["default"].isEqual(state.left, rubric.left) && ___default["default"].isEqual(state.right, rubric.right);
+  return {
+    type: "points",
+    earned: correct ? 1 : 0,
+    total: 1,
+    message: null
+  };
+}
+
 const {
   shuffle: shuffle$1,
   seededRNG
@@ -38357,6 +38505,9 @@ class Matcher extends React__namespace.Component {
     rightHeight: 0,
     texRendererLoaded: false
   };
+  static validate(state, rubric) {
+    return matcherValidator(state, rubric);
+  }
   changeAndTrack = e => {
     this.props.onChange(e);
     this.props.trackInteraction();
@@ -38409,8 +38560,7 @@ class Matcher extends React__namespace.Component {
     this.refs.right.moveOptionToIndex(option, index);
   };
   simpleValidate(rubric) {
-    // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Matcher'.
-    return Matcher.validate(this.getUserInput(), rubric);
+    return matcherValidator(this.getUserInput(), rubric);
   }
   render() {
     // To minimize layout shift, we display a spinner until our math
@@ -38506,17 +38656,6 @@ class Matcher extends React__namespace.Component {
     })))));
   }
 }
-___default["default"].extend(Matcher, {
-  validate: function (state, rubric) {
-    const correct = ___default["default"].isEqual(state.left, rubric.left) && ___default["default"].isEqual(state.right, rubric.right);
-    return {
-      type: "points",
-      earned: correct ? 1 : 0,
-      total: 1,
-      message: null
-    };
-  }
-});
 const padding = 5;
 const border = "1px solid #444";
 const styles$c = aphrodite.StyleSheet.create({
@@ -38552,7 +38691,59 @@ var Matcher$1 = {
   isLintable: true
 };
 
-// Type imports
+function matrixValidator(state, rubric, strings) {
+  const solution = rubric.answers;
+  const supplied = state.answers;
+  const solutionSize = getMatrixSize(solution);
+  const suppliedSize = getMatrixSize(supplied);
+  const incorrectSize = solutionSize[0] !== suppliedSize[0] || solutionSize[1] !== suppliedSize[1];
+  const createValidator = KhanAnswerTypes.number.createValidatorFunctional;
+  let message = null;
+  let hasEmptyCell = false;
+  let incorrect = false;
+  ___default["default"](suppliedSize[0]).times(row => {
+    ___default["default"](suppliedSize[1]).times(col => {
+      if (supplied[row][col] == null || supplied[row][col].toString().length === 0) {
+        hasEmptyCell = true;
+      }
+      if (!incorrectSize) {
+        const validator = createValidator(
+        // @ts-expect-error - TS2345 - Argument of type 'number' is not assignable to parameter of type 'string'.
+        solution[row][col], {
+          simplify: true
+        }, strings);
+        const result = validator(supplied[row][col]);
+        if (result.message) {
+          // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'null'.
+          message = result.message;
+        }
+        if (!result.correct) {
+          incorrect = true;
+        }
+      }
+    });
+  });
+  if (hasEmptyCell) {
+    return {
+      type: "invalid",
+      message: strings.fillAllCells
+    };
+  }
+  if (incorrectSize) {
+    return {
+      type: "points",
+      earned: 0,
+      total: 1,
+      message: null
+    };
+  }
+  return {
+    type: "points",
+    earned: incorrect ? 0 : 1,
+    total: 1,
+    message: message
+  };
+}
 
 const {
   assert: assert$2
@@ -38602,7 +38793,7 @@ const getRefForPath$1 = function (path) {
   const column = getColumnFromPath$1(path);
   return "answer" + row + "," + column;
 };
-const getMatrixSize = function (matrix) {
+function getMatrixSize(matrix) {
   const matrixSize = [1, 1];
 
   // We need to find the widest row and tallest column to get the correct
@@ -38624,7 +38815,7 @@ const getMatrixSize = function (matrix) {
     }
   });
   return matrixSize;
-};
+}
 class Matrix extends React__namespace.Component {
   static contextType = PerseusI18nContext;
   // @ts-expect-error - TS2564 - Property 'cursorPosition' has no initializer and is not definitely assigned in the constructor.
@@ -38639,57 +38830,7 @@ class Matrix extends React__namespace.Component {
     linterContext: PerseusLinter.linterContextDefault
   };
   static validate(state, rubric, strings) {
-    const solution = rubric.answers;
-    const supplied = state.answers;
-    const solutionSize = getMatrixSize(solution);
-    const suppliedSize = getMatrixSize(supplied);
-    const incorrectSize = solutionSize[0] !== suppliedSize[0] || solutionSize[1] !== suppliedSize[1];
-    const createValidator = KhanAnswerTypes.number.createValidatorFunctional;
-    let message = null;
-    let hasEmptyCell = false;
-    let incorrect = false;
-    ___default["default"](suppliedSize[0]).times(row => {
-      ___default["default"](suppliedSize[1]).times(col => {
-        if (supplied[row][col] == null || supplied[row][col].toString().length === 0) {
-          hasEmptyCell = true;
-        }
-        if (!incorrectSize) {
-          const validator = createValidator(
-          // @ts-expect-error - TS2345 - Argument of type 'number' is not assignable to parameter of type 'string'.
-          solution[row][col], {
-            simplify: true
-          }, strings);
-          const result = validator(supplied[row][col]);
-          if (result.message) {
-            // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'null'.
-            message = result.message;
-          }
-          if (!result.correct) {
-            incorrect = true;
-          }
-        }
-      });
-    });
-    if (hasEmptyCell) {
-      return {
-        type: "invalid",
-        message: strings.fillAllCells
-      };
-    }
-    if (incorrectSize) {
-      return {
-        type: "points",
-        earned: 0,
-        total: 1,
-        message: null
-      };
-    }
-    return {
-      type: "points",
-      earned: incorrect ? 0 : 1,
-      total: 1,
-      message: message
-    };
+    return matrixValidator(state, rubric, strings);
   }
   state = {
     enterTheMatrix: 0
@@ -38834,7 +38975,7 @@ class Matrix extends React__namespace.Component {
     };
   }
   simpleValidate(rubric) {
-    return Matrix.validate(this.getUserInput(), rubric, this.context.strings);
+    return matrixValidator(this.getUserInput(), rubric, this.context.strings);
   }
   render() {
     // Set the input sizes through JS so we can control the size of the
@@ -40071,6 +40212,45 @@ var Molecule$1 = {
   widget: MoleculeWidget
 };
 
+function numberLineValidator(state, rubric) {
+  const range = rubric.range;
+  const divisionRange = state.divisionRange;
+  const start = rubric.initialX != null ? rubric.initialX : range[0];
+  const startRel = rubric.isInequality ? "ge" : "eq";
+  const correctRel = rubric.correctRel || "eq";
+  const correctPos = kmath.number.equal(state.numLinePosition, rubric.correctX || 0);
+  const outsideAllowedRange = state.numDivisions > divisionRange[1] || state.numDivisions < divisionRange[0];
+
+  // TODO: I don't think isTickCrtl is a thing anymore
+  if (state.isTickCrtl && outsideAllowedRange) {
+    return {
+      type: "invalid",
+      message: "Number of divisions is outside the allowed range."
+    };
+  }
+  if (correctPos && correctRel === state.rel) {
+    return {
+      type: "points",
+      earned: 1,
+      total: 1,
+      message: null
+    };
+  }
+  if (state.numLinePosition === start && state.rel === startRel) {
+    // We're where we started.
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  return {
+    type: "points",
+    earned: 0,
+    total: 1,
+    message: null
+  };
+}
+
 // @ts-expect-error - TS2339 - Property 'MovablePoint' does not exist on type 'typeof Graphie'.
 const MovablePoint = Graphie.MovablePoint;
 // @ts-expect-error - TS2339 - Property 'Line' does not exist on type 'typeof Graphie'.
@@ -40218,6 +40398,9 @@ class NumberLine extends React__namespace.Component {
   state = {
     numDivisionsEmpty: false
   };
+  static validate(state, rubric) {
+    return numberLineValidator(state, rubric);
+  }
   change = (() => {
     var _this = this;
     return function () {
@@ -40509,8 +40692,7 @@ class NumberLine extends React__namespace.Component {
     };
   }
   simpleValidate(rubric) {
-    // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof NumberLine'.
-    return NumberLine.validate(this.getUserInput(), rubric);
+    return numberLineValidator(this.getUserInput(), rubric);
   }
   render() {
     const {
@@ -40562,46 +40744,6 @@ class NumberLine extends React__namespace.Component {
     })) : this._renderGraphie(), !this.props.static && this.props.isInequality && inequalityControls);
   }
 }
-___default["default"].extend(NumberLine, {
-  validate: function (state, rubric) {
-    const range = rubric.range;
-    const divisionRange = state.divisionRange;
-    const start = rubric.initialX != null ? rubric.initialX : range[0];
-    const startRel = rubric.isInequality ? "ge" : "eq";
-    const correctRel = rubric.correctRel || "eq";
-    const correctPos = kmath.number.equal(state.numLinePosition, rubric.correctX || 0);
-    const outsideAllowedRange = state.numDivisions > divisionRange[1] || state.numDivisions < divisionRange[0];
-
-    // TODO: I don't think isTickCrtl is a thing anymore
-    if (state.isTickCrtl && outsideAllowedRange) {
-      return {
-        type: "invalid",
-        message: "Number of divisions is outside the allowed range."
-      };
-    }
-    if (correctPos && correctRel === state.rel) {
-      return {
-        type: "points",
-        earned: 1,
-        total: 1,
-        message: null
-      };
-    }
-    if (state.numLinePosition === start && state.rel === startRel) {
-      // We're where we started.
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    return {
-      type: "points",
-      earned: 0,
-      total: 1,
-      message: null
-    };
-  }
-});
 const numberLineTransform = editorProps => {
   const props = ___default["default"].pick(editorProps, ["range", "labelRange", "labelStyle", "labelTicks", "divisionRange", "snapDivisions", "isTickCtrl", "isInequality", "showTooltips"]);
   const numLinePosition = editorProps.initialX != null ? editorProps.initialX : editorProps.range[0];
@@ -43668,10 +43810,25 @@ var PhetSimulation$1 = {
   isLintable: true
 };
 
-/* eslint-disable react/no-unsafe */
 const {
   deepEq
 } = Util;
+function plotterValidator(userInput, rubric) {
+  if (deepEq(userInput, rubric.starting)) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  return {
+    type: "points",
+    earned: deepEq(userInput, rubric.correct) ? 1 : 0,
+    total: 1,
+    message: null
+  };
+}
+
+/* eslint-disable react/no-unsafe */
 class Plotter extends React__namespace.Component {
   static contextType = PerseusI18nContext;
   // @ts-expect-error - TS2564 - Property 'shouldSetupGraphie' has no initializer and is not definitely assigned in the constructor.
@@ -43700,6 +43857,9 @@ class Plotter extends React__namespace.Component {
     // bottom label.
     categoryHeights: {}
   };
+  static validate(userInput, rubric) {
+    return plotterValidator(userInput, rubric);
+  }
   componentDidMount() {
     this._isMounted = true;
     this.setupGraphie(this.state);
@@ -44445,8 +44605,7 @@ class Plotter extends React__namespace.Component {
     return this.state.values;
   }
   simpleValidate(rubric) {
-    // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Plotter'.
-    return Plotter.validate(this.getUserInput(), rubric);
+    return plotterValidator(this.getUserInput(), rubric);
   }
   render() {
     // TODO(kevinb) actually compute the size of the graphie correctly and
@@ -44465,22 +44624,6 @@ class Plotter extends React__namespace.Component {
     });
   }
 }
-___default["default"].extend(Plotter, {
-  validate: function (userInput, rubric) {
-    if (deepEq(userInput, rubric.starting)) {
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    return {
-      type: "points",
-      earned: deepEq(userInput, rubric.correct) ? 1 : 0,
-      total: 1,
-      message: null
-    };
-  }
-});
 
 // We don't need to change any of the original props for static mode
 const staticTransform = ___default["default"].identity;
@@ -44649,6 +44792,66 @@ var Sorter$1 = {
   isLintable: true
 };
 
+function tableValidator(state, rubric, strings) {
+  const filterNonEmpty = function (table) {
+    return ___default["default"].filter(table, function (row) {
+      // Check if row has a cell that is nonempty
+      return ___default["default"].some(row, ___default["default"].identity);
+    });
+  };
+  const solution = filterNonEmpty(rubric.answers);
+  const supplied = filterNonEmpty(state);
+  const hasEmptyCell = ___default["default"].some(supplied, function (row) {
+    return ___default["default"].some(row, function (cell) {
+      return cell === "";
+    });
+  });
+  if (hasEmptyCell || !supplied.length) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  if (supplied.length !== solution.length) {
+    return {
+      type: "points",
+      earned: 0,
+      total: 1,
+      message: null
+    };
+  }
+  const createValidator = KhanAnswerTypes.number.createValidatorFunctional;
+  let message = null;
+  const allCorrect = ___default["default"].every(solution, function (rowSolution) {
+    for (let i = 0; i < supplied.length; i++) {
+      const rowSupplied = supplied[i];
+      const correct = ___default["default"].every(rowSupplied, function (cellSupplied, i) {
+        const cellSolution = rowSolution[i];
+        const validator = createValidator(cellSolution, {
+          simplify: true
+        }, strings);
+        const result = validator(cellSupplied);
+        if (result.message) {
+          // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'null'.
+          message = result.message;
+        }
+        return result.correct;
+      });
+      if (correct) {
+        supplied.splice(i, 1);
+        return true;
+      }
+    }
+    return false;
+  });
+  return {
+    type: "points",
+    earned: allCorrect ? 1 : 0,
+    total: 1,
+    message: message
+  };
+}
+
 const {
   assert
 } = InteractiveUtil;
@@ -44694,6 +44897,9 @@ class Table extends React__namespace.Component {
       linterContext: PerseusLinter.linterContextDefault
     };
   }();
+  static validate(state, rubric, strings) {
+    return tableValidator(state, rubric, strings);
+  }
   _getRows = () => {
     return this.props.answers.length;
   };
@@ -44723,8 +44929,7 @@ class Table extends React__namespace.Component {
     });
   };
   simpleValidate(rubric) {
-    // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Table'.
-    return Table.validate(this.getUserInput(), rubric, this.context.strings);
+    return tableValidator(this.getUserInput(), rubric, this.context.strings);
   }
   _handleFocus = inputPath => {
     this.props.onFocus(inputPath);
@@ -44851,68 +45056,6 @@ class Table extends React__namespace.Component {
     })));
   }
 }
-___default["default"].extend(Table, {
-  validate: function (state, rubric, strings) {
-    const filterNonEmpty = function (table) {
-      return ___default["default"].filter(table, function (row) {
-        // Check if row has a cell that is nonempty
-        return ___default["default"].some(row, ___default["default"].identity);
-      });
-    };
-    const solution = filterNonEmpty(rubric.answers);
-    const supplied = filterNonEmpty(state);
-    const hasEmptyCell = ___default["default"].some(supplied, function (row) {
-      return ___default["default"].some(row, function (cell) {
-        return cell === "";
-      });
-    });
-    if (hasEmptyCell || !supplied.length) {
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    if (supplied.length !== solution.length) {
-      return {
-        type: "points",
-        earned: 0,
-        total: 1,
-        message: null
-      };
-    }
-    const createValidator = KhanAnswerTypes.number.createValidatorFunctional;
-    let message = null;
-    const allCorrect = ___default["default"].every(solution, function (rowSolution) {
-      let i;
-      for (i = 0; i < supplied.length; i++) {
-        const rowSupplied = supplied[i];
-        const correct = ___default["default"].every(rowSupplied, function (cellSupplied, i) {
-          const cellSolution = rowSolution[i];
-          const validator = createValidator(cellSolution, {
-            simplify: true
-          }, strings);
-          const result = validator(cellSupplied);
-          if (result.message) {
-            // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'null'.
-            message = result.message;
-          }
-          return result.correct;
-        });
-        if (correct) {
-          supplied.splice(i, 1);
-          return true;
-        }
-      }
-      return false;
-    });
-    return {
-      type: "points",
-      earned: allCorrect ? 1 : 0,
-      total: 1,
-      message: message
-    };
-  }
-});
 const propTransform = editorProps => {
   // Remove answers before passing to widget
   const rows = editorProps.answers.length;
@@ -45145,7 +45288,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "35.0.0";
+const libVersion = "35.1.1";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {