@khanacademy/perseus 34.0.0 → 35.0.0

package/dist/index.js

@@ -366,7 +366,10 @@ const mockStrings = {
   cos: "cos",
   tan: "tan",
   simulationLoadFail: "Sorry, this simulation cannot load.",
-  simulationLocaleWarning: "Sorry, this simulation isn't available in your language."
+  simulationLocaleWarning: "Sorry, this simulation isn't available in your language.",
+  addPoint: "Add Point",
+  removePoint: "Remove Point",
+  graphKeyboardPrompt: "Press Shift + Enter to interact with the graph"
 };
 
 /**
@@ -862,7 +865,7 @@ const denylist = [
 // (technically the renderer still adds them)
 "key", "ref",
 // added by src/renderer.jsx
-"containerSizeClass", "widgetId", "onChange", "problemNum", "apiOptions", "questionCompleted", "findWidgets",
+"containerSizeClass", "widgetId", "onChange", "problemNum", "apiOptions", "widgetIsOpen", "questionCompleted", "findWidgets",
 // added by src/editor.jsx, for widgets removing themselves
 // this is soooo not the right place for this, but alas.
 "onRemove",
@@ -870,17 +873,6 @@ const denylist = [
 "id",
 // Callbacks and items for interaction handling
 "onBlur", "onFocus", "trackInteraction", "keypadElement"];
-const removeDenylistProps = props => {
-  const newProps = {
-    ...props
-  };
-  for (const prop of denylist) {
-    if (prop in newProps) {
-      delete newProps[prop];
-    }
-  }
-  return newProps;
-};
 
 /* eslint-disable @babel/no-invalid-this */
 const USAGE = "Usage:\n" + "  this.change({propName: 5}, callback);\n" + '  this.change("propName", 5, callback);\n' + '  this.change("propName")';
