@khanacademy/perseus-editor 14.3.0 → 14.5.0

package/dist/index.js

@@ -27,6 +27,7 @@ var mathInput = require('@khanacademy/math-input');
 var kmath = require('@khanacademy/kmath');
 var wonderBlocksDropdown = require('@khanacademy/wonder-blocks-dropdown');
 var Banner = require('@khanacademy/wonder-blocks-banner');
+var plusCircle = require('@phosphor-icons/core/regular/plus-circle.svg');
 var wonderBlocksAccordion = require('@khanacademy/wonder-blocks-accordion');
 var IconButton = require('@khanacademy/wonder-blocks-icon-button');
 var caretDoubleDownIcon = require('@phosphor-icons/core/bold/caret-double-down-bold.svg');
@@ -36,7 +37,7 @@ var caretUpIcon = require('@phosphor-icons/core/bold/caret-up-bold.svg');
 var trashIcon = require('@phosphor-icons/core/bold/trash-bold.svg');
 var copyIcon = require('@phosphor-icons/core/assets/regular/copy.svg');
 var autoPasteIcon = require('@phosphor-icons/core/assets/regular/note-pencil.svg');
-var plusCircle = require('@phosphor-icons/core/regular/plus-circle.svg');
+var mafs = require('mafs');
 var arrowFatDown = require('@phosphor-icons/core/regular/arrow-fat-down.svg');
 var arrowFatLeft = require('@phosphor-icons/core/regular/arrow-fat-left.svg');
 var arrowFatRight = require('@phosphor-icons/core/regular/arrow-fat-right.svg');
@@ -77,6 +78,7 @@ var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 var KAS__namespace = /*#__PURE__*/_interopNamespace(KAS);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
 var Banner__default = /*#__PURE__*/_interopDefaultLegacy(Banner);
+var plusCircle__default = /*#__PURE__*/_interopDefaultLegacy(plusCircle);
 var IconButton__default = /*#__PURE__*/_interopDefaultLegacy(IconButton);
 var caretDoubleDownIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretDoubleDownIcon);
 var caretDoubleUpIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretDoubleUpIcon);
@@ -85,7 +87,6 @@ var caretUpIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretUpIcon);
 var trashIcon__default = /*#__PURE__*/_interopDefaultLegacy(trashIcon);
 var copyIcon__default = /*#__PURE__*/_interopDefaultLegacy(copyIcon);
 var autoPasteIcon__default = /*#__PURE__*/_interopDefaultLegacy(autoPasteIcon);
-var plusCircle__default = /*#__PURE__*/_interopDefaultLegacy(plusCircle);
 var arrowFatDown__default = /*#__PURE__*/_interopDefaultLegacy(arrowFatDown);
 var arrowFatLeft__default = /*#__PURE__*/_interopDefaultLegacy(arrowFatLeft);
 var arrowFatRight__default = /*#__PURE__*/_interopDefaultLegacy(arrowFatRight);
@@ -95,7 +96,7 @@ var arrowCounterClockwise__default = /*#__PURE__*/_interopDefaultLegacy(arrowCou
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "14.3.0";
+const libVersion = "14.5.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -290,13 +291,13 @@ class SectionControlButton extends React__namespace.Component {
       role: "button",
       hideDefaultFocusRing: true,
       "aria-label": title,
-      style: styles$U.button
+      style: styles$T.button
     }, _ref => {
       return /*#__PURE__*/React__namespace.createElement(InlineIcon$b, icon);
     });
   }
 }
-const styles$U = aphrodite.StyleSheet.create({
+const styles$T = aphrodite.StyleSheet.create({
   button: {
     backgroundColor: wonderBlocksTokens.color.gold,
     margin: 2,
@@ -20677,11 +20678,11 @@ class Spring extends React__namespace.Component {
     } = this.props;
     return React__namespace.createElement(wonderBlocksCore.View, {
       "aria-hidden": "true",
-      style: [styles$T.grow, style]
+      style: [styles$S.grow, style]
     });
   }
 }
-const styles$T = aphrodite.StyleSheet.create({
+const styles$S = aphrodite.StyleSheet.create({
   grow: {
     flexGrow: 1
   }
@@ -20749,7 +20750,7 @@ class WidgetEditor extends React__namespace.Component {
   constructor(props) {
     super(props);
     this.state = {
-      showWidget: false,
+      showWidget: props.widgetIsOpen ?? true,
       widgetInfo: _upgradeWidgetInfo(props)
     };
     this.widget = /*#__PURE__*/React__namespace.createRef();
@@ -20760,6 +20761,12 @@ class WidgetEditor extends React__namespace.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
+      });
+    }
   }
   _toggleWidget = e => {
     e.preventDefault();
@@ -20918,13 +20925,13 @@ class WidgetSelect extends React__namespace.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__namespace.createElement(wonderBlocksIcon.PhosphorIcon, {
     icon: caretRight__default["default"],
     style: iconStyle
   });
 }
-const styles$S = aphrodite.StyleSheet.create({
+const styles$R = aphrodite.StyleSheet.create({
   collapsed: {
     transition: ".15s"
   },
@@ -20954,16 +20961,16 @@ class TexErrorView extends React__namespace.Component {
       showErrors
     } = this.state;
     return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$R.errorContainer
+      style: styles$Q.errorContainer
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$R.title,
+      style: styles$Q.title,
       onClick: this.handleToggleTexErrors
     }, /*#__PURE__*/React__namespace.createElement(ToggleableCaret, {
       isExpanded: showErrors
     }), "\xA0 TeX Errors (", errorList.length, ")"), showErrors && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.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__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$R.error,
+      style: styles$Q.error,
       key: index
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       style: {
@@ -20972,7 +20979,7 @@ class TexErrorView extends React__namespace.Component {
     }, e.math), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, e.message))));
   }
 }
-const styles$R = aphrodite.StyleSheet.create({
+const styles$Q = aphrodite.StyleSheet.create({
   title: {
     backgroundColor: "#eee",
     fontSize: "1.25em",
@@ -21168,7 +21175,8 @@ class Editor extends React__namespace.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]));
   }
   _handleWidgetEditorChange = (id, newWidgetInfo, cb, silent) => {
@@ -21935,8 +21943,7 @@ class IframeContentRenderer extends React__namespace.Component {
       this._lastData = data;
 
       // We can't use JSON.stringify/parse for this because the apiOptions
-      // includes the functions GroupMetadataEditor, groupAnnotator,
-      // onFocusChange, and onInputError.
+      // includes the functions GroupMetadataEditor, groupAnnotator, and onFocusChange.
       // @ts-expect-error - TS2339 - Property 'iframeDataStore' does not exist on type 'Window & typeof globalThis'.
       window.iframeDataStore[this.iframeID] = data;
       frame.contentWindow.postMessage(this.iframeID, "*");
@@ -24049,7 +24056,7 @@ class ItemExtrasEditor extends React__namespace.Component {
   }
 }
 const ItemExtraCheckbox = props => /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-  style: [styles$Q.checkbox, props.indent ? styles$Q.indented : undefined]
+  style: [styles$P.checkbox, props.indent ? styles$P.indented : undefined]
 }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.Checkbox, {
   label: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     style: {
@@ -24059,7 +24066,7 @@ const ItemExtraCheckbox = props => /*#__PURE__*/React__namespace.createElement(w
   checked: props.checked,
   onChange: newCheckedState => props.onChange(newCheckedState)
 }));
-const styles$Q = aphrodite.StyleSheet.create({
+const styles$P = aphrodite.StyleSheet.create({
   indented: {
     marginInlineStart: wonderBlocksTokens.spacing.large_24
   }
@@ -24129,7 +24136,8 @@ class ItemEditor extends React__namespace.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__namespace.createElement("div", {
       className: "perseus-editor-right-cell"
     }, /*#__PURE__*/React__namespace.createElement("div", {
@@ -24187,7 +24195,8 @@ class EditorPage extends React__namespace.Component {
       json: ___default["default"].pick(this.props, "question", "answerArea", "hints", "itemDataVersion"),
       gradeMessage: "",
       wasAnswered: false,
-      highlightLint: true
+      highlightLint: true,
+      widgetsAreOpen: this.props.widgetsAreOpen ?? true
     };
     this._isMounted = false;
   }
@@ -24339,6 +24348,7 @@ class EditorPage extends React__namespace.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__namespace.createElement(CombinedHintsEditor, {
@@ -24722,12 +24732,12 @@ class SimpleButton extends React__namespace.Component {
       ...otherProps
     } = this.props;
     return /*#__PURE__*/React__namespace.createElement("div", _extends({
-      className: aphrodite.css(styles$P.baseButton, color === "green" && styles$P.green, color === "orange" && styles$P.orange),
+      className: aphrodite.css(styles$O.baseButton, color === "green" && styles$O.green, color === "orange" && styles$O.orange),
       onClick: onClick
     }, otherProps), children);
   }
 }
-const styles$P = aphrodite.StyleSheet.create({
+const styles$O = aphrodite.StyleSheet.create({
   baseButton: {
     top: "0",
     fontSize: "11px",
@@ -24940,23 +24950,23 @@ const LeafContainer = _ref2 => {
   } = _ref2;
   const hasPreviewHeading = shape.type === "content" || shape.type === "hint";
   const previewHeading = hasPreviewHeading && /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.containerHeader)
+    className: aphrodite.css(styles$N.containerHeader)
   }, /*#__PURE__*/React__namespace.createElement(Header, {
     depth: path.length,
-    className: aphrodite.css(styles$O.containerTitle)
+    className: aphrodite.css(styles$N.containerTitle)
   }, capitalize(name)));
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.container)
+    className: aphrodite.css(styles$N.container)
   }, /*#__PURE__*/React__namespace.createElement("span", {
-    className: aphrodite.css(styles$O.row, styles$O.rowHeading)
+    className: aphrodite.css(styles$N.row, styles$N.rowHeading)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft)
+    className: aphrodite.css(styles$N.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: "pod-title " + aphrodite.css(styles$O.containerHeader)
+    className: "pod-title " + aphrodite.css(styles$N.containerHeader)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.containerTitle)
+    className: aphrodite.css(styles$N.containerTitle)
   }, capitalize(name)), controls)), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnRight)
+    className: aphrodite.css(styles$N.columnRight)
   }, previewHeading)), children);
 };
 const ArrayContainer = props => {
@@ -24969,11 +24979,11 @@ const ArrayContainer = props => {
     actions
   } = props;
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.container)
+    className: aphrodite.css(styles$N.container)
   }, controls && /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft, styles$O.containerHeader)
