@khanacademy/perseus-editor 14.2.0 → 14.4.0

package/dist/es/index.js

@@ -34,17 +34,18 @@ import caretUpIcon from '@phosphor-icons/core/bold/caret-up-bold.svg';
 import trashIcon from '@phosphor-icons/core/bold/trash-bold.svg';
 import copyIcon from '@phosphor-icons/core/assets/regular/copy.svg';
 import autoPasteIcon from '@phosphor-icons/core/assets/regular/note-pencil.svg';
+import plusCircle from '@phosphor-icons/core/regular/plus-circle.svg';
+import { vec } from 'mafs';
 import arrowFatDown from '@phosphor-icons/core/regular/arrow-fat-down.svg';
 import arrowFatLeft from '@phosphor-icons/core/regular/arrow-fat-left.svg';
 import arrowFatRight from '@phosphor-icons/core/regular/arrow-fat-right.svg';
 import arrowFatUp from '@phosphor-icons/core/regular/arrow-fat-up.svg';
 import minusCircle from '@phosphor-icons/core/regular/minus-circle.svg';
-import plusCircle from '@phosphor-icons/core/regular/plus-circle.svg';
 import arrowCounterClockwise from '@phosphor-icons/core/bold/arrow-counter-clockwise-bold.svg';
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "14.2.0";
+const libVersion = "14.4.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -229,7 +230,7 @@ class SectionControlButton extends React.Component {
       role: "button",
       hideDefaultFocusRing: true,
       "aria-label": title,
-      style: styles$U.button
+      style: styles$T.button
     }, ({
       hovered,
       focused,
@@ -237,7 +238,7 @@ class SectionControlButton extends React.Component {
     }) => /*#__PURE__*/React.createElement(InlineIcon$b, icon));
   }
 }
-const styles$U = StyleSheet.create({
+const styles$T = StyleSheet.create({
   button: {
     backgroundColor: color.gold,
     margin: 2,
@@ -20628,11 +20629,11 @@ class Spring extends React.Component {
     } = this.props;
     return React.createElement(View, {
       "aria-hidden": "true",
-      style: [styles$T.grow, style]
+      style: [styles$S.grow, style]
     });
   }
 }
-const styles$T = StyleSheet.create({
+const styles$S = StyleSheet.create({
   grow: {
     flexGrow: 1
   }
@@ -20698,6 +20699,7 @@ const _upgradeWidgetInfo = props => {
 // eslint-disable-next-line react/no-unsafe
 class WidgetEditor extends React.Component {
   constructor(props) {
+    var _props$widgetIsOpen;
     super(props);
     this.widget = void 0;
     this._toggleWidget = e => {
@@ -20751,7 +20753,7 @@ class WidgetEditor extends React.Component {
       };
     };
     this.state = {
-      showWidget: false,
+      showWidget: (_props$widgetIsOpen = props.widgetIsOpen) != null ? _props$widgetIsOpen : true,
       widgetInfo: _upgradeWidgetInfo(props)
     };
     this.widget = /*#__PURE__*/React.createRef();
@@ -20762,6 +20764,12 @@ class WidgetEditor extends React.Component {
     this.setState({
       widgetInfo: _upgradeWidgetInfo(nextProps)
     });
+    // user can update internal state while the widget is handled globally
+    if (nextProps.widgetIsOpen != null && nextProps.widgetIsOpen !== this.props.widgetIsOpen) {
+      this.setState({
+        showWidget: nextProps.widgetIsOpen
+      });
+    }
   }
   render() {
     const widgetInfo = this.state.widgetInfo;
@@ -20869,13 +20877,13 @@ class WidgetSelect extends React.Component {
  * that collapse a region.
  */
 function ToggleableCaret(props) {
-  const iconStyle = props.isExpanded ? styles$S.expanded : styles$S.collapsed;
+  const iconStyle = props.isExpanded ? styles$R.expanded : styles$R.collapsed;
   return /*#__PURE__*/React.createElement(PhosphorIcon, {
     icon: caretRight,
     style: iconStyle
   });
 }
-const styles$S = StyleSheet.create({
+const styles$R = StyleSheet.create({
   collapsed: {
     transition: ".15s"
   },
@@ -20908,16 +20916,16 @@ class TexErrorView extends React.Component {
       showErrors
     } = this.state;
     return /*#__PURE__*/React.createElement(View, {
-      style: styles$R.errorContainer
+      style: styles$Q.errorContainer
     }, /*#__PURE__*/React.createElement(View, {
-      style: styles$R.title,
+      style: styles$Q.title,
       onClick: this.handleToggleTexErrors
     }, /*#__PURE__*/React.createElement(ToggleableCaret, {
       isExpanded: showErrors
     }), "\xA0 TeX Errors (", errorList.length, ")"), showErrors && /*#__PURE__*/React.createElement(View, {
-      style: styles$R.errorExplanation
+      style: styles$Q.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$R.error,
+      style: styles$Q.error,
       key: index
     }, /*#__PURE__*/React.createElement(View, {
       style: {
@@ -20926,7 +20934,7 @@ class TexErrorView extends React.Component {
     }, e.math), /*#__PURE__*/React.createElement(View, null, e.message))));
   }
 }
-const styles$R = StyleSheet.create({
+const styles$Q = StyleSheet.create({
   title: {
     backgroundColor: "#eee",
     fontSize: "1.25em",
@@ -21574,7 +21582,8 @@ class Editor extends React.Component {
       // eslint-disable-next-line react/jsx-no-bind
       ,
       onRemove: this._handleWidgetEditorRemove.bind(this, id),
-      apiOptions: this.props.apiOptions
+      apiOptions: this.props.apiOptions,
+      widgetIsOpen: this.props.widgetIsOpen
     }, this.props.widgets[id]));
   }
   render() {
@@ -24039,7 +24048,7 @@ ItemExtrasEditor.defaultProps = {
   zTable: false
 };
 const ItemExtraCheckbox = props => /*#__PURE__*/React.createElement(View, {
-  style: [styles$Q.checkbox, props.indent ? styles$Q.indented : undefined]
+  style: [styles$P.checkbox, props.indent ? styles$P.indented : undefined]
 }, /*#__PURE__*/React.createElement(Checkbox$1, {
   label: /*#__PURE__*/React.createElement(View, {
     style: {
@@ -24049,7 +24058,7 @@ const ItemExtraCheckbox = props => /*#__PURE__*/React.createElement(View, {
   checked: props.checked,
   onChange: newCheckedState => props.onChange(newCheckedState)
 }));
-const styles$Q = StyleSheet.create({
+const styles$P = StyleSheet.create({
   indented: {
     marginInlineStart: spacing.large_24
   }
@@ -24119,7 +24128,8 @@ class ItemEditor extends React.Component {
       imageUploader: this.props.imageUploader,
       onChange: this.handleEditorChange,
       apiOptions: this.props.apiOptions,
-      showWordCount: true
+      showWordCount: true,
+      widgetIsOpen: this.props.widgetIsOpen
     }, this.props.question))), /*#__PURE__*/React.createElement("div", {
       className: "perseus-editor-right-cell"
     }, /*#__PURE__*/React.createElement("div", {
@@ -24167,6 +24177,7 @@ const {
 } = components;
 class EditorPage extends React.Component {
   constructor(props) {
+    var _this$props$widgetsAr;
     super(props);
     this._isMounted = void 0;
     this.renderer = void 0;
@@ -24199,7 +24210,8 @@ class EditorPage extends React.Component {
       json: _.pick(this.props, "question", "answerArea", "hints", "itemDataVersion"),
       gradeMessage: "",
       wasAnswered: false,
-      highlightLint: true
+      highlightLint: true,
+      widgetsAreOpen: (_this$props$widgetsAr = this.props.widgetsAreOpen) != null ? _this$props$widgetsAr : true
     };
     this._isMounted = false;
   }
@@ -24327,6 +24339,7 @@ class EditorPage extends React.Component {
       wasAnswered: this.state.wasAnswered,
       gradeMessage: this.state.gradeMessage,
       deviceType: this.props.previewDevice,
+      widgetIsOpen: this.state.widgetsAreOpen,
       apiOptions: deviceBasedApiOptions,
       previewURL: this.props.previewURL
     }), (!this.props.developerMode || !this.props.jsonMode) && /*#__PURE__*/React.createElement(CombinedHintsEditor, {
@@ -24707,7 +24720,7 @@ class SimpleButton extends React.Component {
       } = _this$props,
       otherProps = _objectWithoutPropertiesLoose(_this$props, _excluded$3);
     return /*#__PURE__*/React.createElement("div", _extends({
-      className: css(styles$P.baseButton, color === "green" && styles$P.green, color === "orange" && styles$P.orange),
+      className: css(styles$O.baseButton, color === "green" && styles$O.green, color === "orange" && styles$O.orange),
       onClick: onClick
     }, otherProps), children);
   }
@@ -24722,7 +24735,7 @@ SimpleButton.defaultProps = {
   color: "green",
   onClick: () => {}
 };
-const styles$P = StyleSheet.create({
+const styles$O = StyleSheet.create({
   baseButton: {
     top: "0",
     fontSize: "11px",
@@ -24942,23 +24955,23 @@ const LeafContainer = ({
 }) => {
   const hasPreviewHeading = shape.type === "content" || shape.type === "hint";
   const previewHeading = hasPreviewHeading && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.containerHeader)
+    className: css(styles$N.containerHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$O.containerTitle)
+    className: css(styles$N.containerTitle)
   }, capitalize(name)));
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.container)
+    className: css(styles$N.container)
   }, /*#__PURE__*/React.createElement("span", {
-    className: css(styles$O.row, styles$O.rowHeading)
+    className: css(styles$N.row, styles$N.rowHeading)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft)
+    className: css(styles$N.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: "pod-title " + css(styles$O.containerHeader)
+    className: "pod-title " + css(styles$N.containerHeader)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.containerTitle)
+    className: css(styles$N.containerTitle)
   }, capitalize(name)), controls)), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnRight)
+    className: css(styles$N.columnRight)
   }, previewHeading)), children);
 };
 const ArrayContainer = props => {
@@ -24971,11 +24984,11 @@ const ArrayContainer = props => {
     actions
   } = props;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.container)
+    className: css(styles$N.container)
   }, controls && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft, styles$O.containerHeader)
+    className: css(styles$N.columnLeft, styles$N.containerHeader)
   }, controls), /*#__PURE__*/React.createElement("div", null, children), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft)
+    className: css(styles$N.columnLeft)
   }, /*#__PURE__*/React.createElement("a", {
     href: "javascript:void 0",
     onClick: () => actions.addArrayElement(path, shape.elementShape)
@@ -24988,28 +25001,28 @@ const ObjectContainer = ({
   path
 }) => {
   const headingEditor = /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.containerHeader)
+    className: css(styles$N.containerHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$O.containerTitle)
+    className: css(styles$N.containerTitle)
   }, capitalize(name)), controls);
   const headingPreview = (name || controls) && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.containerHeader, styles$O.previewCollectionHeader)
+    className: css(styles$N.containerHeader, styles$N.previewCollectionHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$O.containerTitle)
+    className: css(styles$N.containerTitle)
   }, capitalize(name)));
   const hasBothHeadings = headingEditor && headingPreview;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.container)
+    className: css(styles$N.container)
   }, hasBothHeadings && /*#__PURE__*/React.createElement("span", {
-    className: css(styles$O.row)
+    className: css(styles$N.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft)
+    className: css(styles$N.columnLeft)
   }, headingEditor), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnRight)
+    className: css(styles$N.columnRight)
   }, headingPreview)), /*#__PURE__*/React.createElement("div", {
-    className: css(path.length > 0 && styles$O.contentIndent)
+    className: css(path.length > 0 && styles$N.contentIndent)
   }, children));
 };
 
