@khanacademy/perseus 39.0.0 → 39.0.1

package/dist/index.js

@@ -21260,7 +21260,14 @@ const Triangle = props => {
     }
   });
 };
-const TooltipArrow = props => {
+const TooltipArrow = _ref => {
+  let {
+    position = "relative",
+    visibility = "visible",
+    left = 100,
+    top = 0,
+    ...props
+  } = _ref;
   // TODO(aria): Think about adding a box-shadow to the triangle here
   // See http://css-tricks.com/triangle-with-shadow/
 
@@ -21271,10 +21278,10 @@ const TooltipArrow = props => {
   return /*#__PURE__*/React__namespace.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,
@@ -21300,12 +21307,6 @@ const TooltipArrow = props => {
     height: props.height
   }));
 };
-TooltipArrow.defaultProps = {
-  position: "relative",
-  visibility: "visible",
-  left: 0,
-  top: 0
-};
 const VERTICAL_CORNERS = {
   top: {
     top: "-100%"
@@ -22176,48 +22177,35 @@ 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"));
+  const normalizedAnswerExpected = rubric.answers.filter(answer => answer.status === "correct").every(answer => Math.abs(answer.value) <= 1);
 
-    // 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;
-    });
-    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
-    };
+  // 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 {
+      ...answer,
+      score
+    };
+  }).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?.status === "correct" ? matchedAnswer.score : {
+    empty: matchedAnswer?.status === "ungraded",
+    correct: matchedAnswer?.status === "correct",
+    message: matchedAnswer?.message ?? null,
+    guess: localValue
+  };
 
   // TODO(eater): Seems silly to translate result to this
   // invalid/points thing and immediately translate it
@@ -25191,13 +25179,13 @@ function getA11yText(letter, checked, correct, crossedOut, showCorrectness, stri
 /**
  * Renders a circular selection ring around the child.
  */
-const FocusRing = function (props) {
-  const {
-    visible,
-    color,
-    children,
-    multipleSelect
-  } = props;
+const FocusRing = function (_ref) {
+  let {
+    visible = true,
+    color = kaGreen$1,
+    multipleSelect = false,
+    children
+  } = _ref;
   const borderColor = visible ? color : "transparent";
   const borderRadius = multipleSelect ? 5 : "50%";
   const style = {
@@ -25210,11 +25198,6 @@ const FocusRing = function (props) {
     style: style
   }, children);
 };
-FocusRing.defaultProps = {
-  visible: true,
-  color: kaGreen$1,
-  multipleSelect: false
-};
 const styles$v = aphrodite.StyleSheet.create({
   ring: {
     margin: "auto",
@@ -25753,13 +25736,13 @@ var Choice$1 = /*#__PURE__*/React__namespace.forwardRef((props, ref) => /*#__PUR
   forwardedRef: ref
 })));
 
-const ChoiceNoneAbove = function (props) {
-  const {
-    showContent,
+const ChoiceNoneAbove = function (_ref) {
+  let {
     content,
     forwardedRef,
+    showContent = true,
     ...rest
-  } = props;
+  } = _ref;
   const {
     strings
   } = usePerseusI18n();
@@ -25787,9 +25770,6 @@ const ChoiceNoneAbove = function (props) {
     ref: forwardedRef
   }));
 };
-ChoiceNoneAbove.defaultProps = {
-  showContent: true
-};
 var ChoiceNoneAbove$1 = /*#__PURE__*/React__namespace.forwardRef((props, ref) => /*#__PURE__*/React__namespace.createElement(ChoiceNoneAbove, _extends({}, props, {
   forwardedRef: ref
 })));
@@ -25811,20 +25791,21 @@ function getInstructionsText(multipleSelect, countChoices, numCorrect, strings)
   }
   return strings.chooseOneAnswer;
 }
-const BaseRadio = function (props) {
-  const {
+const BaseRadio = function (_ref) {
+  let {
     apiOptions,
     reviewModeRubric,
     reviewMode,
     choices,
-    editMode,
-    multipleSelect,
+    editMode = false,
+    multipleSelect = false,
     labelWrap,
     countChoices,
     numCorrect,
     isLastUsedWidget,
+    onChange,
     registerFocusFunction
-  } = props;
+  } = _ref;
   const {
     strings
   } = usePerseusI18n();
@@ -25881,12 +25862,6 @@ const BaseRadio = function (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.
@@ -26053,10 +26028,6 @@ const BaseRadio = function (props) {
     className: aphrodite.css(styles$p.responsiveContainer)
   }, fieldset);
 };
-BaseRadio.defaultProps = {
-  editMode: false,
-  multipleSelect: false
-};
 const styles$p = aphrodite.StyleSheet.create({
   instructions: {
     display: "block",
@@ -26155,7 +26126,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 {
@@ -26165,7 +26136,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 {
@@ -26175,7 +26146,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) => {
@@ -26217,7 +26188,6 @@ class Radio$1 extends React__namespace.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;
@@ -26231,7 +26201,6 @@ class Radio$1 extends React__namespace.Component {
         }
       }
       return {
-        countChoices,
         choicesSelected,
         numCorrect,
         noneOfTheAboveIndex,
@@ -26247,7 +26216,6 @@ class Radio$1 extends React__namespace.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++) {
@@ -26265,7 +26233,6 @@ class Radio$1 extends React__namespace.Component {
         choicesSelected,
         noneOfTheAboveIndex,
         noneOfTheAboveSelected,
-        countChoices,
         numCorrect
       };
     }
@@ -29349,23 +29316,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 {
@@ -40749,9 +40716,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];
@@ -45101,7 +45068,7 @@ const init = function (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";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {