@khanacademy/perseus 21.0.0 → 21.2.0

package/dist/index.js

@@ -3281,6 +3281,15 @@ const textarea = {
  */
 const unescapeMathMode$1 = label => label.startsWith("$") && label.endsWith("$") ? label.slice(1, -1) : label;
 const random$1 = seededRNG$1(new Date().getTime() & 0xffffffff);
+
+// TODO(benchristel): in the future, we may want to make deepClone work for
+// Record<string, Cloneable> as well. Currently, it only does arrays.
+function deepClone(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map(deepClone);
+  }
+  return obj;
+}
 const Util = {
   inputPathsEqual,
   nestedMap: nestedMap$2,
@@ -3326,7 +3335,8 @@ const Util = {
   getDataUrl: getDataUrl,
   textarea,
   unescapeMathMode: unescapeMathMode$1,
-  random: random$1
+  random: random$1,
+  deepClone
 };
 
 // Derived from the MIT-licensed:
@@ -25026,9 +25036,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, {
@@ -25039,8 +25062,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"),
@@ -28342,6 +28366,36 @@ const moveAll = delta => ({
   type: MOVE_ALL,
   delta
 });
+const MOVE_POINT = "move-point";
+function movePoint(index, destination) {
+  return {
+    type: MOVE_POINT,
+    index,
+    destination
+  };
+}
+const CHANGE_SNAP_STEP = "change-snap-step";
+function changeSnapStep(snapStep) {
+  return {
+    type: CHANGE_SNAP_STEP,
+    snapStep
+  };
+}
+const CHANGE_RANGE = "change-range";
+function changeRange(range) {
+  return {
+    type: CHANGE_RANGE,
+    range
+  };
+}
+
+const GraphStateContext = /*#__PURE__*/React.createContext({
+  state: {},
+  dispatch: () => {}
+});
+function useGraphState() {
+  return React__default["default"].useContext(GraphStateContext);
+}
 
 /**
  * 44 is touch best practice and AAA compliant for WCAG
@@ -28368,6 +28422,11 @@ const normalizeCoords = (coordsList, ranges) => coordsList.map(coords => coords.
   const extent = ranges[i][1] - ranges[i][0];
   return (coord + ranges[i][1]) / extent;
 }));
+function snap(snapStep, point) {
+  const [requestedX, requestedY] = point;
+  const [snapX, snapY] = snapStep;
+  return [Math.round(requestedX / snapX) * snapX, Math.round(requestedY / snapY) * snapY];
+}
 
 const useTransform = function () {
   const {
@@ -28426,6 +28485,9 @@ const getLines = points => points.map((point, i) => {
 
 const defaultStroke = "var(--movable-line-stroke-color)";
 const MovableLine = props => {
+  const {
+    state
+  } = useGraphState();
   const {
     start,
     end,
@@ -28450,7 +28512,7 @@ const MovableLine = props => {
     onMove: newPoint => {
       onMove(mafs.vec.sub(newPoint, midpoint));
     },
-    constrain: p => p
+    constrain: p => snap(state.snapStep, p)
   });
   return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement("g", {
     ref: line,
@@ -28501,7 +28563,13 @@ function SVGLine(props) {
   });
 }
 
+// The hitbox size of 48px by 48px is preserved from the legacy interactive
+// graph.
+const hitboxSizePx = 48;
 const StyledMovablePoint = props => {
+  const {
+    state
+  } = useGraphState();
   const hitboxRef = React.useRef(null);
   const {
     point,
@@ -28514,7 +28582,7 @@ const StyledMovablePoint = props => {
     gestureTarget: hitboxRef,
     point,
     onMove,
-    constrain: p => p
+    constrain: p => snap(state.snapStep, p)
   });
   const [[x, y]] = useTransform(point);
   return /*#__PURE__*/React__namespace.createElement("g", {
@@ -28529,7 +28597,7 @@ const StyledMovablePoint = props => {
     }
   }, /*#__PURE__*/React__namespace.createElement("circle", {
     className: "movable-point-hitbox",
-    r: TARGET_SIZE / 2,
+    r: hitboxSizePx / 2,
     cx: x,
     cy: y
   }), /*#__PURE__*/React__namespace.createElement("circle", {
@@ -28567,7 +28635,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
   })));
 };
