@khanacademy/perseus 39.0.0 → 39.0.1

package/dist/es/index.js

@@ -20968,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";
@@ -21012,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/
 
@@ -21023,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,
@@ -21052,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%"
@@ -21340,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) {
@@ -21927,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
@@ -21959,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
@@ -24972,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 = {
@@ -24991,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",
@@ -25528,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();
@@ -25562,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
 })));
@@ -25586,20 +25565,20 @@ function getInstructionsText(multipleSelect, countChoices, numCorrect, strings)
   }
   return strings.chooseOneAnswer;
 }
-const BaseRadio = function BaseRadio(props) {
-  const {
-    apiOptions,
-    reviewModeRubric,
-    reviewMode,
-    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();
@@ -25656,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.
@@ -25828,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",
@@ -25930,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 {
@@ -25940,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 {
@@ -25950,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) => {
@@ -26131,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;
@@ -26145,7 +26113,6 @@ class Radio$1 extends React.Component {
         }
       }
       return {
-        countChoices,
         choicesSelected,
         numCorrect,
         noneOfTheAboveIndex,
@@ -26161,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++) {
@@ -26179,7 +26145,6 @@ class Radio$1 extends React.Component {
         choicesSelected,
         noneOfTheAboveIndex,
         noneOfTheAboveSelected,
-        countChoices,
         numCorrect
       };
     }
@@ -29084,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 {
@@ -40400,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];
@@ -44752,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 = "39.0.0";
+const libVersion = "39.0.1";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {