@khanacademy/perseus 38.0.1 → 39.0.1

package/dist/es/index.js

@@ -2402,11 +2402,6 @@ class Expression extends React.Component {
     // @ts-expect-error - TS2339 - Property 'insert' does not exist on type 'ReactInstance'.
     this.refs.input.insert(keyPressed);
   }
-  // TODO(Nicole): I believe this is going away and won't be needed anymore
-  getGrammarTypeForPath(inputPath) {
-    /* c8 ignore next */
-    return "expression";
-  }
   setInputValue(path, newValue, cb) {
     this.props.onChange({
       value: newValue
@@ -2878,7 +2873,9 @@ function flattenScores(widgetScoreMap) {
 function isCorrect(score) {
   return score.type === "points" && score.earned >= score.total;
 }
-function keScoreFromPerseusScore(score, guess, state) {
+function keScoreFromPerseusScore(score,
+// It's weird, but this is what we're passing it
+guess, state) {
   if (score.type === "points") {
     return {
       empty: false,
@@ -3892,36 +3889,14 @@ const ZoomService = new ZoomServiceClass();
 const baseFontFamily$1 = "'Lato', sans-serif";
 // @boldFontFamily:        "Lato-Bold", "Lato", sans-serif;
 const boldFontFamily = "'Lato-Bold', 'Lato', sans-serif";
-// @green:                 #76a005;
-const green$1 = "#76A005";
 // @kaGreen:               #71b307;
 const kaGreen$1 = "#71B307";
-// @blue:                  #1c758a;
-const blue$1 = "#1C758A";
-// @gray:                  #aaa;
-const gray$1 = "#AAAAAA";
-// @red:                   #ffbaba;
-const red$1 = "#FFBABA";
-// @grayLight:             #aaa;
-const grayLight$1 = "#AAAAAA";
-// @grayLighter:           #ddd;
-const grayLighter$1 = "#DDDDDD";
-// @learnstormBlue:        #4898fc;
-const learnstormBlue$1 = "#4898FC";
 const white$1 = "#FFFFFF";
-const gray98 = "#FAFAFA";
 const gray97 = "#F6F7F7";
-const gray95 = "#F0F1F2";
-const gray90 = "#E3E5E6";
 const gray85 = "#D6D8DA";
 const gray76 = "#BABEC2";
 const gray68 = "#888D93";
-const gray41 = "#626569";
-const gray25 = "#3B3e40";
 const gray17 = "#21242c";
-const black$1 = "#000000";
-const warning1 = "#F86700";
-const warning3 = "#C75300";
 
 // @pure-sm-min: 568px;
 const pureSmMin$2 = "568px";
@@ -3941,16 +3916,10 @@ const pureMdMax$2 = "1023px";
 const pureLgMax$2 = "1279px";
 // @tableBackgroundAccent: #f9f9f9; // for striping
 const tableBackgroundAccent$1 = "#F9F9F9";
-// @zIndexScratchPad: 1;
-const zIndexScratchPad = 1;
 // @zIndexAboveScratchpad: @zIndexScratchPad + 1;
 const zIndexAboveScratchpad$1 = 2;
 // @zIndexInteractiveComponent: @zIndexAboveScratchpad + 1;
 const zIndexInteractiveComponent$1 = 3;
-// @zIndexCurrentlyDragging: @zIndexInteractiveComponent + 1;
-const zIndexCurrentlyDragging = 4;
-// @zIndexCalculator: @zIndexCurrentlyDragging + 1;
-const zIndexCalculator = 5;
 // @phoneMargin: 16px;
 const phoneMargin = 16;
 const negativePhoneMargin = -16;
@@ -3978,28 +3947,13 @@ var constants$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   baseFontFamily: baseFontFamily$1,
   boldFontFamily: boldFontFamily,
-  green: green$1,
   kaGreen: kaGreen$1,
-  blue: blue$1,
-  gray: gray$1,
-  red: red$1,
-  grayLight: grayLight$1,
-  grayLighter: grayLighter$1,
-  learnstormBlue: learnstormBlue$1,
   white: white$1,
-  gray98: gray98,
   gray97: gray97,
-  gray95: gray95,
-  gray90: gray90,
   gray85: gray85,
   gray76: gray76,
   gray68: gray68,
-  gray41: gray41,
-  gray25: gray25,
   gray17: gray17,
-  black: black$1,
-  warning1: warning1,
-  warning3: warning3,
   pureSmMin: pureSmMin$2,
   pureMdMin: pureMdMin$2,
   pureLgMin: pureLgMin$2,
@@ -4009,11 +3963,8 @@ var constants$1 = /*#__PURE__*/Object.freeze({
   pureMdMax: pureMdMax$2,
   pureLgMax: pureLgMax$2,
   tableBackgroundAccent: tableBackgroundAccent$1,
-  zIndexScratchPad: zIndexScratchPad,
   zIndexAboveScratchpad: zIndexAboveScratchpad$1,
   zIndexInteractiveComponent: zIndexInteractiveComponent$1,
-  zIndexCurrentlyDragging: zIndexCurrentlyDragging,
-  zIndexCalculator: zIndexCalculator,
   phoneMargin: phoneMargin,
   negativePhoneMargin: negativePhoneMargin,
   hintBorderWidth: hintBorderWidth,
@@ -19756,6 +19707,7 @@ class Renderer extends React.Component {
         onBlur: _.partial(this._onWidgetBlur, id),
         findWidgets: this.findWidgets,
         reviewModeRubric: reviewModeRubric,
+        reviewMode: this.props.reviewMode,
         onChange: (newProps, cb, silent = false) => {
           this._setWidgetProps(id, newProps, cb, silent);
         },
@@ -20435,14 +20387,6 @@ class Renderer extends React.Component {
         return ReactDOM__default.findDOMNode(widget);
       }
     };
-    this.getGrammarTypeForPath = path => {
-      // @ts-expect-error - TS2345 - Argument of type 'FocusPath' is not assignable to parameter of type 'List<any>'.
-      const widgetId = _.first(path);
-      // @ts-expect-error - TS2345 - Argument of type 'FocusPath' is not assignable to parameter of type 'List<any>'.
-      const interWidgetPath = _.rest(path);
-      const widget = this.getWidgetInstance(widgetId);
-      return widget == null || widget.getGrammarTypeForPath == null ? void 0 : widget.getGrammarTypeForPath(interWidgetPath);
-    };
     this.getInputPaths = () => {
       const inputPaths = [];
       _.each(this.widgetIds, widgetId => {
@@ -20582,11 +20526,6 @@ class Renderer extends React.Component {
     this.getWidgetIds = () => {
       return this.widgetIds;
     };
-    this.guessAndScore = () => {
-      const totalGuess = this.getUserInput();
-      const totalScore = this.score();
-      return [totalGuess, totalScore];
-    };
     this.examples = () => {
       const widgetIds = this.widgetIds;
       const examples = _.compact(_.map(widgetIds, widgetId => {
@@ -20808,6 +20747,11 @@ class Renderer extends React.Component {
     const combinedScore = Util.flattenScores(scores);
     return combinedScore;
   }
+  guessAndScore() {
+    const totalGuess = this.getUserInput();
+    const totalScore = this.score();
+    return [totalGuess, totalScore];
+  }
   render() {
     const apiOptions = this.getApiOptions();
     if (this.reuseMarkdown) {
@@ -21024,7 +20968,17 @@ TextInput.defaultProps = {
   disabled: false
 };
 
-/* eslint-disable react/no-unsafe */
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
+  }
+  return t;
+}
+
+const _excluded$5 = ["position", "visibility", "left", "top"];
 const zIndex = 10;
 let HorizontalDirection = /*#__PURE__*/function (HorizontalDirection) {
   HorizontalDirection["Left"] = "left";
@@ -21068,7 +21022,14 @@ const Triangle = props => {
     }
   });
 };
-const TooltipArrow = props => {
+const TooltipArrow = _ref => {
+  let {
+      position = "relative",
+      visibility = "visible",
+      left = 100,
+      top = 0
+    } = _ref,
+    props = _objectWithoutPropertiesLoose(_ref, _excluded$5);
   // TODO(aria): Think about adding a box-shadow to the triangle here
   // See http://css-tricks.com/triangle-with-shadow/
 
@@ -21079,10 +21040,10 @@ const TooltipArrow = props => {
   return /*#__PURE__*/React.createElement("div", {
     style: {
       display: "block",
-      position: props.position,
-      visibility: props.visibility,
-      left: props.left,
-      top: props["top"],
+      position: position,
+      visibility: visibility,
+      left: left,
+      top: top,
       width: props.width + 2,
       height: props.height + 1,
       marginTop: -1,
@@ -21108,12 +21069,6 @@ const TooltipArrow = props => {
     height: props.height
   }));
 };
-TooltipArrow.defaultProps = {
-  position: "relative",
-  visibility: "visible",
-  left: 0,
-  top: 0
-};
 const VERTICAL_CORNERS = {
   top: {
     top: "-100%"
@@ -21396,16 +21351,6 @@ InputWithExamples.defaultProps = {
   className: ""
 };
 
-function _objectWithoutPropertiesLoose(r, e) {
-  if (null == r) return {};
-  var t = {};
-  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-    if (e.includes(n)) continue;
-    t[n] = r[n];
-  }
-  return t;
-}
-
 const _excluded$4 = ["keypadElement", "onFocus", "value"];
 class SimpleKeypadInput extends React.Component {
   constructor(...args) {
@@ -21787,12 +21732,6 @@ class InputNumber extends React.Component {
       /* c8 ignore next */
       return [[]];
     };
-    // Note: We believe that this isn't used anywhere but are leaving it during
-    // the initial refactor
-    this.getGrammarTypeForPath = path => {
-      /* c8 ignore next */
-      return "number";
-    };
     this.setInputValue = (path, newValue, cb) => {
       this.props.onChange({
         currentValue: newValue
@@ -21836,17 +21775,13 @@ class InputNumber extends React.Component {
       }
       return input;
     }
-    // HACK(johnsullivan): Create a function with shared logic between
-    // this and NumericInput.
-    // TODO(jeremy): Deprecate this widget and prefer numeric-input.
-    const rubric = this.props.reviewModeRubric;
 
     // Note: This is _very_ similar to what `numeric-input.jsx` does. If
     // you modify this, double-check if you also need to modify that
     // component.
     const inputStyles = [styles$A.default, this.props.size === "small" ? styles$A.small : null, this.props.rightAlign ? styles$A.rightAlign : styles$A.leftAlign];
     // Unanswered
-    if (rubric && !this.props.currentValue) {
+    if (this.props.reviewMode && !this.props.currentValue) {
       inputStyles.push(styles$A.answerStateUnanswered);
     }
     return /*#__PURE__*/React.createElement(InputWithExamples
@@ -21993,6 +21928,7 @@ function maybeParsePercentInput(inputValue, normalizedAnswerExpected) {
   return value;
 }
 function numericInputValidator(userInput, rubric, strings) {
+  var _matchedAnswer$messag;
   const defaultAnswerForms = answerFormButtons.map(e => e["value"])
   // Don't default to validating the answer as a pi answer
   // if answerForm isn't set on the answer
@@ -22025,48 +21961,34 @@ function numericInputValidator(userInput, rubric, strings) {
   // We may have received TeX; try to parse it before grading.
   // If `currentValue` is not TeX, this should be a no-op.
   const currentValue = ParseTex(userInput.currentValue);
-  const correctAnswers = rubric.answers.filter(answer => answer.status === "correct");
-  const normalizedAnswerExpected = correctAnswers.every(answer => Math.abs(answer.value) <= 1);
-
-  // Look through all correct answers for one that matches either
-  // precisely or approximately and return the appropriate message:
-  // - if precise, return the message that the answer came with
-  // - if it needs to be simplified, etc., show that message
-  let result = correctAnswers.map(answer => {
-    // The coefficient is an attribute of the widget
-    let localValue = currentValue;
-    if (rubric.coefficient) {
-      if (!localValue) {
-        localValue = 1;
-      } else if (localValue === "-") {
-        localValue = -1;
-      }
-    }
-    const validate = createValidator(answer);
-    return validate(maybeParsePercentInput(localValue, normalizedAnswerExpected));
-  }).find(match => match.correct || match.empty);
-  if (!result) {
-    // Otherwise, if the guess is not correct
-    const otherAnswers = [].concat(
-    // @ts-expect-error - TS2769 - No overload matches this call.
-    rubric.answers.filter(answer => answer.status === "ungraded"), rubric.answers.filter(answer => answer.status === "wrong"));
-
-    // Look through all other answers and if one matches either
-    // precisely or approximately return the answer's message
-    const match = otherAnswers.find(answer => {
-      const validate = createValidator(answer);
-      return validate(maybeParsePercentInput(currentValue, normalizedAnswerExpected)).correct;
+  const normalizedAnswerExpected = rubric.answers.filter(answer => answer.status === "correct").every(answer => Math.abs(answer.value) <= 1);
+
+  // The coefficient is an attribute of the widget
+  let localValue = currentValue;
+  if (rubric.coefficient) {
+    if (!localValue) {
+      localValue = 1;
+    } else if (localValue === "-") {
+      localValue = -1;
+    }
+  }
+  const matchedAnswer = rubric.answers.map(answer => {
+    const validateFn = createValidator(answer);
+    const score = validateFn(maybeParsePercentInput(localValue, normalizedAnswerExpected));
+    return _extends({}, answer, {
+      score
     });
-    result = {
-      // @ts-expect-error - TS2339 - Property 'status' does not exist on type 'never'.
-      empty: match ? match.status === "ungraded" : false,
-      // @ts-expect-error - TS2339 - Property 'status' does not exist on type 'never'.
-      correct: match ? match.status === "correct" : false,
-      // @ts-expect-error - TS2339 - Property 'message' does not exist on type 'never'.
-      message: match ? match.message : null,
-      guess: currentValue
-    };
-  }
+  }).find(answer => {
+    // NOTE: "answer.score.correct" indicates a match via the validate function.
+    //       It does NOT indicate that the answer itself is correct.
+    return answer.score.correct || answer.status === "correct" && answer.score.empty;
+  });
+  const result = (matchedAnswer == null ? void 0 : matchedAnswer.status) === "correct" ? matchedAnswer.score : {
+    empty: (matchedAnswer == null ? void 0 : matchedAnswer.status) === "ungraded",
+    correct: (matchedAnswer == null ? void 0 : matchedAnswer.status) === "correct",
+    message: (_matchedAnswer$messag = matchedAnswer == null ? void 0 : matchedAnswer.message) != null ? _matchedAnswer$messag : null,
+    guess: localValue
+  };
 
   // TODO(eater): Seems silly to translate result to this
   // invalid/points thing and immediately translate it
@@ -22149,10 +22071,6 @@ class NumericInput extends React.Component {
       /* c8 ignore next */
       return [[]];
     };
-    this.getGrammarTypeForPath = inputPath => {
-      /* c8 ignore next */
-      return "number";
-    };
     this.setInputValue = (path, newValue, cb) => {
       /* c8 ignore next */
       this.props.onChange({
@@ -22339,7 +22257,7 @@ var NumericInput$1 = {
  * Several widgets don't have "right"/"wrong" validation logic,
  * so this just says to move on past those widgets
  *
- * TODO(LEMS-2396) widgets that use this probably shouldn't have any
+ * TODO(LEMS-2543) widgets that use this probably shouldn't have any
  * validation logic and the thing validating an exercise
  * should just know to skip these
  */
@@ -24401,7 +24319,7 @@ class Passage extends React.Component {
     const enabled = this.state.stylesAreApplied;
 
     // Highlights are read-only in review mode.
-    const editable = !this.props.reviewModeRubric;
+    const editable = !this.props.reviewMode;
     return /*#__PURE__*/React.createElement(HighlightableContent, {
       editable: editable,
       enabled: enabled,
@@ -25042,13 +24960,12 @@ function getA11yText(letter, checked, correct, crossedOut, showCorrectness, stri
 /**
  * Renders a circular selection ring around the child.
  */
-const FocusRing = function FocusRing(props) {
-  const {
-    visible,
-    color,
-    children,
-    multipleSelect
-  } = props;
+const FocusRing = function FocusRing({
+  visible = true,
+  color = kaGreen$1,
+  multipleSelect = false,
+  children
+}) {
   const borderColor = visible ? color : "transparent";
   const borderRadius = multipleSelect ? 5 : "50%";
   const style = {
@@ -25061,11 +24978,6 @@ const FocusRing = function FocusRing(props) {
     style: style
   }, children);
 };
-FocusRing.defaultProps = {
-  visible: true,
-  color: kaGreen$1,
-  multipleSelect: false
-};
 const styles$v = StyleSheet.create({
   ring: {
     margin: "auto",
@@ -25598,14 +25510,14 @@ var Choice$1 = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/React.
   forwardedRef: ref
 })));
 
-const _excluded$3 = ["showContent", "content", "forwardedRef"];
-const ChoiceNoneAbove = function ChoiceNoneAbove(props) {
-  const {
-      showContent,
+const _excluded$3 = ["content", "forwardedRef", "showContent"];
+const ChoiceNoneAbove = function ChoiceNoneAbove(_ref) {
+  let {
       content,
-      forwardedRef
-    } = props,
-    rest = _objectWithoutPropertiesLoose(props, _excluded$3);
+      forwardedRef,
+      showContent = true
+    } = _ref,
+    rest = _objectWithoutPropertiesLoose(_ref, _excluded$3);
   const {
     strings
   } = usePerseusI18n();
@@ -25632,9 +25544,6 @@ const ChoiceNoneAbove = function ChoiceNoneAbove(props) {
     ref: forwardedRef
   }));
 };
-ChoiceNoneAbove.defaultProps = {
-  showContent: true
-};
 var ChoiceNoneAbove$1 = /*#__PURE__*/React.forwardRef((props, ref) => /*#__PURE__*/React.createElement(ChoiceNoneAbove, _extends({}, props, {
   forwardedRef: ref
 })));
@@ -25656,19 +25565,20 @@ function getInstructionsText(multipleSelect, countChoices, numCorrect, strings)
   }
   return strings.chooseOneAnswer;
 }
-const BaseRadio = function BaseRadio(props) {
-  const {
-    apiOptions,
-    reviewModeRubric,
-    choices,
-    editMode,
-    multipleSelect,
-    labelWrap,
-    countChoices,
-    numCorrect,
-    isLastUsedWidget,
-    registerFocusFunction
-  } = props;
+const BaseRadio = function BaseRadio({
+  apiOptions,
+  reviewModeRubric,
+  reviewMode,
+  choices,
+  editMode = false,
+  multipleSelect = false,
+  labelWrap,
+  countChoices,
+  numCorrect,
+  isLastUsedWidget,
+  onChange,
+  registerFocusFunction
+}) {
   const {
     strings
   } = usePerseusI18n();
@@ -25725,12 +25635,6 @@ const BaseRadio = function BaseRadio(props) {
   // contains a boolean value specifying the new checked and crossed-out
   // value of this choice.
   function updateChoice(choiceIndex, newValues) {
-    const {
-      multipleSelect,
-      choices,
-      onChange
-    } = props;
-
     // Get the baseline `checked` values. If we're checking a new answer
     // and multiple-select is not on, we should clear all choices to be
     // unchecked. Otherwise, we should copy the old checked values.
@@ -25772,7 +25676,6 @@ const BaseRadio = function BaseRadio(props) {
   });
 
   // some commonly used shorthands
-  const reviewMode = !!reviewModeRubric;
   const isMobile = apiOptions.isMobile;
   const firstChoiceHighlighted = choices[0].highlighted;
   const lastChoiceHighlighted = choices[choices.length - 1].highlighted;
@@ -25898,10 +25801,6 @@ const BaseRadio = function BaseRadio(props) {
     className: css(styles$p.responsiveContainer)
   }, fieldset);
 };
-BaseRadio.defaultProps = {
-  editMode: false,
-  multipleSelect: false
-};
 const styles$p = StyleSheet.create({
   instructions: {
     display: "block",
@@ -26000,7 +25899,7 @@ function radioValidator(userInput, rubric, strings) {
     };
   }
 
-  // TODO: should numCorrect actually be on the rubric
+  // TODO(LEMS-2541): should numCorrect actually be on the rubric
   // instead of the userInput?
   if (userInput.numCorrect && userInput.numCorrect > 1 && numSelected !== userInput.numCorrect) {
     return {
@@ -26010,7 +25909,7 @@ function radioValidator(userInput, rubric, strings) {
     // If NOTA and some other answer are checked, ...
   }
 
-  // TODO: should noneOfTheAboveSelected be replaced with a
+  // TODO(LEMS-2541): should noneOfTheAboveSelected be replaced with a
   // combination of choicesSelected and noneOfTheAboveIndex?
   if (userInput.noneOfTheAboveSelected && numSelected > 1) {
     return {
@@ -26020,7 +25919,7 @@ function radioValidator(userInput, rubric, strings) {
   }
   const correct = userInput.choicesSelected.every((selected, i) => {
     let isCorrect;
-    // TODO: should noneOfTheAboveIndex actually be on the rubric
+    // TODO(LEMS-2541): should noneOfTheAboveIndex actually be on the rubric
     // instead of the userInput?
     if (userInput.noneOfTheAboveIndex === i) {
       isCorrect = rubric.choices.every((choice, j) => {
@@ -26201,7 +26100,6 @@ class Radio$1 extends React.Component {
       let noneOfTheAboveSelected = false;
       const choiceStates = props.choiceStates;
       const choicesSelected = choiceStates.map(() => false);
-      const countChoices = props.countChoices;
       const numCorrect = props.numCorrect;
       for (let i = 0; i < choicesSelected.length; i++) {
         const index = props.choices[i].originalIndex;
@@ -26215,7 +26113,6 @@ class Radio$1 extends React.Component {
         }
       }
       return {
-        countChoices,
         choicesSelected,
         numCorrect,
         noneOfTheAboveIndex,
@@ -26231,7 +26128,6 @@ class Radio$1 extends React.Component {
       let noneOfTheAboveIndex = null;
       let noneOfTheAboveSelected = false;
       const choicesSelected = [...values];
-      const countChoices = props.countChoices;
       const numCorrect = props.numCorrect;
       const valuesLength = values.length;
       for (let i = 0; i < valuesLength; i++) {
@@ -26249,7 +26145,6 @@ class Radio$1 extends React.Component {
         choicesSelected,
         noneOfTheAboveIndex,
         noneOfTheAboveSelected,
-        countChoices,
         numCorrect
       };
     }
@@ -26340,6 +26235,7 @@ class Radio$1 extends React.Component {
       }));
     }
     const choicesProp = choices.map((choice, i) => {
+      var _this$props$reviewMod;
       const content = choice.isNoneOfTheAbove && !choice.content ? strings.noneOfTheAbove : choice.content;
       const {
         selected,
@@ -26350,7 +26246,7 @@ class Radio$1 extends React.Component {
         highlighted,
         previouslyAnswered
       } = choiceStates[i];
-      const reviewChoice = this.props.reviewModeRubric && this.props.reviewModeRubric.choices[i];
+      const reviewChoice = (_this$props$reviewMod = this.props.reviewModeRubric) == null ? void 0 : _this$props$reviewMod.choices[i];
       return {
         content: this._renderRenderer(content),
         checked: selected,
@@ -26385,6 +26281,7 @@ class Radio$1 extends React.Component {
       choices: choicesProp,
       onChange: this.updateChoices,
       reviewModeRubric: this.props.reviewModeRubric,
+      reviewMode: this.props.reviewMode,
       deselectEnabled: this.props.deselectEnabled,
       apiOptions: this.props.apiOptions,
       isLastUsedWidget: this.props.isLastUsedWidget,
@@ -29121,7 +29018,7 @@ class Group extends React.Component {
       ref: ref => this.rendererRef = ref,
       apiOptions: apiOptions,
       findExternalWidgets: this.props.findWidgets,
-      reviewMode: !!this.props.reviewModeRubric,
+      reviewMode: this.props.reviewMode,
       onInteractWithWidget: onInteractWithWidget,
       linterContext: this.props.linterContext,
       strings: this.context.strings
@@ -29152,23 +29049,23 @@ var Group$1 = {
   isLintable: true
 };
 
-function iframeValidator(state) {
+function iframeValidator(userInput) {
   // The iframe can tell us whether it's correct or incorrect,
   //  and pass an optional message
-  if (state.status === "correct") {
+  if (userInput.status === "correct") {
     return {
       type: "points",
       earned: 1,
       total: 1,
-      message: state.message || null
+      message: userInput.message || null
     };
   }
-  if (state.status === "incorrect") {
+  if (userInput.status === "incorrect") {
     return {
       type: "points",
       earned: 0,
       total: 1,
-      message: state.message || null
+      message: userInput.message || null
     };
   }
   return {
@@ -38983,8 +38880,6 @@ const styles$b = StyleSheet.create({
  * No diagonals allowed.
  */
 
-// TODO: should this be using WidgetProps / PerseusLabelImageWidgetOptions?
-
 class LabelImage extends React.Component {
   /**
    * Test whether point is contained within triangle.
@@ -40470,9 +40365,9 @@ var Matcher$1 = {
   validator: matcherValidator
 };
 
-function matrixValidator(state, rubric, strings) {
+function matrixValidator(userInput, rubric, strings) {
   const solution = rubric.answers;
-  const supplied = state.answers;
+  const supplied = userInput.answers;
   const solutionSize = getMatrixSize(solution);
   const suppliedSize = getMatrixSize(supplied);
   const incorrectSize = solutionSize[0] !== suppliedSize[0] || solutionSize[1] !== suppliedSize[1];
@@ -40615,9 +40510,6 @@ class Matrix extends React.Component {
       });
       return inputPaths;
     };
-    this.getGrammarTypeForPath = inputPath => {
-      return "number";
-    };
     this._handleFocus = (row, col) => {
       this.props.onFocus(getInputPath$1(row, col));
     };
@@ -41030,7 +40922,7 @@ class Measurer extends React.Component {
 }
 Measurer.defaultProps = {
   box: [480, 480],
-  image: {},
+  image: defaultImage,
   showProtractor: true,
   protractorX: 7.5,
   protractorY: 0.5,
@@ -42415,11 +42307,6 @@ class NumberLine extends React.Component {
     }
     return null;
   }
-  getGrammarTypeForPath(inputPath) {
-    if ((inputPath == null ? void 0 : inputPath.length) === 1 && inputPath[0] === "tick-ctrl") {
-      return "number";
-    }
-  }
   getUserInput() {
     return {
       numLinePosition: this.props.numLinePosition,
@@ -44513,9 +44400,6 @@ class Table extends React.Component {
       });
       return inputPaths;
     };
-    this.getGrammarTypeForPath = inputPath => {
-      return "number";
-    };
     this.setInputValue = (path, newValue, cb) => {
       // Extract row, column information
       const row = getRowFromPath(path);
@@ -44833,7 +44717,7 @@ const init = function init(options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "38.0.1";
+const libVersion = "39.0.1";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -45555,9 +45439,6 @@ class ServerItemRenderer extends React.Component {
   getDOMNodeForPath(path) {
     return this.questionRenderer.getDOMNodeForPath(path);
   }
-  getGrammarTypeForPath(path) {
-    return this.questionRenderer.getGrammarTypeForPath(path);
-  }
   getInputPaths() {
     const questionAreaInputPaths = this.questionRenderer.getInputPaths();
     return questionAreaInputPaths;
@@ -46834,7 +46715,6 @@ const styles = StyleSheet.create({
  * If you're writing new components, though, consider using the Item and Shape
  * types instead.
  */
-
 /**
  * Return a PropType that accepts Items of the given shape, and rejects other
  * objects.
@@ -47066,6 +46946,21 @@ function violatingWidgets(itemData) {
 }
 
 /* eslint-disable eqeqeq, @typescript-eslint/no-unused-vars */
+/*
+ * A class for formatting number to significant digits.
+ * Copyright (C) 2001 Stephen Ostermiller
+ * http://ostermiller.org/contact.pl?regarding?JavaScript+Significant+Figures
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
 
 /**
  * Format a floating point for display using the specified