@khanacademy/perseus 20.8.1 → 21.1.0

package/dist/index.js

@@ -18890,7 +18890,7 @@ const isAccessible = widgetInfo => {
   }
   return !!accessible;
 };
-const getAllWidgetTypes$1 = () => {
+const getAllWidgetTypes = () => {
   return ___default["default"].keys(widgets);
 };
 const upgradeWidgetInfoToLatestVersion = oldWidgetInfo => {
@@ -19162,7 +19162,7 @@ var widgets$1 = /*#__PURE__*/Object.freeze({
   getVersionVector: getVersionVector,
   getPublicWidgets: getPublicWidgets,
   isAccessible: isAccessible,
-  getAllWidgetTypes: getAllWidgetTypes$1,
+  getAllWidgetTypes: getAllWidgetTypes,
   upgradeWidgetInfoToLatestVersion: upgradeWidgetInfoToLatestVersion,
   getRendererPropsForWidgetInfo: getRendererPropsForWidgetInfo,
   traverseChildWidgets: traverseChildWidgets$3,
@@ -19560,6 +19560,9 @@ class Renderer extends React__namespace.Component {
       if (!widgetInfo.type || !widgetInfo.alignment) {
         const newValues = {};
         if (!widgetInfo.type) {
+          // TODO: why does widget have no type?
+          // We don't want to derive type from widget ID
+          // see: LEMS-1845
           newValues.type = widgetId.split(" ")[0];
         }
         if (!widgetInfo.alignment) {
@@ -25023,9 +25026,22 @@ class Explanation extends React__namespace.Component {
     // Special styling is needed to fit the button in a block of text without throwing off the line spacing.
     // While the button is not normally included in a block of text, it needs to be able to accommodate such a case.
     const buttonStyleOverrides = {
-      height: "22px",
+      height: "auto",
       marginLeft: "-2px",
-      padding: "0 2px"
+      // transfer space on the left side to the padding
+      marginRight: "2px",
+      // adds space between the right border and any text that follows
+      paddingLeft: "2px" // adds space between the left border and the button text
+    };
+
+    const labelStyle = {
+      fontSize: "18px",
+      lineHeight: "20px",
+      // The following property adjusts the large space between the button text and the caret icon.
+      // Since we are unable to adjust the styling of the icon (where the extra space exists),
+      //      we are adjusting it on the text label by using a negative margin.
+      marginRight: "-6px",
+      "white-space": "normal"
     };
     const contentStyling = [styles$p.content, this.state.expanded ? styles$p.contentExpanded : styles$p.contentCollapsed, allowTransition && (this.state.expanded ? styles$p.transitionExpanded : styles$p.transitionCollapsed)];
     return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.UniqueIDProvider, {
@@ -25036,8 +25052,9 @@ class Explanation extends React__namespace.Component {
       "aria-controls": ids.get("content"),
       endIcon: caretIcon,
       kind: "tertiary",
+      labelStyle: labelStyle,
       onClick: this._onClick,
-      size: "large",
+      size: "small",
       style: buttonStyleOverrides
     }, promptText), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       id: ids.get("content"),
@@ -28339,6 +28356,14 @@ const moveAll = delta => ({
   type: MOVE_ALL,
   delta
 });
+const MOVE_POINT = "move-point";
+function movePoint(index, destination) {
+  return {
+    type: MOVE_POINT,
+    index,
+    destination
+  };
+}
 
 /**
  * 44 is touch best practice and AAA compliant for WCAG
@@ -28416,6 +28441,10 @@ const getRayIntersectionCoords = (collinearPoint, extendFrom, range) => {
       return [xMax, yAtXMax];
   }
 };
+const getLines = points => points.map((point, i) => {
+  const next = points[(i + 1) % points.length];
+  return [point, next];
+});
 
 const defaultStroke = "var(--movable-line-stroke-color)";
 const MovableLine = props => {
@@ -28560,7 +28589,9 @@ const SegmentGraph = props => {
     onMoveLine: delta => {
       dispatch(moveLine(i, delta));
     },
-    onMovePoint: (endpointIndex, destination) => dispatch(moveControlPoint(endpointIndex, destination, i)),
+    onMovePoint: (endpointIndex, destination) => {
+      dispatch(moveControlPoint(endpointIndex, destination, i));
+    },
     "data-testid": "segment" + i
   })));
 };
@@ -28676,12 +28707,55 @@ const RayGraph = props => {
   }));
 };
 
+/**
+ * Wrapper with Mafs transform styles for SVG elements.
+ * Scales and translates the SVG element to match the Mafs view.
+ * Use if you do not need/want to use the hook in `use-transform.ts`.
+ */
+const MafsCssTransformWrapper = _ref => {
+  let {
+    children
+  } = _ref;
+  return /*#__PURE__*/React__namespace.createElement("g", {
+    style: {
+      transform: `var(--mafs-view-transform) var(--mafs-user-transform)`
+    }
+  }, children);
+};
+
+const TextLabel = _ref => {
+  let {
+    children,
+    ...rest
+  } = _ref;
+  return /*#__PURE__*/React__default["default"].createElement(mafs.Text, _extends({
+    size: 16,
+    svgTextProps: {
+      filter: "url(#background)",
+      fontWeight: "bold"
+    }
+  }, rest), children);
+};
+const SvgDefs = () => /*#__PURE__*/React__default["default"].createElement("defs", null, /*#__PURE__*/React__default["default"].createElement("filter", {
+  id: "background",
+  x: "-5%",
+  width: "110%",
+  y: "0%",
+  height: "100%"
+}, /*#__PURE__*/React__default["default"].createElement("feFlood", {
+  floodColor: "#FFF",
+  floodOpacity: "0.64"
+}), /*#__PURE__*/React__default["default"].createElement("feComposite", {
+  operator: "over",
+  in: "SourceGraphic"
+})));
+
 const Angle = _ref => {
   let {
     centerPoint,
     endPoints,
     range,
-    polygonPoints,
+    polygonLines,
     showAngles
   } = _ref;
   const [centerX, centerY] = centerPoint;
@@ -28703,7 +28777,7 @@ const Angle = _ref => {
   // Used to calculate the inside of the angle and to create square
   const [x3, y3] = mafs.vec.add(centerPoint, mafs.vec.add(mafs.vec.sub([x1, y1], centerPoint), mafs.vec.sub([x2, y2], centerPoint)));
   if (!showAngles) {
-    return isRightAngle(angle) ? /*#__PURE__*/React__namespace.createElement(RightAngleArc, {
+    return isRightAngle(angle) ? /*#__PURE__*/React__namespace.createElement(RightAngleSquare, {
       start: [x1, y1],
       vertex: [x2, y2],
       end: [x3, y3]
@@ -28711,13 +28785,13 @@ const Angle = _ref => {
   }
 
   // Midpoint betwen ends of arc
-  const isInside = shouldDrawArcInside([x3, y3], centerPoint, range, polygonPoints);
-  const largeArcFlag = isInside ? 1 : 0;
-  const sweepFlag = isInside ? 1 : 0;
+  const isOutside = shouldDrawArcOutside([x3, y3], centerPoint, range, polygonLines);
+  const largeArcFlag = isOutside ? 1 : 0;
+  const sweepFlag = isOutside ? 1 : 0;
   const arc = `M ${x1} ${y1} A ${radius} ${radius} 0 ${largeArcFlag} ${sweepFlag} ${x2} ${y2}`;
   let angleInDegrees = angle * (180 / Math.PI);
   // If we have triggered "largArcFlag", the angle should be greater than 180
-  if (isInside) {
+  if (isOutside) {
     angleInDegrees = 360 - angleInDegrees;
   }
   const angleLabelNumber = parseFloat(angleInDegrees.toFixed(1));
@@ -28734,92 +28808,63 @@ const Angle = _ref => {
   }), /*#__PURE__*/React__namespace.createElement("feComposite", {
     operator: "over",
     in: "SourceGraphic"
-  }))), !isInside && isRightAngle(angle) ? /*#__PURE__*/React__namespace.createElement(RightAngleArc, {
+  }))), !isOutside && isRightAngle(angle) ? /*#__PURE__*/React__namespace.createElement(RightAngleSquare, {
     start: [x1, y1],
     vertex: [x2, y2],
     end: [x3, y3]
-  }) : /*#__PURE__*/React__namespace.createElement("g", {
-    style: {
-      transform: `var(--mafs-view-transform) var(--mafs-user-transform)`
-    }
-  }, /*#__PURE__*/React__namespace.createElement("path", {
+  }) : /*#__PURE__*/React__namespace.createElement(MafsCssTransformWrapper, null, /*#__PURE__*/React__namespace.createElement("path", {
     d: arc,
     strokeWidth: 0.02,
     fill: "none"
-  })), /*#__PURE__*/React__namespace.createElement(mafs.Text, {
+  })), /*#__PURE__*/React__namespace.createElement(TextLabel, {
     x: x3,
     y: y3,
-    size: 15,
-    svgTextProps: {
-      filter: "url(#background)",
-      fontWeight: "bold"
-    }
-    // Shift position if text is too close to movable point
-    ,
     attach: y3 - centerY > 0 ? "s" : "n",
     attachDistance: Math.abs(y3 - centerY) < 0.2 || mafs.vec.dist([x3, y3], centerPoint) < 0.3 ? 20 : 10
   }, angleLabel, "\xB0"));
 };
-const RightAngleArc = _ref2 => {
+
+/**
+ * This is broken out into its own component so that it can be used for an early return
+ * (see line 55 or https://github.com/Khan/perseus/blob/84bbd882b11d16871e1b813a0b901f3b903d5479/packages/perseus/src/widgets/interactive-graphs/graphs/components/angle.tsx#L53-L57)
+ */
+const RightAngleSquare = _ref2 => {
   let {
     start: [x1, y1],
     vertex: [x2, y2],
     end: [x3, y3]
   } = _ref2;
-  return /*#__PURE__*/React__namespace.createElement("g", {
-    style: {
-      transform: `var(--mafs-view-transform) var(--mafs-user-transform)`
-    }
-  }, /*#__PURE__*/React__namespace.createElement("path", {
+  return /*#__PURE__*/React__namespace.createElement(MafsCssTransformWrapper, null, /*#__PURE__*/React__namespace.createElement("path", {
     d: `M ${x1} ${y1} L ${x3} ${y3} M ${x3} ${y3} L ${x2} ${y2}`,
     strokeWidth: 0.02,
     fill: "none"
   }));
 };
 const isRightAngle = angle => Math.abs(angle - Math.PI / 2) < 0.01;
-const shouldDrawArcInside = (midPoint, vertex, range, polygonPoints) => {
-  const rangeIntersectionPoint = getRayIntersectionCoords(vertex, midPoint, range);
-  const lines = getLines(polygonPoints);
-  let lineIntersections = 0;
-  lines.forEach(line => linesIntersect([vertex, rangeIntersectionPoint], line) && lineIntersections++);
-
-  // The intersection check will sometimes return false if it intersects with
-  // another vertex, so in the case we get 0 intersections, we check for points.
-  if (lineIntersections === 0) {
-    // find point in array
-    const midpointIndex = polygonPoints.findIndex(_ref3 => {
-      let [x, y] = _ref3;
-      return x === midPoint[0] && y === midPoint[1];
-    });
-    // get array sans point and adjacent points
-    const [prev, next] = [(midpointIndex - 1 + polygonPoints.length) % polygonPoints.length, (midpointIndex + 1) % polygonPoints.length];
-    const [[lineAx, lineAy], [lineBx, lineBy]] = [midPoint, rangeIntersectionPoint];
-    for (let i = 0; i < polygonPoints.length; i++) {
-      if ([prev, midpointIndex, next].includes(i)) {
-        continue;
-      }
-      const [x, y] = polygonPoints[i];
-      const intersectsPoint = (y - lineAy) * (lineBx - lineAx) === (lineBy - lineAy) * (x - lineAx);
-      if (intersectsPoint) {
-        return false;
-      }
-    }
-    return true;
-  }
+
+/**
+ * Determines if an angle is an inside (false) or outside (true) angle.
+ * They way, we know to flip the `largeArc` and `sweepArc` flags.
+ * Uses the priciple that a ray from a point inside a polygon will intersect
+ * with an odd number of lines, while a ray from a point outside the polygon
+ * will intersect with an even number of lines.
+ * https://stackoverflow.com/questions/217578/how-can-i-determine-whether-a-2d-point-is-within-a-polygon
+ */
+const shouldDrawArcOutside = (midpoint, vertex, range, polygonLines) => {
+  // Create a ray from the midpoint (inside angle) to the edge of the range
+  const rangeIntersectionPoint = getRayIntersectionCoords(midpoint, vertex, range);
+  let lineIntersectionCount = 0;
+  polygonLines.forEach(line => linesIntersect([vertex, rangeIntersectionPoint], line) && lineIntersectionCount++);
 
   // If the number of intersections is even, the angle is inside the polygon
-  return isEven(lineIntersections);
+  return !isEven(lineIntersectionCount);
 };
-const getLines = points => points.map((point, i) => {
-  const next = points[(i + 1) % points.length];
-  return [point, next];
-});
 
 // https://stackoverflow.com/a/24392281/7347484
 // The "intersects" function in geometry doesn't seem to work for this use case
-const linesIntersect = (_ref4, _ref5) => {
-  let [[a, b], [c, d]] = _ref4;
-  let [[p, q], [r, s]] = _ref5;
+const linesIntersect = (_ref3, _ref4) => {
+  let [[a, b], [c, d]] = _ref3;
+  let [[p, q], [r, s]] = _ref4;
   const determinant = (c - a) * (s - q) - (r - p) * (d - b);
   if (determinant === 0) {
     return false;
@@ -28841,6 +28886,7 @@ const PolygonGraph = props => {
     coords,
     type,
     showAngles,
+    showSides,
     range
   } = props.graphState;
   const points = coords ?? [[0, 0]];
@@ -28859,6 +28905,7 @@ const PolygonGraph = props => {
     constrain: p => p
   });
   const active = hovered || focused || dragging;
+  const lines = getLines(points);
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(mafs.Polygon, {
     points: [...points],
     color: "var(--movable-line-stroke-color)",
@@ -28877,9 +28924,18 @@ const PolygonGraph = props => {
       endPoints: [pt1, pt2],
       active: active,
       range: range,
-      polygonPoints: points,
+      polygonLines: lines,
       showAngles: !!showAngles
     });
+  }), showSides && lines.map((_ref, i) => {
+    let [start, end] = _ref;
+    const [x, y] = mafs.vec.midpoint(start, end);
+    const length = parseFloat(mafs.vec.dist(start, end).toFixed(1));
+    return /*#__PURE__*/React__namespace.createElement(TextLabel, {
+      key: "side-" + i,
+      x: x,
+      y: y
+    }, !Number.isInteger(length) && "≈ ", length);
   }), /*#__PURE__*/React__namespace.createElement(mafs.Polygon, {
     points: [...points],
     color: "transparent",
@@ -28899,11 +28955,73 @@ const PolygonGraph = props => {
   }), points.map((point, i) => /*#__PURE__*/React__namespace.createElement(StyledMovablePoint, {
     key: "point-" + i,
     point: point,
-    onMove: destination => dispatch(moveControlPoint(i, destination)),
+    onMove: destination => dispatch(movePoint(i, destination)),
     "data-testid": type + i
   })));
 };
 
+function PointGraph(props) {
+  const {
+    dispatch
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, props.graphState.coords.map((point, i) => /*#__PURE__*/React__namespace.createElement(StyledMovablePoint, {
+    key: i,
+    point: point,
+    onMove: destination => dispatch(movePoint(i, destination))
+  })));
+}
+
+const GraphStateContext = /*#__PURE__*/React.createContext({
+  state: {},
+  dispatch: () => {}
+});
+function useGraphState() {
+  return React__default["default"].useContext(GraphStateContext);
+}
+
+function Arrow(props) {
+  const {
+    userTransform,
+    viewTransform
+  } = mafs.useTransformContext();
+  const point = [props.x, props.y];
+  const userTransformedPoint = mafs.vec.transform(point, userTransform);
+  const viewTransformedPoint = mafs.vec.transform(userTransformedPoint, viewTransform);
+  return /*#__PURE__*/React__default["default"].createElement("g", {
+    transform: `translate(${viewTransformedPoint[0]} ${viewTransformedPoint[1]}) rotate(${props.rotate}) scale(1.25)`
+  }, /*#__PURE__*/React__default["default"].createElement("g", {
+    transform: "translate(-1)"
+  }, /*#__PURE__*/React__default["default"].createElement("path", {
+    d: "M-3 4 C-2.75 2.5 0 0.25 0.75 0C0 -0.25 -2.75 -2.5 -3 -4",
+    fill: "none"
+  })));
+}
+function AxisArrows() {
+  const {
+    state
+  } = useGraphState();
+  const range = state.range;
+  const [xMin, xMax] = range[0];
+  const [yMin, yMax] = range[1];
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(Arrow, {
+    x: xMax,
+    y: 0,
+    rotate: 0
+  }), /*#__PURE__*/React__default["default"].createElement(Arrow, {
+    x: 0,
+    y: yMin,
+    rotate: 90
+  }), /*#__PURE__*/React__default["default"].createElement(Arrow, {
+    x: xMin,
+    y: 0,
+    rotate: 180
+  }), /*#__PURE__*/React__default["default"].createElement(Arrow, {
+    x: 0,
+    y: yMax,
+    rotate: 270
+  }));
+}
+
 const renderLineLabel = (n, _ref) => {
   let [min, max] = _ref;
   return n !== -1 && n !== min && n !== max;
@@ -28914,10 +29032,10 @@ const axisOptions = (props, index) => ({
   subdivisions: props.step[index] / props.gridStep[index],
   labels: n => renderLineLabel(n, props.range[index]) ? n : ""
 });
-const Grid = props => props.markings === "none" ? null : /*#__PURE__*/React__namespace.createElement(mafs.Coordinates.Cartesian, {
+const Grid = props => props.markings === "none" ? null : /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(mafs.Coordinates.Cartesian, {
   xAxis: axisOptions(props, 0),
   yAxis: axisOptions(props, 1)
-});
+}), props.markings === "graph" && /*#__PURE__*/React__namespace.createElement(AxisArrows, null));
 
 // Displays a stylized open eye: lint warnings are visible
 const VisibleIcon = () => /*#__PURE__*/React__namespace.createElement("svg", {
@@ -29615,22 +29733,32 @@ const LegacyGrid = _ref => {
   return null;
 };
 
-/** Determine if coords is type CollinearTuple[] */
-const isCollinearTuples = coords => Array.isArray(coords[0][0]);
-
-// Generic type makes returned state match input state
 function interactiveGraphReducer(state, action) {
+  switch (action.type) {
+    case MOVE_CONTROL_POINT:
+      return doMoveControlPoint(state, action);
+    case MOVE_LINE:
+      return doMoveLine(state, action);
+    case MOVE_ALL:
+      return doMoveAll(state, action);
+    case MOVE_POINT:
+      return doMovePoint(state, action);
+    default:
+      throw new wonderStuffCore.UnreachableCaseError(action);
+  }
+}
+function doMoveControlPoint(state, action) {
   const {
     snapStep,
     range
   } = state;
-  if (!state.coords) {
-    throw new Error("Graph state must have been initialized with coords");
-  }
-  switch (action.type) {
-    case MOVE_CONTROL_POINT:
+  switch (state.type) {
+    case "segment":
+    case "linear":
+    case "linear-system":
+    case "ray":
       {
-        const newCoords = action.itemIndex !== undefined && state.coords && isCollinearTuples(state.coords) ? updateAtIndex({
+        const newCoords = updateAtIndex({
           array: state.coords,
           index: action.itemIndex,
           update: tuple => setAtIndex({
@@ -29645,23 +29773,9 @@ function interactiveGraphReducer(state, action) {
               })
             })
           })
-        }) : setAtIndex({
-          array: state.coords,
-          index: action.pointIndex,
-          newValue: snap({
-            snapStep,
-            point: bound$1({
-              snapStep,
-              range,
-              point: action.destination
-            })
-          })
         });
-
-        // Cannot type narrow both conditions within function parameters,
-        // so this may seem redundant, but it's necessary for type safety.
-        const coordsToCheck = isCollinearTuples(newCoords) && action.itemIndex !== undefined ? newCoords[action.itemIndex] : newCoords;
-        if (!isCollinearTuples(coordsToCheck) && coordsOverlap(coordsToCheck)) {
+        const coordsToCheck = newCoords[action.itemIndex];
+        if (coordsOverlap(coordsToCheck)) {
           return state;
         }
         return {
@@ -29670,15 +29784,30 @@ function interactiveGraphReducer(state, action) {
           coords: newCoords
         };
       }
-    case MOVE_LINE:
+    case "circle":
+      throw new Error("FIXME implement circle reducer");
+    case "point":
+    case "polygon":
+      throw new Error(`Don't use moveControlPoint for ${state.type} graphs. Use movePoint instead!`);
+    default:
+      throw new wonderStuffCore.UnreachableCaseError(state);
+  }
+}
+function doMoveLine(state, action) {
+  const {
+    snapStep,
+    range
+  } = state;
+  switch (state.type) {
+    case "segment":
+    case "linear":
+    case "linear-system":
+    case "ray":
       {
-        if (!isCollinearTuples(state.coords)) {
-          throw new Error("Cannot call this action unless coords is array of CollinearTuple.");
-        }
         if (action.itemIndex === undefined) {
           throw new Error("Please provide index of line to move");
         }
-        const currentLine = state.coords?.[action.itemIndex];
+        const currentLine = state.coords[action.itemIndex];
         if (!currentLine) {
           throw new Error("No line to move");
         }
@@ -29700,15 +29829,25 @@ function interactiveGraphReducer(state, action) {
         });
         return {
           ...state,
+          type: state.type,
           hasBeenInteractedWith: true,
           coords: newCoords
         };
       }
-    case MOVE_ALL:
+    default:
+      // The MoveLine action doesn't make sense for other graph types;
+      // ignore it if it somehow happens
+      return state;
+  }
+}
+function doMoveAll(state, action) {
+  const {
+    snapStep,
+    range
+  } = state;
+  switch (state.type) {
+    case "polygon":
       {
-        if (isCollinearTuples(state.coords)) {
-          throw new Error("Cannot call this action unless coords is array of vectors.");
-        }
         const change = getChange(state.coords, action.delta, {
           snapStep,
           range
@@ -29724,7 +29863,34 @@ function interactiveGraphReducer(state, action) {
         };
       }
     default:
-      throw new wonderStuffCore.UnreachableCaseError(action);
+      // MoveAll is not supported for other state types; just ignore it.
+      return state;
+  }
+}
+function doMovePoint(state, action) {
+  switch (state.type) {
+    case "point":
+    case "polygon":
+      {
+        return {
+          ...state,
+          hasBeenInteractedWith: true,
+          coords: setAtIndex({
+            array: state.coords,
+            index: action.index,
+            newValue: snap({
+              snapStep: state.snapStep,
+              point: bound$1({
+                snapStep: state.snapStep,
+                range: state.range,
+                point: action.destination
+              })
+            })
+          })
+        };
+      }
+    default:
+      throw new Error("The movePoint action is only for point and polygon graphs");
   }
 }
 const getChange = (coords, delta, constraintOpts) => {
@@ -29811,7 +29977,7 @@ function clamp(value, min, max) {
 const coordsOverlap = coords => coords.some((coord, i) => coords.some((c, j) => i !== j && kmath.vector.equal(coord, c)));
 function updateAtIndex(args) {
   const {
-    array = [],
+    array,
     index,
     update
   } = args;
@@ -29824,13 +29990,12 @@ function updateAtIndex(args) {
 }
 function setAtIndex(args) {
   const {
-    array = [],
+    array,
     index,
     newValue
   } = args;
   const copy = [...array];
   copy[index] = newValue;
-  // restoring readonly to array
   return copy;
 }
 
@@ -29872,18 +30037,31 @@ function initializeGraphState(params) {
       };
     case "polygon":
       return {
+        type: "polygon",
         hasBeenInteractedWith: false,
         range,
         snapStep,
-        ...graph,
+        showAngles: Boolean(graph.showAngles),
+        showSides: Boolean(graph.showSides),
         coords: getPolygonCoords({
           graph,
           range,
           step
         })
       };
-    case "angle":
     case "point":
+      return {
+        type: graph.type,
+        hasBeenInteractedWith: false,
+        range,
+        snapStep,
+        coords: getDefaultPoints({
+          graph,
+          step,
+          range
+        })
+      };
+    case "angle":
     case "circle":
     case "sinusoid":
     case "quadratic":
@@ -29892,43 +30070,99 @@ function initializeGraphState(params) {
       throw new wonderStuffCore.UnreachableCaseError(graph);
   }
 }
+const getDefaultPoints = _ref => {
+  let {
+    graph,
+    range,
+    step
+  } = _ref;
+  const numPoints = graph.numPoints || 1;
+  let coords = graph.coords?.slice();
+  if (coords) {
+    return coords;
+  }
+  switch (numPoints) {
+    case 1:
+      // Back in the day, one point's coords were in graph.coord
+      coords = [graph.coord || [0, 0]];
+      break;
+    case 2:
+      coords = [[-5, 0], [5, 0]];
+      break;
+    case 3:
+      coords = [[-5, 0], [0, 0], [5, 0]];
+      break;
+    case 4:
+      coords = [[-6, 0], [-2, 0], [2, 0], [6, 0]];
+      break;
+    case 5:
+      coords = [[-6, 0], [-3, 0], [0, 0], [3, 0], [6, 0]];
+      break;
+    case 6:
+      coords = [[-5, 0], [-3, 0], [-1, 0], [1, 0], [3, 0], [5, 0]];
+      break;
+    default:
+      coords = [];
+      break;
+  }
+  // Transform coords from their -10 to 10 space to 0 to 1
+  // because of the old graph.coord, and also it's easier.
+  const newCoords = normalizeCoords(coords, [[-10, 10], [-10, 10]]);
+  return normalizePoints(range, step, newCoords);
+};
 
 // TS v4 doesn't narrow return types, while v5 does.
 // Instead of updating to v5, using generic type to relate input and output types.
 function getGradableGraph(state, initialGraph) {
   if (!state.hasBeenInteractedWith) {
-    return initialGraph;
+    return {
+      type: initialGraph.type
+    };
   }
-  switch (true) {
-    // coords: Array of CollinearTuple
-    case state.type === "linear-system" && initialGraph.type === "linear-system":
-    case state.type === "segment" && initialGraph.type === "segment":
-      return {
-        ...initialGraph,
-        coords: state.coords
-      };
-    // coords: CollinearTuple
-    case state.type === "linear" && initialGraph.type === "linear":
-    case state.type === "ray" && initialGraph.type === "ray":
-      return {
-        ...initialGraph,
-        coords: state.coords?.[0]
-      };
-    case state.type === "polygon" && initialGraph.type === "polygon":
-      return {
-        ...initialGraph,
-        coords: state.coords
-      };
-    default:
-      throw new Error("Mafs is not yet implemented for graph type: " + initialGraph.type);
+  if (initialGraph.type === "linear-system" && state.type === "linear-system") {
+    return {
+      ...initialGraph,
+      coords: state.coords
+    };
+  }
+  if (state.type === "segment" && initialGraph.type === "segment") {
+    return {
+      ...initialGraph,
+      coords: state.coords
+    };
+  }
+  if (state.type === "linear" && initialGraph.type === "linear") {
+    return {
+      ...initialGraph,
+      coords: state.coords[0]
+    };
+  }
+  if (state.type === "ray" && initialGraph.type === "ray") {
+    return {
+      ...initialGraph,
+      coords: state.coords[0]
+    };
+  }
+  if (state.type === "polygon" && initialGraph.type === "polygon") {
+    return {
+      ...initialGraph,
+      coords: state.coords
+    };
   }
+  if (state.type === "point" && initialGraph.type === "point") {
+    return {
+      ...initialGraph,
+      coords: state.coords
+    };
+  }
+  throw new Error("Mafs is not yet implemented for graph type: " + initialGraph.type);
 }
-const getDefaultSegments = _ref => {
+const getDefaultSegments = _ref2 => {
   let {
     graph,
     range,
     step
-  } = _ref;
+  } = _ref2;
   const ys = n => {
     switch (n) {
       case 2:
@@ -29954,24 +30188,24 @@ const getDefaultSegments = _ref => {
   });
 };
 const defaultLinearCoords = [[[0.25, 0.75], [0.75, 0.75]], [[0.25, 0.25], [0.75, 0.25]]];
-const getLineCoords = _ref2 => {
+const getLineCoords = _ref3 => {
   let {
     graph,
     range,
     step
-  } = _ref2;
+  } = _ref3;
   return (
     // Return two lines for a linear system, one for a ray or linear
     graph.coords ?? graph.type === "linear-system" ? defaultLinearCoords.map(collinear => normalizePoints(range, step, collinear)) : [normalizePoints(range, step, defaultLinearCoords[0])]
   );
 };
-const getPolygonCoords = _ref3 => {
+const getPolygonCoords = _ref4 => {
   let {
     graph,
     range,
     step
-  } = _ref3;
-  let coords = graph.coords;
+  } = _ref4;
+  let coords = graph.coords?.slice();
   if (coords) {
     return coords;
   }
@@ -30025,6 +30259,13 @@ const renderGraph = props => {
         graphState: state,
         dispatch: dispatch
       });
+    case "point":
+      return /*#__PURE__*/React__namespace.createElement(PointGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "circle":
+      throw new Error("the circle graph type is not yet implemented");
     default:
       return new wonderStuffCore.UnreachableCaseError(type);
   }
@@ -30032,10 +30273,24 @@ const renderGraph = props => {
 const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
   const [width, height] = props.box;
   const [state, dispatch] = React__namespace.useReducer(interactiveGraphReducer, props, initializeGraphState);
+  const prevState = React.useRef(state);
+  React.useEffect(() => {
+    if (prevState.current !== state) {
+      props.onChange({
+        graph: state
+      });
+    }
+    prevState.current = state;
+  }, [props, state]);
   React__namespace.useImperativeHandle(ref, () => ({
     getUserInput: () => getGradableGraph(state, props.graph)
   }));
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+  return /*#__PURE__*/React__namespace.createElement(GraphStateContext.Provider, {
+    value: {
+      state,
+      dispatch
+    }
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     style: {
       width,
       height,
@@ -30061,12 +30316,12 @@ const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
     zoom: false,
     width: width,
     height: height
-  }, /*#__PURE__*/React__namespace.createElement(Grid, props), props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
+  }, /*#__PURE__*/React__namespace.createElement(SvgDefs, null), /*#__PURE__*/React__namespace.createElement(Grid, props), props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
     lockedFigures: props.lockedFigures
   }), renderGraph({
     state,
     dispatch
-  }))));
+  })))));
 });
 
 const {
@@ -31233,6 +31488,7 @@ 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()
@@ -31687,18 +31943,18 @@ 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(
-  // TODO(kevinb): rename state to userInput
-  // state === userInput
-  state, rubric, component) {
+  static validate(userInput, rubric, component) {
     // 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.
-    // @ts-expect-error - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'. | TS2339 - Property 'center' does not exist on type 'PerseusGraphType'. | TS2339 - Property 'radius' does not exist on type 'PerseusGraphType'.
-    const hasValue = !!(state.coords || state.center && state.radius);
-    if (state.type === rubric.correct.type && hasValue) {
-      if (state.type === "linear" && rubric.correct.type === "linear" && state.coords != null) {
-        const guess = state.coords;
+    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
@@ -31715,8 +31971,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "linear-system" && rubric.correct.type === "linear-system" && state.coords != null) {
-        const guess = state.coords;
+      } 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 {
@@ -31726,9 +31982,9 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "quadratic" && rubric.correct.type === "quadratic" && state.coords != 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(state.coords);
+        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);
@@ -31740,8 +31996,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "sinusoid" && rubric.correct.type === "sinusoid" && state.coords != null) {
-        const guessCoeffs = this.getSinusoidCoefficients(state.coords);
+      } 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);
@@ -31756,8 +32012,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "circle" && rubric.correct.type === "circle") {
-        if (deepEq$1(state.center, rubric.correct.center) && eq(state.radius, rubric.correct.radius)) {
+      } 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,
@@ -31765,9 +32021,9 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "point" && rubric.correct.type === "point" && state.coords != null) {
+      } else if (userInput.type === "point" && rubric.correct.type === "point" && userInput.coords != null) {
         let correct = InteractiveGraph.getPointCoords(rubric.correct, component);
-        const guess = state.coords?.slice();
+        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
@@ -31784,8 +32040,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "polygon" && rubric.correct.type === "polygon" && state.coords != null) {
-        const guess = state.coords?.slice();
+      } 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;
@@ -31809,8 +32065,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "segment" && rubric.correct.type === "segment" && state.coords != null) {
-        let guess = state.coords.slice();
+      } else if (userInput.type === "segment" && rubric.correct.type === "segment" && userInput.coords != null) {
+        let guess = userInput.coords.slice();
         let correct = rubric.correct.coords?.slice();
         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>'.
@@ -31823,8 +32079,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "ray" && rubric.correct.type === "ray" && state.coords != null) {
-        const guess = state.coords;
+      } 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'.
@@ -31838,8 +32094,8 @@ class InteractiveGraph extends React__namespace.Component {
             message: null
           };
         }
-      } else if (state.type === "angle" && rubric.correct.type === "angle") {
-        const guess = state.coords;
+      } 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") {
@@ -31878,7 +32134,7 @@ class InteractiveGraph extends React__namespace.Component {
 
     // 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(state, rubric.graph)) {
+    if (!hasValue || ___default["default"].isEqual(userInput, rubric.graph)) {
       // We're where we started.
       return {
         type: "invalid",
@@ -42073,7 +42329,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "20.8.1";
+const libVersion = "21.1.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -44322,6 +44578,138 @@ const registerAllWidgetsForTesting = () => {
   replaceDeprecatedWidgets();
 };
 
+// These are all the current widgets that require user-input and are supported for automatic scoring
+const QUESTION_WIDGETS = ["numeric-input", "input-number", "radio", "interactive-graph", "interactive-number-line", "categorizer", "plotter", "orderer", "protractor", "matcher", "sorter"];
+
+/**
+ * Regex for widget placeholders in a string.
+ *
+ * First capture group is the widget ID (ex. 'radio 1')
+ * Second capture group is the widget type (ex. "radio)
+ * exec return will look like: ['[[☃ radio 1]]', 'radio 1', 'radio']
+ */
+function getWidgetRegex() {
+  return /\[\[☃ ([A-Za-z0-9- ]+)\]\]/g;
+}
+
+/**
+ * Add a widget placeholder using the widget ID.
+ * ex. addWidget("radio 1") => "[[☃ radio 1]]"
+ *
+ * @param {string} id
+ * @returns {string}
+ */
+function addWidget(id) {
+  return `[[☃ ${id}]]`;
+}
+
+/**
+ * Get a widget type by a widget's ID
+ * (please don't derive type from ID)
+ *
+ * @param {string} widgetId the ID of the widget
+ * @param {PerseusWidgetsMap} widgetMap widget ID to widget map
+ * @returns {string} the widget type (ie "radio")
+ */
+function getWidgetTypeByWidgetId(WidgetId, widgetMap) {
+  const widget = widgetMap[WidgetId];
+  return widget?.type ?? null;
+}
+
+/**
+ * Does the content have a specific type of widget?
+ *
+ * @param {string} type the type of the widget in question (ie "radio")
+ * @param {string} content the string to search through
+ * @param {PerseusWidgetsMap} widgetMap widget ID to widget map
+ * @returns {boolean} if the content includes the widget type
+ */
+function contentHasWidgetType(type, content, widgetMap) {
+  return getWidgetIdsFromContentByType(type, content, widgetMap).length > 0;
+}
+
+/**
+ * Extract all widget IDs, which includes the widget type and instance number.
+ * example output: ['radio 1', 'categorizer 1', 'categorizor 2']
+ *
+ * Content should contain Perseus widget placeholders,
+ * which look like: '[[☃ radio 1]]'.
+ *
+ * @param {string} content
+ * @returns {ReadonlyArray<string>} widgetIds
+ */
+function getWidgetIdsFromContent(content) {
+  const widgets = [];
+  const localWidgetRegex = getWidgetRegex();
+  let match = localWidgetRegex.exec(content);
+  while (match !== null) {
+    widgets.push(match[1]);
+    match = localWidgetRegex.exec(content);
+  }
+  return widgets;
+}
+
+/**
+ * Get a list of widget IDs from content,
+ * but only for specific widget types
+ *
+ * @param {string} type the type of widget (ie "radio")
+ * @param {string} content the string to parse
+ * @param {PerseusWidgetsMap} widgetMap widget ID to widget map
+ * @returns {ReadonlyArray<string>} the widget type (ie "radio")
+ */
+function getWidgetIdsFromContentByType(type, content, widgetMap) {
+  const rv = [];
+  const widgetIdsInContent = getWidgetIdsFromContent(content);
+  widgetIdsInContent.forEach(widgetId => {
+    const widget = widgetMap[widgetId];
+    if (widget?.type === type) {
+      rv.push(widgetId);
+    }
+  });
+  return rv;
+}
+
+/**
+ * Pull the widget map out of ItemData
+ *
+ * @param {PerseusItem} PerseusItem containing a widgetMap
+ * @returns {WidgetMap} the widget map in the PerseusItem
+ */
+function getWidgetsMapFromItemData(itemData) {
+  return itemData.question.widgets;
+}
+
+/**
+ * Get the widget information from a WidgetMap
+ *
+ * @param {string} widgetId the ID of the widget
+ * @returns {PerseusWidget | null} the widget data if it exists, otherwise null
+ */
+function getWidgetFromWidgetMap(widgetId, widgetMap) {
+  return widgetMap[widgetId] ?? null;
+}
+
+/**
+ * Get select widgets from a widget map.
+ * Useful for multi-items that needs to split
+ * one PerseusItem into several
+ *
+ * @param {ReadonlyArray<string>} widgetIds to extract
+ * @param {PerseusWidgetsMap} widgetMap to extract from
+ * @return {PerseusWidgetsMap} a new widget map with requested widgets
+ */
+function getWidgetsFromWidgetMap(widgetIds, widgetMap) {
+  const widgets = {};
+  widgetIds.forEach(widgetId => {
+    const widget = getWidgetFromWidgetMap(widgetId, widgetMap);
+    if (widget) {
+      widgets[widgetId] = widget;
+    }
+  });
+  return widgets;
+}
+
 /**
  * This function extracts the answers from the widgets.
  *
@@ -44443,7 +44831,7 @@ function getAnswersFromWidgets(widgets) {
         // E.g. 'item 1\nitem 2\nitem 3'
         const orderer = widget;
         if (orderer.options?.correctOptions) {
-          answers.push(orderer.options.correctOptions.map(option => option.content).join("\n"));
+          answers.push(joinOptionContents(orderer.options.correctOptions));
         }
         break;
       case "sorter":
@@ -44502,6 +44890,31 @@ function getAnswersFromWidgets(widgets) {
   return answers;
 }
 
+/**
+ * Join the content of the options together.
+ * @param {Array<{content: string}>} options
+ * @returns {string}
+ */
+const joinOptionContents = options => options.map(_ref => {
+  let {
+    content
+  } = _ref;
+  return content;
+}).join("\n");
+
+/**
+ * Convert an index to an option letter.
+ * @param {number} index
+ * @returns {string}
+ * @example
+ * toOptionLetter(0) // 'A'
+ * toOptionLetter(1) // 'B'
+ * toOptionLetter(25) // 'Z'
+ * // Once the index goes past 25, it will start returning special characters
+ * toOptionLetter(26) // '['
+ */
+const toOptionLetter = index => String.fromCharCode("A".charCodeAt(0) + index);
+
 /**
  * Inject a string equivalent of the widgets into the content.
  *
@@ -44512,7 +44925,7 @@ function getAnswersFromWidgets(widgets) {
  * @param {PerseusRenderer["widgets"]} widgets
  * @returns
  */
-function injectWidgets(content, widgets) {
+function injectWidgets(content, widgets, widgetProps) {
   // The types for taskProgress.itemData are not well defined,
   // so there is a chance that widgets or content could be undefined.
   // In that scenario, simply exit early and return the content as is.
@@ -44531,11 +44944,22 @@ function injectWidgets(content, widgets) {
     switch (widget.type) {
       case "radio":
         // Replace radio with the radio options
-        // '[[☃ Radio 1]]' -> 'option 1\noption 2\noption 3'
+        // '[[☃ Radio 1]]' -> 'choice 1\nchoice 2\nchoice 3'
+        // or if the current widget state is available with proper order,
+        // '[[☃ Radio 1]]' ->
+        //   'Option A: choice 1\nOption B: choice 2\nOption C: choice 3'
         const radio = widget;
+        const radioProps = widgetProps?.[widgetID];
         if (radio.options?.choices?.length) {
-          let radioContext = radio.options.choices.map(choice => choice.content).join("\n");
-          if (radio.options?.randomize) {
+          let radioContext = joinOptionContents(radioProps ? radioProps.choices.map((_ref2, i) => {
+            let {
+              content
+            } = _ref2;
+            return {
+              content: `Option ${toOptionLetter(i)}: ${content}`
+            };
+          }) : radio.options.choices);
+          if (!radioProps && radio.options?.randomize) {
             radioContext += "\nThose options are displayed in a different order to the user. If the user says the letter, number, or ordinal number, always ask them clarify which option they are referring to.\n";
           }
           context = context.replace(`[[☃ ${widgetID}]]`, radioContext);
@@ -44643,7 +45067,7 @@ function injectWidgets(content, widgets) {
         // '[[☃ Orderer 1]]' -> 'option 1\noption 2\noption 3'
         const orderer = widget;
         if (orderer.options?.options) {
-          context = context.replace(`[[☃ ${widgetID}]]`, orderer.options.options.map(option => option.content).join("\n"));
+          context = context.replace(`[[☃ ${widgetID}]]`, joinOptionContents(orderer.options.options));
         }
         break;
       case "sorter":
@@ -44726,18 +45150,15 @@ const INDIVIDUAL_ANSWER_WIDGETS = ["interactive-graph", "categorizer", "grapher"
 
 /* Widgets that are supported for automatic scoring */
 const SUPPORTED_WIDGETS = ["radio", "numeric-input", "input-number", "expression", ...INDIVIDUAL_ANSWER_WIDGETS];
-const getWidgetTypeFromWidgetKey = widgetKey => {
-  return widgetKey.split(" ")[0];
-};
 
 /* Verify if the perseus item has supported widgets for automatic scoring */
-const isWrongAnswerSupported = widgetKeys => {
-  return widgetKeys.length !== 0 && widgetKeys.every(widgetKey => SUPPORTED_WIDGETS.includes(getWidgetTypeFromWidgetKey(widgetKey)));
+const isWrongAnswerSupported = (widgetIds, widgetMap) => {
+  return widgetIds.length !== 0 && widgetIds.every(widgetId => SUPPORTED_WIDGETS.includes(getWidgetTypeByWidgetId(widgetId, widgetMap)));
 };
 
-/* Verify if the widget key has an individual answer for the coach report view  */
-const shouldHaveIndividualAnswer = widgetKey => {
-  return INDIVIDUAL_ANSWER_WIDGETS.includes(getWidgetTypeFromWidgetKey(widgetKey));
+/* Verify if the widget ID has an individual answer for the coach report view  */
+const shouldHaveIndividualAnswer = (widgetId, widgetMap) => {
+  return INDIVIDUAL_ANSWER_WIDGETS.includes(getWidgetTypeByWidgetId(widgetId, widgetMap));
 };
 
 /* Returns the answer userInput submission for currently supported widgets */
@@ -44756,29 +45177,30 @@ const getAnswerFromUserInput = (widgetType, userInput) => {
   return userInput;
 };
 
-/* Returns the correct answer for a given widget key and Perseus Item */
+/* Returns the correct answer for a given widget ID and Perseus Item */
 // TODO (LEMS-1835): We should fix the resonse type from getWidget to be specific.
 // TODO (LEMS-1836): We should also consider adding the getOneCorrectAnswerFromRubric method to all widgets.
-const getCorrectAnswerForWidgetKey = (widgetKey, itemData) => {
-  const rubric = itemData.question.widgets[widgetKey].options;
-  const widgetType = getWidgetTypeFromWidgetKey(widgetKey);
+const getCorrectAnswerForWidgetId = (widgetId, itemData) => {
+  const rubric = itemData.question.widgets[widgetId].options;
+  const widgetMap = getWidgetsMapFromItemData(itemData);
+  const widgetType = getWidgetTypeByWidgetId(widgetId, widgetMap);
   const widget = getWidget(widgetType);
 
   // @ts-expect-error - TS2339 - Property 'getOneCorrectAnswerFromRubric' does not exist on type 'ComponentType<any>'.
   return widget?.getOneCorrectAnswerFromRubric?.(rubric);
 };
 
-/* Verify if the widget key exists in the content string of the Perseus Item */
-const isWidgetKeyInContent = (perseusItem, widgetKey) => {
-  return perseusItem.question.content.indexOf(widgetKey) !== -1;
+/* Verify if the widget ID exists in the content string of the Perseus Item */
+const isWidgetIdInContent = (perseusItem, widgetId) => {
+  return perseusItem.question.content.indexOf(widgetId) !== -1;
 };
 
-/* Return an array of all the widget keys that exist in the content string of a Perseus Item */
-const getValidWidgetKeys = perseusItem => {
+/* Return an array of all the widget IDs that exist in the content string of a Perseus Item */
+const getValidWidgetIds = perseusItem => {
   const {
     widgets
   } = perseusItem.question;
-  return wonderStuffCore.keys(widgets).filter(key => isWidgetKeyInContent(perseusItem, key));
+  return wonderStuffCore.keys(widgets).filter(id => isWidgetIdInContent(perseusItem, id));
 };
 
 /**
@@ -44826,7 +45248,7 @@ const genericPerseusItemData = {
  * uses a basic Perseus object and updates it with custom values as needed.
  *
  * @param {Partial<PerseusItem>} customFields
- * @returns PerseusItem
+ * @returns {PerseusItem}
  */
 function generateTestPerseusItem() {
   let customFields = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -44836,6 +45258,107 @@ function generateTestPerseusItem() {
   };
 }
 
+/**
+ * Creates an object with the bare amount
+ * of data to be a properly typed RadioWidget
+ *
+ * @returns {RadioWidget} skeleton RadioWidget for testing
+ */
+function generateTestRadioWidget() {
+  return {
+    type: "radio",
+    options: {
+      choices: []
+    }
+  };
+}
+
+/**
+ * Creates an object with the bare amount
+ * of data to be a properly typed InteractiveGraphWidget
+ *
+ * @returns {InteractiveGraphWidget} skeleton InteractiveGraphWidget for testing
+ */
+function generateTestInteractiveGraphWidget() {
+  return {
+    type: "interactive-graph",
+    options: {
+      step: [1, 1],
+      gridStep: [1, 1],
+      snapStep: [1, 1],
+      markings: "graph",
+      labels: ["x", "y"],
+      showProtractor: false,
+      showRuler: false,
+      rulerLabel: "mm",
+      rulerTicks: 2,
+      range: [[-10, 10], [-10, 10]],
+      graph: {
+        type: "angle"
+      },
+      correct: {
+        type: "angle"
+      }
+    }
+  };
+}
+
+/**
+ * Creates an object with the bare amount
+ * of data to be a properly typed InteractiveGraphWidget
+ *
+ * @returns {InteractiveGraphWidget} skeleton InteractiveGraphWidget for testing
+ */
+function generateTestCategorizerWidget() {
+  return {
+    type: "categorizer",
+    options: {
+      items: [],
+      categories: [],
+      randomizeItems: false,
+      static: false,
+      values: []
+    }
+  };
+}
+
+/**
+ * Creates an object with the bare amount
+ * of data to be a properly typed ExpressionWidget
+ *
+ * @returns {ExpressionWidget} skeleton ExpressionWidget for testing
+ */
+function generateTestExpressionWidget() {
+  return {
+    type: "expression",
+    options: {
+      answerForms: [],
+      buttonSets: ["basic"],
+      functions: [],
+      times: false
+    }
+  };
+}
+
+/**
+ * Creates an object with the bare amount
+ * of data to be a properly typed NumericInputWidget
+ *
+ * @returns {NumericInputWidget} skeleton NumericInputWidget for testing
+ */
+function generateTestNumericInputWidget() {
+  return {
+    type: "numeric-input",
+    options: {
+      answers: [],
+      labelText: "",
+      size: "normal",
+      coefficient: false,
+      static: false
+    }
+  };
+}
+
 /**
  * Some helpers for CEDAR logging. CEDAR convention dictates
  * that enum values should be upper case. Ex: for the
@@ -44890,162 +45413,6 @@ function convertWidgetNameToEnum(name) {
   }
   return widgetEnum;
 }
-function getWidgetTypeFromWidgetId(widgetId) {
-  const [widgetType, widgetNumber] = widgetId.split(" ");
-  if (!widgetNumber) {
-    throw new Error(`Incorrect format for widget ID: ${widgetId}`);
-  }
-  if (!widgetNameToEnum[widgetType]) {
-    throw new Error(`Unknown widget type (${widgetType}) in widget ID: ${widgetId}`);
-  }
-  return widgetType;
-}
-
-let WidgetType = /*#__PURE__*/function (WidgetType) {
-  WidgetType["Categorizer"] = "categorizer";
-  WidgetType["CSProgram"] = "cs-program";
-  WidgetType["Definition"] = "definition";
-  WidgetType["Dropdown"] = "dropdown";
-  WidgetType["Explanation"] = "explanation";
-  WidgetType["Expression"] = "expression";
-  WidgetType["GradedGroup"] = "graded-group";
-  WidgetType["GradedGroupAnswerBar"] = "graded-group-answer-bar";
-  WidgetType["GradedGroupSet"] = "graded-group-set";
-  WidgetType["Grapher"] = "grapher";
-  WidgetType["Group"] = "group";
-  WidgetType["Iframe"] = "iframe";
-  WidgetType["Image"] = "image";
-  WidgetType["InputNumber"] = "input-number";
-  WidgetType["Interaction"] = "interaction";
-  WidgetType["InteractiveGraph"] = "interactive-graph";
-  WidgetType["InteractiveNumberLine"] = "interactive-number-line";
-  WidgetType["LabelImage"] = "label-image";
-  WidgetType["Matcher"] = "matcher";
-  WidgetType["Matrix"] = "matrix";
-  WidgetType["Measurer"] = "measurer";
-  WidgetType["Molecule"] = "molecule";
-  WidgetType["NumberLine"] = "number-line";
-  WidgetType["NumericInput"] = "numeric-input";
-  WidgetType["Orderer"] = "orderer";
-  WidgetType["Passage"] = "passage";
-  WidgetType["PassageRef"] = "passage-ref";
-  WidgetType["PassageRefTarget"] = "passage-ref-target";
-  WidgetType["Plotter"] = "plotter";
-  WidgetType["Protractor"] = "protractor";
-  WidgetType["PythonProgram"] = "python-program";
-  WidgetType["Radio"] = "radio";
-  WidgetType["Sorter"] = "sorter";
-  WidgetType["Table"] = "table";
-  WidgetType["Unit"] = "unit";
-  WidgetType["Video"] = "video";
-  WidgetType["VideoTranscriptLink"] = "video-transcript-link";
-  return WidgetType;
-}({});
-// These are all the current widgets that require user-input and are supported for automatic scoring
-const QUESTION_WIDGETS = ["numeric-input", "input-number", "radio", "interactive-graph", "interactive-number-line", "categorizer", "plotter", "orderer", "protractor", "matcher", "sorter"];
-
-/**
- * Regex for widget placeholders in a string.
- *
- * First capture group is the widget ID (ex. 'radio 1')
- * Second capture group is the widget type (ex. "radio)
- * exec return will look like: ['[[☃ radio 1]]', 'radio 1', 'radio']
- */
-function getWidgetRegex() {
-  return /\[\[☃ (([a-z-]+) \d+)\]\]/g;
-}
-
-/**
- * Add a widget placeholder using the widget ID.
- * ex. addWidget("radio 1") => "[[☃ radio 1]]"
- *
- * @param {string} id
- * @returns {string}
- */
-function addWidget(id) {
-  return `[[☃ ${id}]]`;
-}
-
-/**
- * Extract all widget IDs, which includes the widget type and instance number.
- * example output: ['radio 1', 'categorizer 1', 'categorizor 2']
- *
- * Content should contain Perseus widget placeholders,
- * which look like: '[[☃ radio 1]]'.
- *
- * @param {string} content
- * @returns {Array<WidgetId>} widgets
- */
-function getAllWidgetIds(content) {
-  const widgets = [];
-  const localWidgetRegex = getWidgetRegex();
-  let match = localWidgetRegex.exec(content);
-  while (match !== null) {
-    widgets.push(match[1]);
-    match = localWidgetRegex.exec(content);
-  }
-  return widgets;
-}
-
-/**
- * Check if a specific widget is an actual widget type using its name.
- * The widget name should include a widget type, without an instance number,
- * as a string. ex. 'radio'
- *
- * @param {string} widgetName
- * @returns {boolean}
- */
-function isWidgetType(widgetName) {
-  return Object.values(WidgetType).includes(widgetName);
-}
-
-/**
- * Extract all widget types from a Perseus JSON content string.
- * This does not include the instance number and prevents duplicates.
- * example output: ['radio', 'categorizer']
- *
- * @param {string} content
- * @returns {Array<WidgetId>}
- */
-function getAllWidgetTypes(content) {
-  const widgetTypes = [];
-  const localWidgetRegex = getWidgetRegex();
-  let match = localWidgetRegex.exec(content);
-  while (match !== null) {
-    const matchType = match[2];
-    if (!widgetTypes.includes(matchType) && isWidgetType(matchType)) {
-      widgetTypes.push(matchType);
-    }
-    match = localWidgetRegex.exec(content);
-  }
-  return widgetTypes;
-}
-
-/**
- * Check if a specific widget is a question widget type using its ID.
- * The widget ID includes the widget type and the instance number.
- *
- * @param {WidgetId} widgetId
- * @returns {boolean}
- */
-function isQuestionWidgetType(widgetId) {
-  return QUESTION_WIDGETS.includes(widgetId.split(" ")[0]);
-}
-
-/**
- * Extract the widget IDs of all widgets considered question widgets. Widget IDs
- * include widget type and instance number.
- * example output: ['radio 1', 'categorizer 1']
- *
- * Content should contain Perseus widget placeholders,
- * which look like: '[[☃ radio 1]]'.
- *
- * @param {string} content
- * @returns Array<WidgetId>
- */
-function getQuestionWidgetIds(content) {
-  return getAllWidgetIds(content).filter(isQuestionWidgetType);
-}
 
 const EditorJsonify = {
   serialize: function () {
@@ -45097,7 +45464,6 @@ exports.TableWidget = Table$1;
 exports.Util = Util;
 exports.WIDGET_PROP_DENYLIST = denylist;
 exports.WidgetJsonifyDeprecated = WidgetJsonifyDeprecated;
-exports.WidgetType = WidgetType;
 exports.Widgets = widgets$1;
 exports.addWidget = addWidget;
 exports.apiVersion = apiVersion;
@@ -45105,19 +45471,26 @@ exports.buildEmptyItemTreeForShape = buildEmptyItemTreeForShape;
 exports.buildMapper = buildMapper;
 exports.components = components;
 exports.constants = constants;
+exports.contentHasWidgetType = contentHasWidgetType;
 exports.convertWidgetNameToEnum = convertWidgetNameToEnum;
 exports.displaySigFigs = displaySigFigs;
+exports.generateTestCategorizerWidget = generateTestCategorizerWidget;
+exports.generateTestExpressionWidget = generateTestExpressionWidget;
+exports.generateTestInteractiveGraphWidget = generateTestInteractiveGraphWidget;
+exports.generateTestNumericInputWidget = generateTestNumericInputWidget;
 exports.generateTestPerseusItem = generateTestPerseusItem;
+exports.generateTestRadioWidget = generateTestRadioWidget;
 exports.genericPerseusItemData = genericPerseusItemData;
-exports.getAllWidgetIds = getAllWidgetIds;
-exports.getAllWidgetTypes = getAllWidgetTypes;
 exports.getAnswerFromUserInput = getAnswerFromUserInput;
 exports.getAnswersFromWidgets = getAnswersFromWidgets;
-exports.getCorrectAnswerForWidgetKey = getCorrectAnswerForWidgetKey;
-exports.getQuestionWidgetIds = getQuestionWidgetIds;
-exports.getValidWidgetKeys = getValidWidgetKeys;
-exports.getWidgetTypeFromWidgetId = getWidgetTypeFromWidgetId;
-exports.getWidgetTypeFromWidgetKey = getWidgetTypeFromWidgetKey;
+exports.getCorrectAnswerForWidgetId = getCorrectAnswerForWidgetId;
+exports.getValidWidgetIds = getValidWidgetIds;
+exports.getWidgetFromWidgetMap = getWidgetFromWidgetMap;
+exports.getWidgetIdsFromContent = getWidgetIdsFromContent;
+exports.getWidgetIdsFromContentByType = getWidgetIdsFromContentByType;
+exports.getWidgetTypeByWidgetId = getWidgetTypeByWidgetId;
+exports.getWidgetsFromWidgetMap = getWidgetsFromWidgetMap;
+exports.getWidgetsMapFromItemData = getWidgetsMapFromItemData;
 exports.globalConstants = globalConstants;
 exports.globalStyles = globalStyles;
 exports.icons = iconPaths;
@@ -45125,7 +45498,7 @@ exports.init = init;
 exports.injectWidgets = injectWidgets;
 exports.interactiveSizes = interactiveSizes$1;
 exports.isItemRenderableByVersion = isItemRenderableByVersion;
-exports.isWidgetKeyInContent = isWidgetKeyInContent;
+exports.isWidgetIdInContent = isWidgetIdInContent;
 exports.isWrongAnswerSupported = isWrongAnswerSupported;
 exports.itemDataVersion = itemDataVersion;
 exports.itemToTree = itemToTree;