+    className: aphrodite.css(styles$N.columnLeft, styles$N.containerHeader)
   }, controls), /*#__PURE__*/React__namespace.createElement("div", null, children), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft)
+    className: aphrodite.css(styles$N.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("a", {
     href: "javascript:void 0",
     onClick: () => actions.addArrayElement(path, shape.elementShape)
@@ -24987,28 +24997,28 @@ const ObjectContainer = _ref3 => {
     path
   } = _ref3;
   const headingEditor = /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.containerHeader)
+    className: aphrodite.css(styles$N.containerHeader)
   }, /*#__PURE__*/React__namespace.createElement(Header, {
     depth: path.length,
-    className: aphrodite.css(styles$O.containerTitle)
+    className: aphrodite.css(styles$N.containerTitle)
   }, capitalize(name)), controls);
   const headingPreview = (name || controls) && /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.containerHeader, styles$O.previewCollectionHeader)
+    className: aphrodite.css(styles$N.containerHeader, styles$N.previewCollectionHeader)
   }, /*#__PURE__*/React__namespace.createElement(Header, {
     depth: path.length,
-    className: aphrodite.css(styles$O.containerTitle)
+    className: aphrodite.css(styles$N.containerTitle)
   }, capitalize(name)));
   const hasBothHeadings = headingEditor && headingPreview;
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.container)
+    className: aphrodite.css(styles$N.container)
   }, hasBothHeadings && /*#__PURE__*/React__namespace.createElement("span", {
-    className: aphrodite.css(styles$O.row)
+    className: aphrodite.css(styles$N.row)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft)
+    className: aphrodite.css(styles$N.columnLeft)
   }, headingEditor), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnRight)
+    className: aphrodite.css(styles$N.columnRight)
   }, headingPreview)), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(path.length > 0 && styles$O.contentIndent)
+    className: aphrodite.css(path.length > 0 && styles$N.contentIndent)
   }, children));
 };
 
@@ -25128,11 +25138,11 @@ const ItemNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React__namespace.createElement("span", null, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.row)
+    className: aphrodite.css(styles$N.row)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft)
+    className: aphrodite.css(styles$N.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$O.sticky)
+    className: aphrodite.css(sticky && styles$N.sticky)
   },
   /*#__PURE__*/
   // @ts-expect-error - TS2769 - No overload matches this call.
@@ -25140,9 +25150,9 @@ const ItemNodeContent = withStickiness(props => {
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions
   })))), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnRight)
+    className: aphrodite.css(styles$N.columnRight)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$O.sticky)
+    className: aphrodite.css(sticky && styles$N.sticky)
   }, preview))));
 });
 const HintNodeContent = withStickiness(props => {
@@ -25158,13 +25168,13 @@ const HintNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.row)
+    className: aphrodite.css(styles$N.row)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft)
+    className: aphrodite.css(styles$N.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$O.sticky)
+    className: aphrodite.css(sticky && styles$N.sticky)
   }, /*#__PURE__*/React__namespace.createElement(HintEditor, _extends({}, data, {
-    className: aphrodite.css(styles$O.hintEditor),
+    className: aphrodite.css(styles$N.hintEditor),
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions,
     showTitle: false,
@@ -25179,9 +25189,9 @@ const HintNodeContent = withStickiness(props => {
     isFirst: true,
     isLast: true
   })))), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnRight)
+    className: aphrodite.css(styles$N.columnRight)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$O.sticky)
+    className: aphrodite.css(sticky && styles$N.sticky)
   }, preview)));
 });
 const TagsNodeContent = props => {
@@ -25198,9 +25208,9 @@ const TagsNodeContent = props => {
     return null;
   }
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.columnLeft)
+    className: aphrodite.css(styles$N.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$O.tagsEditor)
+    className: aphrodite.css(styles$N.tagsEditor)
   }, /*#__PURE__*/React__namespace.createElement(GroupMetadataEditor, {
     value: data,
     onChange: newVal => actions.setValueAtPath(path, newVal),
@@ -25231,23 +25241,23 @@ const ArrayNodeContent = props => {
     const subpath = path.concat(i);
     const controls = [i > 0 && /*#__PURE__*/React__namespace.createElement("div", {
       key: "moveArrayElementUp",
-      className: aphrodite.css(styles$O.control)
+      className: aphrodite.css(styles$N.control)
     }, /*#__PURE__*/React__namespace.createElement(SimpleButton, {
       color: "orange",
       title: "Move up",
       onClick: () => actions.moveArrayElementUp(subpath)
     }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$O.verticalFlip)
+      className: aphrodite.css(styles$N.verticalFlip)
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$6, iconChevronDown)))), i < data.length - 1 && /*#__PURE__*/React__namespace.createElement("div", {
       key: "moveArrayElementDown",
-      className: aphrodite.css(styles$O.control)
+      className: aphrodite.css(styles$N.control)
     }, /*#__PURE__*/React__namespace.createElement(SimpleButton, {
       color: "orange",
       title: "Move down",
       onClick: () => actions.moveArrayElementDown(subpath)
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$6, iconChevronDown))), /*#__PURE__*/React__namespace.createElement("div", {
       key: "removeArrayElement",
-      className: aphrodite.css(styles$O.control)
+      className: aphrodite.css(styles$N.control)
     }, /*#__PURE__*/React__namespace.createElement(SimpleButton, {
       color: "orange",
       title: "Delete",
@@ -25255,7 +25265,7 @@ const ArrayNodeContent = props => {
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$6, iconTrash$4)))];
     return /*#__PURE__*/React__namespace.createElement("div", {
       key: i,
-      className: aphrodite.css(styles$O.arrayElement, !elementIsLeaf && styles$O.arrayElementAndNotLeaf)
+      className: aphrodite.css(styles$N.arrayElement, !elementIsLeaf && styles$N.arrayElementAndNotLeaf)
     }, /*#__PURE__*/React__namespace.createElement(NodeContainer, _extends({}, otherProps, {
       key: i,
       shape: shape.elementShape,
@@ -25281,7 +25291,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__namespace.createElement("div", {
     key: subkey,
-    className: aphrodite.css(styles$O.objectElement)
+    className: aphrodite.css(styles$N.objectElement)
   }, /*#__PURE__*/React__namespace.createElement(NodeContainer, _extends({}, otherProps, {
     shape: shape.shape[subkey],
     data: data[subkey],
@@ -25451,7 +25461,7 @@ class MultiRendererEditor extends React__namespace.Component {
     }, this._renderContent());
   }
 }
-const styles$O = aphrodite.StyleSheet.create({
+const styles$N = aphrodite.StyleSheet.create({
   // This is used in a number of places throughout this file.
   container: {},
   // eslint-disable-next-line react-native/no-unused-styles
@@ -26421,7 +26431,7 @@ const SortableItem = createReactClass__default["default"]({
     }
     return /*#__PURE__*/React__namespace.createElement("li", {
       draggable: this.props.draggable,
-      className: [dragState, aphrodite.css(styles$N.sortableListItem)].join(" "),
+      className: [dragState, aphrodite.css(styles$M.sortableListItem)].join(" "),
       onDragStart: this.handleDragStart,
       onDrop: this.handleDrop,
       onDragEnter: this.handleDragEnter,
@@ -26429,7 +26439,7 @@ const SortableItem = createReactClass__default["default"]({
     }, this.props.component);
   }
 });
-const styles$N = aphrodite.StyleSheet.create({
+const styles$M = aphrodite.StyleSheet.create({
   sortableListItem: {
     margin: "5px 0"
   }
@@ -26689,13 +26699,13 @@ class ExpressionEditor extends React__namespace.Component {
       onChange: this.handleToggleDiv
     }));
     return /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.HeadingSmall, null, "Global Options"), /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY)
+      className: aphrodite.css(styles$L.paddedY)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.LabeledTextField, {
       label: "Visible label",
       value: this.props.visibleLabel || "",
       onChange: this.change("visibleLabel")
     }), /*#__PURE__*/React__namespace.createElement(InfoTip$i, null, /*#__PURE__*/React__namespace.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__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY)
+      className: aphrodite.css(styles$L.paddedY)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.LabeledTextField, {
       label: "Aria label",
       value: this.props.ariaLabel || "",
@@ -26704,13 +26714,13 @@ class ExpressionEditor extends React__namespace.Component {
       href: "https://www.w3.org/WAI/tips/designing/#ensure-that-form-elements-include-clearly-associated-labels",
       target: "_blank"
     }, "this article.")))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY)
+      className: aphrodite.css(styles$L.paddedY)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.LabeledTextField, {
       label: "Function variables",
       value: this.state.functionsInternal,
       onChange: this.handleFunctions
     }), /*#__PURE__*/React__namespace.createElement(InfoTip$i, null, /*#__PURE__*/React__namespace.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__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY)
+      className: aphrodite.css(styles$L.paddedY)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.Checkbox, {
       label: "Use \xD7 instead of \u22C5 for multiplication",
       checked: this.props.times,
@@ -26720,7 +26730,7 @@ class ExpressionEditor extends React__namespace.Component {
         });
       }
     }), /*#__PURE__*/React__namespace.createElement(InfoTip$i, null, /*#__PURE__*/React__namespace.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__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY)
+      className: aphrodite.css(styles$L.paddedY)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.HeadingXSmall, null, "Button Sets"), buttonSetChoices), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.HeadingSmall, null, "Answers"), /*#__PURE__*/React__namespace.createElement("p", {
       style: {
         margin: "4px 0"
@@ -26787,18 +26797,18 @@ class AnswerOption extends React__namespace.Component {
       color: "destructive",
       light: true
     }, "Delete");
-    const answerStatusCss = aphrodite.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 = aphrodite.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__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.answerOption)
+      className: aphrodite.css(styles$L.answerOption)
     }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.answerHandle)
