@khanacademy/perseus-editor 5.2.14 → 6.0.0

package/dist/es/index.js

@@ -1,5 +1,5 @@
 import { addLibraryVersionToPerseusDebug } from '@khanacademy/perseus-core';
-import { constants, components, Widgets, icons, WIDGET_PROP_DENYLIST, Util, Log, PerseusError, Errors, PerseusMarkdown, preprocessTex, ApiOptions, buildMapper, itemToTree, buildEmptyItemTreeForShape, shapes, ItemExtras, itemDataVersion, ClassNames, MultiItems, traverse, Categorizer as Categorizer$1, Changeable, EditorJsonify, Dependencies, WidgetJsonifyDeprecated, PerseusExpressionAnswerFormConsidered, Expression, interactiveSizes, KhanMath, GrapherWidget, GrapherUtil, SizingUtils, KhanColors, ColorPicker, DashPicker, ArrowPicker, ElementContainer, InteractiveGraphWidget, globalStyles, globalConstants, MatrixWidget, PlotterWidget, plotterPlotTypes, BaseRadio, TableWidget, displaySigFigs, widgets } from '@khanacademy/perseus';
+import { constants, components, Widgets, icons, WIDGET_PROP_DENYLIST, Util, Log, PerseusError, Errors, PerseusMarkdown, preprocessTex, ApiOptions, buildMapper, itemToTree, buildEmptyItemTreeForShape, shapes, ItemExtras, itemDataVersion, ClassNames, MultiItems, traverse, Categorizer as Categorizer$1, Changeable, EditorJsonify, Dependencies, WidgetJsonifyDeprecated, PerseusExpressionAnswerFormConsidered, Expression, interactiveSizes, KhanMath, GrapherWidget, GrapherUtil, SizingUtils, PerseusI18nContext, KhanColors, ColorPicker, DashPicker, ArrowPicker, ElementContainer, lockedFigureColors, InteractiveGraphWidget, globalStyles, globalConstants, MatrixWidget, PlotterWidget, plotterPlotTypes, BaseRadio, TableWidget, displaySigFigs, widgets } from '@khanacademy/perseus';
 import * as React from 'react';
 import { useRef, useEffect } from 'react';
 import _ from 'underscore';
@@ -16,33 +16,32 @@ import classNames from 'classnames';
 import ReactDOM from 'react-dom';
 import { point, number } from '@khanacademy/kmath';
 import * as KAS from '@khanacademy/kas';
-import { isTruthy } from '@khanacademy/wonder-stuff-core';
-import { createMathField } from '@khanacademy/math-input';
+import { isTruthy, UnreachableCaseError } from '@khanacademy/wonder-stuff-core';
+import { useMathInputI18n, createMathField } from '@khanacademy/math-input';
 import { SingleSelect, OptionItem, ActionMenu, ActionItem } from '@khanacademy/wonder-blocks-dropdown';
 import { TextField, Checkbox as Checkbox$1 } from '@khanacademy/wonder-blocks-form';
-import { LabelSmall, LabelLarge, LabelMedium, BodyMonospace } from '@khanacademy/wonder-blocks-typography';
+import { LabelSmall, LabelMedium, LabelLarge, BodyMonospace } from '@khanacademy/wonder-blocks-typography';
+import { AccordionSection } from '@khanacademy/wonder-blocks-accordion';
 import IconButton from '@khanacademy/wonder-blocks-icon-button';
 import trashIcon from '@phosphor-icons/core/bold/trash-bold.svg';
+import Switch from '@khanacademy/wonder-blocks-switch';
 import Button from '@khanacademy/wonder-blocks-button';
-import * as i18n$1 from '@khanacademy/wonder-blocks-i18n';
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "5.2.14";
+const libVersion = "6.0.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
   _extends = Object.assign ? Object.assign.bind() : function (target) {
     for (var i = 1; i < arguments.length; i++) {
       var source = arguments[i];
-
       for (var key in source) {
         if (Object.prototype.hasOwnProperty.call(source, key)) {
           target[key] = source[key];
         }
       }
     }
-
     return target;
   };
   return _extends.apply(this, arguments);
@@ -220,7 +219,7 @@ class SectionControlButton extends React.Component {
       role: "button",
       hideDefaultFocusRing: true,
       "aria-label": title,
-      style: styles$q.button
+      style: styles$s.button
     }, ({
       hovered,
       focused,
@@ -228,7 +227,7 @@ class SectionControlButton extends React.Component {
     }) => /*#__PURE__*/React.createElement(InlineIcon$b, icon));
   }
 }
-const styles$q = StyleSheet.create({
+const styles$s = StyleSheet.create({
   button: {
     backgroundColor: color.gold,
     margin: 2,
@@ -20750,19 +20749,19 @@ class TexErrorView extends React.Component {
     const {
       showErrors
     } = this.state;
-    const iconStyle = showErrors ? styles$p.iconExpanded : styles$p.iconCollapsed;
+    const iconStyle = showErrors ? styles$r.iconExpanded : styles$r.iconCollapsed;
     return /*#__PURE__*/React.createElement(View, {
-      style: styles$p.errorContainer
+      style: styles$r.errorContainer
     }, /*#__PURE__*/React.createElement(View, {
-      style: styles$p.title,
+      style: styles$r.title,
       onClick: this.handleToggleTexErrors
     }, /*#__PURE__*/React.createElement(PhosphorIcon, {
       icon: caretRight,
       style: iconStyle
     }), "\xA0 TeX Errors (", errorList.length, ")"), showErrors && /*#__PURE__*/React.createElement(View, {
-      style: styles$p.errorExplanation
+      style: styles$r.errorExplanation
     }, "If your math doesn't display correctly, these errors might help you troubleshoot. Message #content-kitchen for help."), showErrors && errorList.map((e, index) => /*#__PURE__*/React.createElement(View, {
-      style: styles$p.error,
+      style: styles$r.error,
       key: index
     }, /*#__PURE__*/React.createElement(View, {
       style: {
@@ -20771,7 +20770,7 @@ class TexErrorView extends React.Component {
     }, e.math), /*#__PURE__*/React.createElement(View, null, e.message))));
   }
 }
-const styles$p = StyleSheet.create({
+const styles$r = StyleSheet.create({
   title: {
     backgroundColor: "#eee",
     fontSize: "1.25em",
@@ -24336,13 +24335,11 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   var target = {};
   var sourceKeys = Object.keys(source);
   var key, i;
-
   for (i = 0; i < sourceKeys.length; i++) {
     key = sourceKeys[i];
     if (excluded.indexOf(key) >= 0) continue;
     target[key] = source[key];
   }
-
   return target;
 }
 
@@ -24574,7 +24571,7 @@ class SimpleButton extends React.Component {
       } = _this$props,
       otherProps = _objectWithoutPropertiesLoose(_this$props, _excluded$3);
     return /*#__PURE__*/React.createElement("div", _extends({
-      className: css(styles$o.baseButton, color === "green" && styles$o.green, color === "orange" && styles$o.orange),
+      className: css(styles$q.baseButton, color === "green" && styles$q.green, color === "orange" && styles$q.orange),
       onClick: onClick
     }, otherProps), children);
   }
@@ -24589,7 +24586,7 @@ SimpleButton.defaultProps = {
   color: "green",
   onClick: () => {}
 };
-const styles$o = StyleSheet.create({
+const styles$q = StyleSheet.create({
   baseButton: {
     top: "0",
     fontSize: "11px",
@@ -24809,23 +24806,23 @@ const LeafContainer = ({
 }) => {
   const hasPreviewHeading = shape.type === "content" || shape.type === "hint";
   const previewHeading = hasPreviewHeading && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.containerHeader)
+    className: css(styles$p.containerHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$n.containerTitle)
+    className: css(styles$p.containerTitle)
   }, capitalize(name)));
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.container)
+    className: css(styles$p.container)
   }, /*#__PURE__*/React.createElement("span", {
-    className: css(styles$n.row, styles$n.rowHeading)
+    className: css(styles$p.row, styles$p.rowHeading)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft)
+    className: css(styles$p.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: "pod-title " + css(styles$n.containerHeader)
+    className: "pod-title " + css(styles$p.containerHeader)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.containerTitle)
+    className: css(styles$p.containerTitle)
   }, capitalize(name)), controls)), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnRight)
+    className: css(styles$p.columnRight)
   }, previewHeading)), children);
 };
 const ArrayContainer = props => {
@@ -24838,11 +24835,11 @@ const ArrayContainer = props => {
     actions
   } = props;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.container)
