@khanacademy/perseus 20.8.0 → 21.0.0

package/dist/index.js

@@ -12,9 +12,8 @@ var classNames = require('classnames');
 var React = require('react');
 var _ = require('underscore');
 var Clickable = require('@khanacademy/wonder-blocks-clickable');
-var Color = require('@khanacademy/wonder-blocks-color');
 var wonderBlocksPopover = require('@khanacademy/wonder-blocks-popover');
-var Spacing = require('@khanacademy/wonder-blocks-spacing');
+var wonderBlocksTokens = require('@khanacademy/wonder-blocks-tokens');
 var aphrodite = require('aphrodite');
 var $ = require('jquery');
 var PropTypes = require('prop-types');
@@ -33,7 +32,6 @@ var caretDown = require('@phosphor-icons/core/assets/regular/caret-down.svg');
 var caretUp = require('@phosphor-icons/core/assets/regular/caret-up.svg');
 var debounce$1 = require('lodash.debounce');
 var mafs = require('mafs');
-var wonderBlocksTokens = require('@khanacademy/wonder-blocks-tokens');
 var wonderBlocksIcon = require('@khanacademy/wonder-blocks-icon');
 var questionIcon = require('@phosphor-icons/core/regular/question.svg');
 var wonderBlocksTypography = require('@khanacademy/wonder-blocks-typography');
@@ -73,8 +71,6 @@ var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
 var Clickable__default = /*#__PURE__*/_interopDefaultLegacy(Clickable);
-var Color__default = /*#__PURE__*/_interopDefaultLegacy(Color);
-var Spacing__default = /*#__PURE__*/_interopDefaultLegacy(Spacing);
 var $__default = /*#__PURE__*/_interopDefaultLegacy($);
 var PropTypes__default = /*#__PURE__*/_interopDefaultLegacy(PropTypes);
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
@@ -361,16 +357,16 @@ const MathInputIcon = _ref => {
     focused,
     active
   } = _ref;
-  let color;
+  let fillColor;
   switch (true) {
     case focused || active:
-      color = Color__default["default"].white;
+      fillColor = wonderBlocksTokens.color.white;
       break;
     case hovered:
-      color = Color__default["default"].blue;
+      fillColor = wonderBlocksTokens.color.blue;
       break;
     default:
-      color = Color__default["default"].offBlack;
+      fillColor = wonderBlocksTokens.color.offBlack;
       break;
   }
   const dynamicClass = active || focused ? styles$D.iconActive : styles$D.iconInactive;