+      className: aphrodite.css(styles$L.answerHandle)
     }), /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.answerBody)
+      className: aphrodite.css(styles$L.answerBody)
     }, /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("button", {
       onClick: this.toggleConsidered,
       className: answerStatusCss
     }, this.props.considered), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement(perseus.Expression, this.props.expressionProps))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY, styles$M.paddedX)
+      className: aphrodite.css(styles$L.paddedY, styles$L.paddedX)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.Checkbox, {
       label: "Answer expression must have the same form.",
       checked: this.props.form,
@@ -26808,7 +26818,7 @@ class AnswerOption extends React__namespace.Component {
         });
       }
     }), /*#__PURE__*/React__namespace.createElement(InfoTip$i, null, /*#__PURE__*/React__namespace.createElement("p", null, "The student's answer must be in the same form. Commutativity and excess negative signs are ignored."))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.paddedY, styles$M.paddedX)
+      className: aphrodite.css(styles$L.paddedY, styles$L.paddedX)
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.Checkbox, {
       label: "Answer expression must be fully expanded and simplified.",
       checked: this.props.simplify,
@@ -26818,11 +26828,11 @@ class AnswerOption extends React__namespace.Component {
         });
       }
     }), /*#__PURE__*/React__namespace.createElement(InfoTip$i, null, /*#__PURE__*/React__namespace.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__namespace.createElement("div", {
-      className: aphrodite.css(styles$M.buttonRow, styles$M.paddedY)
+      className: aphrodite.css(styles$L.buttonRow, styles$L.paddedY)
     }, removeButton)));
   }
 }
-const styles$M = aphrodite.StyleSheet.create({
+const styles$L = aphrodite.StyleSheet.create({
   paddedX: {
     paddingLeft: wonderBlocksTokens.spacing.xSmall_8,
     paddingRight: wonderBlocksTokens.spacing.xSmall_8
@@ -26934,10 +26944,10 @@ class GradedGroupEditor extends React__namespace.Component {
     }, /*#__PURE__*/React__namespace.createElement("div", {
       className: "perseus-widget-row"
     }, /*#__PURE__*/React__namespace.createElement("label", {
-      className: aphrodite.css(styles$L.title)
+      className: aphrodite.css(styles$K.title)
     }, "Title:", " ", /*#__PURE__*/React__namespace.createElement(TextInput$5, {
       value: this.props.title,
-      className: aphrodite.css(styles$L.input)
+      className: aphrodite.css(styles$K.input)
       // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       ,
       onChange: this.change("title")
@@ -26962,7 +26972,7 @@ class GradedGroupEditor extends React__namespace.Component {
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$4, iconPlus$1), " Add a hint"), this.props.hint && /*#__PURE__*/React__namespace.createElement("div", {
       className: "perseus-hint-editor"
     }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$L.hintsTitle)
+      className: aphrodite.css(styles$K.hintsTitle)
     }, "Hint"), /*#__PURE__*/React__namespace.createElement(Editor, {
       ref: this.hintEditor,
       content: this.props.hint ? this.props.hint.content : "",
@@ -26984,7 +26994,7 @@ class GradedGroupEditor extends React__namespace.Component {
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$4, iconTrash$2), " Remove this hint")));
   }
 }
-const styles$L = aphrodite.StyleSheet.create({
+const styles$K = aphrodite.StyleSheet.create({
   title: {
     fontSize: 18,
     fontWeight: "bold"
@@ -28475,13 +28485,13 @@ function MathquillInput(props) {
     }
   });
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$K.outerWrapper
+    style: styles$J.outerWrapper
   }, /*#__PURE__*/React__namespace.createElement("span", {
     ref: mathFieldWrapperRef,
     className: "perseus-math-input mq-editable-field mq-math-mode"
   }));
 }
-const styles$K = aphrodite.StyleSheet.create({
+const styles$J = aphrodite.StyleSheet.create({
   outerWrapper: {
     display: "inline-block",
     borderStyle: "solid",
@@ -29610,7 +29620,7 @@ const GraphPointsCountSelector = _ref => {
     // Never uses placeholder, always has value
     ,
     placeholder: "",
-    style: styles$J.singleSelectShort
+    style: styles$I.singleSelectShort
   }, [...[...Array(7).keys()].map(n => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     key: n,
     value: `${n}`,
@@ -29621,7 +29631,7 @@ const GraphPointsCountSelector = _ref => {
     label: "unlimited"
   })]);
 };
-const styles$J = aphrodite.StyleSheet.create({
+const styles$I = aphrodite.StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29634,7 +29644,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__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     value: "none",
     label: "None"
@@ -29670,7 +29680,7 @@ const GraphTypeSelector = props => {
     label: "Angle"
   }));
 };
-const styles$I = aphrodite.StyleSheet.create({
+const styles$H = aphrodite.StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29686,11 +29696,11 @@ function Heading(_ref) {
     onToggle
   } = _ref;
   return /*#__PURE__*/React__namespace.createElement(Clickable__default["default"], {
-    style: [styles$H.container, !isCollapsible && styles$H.notClickable],
+    style: [styles$G.container, !isCollapsible && styles$G.notClickable],
     disabled: !isCollapsible,
     onClick: () => isCollapsible && onToggle?.(!isOpen)
   }, () => /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$H.heading
+    style: styles$G.heading
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, {
     style: {
       fontSize: 14,
@@ -29700,7 +29710,7 @@ function Heading(_ref) {
     isExpanded: isOpen
   })));
 }
-const styles$H = aphrodite.StyleSheet.create({
+const styles$G = aphrodite.StyleSheet.create({
   container: {
     marginTop: wonderBlocksTokens.spacing.small_12,
     // NOTE(jeremy): This is the inverse of the @editorPadding CSS
@@ -29760,15 +29770,18 @@ function InteractiveGraphDescription(props) {
     isOpen: isOpen,
     onToggle: setIsOpen
   }), isOpen && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.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__namespace.createElement(wonderBlocksTypography.LabelLarge, {
     tag: "label"
   }, "Title", /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
     value: ariaLabelValue,
     onChange: newValue => onChange({
-      fullGraphAriaLabel: newValue
+      fullGraphAriaLabel:
+      // Save as undefined if the new value
+      // is an empty string.
+      newValue || undefined
     }),
-    style: styles$G.spaceAbove
+    style: styles$F.spaceAbove
   })), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.small_12
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, {
@@ -29778,12 +29791,15 @@ function InteractiveGraphDescription(props) {
     resizeType: "vertical",
     value: ariaDescriptionValue,
     onChange: newValue => onChange({
-      fullGraphAriaDescription: newValue
+      fullGraphAriaDescription:
+      // Save as undefined if the new value
+      // is an empty string.
+      newValue || undefined
     }),
-    style: styles$G.spaceAbove
+    style: styles$F.spaceAbove
   }))));
 }
-const styles$G = aphrodite.StyleSheet.create({
+const styles$F = aphrodite.StyleSheet.create({
   caption: {
     color: wonderBlocksTokens.color.offBlack64,
     paddingTop: wonderBlocksTokens.spacing.xxSmall_6,
@@ -29803,16 +29819,16 @@ const LabeledRow = props => {
     style
   } = props;
   return /*#__PURE__*/React__namespace.createElement("label", {
-    className: aphrodite.css(styles$F.label)
+    className: aphrodite.css(styles$E.label)
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$F.row, style]
+    style: [styles$E.row, style]
   }, labelSide === "start" || /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, {
-    style: styles$F.spaceEnd
+    style: styles$E.spaceEnd
   }, label), children, labelSide === "end" && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, {
-    style: styles$F.spaceStart
+    style: styles$E.spaceStart
   }, label)));
 };
-const styles$F = aphrodite.StyleSheet.create({
+const styles$E = aphrodite.StyleSheet.create({
   label: {
     width: "fit-content"
   },
@@ -30231,10 +30247,10 @@ class InteractiveGraphSettings extends React__namespace.Component {
       }
     }))), /*#__PURE__*/React__namespace.createElement(LabeledRow, {
       label: "Background image URL:",
-      style: styles$E.resetSpaceTop
+      style: styles$D.resetSpaceTop
     }, /*#__PURE__*/React__namespace.createElement("input", {
       type: "text",
-      className: aphrodite.css(styles$E.backgroundUrlInput),
+      className: aphrodite.css(styles$D.backgroundUrlInput),
       ref: this.bgUrlRef,
       value: this.state.backgroundImage.url || "",
       onChange: e => {
@@ -30250,9 +30266,9 @@ class InteractiveGraphSettings extends React__namespace.Component {
       onKeyPress: this.changeBackgroundUrl,
       onBlur: this.changeBackgroundUrl
     }), /*#__PURE__*/React__namespace.createElement(InfoTip$d, null, /*#__PURE__*/React__namespace.createElement("p", null, "Create an image in graphie, or use the \"Add image\" function to create a background."))), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$E.protractorSection
+      style: styles$D.protractorSection
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$E.checkboxRow
+      style: styles$D.checkboxRow
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.Checkbox, {
       label: "Show protractor",
       checked: this.props.showProtractor,
@@ -30261,7 +30277,7 @@ class InteractiveGraphSettings extends React__namespace.Component {
           showProtractor: value
         });
       },
-      style: styles$E.resetSpaceTop
+      style: styles$D.resetSpaceTop
     })), this.props.showProtractor && /*#__PURE__*/React__namespace.createElement(Banner__default["default"], {
       layout: "floating",
       text: "The protractor is not accessible. Please consider an alternate approach.",
@@ -30269,7 +30285,7 @@ class InteractiveGraphSettings extends React__namespace.Component {
     }))));
   }
 }