+    className: css(styles$p.container)
   }, controls && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft, styles$n.containerHeader)
+    className: css(styles$p.columnLeft, styles$p.containerHeader)
   }, controls), /*#__PURE__*/React.createElement("div", null, children), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft)
+    className: css(styles$p.columnLeft)
   }, /*#__PURE__*/React.createElement("a", {
     href: "javascript:void 0",
     onClick: () => actions.addArrayElement(path, shape.elementShape)
@@ -24855,28 +24852,28 @@ const ObjectContainer = ({
   path
 }) => {
   const headingEditor = /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.containerHeader)
+    className: css(styles$p.containerHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$n.containerTitle)
+    className: css(styles$p.containerTitle)
   }, capitalize(name)), controls);
   const headingPreview = (name || controls) && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.containerHeader, styles$n.previewCollectionHeader)
+    className: css(styles$p.containerHeader, styles$p.previewCollectionHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$n.containerTitle)
+    className: css(styles$p.containerTitle)
   }, capitalize(name)));
   const hasBothHeadings = headingEditor && headingPreview;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.container)
+    className: css(styles$p.container)
   }, hasBothHeadings && /*#__PURE__*/React.createElement("span", {
-    className: css(styles$n.row)
+    className: css(styles$p.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft)
+    className: css(styles$p.columnLeft)
   }, headingEditor), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnRight)
+    className: css(styles$p.columnRight)
   }, headingPreview)), /*#__PURE__*/React.createElement("div", {
-    className: css(path.length > 0 && styles$n.contentIndent)
+    className: css(path.length > 0 && styles$p.contentIndent)
   }, children));
 };
 
@@ -24999,11 +24996,11 @@ const ItemNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.row)
+    className: css(styles$p.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft)
+    className: css(styles$p.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$n.sticky)
+    className: css(sticky && styles$p.sticky)
   },
   /*#__PURE__*/
   // @ts-expect-error - TS2769 - No overload matches this call.
@@ -25011,9 +25008,9 @@ const ItemNodeContent = withStickiness(props => {
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions
   })))), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnRight)
+    className: css(styles$p.columnRight)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$n.sticky)
+    className: css(sticky && styles$p.sticky)
   }, preview))));
 });
 const HintNodeContent = withStickiness(props => {
@@ -25029,13 +25026,13 @@ const HintNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.row)
+    className: css(styles$p.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft)
+    className: css(styles$p.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$n.sticky)
+    className: css(sticky && styles$p.sticky)
   }, /*#__PURE__*/React.createElement(HintEditor, _extends({}, data, {
-    className: css(styles$n.hintEditor),
+    className: css(styles$p.hintEditor),
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions,
     showTitle: false,
@@ -25050,9 +25047,9 @@ const HintNodeContent = withStickiness(props => {
     isFirst: true,
     isLast: true
   })))), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnRight)
+    className: css(styles$p.columnRight)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$n.sticky)
+    className: css(sticky && styles$p.sticky)
   }, preview)));
 });
 const TagsNodeContent = props => {
@@ -25069,9 +25066,9 @@ const TagsNodeContent = props => {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.columnLeft)
+    className: css(styles$p.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$n.tagsEditor)
+    className: css(styles$p.tagsEditor)
   }, /*#__PURE__*/React.createElement(GroupMetadataEditor, {
     value: data,
     onChange: newVal => actions.setValueAtPath(path, newVal),
@@ -25102,23 +25099,23 @@ const ArrayNodeContent = props => {
     const subpath = path.concat(i);
     const controls = [i > 0 && /*#__PURE__*/React.createElement("div", {
       key: "moveArrayElementUp",
-      className: css(styles$n.control)
+      className: css(styles$p.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Move up",
       onClick: () => actions.moveArrayElementUp(subpath)
     }, /*#__PURE__*/React.createElement("div", {
-      className: css(styles$n.verticalFlip)
+      className: css(styles$p.verticalFlip)
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconChevronDown)))), i < data.length - 1 && /*#__PURE__*/React.createElement("div", {
       key: "moveArrayElementDown",
-      className: css(styles$n.control)
+      className: css(styles$p.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Move down",
       onClick: () => actions.moveArrayElementDown(subpath)
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconChevronDown))), /*#__PURE__*/React.createElement("div", {
       key: "removeArrayElement",
-      className: css(styles$n.control)
+      className: css(styles$p.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Delete",
@@ -25126,7 +25123,7 @@ const ArrayNodeContent = props => {
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconTrash$4)))];
     return /*#__PURE__*/React.createElement("div", {
       key: i,
-      className: css(styles$n.arrayElement, !elementIsLeaf && styles$n.arrayElementAndNotLeaf)
+      className: css(styles$p.arrayElement, !elementIsLeaf && styles$p.arrayElementAndNotLeaf)
     }, /*#__PURE__*/React.createElement(NodeContainer, _extends({}, otherProps, {
       key: i,
       shape: shape.elementShape,
@@ -25152,7 +25149,7 @@ const ObjectNodeContent = props => {
   // made sense to the shape's author is the order in which we'll iterate :)
   const children = Object.keys(shape.shape).map(subkey => /*#__PURE__*/React.createElement("div", {
     key: subkey,
-    className: css(styles$n.objectElement)
+    className: css(styles$p.objectElement)
   }, /*#__PURE__*/React.createElement(NodeContainer, _extends({}, otherProps, {
     shape: shape.shape[subkey],
     data: data[subkey],
@@ -25319,7 +25316,7 @@ class MultiRendererEditor extends React.Component {
     }, this._renderContent());
   }
 }
-const styles$n = StyleSheet.create({
+const styles$p = StyleSheet.create({
   // This is used in a number of places throughout this file.
   container: {},
   // eslint-disable-next-line react-native/no-unused-styles
@@ -25471,47 +25468,47 @@ const StatefulArticleEditor = createReactClass({
       screen
     } = this.state;
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-      style: styles$m.controlBar
+      style: styles$o.controlBar
     }, /*#__PURE__*/React.createElement("span", {
-      style: styles$m.controls
+      style: styles$o.controls
     }, "Mode:", " ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         mode: "edit"
       }),
-      style: mode === "edit" ? styles$m.controlSelected : styles$m.control
+      style: mode === "edit" ? styles$o.controlSelected : styles$o.control
     }, "EDIT"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         mode: "preview"
       }),
-      style: mode === "preview" ? styles$m.controlSelected : styles$m.control
+      style: mode === "preview" ? styles$o.controlSelected : styles$o.control
     }, "PREVIEW"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         mode: "json"
       }),
-      style: mode === "json" ? styles$m.controlSelected : styles$m.control
+      style: mode === "json" ? styles$o.controlSelected : styles$o.control
     }, "JSON")), /*#__PURE__*/React.createElement("span", {
-      style: styles$m.controls
+      style: styles$o.controls
     }, "Screen:", " ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         screen: "phone"
       }),
-      style: screen === "phone" ? styles$m.controlSelected : styles$m.control
+      style: screen === "phone" ? styles$o.controlSelected : styles$o.control
     }, "PHONE"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         screen: "tablet"
       }),
-      style: screen === "tablet" ? styles$m.controlSelected : styles$m.control
+      style: screen === "tablet" ? styles$o.controlSelected : styles$o.control
     }, "TABLET"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         screen: "desktop"
       }),
-      style: screen === "desktop" ? styles$m.controlSelected : styles$m.control
+      style: screen === "desktop" ? styles$o.controlSelected : styles$o.control
     }, "DESKTOP"))), /*#__PURE__*/React.createElement("div", {
-      style: styles$m.editor
+      style: styles$o.editor
     }, /*#__PURE__*/React.createElement(ArticleEditor, this.state)));
   }
 });