@@ -25132,11 +25145,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$O.row)
+    className: css(styles$N.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft)
+    className: css(styles$N.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$O.sticky)
+    className: css(sticky && styles$N.sticky)
   },
   /*#__PURE__*/
   // @ts-expect-error - TS2769 - No overload matches this call.
@@ -25144,9 +25157,9 @@ const ItemNodeContent = withStickiness(props => {
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions
   })))), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnRight)
+    className: css(styles$N.columnRight)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$O.sticky)
+    className: css(sticky && styles$N.sticky)
   }, preview))));
 });
 const HintNodeContent = withStickiness(props => {
@@ -25162,13 +25175,13 @@ const HintNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.row)
+    className: css(styles$N.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft)
+    className: css(styles$N.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$O.sticky)
+    className: css(sticky && styles$N.sticky)
   }, /*#__PURE__*/React.createElement(HintEditor, _extends({}, data, {
-    className: css(styles$O.hintEditor),
+    className: css(styles$N.hintEditor),
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions,
     showTitle: false,
@@ -25183,9 +25196,9 @@ const HintNodeContent = withStickiness(props => {
     isFirst: true,
     isLast: true
   })))), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnRight)
+    className: css(styles$N.columnRight)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$O.sticky)
+    className: css(sticky && styles$N.sticky)
   }, preview)));
 });
 const TagsNodeContent = props => {
@@ -25202,9 +25215,9 @@ const TagsNodeContent = props => {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.columnLeft)
+    className: css(styles$N.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$O.tagsEditor)
+    className: css(styles$N.tagsEditor)
   }, /*#__PURE__*/React.createElement(GroupMetadataEditor, {
     value: data,
     onChange: newVal => actions.setValueAtPath(path, newVal),
@@ -25235,23 +25248,23 @@ const ArrayNodeContent = props => {
     const subpath = path.concat(i);
     const controls = [i > 0 && /*#__PURE__*/React.createElement("div", {
       key: "moveArrayElementUp",
-      className: css(styles$O.control)
+      className: css(styles$N.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Move up",
       onClick: () => actions.moveArrayElementUp(subpath)
     }, /*#__PURE__*/React.createElement("div", {
-      className: css(styles$O.verticalFlip)
+      className: css(styles$N.verticalFlip)
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconChevronDown)))), i < data.length - 1 && /*#__PURE__*/React.createElement("div", {
       key: "moveArrayElementDown",
-      className: css(styles$O.control)
+      className: css(styles$N.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$O.control)
+      className: css(styles$N.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Delete",
@@ -25259,7 +25272,7 @@ const ArrayNodeContent = props => {
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconTrash$4)))];
     return /*#__PURE__*/React.createElement("div", {
       key: i,
-      className: css(styles$O.arrayElement, !elementIsLeaf && styles$O.arrayElementAndNotLeaf)
+      className: css(styles$N.arrayElement, !elementIsLeaf && styles$N.arrayElementAndNotLeaf)
     }, /*#__PURE__*/React.createElement(NodeContainer, _extends({}, otherProps, {
       key: i,
       shape: shape.elementShape,
@@ -25285,7 +25298,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$O.objectElement)
+    className: css(styles$N.objectElement)
   }, /*#__PURE__*/React.createElement(NodeContainer, _extends({}, otherProps, {
     shape: shape.shape[subkey],
     data: data[subkey],
@@ -25452,7 +25465,7 @@ class MultiRendererEditor extends React.Component {
     }, this._renderContent());
   }
 }
-const styles$O = StyleSheet.create({
+const styles$N = StyleSheet.create({
   // This is used in a number of places throughout this file.
   container: {},
   // eslint-disable-next-line react-native/no-unused-styles
@@ -26398,7 +26411,7 @@ const SortableItem = createReactClass({
     }
     return /*#__PURE__*/React.createElement("li", {
       draggable: this.props.draggable,
-      className: [dragState, css(styles$N.sortableListItem)].join(" "),
+      className: [dragState, css(styles$M.sortableListItem)].join(" "),
       onDragStart: this.handleDragStart,
       onDrop: this.handleDrop,
       onDragEnter: this.handleDragEnter,
@@ -26406,7 +26419,7 @@ const SortableItem = createReactClass({
     }, this.props.component);
   }
 });
-const styles$N = StyleSheet.create({
+const styles$M = StyleSheet.create({
   sortableListItem: {
     margin: "5px 0"
   }
@@ -26654,13 +26667,13 @@ class ExpressionEditor extends React.Component {
       onChange: this.handleToggleDiv
     }));
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(HeadingSmall, null, "Global Options"), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY)
+      className: css(styles$L.paddedY)
     }, /*#__PURE__*/React.createElement(LabeledTextField, {
       label: "Visible label",
       value: this.props.visibleLabel || "",
       onChange: this.change("visibleLabel")
     }), /*#__PURE__*/React.createElement(InfoTip$i, null, /*#__PURE__*/React.createElement("p", null, "Optional visible text; strongly encouraged to help learners using dictation software, but can be omitted if the surrounding content provides enough context."))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY)
+      className: css(styles$L.paddedY)
     }, /*#__PURE__*/React.createElement(LabeledTextField, {
       label: "Aria label",
       value: this.props.ariaLabel || "",
@@ -26669,13 +26682,13 @@ class ExpressionEditor extends React.Component {
       href: "https://www.w3.org/WAI/tips/designing/#ensure-that-form-elements-include-clearly-associated-labels",
       target: "_blank"
     }, "this article.")))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY)
+      className: css(styles$L.paddedY)
     }, /*#__PURE__*/React.createElement(LabeledTextField, {
       label: "Function variables",
       value: this.state.functionsInternal,
       onChange: this.handleFunctions
     }), /*#__PURE__*/React.createElement(InfoTip$i, null, /*#__PURE__*/React.createElement("p", null, "Single-letter variables listed here will be interpreted as functions. This let us know that f(x) means \"f of x\" and not \"f times x\"."))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY)
+      className: css(styles$L.paddedY)
     }, /*#__PURE__*/React.createElement(Checkbox$1, {
       label: "Use \xD7 instead of \u22C5 for multiplication",
       checked: this.props.times,
@@ -26685,7 +26698,7 @@ class ExpressionEditor extends React.Component {
         });
       }
     }), /*#__PURE__*/React.createElement(InfoTip$i, null, /*#__PURE__*/React.createElement("p", null, "For pre-algebra problems this option displays multiplication as \\times instead of \\cdot in both the rendered output and the acceptable formats examples."))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY)