-const styles$E = aphrodite.StyleSheet.create({
+const styles$D = aphrodite.StyleSheet.create({
   resetSpaceTop: {
     marginTop: 0
   },
@@ -30308,14 +30324,14 @@ const SegmentCountSelector = _ref => {
       const num = +newValue;
       onChange(num);
     },
-    style: styles$D.singleSelectShort
+    style: styles$C.singleSelectShort
   }, ___default["default"].range(1, 7).map(n => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     key: n,
     value: `${n}`,
     label: `${n} segment${n > 1 ? "s" : ""}`
   })));
 };
-const styles$D = aphrodite.StyleSheet.create({
+const styles$C = aphrodite.StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -30340,17 +30356,17 @@ const LockedFigureSelect = props => {
     figureTypes.push("label");
   }
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$C.container
+    style: styles$B.container
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.ActionMenu, {
     menuText: "Add locked figure",
-    style: styles$C.addElementSelect
+    style: styles$B.addElementSelect
   }, figureTypes.map(figureType => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.ActionItem, {
     key: `${id}-${figureType}`,
     label: figureType,
     onClick: () => onChange(figureType)
   }))));
 };
-const styles$C = aphrodite.StyleSheet.create({
+const styles$B = aphrodite.StyleSheet.create({
   container: {
     marginTop: wonderBlocksTokens.spacing.xSmall_8
   },
@@ -30467,18 +30483,18 @@ const AngleInput = props => {
   }
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$B.row
+    style: styles$A.row
   }, "angle (degrees)", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(ScrolllessNumberTextField, {
     value: angleInput,
     onChange: handleAngleChange,
-    style: styles$B.textField
+    style: styles$A.textField
   }), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }));
 };
-const styles$B = aphrodite.StyleSheet.create({
+const styles$A = aphrodite.StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30527,30 +30543,30 @@ const CoordinatePairInput = props => {
     onChange(newCoords);
   }
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$A.row, style]
+    style: [styles$z.row, style]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$A.row
+    style: styles$z.row
   }, labels ? labels[0] : "x coord", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.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__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.medium_16
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$A.row
+    style: styles$z.row
   }, labels ? labels[1] : "y coord", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.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 = aphrodite.StyleSheet.create({
+const styles$z = aphrodite.StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30583,14 +30599,14 @@ const PerseusEditorAccordion = props => {
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksAccordion.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__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$z.accordionPanel, panelStyle]
+    style: [styles$y.accordionPanel, panelStyle]
   }, children)));
 };
-const styles$z = aphrodite.StyleSheet.create({
+const styles$y = aphrodite.StyleSheet.create({
   container: {
     backgroundColor: wonderBlocksTokens.color.fadedBlue8,
     marginTop: wonderBlocksTokens.spacing.xSmall_8
@@ -30621,13 +30637,13 @@ const ColorSwatch = props => {
     "aria-label":
     // Don't include an aria label for decorative circles.
     !decorative ? `${color}, ${filled ? "filled" : "open"}` : undefined,
-    style: [styles$y.colorSwatch, {
+    style: [styles$x.colorSwatch, {
       border: `4px solid ${perseus.lockedFigureColors[color]}`,
       backgroundColor: filled ? perseus.lockedFigureColors[color] : wonderBlocksTokens.color.white
     }]
   });
 };
-const styles$y = aphrodite.StyleSheet.create({
+const styles$x = aphrodite.StyleSheet.create({
   colorSwatch: {
     // Add a white outline so that the color swatch is visible when
     // the dropdown option is highlighted with its blue background.
@@ -30646,10 +30662,10 @@ const ColorSelect = props => {
     onChange
   } = props;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$x.row, style]
+    style: [styles$w.row, style]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$x.row
+    style: styles$w.row
   }, "color", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
@@ -30668,7 +30684,7 @@ const ColorSelect = props => {
     })
   })))));
 };
-const styles$x = aphrodite.StyleSheet.create({
+const styles$w = aphrodite.StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
@@ -30687,17 +30703,17 @@ const EllipseSwatch = props => {
   } = props;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     "aria-label": `${color}, stroke ${strokeStyle}, fill ${fillStyle}`,
-    style: [styles$w.container, {
+    style: [styles$v.container, {
       border: `4px ${strokeStyle} ${perseus.lockedFigureColors[color]}`
     }]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$w.innerCircle, {
+    style: [styles$v.innerCircle, {
       backgroundColor: perseus.lockedFigureColors[color],
       opacity: fillStyle === "white" ? 0 : perseus.lockedFigureFillStyles[fillStyle]
     }]
   }));
 };
-const styles$w = aphrodite.StyleSheet.create({
+const styles$v = aphrodite.StyleSheet.create({
   container: {
     // Add a white outline so that the color swatch is visible when
     // the dropdown option is highlighted with its blue background.
@@ -30723,7 +30739,7 @@ const LineStrokeSelect = props => {
   } = props;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$v.lineStrokeSelect
+    style: styles$u.lineStrokeSelect
   }, "stroke", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxxSmall_4
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
@@ -30740,7 +30756,7 @@ const LineStrokeSelect = props => {
     label: "dashed"
   })));
 };
-const styles$v = aphrodite.StyleSheet.create({
+const styles$u = aphrodite.StyleSheet.create({
   lineStrokeSelect: {
     display: "flex",
     flexDirection: "row",
@@ -30762,40 +30778,40 @@ const LockedFigureSettingsActions = props => {
     onRemove
   } = props;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$u.container
+    style: styles$t.container
   }, /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
     startIcon: trashIcon__default["default"],
     "aria-label": `Delete locked ${figureType}`,
     onClick: onRemove,
     kind: "tertiary",
-    style: styles$u.deleteButton
+    style: styles$t.deleteButton
   }, "Delete"), onMove && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(Spring, null), /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
     icon: caretDoubleUpIcon__default["default"],
     size: "small",
     "aria-label": `Move locked ${figureType} to the back`,
     onClick: () => onMove("back"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   }), /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
     icon: caretUpIcon__default["default"],
     size: "small",
     "aria-label": `Move locked ${figureType} backward`,
     onClick: () => onMove("backward"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   }), /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
     icon: caretDownIcon__default["default"],
     size: "small",
     "aria-label": `Move locked ${figureType} forward`,
     onClick: () => onMove("forward"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   }), /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
     icon: caretDoubleDownIcon__default["default"],
     size: "small",
     "aria-label": `Move locked ${figureType} to the front`,
     onClick: () => onMove("front"),
-    style: styles$u.iconButton
+    style: styles$t.iconButton
   })));
 };