@@ -28863,7 +28933,8 @@ const PolygonGraph = props => {
     type,
     showAngles,
     showSides,
-    range
+    range,
+    snapStep
   } = props.graphState;
   const points = coords ?? [[0, 0]];
   const pointsSum = points.reduce((acc, point) => mafs.vec.add(acc, point), [0, 0]);
@@ -28878,7 +28949,7 @@ const PolygonGraph = props => {
       const delta = mafs.vec.sub(newPoint, midpoint);
       dispatch(moveAll(delta));
     },
-    constrain: p => p
+    constrain: p => snap(snapStep, p)
   });
   const active = hovered || focused || dragging;
   const lines = getLines(points);
@@ -28931,25 +29002,181 @@ 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
   })));
 };
 
-const renderLineLabel = (n, _ref) => {
-  let [min, max] = _ref;
-  return n !== -1 && n !== min && n !== max;
+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))
+  })));
+}
+
+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 tickSize = 10;
+const tickStyle = {
+  stroke: "black",
+  strokeWidth: 1
+};
+const YGridTick = _ref => {
+  let {
+    y
+  } = _ref;
+  const pointOnAxis = [0, y];
+  const [[xPosition, yPosition]] = useTransform(pointOnAxis);
+  return /*#__PURE__*/React__namespace.createElement("g", {
+    className: "y-axis-ticks"
+  }, /*#__PURE__*/React__namespace.createElement("line", {
+    x1: xPosition - tickSize / 2,
+    y1: yPosition,
+    x2: xPosition + tickSize / 2,
+    y2: yPosition,
+    style: tickStyle
+  }));
+};
+const XGridTick = _ref2 => {
+  let {
+    x
+  } = _ref2;
+  const pointOnAxis = [x, 0];
+  const [[xPosition, yPosition]] = useTransform(pointOnAxis);
+  return /*#__PURE__*/React__namespace.createElement("g", {
+    className: "x-axis-ticks"
+  }, /*#__PURE__*/React__namespace.createElement("line", {
+    x1: xPosition,
+    y1: yPosition + tickSize / 2,
+    x2: xPosition,
+    y2: yPosition - tickSize / 2,
+    style: tickStyle
+  }));
+};
+function generateTickLocations(tickStep, min, max) {
+  const ticks = [];
+  for (let i = 0 + tickStep; i < max; i += tickStep) {
+    ticks.push(i);
+  }
+  for (let i = 0 - tickStep; i > min; i -= tickStep) {
+    ticks.push(i);
+  }
+  return ticks;
+}
+const AxisTicks = props => {
+  const range = props.range;
+  const [xMin, xMax] = range[0];
+  const [yMin, yMax] = range[1];
+  const yTickStep = props.tickStep[1];
+  const xTickStep = props.tickStep[0];
+  const yGridTicks = generateTickLocations(yTickStep, yMin, yMax);
+  const xGridTicks = generateTickLocations(xTickStep, xMin, xMax);
+  return /*#__PURE__*/React__namespace.createElement("g", {
+    className: "axis-ticks"
+  }, yGridTicks.map(y => {
+    return /*#__PURE__*/React__namespace.createElement(YGridTick, {
+      y: y,
+      key: `y-grid-tick-${y}`
+    });
+  }), xGridTicks.map(x => {
+    return /*#__PURE__*/React__namespace.createElement(XGridTick, {
+      x: x,
+      key: `x-grid-tick-${x}`
+    });
+  }));
+};
+
+/**
+ * lineLabelText get the text that should
+ * be displayed for a specific tick place
+ *
+ * @param {number} n the tick number
+ * @param {number} tickStep how frequently a label should appear
+ * @param {vec.Vector2} range the min/max range on the axis
+ */
+const lineLabelText = (n, tickStep, range) => {
+  const [min, max] = range;
+  const isOnStep = n % tickStep === 0;
+  const isNegativeOne = n === -1;
+  const isMin = n === min;
+  const isMax = n === max;
+  const shouldRender = isOnStep && !isNegativeOne && !isMin && !isMax;
+  return shouldRender ? `${n}` : "";
+};
+
+/**
+ * axisOptions determine axis options for Mafs
+ *
+ * axisIndex is for grabbing data in an array that contains
+ * data for multiple axes. For example range: [[-10, 10], [-10, 10]]
+ * range[0] is data for the x axis and range[1] is data for the y axis
+ *
+ * @param {GridProps} props
+ * @param {number} axisIndex which axis we're getting options for
+ */
+const axisOptions = (props, axisIndex) => {
+  const axisStep = props.tickStep[axisIndex];
+  const axisRange = props.range[axisIndex];
+  return {
+    axis: props.markings === "graph",
+    lines: props.gridStep[axisIndex],
+    labels: n => lineLabelText(n, axisStep, axisRange)
+  };
+};
+const Grid = props => {
+  return 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)
+  }), /*#__PURE__*/React__namespace.createElement(AxisTicks, {
+    range: props.range,
+    tickStep: props.tickStep
+  }), props.markings === "graph" && /*#__PURE__*/React__namespace.createElement(AxisArrows, null));
 };