+      className: css(styles$L.paddedY)
     }, /*#__PURE__*/React.createElement(HeadingXSmall, null, "Button Sets"), buttonSetChoices), /*#__PURE__*/React.createElement(HeadingSmall, null, "Answers"), /*#__PURE__*/React.createElement("p", {
       style: {
         margin: "4px 0"
@@ -26756,18 +26769,18 @@ class AnswerOption extends React.Component {
       color: "destructive",
       light: true
     }, "Delete");
-    const answerStatusCss = css(styles$M.answerStatus, this.props.considered === "wrong" && styles$M.answerStatusWrong, this.props.considered === "correct" && styles$M.answerStatusCorrect, this.props.considered === "ungraded" && styles$M.answerStatusUngraded);
+    const answerStatusCss = css(styles$L.answerStatus, this.props.considered === "wrong" && styles$L.answerStatusWrong, this.props.considered === "correct" && styles$L.answerStatusCorrect, this.props.considered === "ungraded" && styles$L.answerStatusUngraded);
     return /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.answerOption)
+      className: css(styles$L.answerOption)
     }, /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.answerHandle)
+      className: css(styles$L.answerHandle)
     }), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.answerBody)
+      className: css(styles$L.answerBody)
     }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("button", {
       onClick: this.toggleConsidered,
       className: answerStatusCss
     }, this.props.considered), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Expression, this.props.expressionProps))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY, styles$M.paddedX)
+      className: css(styles$L.paddedY, styles$L.paddedX)
     }, /*#__PURE__*/React.createElement(Checkbox$1, {
       label: "Answer expression must have the same form.",
       checked: this.props.form,
@@ -26777,7 +26790,7 @@ class AnswerOption extends React.Component {
         });
       }
     }), /*#__PURE__*/React.createElement(InfoTip$i, null, /*#__PURE__*/React.createElement("p", null, "The student's answer must be in the same form. Commutativity and excess negative signs are ignored."))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.paddedY, styles$M.paddedX)
+      className: css(styles$L.paddedY, styles$L.paddedX)
     }, /*#__PURE__*/React.createElement(Checkbox$1, {
       label: "Answer expression must be fully expanded and simplified.",
       checked: this.props.simplify,
@@ -26787,11 +26800,11 @@ class AnswerOption extends React.Component {
         });
       }
     }), /*#__PURE__*/React.createElement(InfoTip$i, null, /*#__PURE__*/React.createElement("p", null, "The student's answer must be fully expanded and simplified. Answering this equation (x^2+2x+1) with this factored equation (x+1)^2 will render this response \"Your answer is not fully expanded and simplified.\""))), /*#__PURE__*/React.createElement("div", {
-      className: css(styles$M.buttonRow, styles$M.paddedY)
+      className: css(styles$L.buttonRow, styles$L.paddedY)
     }, removeButton)));
   }
 }