-const styles$u = aphrodite.StyleSheet.create({
+const styles$t = aphrodite.StyleSheet.create({
   container: {
     width: "100%",
     flexDirection: "row",
@@ -30813,162 +30829,422 @@ const styles$u = aphrodite.StyleSheet.create({
   }
 });
 
-const {
-  InfoTip: InfoTip$c
-} = perseus.components;
-const LockedEllipseSettings = props => {
+/**
+ * LockedLabelSettings is a component that allows the user to edit the
+ * settings of specifically a locked label on the graph within the
+ * Interactive Graph widget.
+ *
+ * Used in the interactive graph editor's locked figures section.
+ */
+function LockedLabelSettings(props) {
   const {
-    center,
-    radius,
-    angle,
+    type,
+    coord,
     color,
-    fillStyle,
-    strokeStyle,
+    size,
+    text,
     expanded,
-    onToggle,
     onChangeProps,
     onMove,
-    onRemove
+    onRemove,
+    onToggle,
+    containerStyle
   } = props;
-  function handleColorChange(newValue) {
-    onChangeProps({
-      color: newValue
-    });
-  }
   return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
     expanded: expanded,
     onToggle: onToggle,
-    header:
-    /*#__PURE__*/
-    // Summary: Ellipse, center, radius, color (opacity, dashed)
-    React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$t.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Ellipse (${center[0]}, ${center[1]}), radius ${radius[0]}, ${radius[1]}`), /*#__PURE__*/React__namespace.createElement(Strut, {
+    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      style: [styles$s.row, styles$s.accordionHeaderContainer]
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, "Label (", coord[0], ", ", coord[1], ")"), /*#__PURE__*/React__namespace.createElement(Strut, {
       size: wonderBlocksTokens.spacing.xSmall_8
-    }), /*#__PURE__*/React__namespace.createElement(EllipseSwatch, {
-      color: props.color,
-      fillStyle: fillStyle,
-      strokeStyle: strokeStyle
-    }))
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$t.row
+    }), text !== "" && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, {
+      style: [{
+        backgroundColor: wonderBlocksTokens.color.white,
+        color: perseus.lockedFigureColors[color]
+      }, styles$s.accordionHeader]
+    }, text)),
+    containerStyle: containerStyle
   }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: center,
-    style: styles$t.spaceUnder,
-    onChange: newCoords => onChangeProps({
-      center: newCoords
-    })
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$t.spaceUnder
-  }, /*#__PURE__*/React__namespace.createElement(InfoTip$c, null, "The coordinates for the center of the ellipse."))), /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: radius,
-    labels: ["x radius", "y radius"],
-    style: styles$t.spaceUnder,
-    onChange: newCoords => onChangeProps({
-      radius: newCoords
-    })
-  }), /*#__PURE__*/React__namespace.createElement(AngleInput, {
-    angle: angle,
-    onChange: newAngle => onChangeProps({
-      angle: newAngle
-    })
-  }), /*#__PURE__*/React__namespace.createElement(Strut, {
+    coord: coord,
+    onChange: newCoords => {
+      onChangeProps({
+        coord: newCoords
+      });
+    },
+    style: styles$s.spaceUnder
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: [styles$s.row, styles$s.spaceUnder]
+  }, "TeX", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xSmall_8
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$t.row, styles$t.spaceUnder]
-  }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
+    value: text,
+    placeholder: "ex. x^2 or \\frac{1}{2}",
+    onChange: newValue => onChangeProps({
+      text: newValue
+    })
+  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$s.row
+  }, onMove && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
     selectedValue: color,
-    onChange: handleColorChange
+    onChange: newColor => {
+      onChangeProps({
+        color: newColor
+      });
+    },
+    style: styles$s.spaceUnder
   }), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.medium_16
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: [styles$t.row, styles$t.truncatedWidth]
-  }, "fill", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxSmall_6
+    style: styles$s.row
+  }, "size", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xSmall_8
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: fillStyle,
-    onChange: value => onChangeProps({
-      fillStyle: value
+    selectedValue: size,
+    onChange: newValue => onChangeProps({
+      size: newValue
     })
-    // Placeholder is required, but never gets used.
+    // Placeholder is required, but never gets used since
+    // we have a label for the select.
     ,
     placeholder: ""
-  }, Object.keys(perseus.lockedFigureFillStyles).map(option => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    key: option,
-    value: option,
-    label: option
-  }))))), /*#__PURE__*/React__namespace.createElement(LineStrokeSelect, {
-    selectedValue: strokeStyle,
-    onChange: value => onChangeProps({
-      strokeStyle: value
-    })
-  }), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    figureType: props.type,
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "small",
+    label: "small"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "medium",
+    label: "medium"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "large",
+    label: "large"
+  })))), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    figureType: type,
     onMove: onMove,
     onRemove: onRemove
   }));
-};
-const styles$t = aphrodite.StyleSheet.create({
+}
+const styles$s = aphrodite.StyleSheet.create({
+  accordionHeaderContainer: {
+    // Stop the label summary from wrapping.
+    whiteSpace: "nowrap"
+  },
+  accordionHeader: {
+    padding: wonderBlocksTokens.spacing.xxxSmall_4,
+    marginInlineEnd: wonderBlocksTokens.spacing.xSmall_8,
+    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4,
+    textOverflow: "ellipsis",
+    overflow: "hidden"
+  },
   row: {
     display: "flex",
     flexDirection: "row",
-    alignItems: "center"
-  },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
-  },
-  truncatedWidth: {
+    alignItems: "center",
     // Allow truncation, stop bleeding over the edge.
     minWidth: 0
-  }
-});
-
-const LineSwatch = props => {
-  const {
-    color,
-    lineStyle
-  } = props;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$s.container
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    "aria-label": `${color}, ${lineStyle}`,
-    style: [styles$s.lineSwatch, {
-      border: `5px ${lineStyle} ${perseus.lockedFigureColors[color]}`
-    }]
-  }));
-};
-const styles$s = aphrodite.StyleSheet.create({
-  container: {
-    backgroundColor: wonderBlocksTokens.color.white,
-    justifyContent: "center",
-    padding: wonderBlocksTokens.spacing.xSmall_8,
-    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4
   },
-  lineSwatch: {
-    width: 40
+  spaceUnder: {
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
   }
 });
 
-const examples = {
-  linear: ["x + 5", "1/2x - 2"],
-  polynomial: ["1/2x^2 + 3x - 4", "(1/3)x^3 - 2x^2 + 3x - 4"],
-  trigonometric: ["sin(x) * 3", "arctan(2x) + 4"]
-};
-
-/**
- * LockedFunctionSettings is a component that allows the user to edit the
- * settings of specifically a locked function on the graph.
- *
- * Used in the interactive graph editor's locked figures section.
- */
-const LockedFunctionSettings = props => {
-  const {
-    color: lineColor,
-    strokeStyle,
-    equation,
-    directionalAxis,
+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"), {
+          ...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 wonderStuffCore.UnreachableCaseError(type);
+  }
+}
+
+const {
+  InfoTip: InfoTip$c
+} = perseus.components;
+const LockedEllipseSettings = props => {
+  const {
+    flags,
+    center,
+    radius,
+    angle,
+    color,
+    labels,
+    fillStyle,
+    strokeStyle,
+    expanded,
+    onToggle,
+    onChangeProps,
+    onMove,
+    onRemove
+  } = props;
+  function handleCenterChange(newCoord) {
+    const xOffset = newCoord[0] - center[0];
+    const yOffset = newCoord[1] - center[1];
+    const newProps = {
+      center: newCoord
+    };
+
+    // Update the coord by the same amount as the point for all labels
+    newProps.labels = labels?.map(label => ({
+      ...label,
+      coord: [label.coord[0] + xOffset, label.coord[1] + yOffset]
+    }));
+    onChangeProps(newProps);
+  }
+  function handleColorChange(newValue) {
+    const newProps = {
+      color: newValue
+    };
+
+    // Update the color of the all labels to match the point
+    newProps.labels = labels?.map(label => ({
+      ...label,
+      color: newValue
+    }));
+    onChangeProps(newProps);
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = {
+      ...labels[labelIndex],
+      ...updatedLabel
+    };
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
+    expanded: expanded,
+    onToggle: onToggle,
+    header:
+    /*#__PURE__*/
+    // Summary: Ellipse, center, radius, color (opacity, dashed)
+    React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$r.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Ellipse (${center[0]}, ${center[1]}), radius ${radius[0]}, ${radius[1]}`), /*#__PURE__*/React__namespace.createElement(Strut, {
+      size: wonderBlocksTokens.spacing.xSmall_8
+    }), /*#__PURE__*/React__namespace.createElement(EllipseSwatch, {
+      color: props.color,
+      fillStyle: fillStyle,
+      strokeStyle: strokeStyle
+    }))
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$r.row
+  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: center,
+    style: styles$r.spaceUnder,
+    onChange: handleCenterChange
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$r.spaceUnder
+  }, /*#__PURE__*/React__namespace.createElement(InfoTip$c, null, "The coordinates for the center of the ellipse."))), /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: radius,
+    labels: ["x radius", "y radius"],
+    style: styles$r.spaceUnder,
+    onChange: newCoords => onChangeProps({
+      radius: newCoords
+    })
+  }), /*#__PURE__*/React__namespace.createElement(AngleInput, {
+    angle: angle,
+    onChange: newAngle => onChangeProps({
+      angle: newAngle
+    })
+  }), /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xSmall_8
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$r.row, styles$r.spaceUnder]
+  }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
+    selectedValue: color,
+    onChange: handleColorChange
+  }), /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.medium_16
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: [styles$r.row, styles$r.truncatedWidth]
+  }, "fill", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+    selectedValue: fillStyle,
+    onChange: value => onChangeProps({
+      fillStyle: value
+    })
+    // Placeholder is required, but never gets used.
+    ,
+    placeholder: ""
+  }, Object.keys(perseus.lockedFigureFillStyles).map(option => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    key: option,
+    value: option,
+    label: option
+  }))))), /*#__PURE__*/React__namespace.createElement(LineStrokeSelect, {
+    selectedValue: strokeStyle,
+    onChange: value => onChangeProps({
+      strokeStyle: value
+    })
+  }), flags?.["mafs"]?.["locked-ellipse-labels"] && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, labels?.map((label, labelIndex) => /*#__PURE__*/React__namespace.createElement(LockedLabelSettings, _extends({}, label, {
+    expanded: true,
+    onChangeProps: newLabel => {
+      handleLabelChange(newLabel, labelIndex);
+    },
+    onRemove: () => {
+      handleLabelRemove(labelIndex);
+    },
+    containerStyle: styles$r.labelContainer
+  }))), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "tertiary",
+    startIcon: plusCircle__default["default"],
+    onClick: () => {
+      const newLabel = {
+        ...getDefaultFigureForType("label"),
+        coord: [center[0],
+        // Additional vertical offset for each
+        // label so they don't overlap.
+        center[1] - (labels?.length ?? 0)],
+        // Default to the same color as the ellipse
+        color: color
+      };
+      onChangeProps({
+        labels: [...(labels ?? []), newLabel]
+      });
+    },
+    style: styles$r.addButton
+  }, "Add visible label")), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
+};
+const styles$r = aphrodite.StyleSheet.create({
+  row: {
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center"
+  },
+  spaceUnder: {
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
+  },
+  truncatedWidth: {
+    // Allow truncation, stop bleeding over the edge.
+    minWidth: 0
+  },
+  addButton: {
+    alignSelf: "start"
+  },
+  labelContainer: {
+    backgroundColor: wonderBlocksTokens.color.white
+  }
+});
+
+const LineSwatch = props => {
+  const {
+    color,
+    lineStyle
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$q.container
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    "aria-label": `${color}, ${lineStyle}`,
+    style: [styles$q.lineSwatch, {
+      border: `5px ${lineStyle} ${perseus.lockedFigureColors[color]}`
+    }]
+  }));
+};
+const styles$q = aphrodite.StyleSheet.create({
+  container: {
+    backgroundColor: wonderBlocksTokens.color.white,
+    justifyContent: "center",
+    padding: wonderBlocksTokens.spacing.xSmall_8,
+    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4
+  },
+  lineSwatch: {
+    width: 40
+  }
+});
+
+const examples = {
+  linear: ["x + 5", "1/2x - 2"],
+  polynomial: ["1/2x^2 + 3x - 4", "(1/3)x^3 - 2x^2 + 3x - 4"],
+  trigonometric: ["sin(x) * 3", "arctan(2x) + 4"]
+};
+
+const LockedFunctionSettings = props => {
+  const {
+    flags,
+    color: lineColor,
+    strokeStyle,
+    equation,
+    directionalAxis,
     domain,
+    labels,
     onChangeProps,
     onMove,
     onRemove
@@ -31019,13 +31295,47 @@ const LockedFunctionSettings = props => {
   const exampleCategories = Object.keys(examples);
   const exampleCategorySelected = exampleCategory !== "";
   const exampleContent = exampleCategorySelected ? examples[exampleCategory] : ["Select category to see example equations"];
+  function handleColorChange(newValue) {
+    const newProps = {
+      color: newValue
+    };
+
+    // Update the color of the all labels to match the point
+    newProps.labels = labels?.map(label => ({
+      ...label,
+      color: newValue
+    }));
+    onChangeProps(newProps);
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = {
+      ...labels[labelIndex],
+      ...updatedLabel
+    };
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
   return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
     expanded: props.expanded,
     onToggle: props.onToggle,
     header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$r.row
+      style: styles$p.row
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, {
-      style: styles$r.accordionHeader
+      style: styles$p.accordionHeader
     }, lineLabel), /*#__PURE__*/React__namespace.createElement(Strut, {
       size: wonderBlocksTokens.spacing.xSmall_8
     }), /*#__PURE__*/React__namespace.createElement(LineSwatch, {
@@ -31033,12 +31343,10 @@ const LockedFunctionSettings = props => {
       lineStyle: strokeStyle
     }))
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$r.row, styles$r.spaceUnder]
+    style: [styles$p.row, styles$p.spaceUnder]
   }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
     selectedValue: lineColor,
-    onChange: newValue => {
-      handlePropChange("color", newValue);
-    }
+    onChange: handleColorChange
   }), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.small_12
   }), /*#__PURE__*/React__namespace.createElement(LineStrokeSelect, {
@@ -31047,14 +31355,14 @@ const LockedFunctionSettings = props => {
       handlePropChange("strokeStyle", newValue);
     }
   })), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$r.row, styles$r.rowSpace]