@@ -1142,8 +1134,6 @@ class StubTagEditor extends React__namespace.Component {
  *  * nothing if it is purely a bug fix.
  *
  * Callbacks passed to Renderer/ItemRenderer:
- *  * onInputError:
- *    Called when there is an error grading a widget
  *  * onFocusChange: (newFocusPath, oldFocusPath, keypadDOMNode)
  *    Called when the user focus changes. The first two parameters are `path`
  *    arrays uniquely identifying the respect inputs. The third parameter,
@@ -1166,7 +1156,6 @@ class StubTagEditor extends React__namespace.Component {
 const ApiOptions = {
   propTypes: PropTypes__default["default"].shape({
     isArticle: PropTypes__default["default"].bool.isRequired,
-    onInputError: PropTypes__default["default"].func.isRequired,
     onFocusChange: PropTypes__default["default"].func.isRequired,
     GroupMetadataEditor: PropTypes__default["default"].func.isRequired,
     showAlignmentOptions: PropTypes__default["default"].bool.isRequired,
@@ -1250,7 +1239,6 @@ const ApiOptions = {
   defaults: {
     isArticle: false,
     isMobile: false,
-    onInputError: function () {},
     onFocusChange: function () {},
     GroupMetadataEditor: StubTagEditor,
     showAlignmentOptions: false,
@@ -2262,10 +2250,7 @@ const getDecimalSeparator = locale => {
  *   show the user an error. TODO(joel) - what error?
  * - Otherwise, pass through the resulting points and message.
  */
-function expressionValidator(userInput, rubric) {
-  let onInputError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
-  let strings = arguments.length > 3 ? arguments[3] : undefined;
-  let locale = arguments.length > 4 ? arguments[4] : undefined;
+function expressionValidator(userInput, rubric, strings, locale) {
   const options = ___default["default"].clone(rubric);
   ___default["default"].extend(options, {
     decimal_separator: getDecimalSeparator(locale)
@@ -2365,14 +2350,9 @@ function expressionValidator(userInput, rubric) {
     };
   }
   if (matchingAnswerForm.considered === "ungraded") {
-    // We matched an ungraded answer form - return "invalid", which
-    // will let the user try again with no penalty
-    const apiResult = onInputError(null,
-    // Reserved for some widget identifier
-    userInput, matchMessage);
     return {
       type: "invalid",
-      message: apiResult === false ? null : matchMessage
+      message: matchMessage
     };
   }
   // We matched a graded answer form, so we can now tell the user
@@ -2422,11 +2402,8 @@ class Expression extends React__namespace.Component {
   _isMounted = false;
 
   // TODO remove this in favor of just using expressionValidator
-  static validate(userInput, rubric) {
-    let onInputError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function () {};
-    let strings = arguments.length > 3 ? arguments[3] : undefined;
-    let locale = arguments.length > 4 ? arguments[4] : undefined;
-    return expressionValidator(userInput, rubric, onInputError, strings, locale);
+  static validate(userInput, rubric, strings, locale) {
+    return expressionValidator(userInput, rubric, strings, locale);
   }
   static getUserInputFromProps(props) {
     return normalizeTex(props.value);
@@ -2487,14 +2464,9 @@ class Expression extends React__namespace.Component {
         showErrorStyle: false
       });
       if (!this.parse(this.props.value, this.props).parsed) {
-        const apiResult = this.props.apiOptions.onInputError(null,
-        // reserved for some widget identifier
-        this.props.value, this.context.strings.ERROR_TITLE);
-        if (apiResult !== false) {
-          this.setState({
-            invalid: true
-          });
-        }
+        this.setState({
+          invalid: true
+        });
       }
     }
   };
@@ -2508,12 +2480,12 @@ class Expression extends React__namespace.Component {
       });
     }
   };
-  simpleValidate = (_ref, onInputError) => {
+  simpleValidate = _ref => {
     let {
       scoring,
       ...rubric
     } = _ref;
-    const score = expressionValidator(this.getUserInput(), rubric, onInputError || function () {}, this.context.strings, this.context.locale);
+    const score = expressionValidator(this.getUserInput(), rubric, this.context.strings, this.context.locale);
 
     // "scoring" is a flag that indicates when we are checking answers.
     // otherwise, we may just be checking validity after changes.
@@ -2528,9 +2500,9 @@ class Expression extends React__namespace.Component {
     }
     return score;
   };
-  getUserInput = () => {
+  getUserInput() {
     return Expression.getUserInputFromProps(this.props);
-  };
+  }
   change = (() => {
     var _this = this;
     return function () {
@@ -14815,7 +14787,7 @@ const pluck = function (table, subKey) {
  *   });
  * {a: 2, b: 3}
  */
-const mapObject$2 = function (obj, lambda) {
+const mapObject$1 = function (obj, lambda) {
   const result = {};
   ___default["default"].each(___default["default"].keys(obj), function (key) {
     // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type 'K'.
@@ -14841,7 +14813,7 @@ const mapObjectFromArray$1 = function (arr, lambda) {
 };
 var objective_ = {
   pluck: pluck,
-  mapObject: mapObject$2,
+  mapObject: mapObject$1,
   mapObjectFromArray: mapObjectFromArray$1
 };
 
@@ -19789,7 +19761,7 @@ class WidgetContainer extends React__namespace.Component {
 }
 
 const {
-  mapObject: mapObject$1,
+  mapObject,
   mapObjectFromArray
 } = objective_;
 const rContainsNonWhitespace = /\S/;
@@ -19817,9 +19789,6 @@ const isIdPathPrefix = function (prefixArray, wholeArray) {
   });
 };
 
-// The return type for getUserInput. Widgets have full control of what is
-// returned so it's not easily typed (some widgets return a scalar (string),
-// some return a custom-built object
 /**
  * The Widget type represents the common API that the Renderer uses to interact
  * with all widgets. All widgets must implement the methods in this API, unless
@@ -19829,6 +19798,7 @@ const isIdPathPrefix = function (prefixArray, wholeArray) {
  * communicate with the individual widgets to coordinate actions such as
  * scoring, state serialization/deserialization, and focus management.
  */
+
 class Renderer extends React__namespace.Component {
   _currentFocus;
   // @ts-expect-error - TS2564 - Property '_foundTextNodes' has no initializer and is not definitely assigned in the constructor.
@@ -20025,7 +19995,7 @@ class Renderer extends React__namespace.Component {
 
   // @ts-expect-error - TS2322 - Type '(props: Props) => Partial<Record<string, CategorizerWidget | CSProgramWidget | DefinitionWidget | DropdownWidget | ... 35 more ... | VideoWidget>>' is not assignable to type '(props: Props) => { [key: string]: PerseusWidget; }'.
   _getAllWidgetsInfo = props => {
-    return mapObject$1(props.widgets, (widgetInfo, widgetId) => {
+    return mapObject(props.widgets, (widgetInfo, widgetId) => {
       if (!widgetInfo.type || !widgetInfo.alignment) {
         const newValues = {};
         if (!widgetInfo.type) {
@@ -20172,7 +20142,7 @@ class Renderer extends React__namespace.Component {
    * state from that instead of the current widget props.
    */
   getSerializedState = widgetProps => {
-    return mapObject$1(widgetProps || this.state.widgetProps, (props, widgetId) => {
+    return mapObject(widgetProps || this.state.widgetProps, (props, widgetId) => {
       const widget = this.getWidgetInstance(widgetId);
       if (widget && widget.getSerializedState) {
         return widget.getSerializedState();
@@ -20208,7 +20178,7 @@ class Renderer extends React__namespace.Component {
       }
     };
     this.setState({
-      widgetProps: mapObject$1(serializedState, (props, widgetId) => {
+      widgetProps: mapObject(serializedState, (props, widgetId) => {
         const widget = this.getWidgetInstance(widgetId);
         if (widget && widget.restoreSerializedState) {
           // Note that we probably can't call
@@ -21083,7 +21053,6 @@ class Renderer extends React__namespace.Component {
    */
   scoreWidgets = () => {
     const widgetProps = this.state.widgetInfo;
-    const onInputError = this.getApiOptions().onInputError;
     const gradedWidgetIds = ___default["default"].filter(this.widgetIds, id => {
       const props = widgetProps[id];
       const widgetIsGraded = props?.graded == null || props.graded;
@@ -21100,7 +21069,7 @@ class Renderer extends React__namespace.Component {
         widgetScores[id] = widget.simpleValidate({
           ...props?.options,
           scoring: true
-        }, onInputError);
+        });
       }
     });
     return widgetScores;
@@ -21972,6 +21941,43 @@ const answerTypes = {
     forms: "pi"
   }
 };
+function inputNumberValidator(state, rubric, strings) {
+  if (rubric.answerType == null) {
+    rubric.answerType = "number";
+  }
+
+  // note(matthewc): this will get immediately parsed again by
+  // `KhanAnswerTypes.number.convertToPredicate`, but a string is
+  // expected here
+  const stringValue = `${rubric.value}`;
+  const val = KhanAnswerTypes.number.createValidatorFunctional(stringValue, {
+    simplify: rubric.simplify,
+    inexact: rubric.inexact || undefined,
+    maxError: rubric.maxError,
+    forms: answerTypes[rubric.answerType].forms
+  }, 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$1(state.currentValue);
+  const result = val(currentValue);
+
+  // TODO(eater): Seems silly to translate result to this invalid/points
+  // thing and immediately translate it back in ItemRenderer.scoreInput()
+  if (result.empty) {
+    return {
+      type: "invalid",
+      message: result.message
+    };
+  }
+  return {
+    type: "points",
+    earned: result.correct ? 1 : 0,
+    total: 1,
+    message: result.message
+  };
+}
+
 const formExamples$1 = {
   integer: function (options, strings) {
     return strings.integerExample;
@@ -22014,45 +22020,7 @@ class InputNumber extends React__namespace.Component {
     linterContext: PerseusLinter.linterContextDefault
   };
   static validate(state, rubric, strings) {
-    let onInputError = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : () => {};
-    if (rubric.answerType == null) {
-      rubric.answerType = "number";
-    }
-
-    // note(matthewc): this will get immediately parsed again by
-    // `KhanAnswerTypes.number.convertToPredicate`, but a string is
-    // expected here
-    const stringValue = `${rubric.value}`;
-    const val = KhanAnswerTypes.number.createValidatorFunctional(stringValue, {
-      simplify: rubric.simplify,
-      inexact: rubric.inexact || undefined,
-      maxError: rubric.maxError,
-      forms: answerTypes[rubric.answerType].forms
-    }, 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$1(state.currentValue);
-    const result = val(currentValue);
-
-    // TODO(eater): Seems silly to translate result to this invalid/points
-    // thing and immediately translate it back in ItemRenderer.scoreInput()
-    if (result.empty) {
-      // TODO(FEI-3867): remove null-check once we have APIOptionsInternal
-      const apiResult = onInputError?.(null,
-      // reserved for some widget identifier
-      state.currentValue, result.message);
-      return {
-        type: "invalid",
-        message: apiResult === false ? null : result.message
-      };
-    }
-    return {
-      type: "points",
-      earned: result.correct ? 1 : 0,
-      total: 1,
-      message: result.message
-    };
+    return inputNumberValidator(state, rubric, strings);
   }
   static getUserInputFromProps(props) {
     return {
@@ -22121,13 +22089,12 @@ class InputNumber extends React__namespace.Component {
       currentValue: newValue
     }, cb);
   };
-  getUserInput = () => {
+  getUserInput() {
     return InputNumber.getUserInputFromProps(this.props);
-  };
-  simpleValidate = (rubric, onInputError) => {
-    onInputError = onInputError || function () {};
-    return InputNumber.validate(this.getUserInput(), rubric, this.context.strings, onInputError);
-  };
+  }
+  simpleValidate(rubric) {
+    return inputNumberValidator(this.getUserInput(), rubric, this.context.strings);
+  }
   examples = () => {
     const {
       strings
@@ -22472,9 +22439,9 @@ class NumericInput extends React__namespace.Component {
     const allFormsAccepted = answerFormNames.length >= Object.keys(formExamples).length;
     return !noFormsAccepted && !allFormsAccepted;
   };
-  simpleValidate = rubric => {
+  simpleValidate(rubric) {
     return numericInputValidator(this.getUserInput(), rubric, this.context.strings);
-  };
+  }
   focus = () => {
     this.inputRef?.focus();
     return true;
@@ -22501,9 +22468,9 @@ class NumericInput extends React__namespace.Component {
       currentValue: newValue
     }, cb);
   };
-  getUserInput = () => {
+  getUserInput() {
     return NumericInput.getUserInputFromProps(this.props);
-  };
+  }
   handleChange = (newValue, cb) => {
     this.props.onChange({
       currentValue: newValue
@@ -22635,15 +22602,16 @@ var NumericInput$1 = {
  * Several widgets don't have "right"/"wrong" validation logic,
  * so this just says to move on past those widgets
  *
- * TODO: widgets that use this probably shouldn't have any
+ * TODO(LEMS-2396) widgets that use this probably shouldn't have any
  * validation logic and the thing validating an exercise
  * should just know to skip these
  */
 function noopValidator() {
+  let points = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 0;
   return {
     type: "points",
-    earned: 0,
-    total: 0,
+    earned: points,
+    total: points,
     message: null
   };
 }
@@ -22665,7 +22633,9 @@ class PassageRef extends React__namespace.Component {
     lineRange: null,
     content: null
   };
-  static validate(userInput, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
   componentDidMount() {
@@ -22687,11 +22657,10 @@ class PassageRef extends React__namespace.Component {
     this._isMounted = false;
   }
 
-  // TODO(tamarab): getUserInput needs to be updated to only return
-  // props input by the user. Currently returns all the widget's props.
-  getUserInput = () => {
-    return removeDenylistProps(this.props);
-  };
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  getUserInput() {
+    return null;
+  }
   change = (() => {
     var _this = this;
     return function () {
@@ -22727,9 +22696,11 @@ class PassageRef extends React__namespace.Component {
       }
     }
   };
-  simpleValidate = rubric => {
-    return PassageRef.validate(this.getUserInput(), rubric);
-  };
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   render() {
     const {
       strings
@@ -24133,6 +24104,56 @@ const styles$t = aphrodite.StyleSheet.create({
   }
 });
 
+function radioValidator(userInput, rubric, strings) {
+  const numSelected = userInput.choicesSelected.reduce((sum, selected) => {
+    return sum + (selected ? 1 : 0);
+  }, 0);
+  if (numSelected === 0) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+
+  // TODO: should numCorrect actually be on the rubric
+  // instead of the userInput?
+  if (userInput.numCorrect && userInput.numCorrect > 1 && numSelected !== userInput.numCorrect) {
+    return {
+      type: "invalid",
+      message: strings.chooseCorrectNum
+    };
+    // If NOTA and some other answer are checked, ...
+  }
+
+  // TODO: should noneOfTheAboveSelected be replaced with a
+  // combination of choicesSelected and noneOfTheAboveIndex?
+  if (userInput.noneOfTheAboveSelected && numSelected > 1) {
+    return {
+      type: "invalid",
+      message: strings.notNoneOfTheAbove
+    };
+  }
+  const correct = userInput.choicesSelected.every((selected, i) => {
+    let isCorrect;
+    // TODO: should noneOfTheAboveIndex actually be on the rubric
+    // instead of the userInput?
+    if (userInput.noneOfTheAboveIndex === i) {
+      isCorrect = rubric.choices.every((choice, j) => {
+        return i === j || !choice.correct;
+      });
+    } else {
+      isCorrect = !!rubric.choices[i].correct;
+    }
+    return isCorrect === selected;
+  });
+  return {
+    type: "points",
+    earned: correct ? 1 : 0,
+    total: 1,
+    message: null
+  };
+}
+
 // RenderProps is the return type for radio.jsx#transform
 
 class Radio$1 extends React__namespace.Component {
@@ -24148,46 +24169,7 @@ class Radio$1 extends React__namespace.Component {
     showSolutions: "none"
   };
   static validate(userInput, rubric, strings) {
-    const numSelected = userInput.choicesSelected.reduce((sum, selected) => {
-      return sum + (selected ? 1 : 0);
-    }, 0);
-    if (numSelected === 0) {
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    if (userInput.numCorrect && userInput.numCorrect > 1 && numSelected !== userInput.numCorrect) {
-      return {
-        type: "invalid",
-        message: strings.chooseCorrectNum
-      };
-      // If NOTA and some other answer are checked, ...
-    }
-
-    if (userInput.noneOfTheAboveSelected && numSelected > 1) {
-      return {
-        type: "invalid",
-        message: strings.notNoneOfTheAbove
-      };
-    }
-    const correct = userInput.choicesSelected.every((selected, i) => {
-      let isCorrect;
-      if (userInput.noneOfTheAboveIndex === i) {
-        isCorrect = rubric.choices.every((choice, j) => {
-          return i === j || !choice.correct;
-        });
-      } else {
-        isCorrect = !!rubric.choices[i].correct;
-      }
-      return isCorrect === selected;
-    });
-    return {
-      type: "points",
-      earned: correct ? 1 : 0,
-      total: 1,
-      message: null
-    };
+    return radioValidator(userInput, rubric, strings);
   }
   static getUserInputFromProps(props) {
     // Return checked inputs in the form {choicesSelected: [bool]}. (Dear
@@ -24372,12 +24354,12 @@ class Radio$1 extends React__namespace.Component {
     });
     this.props.trackInteraction();
   };
-  getUserInput = () => {
+  getUserInput() {
     return Radio$1.getUserInputFromProps(this.props);
-  };
-  simpleValidate = rubric => {
-    return Radio$1.validate(this.getUserInput(), rubric, this.context.strings);
-  };
+  }
+  simpleValidate(rubric) {
+    return radioValidator(this.getUserInput(), rubric, this.context.strings);
+  }
 
   /**
    * Turn on rationale display for the currently selected choices. Note that
@@ -24676,6 +24658,31 @@ var Radio = {
 /* eslint-disable import/no-named-as-default */
 var basicWidgets = [Radio, InputNumber$1, NumericInput$1, Expression$1];
 
+function categorizerValidator(userInput, rubric, strings) {
+  let completed = true;
+  let allCorrect = true;
+  rubric.values.forEach((value, i) => {
+    if (userInput.values[i] == null) {
+      completed = false;
+    }
+    if (userInput.values[i] !== value) {
+      allCorrect = false;
+    }
+  });
+  if (!completed) {
+    return {
+      type: "invalid",
+      message: strings.invalidSelection
+    };
+  }
+  return {
+    type: "points",
+    earned: allCorrect ? 1 : 0,
+    total: 1,
+    message: null
+  };
+}
+
 /* eslint-disable @khanacademy/ts-no-error-suppressions */
 class Categorizer extends React__namespace.Component {
   static contextType = PerseusI18nContext;
@@ -24689,28 +24696,7 @@ class Categorizer extends React__namespace.Component {
     uniqueId: ___default["default"].uniqueId("perseus_radio_")
   };
   static validate(userInput, rubric, strings) {
-    let completed = true;
-    let allCorrect = true;
-    rubric.values.forEach((value, i) => {
-      if (userInput.values[i] == null) {
-        completed = false;
-      }
-      if (userInput.values[i] !== value) {
-        allCorrect = false;
-      }
-    });
-    if (!completed) {
-      return {
-        type: "invalid",
-        message: strings.invalidSelection
-      };
-    }
-    return {
-      type: "points",
-      earned: allCorrect ? 1 : 0,
-      total: 1,
-      message: null
-    };
+    return categorizerValidator(userInput, rubric, strings);
   }
   static getUserInputFromProps(props) {
     return {
@@ -24727,9 +24713,9 @@ class Categorizer extends React__namespace.Component {
       return change.apply(_this, args);
     };
   })();
-  getUserInput = () => {
+  getUserInput() {
     return Categorizer.getUserInputFromProps(this.props);
-  };
+  }
   onChange(itemNum, catNum) {
     const values = [...this.props.values];
     // @ts-expect-error - TS2322 - Type 'number' is not assignable to type 'never'.
@@ -24737,9 +24723,9 @@ class Categorizer extends React__namespace.Component {
     this.change("values", values);
     this.props.trackInteraction();
   }
-  simpleValidate = rubric => {
-    return Categorizer.validate(this.getUserInput(), rubric, this.context.strings);
-  };
+  simpleValidate(rubric) {
+    return categorizerValidator(this.getUserInput(), rubric, this.context.strings);
+  }
   render() {
     const self = this;
 
@@ -25108,15 +25094,19 @@ class Definition extends React__namespace.Component {
     togglePrompt: "define me",
     definition: "definition goes here"
   };
-  static validate(userInput, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
-  getUserInput = () => {
+  getUserInput() {
     return {};
-  };
-  simpleValidate = rubric => {
-    return Definition.validate(this.getUserInput(), rubric);
-  };
+  }
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   render() {
     return /*#__PURE__*/React__namespace.createElement(DefinitionConsumer, null, _ref => {
       let {
@@ -25182,18 +25172,13 @@ class DeprecatedStandin extends React__default["default"].Component {
   static validate(userInput, rubric) {
     // Since this mean to replace an existing widget the learner
     // WILL earn points for this widget
-    return {
-      type: "points",
-      earned: 1,
-      total: 1,
-      message: null
-    };
+    return noopValidator(1);
   }
   getUserInput = () => {
     return {};
   };
   simpleValidate = rubric => {
-    return DeprecatedStandin.validate(this.getUserInput(), rubric);
+    return noopValidator(1);
   };
   render() {
     return /*#__PURE__*/React__default["default"].createElement("div", {
@@ -25259,14 +25244,14 @@ class Dropdown extends React__namespace.Component {
       selected: selected
     });
   };
-  getUserInput = () => {
+  getUserInput() {
     return {
       value: this.props.selected
     };
-  };
-  simpleValidate = rubric => {
+  }
+  simpleValidate(rubric) {
     return dropdownValidator(this.getUserInput(), rubric);
-  };
+  }
   render() {
     const children = [/*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
       key: "placeholder",
@@ -25331,7 +25316,9 @@ class Explanation extends React__namespace.Component {
     widgets: {},
     linterContext: PerseusLinter.linterContextDefault
   };
-  static validate(userInput, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
   componentDidMount() {
@@ -25355,12 +25342,14 @@ class Explanation extends React__namespace.Component {
     });
     this.props.trackInteraction();
   };
-  getUserInput = () => {
+  getUserInput() {
     return {};
-  };
-  simpleValidate = rubric => {
-    return Explanation.validate(this.getUserInput(), rubric);
-  };
+  }
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   render() {
     const promptText = this.state.expanded ? this.props.hidePrompt : this.props.showPrompt;
     const caretIcon = this.state.expanded ? caretUp__default["default"] : caretDown__default["default"];
@@ -26991,9 +26980,6 @@ class FunctionGrapher extends React__namespace.Component {
     }), this.props.model && this.renderPlot(), this.props.model && this.renderAsymptote(), this.props.model && points)));
   }
 }
-
-// Really this is props.plot, I think
-
 /* Widget and editor. */
 class Grapher extends React__namespace.Component {
   horizHairline;
@@ -27228,9 +27214,9 @@ class Group extends React__namespace.Component {
       return change.apply(_this, args);
     };
   })();
-  getUserInput = () => {
+  getUserInput() {
     return this.rendererRef?.getUserInput();
-  };
+  }
   getSerializedState = () => {
     return this.rendererRef?.getSerializedState();
   };
@@ -27240,9 +27226,9 @@ class Group extends React__namespace.Component {
     // (all our changes were in state):
     return null;
   };
-  simpleValidate = rubric => {
+  simpleValidate() {
     return this.rendererRef?.score();
-  };
+  }
 
   // Mobile API:
   getInputPaths = () => {
@@ -27538,7 +27524,9 @@ class ImageWidget extends React__namespace.Component {
     caption: "",
     linterContext: PerseusLinter.linterContextDefault
   };
-  static validate(userInput, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
   change = (() => {
@@ -27550,12 +27538,14 @@ class ImageWidget extends React__namespace.Component {
       return change.apply(_this, args);
     };
   })();
-  getUserInput = () => {
+  getUserInput() {
     return null;
-  };
-  simpleValidate = rubric => {
-    return ImageWidget.validate(this.getUserInput(), rubric);
-  };
+  }
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   focus = () => {}; // no-op
 
   render() {
@@ -27781,7 +27771,9 @@ class Interaction extends React__namespace.Component {
     },
     elements: []
   };
-  static validate(state, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
   state = {
@@ -27891,16 +27883,18 @@ class Interaction extends React__namespace.Component {
       return change.apply(_this, args);
     };
   })();
-  getUserInput = () => {
+  getUserInput() {
     // TODO(eater): Perhaps we want to be able to record the state of the
     // user's interaction. Unfortunately sending all the props will
     // probably make the attempt payload too large. So for now, don't send
     // anything.
     return {};
-  };
-  simpleValidate = rubric => {
-    return Interaction.validate(this.getUserInput(), rubric);
-  };
+  }
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   render() {
     const range = this.props.graph.range;
     let labels = this.props.graph.labels;
@@ -29963,12 +29957,26 @@ function GraphLockedLabelsLayer(props) {
         key: `label-${i}`
       }, figure));
     }
-    if (flags?.["mafs"]?.["locked-point-labels"] && figure.type === "point") {
+    if (
+    // Point flag + point type
+    flags?.["mafs"]?.["locked-point-labels"] && figure.type === "point" ||
+    // Line flag + line type
+    flags?.["mafs"]?.["locked-line-labels"] && figure.type === "line" ||
+    // Vector flag + vector type
+    flags?.["mafs"]?.["locked-vector-labels"] && figure.type === "vector" ||
+    // Ellipse flag + ellipse type
+    flags?.["mafs"]?.["locked-ellipse-labels"] && figure.type === "ellipse" ||
+    // Function flag + function type
+    flags?.["mafs"]?.["locked-function-labels"] && figure.type === "function") {
       return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, {
-        key: `point-${i}`
-      }, figure.labels.map((label, j) => /*#__PURE__*/React__namespace.createElement(LockedLabel, _extends({
-        key: `locked-figure-${i}-label-${j}`
-      }, label))));
+        key: i
+      }, figure.labels?.map((label, j) => /*#__PURE__*/React__namespace.createElement(LockedLabel, _extends({
+        key: `${i}-label-${j}`
+      }, label))), figure.type === "line" && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, figure.points[0].labels?.map((label, k) => /*#__PURE__*/React__namespace.createElement(LockedLabel, _extends({
+        key: `locked-figure-${i}-point-1-label-${k}`
+      }, label))), figure.points[1].labels?.map((label, k) => /*#__PURE__*/React__namespace.createElement(LockedLabel, _extends({
+        key: `locked-figure-${i}-point-2-label-${k}`
+      }, label)))));
     }
     return null;
   });
@@ -30308,7 +30316,9 @@ const GraphLockedLayer = props => {
 
 const actions = {
   global: {
-    deleteIntent
+    deleteIntent,
+    changeInteractionMode,
+    changeKeyboardInvitationVisibility
   },
   angle: {
     movePoint
@@ -30400,6 +30410,20 @@ function clickPoint(index) {
     index
   };
 }
+const CHANGE_INTERACTION_MODE = "point-change-interaction-mode";
+function changeInteractionMode(mode) {
+  return {
+    type: CHANGE_INTERACTION_MODE,
+    mode
+  };
+}
+const CHANGE_KEYBOARD_INVITATION_VISIBILITY = "change-keyboard-interaction-invitation-visibility";
+function changeKeyboardInvitationVisibility(shouldShow) {
+  return {
+    type: CHANGE_KEYBOARD_INVITATION_VISIBILITY,
+    shouldShow
+  };
+}
 const MOVE_ALL = "move-all";
 function moveAll(delta) {
   return {
@@ -32068,7 +32092,7 @@ function Protractor() {
   const [[xMin, xMax], [yMin, yMax]] = range;
   // Position the protractor in the center of the graph (horizontally), and
   // 95% of the way to the bottom of the graph (vertically).
-  const initialCenter = [lerp(xMin, xMax, 0.5), lerp(yMin, yMax, 0.05)];
+  const initialCenter = [lerp(xMin, xMax, 0.5), lerp(yMin, yMax, 0.25)];
   const [center, setCenter] = React.useState(initialCenter);
   const [rotationHandleOffset, setRotationHandleOffset] = React.useState(centerToRotationHandle);
   const draggableRef = React.useRef(null);
@@ -32229,6 +32253,9 @@ const MafsGraph = props => {
     x: viewboxX,
     y: viewboxY
   };
+  const {
+    strings
+  } = usePerseusI18n();
   return /*#__PURE__*/React__namespace.createElement(GraphConfigContext.Provider, {
     value: {
       range: state.range,
@@ -32257,15 +32284,18 @@ const MafsGraph = props => {
       height
     },
     onKeyUp: event => {
-      if (event.key === "Backspace") {
-        dispatch(actions.global.deleteIntent());
-        graphRef.current?.focus();
-      }
+      handleKeyboardEvent(event, state, dispatch);
     },
     "aria-label": fullGraphAriaLabel,
     "aria-describedby": fullGraphAriaDescription ? descriptionId : undefined,
     ref: graphRef,
-    tabIndex: 0
+    tabIndex: 0,
+    onFocus: event => {
+      handleFocusEvent(event, state, dispatch);
+    },
+    onBlur: event => {
+      handleBlurEvent(event, state, dispatch);
+    }
   }, fullGraphAriaDescription && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     id: descriptionId,
     tabIndex: -1,
@@ -32327,35 +32357,75 @@ const MafsGraph = props => {
   }, /*#__PURE__*/React__namespace.createElement("svg", nestedSVGAttributes, props.showProtractor && /*#__PURE__*/React__namespace.createElement(Protractor, null), renderGraph({
     state,
     dispatch
-  })))))), renderGraphControls({
+  }))))), state.type === "point" && state.showKeyboardInteractionInvitation && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: {
+      textAlign: "center",
+      backgroundColor: "white",
+      border: "1px solid #21242C52",
+      padding: "16px 0",
+      boxShadow: "0px 8px 8px 0px #21242C14",
+      // This translates the box to the center of the
+      // graph Then backs it off by half of its
+      // overall height so it's perfectly centered
+      top: "50%",
+      transform: "translateY(-50%)"
+    }
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, null, strings.graphKeyboardPrompt))), renderGraphControls({
     state,
     dispatch,
-    width
+    width,
+    strings
   })));
 };
-const renderPointGraphControls = props => /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-  style: {
-    flexDirection: "row",
-    width: props.width
-  }
-}, props.state.showRemovePointButton && props.state.focusedPointIndex !== null && /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
-  id: REMOVE_BUTTON_ID,
-  kind: "secondary",
-  color: "destructive",
-  tabIndex: -1,
-  style: {
-    width: "100%",
-    marginLeft: "20px"
-  },
-  onClick: event => {
-    props.dispatch(actions.pointGraph.removePoint(props.state.focusedPointIndex));
-  }
-}, "Remove Point"));
+const renderPointGraphControls = props => {
+  const {
+    interactionMode,
+    showRemovePointButton,
+    focusedPointIndex
+  } = props.state;
+  const {
+    strings
+  } = props;
+  const shouldShowRemoveButton = showRemovePointButton && focusedPointIndex !== null;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: {
+      flexDirection: "row",
+      width: props.width
+    }
+  }, interactionMode === "keyboard" && /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "secondary",
+    style: {
+      width: "100%",
+      marginLeft: "20px"
+    },
+    tabIndex: 0,
+    onClick: () => {
+      props.dispatch(actions.pointGraph.addPoint([0, 0]));
+    }
+  }, strings.addPoint), interactionMode === "mouse" && /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    id: REMOVE_BUTTON_ID,
+    kind: "secondary",
+    color: "destructive"
+    // This button is meant to be interacted with by the mouse only
+    // Never allow learners to tab to this button
+    ,
+    tabIndex: -1,
+    style: {
+      width: "100%",
+      marginLeft: "20px",
+      visibility: shouldShowRemoveButton ? "visible" : "hidden"
+    },
+    onClick: event => {
+      props.dispatch(actions.pointGraph.removePoint(props.state.focusedPointIndex));
+    }
+  }, strings.removePoint));
+};
 const renderGraphControls = props => {
   const {
     state,
     dispatch,
-    width
+    width,
+    strings
   } = props;
   const {
     type
@@ -32366,7 +32436,8 @@ const renderGraphControls = props => {
         return renderPointGraphControls({
           state,
           dispatch,
-          width
+          width,
+          strings
         });
       }
       return null;
@@ -32374,6 +32445,34 @@ const renderGraphControls = props => {
       return null;
   }
 };
+function handleFocusEvent(event, state, dispatch) {
+  if (state.type === "point" && state.numPoints === "unlimited") {
+    if (event.target.classList.contains("mafs-graph") && state.interactionMode === "mouse") {
+      dispatch(actions.global.changeKeyboardInvitationVisibility(true));
+    }
+  }
+}
+function handleBlurEvent(event, state, dispatch) {
+  if (state.type === "point" && state.numPoints === "unlimited") {
+    dispatch(actions.global.changeKeyboardInvitationVisibility(false));
+  }
+}
+function handleKeyboardEvent(event, state, dispatch) {
+  if (state.type === "point" && state.numPoints === "unlimited") {
+    if (event.key === "Backspace") {
+      dispatch(actions.global.deleteIntent());
+
+      // After removing a point blur
+      // It would be nice if this could focus on the graph but doing so
+      // would trigger the message to prompt a learner to enter keyboard mode
+      document.activeElement.blur();
+    } else if (event.shiftKey && event.key === "Enter") {
+      dispatch(actions.global.changeInteractionMode("keyboard"));
+    } else if (state.interactionMode === "keyboard" && event.key === "a") {
+      dispatch(actions.pointGraph.addPoint([0, 0]));
+    }
+  }
+}
 
 // Calculate the difference between the min and max values of a range
 const getRangeDiff = range => {
@@ -32543,7 +32642,9 @@ function initializeGraphState(params) {
         coords: getPointCoords(graph, range, step),
         numPoints: graph.numPoints || 0,
         focusedPointIndex: null,
-        showRemovePointButton: false
+        showRemovePointButton: false,
+        interactionMode: "mouse",
+        showKeyboardInteractionInvitation: false
       };
     case "circle":
       return {
@@ -32816,6 +32917,10 @@ function interactiveGraphReducer(state, action) {
       return doDeleteIntent(state);
     case CLICK_POINT:
       return doClickPoint(state, action);
+    case CHANGE_INTERACTION_MODE:
+      return doChangeInteractionMode(state, action);
+    case CHANGE_KEYBOARD_INVITATION_VISIBILITY:
+      return doChangeKeyboardInvitationVisibility(state, action);
     default:
       throw new wonderStuffCore.UnreachableCaseError(action);
   }
@@ -32867,6 +32972,33 @@ function doClickPoint(state, action) {
   }
   return state;
 }
+function doChangeInteractionMode(state, action) {
+  if (state.type !== "point") {
+    return state;
+  }
+  if (state.numPoints === "unlimited") {
+    const nextKeyboardInvitation = action.mode === "keyboard" ? false : state.showKeyboardInteractionInvitation;
+    return {
+      ...state,
+      interactionMode: action.mode,
+      showKeyboardInteractionInvitation: nextKeyboardInvitation
+    };
+  }
+  return state;
+}
+function doChangeKeyboardInvitationVisibility(state, action) {
+  if (state.type !== "point") {
+    return state;
+  }
+  if (state.numPoints === "unlimited") {
+    return {
+      ...state,
+      showKeyboardInteractionInvitation: action.shouldShow,
+      hasBeenInteractedWith: true
+    };
+  }
+  return state;
+}
 function doMovePointInFigure(state, action) {
   switch (state.type) {
     case "segment":
@@ -33635,7 +33767,7 @@ const StatefulMafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref)
   const snapTo = graph.type === "polygon" ? graph.snapTo : null;
   const showAngles = graph.type === "polygon" ? graph.showAngles : null;
   const showSides = graph.type === "polygon" ? graph.showSides : null;
-  const startCoords = "startCoords" in graph ? graph.startCoords : null;
+  const startCoords = "startCoords" in graph ? graph.startCoords : undefined;
   const originalPropsRef = React.useRef(props);
   const latestPropsRef = wonderBlocksCore.useLatestRef(props);
   React.useEffect(() => {
@@ -34923,17 +35055,17 @@ class InteractiveGraph extends React__namespace.Component {
       type: "linear"
     }
   };
-  getUserInput = () => {
-    if (this.mafsRef.current) {
-      return this.mafsRef.current.getUserInput?.();
+  getUserInput() {
+    if (this.mafsRef.current?.getUserInput) {
+      return this.mafsRef.current.getUserInput();
     }
-    if (this.legacyGraphRef.current) {
+    if (this.legacyGraphRef.current?.getUserInput) {
       return this.legacyGraphRef.current.getUserInput();
     }
     throw new perseusCore.PerseusError("Cannot getUserInput from a graph that has never rendered", perseusCore.Errors.NotAllowed);
-  };
+  }
   simpleValidate(rubric) {
-    return InteractiveGraph.validate(this.getUserInput?.(), rubric, this);
+    return InteractiveGraph.validate(this.getUserInput(), rubric, this);
   }
   render() {
     // Mafs shim
@@ -36600,6 +36732,57 @@ const styles$h = aphrodite.StyleSheet.create({
   }
 });
 
+// Question state for marker as result of user selected answers.
+
+function scoreMarker(marker) {
+  const score = {
+    hasAnswers: false,
+    isCorrect: false
+  };
+  if (marker.selected && marker.selected.length > 0) {
+    score.hasAnswers = true;
+  }
+  if (marker.answers.length > 0) {
+    if (marker.selected && marker.selected.length === marker.answers.length) {
+      // All correct answers are selected by the user.
+      score.isCorrect = marker.selected.every(choice => marker.answers.includes(choice));
+    }
+  } else if (!marker.selected || marker.selected.length === 0) {
+    // Correct as no answers should be selected by the user.
+    score.isCorrect = true;
+  }
+  return score;
+}
+function labelImageValidator(state, rubric) {
+  let numAnswered = 0;
+  let numCorrect = 0;
+  for (const marker of state.markers) {
+    const score = scoreMarker(marker);
+    if (score.hasAnswers) {
+      numAnswered++;
+    }
+    if (score.isCorrect) {
+      numCorrect++;
+    }
+  }
+
+  // We expect all question markers to be answered before grading.
+  if (numAnswered !== state.markers.length) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  return {
+    type: "points",
+    // Markers with no expected answers are graded as correct if user
+    // makes no answer selection.
+    earned: numCorrect === state.markers.length ? 1 : 0,
+    total: 1,
+    message: null
+  };
+}
+
 const BringToFront = {
   boxShadow: `0 8px 8px ${wonderBlocksTokens.color.offBlack64}`,
   zIndex: 1000
@@ -36860,61 +37043,15 @@ const styles$f = aphrodite.StyleSheet.create({
  * No diagonals allowed.
  */
 
+// TODO: should this be using WidgetProps / PerseusLabelImageWidgetOptions?
+
 class LabelImage extends React__namespace.Component {
   static contextType = PerseusI18nContext;
   // The rendered markers on the question image for labeling.
   _markers;
   _mounted = false;
-  static gradeMarker(marker) {
-    const score = {
-      hasAnswers: false,
-      isCorrect: false
-    };
-    if (marker.selected && marker.selected.length > 0) {
-      // @ts-expect-error - TS2540 - Cannot assign to 'hasAnswers' because it is a read-only property.
-      score.hasAnswers = true;
-    }
-    if (marker.answers.length > 0) {
-      if (marker.selected && marker.selected.length === marker.answers.length) {
-        // All correct answers are selected by the user.
-        // @ts-expect-error - TS2540 - Cannot assign to 'isCorrect' because it is a read-only property.
-        score.isCorrect = marker.selected.every(choice => marker.answers.includes(choice));
-      }
-    } else if (!marker.selected || marker.selected.length === 0) {
-      // Correct as no answers should be selected by the user.
-      // @ts-expect-error - TS2540 - Cannot assign to 'isCorrect' because it is a read-only property.
-      score.isCorrect = true;
-    }
-    return score;
-  }
   static validate(state, rubric) {
-    let numAnswered = 0;
-    let numCorrect = 0;
-    for (const marker of state.markers) {
-      const score = LabelImage.gradeMarker(marker);
-      if (score.hasAnswers) {
-        numAnswered++;
-      }
-      if (score.isCorrect) {
-        numCorrect++;
-      }
-    }
-
-    // We expect all question markers to be answered before grading.
-    if (numAnswered !== state.markers.length) {
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    return {
-      type: "points",
-      // Markers with no expected answers are graded as correct if user
-      // makes no answer selection.
-      earned: numCorrect === state.markers.length ? 1 : 0,
-      total: 1,
-      message: null
-    };
+    return labelImageValidator(state);
   }
 
   /**
@@ -37109,7 +37246,7 @@ class LabelImage extends React__namespace.Component {
     this._mounted = false;
   }
   simpleValidate(rubric) {
-    return LabelImage.validate(this.getUserInput(), rubric);
+    return labelImageValidator(this.getUserInput());
   }
   getUserInput() {
     const {
@@ -37127,7 +37264,7 @@ class LabelImage extends React__namespace.Component {
       onChange
     } = this.props;
     const updatedMarkers = markers.map(marker => {
-      const score = LabelImage.gradeMarker(marker);
+      const score = scoreMarker(marker);
       return {
         ...marker,
         // Reveal correctness state for markers with answers.
@@ -37276,7 +37413,7 @@ class LabelImage extends React__namespace.Component {
           bottom: "top"
         }[markerPosition];
       }
-      const score = LabelImage.gradeMarker(marker);
+      const score = scoreMarker(marker);
       // Once the question is answered, show markers
       // with correct answers, otherwise passthrough
       // the correctness state.
@@ -37482,9 +37619,7 @@ const LabelImageWithDependencies = /*#__PURE__*/React__namespace.forwardRef((pro
 // methods and instead adjust Peresus to provide these facilities through
 // instance methods on our Renderers.
 // @ts-expect-error - TS2339 - Property 'validate' does not exist on type
-LabelImageWithDependencies.validate = LabelImage.validate;
-// @ts-expect-error - TS2339 - Property 'gradeMarker' does not exist on type
-LabelImageWithDependencies.gradeMarker = LabelImage.gradeMarker;
+LabelImageWithDependencies.validate = labelImageValidator;
 var LabelImage$1 = {
   name: "label-image",
   displayName: "Label Image",
@@ -38273,10 +38408,10 @@ class Matcher extends React__namespace.Component {
     // @ts-expect-error - TS2339 - Property 'moveOptionToIndex' does not exist on type 'ReactInstance'.
     this.refs.right.moveOptionToIndex(option, index);
   };
-  simpleValidate = rubric => {
+  simpleValidate(rubric) {
     // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Matcher'.
     return Matcher.validate(this.getUserInput(), rubric);
-  };
+  }
   render() {
     // To minimize layout shift, we display a spinner until our math
     // renderer is ready to render the math inside the matcher. To
@@ -38519,7 +38654,9 @@ class Matrix extends React__namespace.Component {
           hasEmptyCell = true;
         }
         if (!incorrectSize) {
-          const validator = createValidator(solution[row][col], {
+          const validator = createValidator(
+          // @ts-expect-error - TS2345 - Argument of type 'number' is not assignable to parameter of type 'string'.
+          solution[row][col], {
             simplify: true
           }, strings);
           const result = validator(supplied[row][col]);
@@ -38691,14 +38828,14 @@ class Matrix extends React__namespace.Component {
     }, cb);
     this.props.trackInteraction();
   };
-  getUserInput = () => {
+  getUserInput() {
     return {
       answers: this.props.answers
     };
-  };
-  simpleValidate = rubric => {
+  }
+  simpleValidate(rubric) {
     return Matrix.validate(this.getUserInput(), rubric, this.context.strings);
-  };
+  }
   render() {
     // Set the input sizes through JS so we can control the size of the
     // brackets. (If we set them in CSS we won't know values until the
@@ -38981,9 +39118,8 @@ const Measurer = createReactClass__default["default"]({
   getUserInput: function () {
     return {};
   },
-  simpleValidate: function (rubric) {
-    // TODO(joel) - I don't understand how this is useful!
-    return Measurer.validate(this.getUserInput(), rubric);
+  simpleValidate: function () {
+    return noopValidator(1);
   },
   focus: $__default["default"].noop,
   render: function () {
@@ -39012,14 +39148,7 @@ const Measurer = createReactClass__default["default"]({
   }
 });
 ___default["default"].extend(Measurer, {
-  validate: function (state, rubric) {
-    return {
-      type: "points",
-      earned: 1,
-      total: 1,
-      message: null
-    };
-  }
+  validate: noopValidator(1)
 });
 const propUpgrades = {
   "1": v0props => {
@@ -39914,23 +40043,19 @@ class MoleculeWidget extends React__namespace.Component {
   static defaultProps = {
     rotationAngle: 0
   };
-  simpleValidate = () => {
-    return {
-      type: "points",
-      earned: 0,
-      total: 0,
-      message: null
-    };
-  };
-  getUserInput = () => {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
+  getUserInput() {
     return [];
-  };
-  validate = (state, rubric) => {
-    // TODO(colin): this is here as part of the interface for a component.
-    // Figure out if there is something more appropriate that this should
-    // return.
+  }
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  validate() {
     return noopValidator();
-  };
+  }
   render() {
     return /*#__PURE__*/React__namespace.createElement(Molecule, {
       widgetId: this.props.widgetId,
@@ -40071,6 +40196,9 @@ const TickMarks = Graphie.createSimpleClass((graphie, props) => {
   });
   return results;
 });
+
+// TODO: most widgets use some like Widget<Something, PerseusNumberLineWidgetOptions>
+// should this one?
 class NumberLine extends React__namespace.Component {
   static contextType = PerseusI18nContext;
   static defaultProps = {
@@ -40372,18 +40500,18 @@ class NumberLine extends React__namespace.Component {
       arrows: "->"
     });
   };
-  getUserInput = () => {
+  getUserInput() {
     return {
       numLinePosition: this.props.numLinePosition,
       rel: this.props.isInequality ? this.props.rel : "eq",
       numDivisions: this.props.numDivisions,
       divisionRange: this.props.divisionRange
     };
-  };
-  simpleValidate = rubric => {
+  }
+  simpleValidate(rubric) {
     // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof NumberLine'.
     return NumberLine.validate(this.getUserInput(), rubric);
-  };
+  }
   render() {
     const {
       strings
@@ -40443,6 +40571,8 @@ ___default["default"].extend(NumberLine, {
     const correctRel = rubric.correctRel || "eq";
     const correctPos = kmath.number.equal(state.numLinePosition, rubric.correctX || 0);
     const outsideAllowedRange = state.numDivisions > divisionRange[1] || state.numDivisions < divisionRange[0];
+
+    // TODO: I don't think isTickCrtl is a thing anymore
     if (state.isTickCrtl && outsideAllowedRange) {
       return {
         type: "invalid",
@@ -40695,8 +40825,8 @@ class Card extends React__namespace.Component {
     }))));
   }
 }
-const NORMAL = "normal",
-  HORIZONTAL = "horizontal";
+const NORMAL = "normal";
+const HORIZONTAL = "horizontal";
 class Orderer extends React__namespace.Component {
   static defaultProps = {
     current: [],
@@ -40951,17 +41081,17 @@ class Orderer extends React__namespace.Component {
       current: list
     });
   };
-  getUserInput = () => {
+  getUserInput() {
     return {
       current: ___default["default"].map(this.props.current, function (v) {
         return v.content;
       })
     };
-  };
-  simpleValidate = rubric => {
+  }
+  simpleValidate(rubric) {
     // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Orderer'.
     return Orderer.validate(this.getUserInput(), rubric);
-  };
+  }
   render() {
     // This is the card we are currently dragging
     const dragging = this.state.dragging && /*#__PURE__*/React__namespace.createElement(Card
@@ -41067,14 +41197,14 @@ class Orderer extends React__namespace.Component {
   }
 }
 ___default["default"].extend(Orderer, {
-  validate: function (state, rubric) {
-    if (state.current.length === 0) {
+  validate: function (userInput, rubric) {
+    if (userInput.current.length === 0) {
       return {
         type: "invalid",
         message: null
       };
     }
-    const correct = ___default["default"].isEqual(state.current, ___default["default"].pluck(rubric.correctOptions, "content"));
+    const correct = ___default["default"].isEqual(userInput.current, ___default["default"].pluck(rubric.correctOptions, "content"));
     return {
       type: "points",
       earned: correct ? 1 : 0,
@@ -42896,7 +43026,9 @@ class Passage extends React__namespace.Component {
     startLineNumbersAfter: 0,
     stylesAreApplied: false
   };
-  static validate(state, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
   componentDidMount() {
@@ -43116,8 +43248,10 @@ class Passage extends React__namespace.Component {
   getUserInput() {
     return null;
   }
-  simpleValidate(rubric) {
-    return Passage.validate(this.getUserInput(), rubric);
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
   }
 
   /**
@@ -43273,14 +43407,16 @@ class PassageRefTarget extends React__namespace.Component {
     content: "",
     linterContext: PerseusLinter.linterContextDefault
   };
-  static validate(state, rubric) {
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
 
   // TODO passage-ref-target isn't interactive; remove
-  getUserInput = () => {
-    return;
-  };
+  getUserInput() {
+    return null;
+  }
 
   // TODO passage-ref-target isn't interactive; remove
   change = (() => {
@@ -43293,10 +43429,10 @@ class PassageRefTarget extends React__namespace.Component {
     };
   })();
 
-  // TODO passage-ref-target isn't interactive; remove
-  simpleValidate = rubric => {
-    return PassageRefTarget.validate(this.getUserInput(), rubric);
-  };
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   render() {
     return /*#__PURE__*/React__namespace.createElement(Renderer, {
       content: this.props.content
@@ -43332,9 +43468,6 @@ var PassageRefTarget$1 = {
  * This is a PhET simulation widget. It is used for rendering simulations
  * from https://phet.colorado.edu/.
  */
-
-// For returning user input, but currently the PhET widget
-// does not support accessing user input
 // This renders the PhET sim
 class PhetSimulation extends React__namespace.Component {
   static contextType = PerseusI18nContext;
@@ -43357,6 +43490,8 @@ class PhetSimulation extends React__namespace.Component {
       await this.updateSimState(this.props.url);
     }
   }
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
   getUserInput() {
     return null;
   }
@@ -44306,13 +44441,13 @@ class Plotter extends React__namespace.Component {
       });
     });
   };
-  getUserInput = () => {
+  getUserInput() {
     return this.state.values;
-  };
-  simpleValidate = rubric => {
+  }
+  simpleValidate(rubric) {
     // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Plotter'.
     return Plotter.validate(this.getUserInput(), rubric);
-  };
+  }
   render() {
     // TODO(kevinb) actually compute the size of the graphie correctly and
     // make it that size so we don't have to add extra padding.  The value
@@ -44331,8 +44466,8 @@ class Plotter extends React__namespace.Component {
   }
 }
 ___default["default"].extend(Plotter, {
-  validate: function (guess, rubric) {
-    if (deepEq(guess, rubric.starting)) {
+  validate: function (userInput, rubric) {
+    if (deepEq(userInput, rubric.starting)) {
       return {
         type: "invalid",
         message: null
@@ -44340,7 +44475,7 @@ ___default["default"].extend(Plotter, {
     }
     return {
       type: "points",
-      earned: deepEq(guess, rubric.correct) ? 1 : 0,
+      earned: deepEq(userInput, rubric.correct) ? 1 : 0,
       total: 1,
       message: null
     };
@@ -44403,6 +44538,28 @@ var PythonProgram$1 = {
   widget: PythonProgram
 };
 
+function sorterValidator(userInput, rubric) {
+  // If the sorter widget hasn't been changed yet, we treat it as "empty" which
+  // prevents the "Check" button from becoming active. We want the user
+  // to make a change before trying to move forward. This makes an
+  // assumption that the initial order isn't the correct order! However,
+  // this should be rare if it happens, and interacting with the list
+  // will enable the button, so they won't be locked out of progressing.
+  if (!userInput.changed) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  const correct = Util.deepEq(userInput.options, rubric.correct);
+  return {
+    type: "points",
+    earned: correct ? 1 : 0,
+    total: 1,
+    message: null
+  };
+}
+
 const {
   shuffle
 } = Util;
@@ -44416,14 +44573,8 @@ class Sorter extends React__namespace.Component {
     onChange: function () {},
     linterContext: PerseusLinter.linterContextDefault
   };
-  static validate(state, rubric) {
-    const correct = ___default["default"].isEqual(state.options, rubric.correct);
-    return {
-      type: "points",
-      earned: correct ? 1 : 0,
-      total: 1,
-      message: null
-    };
+  static validate(userInput, rubric) {
+    return sorterValidator(userInput, rubric);
   }
   state = {
     changed: false
@@ -44453,33 +44604,23 @@ class Sorter extends React__namespace.Component {
       }, 0);
     });
   };
-  getUserInput = () => {
+  getUserInput() {
     // eslint-disable-next-line react/no-string-refs
     // @ts-expect-error - TS2339 - Property 'getOptions' does not exist on type 'ReactInstance'.
+    const options = this.refs.sortable.getOptions();
     return {
-      options: this.refs.sortable.getOptions()
+      options,
+      changed: this.state.changed
     };
-  };
+  }
   moveOptionToIndex = (option, index) => {
     // eslint-disable-next-line react/no-string-refs
     // @ts-expect-error - TS2339 - Property 'moveOptionToIndex' does not exist on type 'ReactInstance'.
     this.refs.sortable.moveOptionToIndex(option, index);
   };
-  simpleValidate = rubric => {
-    // If this widget hasn't been changed yet, we treat it as "empty" which
-    // prevents the "Check" button from becoming active. We want the user
-    // to make a change before trying to move forward. This makes an
-    // assumption that the initial order isn't the correct order! However,
-    // this should be rare if it happens, and interacting with the list
-    // will enable the button, so they won't be locked out of progressing.
-    if (!this.state.changed) {
-      return {
-        type: "invalid",
-        message: null
-      };
-    }
-    return Sorter.validate(this.getUserInput(), rubric);
-  };
+  simpleValidate(rubric) {
+    return sorterValidator(this.getUserInput(), rubric);
+  }
   render() {
     const options = shuffle(this.props.correct, this.props.problemNum, /* ensurePermuted */true);
     const {
@@ -44559,9 +44700,9 @@ class Table extends React__namespace.Component {
   _getColumns = () => {
     return this.props.answers[0].length;
   };
-  getUserInput = () => {
+  getUserInput() {
     return ___default["default"].map(this.props.answers, ___default["default"].clone);
-  };
+  }
   onValueChange = (row, column, eventOrValue) => {
     const answers = ___default["default"].map(this.props.answers, ___default["default"].clone);
 
@@ -44581,10 +44722,10 @@ class Table extends React__namespace.Component {
       headers: headers
     });
   };
-  simpleValidate = rubric => {
+  simpleValidate(rubric) {
     // @ts-expect-error - TS2339 - Property 'validate' does not exist on type 'typeof Table'.
     return Table.validate(this.getUserInput(), rubric, this.context.strings);
-  };
+  }
   _handleFocus = inputPath => {
     this.props.onFocus(inputPath);
   };
@@ -44880,16 +45021,18 @@ class Video extends React__namespace.Component {
    * This is the widget's grading function.
    * Points for videos are tallied by the embedded video itself, in the case
    * of Khan Academy videos.
-   */
-  static validate(userInput, rubric) {
+   */ // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  static validate() {
     return noopValidator();
   }
   getUserInput = () => {
     return null;
   };
-  simpleValidate = rubric => {
-    return Video.validate(null, rubric);
-  };
+
+  // TODO (LEMS-2396): remove validation logic from widgets that don't validate
+  simpleValidate() {
+    return noopValidator();
+  }
   change = (() => {
     var _this = this;
     return function () {
@@ -45002,7 +45145,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "34.0.0";
+const libVersion = "35.0.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -45556,9 +45699,6 @@ const defaultContext = {
 };
 const context = /*#__PURE__*/React__namespace.createContext(defaultContext);
 
-const {
-  mapObject
-} = objective_;
 class ServerItemRenderer extends React__namespace.Component {
   static contextType = PerseusI18nContext;
   // @ts-expect-error - TS2564 - Property 'questionRenderer' has no initializer and is not definitely assigned in the constructor.
@@ -45774,20 +45914,6 @@ class ServerItemRenderer extends React__namespace.Component {
     return this.questionRenderer.getWidgetIds();
   }
 
-  /**
-   * Returns an object mapping from widget ID to KE-style score.
-   * The keys of this object are the values of the array returned
-   * from `getWidgetIds`.
-   */
-  scoreWidgets() {
-    const qScore = this.questionRenderer.scoreWidgets();
-    const qGuess = this.questionRenderer.getUserInputForWidgets();
-    const state = this.questionRenderer.getSerializedState();
-    return mapObject(qScore, (score, id) => {
-      return Util.keScoreFromPerseusScore(score, qGuess[id], state);
-    });
-  }
-
   /**
    * Get a representation of the current state of the item.
    */