-const styles$m = {
+const styles$o = {
   controlBar: {
     marginBottom: 25,
     marginTop: 5
@@ -27001,10 +26998,10 @@ class GradedGroupEditor extends React.Component {
     }, /*#__PURE__*/React.createElement("div", {
       className: "perseus-widget-row"
     }, /*#__PURE__*/React.createElement("label", {
-      className: css(styles$l.title)
+      className: css(styles$n.title)
     }, "Title:", " ", /*#__PURE__*/React.createElement(TextInput$6, {
       value: this.props.title,
-      className: css(styles$l.input)
+      className: css(styles$n.input)
       // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       ,
       onChange: this.change("title")
@@ -27029,7 +27026,7 @@ class GradedGroupEditor extends React.Component {
     }, /*#__PURE__*/React.createElement(InlineIcon$4, iconPlus$1), " Add a hint"), this.props.hint && /*#__PURE__*/React.createElement("div", {
       className: "perseus-hint-editor"
     }, /*#__PURE__*/React.createElement("div", {
-      className: css(styles$l.hintsTitle)
+      className: css(styles$n.hintsTitle)
     }, "Hint"), /*#__PURE__*/React.createElement(Editor, {
       ref: this.hintEditor,
       content: this.props.hint ? this.props.hint.content : "",
@@ -27066,7 +27063,7 @@ GradedGroupEditor.defaultProps = {
   images: {},
   hint: null
 };
-const styles$l = StyleSheet.create({
+const styles$n = StyleSheet.create({
   title: {
     fontSize: 18,
     fontWeight: "bold"
@@ -28244,7 +28241,7 @@ class InputNumberEditor extends React.Component {
     super(...args);
     this.input = /*#__PURE__*/React.createRef();
     this.handleAnswerChange = str => {
-      const value = Util.firstNumericalParse(str) || 0;
+      const value = Util.firstNumericalParse(str, this.context.strings) || 0;
       this.props.onChange({
         value: value
       });
@@ -28310,7 +28307,7 @@ class InputNumberEditor extends React.Component {
       defaultValue: this.props.maxError,
       "aria-label": "Max error",
       onBlur: e => {
-        const ans = "" + (Util.firstNumericalParse(e.target.value) || 0);
+        const ans = "" + (Util.firstNumericalParse(e.target.value, this.context.strings) || 0);
         e.target.value = ans;
         this.props.onChange({
           maxError: ans
@@ -28348,6 +28345,7 @@ class InputNumberEditor extends React.Component {
     }), " ", "Right alignment")));
   }
 }
+InputNumberEditor.contextType = PerseusI18nContext;
 InputNumberEditor.widgetName = "input-number";
 InputNumberEditor.defaultProps = {
   value: 0,
@@ -28367,12 +28365,15 @@ InputNumberEditor.defaultProps = {
 function MathquillInput(props) {
   const mathFieldWrapperRef = useRef(null);
   const mathFieldInstance = useRef();
+  const {
+    strings
+  } = useMathInputI18n();
   useEffect(() => {
     // If we have the mount for the input, but not the input
     // make a new Mathquill input
     if (mathFieldWrapperRef.current && !mathFieldInstance.current) {
       // Initialize MathQuill.MathField instance
-      mathFieldInstance.current = createMathField(mathFieldWrapperRef.current, baseConfig => _extends({}, baseConfig, {
+      mathFieldInstance.current = createMathField(mathFieldWrapperRef.current, strings, baseConfig => _extends({}, baseConfig, {
         handlers: {
           edit: mathField => {
             // This handler is guaranteed to be called on change, but
@@ -28400,13 +28401,13 @@ function MathquillInput(props) {
     }
   });
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$k.outerWrapper
+    style: styles$m.outerWrapper
   }, /*#__PURE__*/React.createElement("span", {
     ref: mathFieldWrapperRef,
     className: "perseus-math-input mq-editable-field mq-math-mode"
   }));
 }
-const styles$k = StyleSheet.create({
+const styles$m = StyleSheet.create({
   outerWrapper: {
     display: "inline-block",
     borderStyle: "solid",
@@ -29467,7 +29468,7 @@ const GraphPointsCountSelector = ({
     // Never uses placeholder, always has value
     ,
     placeholder: "",
-    style: styles$j.singleSelectShort
+    style: styles$l.singleSelectShort
   }, [...[...Array(7).keys()].map(n => /*#__PURE__*/React.createElement(OptionItem, {
     key: n,
     value: `${n}`,
@@ -29478,7 +29479,7 @@ const GraphPointsCountSelector = ({
     label: "unlimited"
   })]);
 };
-const styles$j = StyleSheet.create({
+const styles$l = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29491,7 +29492,7 @@ const GraphTypeSelector = props => {
     selectedValue: props.graphType,
     onChange: props.onChange,
     placeholder: "Select a graph type",
-    style: styles$i.singleSelectShort
+    style: styles$k.singleSelectShort
   }, /*#__PURE__*/React.createElement(OptionItem, {
     value: "linear",
     label: "Linear function"
@@ -29524,7 +29525,7 @@ const GraphTypeSelector = props => {
     label: "Angle"
   }));
 };
-const styles$i = StyleSheet.create({
+const styles$k = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29541,16 +29542,16 @@ const LabeledRow = props => {
     style
   } = props;
   return /*#__PURE__*/React.createElement("label", {
-    className: css(styles$h.label)
+    className: css(styles$j.label)
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$h.row, style]
+    style: [styles$j.row, style]
   }, labelSide === "start" || /*#__PURE__*/React.createElement(LabelSmall, {
-    style: styles$h.spaceEnd
+    style: styles$j.spaceEnd
   }, label), children, labelSide === "end" && /*#__PURE__*/React.createElement(LabelSmall, {
-    style: styles$h.spaceStart
+    style: styles$j.spaceStart
   }, label)));
 };
-const styles$h = StyleSheet.create({
+const styles$j = StyleSheet.create({
   label: {
     width: "fit-content"
   },
@@ -29944,10 +29945,10 @@ class InteractiveGraphSettings extends React.Component {
       onChange: this.change
     }))), /*#__PURE__*/React.createElement(LabeledRow, {
       label: "Background image URL:",
-      style: styles$g.resetSpaceTop
+      style: styles$i.resetSpaceTop
     }, /*#__PURE__*/React.createElement("input", {
       type: "text",
-      className: css(styles$g.backgroundUrlInput),
+      className: css(styles$i.backgroundUrlInput),
       ref: this.bgUrlRef,
       value: this.state.backgroundImage.url || "",
       onChange: e => {
@@ -29961,24 +29962,24 @@ class InteractiveGraphSettings extends React.Component {
       onKeyPress: this.changeBackgroundUrl,
       onBlur: this.changeBackgroundUrl
     }), /*#__PURE__*/React.createElement(InfoTip$c, null, /*#__PURE__*/React.createElement("p", null, "Create an image in graphie, or use the \"Add image\" function to create a background."))), /*#__PURE__*/React.createElement(View, {
-      style: styles$g.rulerSection
+      style: styles$i.rulerSection
     }, /*#__PURE__*/React.createElement(View, {
-      style: styles$g.checkboxRow
+      style: styles$i.checkboxRow
     }, /*#__PURE__*/React.createElement(PropCheckBox$7, {
       label: "Show ruler",
       showRuler: this.props.showRuler,
       onChange: this.change,
-      style: styles$g.resetSpaceTop
+      style: styles$i.resetSpaceTop
     }), /*#__PURE__*/React.createElement(PropCheckBox$7, {
       label: "Show protractor",
       showProtractor: this.props.showProtractor,
       onChange: this.change,
-      style: styles$g.resetSpaceTop
+      style: styles$i.resetSpaceTop
     })), this.props.showRuler && /*#__PURE__*/React.createElement(View, {
-      style: styles$g.spaceTop
+      style: styles$i.spaceTop
     }, /*#__PURE__*/React.createElement(LabeledRow, {
       label: "Ruler label:",
-      style: styles$g.resetSpaceTop
+      style: styles$i.resetSpaceTop
     }, /*#__PURE__*/React.createElement(SingleSelect, {
       id: "ruler-label-select",
       selectedValue: this.props.rulerLabel,
@@ -29988,7 +29989,7 @@ class InteractiveGraphSettings extends React.Component {
         });
       },
       placeholder: "None",
-      style: styles$g.singleSelectShort
+      style: styles$i.singleSelectShort
     }, /*#__PURE__*/React.createElement(OptionItem, {
       value: "",
       label: "None",
@@ -30029,7 +30030,7 @@ class InteractiveGraphSettings extends React.Component {
         });
       },
       placeholder: "10",
-      style: styles$g.singleSelectShort
+      style: styles$i.singleSelectShort
     }, [1, 2, 4, 8, 10, 16].map(value => /*#__PURE__*/React.createElement(OptionItem, {
       key: value,
       value: `${value}`,
@@ -30053,7 +30054,7 @@ InteractiveGraphSettings.defaultProps = {
   rulerLabel: "",
   rulerTicks: 10
 };
-const styles$g = StyleSheet.create({
+const styles$i = StyleSheet.create({
   resetSpaceTop: {
     marginTop: 0
   },
@@ -30097,22 +30098,26 @@ const LockedFigureSelect = props => {
     onChange
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$f.container
+    style: styles$h.container
   }, /*#__PURE__*/React.createElement(ActionMenu, {
-    menuText: "Add element",
-    style: styles$f.addElementSelect
+    menuText: "Add locked figure",
+    style: styles$h.addElementSelect
   }, [/*#__PURE__*/React.createElement(ActionItem, {
     key: `${id}-point`,
     label: "Point",
     onClick: () => onChange("point")
-  }, "Point")]));
+  }, "Point"), /*#__PURE__*/React.createElement(ActionItem, {
+    key: `${id}-line`,
+    label: "Line",
+    onClick: () => onChange("line")
+  }, "Line")]));
 };
-const styles$f = StyleSheet.create({
+const styles$h = StyleSheet.create({
   container: {
-    marginTop: spacing.medium_16
+    marginTop: spacing.xxxSmall_4
   },
   addElementSelect: {
-    backgroundColor: color.fadedBlue16,
+    backgroundColor: color.fadedBlue8,
     borderRadius: spacing.xxxSmall_4
   }
 });
@@ -30168,21 +30173,99 @@ const defaultContext = {
 };
 const MediaLayoutContext = React.createContext(defaultContext);
 MediaLayoutContext.displayName = "MediaLayoutContext";
+StyleSheet.create({
+  grow: {
+    flexGrow: 1
+  }
+});
 
-class Spring extends React.Component {
+class Strut extends React.Component {
   render() {
     const {
+      size,
       style
     } = this.props;
     return React.createElement(View, {
       "aria-hidden": "true",
-      style: [styles$e.grow, style]
+      style: [strutStyle(size), style]
     });
   }
 }
-const styles$e = StyleSheet.create({
-  grow: {
-    flexGrow: 1
+const strutStyle = size => {
+  return {
+    width: size,
+    MsFlexBasis: size,
+    MsFlexPreferredSize: size,
+    WebkitFlexBasis: size,
+    flexBasis: size,
+    flexShrink: 0
+  };
+};
+
+const ColorSwatch = props => {
+  const {
+    color: color$1,
+    filled = true,
+    decorative = false
+  } = props;
+  return /*#__PURE__*/React.createElement(View, {
+    "aria-label":
+    // Don't include an aria label for decorative circles.
+    !decorative ? `Color: ${color$1}, ${filled ? "filled" : "open"}` : undefined,
+    style: [styles$g.colorSwatch, {
+      border: `4px solid ${lockedFigureColors[color$1]}`,
+      backgroundColor: filled ? lockedFigureColors[color$1] : color.white
+    }]
+  });
+};
+const styles$g = StyleSheet.create({
+  colorSwatch: {
+    // Add a white outline so that the color swatch is visible when
+    // the dropdown option is highlighted with its blue background.
+    outline: `2px solid ${color.offWhite}`,
+    borderRadius: "50%",
+    width: spacing.large_24,
+    height: spacing.large_24
+  }
+});
+
+const possibleColors = Object.keys(lockedFigureColors);
+const ColorSelect = props => {
+  const {
+    id,
+    selectedValue,
+    onChange
+  } = props;
+  return /*#__PURE__*/React.createElement(View, {
+    style: styles$f.row
+  }, /*#__PURE__*/React.createElement(LabelMedium, {
+    htmlFor: id,
+    style: styles$f.label,
+    tag: "label"
+  }, "Color"), /*#__PURE__*/React.createElement(SingleSelect, {
+    id: id,
+    selectedValue: selectedValue,
+    onChange: onChange
+    // Placeholder is required, but never gets used.
+    ,
+    placeholder: ""
+  }, possibleColors.map(colorName => /*#__PURE__*/React.createElement(OptionItem, {
+    key: colorName,
+    value: colorName,
+    label: colorName,
+    leftAccessory: /*#__PURE__*/React.createElement(ColorSwatch, {
+      color: colorName,
+      decorative: true
+    })
+  }, colorName))));
+};
+const styles$f = StyleSheet.create({
+  row: {
+    flexDirection: "row",
+    alignItems: "center"
+  },
+  label: {
+    marginInlineEnd: spacing.xSmall_8
   }
 });
 
@@ -30227,17 +30310,34 @@ function focusWithChromeStickyFocusBugWorkaround(element) {
   });
 }
 function getValidNumberFromString(value) {
-  const parsed = parseInt(value);
+  const parsed = parseFloat(value);
   // If the value is not a number, return 0.
   return isNaN(parsed) ? 0 : parsed;
 }
-function getDefaultFigureForFigureType(type) {
+function getDefaultFigureForType(type) {
   switch (type) {
     case "point":
       return {
         type: "point",
-        coord: [0, 0]
+        coord: [0, 0],
+        color: "blue",
+        filled: true
       };
+    case "line":
+      return {
+        type: "line",
+        kind: "line",
+        points: [getDefaultFigureForType("point"), _extends({}, getDefaultFigureForType("point"), {
+          coord: [2, 2]
+        })],
+        color: "blue",
+        lineStyle: "solid",
+        showArrows: false,
+        showStartPoint: false,
+        showEndPoint: false
+      };
+    default:
+      throw new UnreachableCaseError(type);
   }
 }
 
@@ -30247,15 +30347,21 @@ function getDefaultFigureForFigureType(type) {
  *
  * Used in the interactive graph editor's locked figures section.
  */
-const possibleColors = ["purple", "blue", "teal", "green", "gold", "red", "pink"];
 const LockedPointSettings = props => {
   const {
     coord,
+    color: pointColor,
+    filled = true,
+    label,
+    toggled = "true",
     style,
-    onChangeColor,
-    onChangeCoord,
+    onChangeProps,
+    onToggle,
     onRemove
   } = props;
+
+  // Keep track of the coordinates via state as the user is editing them,
+  // before they are updated in the props on blur.
   const [coordState, setCoordState] = React.useState([
   // Using strings to make it easier to work with the text fields.
   coord[0].toString(), coord[1].toString()]);
@@ -30265,101 +30371,330 @@ const LockedPointSettings = props => {
   const ids = useUniqueIdWithMock();
   const xCoordId = ids.get("x-coord");
   const yCoordId = ids.get("y-coord");
-  const colorSelectId = ids.get("color-select");
+  const colorSelectId = ids.get("point-color-select");
+  const showPointToggleId = ids.get("show-point-toggle");
   function handleBlur() {
     const validCoord = [getValidNumberFromString(coordState[0]), getValidNumberFromString(coordState[1])];
 
     // Make the text field only show valid numbers after blur.
     setCoordState([validCoord[0].toString(), validCoord[1].toString()]);
     // Update the graph with the new coordinates.
-    onChangeCoord(validCoord);
+    onChangeProps({
+      coord: validCoord
+    });
   }
   function handleCoordChange(newValue, coordIndex) {
     const newCoord = [...coordState];
     newCoord[coordIndex] = newValue;
     setCoordState(newCoord);
   }
-  return /*#__PURE__*/React.createElement(View, {
-    style: styles$d.container
+  function handleColorChange(newValue) {
+    onChangeProps({
+      color: newValue
+    });
+  }
+  return /*#__PURE__*/React.createElement(View
+  // More specificity so that we can override the default
+  // .heading > h2 > .header styles from the articles.less
+  // file (which is imported in perseus-renderer.less).
+  , {
+    className: "locked-figure-accordion"
+  }, /*#__PURE__*/React.createElement(AccordionSection, {
+    style: [styles$e.container, style],
+    headerStyle: styles$e.accordionHeader,
+    header:
+    /*#__PURE__*/
+    // Summary: Point, coords, color (filled/open)
+    React.createElement(View, {
+      style: styles$e.row
+    }, /*#__PURE__*/React.createElement(LabelLarge, null, `${label || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React.createElement(Strut, {
+      size: spacing.xSmall_8
+    }), toggled && /*#__PURE__*/React.createElement(ColorSwatch, {
+      color: pointColor,
+      filled: filled
+    }))
   }, /*#__PURE__*/React.createElement(View, {
-    style: styles$d.row
-  }, /*#__PURE__*/React.createElement(LabelLarge, null, "Point"), /*#__PURE__*/React.createElement(Spring, null), /*#__PURE__*/React.createElement(IconButton, {
-    icon: trashIcon,
-    "aria-label": `Delete locked point at ${coordState[0]}, ${coordState[1]}`,
-    onClick: onRemove
-  })), /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(View, {
-    style: styles$d.row
+    style: styles$e.accordionPanel
+  }, /*#__PURE__*/React.createElement(View, {
+    style: styles$e.row
+  }, /*#__PURE__*/React.createElement(View, {
+    style: [styles$e.row, styles$e.spaceUnder]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: xCoordId,
-    style: styles$d.label,
+    style: styles$e.label,
     tag: "label"
-  }, "x Coordinate"), /*#__PURE__*/React.createElement(TextField, {
+  }, "x Coord"), /*#__PURE__*/React.createElement(TextField, {
     id: xCoordId,
+    type: "number",
     value: coordState[0],
     onChange: newValue => handleCoordChange(newValue, 0),
     onBlur: handleBlur,
-    style: styles$d.textField
-  })), /*#__PURE__*/React.createElement(View, {
-    style: styles$d.row
+    style: styles$e.textField
+  })), /*#__PURE__*/React.createElement(Strut, {
+    size: spacing.medium_16
+  }), /*#__PURE__*/React.createElement(View, {
+    style: [styles$e.row, styles$e.spaceUnder]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: yCoordId,
-    style: styles$d.label,
+    style: styles$e.label,
     tag: "label"
-  }, "y Coordinate"), /*#__PURE__*/React.createElement(TextField, {
+  }, "y Coord"), /*#__PURE__*/React.createElement(TextField, {
     id: yCoordId,
+    type: "number",
     value: coordState[1],
     onChange: newValue => handleCoordChange(newValue, 1),
     onBlur: handleBlur,
-    style: styles$d.textField
+    style: styles$e.textField
+  }))), onToggle && /*#__PURE__*/React.createElement(View, {
+    style: [styles$e.row, styles$e.spaceUnder]
+  }, /*#__PURE__*/React.createElement(Switch, {
+    id: showPointToggleId,
+    checked: !!toggled,
+    onChange: onToggle
+  }), /*#__PURE__*/React.createElement(Strut, {
+    size: spacing.small_12
+  }), /*#__PURE__*/React.createElement(LabelMedium, {
+    tag: "label",
+    htmlFor: showPointToggleId
+  }, "Show point on graph")), toggled && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColorSelect, {
+    id: colorSelectId,
+    selectedValue: pointColor || "blue",
+    onChange: handleColorChange
+  }), /*#__PURE__*/React.createElement(Strut, {
+    size: spacing.xSmall_8
+  }), /*#__PURE__*/React.createElement(Checkbox$1, {
+    label: "Open point",
+    checked: !filled,
+    onChange: newValue => {
+      onChangeProps({
+        filled: !newValue
+      });
+    },
+    style: styles$e.spaceUnder
+  })), onRemove && /*#__PURE__*/React.createElement(IconButton, {
+    icon: trashIcon,
+    "aria-label": `Delete locked point at ${coordState[0]}, ${coordState[1]}`,
+    onClick: onRemove,
+    style: styles$e.deleteButton
+  }))));
+};
+const styles$e = StyleSheet.create({
+  container: {
+    backgroundColor: color.fadedBlue8,
+    marginBottom: spacing.small_12
+  },
+  accordionHeader: {
+    paddingTop: spacing.small_12,
+    paddingBottom: spacing.small_12,
+    paddingInlineStart: spacing.medium_16,
+    // Fixed height so the addition of the color swatch doesn't
+    // change the height of the header when toggling.
+    height: spacing.xxLarge_48
+  },
+  accordionPanel: {
+    padding: spacing.medium_16,
+    paddingBottom: spacing.xSmall_8
+  },
+  row: {
+    flexDirection: "row",
+    alignItems: "center"
+  },
+  spaceUnder: {
+    marginBottom: spacing.xSmall_8
+  },
+  label: {
+    marginInlineEnd: spacing.xSmall_8
+  },
+  textField: {
+    width: spacing.xxxLarge_64
+  },
+  deleteButton: {
+    position: "absolute",
+    top: spacing.small_12,
+    right: spacing.small_12
+  }
+});
+
+const LockedLineSettings = props => {
+  const {
+    kind,
+    points,
+    color: lineColor = "blue",
+    lineStyle = "solid",
+    showArrows,
+    showStartPoint,
+    showEndPoint,
+    onChangeProps,
+    onRemove
+  } = props;
+  const [startPoint, endPoint] = points;
+
+  // Generate unique IDs so that the programmatic labels can be associated
+  // with their respective text fields.
+  const ids = useUniqueIdWithMock();
+  const kindSelectId = ids.get("line-kind-select");
+  const colorSelectId = ids.get("line-color-select");
+  const styleSelectId = ids.get("line-style-select");
+  const lineLabel = `Line (${startPoint.coord[0]}, ${startPoint.coord[1]}),
+        (${endPoint.coord[0]}, ${endPoint.coord[1]})`;
+  function handleChangePoint(newPointProps, index) {
+    const newPoints = [...points];
+    newPoints[index] = _extends({}, points[index], newPointProps);
+    onChangeProps({
+      points: newPoints
+    });
+  }
+  function handleColorChange(newColor) {
+    onChangeProps({
+      color: newColor,
+      // Keep the line's points' colors in sync with the line color.
+      points: [_extends({}, startPoint, {
+        color: newColor
+      }), _extends({}, endPoint, {
+        color: newColor
+      })]
+    });
+  }
+  return /*#__PURE__*/React.createElement(View
+  // More specificity so that we can override the default
+  // .heading > h2 > .header styles from the articles.less
+  // file (which is imported in perseus-renderer.less).
+  , {
+    className: "locked-figure-accordion"
+  }, /*#__PURE__*/React.createElement(AccordionSection, {
+    style: styles$d.container,
+    headerStyle: styles$d.accordionHeader,
+    header: /*#__PURE__*/React.createElement(View, {
+      style: styles$d.row
+    }, /*#__PURE__*/React.createElement(LabelLarge, null, lineLabel), /*#__PURE__*/React.createElement(Strut, {
+      size: spacing.xSmall_8
+    }), /*#__PURE__*/React.createElement(ColorSwatch, {
+      color: lineColor
+    }))
+  }, /*#__PURE__*/React.createElement(View, {
+    style: styles$d.accordionPanel
+  }, /*#__PURE__*/React.createElement(View, {
+    style: [styles$d.row, styles$d.spaceUnder]
+  }, /*#__PURE__*/React.createElement(LabelMedium, {
+    htmlFor: kindSelectId,
+    style: styles$d.label,
+    tag: "label"
+  }, "Kind"), /*#__PURE__*/React.createElement(SingleSelect, {
+    id: kindSelectId,
+    selectedValue: kind,
+    onChange: value => onChangeProps({
+      kind: value
+    })
+    // Placeholder is required, but never gets used.
+    ,
+    placeholder: ""
+  }, /*#__PURE__*/React.createElement(OptionItem, {
+    value: "line",
+    label: "line"
+  }), /*#__PURE__*/React.createElement(OptionItem, {
+    value: "segment",
+    label: "segment"
+  }), /*#__PURE__*/React.createElement(OptionItem, {
+    value: "ray",
+    label: "ray"
   }))), /*#__PURE__*/React.createElement(View, {
+    style: [styles$d.row, styles$d.spaceUnder]
+  }, /*#__PURE__*/React.createElement(ColorSelect, {
+    id: colorSelectId,
+    selectedValue: lineColor || "blue",
+    onChange: handleColorChange
+  }), /*#__PURE__*/React.createElement(Strut, {
+    size: spacing.medium_16
+  }), /*#__PURE__*/React.createElement(View, {
     style: styles$d.row
   }, /*#__PURE__*/React.createElement(LabelMedium, {
-    htmlFor: colorSelectId,
+    htmlFor: styleSelectId,
     style: styles$d.label,
     tag: "label"
-  }, "Color"), /*#__PURE__*/React.createElement(SingleSelect, {
-    id: colorSelectId,
-    selectedValue: (style == null ? void 0 : style.fill) || "blue",
-    onChange: onChangeColor
+  }, "Style"), /*#__PURE__*/React.createElement(SingleSelect, {
+    id: styleSelectId,
+    selectedValue: lineStyle,
+    onChange: value => onChangeProps({
+      lineStyle: value
+    })
     // Placeholder is required, but never gets used.
     ,
     placeholder: ""
-  }, possibleColors.map(colorName => /*#__PURE__*/React.createElement(OptionItem, {
-    key: colorName,
-    value: colorName,
-    label: colorName,
-    leftAccessory: /*#__PURE__*/React.createElement(View, {
-      style: [styles$d.colorCircle, {
-        backgroundColor: color[colorName]
-      }]
-    })
-  }, colorName)))));
+  }, /*#__PURE__*/React.createElement(OptionItem, {
+    value: "solid",
+    label: "solid"
+  }), /*#__PURE__*/React.createElement(OptionItem, {
+    value: "dashed",
+    label: "dashed"
+  })))), /*#__PURE__*/React.createElement(Checkbox$1, {
+    label: "Show arrows",
+    checked: showArrows,
+    onChange: newValue => onChangeProps({
+      showArrows: newValue
+    }),
+    style: styles$d.spaceUnder
+  }), /*#__PURE__*/React.createElement(LockedPointSettings, _extends({
+    label: "Start point",
+    toggled: showStartPoint
+  }, startPoint, {
+    onToggle: newValue => onChangeProps({
+      showStartPoint: newValue
+    }),
+    onChangeProps: newProps => handleChangePoint(newProps, 0),
+    style: styles$d.lockedPointSettingsContainer
+  })), /*#__PURE__*/React.createElement(LockedPointSettings, _extends({
+    label: "End point",
+    toggled: showEndPoint
+  }, endPoint, {
+    onToggle: newValue => onChangeProps({
+      showEndPoint: newValue
+    }),
+    onChangeProps: newProps => handleChangePoint(newProps, 1),
+    style: styles$d.lockedPointSettingsContainer
+  })), /*#__PURE__*/React.createElement(IconButton, {
+    icon: trashIcon,
+    "aria-label": `Delete locked line defined by
+            ${startPoint.coord[0]}, ${startPoint.coord[1]} and
+            ${endPoint.coord[0]}, ${endPoint.coord[1]}.`,
+    onClick: onRemove,
+    style: styles$d.deleteButton
+  }))));
 };
 const styles$d = StyleSheet.create({
   container: {
     backgroundColor: color.fadedBlue8,
-    marginBottom: spacing.xSmall_8,
+    marginBottom: spacing.xSmall_8
+  },
+  accordionHeader: {
+    paddingTop: spacing.small_12,
+    paddingBottom: spacing.small_12,
+    paddingInlineStart: spacing.medium_16
+  },
+  accordionPanel: {
     padding: spacing.medium_16,
-    borderRadius: spacing.xSmall_8
+    paddingBottom: spacing.xSmall_8
+  },
+  lockedPointSettingsContainer: {
+    marginTop: spacing.xSmall_8,
+    marginBottom: spacing.xSmall_8,
+    marginLeft: -spacing.xxxSmall_4,
+    marginRight: -spacing.xxxSmall_4,
+    backgroundColor: color.white
   },
   row: {
     flexDirection: "row",
-    alignItems: "center",
+    alignItems: "center"
+  },
+  spaceUnder: {
     marginBottom: spacing.xSmall_8
   },
   label: {
     marginInlineEnd: spacing.xSmall_8
   },
-  textField: {
-    width: spacing.xxxLarge_64
-  },
-  colorCircle: {
-    // Add a white border so that the color circle is visible when
-    // the dropdown option is highlighted with its blue background.
-    border: `2px solid ${color.offWhite}`,
-    borderRadius: "50%",
-    width: spacing.large_24,
-    height: spacing.large_24
+  deleteButton: {
+    position: "absolute",
+    top: spacing.small_12,
+    right: spacing.small_12
   }
 });
 
@@ -30376,6 +30711,8 @@ const LockedFigureSettings = props => {
   switch (props.type) {
     case "point":
       return /*#__PURE__*/React.createElement(LockedPointSettings, props);
+    case "line":
+      return /*#__PURE__*/React.createElement(LockedLineSettings, props);
   }
   return null;
 };
@@ -30389,7 +30726,7 @@ const LockedFiguresSection = props => {
   function addLockedFigure(newFigure) {
     const lockedFigures = figures || [];
     const newProps = {
-      lockedFigures: [...lockedFigures, getDefaultFigureForFigureType(newFigure)]
+      lockedFigures: [...lockedFigures, getDefaultFigureForType(newFigure)]
     };
     onChange(newProps);
   }
@@ -30399,34 +30736,22 @@ const LockedFiguresSection = props => {
       lockedFigures: [...lockedFigures.slice(0, index), ...lockedFigures.slice(index + 1)]
     });
   }
-  function changeCoord(index, coord) {
+  function changeProps(index,
+  // Omit the type from the figure props so it doesn't think
+  // we're trying to pass in the props for the wrong type.
+  figureProps) {
     const lockedFigures = figures || [];
-    const newProps = {
-      lockedFigures: [...lockedFigures.slice(0, index), _extends({}, lockedFigures[index], {
-        coord
-      }), ...lockedFigures.slice(index + 1)]
+    const newFigures = {
+      lockedFigures: [...lockedFigures.slice(0, index), _extends({}, lockedFigures[index], figureProps), ...lockedFigures.slice(index + 1)]
     };
-    onChange(newProps);
-  }
-  function changeColor(index, colorName) {
-    const lockedFigures = figures || [];
-    const newProps = {
-      lockedFigures: [...lockedFigures.slice(0, index), _extends({}, lockedFigures[index], {
-        style: _extends({}, lockedFigures[index].style, {
-          fill: colorName,
-          stroke: colorName
-        })
-      }), ...lockedFigures.slice(index + 1)]
-    };
-    onChange(newProps);
+    onChange(newFigures);
   }
   return /*#__PURE__*/React.createElement(View, {
     style: styles$c.container
   }, figures == null ? void 0 : figures.map((figure, index) => /*#__PURE__*/React.createElement(LockedFigureSettings, _extends({
     key: `${uniqueId}-locked-${figure}-${index}`
   }, figure, {
-    onChangeColor: color => changeColor(index, color),
-    onChangeCoord: coord => changeCoord(index, coord),
+    onChangeProps: newProps => changeProps(index, newProps),
     onRemove: () => removeLockedFigure(index)
   }))), /*#__PURE__*/React.createElement(LockedFigureSelect, {
     id: `${uniqueId}-select`,
@@ -30519,13 +30844,15 @@ class InteractiveGraphEditor extends React.Component {
     DeprecationMixin.UNSAFE_componentWillMount.call(this);
   }
   render() {
-    var _this$props$graph$typ, _this$props$graph, _this$props$correct, _this$props$correct2, _this$props$correct3, _this$props$correct4, _this$props$correct5, _this$props$correct6, _this$props$correct7, _this$props$correct8, _this$props$correct9, _this$props$correct10, _this$props$correct11, _this$props$apiOption;
+    var _this$props$graph$typ, _this$props$graph, _this$props$correct, _this$props$correct2, _this$props$correct3, _this$props$correct4, _this$props$correct5, _this$props$correct6, _this$props$correct7, _this$props$correct8, _this$props$correct9, _this$props$correct10, _this$props$correct11, _this$props$apiOption, _this$props$apiOption2;
     let graph;
     let equationString;
     const gridStep = this.props.gridStep || Util.getGridStep(this.props.range, this.props.step, interactiveSizes.defaultBoxSize);
     const snapStep = this.props.snapStep || Util.snapStepFromGridStep(gridStep);
     const sizeClass = containerSizeClass.SMALL;
     if (this.props.valid === true) {
+      const correct = this.props.correct;
+
       // TODO(aria): send these down all at once
       const graphProps = {
         ref: "graph",
@@ -30535,7 +30862,7 @@ class InteractiveGraphEditor extends React.Component {
         step: this.props.step,
         gridStep: gridStep,
         snapStep: snapStep,
-        graph: this.props.correct,
+        graph: correct,
         backgroundImage: this.props.backgroundImage,
         markings: this.props.markings,
         showProtractor: this.props.showProtractor,
@@ -30559,6 +30886,10 @@ class InteractiveGraphEditor extends React.Component {
           });
         }
       };
+
+      // This is used to force a remount of the graph component
+      // when there's a significant change
+      const graphKey = `${correct.type}:${correct.numSegments || 0}`;
       graph =
       /*#__PURE__*/
       // There are a bunch of props that renderer.jsx passes to widgets via
@@ -30566,6 +30897,7 @@ class InteractiveGraphEditor extends React.Component {
       // bother passing.
       // @ts-expect-error - TS2769 - No overload matches this call.
       React.createElement(InteractiveGraph, _extends({}, graphProps, {
+        key: graphKey,
         containerSizeClass: sizeClass,
         apiOptions: _extends({}, this.props.apiOptions, {
           isMobile: false
@@ -30761,9 +31093,9 @@ class InteractiveGraphEditor extends React.Component {
         borderWidth: 1
       }
     }, equationString), /*#__PURE__*/React.createElement(InfoTip$b, null, /*#__PURE__*/React.createElement("p", null, "Graph the correct answer in the graph below and ensure the equation or point coordinates displayed represent the correct answer."))), graph,
-    // Only show the "Add element" dropdown if the graph is
-    // using Mafs.
-    this.props.graph && ((_this$props$apiOption = this.props.apiOptions) == null || (_this$props$apiOption = _this$props$apiOption.flags) == null || (_this$props$apiOption = _this$props$apiOption["mafs"]) == null ? void 0 : _this$props$apiOption[this.props.graph.type]) && /*#__PURE__*/React.createElement(LockedFiguresSection, {
+    // Only show the "Add locked figure" dropdown if the graph
+    // is using Mafs.
+    this.props.graph && ((_this$props$apiOption = this.props.apiOptions) == null || (_this$props$apiOption = _this$props$apiOption.flags) == null || (_this$props$apiOption = _this$props$apiOption.mafs) == null ? void 0 : _this$props$apiOption["interactive-graph-locked-features-m1"]) && ((_this$props$apiOption2 = this.props.apiOptions) == null || (_this$props$apiOption2 = _this$props$apiOption2.flags) == null || (_this$props$apiOption2 = _this$props$apiOption2.mafs) == null ? void 0 : _this$props$apiOption2[this.props.graph.type]) && /*#__PURE__*/React.createElement(LockedFiguresSection, {
       figures: this.props.lockedFigures,
       onChange: this.props.onChange
     }));
@@ -30911,7 +31243,7 @@ class FormWrappedTextField extends React.Component {
       className: css(inputBase),
       ref: forwardedRef,
       id: id,
-      "data-test-id": testId
+      "data-testid": testId
     })), !leftSideIcon && wrappedIcon);
   }
 }
@@ -31043,7 +31375,7 @@ class Link extends React.Component {
       rel = "noopener noreferrer";
     }
     return /*#__PURE__*/React.createElement(element, _extends({
-      "data-test-id": testId
+      "data-testid": testId
     }, otherProps, urlProp, {
       className: css(...delegatedStyles) + delegatedClassName,
       style: inlineStyles,
@@ -31362,7 +31694,7 @@ class Checkbox extends React.Component {
     }, handlers) => /*#__PURE__*/React.createElement("div", _extends({}, handlers, {
       className: css(styles$6.container, focused && styles$6.focused),
       style: style,
-      "data-test-id": dataTestId,
+      "data-testid": dataTestId,
       "data-checked": checked
     }), /*#__PURE__*/React.createElement("svg", {
       className: css(styles$6.svg, (disabled || appearDisabled) && styles$6.disabled),
@@ -31609,7 +31941,7 @@ class Option extends React.Component {
       onKeyDown: event => this.handleKeyDown(event),
       "aria-disabled": disabled,
       "aria-label": ariaLabel,
-      "data-test-id": testId
+      "data-testid": testId
     }, optionRenderer && optionRenderer(
     /*#__PURE__*/
     /**
@@ -31985,8 +32317,8 @@ class QuestionMarkers extends React.Component {
     // Open answer selection dropdown for each of the specified markers.
     indices.forEach(index => {
       if (this._markers[index]) {
-        // @ts-expect-error - TS2533 - Object is possibly 'null' or 'undefined'.
-        this._markers[index].openDropdown();
+        var _this$_markers$index;
+        (_this$_markers$index = this._markers[index]) == null || _this$_markers$index.openDropdown();
       }
     });
   }
@@ -32989,6 +33321,7 @@ NumberLineEditor.defaultProps = {
   showTooltips: false
 };
 
+/* eslint-disable jsx-a11y/anchor-is-valid, react/sort-comp */
 const {
   ButtonGroup,
   InfoTip: InfoTip$7,
@@ -33005,6 +33338,9 @@ const {
 const {
   firstNumericalParse
 } = Util;
+
+// NOTE(john): Copied from perseus-types.d.ts in the Perseus package.
+// I'm unable to find a good way of importing these types into this project.
 const answerFormButtons = [{
   title: "Integers",
   value: "integer",
@@ -33041,28 +33377,15 @@ const initAnswer = status => {
     maxError: null
   };
 };
-const NumericInputEditor = createReactClass({
-  displayName: "NumericInputEditor",
-  propTypes: _extends({}, Changeable.propTypes),
-  statics: {
-    widgetName: "numeric-input"
-  },
-  getDefaultProps: function () {
-    return {
-      answers: [initAnswer("correct")],
-      size: "normal",
-      coefficient: false,
-      labelText: "",
-      rightAlign: false
-    };
-  },
-  getInitialState: function () {
-    return {
+class NumericInputEditor extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
       lastStatus: "wrong",
       showOptions: _.map(this.props.answers, () => false)
     };
-  },
-  render: function () {
+  }
+  render() {
     const answers = this.props.answers;
     const unsimplifiedAnswers = i => /*#__PURE__*/React.createElement("div", {
       className: "perseus-widget-row"
@@ -33079,14 +33402,14 @@ const NumericInputEditor = createReactClass({
         value: "enforced",
         content: "wrong"
       }],
-      onChange: this.updateAnswer(i, "simplify")
+      onChange: this.updateAnswer(i, "simplify") || (() => {})
     }), /*#__PURE__*/React.createElement(InfoTip$7, null, /*#__PURE__*/React.createElement("p", null, "Normally select \"ungraded\". This will give the user a message saying the answer is correct but not simplified. The user will then have to simplify it and re-enter, but will not be penalized. (5th grade and after)"), /*#__PURE__*/React.createElement("p", null, "Select \"accepted\" only if the user is not expected to know how to simplify fractions yet. (Anything prior to 5th grade)"), /*#__PURE__*/React.createElement("p", null, "Select \"wrong\" ", /*#__PURE__*/React.createElement("em", null, "only"), " if we are specifically assessing the ability to simplify.")));
     const suggestedAnswerTypes = i => /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       className: "perseus-widget-row"
     }, /*#__PURE__*/React.createElement("label", null, "Choose the suggested answer formats"), /*#__PURE__*/React.createElement(MultiButtonGroup, {
       buttons: answerFormButtons,
       values: answers[i]["answerForms"],
-      onChange: this.updateAnswer(i, "answerForms")
+      onChange: this.updateAnswer(i, "answerForms") || (() => {})
     }), /*#__PURE__*/React.createElement(InfoTip$7, null, /*#__PURE__*/React.createElement("p", null, "Formats will be autoselected for you based on the given answer; to show no suggested formats and accept all types, simply have a decimal/integer be the answer. Values with \u03C0 will have format \"pi\", and values that are fractions will have some subset (mixed will be \"mixed\" and \"proper\"; improper/proper will both be \"improper\" and \"proper\"). If you would like to specify that it is only a proper fraction (or only a mixed/improper fraction), deselect the other format. Except for specific cases, you should not need to change the autoselected formats."), /*#__PURE__*/React.createElement("p", null, "To restrict the answer to ", /*#__PURE__*/React.createElement("em", null, "only"), " an improper fraction (i.e. 7/4), select the improper fraction and toggle \"strict\" to true. This ", /*#__PURE__*/React.createElement("b", null, "will not"), " ", "accept 1.75 as an answer.", " "), /*#__PURE__*/React.createElement("p", null, "Unless you are testing that specific skill, please do not restrict the answer format."))), /*#__PURE__*/React.createElement("div", {
       className: "perseus-widget-row"
     }, /*#__PURE__*/React.createElement(PropCheckBox$3, {
@@ -33172,7 +33495,7 @@ const NumericInputEditor = createReactClass({
         value: answer.value,
         className: "numeric-input-value",
         placeholder: "answer",
-        format: _.last(answer.answerForms),
+        format: _.last(answer.answerForms || []),
         onFormatChange: (newValue, format) => {
           // NOTE(charlie): The mobile web expression
           // editor relies on this automatic answer
@@ -33196,13 +33519,13 @@ const NumericInputEditor = createReactClass({
             forms = ["proper", "improper"];
           }
           this.updateAnswer(i, {
-            value: firstNumericalParse(newValue),
+            value: firstNumericalParse(newValue, this.context.strings),
             answerForms: forms
           });
         },
         onChange: newValue => {
           this.updateAnswer(i, {
-            value: firstNumericalParse(newValue)
+            value: firstNumericalParse(newValue, this.context.strings)
           });
         }
       }), answer.strict && /*#__PURE__*/React.createElement("div", {
@@ -33218,7 +33541,7 @@ const NumericInputEditor = createReactClass({
       }, "\xB1"), /*#__PURE__*/React.createElement(NumberInput$5, {
         placeholder: 0,
         value: answers[i]["maxError"],
-        format: _.last(answer.answerForms),
+        format: _.last(answer.answerForms || []),
         onChange: this.updateAnswer(i, "maxError")
       })) : null, /*#__PURE__*/React.createElement("div", {
         className: "value-divider"
@@ -33226,19 +33549,19 @@ const NumericInputEditor = createReactClass({
         href: "javascript:void(0)",
         className: "answer-status " + answer.status,
         onClick: () => this.onStatusChange(i),
-        onKeyDown: e => this.onSpace(e, this.onStatusChange, i)
+        onKeyDown: e => this.onSpace(e, this.onStatusChange)
       }, answer.status), /*#__PURE__*/React.createElement("a", {
         href: "javascript:void(0)",
         className: "answer-trash",
         "aria-label": "Delete answer",
         onClick: () => this.onTrashAnswer(i),
-        onKeyDown: e => this.onSpace(e, this.onTrashAnswer, i)
+        onKeyDown: e => this.onSpace(e, this.onTrashAnswer)
       }, /*#__PURE__*/React.createElement(InlineIcon$2, iconTrash$1)), /*#__PURE__*/React.createElement("a", {
         href: "javascript:void(0)",
         className: "options-toggle",
         "aria-label": "Toggle options",
         onClick: () => this.onToggleOptions(i),
-        onKeyDown: e => this.onSpace(e, this.onToggleOptions, i)
+        onKeyDown: e => this.onSpace(e, this.onToggleOptions)
       }, /*#__PURE__*/React.createElement(InlineIcon$2, iconGear))), /*#__PURE__*/React.createElement("div", {
         className: "input-answer-editor-message"
       }, editor), this.state.showOptions[i] && /*#__PURE__*/React.createElement("div", {
@@ -33252,18 +33575,18 @@ const NumericInputEditor = createReactClass({
     }, "User input"), /*#__PURE__*/React.createElement("div", {
       className: "msg-title"
     }, "Message shown to user on attempt"), generateInputAnswerEditors(), addAnswerButton, inputSize, rightAlign, coefficientCheck, labelText);
-  },
+  }
   change(...args) {
     return Changeable.change.apply(this, args);
-  },
-  onToggleOptions: function (choiceIndex) {
+  }
+  onToggleOptions(choiceIndex) {
     const showOptions = this.state.showOptions.slice();
     showOptions[choiceIndex] = !showOptions[choiceIndex];
     this.setState({
       showOptions: showOptions
     });
-  },
-  onTrashAnswer: function (choiceIndex) {
+  }
+  onTrashAnswer(choiceIndex) {
     if (choiceIndex >= 0 && choiceIndex < this.props.answers.length) {
       const answers = this.props.answers.slice(0);
       answers.splice(choiceIndex, 1);
@@ -33271,16 +33594,16 @@ const NumericInputEditor = createReactClass({
         answers: answers
       });
     }
-  },
-  onSpace: function (e, callback) {
+  }
+  onSpace(e, callback) {
     if (e.key === " ") {
       e.preventDefault(); // prevent page shifting
       // eslint-disable-next-line prefer-rest-params
       const args = _.toArray(arguments).slice(2);
       callback.apply(this, args);
     }
-  },
-  onStatusChange: function (choiceIndex) {
+  }
+  onStatusChange(choiceIndex) {
     const statuses = ["wrong", "ungraded", "correct"];
     const answers = this.props.answers;
     const i = _.indexOf(statuses, answers[choiceIndex].status);
@@ -33289,8 +33612,8 @@ const NumericInputEditor = createReactClass({
       status: newStatus,
       simplify: newStatus === "correct" ? "required" : "accepted"
     });
-  },
-  updateAnswer: function (choiceIndex, update) {
+  }
+  updateAnswer(choiceIndex, update) {
     if (!_.isObject(update)) {
       return _.partial((choiceIndex, key, value) => {
         const update = {};
@@ -33298,7 +33621,9 @@ const NumericInputEditor = createReactClass({
         this.updateAnswer(choiceIndex, update);
       }, choiceIndex, update);
     }
-    let answers = _.clone(this.props.answers);
+    let answers = [
+    // Have to do this to remove the `readonly` state from the prop
+    ...this.props.answers];
 
     // Don't bother to make a new answer box unless we are editing the last
     // one.
@@ -33311,15 +33636,15 @@ const NumericInputEditor = createReactClass({
     this.props.onChange({
       answers: answers
     });
-  },
-  addAnswer: function () {
+  }
+  addAnswer() {
     const lastAnswer = initAnswer(this.state.lastStatus);
     const answers = this.props.answers.concat(lastAnswer);
     this.props.onChange({
       answers: answers
     });
-  },
-  getSaveWarnings: function () {
+  }
+  getSaveWarnings() {
     // Filter out all the empty answers
     const warnings = [];
     // TODO(emily): This doesn't actually work, because the value is either
@@ -33337,11 +33662,21 @@ const NumericInputEditor = createReactClass({
       }
     });
     return warnings;
-  },
+  }
   serialize() {
     return EditorJsonify.serialize.call(this);
   }
-});
+}
+NumericInputEditor.contextType = PerseusI18nContext;
+NumericInputEditor.widgetName = "numeric-input";
+NumericInputEditor.displayName = "NumericInputEditor";
+NumericInputEditor.defaultProps = {
+  answers: [initAnswer("correct")],
+  size: "normal",
+  coefficient: false,
+  labelText: "",
+  rightAlign: false
+};
 
 /* eslint-disable @khanacademy/ts-no-error-suppressions */
 const {
@@ -34014,9 +34349,7 @@ class ChoiceEditor extends React.Component {
       apiOptions: this.props.apiOptions,
       content: this.props.choice.clue || "",
       widgetEnabled: false,
-      placeholder: i18n$1._("Why is this choice %(correctOrIncorrect)s?", {
-        correctOrIncorrect: checkedClass
-      }),
+      placeholder: `Why is this choice ${checkedClass}?`,
       onChange: this.props.onClueChange
     });
     const deleteLink = /*#__PURE__*/React.createElement("a", {
@@ -34261,7 +34594,7 @@ RadioEditor.propTypes = _extends({}, Changeable.propTypes, {
 });
 RadioEditor.widgetName = "radio";
 RadioEditor.defaultProps = {
-  choices: [{}, {}],
+  choices: [{}, {}, {}, {}],
   displayCount: null,
   randomize: false,
   hasNoneOfTheAbove: false,