-const styles$M = StyleSheet.create({
+const styles$L = StyleSheet.create({
   paddedX: {
     paddingLeft: spacing.xSmall_8,
     paddingRight: spacing.xSmall_8
@@ -26886,10 +26899,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$K.title)
     }, "Title:", " ", /*#__PURE__*/React.createElement(TextInput$5, {
       value: this.props.title,
-      className: css(styles$L.input)
+      className: css(styles$K.input)
       // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       ,
       onChange: this.change("title")
@@ -26914,7 +26927,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$K.hintsTitle)
     }, "Hint"), /*#__PURE__*/React.createElement(Editor, {
       ref: this.hintEditor,
       content: this.props.hint ? this.props.hint.content : "",
@@ -26951,7 +26964,7 @@ GradedGroupEditor.defaultProps = {
   images: {},
   hint: null
 };
-const styles$L = StyleSheet.create({
+const styles$K = StyleSheet.create({
   title: {
     fontSize: 18,
     fontWeight: "bold"
@@ -28410,13 +28423,13 @@ function MathquillInput(props) {
     }
   });
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$K.outerWrapper
+    style: styles$J.outerWrapper
   }, /*#__PURE__*/React.createElement("span", {
     ref: mathFieldWrapperRef,
     className: "perseus-math-input mq-editable-field mq-math-mode"
   }));
 }
-const styles$K = StyleSheet.create({
+const styles$J = StyleSheet.create({
   outerWrapper: {
     display: "inline-block",
     borderStyle: "solid",
@@ -29520,7 +29533,7 @@ const GraphPointsCountSelector = ({
     // Never uses placeholder, always has value
     ,
     placeholder: "",
-    style: styles$J.singleSelectShort
+    style: styles$I.singleSelectShort
   }, [...[...Array(7).keys()].map(n => /*#__PURE__*/React.createElement(OptionItem, {
     key: n,
     value: `${n}`,
@@ -29531,7 +29544,7 @@ const GraphPointsCountSelector = ({
     label: "unlimited"
   })]);
 };
-const styles$J = StyleSheet.create({
+const styles$I = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29544,7 +29557,7 @@ const GraphTypeSelector = props => {
     selectedValue: props.graphType,
     onChange: props.onChange,
     placeholder: "Select an answer type",
-    style: styles$I.singleSelectShort
+    style: styles$H.singleSelectShort
   }, props.showNoneOption && /*#__PURE__*/React.createElement(OptionItem, {
     value: "none",
     label: "None"
@@ -29580,7 +29593,7 @@ const GraphTypeSelector = props => {
     label: "Angle"
   }));
 };
-const styles$I = StyleSheet.create({
+const styles$H = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29595,11 +29608,11 @@ function Heading({
   onToggle
 }) {
   return /*#__PURE__*/React.createElement(Clickable, {
-    style: [styles$H.container, !isCollapsible && styles$H.notClickable],
+    style: [styles$G.container, !isCollapsible && styles$G.notClickable],
     disabled: !isCollapsible,
     onClick: () => isCollapsible && (onToggle == null ? void 0 : onToggle(!isOpen))
   }, () => /*#__PURE__*/React.createElement(View, {
-    style: styles$H.heading
+    style: styles$G.heading
   }, /*#__PURE__*/React.createElement(LabelLarge, {
     style: {
       fontSize: 14,
@@ -29609,7 +29622,7 @@ function Heading({
     isExpanded: isOpen
   })));
 }
-const styles$H = StyleSheet.create({
+const styles$G = StyleSheet.create({
   container: {
     marginTop: spacing.small_12,
     // NOTE(jeremy): This is the inverse of the @editorPadding CSS
@@ -29669,7 +29682,7 @@ function InteractiveGraphDescription(props) {
     isOpen: isOpen,
     onToggle: setIsOpen
   }), isOpen && /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(LabelXSmall, {
-    style: styles$G.caption
+    style: styles$F.caption
   }, "Use these fields to describe the graph as a whole. These are used by screen readers to describe content to users who are visually impaired."), /*#__PURE__*/React.createElement(LabelLarge, {
     tag: "label"
   }, "Title", /*#__PURE__*/React.createElement(TextField, {
@@ -29677,7 +29690,7 @@ function InteractiveGraphDescription(props) {
     onChange: newValue => onChange({
       fullGraphAriaLabel: newValue
     }),
-    style: styles$G.spaceAbove
+    style: styles$F.spaceAbove
   })), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.small_12
   }), /*#__PURE__*/React.createElement(LabelLarge, {
@@ -29689,10 +29702,10 @@ function InteractiveGraphDescription(props) {
     onChange: newValue => onChange({
       fullGraphAriaDescription: newValue
     }),
-    style: styles$G.spaceAbove
+    style: styles$F.spaceAbove
   }))));
 }
-const styles$G = StyleSheet.create({
+const styles$F = StyleSheet.create({
   caption: {
     color: color.offBlack64,
     paddingTop: spacing.xxSmall_6,
@@ -29712,16 +29725,16 @@ const LabeledRow = props => {
     style
   } = props;
   return /*#__PURE__*/React.createElement("label", {
-    className: css(styles$F.label)
+    className: css(styles$E.label)
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$F.row, style]
+    style: [styles$E.row, style]
   }, labelSide === "start" || /*#__PURE__*/React.createElement(LabelSmall, {
-    style: styles$F.spaceEnd
+    style: styles$E.spaceEnd
   }, label), children, labelSide === "end" && /*#__PURE__*/React.createElement(LabelSmall, {
-    style: styles$F.spaceStart
+    style: styles$E.spaceStart
   }, label)));
 };
-const styles$F = StyleSheet.create({
+const styles$E = StyleSheet.create({
   label: {
     width: "fit-content"
   },
@@ -30115,10 +30128,10 @@ class InteractiveGraphSettings extends React.Component {
       }
     }))), /*#__PURE__*/React.createElement(LabeledRow, {
       label: "Background image URL:",
-      style: styles$E.resetSpaceTop
+      style: styles$D.resetSpaceTop
     }, /*#__PURE__*/React.createElement("input", {
       type: "text",
-      className: css(styles$E.backgroundUrlInput),
+      className: css(styles$D.backgroundUrlInput),
       ref: this.bgUrlRef,
       value: this.state.backgroundImage.url || "",
       onChange: e => {
@@ -30132,9 +30145,9 @@ class InteractiveGraphSettings extends React.Component {
       onKeyPress: this.changeBackgroundUrl,
       onBlur: this.changeBackgroundUrl
     }), /*#__PURE__*/React.createElement(InfoTip$d, 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$E.protractorSection
+      style: styles$D.protractorSection
     }, /*#__PURE__*/React.createElement(View, {
-      style: styles$E.checkboxRow
+      style: styles$D.checkboxRow
     }, /*#__PURE__*/React.createElement(Checkbox$1, {
       label: "Show protractor",
       checked: this.props.showProtractor,
@@ -30143,7 +30156,7 @@ class InteractiveGraphSettings extends React.Component {
           showProtractor: value
         });
       },
-      style: styles$E.resetSpaceTop
+      style: styles$D.resetSpaceTop
     })), this.props.showProtractor && /*#__PURE__*/React.createElement(Banner, {
       layout: "floating",
       text: "The protractor is not accessible. Please consider an alternate approach.",
@@ -30164,7 +30177,7 @@ InteractiveGraphSettings.defaultProps = {
   showProtractor: false,
   showTooltips: false
 };
-const styles$E = StyleSheet.create({
+const styles$D = StyleSheet.create({
   resetSpaceTop: {
     marginTop: 0
   },
@@ -30201,13 +30214,13 @@ const SegmentCountSelector = ({
     const num = +newValue;
     onChange(num);
   },
-  style: styles$D.singleSelectShort
+  style: styles$C.singleSelectShort
 }, _.range(1, 7).map(n => /*#__PURE__*/React.createElement(OptionItem, {
   key: n,
   value: `${n}`,
   label: `${n} segment${n > 1 ? "s" : ""}`
 })));
-const styles$D = StyleSheet.create({
+const styles$C = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -30232,17 +30245,17 @@ const LockedFigureSelect = props => {
     figureTypes.push("label");
   }
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$C.container
+    style: styles$B.container
   }, /*#__PURE__*/React.createElement(ActionMenu, {
     menuText: "Add locked figure",
-    style: styles$C.addElementSelect
+    style: styles$B.addElementSelect
   }, figureTypes.map(figureType => /*#__PURE__*/React.createElement(ActionItem, {
     key: `${id}-${figureType}`,
     label: figureType,
     onClick: () => onChange(figureType)
   }))));
 };
-const styles$C = StyleSheet.create({
+const styles$B = StyleSheet.create({
   container: {
     marginTop: spacing.xSmall_8
   },
@@ -30359,18 +30372,18 @@ const AngleInput = props => {
   }
   return /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$B.row
+    style: styles$A.row
   }, "angle (degrees)", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(ScrolllessNumberTextField, {
     value: angleInput,
     onChange: handleAngleChange,
-    style: styles$B.textField
+    style: styles$A.textField
   }), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }));
 };
-const styles$B = StyleSheet.create({
+const styles$A = StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30419,30 +30432,30 @@ const CoordinatePairInput = props => {
     onChange(newCoords);
   }
   return /*#__PURE__*/React.createElement(View, {
-    style: [styles$A.row, style]
+    style: [styles$z.row, style]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$A.row
+    style: styles$z.row
   }, labels ? labels[0] : "x coord", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(ScrolllessNumberTextField, {
     value: coordState[0],
     onChange: newValue => handleCoordChange(newValue, 0),
-    style: [styles$A.textField, error ? styles$A.errorField : undefined]
+    style: [styles$z.textField, error ? styles$z.errorField : undefined]
   })), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.medium_16
   }), /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$A.row
+    style: styles$z.row
   }, labels ? labels[1] : "y coord", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(ScrolllessNumberTextField, {
     value: coordState[1],
     onChange: newValue => handleCoordChange(newValue, 1),
-    style: [styles$A.textField, error ? styles$A.errorField : undefined]
+    style: [styles$z.textField, error ? styles$z.errorField : undefined]
   })));
 };
-const styles$A = StyleSheet.create({
+const styles$z = StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30475,14 +30488,14 @@ const PerseusEditorAccordion = props => {
   }, /*#__PURE__*/React.createElement(AccordionSection, {
     expanded: expanded,
     onToggle: onToggle,
-    style: [styles$z.container, containerStyle],
-    headerStyle: styles$z.accordionHeader,
+    style: [styles$y.container, containerStyle],
+    headerStyle: styles$y.accordionHeader,
     header: header
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$z.accordionPanel, panelStyle]
+    style: [styles$y.accordionPanel, panelStyle]
   }, children)));
 };
-const styles$z = StyleSheet.create({
+const styles$y = StyleSheet.create({
   container: {
     backgroundColor: color.fadedBlue8,
     marginTop: spacing.xSmall_8
@@ -30513,13 +30526,13 @@ const ColorSwatch = props => {
     "aria-label":
     // Don't include an aria label for decorative circles.
     !decorative ? `${color$1}, ${filled ? "filled" : "open"}` : undefined,
-    style: [styles$y.colorSwatch, {
+    style: [styles$x.colorSwatch, {
       border: `4px solid ${lockedFigureColors[color$1]}`,
       backgroundColor: filled ? lockedFigureColors[color$1] : color.white
     }]
   });
 };
-const styles$y = StyleSheet.create({
+const styles$x = StyleSheet.create({
   colorSwatch: {
     // Add a white outline so that the color swatch is visible when
     // the dropdown option is highlighted with its blue background.
@@ -30538,10 +30551,10 @@ const ColorSelect = props => {
     onChange
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: [styles$x.row, style]
+    style: [styles$w.row, style]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$x.row
+    style: styles$w.row
   }, "color", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(SingleSelect, {
@@ -30560,7 +30573,7 @@ const ColorSelect = props => {
     })
   })))));
 };
-const styles$x = StyleSheet.create({
+const styles$w = StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30579,17 +30592,17 @@ const EllipseSwatch = props => {
   } = props;
   return /*#__PURE__*/React.createElement(View, {
     "aria-label": `${color}, stroke ${strokeStyle}, fill ${fillStyle}`,
-    style: [styles$w.container, {
+    style: [styles$v.container, {
       border: `4px ${strokeStyle} ${lockedFigureColors[color]}`
     }]
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$w.innerCircle, {
+    style: [styles$v.innerCircle, {
       backgroundColor: lockedFigureColors[color],
       opacity: fillStyle === "white" ? 0 : lockedFigureFillStyles[fillStyle]
     }]
   }));
 };
-const styles$w = StyleSheet.create({
+const styles$v = StyleSheet.create({
   container: {
     // Add a white outline so that the color swatch is visible when
     // the dropdown option is highlighted with its blue background.
@@ -30615,7 +30628,7 @@ const LineStrokeSelect = props => {
   } = props;
   return /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$v.lineStrokeSelect
+    style: styles$u.lineStrokeSelect
   }, "stroke", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxxSmall_4
   }), /*#__PURE__*/React.createElement(SingleSelect, {
@@ -30632,7 +30645,7 @@ const LineStrokeSelect = props => {
     label: "dashed"
   })));
 };
-const styles$v = StyleSheet.create({
+const styles$u = StyleSheet.create({
   lineStrokeSelect: {
     display: "flex",
     flexDirection: "row",
@@ -30654,40 +30667,40 @@ const LockedFigureSettingsActions = props => {
     onRemove
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$u.container
+    style: styles$t.container
   }, /*#__PURE__*/React.createElement(Button, {
     startIcon: trashIcon,
     "aria-label": `Delete locked ${figureType}`,
     onClick: onRemove,
     kind: "tertiary",
-    style: styles$u.deleteButton
-  }, "Delete"), /*#__PURE__*/React.createElement(Spring, null), /*#__PURE__*/React.createElement(IconButton, {
+    style: styles$t.deleteButton
+  }, "Delete"), onMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Spring, null), /*#__PURE__*/React.createElement(IconButton, {
     icon: caretDoubleUpIcon,
     size: "small",
     "aria-label": `Move locked ${figureType} to the back`,
     onClick: () => onMove("back"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   }), /*#__PURE__*/React.createElement(IconButton, {
     icon: caretUpIcon,
     size: "small",
     "aria-label": `Move locked ${figureType} backward`,
     onClick: () => onMove("backward"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   }), /*#__PURE__*/React.createElement(IconButton, {
     icon: caretDownIcon,
     size: "small",
     "aria-label": `Move locked ${figureType} forward`,
     onClick: () => onMove("forward"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   }), /*#__PURE__*/React.createElement(IconButton, {
     icon: caretDoubleDownIcon,
     size: "small",
     "aria-label": `Move locked ${figureType} to the front`,
     onClick: () => onMove("front"),
-    style: styles$u.iconButton
-  }));
+    style: styles$t.iconButton
+  })));
 };
-const styles$u = StyleSheet.create({
+const styles$t = StyleSheet.create({
   container: {
     width: "100%",
     flexDirection: "row",
@@ -30734,7 +30747,7 @@ const LockedEllipseSettings = props => {
     /*#__PURE__*/
     // Summary: Ellipse, center, radius, color (opacity, dashed)
     React.createElement(View, {
-      style: styles$t.row
+      style: styles$s.row
     }, /*#__PURE__*/React.createElement(LabelLarge, null, `Ellipse (${center[0]}, ${center[1]}), radius ${radius[0]}, ${radius[1]}`), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
     }), /*#__PURE__*/React.createElement(EllipseSwatch, {
@@ -30743,19 +30756,19 @@ const LockedEllipseSettings = props => {
       strokeStyle: strokeStyle
     }))
   }, /*#__PURE__*/React.createElement(View, {
-    style: styles$t.row
+    style: styles$s.row
   }, /*#__PURE__*/React.createElement(CoordinatePairInput, {
     coord: center,
-    style: styles$t.spaceUnder,
+    style: styles$s.spaceUnder,
     onChange: newCoords => onChangeProps({
       center: newCoords
     })
   }), /*#__PURE__*/React.createElement(View, {
-    style: styles$t.spaceUnder
+    style: styles$s.spaceUnder
   }, /*#__PURE__*/React.createElement(InfoTip$c, null, "The coordinates for the center of the ellipse."))), /*#__PURE__*/React.createElement(CoordinatePairInput, {
     coord: radius,
     labels: ["x radius", "y radius"],
-    style: styles$t.spaceUnder,
+    style: styles$s.spaceUnder,
     onChange: newCoords => onChangeProps({
       radius: newCoords
     })
@@ -30767,7 +30780,7 @@ const LockedEllipseSettings = props => {
   }), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xSmall_8
   }), /*#__PURE__*/React.createElement(View, {
-    style: [styles$t.row, styles$t.spaceUnder]
+    style: [styles$s.row, styles$s.spaceUnder]
   }, /*#__PURE__*/React.createElement(ColorSelect, {
     selectedValue: color,
     onChange: handleColorChange
@@ -30775,7 +30788,7 @@ const LockedEllipseSettings = props => {
     size: spacing.medium_16
   }), /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: [styles$t.row, styles$t.truncatedWidth]
+    style: [styles$s.row, styles$s.truncatedWidth]
   }, "fill", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(SingleSelect, {
@@ -30801,7 +30814,7 @@ const LockedEllipseSettings = props => {
     onRemove: onRemove
   }));
 };
-const styles$t = StyleSheet.create({
+const styles$s = StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30822,15 +30835,15 @@ const LineSwatch = props => {
     lineStyle
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$s.container
+    style: styles$r.container
   }, /*#__PURE__*/React.createElement(View, {
     "aria-label": `${color}, ${lineStyle}`,
-    style: [styles$s.lineSwatch, {
+    style: [styles$r.lineSwatch, {
       border: `5px ${lineStyle} ${lockedFigureColors[color]}`
     }]
   }));
 };
-const styles$s = StyleSheet.create({
+const styles$r = StyleSheet.create({
   container: {
     backgroundColor: color.white,
     justifyContent: "center",
@@ -30915,9 +30928,9 @@ const LockedFunctionSettings = props => {
     expanded: props.expanded,
     onToggle: props.onToggle,
     header: /*#__PURE__*/React.createElement(View, {
-      style: styles$r.row
+      style: styles$q.row
     }, /*#__PURE__*/React.createElement(LabelLarge, {
-      style: styles$r.accordionHeader
+      style: styles$q.accordionHeader
     }, lineLabel), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
     }), /*#__PURE__*/React.createElement(LineSwatch, {
@@ -30925,7 +30938,7 @@ const LockedFunctionSettings = props => {
       lineStyle: strokeStyle
     }))
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$r.row, styles$r.spaceUnder]
+    style: [styles$q.row, styles$q.spaceUnder]
   }, /*#__PURE__*/React.createElement(ColorSelect, {
     selectedValue: lineColor,
     onChange: newValue => {
@@ -30939,14 +30952,14 @@ const LockedFunctionSettings = props => {
       handlePropChange("strokeStyle", newValue);
     }
   })), /*#__PURE__*/React.createElement(View, {
-    style: [styles$r.row, styles$r.rowSpace]
+    style: [styles$q.row, styles$q.rowSpace]
   }, /*#__PURE__*/React.createElement(SingleSelect, {
     selectedValue: directionalAxis,
     onChange: newValue => {
       handlePropChange("directionalAxis", newValue);
     },
     "aria-label": "equation prefix",
-    style: [styles$r.dropdownLabel, styles$r.axisMenu]
+    style: [styles$q.dropdownLabel, styles$q.axisMenu]
     // Placeholder is required, but never gets used.
     ,
     placeholder: ""
@@ -30965,17 +30978,17 @@ const LockedFunctionSettings = props => {
     onChange: newValue => {
       handlePropChange("equation", newValue);
     },
-    style: [styles$r.textField]
+    style: [styles$q.textField]
   })), /*#__PURE__*/React.createElement(View, {
-    style: [styles$r.row, styles$r.rowSpace]
+    style: [styles$q.row, styles$q.rowSpace]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: [styles$r.dropdownLabel, styles$r.domainMin]
+    style: [styles$q.dropdownLabel, styles$q.domainMin]
   }, `${domainRangeText} min`, /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(TextField, {
     type: "number",
-    style: styles$r.domainMinField,
+    style: styles$q.domainMinField,
     value: domainEntries[0],
     onChange: newValue => {
       handleDomainChange(0, newValue);
@@ -30985,12 +30998,12 @@ const LockedFunctionSettings = props => {
   }), /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
     "aria-label": `${domainRangeText} max`,
-    style: [styles$r.dropdownLabel, styles$r.domainMax]
+    style: [styles$q.dropdownLabel, styles$q.domainMax]
   }, "max", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(TextField, {
     type: "number",
-    style: styles$r.domainMaxField,
+    style: styles$q.domainMaxField,
     value: domainEntries[1],
     onChange: newValue => {
       handleDomainChange(1, newValue);
@@ -30998,11 +31011,11 @@ const LockedFunctionSettings = props => {
   }))), /*#__PURE__*/React.createElement(PerseusEditorAccordion, {
     header: /*#__PURE__*/React.createElement(LabelLarge, null, "Example Functions"),
     expanded: false,
-    containerStyle: styles$r.exampleWorkspace,
-    panelStyle: styles$r.exampleAccordionPanel
+    containerStyle: styles$q.exampleWorkspace,
+    panelStyle: styles$q.exampleAccordionPanel
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$r.dropdownLabel
+    style: styles$q.dropdownLabel
   }, "Choose a category", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxSmall_6
   }), /*#__PURE__*/React.createElement(SingleSelect, {
@@ -31016,7 +31029,7 @@ const LockedFunctionSettings = props => {
       label: category
     });
   }))), exampleCategorySelected && /*#__PURE__*/React.createElement("ul", {
-    className: css(styles$r.exampleContainer)
+    className: css(styles$q.exampleContainer)
   }, exampleContent.map((example, index) => /*#__PURE__*/React.createElement(ExampleItem, {
     category: exampleCategory,
     example: example,
@@ -31038,29 +31051,29 @@ const ExampleItem = props => {
   const exampleId = useId();
   return /*#__PURE__*/React.createElement("li", {
     key: `${category}-${index}`,
-    className: css(styles$r.exampleRow)
+    className: css(styles$q.exampleRow)
   }, /*#__PURE__*/React.createElement(IconButton, {
     icon: autoPasteIcon,
     "aria-label": "paste example",
     "aria-describedby": exampleId,
     onClick: () => pasteEquationFn("equation", example),
     size: "medium",
-    style: styles$r.copyPasteButton
+    style: styles$q.copyPasteButton
   }), /*#__PURE__*/React.createElement(IconButton, {
     icon: copyIcon,
     "aria-label": "copy example",
     "aria-describedby": exampleId,
     onClick: () => navigator.clipboard.writeText(example),
     size: "medium",
-    style: styles$r.copyPasteButton
+    style: styles$q.copyPasteButton
   }), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxxSmall_4
   }), /*#__PURE__*/React.createElement(View, {
-    style: styles$r.exampleContent,
+    style: styles$q.exampleContent,
     id: exampleId
   }, example));
 };
-const styles$r = StyleSheet.create({
+const styles$q = StyleSheet.create({
   accordionHeader: {
     textOverflow: "ellipsis",
     // A maximum width needs to be specified in order for the ellipsis to work.
@@ -31172,21 +31185,23 @@ function LockedLabelSettings(props) {
     onChangeProps,
     onMove,
     onRemove,
-    onToggle
+    onToggle,
+    containerStyle
   } = props;
   return /*#__PURE__*/React.createElement(PerseusEditorAccordion, {
     expanded: expanded,
     onToggle: onToggle,
     header: /*#__PURE__*/React.createElement(View, {
-      style: [styles$q.row, styles$q.accordionHeaderContainer]
+      style: [styles$p.row, styles$p.accordionHeaderContainer]
     }, /*#__PURE__*/React.createElement(LabelLarge, null, "Label (", coord[0], ", ", coord[1], ")"), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
     }), text !== "" && /*#__PURE__*/React.createElement(LabelLarge, {
       style: [{
         backgroundColor: color.white,
         color: lockedFigureColors[color$1]
-      }, styles$q.accordionHeader]
-    }, text))
+      }, styles$p.accordionHeader]
+    }, text)),
+    containerStyle: containerStyle
   }, /*#__PURE__*/React.createElement(CoordinatePairInput, {
     coord: coord,
     onChange: newCoords => {
@@ -31194,10 +31209,10 @@ function LockedLabelSettings(props) {
         coord: newCoords
       });
     },
-    style: styles$q.spaceUnder
+    style: styles$p.spaceUnder
   }), /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: [styles$q.row, styles$q.spaceUnder]
+    style: [styles$p.row, styles$p.spaceUnder]
   }, "TeX", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xSmall_8
   }), /*#__PURE__*/React.createElement(TextField, {
@@ -31207,20 +31222,20 @@ function LockedLabelSettings(props) {
       text: newValue
     })
   })), /*#__PURE__*/React.createElement(View, {
-    style: styles$q.row
-  }, /*#__PURE__*/React.createElement(ColorSelect, {
+    style: styles$p.row
+  }, onMove && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColorSelect, {
     selectedValue: color$1,
     onChange: newColor => {
       onChangeProps({
         color: newColor
       });
     },
-    style: styles$q.spaceUnder
+    style: styles$p.spaceUnder
   }), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.medium_16
-  }), /*#__PURE__*/React.createElement(LabelMedium, {
+  })), /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: styles$q.row
+    style: styles$p.row
   }, "size", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xSmall_8
   }), /*#__PURE__*/React.createElement(SingleSelect, {
@@ -31247,7 +31262,7 @@ function LockedLabelSettings(props) {
     onRemove: onRemove
   }));
 }
-const styles$q = StyleSheet.create({
+const styles$p = StyleSheet.create({
   accordionHeaderContainer: {
     // Stop the label summary from wrapping.
     whiteSpace: "nowrap"
@@ -31281,7 +31296,7 @@ const LabeledSwitch = props => {
   const ids = useUniqueIdWithMock();
   const switchId = ids.get("switch");
   return /*#__PURE__*/React.createElement(View, {
-    style: [styles$p.row, style]
+    style: [styles$o.row, style]
   }, /*#__PURE__*/React.createElement(Switch, {
     id: switchId,
     checked: checked,
@@ -31293,71 +31308,168 @@ const LabeledSwitch = props => {
     htmlFor: switchId
   }, label));
 };
-const styles$p = StyleSheet.create({
+const styles$o = StyleSheet.create({
   row: {
     flexDirection: "row",
     alignItems: "center"
   }
 });
 
-/**
- * DefiningPointSettings is a component that allows the user to edit the
- * settings of a point that defines a locked figure (ex. line) on the graph.
- *
- * Used in the interactive graph editor's locked figures section.
- */
-const DefiningPointSettings = props => {
+const DEFAULT_COLOR = "grayH";
+function getDefaultFigureForType(type) {
+  switch (type) {
+    case "point":
+      return {
+        type: "point",
+        coord: [0, 0],
+        color: DEFAULT_COLOR,
+        filled: true,
+        labels: []
+      };
+    case "line":
+      return {
+        type: "line",
+        kind: "line",
+        points: [getDefaultFigureForType("point"), _extends({}, getDefaultFigureForType("point"), {
+          coord: [2, 2]
+        })],
+        color: DEFAULT_COLOR,
+        lineStyle: "solid",
+        showPoint1: false,
+        showPoint2: false,
+        labels: []
+      };
+    case "vector":
+      return {
+        type: "vector",
+        points: [[0, 0], [2, 2]],
+        color: DEFAULT_COLOR
+      };
+    case "ellipse":
+      return {
+        type: "ellipse",
+        center: [0, 0],
+        radius: [1, 1],
+        angle: 0,
+        color: DEFAULT_COLOR,
+        fillStyle: "none",
+        strokeStyle: "solid"
+      };
+    case "polygon":
+      return {
+        type: "polygon",
+        points: [[0, 2], [-1, 0], [1, 0]],
+        color: DEFAULT_COLOR,
+        showVertices: false,
+        fillStyle: "none",
+        strokeStyle: "solid"
+      };
+    case "function":
+      return {
+        type: "function",
+        color: DEFAULT_COLOR,
+        strokeStyle: "solid",
+        equation: "x^2",
+        directionalAxis: "x"
+      };
+    case "label":
+      return {
+        type: "label",
+        coord: [0, 0],
+        text: "",
+        color: DEFAULT_COLOR,
+        size: "medium"
+      };
+    default:
+      throw new UnreachableCaseError(type);
+  }
+}
+
+const LockedPointSettings = props => {
+  var _flags$mafs, _flags$mafs2;
   const {
+    flags,
+    headerLabel,
     coord,
     color: pointColor,
     filled = true,
-    label,
-    showPoint = "false",
-    error,
+    labels,
     onChangeProps,
-    onTogglePoint,
+    onMove,
+    onRemove,
+    // defining point props
+    showPoint,
     expanded,
+    onTogglePoint,
     onToggle
   } = props;
+  const isDefiningPoint = !onMove && !onRemove;
   function handleColorChange(newValue) {
-    onChangeProps({
+    const newProps = {
+      color: newValue
+    };
+
+    // Update the color of the all labels to match the point
+    newProps.labels = labels.map(label => _extends({}, label, {
       color: newValue
+    }));
+    onChangeProps(newProps);
+  }
+  function handleCoordChange(newCoord) {
+    const xOffset = newCoord[0] - coord[0];
+    const yOffset = newCoord[1] - coord[1];
+    const newProps = {
+      coord: newCoord
+    };
+
+    // Update the coord by the same amount as the point for all labels
+    newProps.labels = labels.map(label => _extends({}, label, {
+      coord: [label.coord[0] + xOffset, label.coord[1] + yOffset]
+    }));
+    onChangeProps(newProps);
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = _extends({}, labels[labelIndex], updatedLabel);
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
     });
   }
   return /*#__PURE__*/React.createElement(PerseusEditorAccordion, {
     expanded: expanded,
     onToggle: onToggle,
-    containerStyle: styles$o.container,
-    panelStyle: styles$o.accordionPanel,
+    containerStyle: isDefiningPoint ? styles$n.definingContainer : undefined,
+    panelStyle: isDefiningPoint ? styles$n.definingPanel : undefined,
     header:
     /*#__PURE__*/
     // Summary: Point, coords, color (filled/open)
     React.createElement(View, {
-      style: styles$o.row
-    }, /*#__PURE__*/React.createElement(LabelLarge, null, `${label || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React.createElement(Strut, {
+      style: styles$n.row
+    }, /*#__PURE__*/React.createElement(LabelLarge, null, `${headerLabel || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
-    }), showPoint && /*#__PURE__*/React.createElement(ColorSwatch, {
+    }), /*#__PURE__*/React.createElement(ColorSwatch, {
       color: pointColor,
       filled: filled
     }))
   }, /*#__PURE__*/React.createElement(CoordinatePairInput, {
     coord: coord,
-    error: !!error,
-    style: styles$o.spaceUnder,
-    onChange: newCoords => {
-      onChangeProps({
-        coord: newCoords
-      });
-    }
+    style: styles$n.spaceUnder,
+    onChange: handleCoordChange
   }), onTogglePoint && /*#__PURE__*/React.createElement(LabeledSwitch, {
     label: "show point on graph",
     checked: !!showPoint,
-    style: showPoint && styles$o.spaceUnder,
+    style: showPoint && styles$n.spaceUnder,
     onChange: onTogglePoint
-  }), showPoint && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColorSelect, {
+  }), (!isDefiningPoint || showPoint) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColorSelect, {
     selectedValue: pointColor,
     onChange: handleColorChange,
-    style: styles$o.spaceUnder
+    style: styles$n.spaceUnder
   }), /*#__PURE__*/React.createElement(LabeledSwitch, {
     label: "open point",
     checked: !filled,
@@ -31366,19 +31478,57 @@ const DefiningPointSettings = props => {
         filled: !newValue
       });
     }
-  })));
+  })), (!isDefiningPoint && (flags == null || (_flags$mafs = flags["mafs"]) == null ? void 0 : _flags$mafs["locked-point-labels"]) || isDefiningPoint && (flags == null || (_flags$mafs2 = flags["mafs"]) == null ? void 0 : _flags$mafs2["locked-line-labels"])) && /*#__PURE__*/React.createElement(React.Fragment, null, labels.map((label, labelIndex) => /*#__PURE__*/React.createElement(LockedLabelSettings, _extends({}, label, {
+    containerStyle: !isDefiningPoint && styles$n.lockedPointLabelContainer,
+    expanded: true,
+    onChangeProps: newLabel => {
+      handleLabelChange(newLabel, labelIndex);
+    },
+    onRemove: () => {
+      handleLabelRemove(labelIndex);
+    }
+  }))), /*#__PURE__*/React.createElement(Button, {
+    kind: "tertiary",
+    startIcon: plusCircle,
+    onClick: () => {
+      const newLabel = _extends({}, getDefaultFigureForType("label"), {
+        // Place the label at the same position
+        // as the point. Add a small offset to
+        // avoid crowding.
+        coord: [coord[0] + 0.5,
+        // Additional offset for each label so
+        // they don't overlap.
+        coord[1] - 1 * (labels == null ? void 0 : labels.length)],
+        // Default to the same color as the point
+        color: pointColor
+      });
+      onChangeProps({
+        labels: [...labels, newLabel]
+      });
+    },
+    style: styles$n.addButton
+  }, "Add visible label")), onRemove && /*#__PURE__*/React.createElement(LockedFigureSettingsActions, {
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
 };
-const styles$o = StyleSheet.create({
-  container: {
+const styles$n = StyleSheet.create({
+  definingContainer: {
     marginTop: spacing.xSmall_8,
     marginBottom: 0,
     marginLeft: -spacing.xxxSmall_4,
     marginRight: -spacing.xxxSmall_4,
     backgroundColor: color.white
   },
-  accordionPanel: {
+  definingPanel: {
     // Need more space since we don't have the actions' margins.
-    paddingBottom: spacing.medium_16
+    paddingBottom: spacing.xxSmall_6
+  },
+  // A regular point (NOT a defining point) has label
+  // accordions with white backgrounds.
+  lockedPointLabelContainer: {
+    backgroundColor: color.white
   },
   row: {
     flexDirection: "row",
@@ -31386,18 +31536,24 @@ const styles$o = StyleSheet.create({
   },
   spaceUnder: {
     marginBottom: spacing.xSmall_8
+  },
+  addButton: {
+    alignSelf: "start"
   }
 });
 
 const lengthZeroStr = "The line cannot have length 0.";
 const LockedLineSettings = props => {
+  var _flags$mafs;
   const {
+    flags,
     kind,
     points,
     color: lineColor,
     lineStyle = "solid",
     showPoint1,
     showPoint2,
+    labels,
     onChangeProps,
     onMove,
     onRemove
@@ -31412,26 +31568,60 @@ const LockedLineSettings = props => {
   function handleChangePoint(newPointProps, index) {
     const newPoints = [...points];
     newPoints[index] = _extends({}, points[index], newPointProps);
+
+    // Update labels to be centered between the two points,
+    // retaining existing offset.
+    const oldMidpoint = vec.midpoint(points[0].coord, points[1].coord);
+    const newMidpoint = vec.midpoint(newPoints[0].coord, newPoints[1].coord);
+    const offset = [newMidpoint[0] - oldMidpoint[0], newMidpoint[1] - oldMidpoint[1]];
+    const newLabels = labels.map((label, labelIndex) => _extends({}, label, {
+      coord: [label.coord[0] + offset[0], label.coord[1] + offset[1]]
+    }));
     onChangeProps({
-      points: newPoints
+      points: newPoints,
+      labels: newLabels
     });
   }
   function handleColorChange(newColor) {
+    const newLabels = labels.map(label => _extends({}, label, {
+      color: newColor
+    }));
     onChangeProps({
       color: newColor,
       // Keep the line's points' colors in sync with the line color.
       points: [_extends({}, point1, {
-        color: newColor
+        color: newColor,
+        labels: point1.labels.map(label => _extends({}, label, {
+          color: newColor
+        }))
       }), _extends({}, point2, {
-        color: newColor
-      })]
+        color: newColor,
+        labels: point2.labels.map(label => _extends({}, label, {
+          color: newColor
+        }))
+      })],
+      // Keep the line's labels' colors in sync with the line color.
+      labels: newLabels
+    });
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = _extends({}, labels[labelIndex], updatedLabel);
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
     });
   }
   return /*#__PURE__*/React.createElement(PerseusEditorAccordion, {
     expanded: props.expanded,
     onToggle: props.onToggle,
     header: /*#__PURE__*/React.createElement(View, {
-      style: styles$n.row
+      style: styles$m.row
     }, /*#__PURE__*/React.createElement(LabelLarge, null, lineLabel), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
     }), /*#__PURE__*/React.createElement(LineSwatch, {
@@ -31440,7 +31630,7 @@ const LockedLineSettings = props => {
     }))
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     tag: "label",
-    style: [styles$n.row, styles$n.spaceUnder]
+    style: [styles$m.row, styles$m.spaceUnder]
   }, "kind", /*#__PURE__*/React.createElement(Strut, {
     size: spacing.xxxSmall_4
   }), /*#__PURE__*/React.createElement(SingleSelect, {
@@ -31461,7 +31651,7 @@ const LockedLineSettings = props => {
     value: "segment",
     label: "segment"
   }))), /*#__PURE__*/React.createElement(View, {
-    style: styles$n.row
+    style: styles$m.row
   }, /*#__PURE__*/React.createElement(ColorSelect, {
     selectedValue: lineColor,
     onChange: handleColorChange
@@ -31473,9 +31663,11 @@ const LockedLineSettings = props => {
       lineStyle: value
     })
   })), isInvalid && /*#__PURE__*/React.createElement(LabelMedium, {
-    style: styles$n.errorText
-  }, lengthZeroStr), /*#__PURE__*/React.createElement(DefiningPointSettings, _extends({
-    label: "Point 1",
+    style: styles$m.errorText
+  }, lengthZeroStr), /*#__PURE__*/React.createElement(LockedPointSettings, _extends({
+    flags: flags,
+    headerLabel: "Point 1",
+    expanded: true,
     showPoint: showPoint1,
     error: isInvalid ? lengthZeroStr : null
   }, point1, {
@@ -31483,8 +31675,10 @@ const LockedLineSettings = props => {
       showPoint1: newValue
     }),
     onChangeProps: newProps => handleChangePoint(newProps, 0)
-  })), /*#__PURE__*/React.createElement(DefiningPointSettings, _extends({
-    label: "Point 2",
+  })), /*#__PURE__*/React.createElement(LockedPointSettings, _extends({
+    flags: flags,
+    headerLabel: "Point 2",
+    expanded: true,
     showPoint: showPoint2,
     error: isInvalid ? lengthZeroStr : null
   }, point2, {
@@ -31492,13 +31686,42 @@ const LockedLineSettings = props => {
       showPoint2: newValue
     }),
     onChangeProps: newProps => handleChangePoint(newProps, 1)
-  })), /*#__PURE__*/React.createElement(LockedFigureSettingsActions, {
+  })), (flags == null || (_flags$mafs = flags["mafs"]) == null ? void 0 : _flags$mafs["locked-line-labels"]) && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(View, {
+    style: styles$m.horizontalRule
+  }), labels.map((label, labelIndex) => /*#__PURE__*/React.createElement(LockedLabelSettings, _extends({}, label, {
+    expanded: true,
+    onChangeProps: newLabel => {
+      handleLabelChange(newLabel, labelIndex);
+    },
+    onRemove: () => {
+      handleLabelRemove(labelIndex);
+    },
+    containerStyle: styles$m.labelContainer
+  }))), /*#__PURE__*/React.createElement(Button, {
+    kind: "tertiary",
+    startIcon: plusCircle,
+    onClick: () => {
+      // Additional vertical offset for each label so
+      // they don't overlap.
+      const offsetPerLabel = [0, -1];
+      const labelLocation = vec.add(vec.scale(offsetPerLabel, labels.length), vec.midpoint(points[0].coord, points[1].coord));
+      const newLabel = _extends({}, getDefaultFigureForType("label"), {
+        coord: labelLocation,
+        // Default to the same color as the point
+        color: lineColor
+      });
+      onChangeProps({
+        labels: [...labels, newLabel]
+      });
+    },
+    style: styles$m.addButton
+  }, "Add visible label")), /*#__PURE__*/React.createElement(LockedFigureSettingsActions, {
     figureType: props.type,
     onMove: onMove,
     onRemove: onRemove
   }));
 };
-const styles$n = StyleSheet.create({
+const styles$m = StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -31509,76 +31732,18 @@ const styles$n = StyleSheet.create({
   },
   errorText: {
     color: color.red
-  }
-});
-
-/**
- * LockedPointSettings is a component that allows the user to edit the
- * settings of specifically a locked point on the graph.
- *
- * Used in the interactive graph editor's locked figures section.
- */
-const LockedPointSettings = props => {
-  const {
-    coord,
-    color: pointColor,
-    filled = true,
-    onChangeProps,
-    onMove,
-    onRemove
-  } = props;
-  function handleColorChange(newValue) {
-    onChangeProps({
-      color: newValue
-    });
-  }
-  return /*#__PURE__*/React.createElement(PerseusEditorAccordion, {
-    expanded: props.expanded,
-    onToggle: props.onToggle,
-    header:
-    /*#__PURE__*/
-    // Summary: Point, coords, color (filled/open)
-    React.createElement(View, {
-      style: styles$m.row
-    }, /*#__PURE__*/React.createElement(LabelLarge, null, `Point (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React.createElement(Strut, {
-      size: spacing.xSmall_8
-    }), /*#__PURE__*/React.createElement(ColorSwatch, {
-      color: pointColor,
-      filled: filled
-    }))
-  }, /*#__PURE__*/React.createElement(CoordinatePairInput, {
-    coord: coord,
-    style: styles$m.spaceUnder,
-    onChange: newCoord => {
-      onChangeProps({
-        coord: newCoord
-      });
-    }
-  }), /*#__PURE__*/React.createElement(ColorSelect, {
-    selectedValue: pointColor,
-    onChange: handleColorChange,
-    style: styles$m.spaceUnder
-  }), /*#__PURE__*/React.createElement(LabeledSwitch, {
-    label: "open point",
-    checked: !filled,
-    onChange: newValue => {
-      onChangeProps({
-        filled: !newValue
-      });
-    }
-  }), /*#__PURE__*/React.createElement(LockedFigureSettingsActions, {
-    figureType: props.type,
-    onMove: onMove,
-    onRemove: onRemove
-  }));
-};
-const styles$m = StyleSheet.create({
-  row: {
-    flexDirection: "row",
-    alignItems: "center"
   },
-  spaceUnder: {
-    marginBottom: spacing.xSmall_8
+  addButton: {
+    alignSelf: "start"
+  },
+  horizontalRule: {
+    marginTop: spacing.small_12,
+    marginBottom: spacing.xxxSmall_4,
+    height: 1,
+    backgroundColor: color.offBlack16
+  },
+  labelContainer: {
+    backgroundColor: color.white
   }
 });
 
@@ -31968,74 +32133,6 @@ const LockedFigureSettings = props => {
   return null;
 };
 
-const DEFAULT_COLOR = "grayH";
-function getDefaultFigureForType(type) {
-  switch (type) {
-    case "point":
-      return {
-        type: "point",
-        coord: [0, 0],
-        color: DEFAULT_COLOR,
-        filled: true
-      };
-    case "line":
-      return {
-        type: "line",
-        kind: "line",
-        points: [getDefaultFigureForType("point"), _extends({}, getDefaultFigureForType("point"), {
-          coord: [2, 2]
-        })],
-        color: DEFAULT_COLOR,
-        lineStyle: "solid",
-        showPoint1: false,
-        showPoint2: false
-      };
-    case "vector":
-      return {
-        type: "vector",
-        points: [[0, 0], [2, 2]],
-        color: DEFAULT_COLOR
-      };
-    case "ellipse":
-      return {
-        type: "ellipse",
-        center: [0, 0],
-        radius: [1, 1],
-        angle: 0,
-        color: DEFAULT_COLOR,
-        fillStyle: "none",
-        strokeStyle: "solid"
-      };
-    case "polygon":
-      return {
-        type: "polygon",
-        points: [[0, 2], [-1, 0], [1, 0]],
-        color: DEFAULT_COLOR,
-        showVertices: false,
-        fillStyle: "none",
-        strokeStyle: "solid"
-      };
-    case "function":
-      return {
-        type: "function",
-        color: DEFAULT_COLOR,
-        strokeStyle: "solid",
-        equation: "x^2",
-        directionalAxis: "x"
-      };
-    case "label":
-      return {
-        type: "label",
-        coord: [0, 0],
-        text: "",
-        color: DEFAULT_COLOR,
-        size: "medium"
-      };
-    default:
-      throw new UnreachableCaseError(type);
-  }
-}
-
 const LockedFiguresSection = props => {
   var _props$figures;
   // Keep track of all figures' accordions' expanded states for the
@@ -32137,6 +32234,7 @@ const LockedFiguresSection = props => {
   }), isExpanded && /*#__PURE__*/React.createElement(View, null, figures == null ? void 0 : figures.map((figure, index) => {
     return /*#__PURE__*/React.createElement(LockedFigureSettings, _extends({
       key: `${uniqueId}-locked-${figure}-${index}`,
+      flags: props.flags,
       showLabelsFlag: props.showLabelsFlag,
       expanded: expandedStates[index],
       onToggle: newValue => {
@@ -33130,6 +33228,7 @@ class InteractiveGraphEditor extends React.Component {
     // Only show the "Add locked figure" dropdown if the graph
     // is using Mafs.
     this.props.graph && ((_this$props$apiOption3 = this.props.apiOptions) == null || (_this$props$apiOption3 = _this$props$apiOption3.flags) == null || (_this$props$apiOption3 = _this$props$apiOption3.mafs) == null ? void 0 : _this$props$apiOption3[this.props.graph.type]) && /*#__PURE__*/React.createElement(LockedFiguresSection, {
+      flags: this.props.apiOptions.flags,
       showLabelsFlag: (_this$props$apiOption4 = this.props.apiOptions) == null || (_this$props$apiOption4 = _this$props$apiOption4.flags) == null || (_this$props$apiOption4 = _this$props$apiOption4.mafs) == null ? void 0 : _this$props$apiOption4["interactive-graph-locked-features-labels"],
       figures: this.props.lockedFigures,
       onChange: this.props.onChange
@@ -36927,14 +37026,6 @@ class TableEditor extends React.Component {
     };
   }
   render() {
-    const tableProps = _.pick(this.props, "headers", "answers", "onChange", "apiOptions");
-    _.extend(tableProps, {
-      editableHeaders: true,
-      Editor,
-      onFocus: () => {},
-      onBlur: () => {},
-      trackInteraction: () => {}
-    });
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
       className: "perseus-widget-row"
     }, /*#__PURE__*/React.createElement("label", null, "Number of columns:", " ", /*#__PURE__*/React.createElement(NumberInput, {
@@ -36959,7 +37050,17 @@ class TableEditor extends React.Component {
         }
       },
       useArrowKeys: true
-    }))), /*#__PURE__*/React.createElement("div", null, " ", "Table of answers:", " ", /*#__PURE__*/React.createElement(InfoTip$1, null, /*#__PURE__*/React.createElement("p", null, "The student has to fill out all cells in the table. For partially filled tables create a table using the template, and insert text input boxes as desired."))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, tableProps)));
+    }))), /*#__PURE__*/React.createElement("div", null, " ", "Table of answers:", " ", /*#__PURE__*/React.createElement(InfoTip$1, null, /*#__PURE__*/React.createElement("p", null, "The student has to fill out all cells in the table. For partially filled tables create a table using the template, and insert text input boxes as desired."))), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, {
+      headers: this.props.headers,
+      answers: this.props.answers,
+      onChange: this.props.onChange,
+      apiOptions: this.props.apiOptions,
+      editableHeaders: true,
+      onFocus: () => {},
+      onBlur: () => {},
+      trackInteraction: () => {},
+      Editor: Editor
+    })));
   }
 }
 TableEditor.propTypes = {