-const axisOptions = (props, index) => ({
-  axis: props.markings === "graph",
-  lines: props.step[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, {
-  xAxis: axisOptions(props, 0),
-  yAxis: axisOptions(props, 1)
-});
 
 // Displays a stylized open eye: lint warnings are visible
 const VisibleIcon = () => /*#__PURE__*/React__namespace.createElement("svg", {
@@ -29647,53 +29874,50 @@ 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);
+    case CHANGE_SNAP_STEP:
+      return doChangeSnapStep(state, action);
+    case CHANGE_RANGE:
+      return doChangeRange(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({
             array: tuple,
             index: action.pointIndex,
-            newValue: snap({
-              snapStep,
-              point: bound$1({
-                snapStep,
-                range,
-                point: action.destination
-              })
-            })
-          })
-        }) : setAtIndex({
-          array: state.coords,
-          index: action.pointIndex,
-          newValue: snap({
-            snapStep,
-            point: bound$1({
+            newValue: snap(snapStep, 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 {
@@ -29702,15 +29926,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");
         }
@@ -29718,13 +29957,7 @@ function interactiveGraphReducer(state, action) {
           snapStep,
           range
         });
-        const newLine = [snap({
-          snapStep,
-          point: mafs.vec.add(currentLine[0], change)
-        }), snap({
-          snapStep,
-          point: mafs.vec.add(currentLine[1], change)
-        })];
+        const newLine = [snap(snapStep, mafs.vec.add(currentLine[0], change)), snap(snapStep, mafs.vec.add(currentLine[1], change))];
         const newCoords = setAtIndex({
           array: state.coords,
           index: action.itemIndex,
@@ -29732,23 +29965,30 @@ 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
         });
-        const newCoords = state.coords.map(point => snap({
-          snapStep,
-          point: mafs.vec.add(point, change)
-        }));
+        const newCoords = state.coords.map(point => snap(snapStep, mafs.vec.add(point, change)));
         return {
           ...state,
           hasBeenInteractedWith: true,
@@ -29756,8 +29996,54 @@ 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(state.snapStep, 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");
+  }
+}
+function doChangeSnapStep(state, action) {
+  if (
+  // Deep equality check since these are arrays
+  ___default["default"].isEqual(state.snapStep, action.snapStep)) {
+    return state;
+  }
+  return {
+    ...state,
+    snapStep: action.snapStep
+  };
+}
+function doChangeRange(state, action) {
+  if (
+  // Deep equality check since these are arrays
+  ___default["default"].isEqual(state.range, action.range)) {
+    return state;
   }
+  return {
+    ...state,
+    range: action.range
+  };
 }
 const getChange = (coords, delta, constraintOpts) => {
   const [deltaX, deltaY] = delta;
@@ -29777,24 +30063,14 @@ const getChange = (coords, delta, constraintOpts) => {
   const dy = clamp(deltaY, minYMove, maxYMove);
   return [dx, dy];
 };
-function snap(_ref) {
-  let {
-    snapStep,
-    point
-  } = _ref;
-  const [requestedX, requestedY] = point;
-  const [snapX, snapY] = snapStep;
-  return [Math.round(requestedX / snapX) * snapX, Math.round(requestedY / snapY) * snapY];
-}
-
 // Returns the closest point to the given `point` that is within the graph
 // bounds given in `state`.
-function bound$1(_ref2) {
+function bound$1(_ref) {
   let {
     snapStep,
     range,
     point
-  } = _ref2;
+  } = _ref;
   const [requestedX, requestedY] = point;
   const [snapX, snapY] = snapStep;
   const [[minX, maxX], [minY, maxY]] = range;
@@ -29802,12 +30078,12 @@ function bound$1(_ref2) {
 }
 
 // Returns the vector from the given point to the top-right corner of the graph
-function maxMove(_ref3) {
+function maxMove(_ref2) {
   let {
     snapStep,
     range,
     point
-  } = _ref3;
+  } = _ref2;
   const topRight = bound$1({
     snapStep,
     range,
@@ -29818,12 +30094,12 @@ function maxMove(_ref3) {
 
 // Returns the vector from the given point to the bottom-left corner of the
 // graph
-function minMove(_ref4) {
+function minMove(_ref3) {
   let {
     snapStep,
     range,
     point
-  } = _ref4;
+  } = _ref3;
   const bottomLeft = bound$1({
     snapStep,
     range,
@@ -29843,7 +30119,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;
@@ -29856,13 +30132,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;
 }
 
@@ -29904,18 +30179,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":
@@ -29924,6 +30212,46 @@ 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.
@@ -29948,13 +30276,13 @@ function getGradableGraph(state, initialGraph) {
   if (state.type === "linear" && initialGraph.type === "linear") {
     return {
       ...initialGraph,
-      coords: state.coords?.[0]
+      coords: state.coords[0]
     };
   }
   if (state.type === "ray" && initialGraph.type === "ray") {
     return {
       ...initialGraph,
-      coords: state.coords?.[0]
+      coords: state.coords[0]
     };
   }
   if (state.type === "polygon" && initialGraph.type === "polygon") {
@@ -29963,14 +30291,20 @@ function getGradableGraph(state, 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:
@@ -29996,24 +30330,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;
   }
@@ -30067,6 +30401,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);
   }
@@ -30074,10 +30415,36 @@ 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]);
+
+  // Destructuring first to keep useEffect from making excess calls
+  const [xSnap, ySnap] = props.snapStep;
+  React.useEffect(() => {
+    dispatch(changeSnapStep([xSnap, ySnap]));
+  }, [xSnap, ySnap]);
+
+  // Destructuring first to keep useEffect from making excess calls
+  const [[xMinRange, xMaxRange], [yMinRange, yMaxRange]] = props.range;
+  React.useEffect(() => {
+    dispatch(changeRange([[xMinRange, xMaxRange], [yMinRange, yMaxRange]]));
+  }, [xMinRange, xMaxRange, yMinRange, yMaxRange]);
   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,
@@ -30103,12 +30470,18 @@ const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
     zoom: false,
     width: width,
     height: height
-  }, /*#__PURE__*/React__namespace.createElement(SvgDefs, null), /*#__PURE__*/React__namespace.createElement(Grid, props), props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
+  }, /*#__PURE__*/React__namespace.createElement(SvgDefs, null), /*#__PURE__*/React__namespace.createElement(Grid, {
+    tickStep: props.step,
+    gridStep: props.gridStep,
+    range: props.range,
+    containerSizeClass: props.containerSizeClass,
+    markings: props.markings
+  }), props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
     lockedFigures: props.lockedFigures
   }), renderGraph({
     state,
     dispatch
-  }))));
+  })))));
 });
 
 const {
@@ -31275,6 +31648,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()
@@ -31809,7 +32183,7 @@ class InteractiveGraph extends React__namespace.Component {
         }
       } else if (userInput.type === "point" && rubric.correct.type === "point" && userInput.coords != null) {
         let correct = InteractiveGraph.getPointCoords(rubric.correct, component);
-        const guess = userInput.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
@@ -31852,8 +32226,8 @@ class InteractiveGraph extends React__namespace.Component {
           };
         }
       } else if (userInput.type === "segment" && rubric.correct.type === "segment" && userInput.coords != null) {
-        let guess = userInput.coords.slice();
-        let correct = rubric.correct.coords?.slice();
+        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();
@@ -42115,7 +42489,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "21.0.0";
+const libVersion = "21.2.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -43244,6 +43618,9 @@ const ItemExtras = [
 // A background image applied to various widgets.
 
 const PerseusExpressionAnswerFormConsidered = ["correct", "wrong", "ungraded"];
+
+// 2D range: xMin, xMax, yMin, yMax
+
 const plotterPlotTypes = ["bar", "line", "pic", "histogram", "dotplot"];
 
 /**
@@ -44617,7 +44994,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":
@@ -44676,6 +45053,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.
  *
@@ -44686,7 +45088,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.
@@ -44705,11 +45107,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);
@@ -44817,7 +45230,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":