+    style: [styles$p.row, styles$p.rowSpace]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
     selectedValue: directionalAxis,
     onChange: newValue => {
       handlePropChange("directionalAxis", newValue);
     },
     "aria-label": "equation prefix",
-    style: [styles$r.dropdownLabel, styles$r.axisMenu]
+    style: [styles$p.dropdownLabel, styles$p.axisMenu]
     // Placeholder is required, but never gets used.
     ,
     placeholder: ""
@@ -31073,17 +31381,17 @@ const LockedFunctionSettings = props => {
     onChange: newValue => {
       handlePropChange("equation", newValue);
     },
-    style: [styles$r.textField]
+    style: [styles$p.textField]
   })), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$r.row, styles$r.rowSpace]
+    style: [styles$p.row, styles$p.rowSpace]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: [styles$r.dropdownLabel, styles$r.domainMin]
+    style: [styles$p.dropdownLabel, styles$p.domainMin]
   }, `${domainRangeText} min`, /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
     type: "number",
-    style: styles$r.domainMinField,
+    style: styles$p.domainMinField,
     value: domainEntries[0],
     onChange: newValue => {
       handleDomainChange(0, newValue);
@@ -31093,12 +31401,12 @@ const LockedFunctionSettings = props => {
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
     "aria-label": `${domainRangeText} max`,
-    style: [styles$r.dropdownLabel, styles$r.domainMax]
+    style: [styles$p.dropdownLabel, styles$p.domainMax]
   }, "max", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
     type: "number",
-    style: styles$r.domainMaxField,
+    style: styles$p.domainMaxField,
     value: domainEntries[1],
     onChange: newValue => {
       handleDomainChange(1, newValue);
@@ -31106,11 +31414,11 @@ const LockedFunctionSettings = props => {
   }))), /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
     header: /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, "Example Functions"),
     expanded: false,
-    containerStyle: styles$r.exampleWorkspace,
-    panelStyle: styles$r.exampleAccordionPanel
+    containerStyle: styles$p.exampleWorkspace,
+    panelStyle: styles$p.exampleAccordionPanel
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$r.dropdownLabel
+    style: styles$p.dropdownLabel
   }, "Choose a category", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
@@ -31124,13 +31432,41 @@ const LockedFunctionSettings = props => {
       label: category
     });
   }))), exampleCategorySelected && /*#__PURE__*/React__namespace.createElement("ul", {
-    className: aphrodite.css(styles$r.exampleContainer)
+    className: aphrodite.css(styles$p.exampleContainer)
   }, exampleContent.map((example, index) => /*#__PURE__*/React__namespace.createElement(ExampleItem, {
     category: exampleCategory,
     example: example,
     index: index,
     pasteEquationFn: handlePropChange
-  })))), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+  })))), flags?.["mafs"]?.["locked-function-labels"] && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$p.horizontalRule
+  }), labels?.map((label, labelIndex) => /*#__PURE__*/React__namespace.createElement(LockedLabelSettings, _extends({}, label, {
+    expanded: true,
+    onChangeProps: newLabel => {
+      handleLabelChange(newLabel, labelIndex);
+    },
+    onRemove: () => {
+      handleLabelRemove(labelIndex);
+    },
+    containerStyle: styles$p.labelContainer
+  }))), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "tertiary",
+    startIcon: plusCircle__default["default"],
+    onClick: () => {
+      const newLabel = {
+        ...getDefaultFigureForType("label"),
+        // Vertical offset for each label so they
+        // don't overlap.
+        coord: [0, -(labels?.length ?? 0)],
+        // Default to the same color as the function
+        color: lineColor
+      };
+      onChangeProps({
+        labels: [...(labels ?? []), newLabel]
+      });
+    },
+    style: styles$p.addButton
+  }, "Add visible label")), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
     figureType: props.type,
     onMove: onMove,
     onRemove: onRemove
@@ -31146,29 +31482,29 @@ const ExampleItem = props => {
   const exampleId = React.useId();
   return /*#__PURE__*/React__namespace.createElement("li", {
     key: `${category}-${index}`,
-    className: aphrodite.css(styles$r.exampleRow)
+    className: aphrodite.css(styles$p.exampleRow)
   }, /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
     icon: autoPasteIcon__default["default"],
     "aria-label": "paste example",
     "aria-describedby": exampleId,
     onClick: () => pasteEquationFn("equation", example),
     size: "medium",
-    style: styles$r.copyPasteButton
+    style: styles$p.copyPasteButton
   }), /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
     icon: copyIcon__default["default"],
     "aria-label": "copy example",
     "aria-describedby": exampleId,
     onClick: () => navigator.clipboard.writeText(example),
     size: "medium",
-    style: styles$r.copyPasteButton
+    style: styles$p.copyPasteButton
   }), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxxSmall_4
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$r.exampleContent,
+    style: styles$p.exampleContent,
     id: exampleId
   }, example));
 };
