@khanacademy/perseus 21.0.0 → 21.1.0

package/dist/index.js

@@ -25026,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, {
@@ -25039,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"),
@@ -28342,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
@@ -28567,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
   })));
 };
@@ -28931,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;
@@ -28946,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", {
@@ -29647,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({
@@ -29677,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 {
@@ -29702,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");
         }
@@ -29732,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
@@ -29756,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) => {
@@ -29843,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;
@@ -29856,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;
 }
 
@@ -29904,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":
@@ -29924,6 +30070,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 +30134,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 +30149,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 +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;
   }
@@ -30067,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);
   }
@@ -30074,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,
@@ -30108,7 +30321,7 @@ const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
   }), renderGraph({
     state,
     dispatch
-  }))));
+  })))));
 });
 
 const {
@@ -31275,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()
@@ -31809,7 +32023,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
@@ -42115,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 = "21.0.0";
+const libVersion = "21.1.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -44617,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":
@@ -44676,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.
  *
@@ -44686,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.
@@ -44705,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);
@@ -44817,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":