@@ -380,7 +376,7 @@ const MathInputIcon = _ref => {
     xmlns: "http://www.w3.org/2000/svg",
     width: "16",
     height: "16",
-    fill: color,
+    fill: fillColor,
     viewBox: "0 0 256 256"
   }, /*#__PURE__*/React__namespace.createElement("path", {
     d: "M112,72a8,8,0,0,1-8,8H40a8,8,0,0,1,0-16h64A8,8,0,0,1,112,72Zm-8,104H80V152a8,8,0,0,0-16,0v24H40a8,8,0,0,0,0,16H64v24a8,8,0,0,0,16,0V192h24a8,8,0,0,0,0-16Zm48,0h64a8,8,0,0,0,0-16H152a8,8,0,0,0,0,16Zm64,16H152a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16Zm-61.66-90.34a8,8,0,0,0,11.32,0L184,83.31l18.34,18.35a8,8,0,0,0,11.32-11.32L195.31,72l18.35-18.34a8,8,0,0,0-11.32-11.32L184,60.69,165.66,42.34a8,8,0,0,0-11.32,11.32L172.69,72,154.34,90.34A8,8,0,0,0,154.34,101.66Z"
@@ -417,7 +413,7 @@ const mapButtonSets = buttonSets => {
 };
 const inputFocused = {
   borderWidth: 2,
-  borderColor: Color__default["default"].blue,
+  borderColor: wonderBlocksTokens.color.blue,
   margin: -1
 };
 const styles$D = aphrodite.StyleSheet.create({
@@ -425,35 +421,35 @@ const styles$D = aphrodite.StyleSheet.create({
     display: "flex",
     justifyContent: "center",
     height: "100%",
-    padding: Spacing__default["default"].xxxSmall_4,
+    padding: wonderBlocksTokens.spacing.xxxSmall_4,
     borderRadius: 1
   },
   iconInactive: {
-    backgroundColor: Color__default["default"].offBlack8
+    backgroundColor: wonderBlocksTokens.color.offBlack8
   },
   iconActive: {
-    backgroundColor: Color__default["default"].offBlack64
+    backgroundColor: wonderBlocksTokens.color.offBlack64
   },
   outerWrapper: {
     display: "inline-block",
     borderStyle: "solid",
     borderWidth: 1,
-    borderColor: Color__default["default"].offBlack50,
+    borderColor: wonderBlocksTokens.color.offBlack50,
     borderRadius: 3,
-    background: Color__default["default"].white,
+    background: wonderBlocksTokens.color.white,
     ":hover": inputFocused
   },
   wrapperFocused: inputFocused,
   wrapperError: {
-    borderColor: Color__default["default"].red,
-    background: Color.fade(Color__default["default"].red, 0.08),
+    borderColor: wonderBlocksTokens.color.red,
+    background: wonderBlocksTokens.color.fadedRed8,
     ":hover": {
-      borderColor: Color__default["default"].red
+      borderColor: wonderBlocksTokens.color.red
     }
   },
   popoverContent: {
     padding: 0,
-    paddingBottom: Spacing__default["default"].xxSmall_6,
+    paddingBottom: wonderBlocksTokens.spacing.xxSmall_6,
     maxWidth: "initial"
   }
 });
@@ -18894,7 +18890,7 @@ const isAccessible = widgetInfo => {
   }
   return !!accessible;
 };
-const getAllWidgetTypes$1 = () => {
+const getAllWidgetTypes = () => {
   return ___default["default"].keys(widgets);
 };
 const upgradeWidgetInfoToLatestVersion = oldWidgetInfo => {
@@ -19166,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,
@@ -19564,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) {
@@ -21863,13 +21862,13 @@ const styles$A = aphrodite.StyleSheet.create({
     width: 40
   },
   leftAlign: {
-    paddingLeft: Spacing__default["default"].xxxSmall_4,
+    paddingLeft: wonderBlocksTokens.spacing.xxxSmall_4,
     paddingRight: 0
   },
   rightAlign: {
     textAlign: "right",
     paddingLeft: 0,
-    paddingRight: Spacing__default["default"].xxxSmall_4
+    paddingRight: wonderBlocksTokens.spacing.xxxSmall_4
   },
   answerStateUnanswered: {
     backgroundColor: "#eee",
@@ -22966,17 +22965,17 @@ function getDynamicStyles(checked, showCorrectness, pressed, multipleSelect, cor
   let borderColor;
   let color;
   if (!showCorrectness && pressed) {
-    borderColor = Color__default["default"].blue;
-    color = Color__default["default"].blue;
+    borderColor = wonderBlocksTokens.color.blue;
+    color = wonderBlocksTokens.color.blue;
     backgroundColor = "transparent";
   } else if (checked) {
-    const bg = showCorrectness && correct ? Color__default["default"].green : Color__default["default"].blue;
+    const bg = showCorrectness && correct ? wonderBlocksTokens.color.green : wonderBlocksTokens.color.blue;
     color = white$1;
     backgroundColor = bg;
     borderColor = bg;
   } else {
-    borderColor = Color__default["default"].offBlack64;
-    color = Color__default["default"].offBlack64;
+    borderColor = wonderBlocksTokens.color.offBlack64;
+    color = wonderBlocksTokens.color.offBlack64;
   }
 
   // define shape
@@ -23010,7 +23009,7 @@ const ChoiceIcon = function (props) {
   return /*#__PURE__*/React__namespace.createElement("div", {
     className: aphrodite.css(styles$y.iconWrapper)
   }, /*#__PURE__*/React__namespace.createElement(FocusRing, {
-    color: Color__default["default"].blue,
+    color: wonderBlocksTokens.color.blue,
     visible: focused || hovered,
     multipleSelect: multipleSelect
   }, /*#__PURE__*/React__namespace.createElement("div", {
@@ -23075,9 +23074,9 @@ const styles$w = aphrodite.StyleSheet.create({
     color: gray68
   },
   circleIncorrectAnswered: {
-    backgroundColor: Color__default["default"].red,
-    borderColor: Color__default["default"].red,
-    color: Color__default["default"].white
+    backgroundColor: wonderBlocksTokens.color.red,
+    borderColor: wonderBlocksTokens.color.red,
+    color: wonderBlocksTokens.color.white
   }
 });
 
@@ -23145,13 +23144,13 @@ const styles$v = aphrodite.StyleSheet.create({
     textTransform: "uppercase"
   },
   correct: {
-    color: Color__default["default"].green
+    color: wonderBlocksTokens.color.green
   },
   incorrectAnswered: {
-    color: Color__default["default"].red
+    color: wonderBlocksTokens.color.red
   },
   incorrect: {
-    color: Color__default["default"].offBlack64
+    color: wonderBlocksTokens.color.offBlack64
   }
 });
 
@@ -23225,7 +23224,7 @@ const Choice = function (props) {
       // @ts-expect-error - TS2322 - Type '{ dispay: string; flexDirection: "column"; color: string; }' is not assignable to type 'Properties<string | number, string & {}>'.
       dispay: "flex",
       flexDirection: "column",
-      color: Color__default["default"].offBlack
+      color: wonderBlocksTokens.color.offBlack
     },
     className: descriptionClassName
   }, /*#__PURE__*/React__namespace.createElement("div", {
@@ -23268,7 +23267,7 @@ const Choice = function (props) {
     disabled: disabled || apiOptions.readOnly,
     style: {
       flex: 1,
-      color: Color__default["default"].offBlack,
+      color: wonderBlocksTokens.color.offBlack,
       userSelect: "text"
     },
     ref: forwardedRef,
@@ -23285,9 +23284,9 @@ const Choice = function (props) {
         flexDirection: "row",
         justifyContent: "center",
         alignContent: "center",
-        paddingTop: Spacing__default["default"].xSmall_8,
-        paddingBottom: Spacing__default["default"].xSmall_8,
-        paddingLeft: Spacing__default["default"].xSmall_8
+        paddingTop: wonderBlocksTokens.spacing.xSmall_8,
+        paddingBottom: wonderBlocksTokens.spacing.xSmall_8,
+        paddingLeft: wonderBlocksTokens.spacing.xSmall_8
       }
     }, /*#__PURE__*/React__namespace.createElement(ChoiceIcon, {
       pos: pos,
@@ -23303,7 +23302,7 @@ const Choice = function (props) {
       previouslyAnswered: previouslyAnswered
     }), /*#__PURE__*/React__namespace.createElement("span", {
       style: {
-        paddingLeft: Spacing__default["default"].small_12,
+        paddingLeft: wonderBlocksTokens.spacing.small_12,
         textAlign: "left",
         flex: 1,
         paddingTop: 4
@@ -23326,7 +23325,7 @@ const Choice = function (props) {
         content: i18n__namespace._("Cross out option"),
         closeButtonVisible: true,
         actions: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksLayout.Strut, {
-          size: Spacing__default["default"].medium_16
+          size: wonderBlocksTokens.spacing.medium_16
         }), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
           kind: "primary",
           "aria-label": i18n__namespace._("Cross out Choice %(letter)s", {
@@ -23374,7 +23373,7 @@ const Choice = function (props) {
       return /*#__PURE__*/React__namespace.createElement(Icon, {
         icon: ellipsisHorizontalIcon,
         size: 3,
-        color: Color__default["default"].offBlack64
+        color: wonderBlocksTokens.color.offBlack64
       });
     });
   })), showRationale && /*#__PURE__*/React__namespace.createElement("div", {
@@ -23392,7 +23391,7 @@ const styles$u = aphrodite.StyleSheet.create({
     padding: intermediateCheckboxPadding,
     paddingTop: 0,
     marginLeft: 54,
-    color: Color__default["default"].offBlack64,
+    color: wonderBlocksTokens.color.offBlack64,
     [mediaQueries.smOrSmaller]: {
       padding: intermediateCheckboxPaddingPhone,
       paddingTop: 0
@@ -24818,8 +24817,8 @@ class Definition extends React__namespace.Component {
         } = _ref2;
         return /*#__PURE__*/React__namespace.createElement("span", {
           style: {
-            color: Color__default["default"].blue,
-            borderBottom: hovered || focused || pressed ? `2px solid ${Color__default["default"].blue}` : "none"
+            color: wonderBlocksTokens.color.blue,
+            borderBottom: hovered || focused || pressed ? `2px solid ${wonderBlocksTokens.color.blue}` : "none"
           }
         }, this.props.togglePrompt);
       }));
@@ -24828,7 +24827,7 @@ class Definition extends React__namespace.Component {
 }
 const styles$q = {
   tooltipBody: {
-    color: Color__default["default"].offBlack,
+    color: wonderBlocksTokens.color.offBlack,
     fontSize: 20,
     fontWeight: 500,
     lineHeight: "30px"
@@ -25126,7 +25125,7 @@ class GradedGroupAnswerBar extends React__namespace.Component {
     } = this.props;
     const answerBarStyle = {
       ...styles$o.answerBar,
-      backgroundColor: answerBarState === "CORRECT" ? Color__default["default"].offWhite : "white",
+      backgroundColor: answerBarState === "CORRECT" ? wonderBlocksTokens.color.offWhite : "white",
       // Center the "Correct!" message only when there's no next question
       justifyContent: answerBarState === "CORRECT" && !onNextQuestion ? "center" : "space-between"
     };
@@ -25156,7 +25155,7 @@ class GradedGroupAnswerBar extends React__namespace.Component {
     }, /*#__PURE__*/React__namespace.createElement("span", {
       style: {
         fontSize: 28,
-        color: Color__default["default"].green
+        color: wonderBlocksTokens.color.green
       }
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon, _extends({}, iconStar, {
       style: {
@@ -25186,7 +25185,7 @@ const styles$o = {
     marginTop: phoneMargin,
     paddingLeft: phoneMargin,
     paddingRight: 10,
-    borderTop: `1px solid ${Color__default["default"].offBlack50}`
+    borderTop: `1px solid ${wonderBlocksTokens.color.offBlack50}`
   },
   tryAgainIcon: {
     fontSize: 28,
@@ -25494,7 +25493,7 @@ const styles$n = aphrodite.StyleSheet.create({
     padding: 0,
     border: "none",
     marginTop: 20,
-    color: Color__default["default"].blue,
+    color: wonderBlocksTokens.color.blue,
     cursor: "pointer",
     display: "block",
     clear: "both"
@@ -25502,7 +25501,7 @@ const styles$n = aphrodite.StyleSheet.create({
   explanationTitle: {
     backgroundColor: "unset",
     marginTop: 20,
-    color: Color__default["default"].blue,
+    color: wonderBlocksTokens.color.blue,
     marginBottom: 10,
     cursor: "pointer",
     fontSize: 14,
@@ -25718,7 +25717,7 @@ const styles$m = aphrodite.StyleSheet.create({
   },
   title: {
     fontSize: 12,
-    color: Color__default["default"].offBlack64,
+    color: wonderBlocksTokens.color.offBlack64,
     textTransform: "uppercase",
     marginBottom: 11,
     letterSpacing: 0.8
@@ -25752,7 +25751,7 @@ const styles$m = aphrodite.StyleSheet.create({
     height: 10,
     borderRadius: "100%",
     borderWidth: 2,
-    borderColor: Color__default["default"].blue,
+    borderColor: wonderBlocksTokens.color.blue,
     borderStyle: "solid"
   },
   indicatorDotFocused: {
@@ -25760,7 +25759,7 @@ const styles$m = aphrodite.StyleSheet.create({
     borderStyle: "double"
   },
   indicatorDotActive: {
-    backgroundColor: Color__default["default"].blue,
+    backgroundColor: wonderBlocksTokens.color.blue,
     width: "100%",
     height: "100%"
   },
@@ -28370,6 +28369,61 @@ const normalizeCoords = (coordsList, ranges) => coordsList.map(coords => coords.
   return (coord + ranges[i][1]) / extent;
 }));
 
+const useTransform = function () {
+  const {
+    viewTransform,
+    userTransform
+  } = mafs.useTransformContext();
+  const transformToPx = mafs.vec.matrixMult(viewTransform, userTransform);
+  for (var _len = arguments.length, points = new Array(_len), _key = 0; _key < _len; _key++) {
+    points[_key] = arguments[_key];
+  }
+  const transformedPoints = points.map(point => mafs.vec.transform(point, transformToPx));
+  return transformedPoints;
+};
+
+/**
+ * Given two points, find the tips that extends through the points to the edge of the range.
+ * @param collinearPoint - The point that the line passes through. Needed to establish slope.
+ * @param extendFrom - The point that the line extends from to the edge of the graph.
+ */
+const getRayIntersectionCoords = (collinearPoint, extendFrom, range) => {
+  // edges of the graph
+  const [[xMin, xMax], [yMin, yMax]] = range;
+  const [aX, aY] = collinearPoint;
+  const [bX, bY] = extendFrom;
+  const yDiff = bY - aY;
+  const xDiff = bX - aX;
+  const slope = yDiff / xDiff;
+  const yAtXMin = slope * (xMin - aX) + aY;
+  const yAtXMax = slope * (xMax - aX) + aY;
+  const xAtYMin = (yMin - aY) / slope + aX;
+  const xAtYMax = (yMax - aY) / slope + aX;
+
+  // clock analogy to describe quadrants
+  switch (true) {
+    // 12 o'clock to 2:59
+    case yDiff > 0 && xDiff >= 0:
+      return xAtYMax > xMax ? [xMax, yAtXMax] : [xAtYMax, yMax];
+    // 3 o'clock to 5:59
+    case yDiff <= 0 && xDiff > 0:
+      // xAtYMin evaluates to -Infinity here, so we use absolute value
+      return Math.abs(xAtYMin) > xMax ? [xMax, yAtXMax] : [xAtYMin, yMin];
+    // 9 o'clock to 11:59
+    case yDiff >= 0 && xDiff < 0:
+      return xAtYMax < xMin ? [xMin, yAtXMin] : [xAtYMax, yMax];
+    // 6 o'clock to 8:59
+    case yDiff < 0 && xDiff <= 0:
+      return xAtYMin < xMin ? [xMin, yAtXMin] : [xAtYMin, yMin];
+    default:
+      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 => {
   const {
@@ -28380,18 +28434,12 @@ const MovableLine = props => {
     stroke = defaultStroke
   } = props;
   const midpoint = mafs.vec.midpoint(start, end);
-  const {
-    viewTransform,
-    userTransform
-  } = mafs.useTransformContext();
-  const transformToPx = mafs.vec.matrixMult(viewTransform, userTransform);
-  const startPtPx = mafs.vec.transform(start, transformToPx);
-  const endPtPx = mafs.vec.transform(end, transformToPx);
+  const [startPtPx, endPtPx] = useTransform(start, end);
   let startExtend = undefined;
   let endExtend = undefined;
   if (extend) {
-    startExtend = extend.start ? getExtensionCoords(end, start, extend.range) : undefined;
-    endExtend = extend.end ? getExtensionCoords(start, end, extend.range) : undefined;
+    startExtend = extend.start ? getRayIntersectionCoords(end, start, extend.range) : undefined;
+    endExtend = extend.end ? getRayIntersectionCoords(start, end, extend.range) : undefined;
   }
   const line = React.useRef(null);
   const {
@@ -28453,50 +28501,12 @@ function SVGLine(props) {
   });
 }
 
-/**
- * Given two points, find the tips that extends through the points to the edge of the range.
- * @param collinearPoint - The point that the line passes through. Needed to establish slope.
- * @param extendFrom - The point that the line extends from to the edge of the graph.
- */
-const getExtensionCoords = (collinearPoint, extendFrom, range) => {
-  // edges of the graph
-  const [[xMin, xMax], [yMin, yMax]] = range;
-  const [aX, aY] = collinearPoint;
-  const [bX, bY] = extendFrom;
-  const yDiff = bY - aY;
-  const xDiff = bX - aX;
-  const slope = yDiff / xDiff;
-  const yAtXMin = slope * (xMin - aX) + aY;
-  const yAtXMax = slope * (xMax - aX) + aY;
-  const xAtYMin = (yMin - aY) / slope + aX;
-  const xAtYMax = (yMax - aY) / slope + aX;
-
-  // clock analogy to describe quadrants
-  switch (true) {
-    // 12 o'clock to 2:59
-    case yDiff > 0 && xDiff >= 0:
-      return xAtYMax > xMax ? [xMax, yAtXMax] : [xAtYMax, yMax];
-    // 3 o'clock to 5:59
-    case yDiff <= 0 && xDiff > 0:
-      // xAtYMin evaluates to -Infinity here, so we use absolute value
-      return Math.abs(xAtYMin) > xMax ? [xMax, yAtXMax] : [xAtYMin, yMin];
-    // 9 o'clock to 11:59
-    case yDiff >= 0 && xDiff < 0:
-      return xAtYMax < xMin ? [xMin, yAtXMin] : [xAtYMax, yMax];
-    // 6 o'clock to 8:59
-    case yDiff < 0 && xDiff <= 0:
-      return xAtYMin < xMin ? [xMin, yAtXMin] : [xAtYMin, yMin];
-    default:
-      return [xMax, yAtXMax];
-  }
-};
-
 const StyledMovablePoint = props => {
   const hitboxRef = React.useRef(null);
   const {
     point,
     onMove,
-    color = Color__default["default"].blue
+    color = wonderBlocksTokens.color.blue
   } = props;
   const {
     dragging
@@ -28506,12 +28516,7 @@ const StyledMovablePoint = props => {
     onMove,
     constrain: p => p
   });
-  const {
-    viewTransform,
-    userTransform
-  } = mafs.useTransformContext();
-  const transformToPx = mafs.vec.matrixMult(viewTransform, userTransform);
-  const [x, y] = mafs.vec.transform(point, transformToPx);
+  const [[x, y]] = useTransform(point);
   return /*#__PURE__*/React__namespace.createElement("g", {
     ref: hitboxRef,
     className: "movable-point",
@@ -28678,6 +28683,175 @@ 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,
+    polygonLines,
+    showAngles
+  } = _ref;
+  const [centerX, centerY] = centerPoint;
+  const areClockwise = clockwise$1([centerPoint, ...endPoints]);
+  const [[startX, startY], [endX, endY]] = areClockwise ? endPoints : endPoints.reverse();
+  const radius = 0.3;
+  const a = mafs.vec.dist(centerPoint, endPoints[0]);
+  const b = mafs.vec.dist(centerPoint, endPoints[1]);
+  const c = mafs.vec.dist(endPoints[0], endPoints[1]);
+
+  // Law of cosines
+  const angle = Math.acos((a ** 2 + b ** 2 - c ** 2) / (2 * a * b));
+  const y1 = centerY + (startY - centerY) / a * radius;
+  const x2 = centerX + (endX - centerX) / b * radius;
+  const x1 = centerX + (startX - centerX) / a * radius;
+  const y2 = centerY + (endY - centerY) / b * radius;
+
+  // Fourth point that would create a rhomboid
+  // 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(RightAngleSquare, {
+      start: [x1, y1],
+      vertex: [x2, y2],
+      end: [x3, y3]
+    }) : null;
+  }
+
+  // Midpoint betwen ends of arc
+  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 (isOutside) {
+    angleInDegrees = 360 - angleInDegrees;
+  }
+  const angleLabelNumber = parseFloat(angleInDegrees.toFixed(1));
+  const angleLabel = Number.isInteger(angleLabelNumber) ? angleLabelNumber : "≈ " + angleLabelNumber;
+  return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement("defs", null, /*#__PURE__*/React__namespace.createElement("filter", {
+    id: "background",
+    x: "-5%",
+    width: "110%",
+    y: "0%",
+    height: "100%"
+  }, /*#__PURE__*/React__namespace.createElement("feFlood", {
+    floodColor: "#FFF",
+    floodOpacity: "0.5"
+  }), /*#__PURE__*/React__namespace.createElement("feComposite", {
+    operator: "over",
+    in: "SourceGraphic"
+  }))), !isOutside && isRightAngle(angle) ? /*#__PURE__*/React__namespace.createElement(RightAngleSquare, {
+    start: [x1, y1],
+    vertex: [x2, y2],
+    end: [x3, y3]
+  }) : /*#__PURE__*/React__namespace.createElement(MafsCssTransformWrapper, null, /*#__PURE__*/React__namespace.createElement("path", {
+    d: arc,
+    strokeWidth: 0.02,
+    fill: "none"
+  })), /*#__PURE__*/React__namespace.createElement(TextLabel, {
+    x: x3,
+    y: y3,
+    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"));
+};
+
+/**
+ * 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(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;
+
+/**
+ * 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(lineIntersectionCount);
+};
+
+// https://stackoverflow.com/a/24392281/7347484
+// The "intersects" function in geometry doesn't seem to work for this use case
+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;
+  } else {
+    const lambda = ((s - q) * (r - a) + (p - r) * (s - b)) / determinant;
+    const gamma = ((b - d) * (r - a) + (c - a) * (s - b)) / determinant;
+    return 0 < lambda && lambda < 1 && 0 < gamma && gamma < 1;
+  }
+};
+const isEven = n => n % 2 === 0;
+
 const PolygonGraph = props => {
   const [focused, setFocused] = React__namespace.useState(false);
   const [hovered, setHovered] = React__namespace.useState(false);
@@ -28686,7 +28860,10 @@ const PolygonGraph = props => {
   } = props;
   const {
     coords,
-    type
+    type,
+    showAngles,
+    showSides,
+    range
   } = props.graphState;
   const points = coords ?? [[0, 0]];
   const pointsSum = points.reduce((acc, point) => mafs.vec.add(acc, point), [0, 0]);
@@ -28704,12 +28881,37 @@ 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)",
     svgPolygonProps: {
       strokeWidth: active ? "var(--movable-line-stroke-weight-active)" : "var(--movable-line-stroke-weight)"
     }
+  }), points.map((point, i) => {
+    const pt1 = points.at(i - 1);
+    const pt2 = points[(i + 1) % points.length];
+    if (!pt1 || !pt2) {
+      return null;
+    }
+    return /*#__PURE__*/React__namespace.createElement(Angle, {
+      key: "angle-" + i,
+      centerPoint: point,
+      endPoints: [pt1, pt2],
+      active: active,
+      range: range,
+      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",
@@ -28727,7 +28929,7 @@ const PolygonGraph = props => {
       className: "movable-polygon"
     }
   }), points.map((point, i) => /*#__PURE__*/React__namespace.createElement(StyledMovablePoint, {
-    key: i,
+    key: "point-" + i,
     point: point,
     onMove: destination => dispatch(moveControlPoint(i, destination)),
     "data-testid": type + i
@@ -29409,7 +29611,11 @@ var components = /*#__PURE__*/Object.freeze({
  * If a graphie URL is provided in `backgroundImage`, will return the rendered graphie background.
  * Otherwise, returns `null`.
  */
-const getLegacyGrid = (box, backgroundImage) => {
+const LegacyGrid = _ref => {
+  let {
+    box,
+    backgroundImage
+  } = _ref;
   const {
     url,
     width,
@@ -29423,10 +29629,10 @@ const getLegacyGrid = (box, backgroundImage) => {
         bottom: 0,
         left: 0
       }
-    }, /*#__PURE__*/React__namespace.createElement(context$1.Consumer, null, _ref => {
+    }, /*#__PURE__*/React__namespace.createElement(context$1.Consumer, null, _ref2 => {
       let {
         setAssetStatus
-      } = _ref;
+      } = _ref2;
       return /*#__PURE__*/React__namespace.createElement(SvgImage, {
         src: url,
         width: width,
@@ -29698,10 +29904,10 @@ function initializeGraphState(params) {
       };
     case "polygon":
       return {
-        type: "polygon",
         hasBeenInteractedWith: false,
         range,
         snapStep,
+        ...graph,
         coords: getPolygonCoords({
           graph,
           range,
@@ -29723,31 +29929,41 @@ function initializeGraphState(params) {
 // 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
+    };
+  }
+  throw new Error("Mafs is not yet implemented for graph type: " + initialGraph.type);
 }
 const getDefaultSegments = _ref => {
   let {
@@ -29771,9 +29987,10 @@ const getDefaultSegments = _ref => {
         return [5];
     }
   };
+  const defaultRange = [[-10, 10], [-10, 10]];
   return ys(graph.numSegments).map(y => {
     let endpoints = [[-5, y], [5, y]];
-    endpoints = normalizeCoords(endpoints, range);
+    endpoints = normalizeCoords(endpoints, defaultRange);
     endpoints = normalizePoints(range, step, endpoints);
     return endpoints;
   });
@@ -29856,7 +30073,6 @@ const renderGraph = props => {
 };
 const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
   const [width, height] = props.box;
-  const legacyGrid = getLegacyGrid([width, height], props.backgroundImage);
   const [state, dispatch] = React__namespace.useReducer(interactiveGraphReducer, props, initializeGraphState);
   React__namespace.useImperativeHandle(ref, () => ({
     getUserInput: () => getGradableGraph(state, props.graph)
@@ -29867,13 +30083,17 @@ const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
       height,
       position: "relative"
     }
-  }, legacyGrid, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+  }, /*#__PURE__*/React__namespace.createElement(LegacyGrid, {
+    box: props.box,
+    backgroundImage: props.backgroundImage
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     style: {
       position: "absolute",
       bottom: 0,
       left: 0
     }
   }, /*#__PURE__*/React__namespace.createElement(mafs.Mafs, {
+    preserveAspectRatio: false,
     viewBox: {
       x: props.range[0],
       y: props.range[1],
@@ -29883,7 +30103,7 @@ const MafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref) => {
     zoom: false,
     width: width,
     height: height
-  }, !legacyGrid && /*#__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,
@@ -31509,18 +31729,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
@@ -31537,8 +31757,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 {
@@ -31548,9 +31768,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);
@@ -31562,8 +31782,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);
@@ -31578,8 +31798,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,
@@ -31587,9 +31807,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
@@ -31606,8 +31826,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;
@@ -31631,8 +31851,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>'.
@@ -31645,8 +31865,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'.
@@ -31660,8 +31880,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") {
@@ -31700,7 +31920,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",
@@ -32777,7 +32997,7 @@ const styles$g = aphrodite.StyleSheet.create({
 });
 
 const BringToFront = {
-  boxShadow: `0 8px 8px ${Color__default["default"].offBlack64}`,
+  boxShadow: `0 8px 8px ${wonderBlocksTokens.color.offBlack64}`,
   zIndex: 1000
 };
 const AnswerPill = props => {
@@ -32833,7 +33053,7 @@ const styles$f = aphrodite.StyleSheet.create({
     backgroundColor: "#00880b"
   },
   incorrect: {
-    backgroundColor: Color__default["default"].offBlack64
+    backgroundColor: wonderBlocksTokens.color.offBlack64
   },
   pill: {
     // Reset the Pill's default height in order to account
@@ -32877,7 +33097,7 @@ class Marker extends React__namespace.Component {
     // default dot
     let args = {
       size: MARKER_SIZE,
-      color: Color__default["default"].white,
+      color: wonderBlocksTokens.color.white,
       icon: iconNull
     };
     if (showCorrectness) {
@@ -32938,7 +33158,7 @@ class Marker extends React__namespace.Component {
 const styles$e = aphrodite.StyleSheet.create({
   marker: {
     position: "absolute",
-    backgroundColor: Color__default["default"].white,
+    backgroundColor: wonderBlocksTokens.color.white,
     borderRadius: MARKER_SIZE,
     // Center marker position based on its maximum size.
     width: MARKER_SIZE,
@@ -32946,7 +33166,7 @@ const styles$e = aphrodite.StyleSheet.create({
     marginLeft: MARKER_SIZE / -2,
     marginTop: MARKER_SIZE / -2,
     // Add a shadow to the marker to make it stand out from the image.
-    boxShadow: `0 8px 8px ${Color__default["default"].offBlack8}`
+    boxShadow: `0 8px 8px ${wonderBlocksTokens.color.offBlack8}`
   },
   // The base and unfilled marker style.
   markerIcon: {
@@ -32956,7 +33176,7 @@ const styles$e = aphrodite.StyleSheet.create({
     boxSizing: "border-box",
     width: MARKER_SIZE,
     height: MARKER_SIZE,
-    border: `2px solid ${Color__default["default"].offBlack64}`,
+    border: `2px solid ${wonderBlocksTokens.color.offBlack64}`,
     borderRadius: MARKER_SIZE
   },
   // The animation that presents the marker to the learner
@@ -32964,11 +33184,11 @@ const styles$e = aphrodite.StyleSheet.create({
     animationName: {
       "0%": {
         transform: "scale(1)",
-        backgroundColor: Color__default["default"].blue
+        backgroundColor: wonderBlocksTokens.color.blue
       },
       "100%": {
         transform: "scale(1.3)",
-        backgroundColor: Color__default["default"].blue
+        backgroundColor: wonderBlocksTokens.color.blue
       }
     },
     animationDirection: "alternate",
@@ -32985,35 +33205,35 @@ const styles$e = aphrodite.StyleSheet.create({
     animationIterationCount: "2"
   },
   markerActive: {
-    outline: `2px solid ${Color__default["default"].blue}`,
+    outline: `2px solid ${wonderBlocksTokens.color.blue}`,
     outlineOffset: 2
   },
   // The learner is making an initial selection
   markerSelected: {
-    boxShadow: `0 8px 8px ${Color__default["default"].offBlack8}`,
-    border: `solid 4px ${Color__default["default"].white}`,
-    backgroundColor: Color__default["default"].blue,
+    boxShadow: `0 8px 8px ${wonderBlocksTokens.color.offBlack8}`,
+    border: `solid 4px ${wonderBlocksTokens.color.white}`,
+    backgroundColor: wonderBlocksTokens.color.blue,
     borderRadius: MARKER_SIZE,
     transform: "rotate(180deg)"
   },
   // The learner has made a selection
   markerFilled: {
     backgroundColor: "#ECF3FE",
-    border: `4px solid ${Color__default["default"].blue}`
+    border: `4px solid ${wonderBlocksTokens.color.blue}`
   },
   markerGraded: {
     width: MARKER_SIZE,
     height: MARKER_SIZE,
     justifyContent: "center",
     alignItems: "center",
-    border: `2px solid ${Color__default["default"].white}`
+    border: `2px solid ${wonderBlocksTokens.color.white}`
   },
   markerCorrect: {
     background: "#00880b" // WB green darkened by 18%
   },
 
   markerIncorrect: {
-    background: Color__default["default"].offBlack64
+    background: wonderBlocksTokens.color.offBlack64
   }
 });
 
@@ -33444,6 +33664,7 @@ class LabelImage extends React__namespace.Component {
       const answerChoicesActive = index === activeMarkerIndex;
       const showAnswerChoice = marker.selected && !answerChoicesActive && !this.state.hideAnswers;
       return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+        key: index,
         style: {
           position: "absolute",
           left: `${marker.x}%`,
@@ -38048,7 +38269,7 @@ const styles$8 = aphrodite.StyleSheet.create({
     // and the "Add highlight" action fails.
     userSelect: "none",
     fontFamily: `"Lato", sans-serif`,
-    padding: `10px ${Spacing__default["default"].medium_16}px`,
+    padding: `10px ${wonderBlocksTokens.spacing.medium_16}px`,
     cursor: "pointer"
   }
 });
@@ -41894,7 +42115,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.0";
+const libVersion = "21.0.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -44143,6 +44364,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.
  *
@@ -44547,18 +44900,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 */
@@ -44577,29 +44927,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));
 };
 
 /**
@@ -44647,7 +44998,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] : {};
@@ -44657,6 +45008,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
@@ -44711,163 +45163,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 provided widget type and instance number.
- * ex. addWidget(WidgetType.Radio, 1) => "[[☃ radio 1]]"
- *
- * @param {WidgetType} widgetType
- * @param {number} instance
- * @returns {string}
- */
-function addWidget(widgetType, instance) {
-  return `[[☃ ${widgetType} ${String(instance)}]]`;
-}
-
-/**
- * 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 () {
@@ -44919,7 +45214,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;
@@ -44927,19 +45221,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;
@@ -44947,7 +45248,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;