-const styles$r = aphrodite.StyleSheet.create({
+const styles$p = aphrodite.StyleSheet.create({
   accordionHeader: {
     textOverflow: "ellipsis",
     // A maximum width needs to be specified in order for the ellipsis to work.
@@ -31259,126 +31595,18 @@ const styles$r = aphrodite.StyleSheet.create({
   },
   textField: {
     flexGrow: "1"
-  }
-});
-
-/**
- * LockedLabelSettings is a component that allows the user to edit the
- * settings of specifically a locked label on the graph within the
- * Interactive Graph widget.
- *
- * Used in the interactive graph editor's locked figures section.
- */
-function LockedLabelSettings(props) {
-  const {
-    type,
-    coord,
-    color,
-    size,
-    text,
-    expanded,
-    onChangeProps,
-    onMove,
-    onRemove,
-    onToggle
-  } = props;
-  return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
-    expanded: expanded,
-    onToggle: onToggle,
-    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: [styles$q.row, styles$q.accordionHeaderContainer]
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, "Label (", coord[0], ", ", coord[1], ")"), /*#__PURE__*/React__namespace.createElement(Strut, {
-      size: wonderBlocksTokens.spacing.xSmall_8
-    }), text !== "" && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, {
-      style: [{
-        backgroundColor: wonderBlocksTokens.color.white,
-        color: perseus.lockedFigureColors[color]
-      }, styles$q.accordionHeader]
-    }, text)),
-    containerStyle: !onMove && styles$q.innerLabelAccordionPanel
-  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: coord,
-    onChange: newCoords => {
-      onChangeProps({
-        coord: newCoords
-      });
-    },
-    style: styles$q.spaceUnder
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: [styles$q.row, styles$q.spaceUnder]
-  }, "TeX", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xSmall_8
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
-    value: text,
-    placeholder: "ex. x^2 or \\frac{1}{2}",
-    onChange: newValue => onChangeProps({
-      text: newValue
-    })
-  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$q.row
-  }, onMove && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
-    selectedValue: color,
-    onChange: newColor => {
-      onChangeProps({
-        color: newColor
-      });
-    },
-    style: styles$q.spaceUnder
-  }), /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.medium_16
-  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: styles$q.row
-  }, "size", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xSmall_8
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: size,
-    onChange: newValue => onChangeProps({
-      size: newValue
-    })
-    // Placeholder is required, but never gets used since
-    // we have a label for the select.
-    ,
-    placeholder: ""
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "small",
-    label: "small"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "medium",
-    label: "medium"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "large",
-    label: "large"
-  })))), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    figureType: type,
-    onMove: onMove,
-    onRemove: onRemove
-  }));
-}
-const styles$q = aphrodite.StyleSheet.create({
-  accordionHeaderContainer: {
-    // Stop the label summary from wrapping.
-    whiteSpace: "nowrap"
-  },
-  accordionHeader: {
-    padding: wonderBlocksTokens.spacing.xxxSmall_4,
-    marginInlineEnd: wonderBlocksTokens.spacing.xSmall_8,
-    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4,
-    textOverflow: "ellipsis",
-    overflow: "hidden"
   },
-  row: {
-    display: "flex",
-    flexDirection: "row",
-    alignItems: "center",
-    // Allow truncation, stop bleeding over the edge.
-    minWidth: 0
+  // Label settings styles
+  addButton: {
+    alignSelf: "start"
   },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
+  horizontalRule: {
+    marginTop: wonderBlocksTokens.spacing.small_12,
+    marginBottom: wonderBlocksTokens.spacing.xxxSmall_4,
+    height: 1,
+    backgroundColor: wonderBlocksTokens.color.offBlack16
   },
-  innerLabelAccordionPanel: {
+  labelContainer: {
     backgroundColor: wonderBlocksTokens.color.white
   }
 });
@@ -31393,7 +31621,7 @@ const LabeledSwitch = props => {
   const ids = wonderBlocksCore.useUniqueIdWithMock();
   const switchId = ids.get("switch");
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$p.row, style]
+    style: [styles$o.row, style]
   }, /*#__PURE__*/React__namespace.createElement(Switch__default["default"], {
     id: switchId,
     checked: checked,
@@ -31405,71 +31633,112 @@ const LabeledSwitch = props => {
     htmlFor: switchId
   }, label));
 };
-const styles$p = aphrodite.StyleSheet.create({
+const styles$o = aphrodite.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 LockedPointSettings = props => {
   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
+    if (labels) {
+      newProps.labels = labels.map(label => ({
+        ...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
+    if (labels) {
+      newProps.labels = labels.map(label => ({
+        ...label,
+        coord: [label.coord[0] + xOffset, label.coord[1] + yOffset]
+      }));
+    }
+    onChangeProps(newProps);
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = {
+      ...labels[labelIndex],
+      ...updatedLabel
+    };
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
     });
   }
   return /*#__PURE__*/React__namespace.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__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$o.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `${label || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React__namespace.createElement(Strut, {
+      style: styles$n.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `${headerLabel || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React__namespace.createElement(Strut, {
       size: wonderBlocksTokens.spacing.xSmall_8
-    }), showPoint && /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
+    }), /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
       color: pointColor,
       filled: filled
     }))
   }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
     coord: coord,
-    error: !!error,
-    style: styles$o.spaceUnder,
-    onChange: newCoords => {
-      onChangeProps({
-        coord: newCoords
-      });
-    }
+    style: styles$n.spaceUnder,
+    onChange: handleCoordChange
   }), onTogglePoint && /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
     label: "show point on graph",
     checked: !!showPoint,
-    style: showPoint && styles$o.spaceUnder,
+    style: showPoint && styles$n.spaceUnder,
     onChange: onTogglePoint
-  }), showPoint && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
+  }), (!isDefiningPoint || showPoint) && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
     selectedValue: pointColor,
     onChange: handleColorChange,
-    style: styles$o.spaceUnder
+    style: styles$n.spaceUnder
   }), /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
     label: "open point",
     checked: !filled,
@@ -31478,19 +31747,58 @@ const DefiningPointSettings = props => {
         filled: !newValue
       });
     }
-  })));
+  })), (!isDefiningPoint && flags?.["mafs"]?.["locked-point-labels"] || isDefiningPoint && flags?.["mafs"]?.["locked-line-labels"]) && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, labels?.map((label, labelIndex) => /*#__PURE__*/React__namespace.createElement(LockedLabelSettings, _extends({}, label, {
+    containerStyle: !isDefiningPoint && styles$n.lockedPointLabelContainer,
+    expanded: true,
+    onChangeProps: newLabel => {
+      handleLabelChange(newLabel, labelIndex);
+    },
+    onRemove: () => {
+      handleLabelRemove(labelIndex);
+    }
+  }))), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "tertiary",
+    startIcon: plusCircle__default["default"],
+    onClick: () => {
+      const newLabel = {
+        ...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?.length ?? 0)],
+        // Default to the same color as the point
+        color: pointColor
+      };
+      onChangeProps({
+        labels: [...(labels ?? []), newLabel]
+      });
+    },
+    style: styles$n.addButton
+  }, "Add visible label")), onRemove && /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
 };
-const styles$o = aphrodite.StyleSheet.create({
-  container: {
+const styles$n = aphrodite.StyleSheet.create({
+  definingContainer: {
     marginTop: wonderBlocksTokens.spacing.xSmall_8,
     marginBottom: 0,
     marginLeft: -wonderBlocksTokens.spacing.xxxSmall_4,
     marginRight: -wonderBlocksTokens.spacing.xxxSmall_4,
     backgroundColor: wonderBlocksTokens.color.white
   },
-  accordionPanel: {
+  definingPanel: {
     // Need more space since we don't have the actions' margins.
-    paddingBottom: wonderBlocksTokens.spacing.medium_16
+    paddingBottom: wonderBlocksTokens.spacing.xxSmall_6
+  },
+  // A regular point (NOT a defining point) has label
+  // accordions with white backgrounds.
+  lockedPointLabelContainer: {
+    backgroundColor: wonderBlocksTokens.color.white
   },
   row: {
     flexDirection: "row",
@@ -31498,18 +31806,23 @@ const styles$o = aphrodite.StyleSheet.create({
   },
   spaceUnder: {
     marginBottom: wonderBlocksTokens.spacing.xSmall_8
+  },
+  addButton: {
+    alignSelf: "start"
   }
 });
 
 const lengthZeroStr = "The line cannot have length 0.";
 const LockedLineSettings = props => {
   const {
+    flags,
     kind,
     points,
     color: lineColor,
     lineStyle = "solid",
     showPoint1,
     showPoint2,
+    labels,
     onChangeProps,
     onMove,
     onRemove
@@ -31527,28 +31840,75 @@ const LockedLineSettings = props => {
       ...points[index],
       ...newPointProps
     };
+
+    // Update labels to be centered between the two points,
+    // retaining existing offset.
+    const oldMidpoint = mafs.vec.midpoint(points[0].coord, points[1].coord);
+    const newMidpoint = mafs.vec.midpoint(newPoints[0].coord, newPoints[1].coord);
+    const offset = [newMidpoint[0] - oldMidpoint[0], newMidpoint[1] - oldMidpoint[1]];
+    const newLabels = labels?.map((label, labelIndex) => ({
+      ...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 => ({
+      ...label,
+      color: newColor
+    }));
     onChangeProps({
       color: newColor,
       // Keep the line's points' colors in sync with the line color.
       points: [{
         ...point1,
-        color: newColor
+        color: newColor,
+        labels: point1.labels?.map(label => ({
+          ...label,
+          color: newColor
+        }))
       }, {
         ...point2,
-        color: newColor
-      }]
+        color: newColor,
+        labels: point2.labels?.map(label => ({
+          ...label,
+          color: newColor
+        }))
+      }],
+      // Keep the line's labels' colors in sync with the line color.
+      labels: newLabels
+    });
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = {
+      ...labels[labelIndex],
+      ...updatedLabel
+    };
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
     });
   }
   return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
     expanded: props.expanded,
     onToggle: props.onToggle,
     header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$n.row
+      style: styles$m.row
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, lineLabel), /*#__PURE__*/React__namespace.createElement(Strut, {
       size: wonderBlocksTokens.spacing.xSmall_8
     }), /*#__PURE__*/React__namespace.createElement(LineSwatch, {
@@ -31557,7 +31917,7 @@ const LockedLineSettings = props => {
     }))
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: [styles$n.row, styles$n.spaceUnder]
+    style: [styles$m.row, styles$m.spaceUnder]
   }, "kind", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxxSmall_4
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
@@ -31578,7 +31938,7 @@ const LockedLineSettings = props => {
     value: "segment",
     label: "segment"
   }))), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$n.row
+    style: styles$m.row
   }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
     selectedValue: lineColor,
     onChange: handleColorChange
@@ -31590,9 +31950,11 @@ const LockedLineSettings = props => {
       lineStyle: value
     })
   })), isInvalid && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    style: styles$n.errorText
-  }, lengthZeroStr), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
-    label: "Point 1",
+    style: styles$m.errorText
+  }, lengthZeroStr), /*#__PURE__*/React__namespace.createElement(LockedPointSettings, _extends({
+    flags: flags,
+    headerLabel: "Point 1",
+    expanded: true,
     showPoint: showPoint1,
     error: isInvalid ? lengthZeroStr : null
   }, point1, {
@@ -31600,8 +31962,10 @@ const LockedLineSettings = props => {
       showPoint1: newValue
     }),
     onChangeProps: newProps => handleChangePoint(newProps, 0)
-  })), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
-    label: "Point 2",
+  })), /*#__PURE__*/React__namespace.createElement(LockedPointSettings, _extends({
+    flags: flags,
+    headerLabel: "Point 2",
+    expanded: true,
     showPoint: showPoint2,
     error: isInvalid ? lengthZeroStr : null
   }, point2, {
@@ -31609,206 +31973,33 @@ const LockedLineSettings = props => {
       showPoint2: newValue
     }),
     onChangeProps: newProps => handleChangePoint(newProps, 1)
-  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    figureType: props.type,
-    onMove: onMove,
-    onRemove: onRemove
-  }));
-};
-const styles$n = aphrodite.StyleSheet.create({
-  row: {
-    display: "flex",
-    flexDirection: "row",
-    alignItems: "center"
-  },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
-  },
-  errorText: {
-    color: wonderBlocksTokens.color.red
-  }
-});
-
-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"), {
-          ...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 wonderStuffCore.UnreachableCaseError(type);
-  }
-}
-
-const LockedPointSettings = props => {
-  const {
-    flags,
-    coord,
-    color: pointColor,
-    filled = true,
-    labels,
-    onChangeProps,
-    onMove,
-    onRemove
-  } = props;
-  function handleColorChange(newValue) {
-    const newProps = {
-      color: newValue
-    };
-
-    // Update the color of the all labels to match the point
-    newProps.labels = labels.map(label => ({
-      ...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 => ({
-      ...label,
-      coord: [label.coord[0] + xOffset, label.coord[1] + yOffset]
-    }));
-    onChangeProps(newProps);
-  }
-  function handleLabelChange(updatedLabel, labelIndex) {
-    const updatedLabels = [...labels];
-    updatedLabels[labelIndex] = {
-      ...labels[labelIndex],
-      ...updatedLabel
-    };
-    onChangeProps({
-      labels: updatedLabels
-    });
-  }
-  function handleLabelRemove(labelIndex) {
-    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
-    onChangeProps({
-      labels: updatedLabels
-    });
-  }
-  return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
-    expanded: props.expanded,
-    onToggle: props.onToggle,
-    header:
-    /*#__PURE__*/
-    // Summary: Point, coords, color (filled/open)
-    React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$m.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Point (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React__namespace.createElement(Strut, {
-      size: wonderBlocksTokens.spacing.xSmall_8
-    }), /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
-      color: pointColor,
-      filled: filled
-    }))
-  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: coord,
-    style: styles$m.spaceUnder,
-    onChange: handleCoordChange
-  }), /*#__PURE__*/React__namespace.createElement(ColorSelect, {
-    selectedValue: pointColor,
-    onChange: handleColorChange,
-    style: styles$m.spaceUnder
-  }), /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
-    label: "open point",
-    checked: !filled,
-    onChange: newValue => {
-      onChangeProps({
-        filled: !newValue
-      });
-    },
-    style: styles$m.spaceUnder
-  }), flags?.["mafs"]?.["locked-point-labels"] && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, labels.map((label, labelIndex) => /*#__PURE__*/React__namespace.createElement(LockedLabelSettings, _extends({}, label, {
+  })), flags?.["mafs"]?.["locked-line-labels"] && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$m.horizontalRule
+  }), labels?.map((label, labelIndex) => /*#__PURE__*/React__namespace.createElement(LockedLabelSettings, _extends({}, label, {
     expanded: true,
     onChangeProps: newLabel => {
       handleLabelChange(newLabel, labelIndex);
     },
     onRemove: () => {
       handleLabelRemove(labelIndex);
-    }
+    },
+    containerStyle: styles$m.labelContainer
   }))), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
     kind: "tertiary",
     startIcon: plusCircle__default["default"],
     onClick: () => {
+      // Additional vertical offset for each label so
+      // they don't overlap.
+      const offsetPerLabel = [0, -1];
+      const labelLocation = mafs.vec.add(mafs.vec.scale(offsetPerLabel, labels?.length ?? 0), mafs.vec.midpoint(points[0].coord, points[1].coord));
       const newLabel = {
         ...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?.length],
-        // Default to the same color as the point
-        color: pointColor
+        coord: labelLocation,
+        // Default to the same color as the line
+        color: lineColor
       };
       onChangeProps({
-        labels: [...labels, newLabel]
+        labels: [...(labels ?? []), newLabel]
       });
     },
     style: styles$m.addButton
@@ -31820,14 +32011,27 @@ const LockedPointSettings = props => {
 };
 const styles$m = aphrodite.StyleSheet.create({
   row: {
+    display: "flex",
     flexDirection: "row",
     alignItems: "center"
   },
   spaceUnder: {
     marginBottom: wonderBlocksTokens.spacing.xSmall_8
   },
+  errorText: {
+    color: wonderBlocksTokens.color.red
+  },
   addButton: {
     alignSelf: "start"
+  },
+  horizontalRule: {
+    marginTop: wonderBlocksTokens.spacing.small_12,
+    marginBottom: wonderBlocksTokens.spacing.xxxSmall_4,
+    height: 1,
+    backgroundColor: wonderBlocksTokens.color.offBlack16
+  },
+  labelContainer: {
+    backgroundColor: wonderBlocksTokens.color.white
   }
 });
 
@@ -32090,17 +32294,13 @@ const styles$k = aphrodite.StyleSheet.create({
   }
 });
 
-/**
- * LockedVectorSettings is a component that allows the user to edit the
- * settings of specifically a locked vector on the graph.
- *
- * Used in the interactive graph editor's locked figures section.
- */
 const lengthErrorMessage = "The vector cannot have length 0.";
 const LockedVectorSettings = props => {
   const {
+    flags,
     points,
     color: lineColor,
+    labels,
     onChangeProps,
     onMove,
     onRemove
@@ -32114,14 +32314,53 @@ const LockedVectorSettings = props => {
     if (typeof newCoord !== "undefined") {
       const newPoints = [...points];
       newPoints[index] = [...newCoord];
+
+      // Update labels to match the new points
+      const oldMidpoint = mafs.vec.midpoint(tail, tip);
+      const newMidpoint = mafs.vec.midpoint(newPoints[0], newPoints[1]);
+      const offset = mafs.vec.sub(newMidpoint, oldMidpoint);
+      const newLabels = labels?.map(label => ({
+        ...label,
+        coord: mafs.vec.add(label.coord, offset)
+      }));
       onChangeProps({
-        points: newPoints
+        points: newPoints,
+        labels: newLabels
       });
     }
   }
   function handleColorChange(newColor) {
-    onChangeProps({
+    const newProps = {
+      color: newColor
+    };
+
+    // Update the color of the all labels to match the point
+    newProps.labels = labels?.map(label => ({
+      ...label,
       color: newColor
+    }));
+    onChangeProps(newProps);
+  }
+  function handleLabelChange(updatedLabel, labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = [...labels];
+    updatedLabels[labelIndex] = {
+      ...labels[labelIndex],
+      ...updatedLabel
+    };
+    onChangeProps({
+      labels: updatedLabels
+    });
+  }
+  function handleLabelRemove(labelIndex) {
+    if (!labels) {
+      return;
+    }
+    const updatedLabels = labels.filter((_, index) => index !== labelIndex);
+    onChangeProps({
+      labels: updatedLabels
     });
   }
   return /*#__PURE__*/React__namespace.createElement(PerseusEditorAccordion, {
@@ -32170,7 +32409,37 @@ const LockedVectorSettings = props => {
     onChange: newProps => {
       handleChangePoint(newProps, 1);
     }
-  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+  })), flags?.["mafs"]?.["locked-vector-labels"] && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$j.horizontalRule
+  }), labels?.map((label, labelIndex) => /*#__PURE__*/React__namespace.createElement(LockedLabelSettings, _extends({}, label, {
+    expanded: true,
+    onChangeProps: newLabel => {
+      handleLabelChange(newLabel, labelIndex);
+    },
+    onRemove: () => {
+      handleLabelRemove(labelIndex);
+    },
+    containerStyle: styles$j.labelContainer
+  }))), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "tertiary",
+    startIcon: plusCircle__default["default"],
+    onClick: () => {
+      // Additional vertical offset for each label so
+      // they don't overlap.
+      const offsetPerLabel = [0, -1];
+      const labelLocation = mafs.vec.add(mafs.vec.scale(offsetPerLabel, labels?.length ?? 0), mafs.vec.midpoint(tail, tip));
+      const newLabel = {
+        ...getDefaultFigureForType("label"),
+        coord: labelLocation,
+        // Default to the same color as the vector
+        color: lineColor
+      };
+      onChangeProps({
+        labels: [...(labels ?? []), newLabel]
+      });
+    },
+    style: styles$j.addButton
+  }, "Add visible label")), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
     figureType: props.type,
     onMove: onMove,
     onRemove: onRemove
@@ -32194,6 +32463,18 @@ const styles$j = aphrodite.StyleSheet.create({
   row: {
     flexDirection: "row",
     alignItems: "center"
+  },
+  addButton: {
+    alignSelf: "start"
+  },
+  horizontalRule: {
+    marginTop: wonderBlocksTokens.spacing.small_12,
+    marginBottom: wonderBlocksTokens.spacing.xxxSmall_4,
+    height: 1,
+    backgroundColor: wonderBlocksTokens.color.offBlack16
+  },
+  labelContainer: {
+    backgroundColor: wonderBlocksTokens.color.white
   }
 });