@khanacademy/perseus-editor 6.10.0 → 6.12.0

package/dist/index.js

@@ -24,11 +24,18 @@ var mathInput = require('@khanacademy/math-input');
 var wonderBlocksDropdown = require('@khanacademy/wonder-blocks-dropdown');
 var wonderBlocksForm = require('@khanacademy/wonder-blocks-form');
 var wonderBlocksTypography = require('@khanacademy/wonder-blocks-typography');
-var Banner = require('@khanacademy/wonder-blocks-banner');
 var Button = require('@khanacademy/wonder-blocks-button');
-var Switch = require('@khanacademy/wonder-blocks-switch');
 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');
+var caretDoubleUpIcon = require('@phosphor-icons/core/bold/caret-double-up-bold.svg');
+var caretDownIcon = require('@phosphor-icons/core/bold/caret-down-bold.svg');
+var caretUpIcon = require('@phosphor-icons/core/bold/caret-up-bold.svg');
 var trashIcon = require('@phosphor-icons/core/bold/trash-bold.svg');
+var Switch = require('@khanacademy/wonder-blocks-switch');
+var minusCircle = require('@phosphor-icons/core/regular/minus-circle.svg');
+var plusCircle = require('@phosphor-icons/core/regular/plus-circle.svg');
+var Banner = require('@khanacademy/wonder-blocks-banner');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -60,14 +67,21 @@ var caretRight__default = /*#__PURE__*/_interopDefaultLegacy(caretRight);
 var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 var KAS__namespace = /*#__PURE__*/_interopNamespace(KAS);
-var Banner__default = /*#__PURE__*/_interopDefaultLegacy(Banner);
 var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
-var Switch__default = /*#__PURE__*/_interopDefaultLegacy(Switch);
+var IconButton__default = /*#__PURE__*/_interopDefaultLegacy(IconButton);
+var caretDoubleDownIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretDoubleDownIcon);
+var caretDoubleUpIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretDoubleUpIcon);
+var caretDownIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretDownIcon);
+var caretUpIcon__default = /*#__PURE__*/_interopDefaultLegacy(caretUpIcon);
 var trashIcon__default = /*#__PURE__*/_interopDefaultLegacy(trashIcon);
+var Switch__default = /*#__PURE__*/_interopDefaultLegacy(Switch);
+var minusCircle__default = /*#__PURE__*/_interopDefaultLegacy(minusCircle);
+var plusCircle__default = /*#__PURE__*/_interopDefaultLegacy(plusCircle);
+var Banner__default = /*#__PURE__*/_interopDefaultLegacy(Banner);
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "6.10.0";
+const libVersion = "6.12.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -262,13 +276,13 @@ class SectionControlButton extends React__namespace.Component {
       role: "button",
       hideDefaultFocusRing: true,
       "aria-label": title,
-      style: styles$D.button
+      style: styles$G.button
     }, _ref => {
       return /*#__PURE__*/React__namespace.createElement(InlineIcon$b, icon);
     });
   }
 }
-const styles$D = aphrodite.StyleSheet.create({
+const styles$G = aphrodite.StyleSheet.create({
   button: {
     backgroundColor: wonderBlocksTokens.color.gold,
     margin: 2,
@@ -20773,13 +20787,13 @@ class WidgetSelect extends React__namespace.Component {
  * that collapse a region.
  */
 function ToggleableCaret(props) {
-  const iconStyle = props.isExpanded ? styles$C.expanded : styles$C.collapsed;
+  const iconStyle = props.isExpanded ? styles$F.expanded : styles$F.collapsed;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksIcon.PhosphorIcon, {
     icon: caretRight__default["default"],
     style: iconStyle
   });
 }
-const styles$C = aphrodite.StyleSheet.create({
+const styles$F = aphrodite.StyleSheet.create({
   collapsed: {
     transition: ".15s"
   },
@@ -20809,16 +20823,16 @@ class TexErrorView extends React__namespace.Component {
       showErrors
     } = this.state;
     return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$B.errorContainer
+      style: styles$E.errorContainer
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$B.title,
+      style: styles$E.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$B.errorExplanation
+      style: styles$E.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$B.error,
+      style: styles$E.error,
       key: index
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       style: {
@@ -20827,7 +20841,7 @@ class TexErrorView extends React__namespace.Component {
     }, e.math), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, e.message))));
   }
 }
-const styles$B = aphrodite.StyleSheet.create({
+const styles$E = aphrodite.StyleSheet.create({
   title: {
     backgroundColor: "#eee",
     fontSize: "1.25em",
@@ -23464,7 +23478,7 @@ class StructuredItemDiff extends React__namespace.Component {
 
 /* eslint-disable @khanacademy/ts-no-error-suppressions */
 const {
-  InfoTip: InfoTip$n,
+  InfoTip: InfoTip$m,
   InlineIcon: InlineIcon$7
 } = perseus.components;
 const {
@@ -23538,7 +23552,7 @@ class HintEditor extends React__namespace.Component {
       type: "button",
       className: this.props.isFirst ? "hidden" : "",
       onClick: ___default["default"].partial(this.props.onMove, -1)
-    }, /*#__PURE__*/React__namespace.createElement(InlineIcon$7, iconCircleArrowUp)), " ", this.props.isLast && /*#__PURE__*/React__namespace.createElement(InfoTip$n, null, /*#__PURE__*/React__namespace.createElement("p", null, "The last hint is automatically bolded."))), /*#__PURE__*/React__namespace.createElement("input", {
+    }, /*#__PURE__*/React__namespace.createElement(InlineIcon$7, iconCircleArrowUp)), " ", this.props.isLast && /*#__PURE__*/React__namespace.createElement(InfoTip$m, null, /*#__PURE__*/React__namespace.createElement("p", null, "The last hint is automatically bolded."))), /*#__PURE__*/React__namespace.createElement("input", {
       type: "checkbox"
       // @ts-expect-error - TS2322 - Type 'boolean | null | undefined' is not assignable to type 'boolean | undefined'.
       ,
@@ -23773,7 +23787,7 @@ class CombinedHintsEditor extends React__namespace.Component {
 }
 
 const {
-  InfoTip: InfoTip$m
+  InfoTip: InfoTip$l
 } = perseus.components;
 class ItemExtrasEditor extends React__namespace.Component {
   static defaultProps = {
@@ -23918,7 +23932,7 @@ const ItemExtraCheckbox = props => /*#__PURE__*/React__namespace.createElement("
   type: "checkbox",
   checked: props.checked,
   onChange: props.onChange
-})), /*#__PURE__*/React__namespace.createElement(InfoTip$m, null, props.infoTip));
+})), /*#__PURE__*/React__namespace.createElement(InfoTip$l, null, props.infoTip));
 
 const ITEM_DATA_VERSION = perseus.itemDataVersion;
 class ItemEditor extends React__namespace.Component {
@@ -24577,12 +24591,12 @@ class SimpleButton extends React__namespace.Component {
       ...otherProps
     } = this.props;
     return /*#__PURE__*/React__namespace.createElement("div", _extends({
-      className: aphrodite.css(styles$A.baseButton, color === "green" && styles$A.green, color === "orange" && styles$A.orange),
+      className: aphrodite.css(styles$D.baseButton, color === "green" && styles$D.green, color === "orange" && styles$D.orange),
       onClick: onClick
     }, otherProps), children);
   }
 }
-const styles$A = aphrodite.StyleSheet.create({
+const styles$D = aphrodite.StyleSheet.create({
   baseButton: {
     top: "0",
     fontSize: "11px",
@@ -24795,23 +24809,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$z.containerHeader)
+    className: aphrodite.css(styles$C.containerHeader)
   }, /*#__PURE__*/React__namespace.createElement(Header, {
     depth: path.length,
-    className: aphrodite.css(styles$z.containerTitle)
+    className: aphrodite.css(styles$C.containerTitle)
   }, capitalize(name)));
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.container)
+    className: aphrodite.css(styles$C.container)
   }, /*#__PURE__*/React__namespace.createElement("span", {
-    className: aphrodite.css(styles$z.row, styles$z.rowHeading)
+    className: aphrodite.css(styles$C.row, styles$C.rowHeading)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft)
+    className: aphrodite.css(styles$C.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: "pod-title " + aphrodite.css(styles$z.containerHeader)
+    className: "pod-title " + aphrodite.css(styles$C.containerHeader)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.containerTitle)
+    className: aphrodite.css(styles$C.containerTitle)
   }, capitalize(name)), controls)), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnRight)
+    className: aphrodite.css(styles$C.columnRight)
   }, previewHeading)), children);
 };
 const ArrayContainer = props => {
@@ -24824,11 +24838,11 @@ const ArrayContainer = props => {
     actions
   } = props;
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.container)
+    className: aphrodite.css(styles$C.container)
   }, controls && /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft, styles$z.containerHeader)
+    className: aphrodite.css(styles$C.columnLeft, styles$C.containerHeader)
   }, controls), /*#__PURE__*/React__namespace.createElement("div", null, children), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft)
+    className: aphrodite.css(styles$C.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("a", {
     href: "javascript:void 0",
     onClick: () => actions.addArrayElement(path, shape.elementShape)
@@ -24842,28 +24856,28 @@ const ObjectContainer = _ref3 => {
     path
   } = _ref3;
   const headingEditor = /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.containerHeader)
+    className: aphrodite.css(styles$C.containerHeader)
   }, /*#__PURE__*/React__namespace.createElement(Header, {
     depth: path.length,
-    className: aphrodite.css(styles$z.containerTitle)
+    className: aphrodite.css(styles$C.containerTitle)
   }, capitalize(name)), controls);
   const headingPreview = (name || controls) && /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.containerHeader, styles$z.previewCollectionHeader)
+    className: aphrodite.css(styles$C.containerHeader, styles$C.previewCollectionHeader)
   }, /*#__PURE__*/React__namespace.createElement(Header, {
     depth: path.length,
-    className: aphrodite.css(styles$z.containerTitle)
+    className: aphrodite.css(styles$C.containerTitle)
   }, capitalize(name)));
   const hasBothHeadings = headingEditor && headingPreview;
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.container)
+    className: aphrodite.css(styles$C.container)
   }, hasBothHeadings && /*#__PURE__*/React__namespace.createElement("span", {
-    className: aphrodite.css(styles$z.row)
+    className: aphrodite.css(styles$C.row)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft)
+    className: aphrodite.css(styles$C.columnLeft)
   }, headingEditor), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnRight)
+    className: aphrodite.css(styles$C.columnRight)
   }, headingPreview)), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(path.length > 0 && styles$z.contentIndent)
+    className: aphrodite.css(path.length > 0 && styles$C.contentIndent)
   }, children));
 };
 
@@ -24983,11 +24997,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$z.row)
+    className: aphrodite.css(styles$C.row)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft)
+    className: aphrodite.css(styles$C.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$z.sticky)
+    className: aphrodite.css(sticky && styles$C.sticky)
   },
   /*#__PURE__*/
   // @ts-expect-error - TS2769 - No overload matches this call.
@@ -24995,9 +25009,9 @@ const ItemNodeContent = withStickiness(props => {
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions
   })))), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnRight)
+    className: aphrodite.css(styles$C.columnRight)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$z.sticky)
+    className: aphrodite.css(sticky && styles$C.sticky)
   }, preview))));
 });
 const HintNodeContent = withStickiness(props => {
@@ -25013,13 +25027,13 @@ const HintNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.row)
+    className: aphrodite.css(styles$C.row)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft)
+    className: aphrodite.css(styles$C.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$z.sticky)
+    className: aphrodite.css(sticky && styles$C.sticky)
   }, /*#__PURE__*/React__namespace.createElement(HintEditor, _extends({}, data, {
-    className: aphrodite.css(styles$z.hintEditor),
+    className: aphrodite.css(styles$C.hintEditor),
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions,
     showTitle: false,
@@ -25034,9 +25048,9 @@ const HintNodeContent = withStickiness(props => {
     isFirst: true,
     isLast: true
   })))), /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnRight)
+    className: aphrodite.css(styles$C.columnRight)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(sticky && styles$z.sticky)
+    className: aphrodite.css(sticky && styles$C.sticky)
   }, preview)));
 });
 const TagsNodeContent = props => {
@@ -25053,9 +25067,9 @@ const TagsNodeContent = props => {
     return null;
   }
   return /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.columnLeft)
+    className: aphrodite.css(styles$C.columnLeft)
   }, /*#__PURE__*/React__namespace.createElement("div", {
-    className: aphrodite.css(styles$z.tagsEditor)
+    className: aphrodite.css(styles$C.tagsEditor)
   }, /*#__PURE__*/React__namespace.createElement(GroupMetadataEditor, {
     value: data,
     onChange: newVal => actions.setValueAtPath(path, newVal),
@@ -25086,23 +25100,23 @@ const ArrayNodeContent = props => {
     const subpath = path.concat(i);
     const controls = [i > 0 && /*#__PURE__*/React__namespace.createElement("div", {
       key: "moveArrayElementUp",
-      className: aphrodite.css(styles$z.control)
+      className: aphrodite.css(styles$C.control)
     }, /*#__PURE__*/React__namespace.createElement(SimpleButton, {
       color: "orange",
       title: "Move up",
       onClick: () => actions.moveArrayElementUp(subpath)
     }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: aphrodite.css(styles$z.verticalFlip)
+      className: aphrodite.css(styles$C.verticalFlip)
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$6, iconChevronDown)))), i < data.length - 1 && /*#__PURE__*/React__namespace.createElement("div", {
       key: "moveArrayElementDown",
-      className: aphrodite.css(styles$z.control)
+      className: aphrodite.css(styles$C.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$z.control)
+      className: aphrodite.css(styles$C.control)
     }, /*#__PURE__*/React__namespace.createElement(SimpleButton, {
       color: "orange",
       title: "Delete",
@@ -25110,7 +25124,7 @@ const ArrayNodeContent = props => {
     }, /*#__PURE__*/React__namespace.createElement(InlineIcon$6, iconTrash$4)))];
     return /*#__PURE__*/React__namespace.createElement("div", {
       key: i,
-      className: aphrodite.css(styles$z.arrayElement, !elementIsLeaf && styles$z.arrayElementAndNotLeaf)
+      className: aphrodite.css(styles$C.arrayElement, !elementIsLeaf && styles$C.arrayElementAndNotLeaf)
     }, /*#__PURE__*/React__namespace.createElement(NodeContainer, _extends({}, otherProps, {
       key: i,
       shape: shape.elementShape,
@@ -25136,7 +25150,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$z.objectElement)
+    className: aphrodite.css(styles$C.objectElement)
   }, /*#__PURE__*/React__namespace.createElement(NodeContainer, _extends({}, otherProps, {
     shape: shape.shape[subkey],
     data: data[subkey],
@@ -25306,7 +25320,7 @@ class MultiRendererEditor extends React__namespace.Component {
     }, this._renderContent());
   }
 }
-const styles$z = aphrodite.StyleSheet.create({
+const styles$C = aphrodite.StyleSheet.create({
   // This is used in a number of places throughout this file.
   container: {},
   // eslint-disable-next-line react-native/no-unused-styles
@@ -25458,47 +25472,47 @@ const StatefulArticleEditor = createReactClass__default["default"]({
       screen
     } = this.state;
     return /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("div", {
-      style: styles$y.controlBar
+      style: styles$B.controlBar
     }, /*#__PURE__*/React__namespace.createElement("span", {
-      style: styles$y.controls
+      style: styles$B.controls
     }, "Mode:", " ", /*#__PURE__*/React__namespace.createElement("span", {
       onClick: () => this.setState({
         mode: "edit"
       }),
-      style: mode === "edit" ? styles$y.controlSelected : styles$y.control
+      style: mode === "edit" ? styles$B.controlSelected : styles$B.control
     }, "EDIT"), " | ", /*#__PURE__*/React__namespace.createElement("span", {
       onClick: () => this.setState({
         mode: "preview"
       }),
-      style: mode === "preview" ? styles$y.controlSelected : styles$y.control
+      style: mode === "preview" ? styles$B.controlSelected : styles$B.control
     }, "PREVIEW"), " | ", /*#__PURE__*/React__namespace.createElement("span", {
       onClick: () => this.setState({
         mode: "json"
       }),
-      style: mode === "json" ? styles$y.controlSelected : styles$y.control
+      style: mode === "json" ? styles$B.controlSelected : styles$B.control
     }, "JSON")), /*#__PURE__*/React__namespace.createElement("span", {
-      style: styles$y.controls
+      style: styles$B.controls
     }, "Screen:", " ", /*#__PURE__*/React__namespace.createElement("span", {
       onClick: () => this.setState({
         screen: "phone"
       }),
-      style: screen === "phone" ? styles$y.controlSelected : styles$y.control
+      style: screen === "phone" ? styles$B.controlSelected : styles$B.control
     }, "PHONE"), " | ", /*#__PURE__*/React__namespace.createElement("span", {
       onClick: () => this.setState({
         screen: "tablet"
       }),
-      style: screen === "tablet" ? styles$y.controlSelected : styles$y.control
+      style: screen === "tablet" ? styles$B.controlSelected : styles$B.control
     }, "TABLET"), " | ", /*#__PURE__*/React__namespace.createElement("span", {
       onClick: () => this.setState({
         screen: "desktop"
       }),
-      style: screen === "desktop" ? styles$y.controlSelected : styles$y.control
+      style: screen === "desktop" ? styles$B.controlSelected : styles$B.control
     }, "DESKTOP"))), /*#__PURE__*/React__namespace.createElement("div", {
-      style: styles$y.editor
+      style: styles$B.editor
     }, /*#__PURE__*/React__namespace.createElement(ArticleEditor, this.state)));
   }
 });
-const styles$y = {
+const styles$B = {
   controlBar: {
     marginBottom: 25,
     marginTop: 5
@@ -25713,7 +25727,7 @@ class BlurInput extends React__namespace.Component {
 
 /* eslint-disable no-useless-escape */
 const {
-  InfoTip: InfoTip$l,
+  InfoTip: InfoTip$k,
   PropCheckBox: PropCheckBox$b
 } = perseus.components;
 const DEFAULT_WIDTH = 400;
@@ -25901,7 +25915,7 @@ class CSProgramEditor extends React__namespace.Component {
       label: "Show Editor",
       showEditor: this.props.showEditor,
       onChange: this.props.onChange
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$l, null, "If you show the editor, you should use the \"full-width\" alignment to make room for the width of the editor."), /*#__PURE__*/React__namespace.createElement("br", null), /*#__PURE__*/React__namespace.createElement(PropCheckBox$b, {
+    }), /*#__PURE__*/React__namespace.createElement(InfoTip$k, null, "If you show the editor, you should use the \"full-width\" alignment to make room for the width of the editor."), /*#__PURE__*/React__namespace.createElement("br", null), /*#__PURE__*/React__namespace.createElement(PropCheckBox$b, {
       label: "Show Buttons",
       showButtons: this.props.showButtons,
       onChange: this.props.onChange
@@ -25909,7 +25923,7 @@ class CSProgramEditor extends React__namespace.Component {
       name: "settings",
       pairs: this.props.settings,
       onChange: this._handleSettingsChange
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$l, null, "Settings that you add here are available to the program as an object returned by ", /*#__PURE__*/React__namespace.createElement("code", null, "Program.settings()"))));
+    }), /*#__PURE__*/React__namespace.createElement(InfoTip$k, null, "Settings that you add here are available to the program as an object returned by ", /*#__PURE__*/React__namespace.createElement("code", null, "Program.settings()"))));
   }
 }
 
@@ -25986,7 +26000,7 @@ class DeprecatedStandinEditor extends React__namespace.Component {
 
 /* eslint-disable @khanacademy/ts-no-error-suppressions */
 const {
-  InfoTip: InfoTip$k,
+  InfoTip: InfoTip$j,
   InlineIcon: InlineIcon$5
 } = perseus.components;
 const {
@@ -26067,14 +26081,14 @@ class DropdownEditor extends React__namespace.Component {
       className: "perseus-widget-dropdown"
     }, /*#__PURE__*/React__namespace.createElement("div", {
       className: "dropdown-info"
-    }, "Dropdown", /*#__PURE__*/React__namespace.createElement(InfoTip$k, null, /*#__PURE__*/React__namespace.createElement("p", null, "The drop down is useful for making inequalities in a custom format. We normally use the symbols ", "<", ",", " ", ">", ", \u2264, \u2265 (in that order) which you can copy into the choices. When possible, use the \"multiple choice\" answer type instead."))), /*#__PURE__*/React__namespace.createElement("div", {
+    }, "Dropdown", /*#__PURE__*/React__namespace.createElement(InfoTip$j, null, /*#__PURE__*/React__namespace.createElement("p", null, "The drop down is useful for making inequalities in a custom format. We normally use the symbols ", "<", ",", " ", ">", ", \u2264, \u2265 (in that order) which you can copy into the choices. When possible, use the \"multiple choice\" answer type instead."))), /*#__PURE__*/React__namespace.createElement("div", {
       className: "dropdown-placeholder"
     }, /*#__PURE__*/React__namespace.createElement("input", {
       type: "text",
       placeholder: "Placeholder value",
       value: this.props.placeholder,
       onChange: this.onPlaceholderChange
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$k, null, /*#__PURE__*/React__namespace.createElement("p", null, "This value will appear as the drop down default. It should give the user some indication of the values available in the drop down itself, e.g., Yes/No/Maybe."))), /*#__PURE__*/React__namespace.createElement("div", {
+    }), /*#__PURE__*/React__namespace.createElement(InfoTip$j, null, /*#__PURE__*/React__namespace.createElement("p", null, "This value will appear as the drop down default. It should give the user some indication of the values available in the drop down itself, e.g., Yes/No/Maybe."))), /*#__PURE__*/React__namespace.createElement("div", {
       className: "clearfix"
     }), /*#__PURE__*/React__namespace.createElement("ul", {
       className: "dropdown-choices"
@@ -26608,7 +26622,7 @@ const SortableItem = createReactClass__default["default"]({
 });
 
 const {
-  InfoTip: InfoTip$j,
+  InfoTip: InfoTip$i,
   PropCheckBox: PropCheckBox$a
 } = perseus.components;
 
@@ -26734,11 +26748,11 @@ class ExpressionEditor extends React__namespace.Component {
       onChange: this.props.onChange,
       labelAlignment: "right",
       label: "Use \xD7 for rendering multiplication instead of a center dot."
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$j, 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", null, /*#__PURE__*/React__namespace.createElement("label", null, "Function variables: ", /*#__PURE__*/React__namespace.createElement("input", {
+    }), /*#__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", null, /*#__PURE__*/React__namespace.createElement("label", null, "Function variables: ", /*#__PURE__*/React__namespace.createElement("input", {
       type: "text",
       defaultValue: this.props.functions.join(" "),
       onChange: this.handleFunctions
-    })), /*#__PURE__*/React__namespace.createElement(InfoTip$j, 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", null, /*#__PURE__*/React__namespace.createElement("div", null, "Button sets:"), buttonSetChoices), /*#__PURE__*/React__namespace.createElement("h3", {
+    })), /*#__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", null, /*#__PURE__*/React__namespace.createElement("div", null, "Button sets:"), buttonSetChoices), /*#__PURE__*/React__namespace.createElement("h3", {
       className: "expression-editor-h3"
     }, "Answers"), /*#__PURE__*/React__namespace.createElement("p", {
       style: {
@@ -26952,14 +26966,14 @@ class AnswerOption extends React__namespace.Component {
       onChange: this.props.onChange,
       labelAlignment: "right",
       label: "Answer expression must have the same form."
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$j, 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", {
+    }), /*#__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: "answer-option"
     }, /*#__PURE__*/React__namespace.createElement(PropCheckBox$a, {
       simplify: this.props.simplify,
       onChange: this.props.onChange,
       labelAlignment: "right",
       label: "Answer expression must be fully expanded and simplified."
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$j, 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", {
+    }), /*#__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: "remove-container"
     }, removeButton)));
   }
@@ -27037,10 +27051,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$x.title)
+      className: aphrodite.css(styles$A.title)
     }, "Title:", " ", /*#__PURE__*/React__namespace.createElement(TextInput$6, {
       value: this.props.title,
-      className: aphrodite.css(styles$x.input)
+      className: aphrodite.css(styles$A.input)
       // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       ,
       onChange: this.change("title")
@@ -27065,7 +27079,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$x.hintsTitle)
+      className: aphrodite.css(styles$A.hintsTitle)
     }, "Hint"), /*#__PURE__*/React__namespace.createElement(Editor, {
       ref: this.hintEditor,
       content: this.props.hint ? this.props.hint.content : "",
@@ -27097,7 +27111,7 @@ class GradedGroupEditor extends React__namespace.Component {
     };
   };
 }
-const styles$x = aphrodite.StyleSheet.create({
+const styles$A = aphrodite.StyleSheet.create({
   title: {
     fontSize: 18,
     fontWeight: "bold"
@@ -27184,7 +27198,7 @@ const setArrayItem = (list, i, value) => [...list.slice(0, i), value, ...list.sl
 /* eslint-disable react/forbid-prop-types, react/no-unsafe */
 const {
   ButtonGroup: ButtonGroup$4,
-  InfoTip: InfoTip$i,
+  InfoTip: InfoTip$h,
   PropCheckBox: PropCheckBox$9,
   RangeInput: RangeInput$6
 } = perseus.components;
@@ -27645,7 +27659,7 @@ const GraphSettings = createReactClass__default["default"]({
       },
       onKeyPress: this.changeBackgroundUrl,
       onBlur: this.changeBackgroundUrl
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$i, null, /*#__PURE__*/React__namespace.createElement("p", null, "Create an image in graphie, or use the \"Add image\" function to create a background.")))), ___default["default"].contains(this.props.editableSettings, "measure") && /*#__PURE__*/React__namespace.createElement("div", {
+    }), /*#__PURE__*/React__namespace.createElement(InfoTip$h, null, /*#__PURE__*/React__namespace.createElement("p", null, "Create an image in graphie, or use the \"Add image\" function to create a background.")))), ___default["default"].contains(this.props.editableSettings, "measure") && /*#__PURE__*/React__namespace.createElement("div", {
       className: "misc-settings"
     }, /*#__PURE__*/React__namespace.createElement("div", {
       className: "perseus-widget-row"
@@ -27683,7 +27697,7 @@ const GraphSettings = createReactClass__default["default"]({
 });
 
 const {
-  InfoTip: InfoTip$h,
+  InfoTip: InfoTip$g,
   MultiButtonGroup: MultiButtonGroup$1
 } = perseus.components;
 const {
@@ -27757,7 +27771,7 @@ class GrapherEditor extends React__namespace.Component {
         className: "perseus-error"
       }, this.props.graph.valid);
     }
-    return /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("div", null, "Correct answer", " ", /*#__PURE__*/React__namespace.createElement(InfoTip$h, null, /*#__PURE__*/React__namespace.createElement("p", null, "Graph the correct answer in the graph below and ensure the equation or point coordinates displayed represent the correct answer.")), " ", ": ", equationString), /*#__PURE__*/React__namespace.createElement(GraphSettings, {
+    return /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("div", null, "Correct answer", " ", /*#__PURE__*/React__namespace.createElement(InfoTip$g, null, /*#__PURE__*/React__namespace.createElement("p", null, "Graph the correct answer in the graph below and ensure the equation or point coordinates displayed represent the correct answer.")), " ", ": ", equationString), /*#__PURE__*/React__namespace.createElement(GraphSettings, {
       editableSettings: ["graph", "snap", "image"],
       box: getInteractiveBoxFromSizeClass$1(sizeClass),
       range: this.props.graph.range,
@@ -28032,7 +28046,7 @@ class IframeEditor extends React__namespace.Component {
 
 /* eslint-disable jsx-a11y/anchor-is-valid, react/sort-comp */
 const {
-  InfoTip: InfoTip$g,
+  InfoTip: InfoTip$f,
   InlineIcon: InlineIcon$3,
   RangeInput: RangeInput$5
 } = perseus.components;
@@ -28089,7 +28103,7 @@ class ImageEditor extends React__namespace.Component {
       style: {
         width: "100%"
       }
-    }))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("div", null, "Dimensions:"), /*#__PURE__*/React__namespace.createElement("p", null, backgroundImage.width, "x", backgroundImage.height))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("div", null, "Alt text:", /*#__PURE__*/React__namespace.createElement(InfoTip$g, null, "This is important for screenreaders. The content of this alt text will be formatted as markdown (tables, emphasis, etc. are supported).")), /*#__PURE__*/React__namespace.createElement(Editor, {
+    }))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("div", null, "Dimensions:"), /*#__PURE__*/React__namespace.createElement("p", null, backgroundImage.width, "x", backgroundImage.height))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("div", null, "Alt text:", /*#__PURE__*/React__namespace.createElement(InfoTip$f, null, "This is important for screenreaders. The content of this alt text will be formatted as markdown (tables, emphasis, etc. are supported).")), /*#__PURE__*/React__namespace.createElement(Editor, {
       apiOptions: this.props.apiOptions,
       content: this.props.alt,
       onChange: props => {
@@ -28113,7 +28127,7 @@ class ImageEditor extends React__namespace.Component {
     }, this.state.backgroundImageError);
     return /*#__PURE__*/React__namespace.createElement("div", {
       className: "perseus-image-editor"
-    }, /*#__PURE__*/React__namespace.createElement("label", null, "Image url:", /*#__PURE__*/React__namespace.createElement(InfoTip$g, null, "Paste an image or graphie image URL."), this.state.backgroundImageError && backgroundImageErrorText, /*#__PURE__*/React__namespace.createElement(BlurInput, {
+    }, /*#__PURE__*/React__namespace.createElement("label", null, "Image url:", /*#__PURE__*/React__namespace.createElement(InfoTip$f, null, "Paste an image or graphie image URL."), this.state.backgroundImageError && backgroundImageErrorText, /*#__PURE__*/React__namespace.createElement(BlurInput, {
       value: backgroundImage.url || "",
       style: {
         width: 332
@@ -28269,7 +28283,7 @@ class ImageEditor extends React__namespace.Component {
 
 /* eslint-disable react/sort-comp */
 const {
-  InfoTip: InfoTip$f
+  InfoTip: InfoTip$e
 } = perseus.components;
 const answerTypes = {
   number: {
@@ -28349,7 +28363,7 @@ class InputNumberEditor extends React__namespace.Component {
       value: "optional"
     }, "will be accepted"), /*#__PURE__*/React__namespace.createElement("option", {
       value: "enforced"
-    }, "will be marked wrong"))), /*#__PURE__*/React__namespace.createElement(InfoTip$f, null, /*#__PURE__*/React__namespace.createElement("p", null, "Normally select \"will not be graded\". This will give the user a message saying the answer is correct but not simplified. The user will then have to simplify it and re-enter, but will not be penalized. (5th grade and anything after)"), /*#__PURE__*/React__namespace.createElement("p", null, "Select \"will be accepted\" only if the user is not expected to know how to simplify fractions yet. (Anything prior to 5th grade)"), /*#__PURE__*/React__namespace.createElement("p", null, "Select \"will be marked wrong\" only if we are specifically assessing the ability to simplify."))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("input", {
+    }, "will be marked wrong"))), /*#__PURE__*/React__namespace.createElement(InfoTip$e, null, /*#__PURE__*/React__namespace.createElement("p", null, "Normally select \"will not be graded\". This will give the user a message saying the answer is correct but not simplified. The user will then have to simplify it and re-enter, but will not be penalized. (5th grade and anything after)"), /*#__PURE__*/React__namespace.createElement("p", null, "Select \"will be accepted\" only if the user is not expected to know how to simplify fractions yet. (Anything prior to 5th grade)"), /*#__PURE__*/React__namespace.createElement("p", null, "Select \"will be marked wrong\" only if we are specifically assessing the ability to simplify."))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("input", {
       type: "checkbox",
       checked: this.props.inexact,
       onChange: e => {
@@ -28385,7 +28399,7 @@ class InputNumberEditor extends React__namespace.Component {
         });
       },
       "aria-label": "Answer type"
-    }, answerTypeOptions), /*#__PURE__*/React__namespace.createElement(InfoTip$f, null, /*#__PURE__*/React__namespace.createElement("p", null, "Use the default \"Numbers\" unless the answer must be in a specific form (e.g., question is about converting decimals to fractions)."))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, "Width", " ", /*#__PURE__*/React__namespace.createElement("select", {
+    }, answerTypeOptions), /*#__PURE__*/React__namespace.createElement(InfoTip$e, null, /*#__PURE__*/React__namespace.createElement("p", null, "Use the default \"Numbers\" unless the answer must be in a specific form (e.g., question is about converting decimals to fractions)."))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, "Width", " ", /*#__PURE__*/React__namespace.createElement("select", {
       value: this.props.size,
       onChange: e => {
         // @ts-expect-error - TS2322 - Type 'string' is not assignable to type '"small" | "normal" | undefined'.
@@ -28397,7 +28411,7 @@ class InputNumberEditor extends React__namespace.Component {
       value: "normal"
     }, "Normal (80px)"), /*#__PURE__*/React__namespace.createElement("option", {
       value: "small"
-    }, "Small (40px)"))), /*#__PURE__*/React__namespace.createElement(InfoTip$f, null, /*#__PURE__*/React__namespace.createElement("p", null, "Use size \"Normal\" for all text boxes, unless there are multiple text boxes in one line and the answer area is too narrow to fit them."))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("input", {
+    }, "Small (40px)"))), /*#__PURE__*/React__namespace.createElement(InfoTip$e, null, /*#__PURE__*/React__namespace.createElement("p", null, "Use size \"Normal\" for all text boxes, unless there are multiple text boxes in one line and the answer area is too narrow to fit them."))), /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("label", null, /*#__PURE__*/React__namespace.createElement("input", {
       type: "checkbox",
       checked: this.props.rightAlign,
       onChange: e => {
@@ -28468,13 +28482,13 @@ function MathquillInput(props) {
     }
   });
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$w.outerWrapper
+    style: styles$z.outerWrapper
   }, /*#__PURE__*/React__namespace.createElement("span", {
     ref: mathFieldWrapperRef,
     className: "perseus-math-input mq-editable-field mq-math-mode"
   }));
 }
-const styles$w = aphrodite.StyleSheet.create({
+const styles$z = aphrodite.StyleSheet.create({
   outerWrapper: {
     display: "inline-block",
     borderStyle: "solid",
@@ -29535,96 +29549,6 @@ class InteractionEditor extends React__namespace.Component {
   }
 }
 
-const UNLIMITED = "unlimited";
-// Parses a string (ostensibly from some UI element that only supports string
-// types, such as a <select />) into a numeric point count or the special sigil
-// "unlimited". Note that 0 is a special case, and means "unlimited".
-const parsePointCount = points => {
-  const parsed = parseInt(points, 10);
-  if (isNaN(parsed)) {
-    return UNLIMITED;
-  }
-  return parsed === 0 ? UNLIMITED : parsed;
-};
-
-const GraphPointsCountSelector = _ref => {
-  let {
-    numPoints = 1,
-    onChange
-  } = _ref;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: `${numPoints}`,
-    onChange: newValue => {
-      onChange(parsePointCount(newValue));
-    }
-    // Never uses placeholder, always has value
-    ,
-    placeholder: "",
-    style: styles$v.singleSelectShort
-  }, [...[...Array(7).keys()].map(n => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    key: n,
-    value: `${n}`,
-    label: `${n} point${n > 1 ? "s" : ""}`
-  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    key: "unlimited",
-    value: UNLIMITED,
-    label: "unlimited"
-  })]);
-};
-const styles$v = aphrodite.StyleSheet.create({
-  singleSelectShort: {
-    // Non-standard spacing, but it's the smallest we can go
-    // without running into styling issues with the dropdown.
-    height: 26
-  }
-});
-
-const GraphTypeSelector = props => {
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: props.graphType,
-    onChange: props.onChange,
-    placeholder: "Select a graph type",
-    style: styles$u.singleSelectShort
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "linear",
-    label: "Linear function"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "quadratic",
-    label: "Quadratic function"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "sinusoid",
-    label: "Sinusoid function"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "circle",
-    label: "Circle"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "point",
-    label: "Point(s)"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "linear-system",
-    label: "Linear System"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "polygon",
-    label: "Polygon"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "segment",
-    label: "Line Segment(s)"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "ray",
-    label: "Ray"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "angle",
-    label: "Angle"
-  }));
-};
-const styles$u = aphrodite.StyleSheet.create({
-  singleSelectShort: {
-    // Non-standard spacing, but it's the smallest we can go
-    // without running into styling issues with the dropdown.
-    height: 26
-  }
-});
-
 // Renders the given children in a View laid out horizontally.
 const LabeledRow = props => {
   const {
@@ -29634,16 +29558,16 @@ const LabeledRow = props => {
     style
   } = props;
   return /*#__PURE__*/React__namespace.createElement("label", {
-    className: aphrodite.css(styles$t.label)
+    className: aphrodite.css(styles$y.label)
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$t.row, style]
+    style: [styles$y.row, style]
   }, labelSide === "start" || /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, {
-    style: styles$t.spaceEnd
+    style: styles$y.spaceEnd
   }, label), children, labelSide === "end" && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, {
-    style: styles$t.spaceStart
+    style: styles$y.spaceStart
   }, label)));
 };
-const styles$t = aphrodite.StyleSheet.create({
+const styles$y = aphrodite.StyleSheet.create({
   label: {
     width: "fit-content"
   },
@@ -29661,903 +29585,1044 @@ const styles$t = aphrodite.StyleSheet.create({
   }
 });
 
-/* eslint-disable react/forbid-prop-types, react/no-unsafe */
-const {
-  ButtonGroup: ButtonGroup$2,
-  InfoTip: InfoTip$e,
-  PropCheckBox: PropCheckBox$7,
-  RangeInput: RangeInput$4
-} = perseus.components;
-const defaultBackgroundImage$1 = {
-  url: null,
-  width: 0,
-  height: 0
+const mediaDefaultSpecLargeMarginWidth = wonderBlocksTokens.spacing.large_24;
+const MEDIA_DEFAULT_SPEC = {
+  small: {
+    query: "(max-width: 767px)",
+    totalColumns: 4,
+    gutterWidth: wonderBlocksTokens.spacing.medium_16,
+    marginWidth: wonderBlocksTokens.spacing.medium_16
+  },
+  medium: {
+    query: "(min-width: 768px) and (max-width: 1023px)",
+    totalColumns: 8,
+    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
+    marginWidth: wonderBlocksTokens.spacing.large_24
+  },
+  large: {
+    query: "(min-width: 1024px)",
+    totalColumns: 12,
+    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
+    marginWidth: mediaDefaultSpecLargeMarginWidth,
+    maxWidth: 1120 + mediaDefaultSpecLargeMarginWidth * 2
+  }
 };
-function numSteps(range, step) {
-  return Math.floor((range[1] - range[0]) / step);
-}
-function Heading(_ref) {
-  let {
-    title,
-    isOpen,
-    onToggle
-  } = _ref;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: {
-      flexDirection: "row",
-      justifyContent: "space-between",
-      backgroundColor: wonderBlocksTokens.color.offBlack8,
-      padding: wonderBlocksTokens.spacing.xSmall_8,
-      marginTop: wonderBlocksTokens.spacing.small_12,
-      // NOTE(jeremy): This is the inverse of the @editorPadding CSS
-      // variable found in perseus-editor.less. For now, it must
-      // match otherwise there's a gap from this header to the edge
-      // of the editor borders.
-      marginInline: -10,
-      cursor: "pointer"
-    },
-    onClick: () => onToggle?.(!isOpen)
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, null, title), /*#__PURE__*/React__namespace.createElement(ToggleableCaret, {
-    isExpanded: isOpen
-  }));
-}
-class InteractiveGraphSettings extends React__namespace.Component {
-  _isMounted = false;
-  bgUrlRef = /*#__PURE__*/React__namespace.createRef();
-  labelXRef = /*#__PURE__*/React__namespace.createRef();
-  labelYRef = /*#__PURE__*/React__namespace.createRef();
-  static stateFromProps(props) {
-    return {
-      labelsTextbox: props.labels,
-      gridStepTextbox: props.gridStep,
-      snapStepTextbox: props.snapStep,
-      stepTextbox: props.step,
-      rangeTextbox: props.range,
-      // Shallow-copied clone
-      backgroundImage: {
-        ...props.backgroundImage
-      }
-    };
+({
+  large: {
+    query: "(min-width: 1px)",
+    totalColumns: 12,
+    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
+    marginWidth: wonderBlocksTokens.spacing.medium_16
   }
-  constructor(props) {
-    super(props);
-    this.state = {
-      isExpanded: true,
-      ...InteractiveGraphSettings.stateFromProps(props)
-    };
+});
+({
+  small: {
+    query: "(max-width: 767px)",
+    totalColumns: 4,
+    gutterWidth: wonderBlocksTokens.spacing.medium_16,
+    marginWidth: wonderBlocksTokens.spacing.medium_16
+  },
+  large: {
+    query: "(min-width: 768px)",
+    totalColumns: 12,
+    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
+    marginWidth: wonderBlocksTokens.spacing.xxLarge_48
   }
-  static defaultProps = {
-    box: [perseus.interactiveSizes.defaultBoxSizeSmall, perseus.interactiveSizes.defaultBoxSizeSmall],
-    labels: ["x", "y"],
-    range: [[-10, 10], [-10, 10]],
-    step: [1, 1],
-    gridStep: [1, 1],
-    snapStep: [1, 1],
-    valid: true,
-    backgroundImage: defaultBackgroundImage$1,
-    markings: "graph",
-    showProtractor: false,
-    showRuler: false,
-    showTooltips: false,
-    rulerLabel: "",
-    rulerTicks: 10
-  };
-  componentDidMount() {
-    // TODO(scottgrant): This is a hack to remove the deprecated call to
-    // this.isMounted() but is still considered an anti-pattern.
-    this._isMounted = true;
-    this.changeGraph = ___default["default"].debounce(this.changeGraph, 300);
+});
+
+const defaultContext = {
+  ssrSize: "large",
+  mediaSpec: MEDIA_DEFAULT_SPEC
+};
+const MediaLayoutContext = React__namespace.createContext(defaultContext);
+MediaLayoutContext.displayName = "MediaLayoutContext";
+
+class Spring extends React__namespace.Component {
+  render() {
+    const {
+      style
+    } = this.props;
+    return React__namespace.createElement(wonderBlocksCore.View, {
+      "aria-hidden": "true",
+      style: [styles$x.grow, style]
+    });
   }
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    // Make sure that state updates when switching
-    // between different items in a multi-item editor.
-    if (!___default["default"].isEqual(this.props.labels, nextProps.labels) || !___default["default"].isEqual(this.props.gridStep, nextProps.gridStep) || !___default["default"].isEqual(this.props.snapStep, nextProps.snapStep) || !___default["default"].isEqual(this.props.step, nextProps.step) || !___default["default"].isEqual(this.props.range, nextProps.range) || !___default["default"].isEqual(this.props.backgroundImage, nextProps.backgroundImage)) {
-      this.setState(InteractiveGraphSettings.stateFromProps(nextProps));
-    }
-  }
-  componentWillUnmount() {
-    this._isMounted = false;
+}
+const styles$x = aphrodite.StyleSheet.create({
+  grow: {
+    flexGrow: 1
   }
-  change = (() => {
-    var _this = this;
-    return function () {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      return perseus.Changeable.change.apply(_this, args);
-    };
-  })();
+});
 
-  // TODO(aria): Make either a wrapper for standard events to work
-  // with this.change, or make these use some TextInput/NumberInput box
-  changeRulerLabel = e => {
-    this.change({
-      rulerLabel: e.target.value
-    });
-  };
-  changeRulerTicks = e => {
-    this.change({
-      rulerTicks: +e.target.value
-    });
-  };
-  changeBackgroundUrl = e => {
-    // Only continue on blur or "enter"
-    if (e.type === "keypress" && e.key !== "Enter") {
-      return;
-    }
-    const setUrl = (url, width, height) => {
-      // Shallow-copied clone
-      const image = {
-        ...this.props.backgroundImage
-      };
-      image.url = url;
-      image.width = width;
-      image.height = height;
-      this.setState({
-        backgroundImage: image
-      }, this.changeGraph);
-    };
-    const url = this.bgUrlRef.current?.value;
-    if (url) {
-      perseus.Util.getImageSize(url, (width, height) => {
-        if (this._isMounted) {
-          setUrl(url, width, height);
-        }
-      });
-    } else {
-      setUrl(null, 0, 0);
-    }
-  };
-  renderLabelChoices = choices => {
-    return choices.map(nameAndValue => /*#__PURE__*/React__namespace.createElement("option", {
-      key: nameAndValue[1],
-      value: nameAndValue[1]
-    }, nameAndValue[0]));
-  };
-  validRange = range => {
-    const numbers = ___default["default"].every(range, function (num) {
-      return ___default["default"].isFinite(num);
-    });
-    if (!numbers) {
-      return "Range must be a valid number";
-    }
-    if (range[0] >= range[1]) {
-      return "Range must have a higher number on the right";
-    }
-    return true;
-  };
-  validateStepValue = settings => {
+class Strut extends React__namespace.Component {
+  render() {
     const {
-      step,
-      range,
-      name,
-      minTicks,
-      maxTicks
-    } = settings;
-    const nSteps = numSteps(range, step);
-    if (nSteps < minTicks) {
-      return name + " is too large, there must be at least " + minTicks + " ticks.";
-    }
-    if (nSteps > maxTicks) {
-      return name + " is too small, there can be at most " + maxTicks + " ticks.";
-    }
-    return true;
-  };
-  validSnapStep = (step, range) => {
-    return this.validateStepValue({
-      step: step,
-      range: range,
-      name: "Snap step",
-      minTicks: 5,
-      maxTicks: 60
-    });
-  };
-  validGridStep = (step, range) => {
-    return this.validateStepValue({
-      step: step,
-      range: range,
-      name: "Grid step",
-      minTicks: 3,
-      maxTicks: 60
-    });
-  };
-  validStep = (step, range) => {
-    return this.validateStepValue({
-      step: step,
-      range: range,
-      name: "Step",
-      minTicks: 3,
-      maxTicks: 20
-    });
-  };
-  validBackgroundImageSize = image => {
-    // Ignore empty images
-    if (!image.url) {
-      return true;
-    }
-    const validSize = image.width <= 450 && image.height <= 450;
-    if (!validSize) {
-      return "Image must be smaller than 450px x 450px.";
-    }
-    return true;
-  };
-  validateGraphSettings = (range, step, gridStep, snapStep, image) => {
-    const self = this;
-    let msg;
-    const goodRange = ___default["default"].every(range, function (range) {
-      msg = self.validRange(range);
-      return msg === true;
-    });
-    if (!goodRange) {
-      return msg;
-    }
-    const goodStep = ___default["default"].every(step, function (step, i) {
-      msg = self.validStep(step, range[i]);
-      return msg === true;
-    });
-    if (!goodStep) {
-      return msg;
-    }
-    const goodGridStep = ___default["default"].every(gridStep, function (gridStep, i) {
-      msg = self.validGridStep(gridStep, range[i]);
-      return msg === true;
-    });
-    if (!goodGridStep) {
-      return msg;
-    }
-    const goodSnapStep = ___default["default"].every(snapStep, function (snapStep, i) {
-      msg = self.validSnapStep(snapStep, range[i]);
-      return msg === true;
+      size,
+      style
+    } = this.props;
+    return React__namespace.createElement(wonderBlocksCore.View, {
+      "aria-hidden": "true",
+      style: [strutStyle(size), style]
     });
-    if (!goodSnapStep) {
-      return msg;
-    }
-    const goodImageSize = this.validBackgroundImageSize(image);
-    if (goodImageSize !== true) {
-      msg = goodImageSize;
-      return msg;
-    }
-    return true;
-  };
-  changeLabel = (i, e) => {
-    const val = e.target.value;
-    const labels = this.state.labelsTextbox.slice();
-    labels[i] = val;
-    this.setState({
-      labelsTextbox: labels
-    }, this.changeGraph);
-  };
-  changeRange = (i, values) => {
-    const ranges = this.state.rangeTextbox.slice();
-    ranges[i] = values;
-    const step = this.state.stepTextbox.slice();
-    const gridStep = this.state.gridStepTextbox.slice();
-    const snapStep = this.state.snapStepTextbox.slice();
-    const scale = perseus.Util.scaleFromExtent(ranges[i], this.props.box[i]);
-    if (this.validRange(ranges[i]) === true) {
-      step[i] = perseus.Util.tickStepFromExtent(ranges[i], this.props.box[i]);
-      const gridStepValue = perseus.Util.gridStepFromTickStep(step[i], scale);
-      if (gridStepValue) {
-        gridStep[i] = gridStepValue;
-      }
-      snapStep[i] = gridStep[i] / 2;
-    }
-    this.setState({
-      stepTextbox: step,
-      gridStepTextbox: gridStep,
-      snapStepTextbox: snapStep,
-      rangeTextbox: ranges
-    }, this.changeGraph);
-  };
-  changeStep = step => {
-    this.setState({
-      stepTextbox: step
-    }, this.changeGraph);
-  };
-  changeSnapStep = snapStep => {
-    this.setState({
-      snapStepTextbox: snapStep
-    }, this.changeGraph);
-  };
-  changeGridStep = gridStep => {
-    this.setState({
-      gridStepTextbox: gridStep,
-      snapStepTextbox: ___default["default"].map(gridStep, function (step) {
-        return step / 2;
-      })
-    }, this.changeGraph);
+  }
+}
+const strutStyle = size => {
+  return {
+    width: size,
+    MsFlexBasis: size,
+    MsFlexPreferredSize: size,
+    WebkitFlexBasis: size,
+    flexBasis: size,
+    flexShrink: 0
   };
-  changeGraph = () => {
-    const labels = this.state.labelsTextbox;
-    const range = ___default["default"].map(this.state.rangeTextbox, function (range) {
-      return ___default["default"].map(range, Number);
-    });
-    const step = ___default["default"].map(this.state.stepTextbox, Number);
-    const gridStep = this.state.gridStepTextbox;
-    const snapStep = this.state.snapStepTextbox;
-    const image = this.state.backgroundImage;
+};
 
-    // validationResult is either:
-    //   true -> the settings are valid
-    //   a string -> the settings are invalid, and the explanation
-    //               is contained in the string
-    // TODO(aria): Refactor this to not be confusing
-    const validationResult = this.validateGraphSettings(range, step, gridStep, snapStep, image);
-    if (validationResult === true) {
-      // either true or a string
-      this.change({
-        valid: true,
-        labels: labels,
-        range: range,
-        step: step,
-        gridStep: gridStep,
-        snapStep: snapStep,
-        backgroundImage: image
-      });
-    } else {
-      this.change({
-        valid: validationResult // a string message, not false
-      });
+function focusWithChromeStickyFocusBugWorkaround(element) {
+  // NOTE(marksandstrom) Chrome sticky focus bug.
+  //
+  // There is a bug in Chrome related to sticky positioning and
+  // focus: When a child of an element with sticky positioning is
+  // focused with the focus() method, the scrollable area
+  // containing that element will scroll to the top (even though
+  // the element is already visble on the page). For a dropdown
+  // this means that the area will be scrolled to the top when
+  // the user interacts with the dropdown (since we actively
+  // manage dropdown header and option focus for keyboard users).
+  //
+  // To work around this bug the `preventScroll` focus option is
+  // used.
+  //
+  // Using `focusOptions` is an experimental browser feature
+  // "that should not be used in production code". However, since
+  // Chrome is the only browser we support that exhibits this
+  // buggy behavior and using `focusOptions` works around the
+  // bug, it is perfectly reasonable to use the feature in this
+  // case. We are not relying on the effect of the
+  // `preventScroll` option otherwise.
+  //
+  // focusOptions documentation:
+  //
+  // https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus
+  //
+  // Note that there could be cases where we want default focus() behavior.
+  // One that comes to mind is a dropdown with a long list of options that
+  // might be rendered off screen when opened. With this workaround the
+  // selected option would not be scrolled into view if the option is near
+  // the end of the list. We're not aware of any uses of the dropdown where
+  // this is an issue, however, so there isn't currently a way to out of the
+  // `preventScroll` behavior.
+
+  // @ts-expect-error - TS2339 - Property 'focus' does not exist on type 'Element'.
+  element.focus({
+    preventScroll: true
+  });
+}
+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"
+      };
+    default:
+      throw new wonderStuffCore.UnreachableCaseError(type);
+  }
+}
+function degreeToRadian(degrees) {
+  return degrees / 180 * Math.PI;
+}
+function radianToDegree(radians) {
+  return radians / Math.PI * 180;
+}
+
+/**
+ * Dropdown for selecting a locked figure to add to an interactive graph.
+ * Locked figures are elements (points, segmeents, etc.) that are not
+ * interactive, just present in the graph's background.
+ *
+ * Used in the interactive graph editor's locked figures section.
+ */
+const LockedFigureSelect = props => {
+  const {
+    id,
+    onChange
+  } = props;
+  const figureTypes = props.showM2Features ? ["point", "line", "vector", "ellipse", "polygon"] : ["point", "line"];
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$w.container
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.ActionMenu, {
+    menuText: "Add locked figure",
+    style: styles$w.addElementSelect
+  }, figureTypes.map(figureType => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.ActionItem, {
+    key: `${id}-${figureType}`,
+    label: figureType,
+    onClick: () => onChange(figureType)
+  }, figureType))));
+};
+const styles$w = aphrodite.StyleSheet.create({
+  container: {
+    marginTop: wonderBlocksTokens.spacing.xSmall_8
+  },
+  addElementSelect: {
+    backgroundColor: wonderBlocksTokens.color.fadedBlue8,
+    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4
+  }
+});
+
+const AngleInput = props => {
+  const {
+    angle,
+    onChange
+  } = props;
+  const [angleInput, setAngleInput] = React__namespace.useState(radianToDegree(angle).toString());
+  function handleAngleChange(newValue) {
+    // Update the local state (update the input field value).
+    setAngleInput(newValue);
+
+    // If the new value is not a number, don't update the props.
+    // If it's empty, keep the props the same value instead of setting to 0.
+    if (isNaN(+newValue) || newValue === "") {
+      return;
     }
-  };
 
-  render() {
-    return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(Heading, {
-      title: "Common Graph Settings",
-      isOpen: this.state.isExpanded,
-      onToggle: () => this.setState({
-        isExpanded: !this.state.isExpanded
-      })
-    }), this.state.isExpanded && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, /*#__PURE__*/React__namespace.createElement("div", {
-      className: "graph-settings"
-    }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-row"
-    }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-left-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "x Label"
-    }, /*#__PURE__*/React__namespace.createElement("input", {
-      type: "text",
-      className: "graph-settings-axis-label",
-      ref: this.labelXRef,
-      onChange: e => this.changeLabel(0, e),
-      value: this.state.labelsTextbox[0] || ""
-    }))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-right-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "y Label"
-    }, /*#__PURE__*/React__namespace.createElement("input", {
-      type: "text",
-      className: "graph-settings-axis-label",
-      ref: this.labelYRef,
-      onChange: e => this.changeLabel(1, e),
-      value: this.state.labelsTextbox[1] || ""
-    })))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-row"
-    }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-left-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "x Range"
-    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
-      value: this.state.rangeTextbox[0],
-      onChange: vals => this.changeRange(0, vals)
-    }))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-right-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "y Range"
-    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
-      value: this.state.rangeTextbox[1],
-      onChange: vals => this.changeRange(1, vals)
-    })))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-row"
-    }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-left-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Tick Step"
-    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
-      value: this.state.stepTextbox,
-      onChange: this.changeStep
-    }))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-right-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Grid Step"
-    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
-      value: this.state.gridStepTextbox,
-      onChange: this.changeGridStep
-    })))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-row"
-    }, /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-left-col"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Snap Step"
-    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
-      value: this.state.snapStepTextbox,
-      onChange: this.changeSnapStep
-    })))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-row"
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Markings:"
-    }, /*#__PURE__*/React__namespace.createElement(ButtonGroup$2, {
-      value: this.props.markings,
-      allowEmpty: false,
-      buttons: [{
-        value: "graph",
-        content: "Graph"
-      }, {
-        value: "grid",
-        content: "Grid"
-      }, {
-        value: "none",
-        content: "None"
-      }],
-      onChange: this.change("markings")
-    }))), /*#__PURE__*/React__namespace.createElement("div", {
-      className: "perseus-widget-left-col"
-    }, /*#__PURE__*/React__namespace.createElement(PropCheckBox$7, {
-      label: "Show tooltips",
-      showTooltips: this.props.showTooltips,
-      onChange: this.change
-    }))), /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Background image URL:",
-      style: styles$s.resetSpaceTop
-    }, /*#__PURE__*/React__namespace.createElement("input", {
-      type: "text",
-      className: aphrodite.css(styles$s.backgroundUrlInput),
-      ref: this.bgUrlRef,
-      value: this.state.backgroundImage.url || "",
-      onChange: e => {
-        // Shallow-copied clone
-        const image = {
-          ...this.props.backgroundImage
-        };
-        image.url = e.target.value;
-        this.setState({
-          backgroundImage: image
-        });
-      },
-      onKeyPress: this.changeBackgroundUrl,
-      onBlur: this.changeBackgroundUrl
-    }), /*#__PURE__*/React__namespace.createElement(InfoTip$e, 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$s.rulerSection
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$s.checkboxRow
-    }, /*#__PURE__*/React__namespace.createElement(PropCheckBox$7, {
-      label: "Show ruler",
-      showRuler: this.props.showRuler,
-      onChange: this.change,
-      style: styles$s.resetSpaceTop
-    }), /*#__PURE__*/React__namespace.createElement(PropCheckBox$7, {
-      label: "Show protractor",
-      showProtractor: this.props.showProtractor,
-      onChange: this.change,
-      style: styles$s.resetSpaceTop
-    })), (this.props.showRuler || this.props.showProtractor) && /*#__PURE__*/React__namespace.createElement(Banner__default["default"], {
-      layout: "floating",
-      text: "The ruler and protractor are not accessible. Please consider an alternate approach.",
-      kind: "warning"
-    }), this.props.showRuler && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$s.spaceTop
-    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Ruler label:",
-      style: styles$s.resetSpaceTop
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-      id: "ruler-label-select",
-      selectedValue: this.props.rulerLabel,
-      onChange: newValue => {
-        this.change({
-          rulerLabel: newValue
-        });
-      },
-      placeholder: "None",
-      style: styles$s.singleSelectShort
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "",
-      label: "None",
-      horizontalRule: "full-width"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "mm",
-      label: "Milimeters"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "cm",
-      label: "Centimeters"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "m",
-      label: "Meters"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "km",
-      label: "Kilometers",
-      horizontalRule: "full-width"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "in",
-      label: "Inches"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "ft",
-      label: "Feet"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "yd",
-      label: "Yards"
-    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      value: "mi",
-      label: "Miles"
-    }))), /*#__PURE__*/React__namespace.createElement(LabeledRow, {
-      label: "Ruler ticks:"
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-      id: "ruler-ticks-select",
-      selectedValue: `${this.props.rulerTicks}`,
-      onChange: newValue => {
-        this.change({
-          rulerTicks: newValue
-        });
-      },
-      placeholder: "10",
-      style: styles$s.singleSelectShort
-    }, [1, 2, 4, 8, 10, 16].map(value => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-      key: value,
-      value: `${value}`,
-      label: `${value}`
-    }))))))));
+    // Update the graph.
+    onChange(degreeToRadian(newValue));
+  }
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: styles$v.row
+  }, "angle (degrees)", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
+    type: "number",
+    value: angleInput,
+    onChange: handleAngleChange,
+    style: styles$v.textField
+  }), /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }));
+};
+const styles$v = aphrodite.StyleSheet.create({
+  row: {
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center"
+  },
+  textField: {
+    width: wonderBlocksTokens.spacing.xxxLarge_64
+  }
+});
+
+const ColorSwatch = props => {
+  const {
+    color,
+    filled = true,
+    decorative = false
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    "aria-label":
+    // Don't include an aria label for decorative circles.
+    !decorative ? `${color}, ${filled ? "filled" : "open"}` : undefined,
+    style: [styles$u.colorSwatch, {
+      border: `4px solid ${perseus.lockedFigureColors[color]}`,
+      backgroundColor: filled ? perseus.lockedFigureColors[color] : wonderBlocksTokens.color.white
+    }]
+  });
+};
+const styles$u = 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.
+    outline: `2px solid ${wonderBlocksTokens.color.offWhite}`,
+    borderRadius: "50%",
+    width: wonderBlocksTokens.spacing.large_24,
+    height: wonderBlocksTokens.spacing.large_24
+  }
+});
+
+const possibleColors = Object.keys(perseus.lockedFigureColors);
+const ColorSelect = props => {
+  const {
+    selectedValue,
+    style,
+    onChange
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$t.row, style]
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: styles$t.row
+  }, "color", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+    selectedValue: selectedValue,
+    onChange: onChange
+    // Placeholder is required, but never gets used.
+    ,
+    placeholder: ""
+  }, possibleColors.map(colorName => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    key: colorName,
+    value: colorName,
+    label: colorName,
+    leftAccessory: /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
+      color: colorName,
+      decorative: true
+    })
+  }, colorName)))));
+};
+const styles$t = aphrodite.StyleSheet.create({
+  row: {
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center"
+  }
+});
+
+const CoordinatePairInput = props => {
+  const {
+    coord,
+    labels,
+    error,
+    style,
+    onChange
+  } = props;
+
+  // Keep track of the coordinates via state as the user is editing them,
+  // before they are updated in the props as a valid number.
+  const [coordState, setCoordState] = React__namespace.useState([
+  // Using strings to make it easier to work with the text fields.
+  coord[0].toString(), coord[1].toString()]);
+  function handleCoordChange(newValue, coordIndex) {
+    // Update the local state (update the input field value).
+    const newCoordState = [...coordState];
+    newCoordState[coordIndex] = newValue;
+    setCoordState(newCoordState);
+
+    // If the new value is not a number, don't update the props.
+    // If it's empty, keep the props the same value instead of setting to 0.
+    if (isNaN(+newValue) || newValue === "") {
+      return;
+    }
+
+    // Update the props (update the graph).
+    const newCoords = [...coord];
+    newCoords[coordIndex] = +newValue;
+    onChange(newCoords);
   }
-}
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$s.row, style]
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: styles$s.row
+  }, labels ? labels[0] : "x coord", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
+    type: "number",
+    value: coordState[0],
+    onChange: newValue => handleCoordChange(newValue, 0),
+    style: [styles$s.textField, error ? styles$s.errorField : undefined]
+  })), /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.medium_16
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: styles$s.row
+  }, labels ? labels[1] : "y coord", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
+    type: "number",
+    value: coordState[1],
+    onChange: newValue => handleCoordChange(newValue, 1),
+    style: [styles$s.textField, error ? styles$s.errorField : undefined]
+  })));
+};
 const styles$s = aphrodite.StyleSheet.create({
-  resetSpaceTop: {
-    marginTop: 0
+  row: {
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center"
   },
-  spaceTop: {
-    marginTop: wonderBlocksTokens.spacing.xSmall_8
+  textField: {
+    width: wonderBlocksTokens.spacing.xxxLarge_64
   },
-  singleSelectShort: {
-    // Non-standard spacing, but it's the smallest we can go
-    // without running into styling issues with the dropdown.
-    height: 26
+  errorField: {
+    borderColor: wonderBlocksTokens.color.red,
+    backgroundColor: wonderBlocksTokens.color.fadedRed8
+  }
+});
+
+const EllipseSwatch = props => {
+  const {
+    color,
+    fillStyle,
+    strokeStyle
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    "aria-label": `${color}, stroke ${strokeStyle}, fill ${fillStyle}`,
+    style: [styles$r.container, {
+      border: `4px ${strokeStyle} ${perseus.lockedFigureColors[color]}`
+    }]
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$r.innerCircle, {
+      backgroundColor: perseus.lockedFigureColors[color],
+      opacity: perseus.lockedFigureFillStyles[fillStyle]
+    }]
+  }));
+};
+const styles$r = 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.
+    outline: `2px solid ${wonderBlocksTokens.color.offWhite}`,
+    borderRadius: "50%",
+    width: wonderBlocksTokens.spacing.xLarge_32,
+    height: wonderBlocksTokens.spacing.large_24,
+    backgroundColor: wonderBlocksTokens.color.white,
+    alignItems: "center",
+    justifyContent: "center"
   },
-  backgroundUrlInput: {
-    border: `1px solid ${wonderBlocksTokens.color.offBlack32}`,
-    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4,
-    padding: wonderBlocksTokens.spacing.xxxSmall_4
+  innerCircle: {
+    width: 28,
+    height: 20,
+    borderRadius: "50%"
+  }
+});
+
+const LockedFigureSettingsAccordion = props => {
+  const {
+    children,
+    header,
+    expanded,
+    containerStyle,
+    panelStyle,
+    onToggle
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View
+  // More specificity so that we can override the default
+  // .heading > h2 > .header styles from the articles.less
+  // file (which is imported in perseus-renderer.less).
+  , {
+    className: "locked-figure-accordion"
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksAccordion.AccordionSection, {
+    expanded: expanded,
+    onToggle: onToggle,
+    style: [styles$q.container, containerStyle],
+    headerStyle: styles$q.accordionHeader,
+    header: header
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$q.accordionPanel, panelStyle]
+  }, children)));
+};
+const styles$q = aphrodite.StyleSheet.create({
+  container: {
+    backgroundColor: wonderBlocksTokens.color.fadedBlue8,
+    marginTop: wonderBlocksTokens.spacing.xSmall_8
   },
-  checkboxRow: {
-    flexDirection: "row",
-    alignItems: "center",
-    justifyContent: "space-between",
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
+  accordionHeader: {
+    padding: wonderBlocksTokens.spacing.small_12,
+    // Don't move the dropdown caret.
+    paddingInlineEnd: 0,
+    // Fixed height so the addition of the color swatch doesn't
+    // change the height of the header when toggling.
+    height: wonderBlocksTokens.spacing.xxLarge_48
   },
-  rulerSection: {
-    marginTop: wonderBlocksTokens.spacing.xSmall_8,
-    borderTop: `1px solid ${wonderBlocksTokens.color.offBlack16}`,
-    paddingTop: wonderBlocksTokens.spacing.xSmall_8,
-    paddingBottom: wonderBlocksTokens.spacing.xSmall_8,
-    borderBottom: `1px solid ${wonderBlocksTokens.color.offBlack16}`
+  accordionPanel: {
+    paddingTop: wonderBlocksTokens.spacing.xxSmall_6,
+    paddingBottom: wonderBlocksTokens.spacing.xxxSmall_4,
+    paddingLeft: wonderBlocksTokens.spacing.small_12,
+    paddingRight: wonderBlocksTokens.spacing.small_12
   }
 });
 
-const mediaDefaultSpecLargeMarginWidth = wonderBlocksTokens.spacing.large_24;
-const MEDIA_DEFAULT_SPEC = {
-  small: {
-    query: "(max-width: 767px)",
-    totalColumns: 4,
-    gutterWidth: wonderBlocksTokens.spacing.medium_16,
-    marginWidth: wonderBlocksTokens.spacing.medium_16
+/**
+ * The part of a locked figure settings panel that contains actions
+ * for this panel and its associated locked figure, including
+ * the delete button.
+ */
+const LockedFigureSettingsActions = props => {
+  const {
+    figureType,
+    onMove,
+    onRemove
+  } = props;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$p.container
+  }, /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    startIcon: trashIcon__default["default"],
+    "aria-label": `Delete locked ${figureType}`,
+    onClick: onRemove,
+    kind: "tertiary",
+    style: styles$p.deleteButton
+  }, "Delete"), /*#__PURE__*/React__namespace.createElement(Spring, null), props.showM2Features && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, 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$p.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$p.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$p.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$p.iconButton
+  })));
+};
+const styles$p = aphrodite.StyleSheet.create({
+  container: {
+    width: "100%",
+    flexDirection: "row",
+    alignItems: "center",
+    marginTop: wonderBlocksTokens.spacing.xxxSmall_4
   },
-  medium: {
-    query: "(min-width: 768px) and (max-width: 1023px)",
-    totalColumns: 8,
-    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
-    marginWidth: wonderBlocksTokens.spacing.large_24
+  deleteButton: {
+    // Line up the delete icon with the rest of the content.
+    marginInlineStart: -wonderBlocksTokens.spacing.xxxSmall_4
   },
-  large: {
-    query: "(min-width: 1024px)",
-    totalColumns: 12,
-    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
-    marginWidth: mediaDefaultSpecLargeMarginWidth,
-    maxWidth: 1120 + mediaDefaultSpecLargeMarginWidth * 2
+  iconButton: {
+    // Reset the margin because the icon buttons
+    // overlap each other otherwise.
+    margin: 0
+  }
+});
+
+const {
+  InfoTip: InfoTip$d
+} = perseus.components;
+const LockedEllipseSettings = props => {
+  const {
+    center,
+    radius,
+    angle,
+    color,
+    fillStyle,
+    strokeStyle,
+    expanded,
+    onToggle,
+    onChangeProps,
+    onMove,
+    onRemove
+  } = props;
+  function handleColorChange(newValue) {
+    onChangeProps({
+      color: newValue
+    });
   }
+  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    expanded: expanded,
+    onToggle: onToggle,
+    header:
+    /*#__PURE__*/
+    // Summary: Ellipse, center, radius, color (opacity, dashed)
+    React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$o.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$o.row
+  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: center,
+    style: styles$o.spaceUnder,
+    onChange: newCoords => onChangeProps({
+      center: newCoords
+    })
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$o.spaceUnder
+  }, /*#__PURE__*/React__namespace.createElement(InfoTip$d, null, "The coordinates for the center of the ellipse."))), /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: radius,
+    labels: ["x radius", "y radius"],
+    style: styles$o.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$o.row, styles$o.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$o.row
+  }, "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
+  }, option))))), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: styles$o.row
+  }, "stroke", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxSmall_6
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+    selectedValue: strokeStyle,
+    onChange: value => onChangeProps({
+      strokeStyle: value
+    })
+    // Placeholder is required, but never gets used.
+    ,
+    placeholder: ""
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "solid",
+    label: "solid"
+  }, "solid"), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "dashed",
+    label: "dashed"
+  }, "dashed"))), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    showM2Features: props.showM2Features,
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
 };
-({
-  large: {
-    query: "(min-width: 1px)",
-    totalColumns: 12,
-    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
-    marginWidth: wonderBlocksTokens.spacing.medium_16
-  }
-});
-({
-  small: {
-    query: "(max-width: 767px)",
-    totalColumns: 4,
-    gutterWidth: wonderBlocksTokens.spacing.medium_16,
-    marginWidth: wonderBlocksTokens.spacing.medium_16
+const styles$o = aphrodite.StyleSheet.create({
+  row: {
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center"
   },
-  large: {
-    query: "(min-width: 768px)",
-    totalColumns: 12,
-    gutterWidth: wonderBlocksTokens.spacing.xLarge_32,
-    marginWidth: wonderBlocksTokens.spacing.xxLarge_48
+  spaceUnder: {
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
   }
 });
 
-const defaultContext = {
-  ssrSize: "large",
-  mediaSpec: MEDIA_DEFAULT_SPEC
+const LabeledSwitch = props => {
+  const {
+    checked,
+    label,
+    style,
+    onChange
+  } = props;
+  const ids = wonderBlocksCore.useUniqueIdWithMock();
+  const switchId = ids.get("switch");
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$n.row, style]
+  }, /*#__PURE__*/React__namespace.createElement(Switch__default["default"], {
+    id: switchId,
+    checked: checked,
+    onChange: onChange
+  }), /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xSmall_8
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    htmlFor: switchId
+  }, label));
 };
-const MediaLayoutContext = React__namespace.createContext(defaultContext);
-MediaLayoutContext.displayName = "MediaLayoutContext";
-aphrodite.StyleSheet.create({
-  grow: {
-    flexGrow: 1
+const styles$n = aphrodite.StyleSheet.create({
+  row: {
+    flexDirection: "row",
+    alignItems: "center"
   }
 });
 
-class Strut extends React__namespace.Component {
-  render() {
-    const {
-      size,
-      style
-    } = this.props;
-    return React__namespace.createElement(wonderBlocksCore.View, {
-      "aria-hidden": "true",
-      style: [strutStyle(size), style]
-    });
-  }
-}
-const strutStyle = size => {
-  return {
-    width: size,
-    MsFlexBasis: size,
-    MsFlexPreferredSize: size,
-    WebkitFlexBasis: size,
-    flexBasis: size,
-    flexShrink: 0
-  };
-};
-
 /**
- * Dropdown for selecting a locked figure to add to an interactive graph.
- * Locked figures are elements (points, segmeents, etc.) that are not
- * interactive, just present in the graph's background.
+ * 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 LockedFigureSelect = props => {
+const DefiningPointSettings = props => {
   const {
-    id,
-    onChange
+    coord,
+    color: pointColor,
+    filled = true,
+    label,
+    showPoint = "false",
+    error,
+    onChangeProps,
+    onTogglePoint,
+    expanded,
+    onToggle
   } = props;
-  const figureTypes = props.showM2Features ? ["point", "line", "ellipse", "vector"] : ["point", "line"];
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$r.container
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.ActionMenu, {
-    menuText: "Add locked figure",
-    style: styles$r.addElementSelect
-  }, figureTypes.map(figureType => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.ActionItem, {
-    key: `${id}-${figureType}`,
-    label: figureType,
-    onClick: () => onChange(figureType)
-  }, figureType))));
-};
-const styles$r = aphrodite.StyleSheet.create({
-  container: {
-    marginTop: wonderBlocksTokens.spacing.xSmall_8
-  },
-  addElementSelect: {
-    backgroundColor: wonderBlocksTokens.color.fadedBlue8,
-    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4
+  function handleColorChange(newValue) {
+    onChangeProps({
+      color: newValue
+    });
   }
-});
-
-const {
-  InfoTip: InfoTip$d
-} = perseus.components;
-const degreeToRadian = degrees => {
-  return degrees / 180 * Math.PI;
-};
-const AngleInput = props => {
-  const {
-    angle,
-    onChange
-  } = props;
-  const [angleInput, setAngleInput] = React__namespace.useState(angle.toString());
-  const [isInDegrees, setIsInDegrees] = React__namespace.useState(false);
-  function handleAngleChange(newValue) {
-    let useDegrees = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isInDegrees;
-    // Update the local state (update the input field value).
-    setAngleInput(newValue);
-    try {
-      // If the new value is a valid expression, update the props.
-      // Save the angle in radians.
-      const evaluatedAngle = KAS__namespace.parse(newValue).expr.eval();
-      if (useDegrees) {
-        onChange(degreeToRadian(evaluatedAngle));
-      } else {
-        onChange(evaluatedAngle);
-      }
-    } catch (e) {
-      // The user likely has not finished typing the expression.
-      // Do nothing.
-      return;
+  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    expanded: expanded,
+    onToggle: onToggle,
+    containerStyle: styles$m.container,
+    panelStyle: styles$m.accordionPanel,
+    header:
+    /*#__PURE__*/
+    // Summary: Point, coords, color (filled/open)
+    React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$m.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `${label || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React__namespace.createElement(Strut, {
+      size: wonderBlocksTokens.spacing.xSmall_8
+    }), showPoint && /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
+      color: pointColor,
+      filled: filled
+    }))
+  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: coord,
+    error: !!error,
+    style: styles$m.spaceUnder,
+    onChange: newCoords => {
+      onChangeProps({
+        coord: newCoords
+      });
     }
-  }
-  function handleAngleTypeChange() {
-    // Change the angle based on the new angle type.
-    handleAngleChange(angleInput, !isInDegrees);
-
-    // Update the angle to the new type.
-    setIsInDegrees(usingDegrees => !usingDegrees);
-  }
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$q.row, styles$q.spaceUnder]
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: styles$q.row
-  }, "angle", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxSmall_6
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
-    value: angleInput,
-    onChange: handleAngleChange,
-    style: styles$q.textField
-  })), /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxSmall_6
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, null, "radians"), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$q.switch
-  }, /*#__PURE__*/React__namespace.createElement(Switch__default["default"], {
-    onChange: handleAngleTypeChange,
-    checked: isInDegrees
-  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, null, "degrees"), /*#__PURE__*/React__namespace.createElement(InfoTip$d, null, /*#__PURE__*/React__namespace.createElement("p", null, "The angle of rotation for the ellipse (if the x radius and y radius are different)."), /*#__PURE__*/React__namespace.createElement("p", null, "Expressions will be evaluted (e.g. \"pi/2\" or \"5pi/4\").")));
+  }), onTogglePoint && /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
+    label: "show point on graph",
+    checked: !!showPoint,
+    style: showPoint && styles$m.spaceUnder,
+    onChange: onTogglePoint
+  }), showPoint && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__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
+      });
+    }
+  })));
 };
-const styles$q = aphrodite.StyleSheet.create({
+const styles$m = aphrodite.StyleSheet.create({
+  container: {
+    marginTop: wonderBlocksTokens.spacing.xSmall_8,
+    marginBottom: 0,
+    marginLeft: -wonderBlocksTokens.spacing.xxxSmall_4,
+    marginRight: -wonderBlocksTokens.spacing.xxxSmall_4,
+    backgroundColor: wonderBlocksTokens.color.white
+  },
+  accordionPanel: {
+    // Need more space since we don't have the actions' margins.
+    paddingBottom: wonderBlocksTokens.spacing.medium_16
+  },
   row: {
-    display: "flex",
     flexDirection: "row",
     alignItems: "center"
   },
-  switch: {
-    marginLeft: wonderBlocksTokens.spacing.xxSmall_6,
-    marginRight: wonderBlocksTokens.spacing.xxSmall_6
-  },
-  textField: {
-    maxWidth: wonderBlocksTokens.spacing.xxxLarge_64
+  spaceUnder: {
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
   }
 });
 
-const ColorSwatch = props => {
+const LineSwatch = props => {
   const {
     color,
-    filled = true,
-    decorative = false
+    lineStyle
   } = props;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    "aria-label":
-    // Don't include an aria label for decorative circles.
-    !decorative ? `${color}, ${filled ? "filled" : "open"}` : undefined,
-    style: [styles$p.colorSwatch, {
-      border: `4px solid ${perseus.lockedFigureColors[color]}`,
-      backgroundColor: filled ? perseus.lockedFigureColors[color] : wonderBlocksTokens.color.white
+    style: styles$l.container
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    "aria-label": `${color}, ${lineStyle}`,
+    style: [styles$l.lineSwatch, {
+      border: `5px ${lineStyle} ${perseus.lockedFigureColors[color]}`
     }]
-  });
+  }));
 };
-const styles$p = 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.
-    outline: `2px solid ${wonderBlocksTokens.color.offWhite}`,
-    borderRadius: "50%",
-    width: wonderBlocksTokens.spacing.large_24,
-    height: wonderBlocksTokens.spacing.large_24
+const styles$l = aphrodite.StyleSheet.create({
+  container: {
+    backgroundColor: wonderBlocksTokens.color.white,
+    justifyContent: "center",
+    padding: wonderBlocksTokens.spacing.xSmall_8,
+    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4
+  },
+  lineSwatch: {
+    width: 40
   }
 });
 
-const possibleColors = Object.keys(perseus.lockedFigureColors);
-const ColorSelect = props => {
+const lengthZeroStr = "The line cannot have length 0.";
+const LockedLineSettings = props => {
   const {
-    selectedValue,
-    style,
-    onChange
+    kind,
+    points,
+    color: lineColor,
+    lineStyle = "solid",
+    showPoint1,
+    showPoint2,
+    onChangeProps,
+    onMove,
+    onRemove
   } = props;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$o.row, style]
+  const [point1, point2] = points;
+  const capitalizeKind = kind.charAt(0).toUpperCase() + kind.slice(1);
+  const lineLabel = `${capitalizeKind} (${point1.coord[0]},
+        ${point1.coord[1]}), (${point2.coord[0]}, ${point2.coord[1]})`;
+
+  // Check if the line has length 0.
+  const isInvalid = kmath.vector.equal(point1.coord, point2.coord);
+  function handleChangePoint(newPointProps, index) {
+    const newPoints = [...points];
+    newPoints[index] = {
+      ...points[index],
+      ...newPointProps
+    };
+    onChangeProps({
+      points: newPoints
+    });
+  }
+  function handleColorChange(newColor) {
+    onChangeProps({
+      color: newColor,
+      // Keep the line's points' colors in sync with the line color.
+      points: [{
+        ...point1,
+        color: newColor
+      }, {
+        ...point2,
+        color: newColor
+      }]
+    });
+  }
+  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    expanded: props.expanded,
+    onToggle: props.onToggle,
+    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$k.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, lineLabel), /*#__PURE__*/React__namespace.createElement(Strut, {
+      size: wonderBlocksTokens.spacing.xSmall_8
+    }), /*#__PURE__*/React__namespace.createElement(LineSwatch, {
+      color: lineColor,
+      lineStyle: lineStyle
+    }))
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$o.row
-  }, "color", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxSmall_6
+    style: [styles$k.row, styles$k.spaceUnder]
+  }, "kind", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxxSmall_4
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: selectedValue,
-    onChange: onChange
+    selectedValue: kind,
+    onChange: value => onChangeProps({
+      kind: value
+    })
     // Placeholder is required, but never gets used.
     ,
     placeholder: ""
-  }, possibleColors.map(colorName => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    key: colorName,
-    value: colorName,
-    label: colorName,
-    leftAccessory: /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
-      color: colorName,
-      decorative: true
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "line",
+    label: "line"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "ray",
+    label: "ray"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "segment",
+    label: "segment"
+  }))), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$k.row
+  }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
+    selectedValue: lineColor,
+    onChange: handleColorChange
+  }), /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.small_12
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    tag: "label",
+    style: styles$k.row
+  }, "style", /*#__PURE__*/React__namespace.createElement(Strut, {
+    size: wonderBlocksTokens.spacing.xxxSmall_4
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+    selectedValue: lineStyle,
+    onChange: value => onChangeProps({
+      lineStyle: value
     })
-  }, colorName)))));
+    // Placeholder is required, but never gets used.
+    ,
+    placeholder: "",
+    style: styles$k.selectMarginOffset
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "solid",
+    label: "solid"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "dashed",
+    label: "dashed"
+  })))), isInvalid && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    style: styles$k.errorText
+  }, lengthZeroStr), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
+    label: "Point 1",
+    showPoint: showPoint1,
+    error: isInvalid ? lengthZeroStr : null
+  }, point1, {
+    onTogglePoint: newValue => onChangeProps({
+      showPoint1: newValue
+    }),
+    onChangeProps: newProps => handleChangePoint(newProps, 0)
+  })), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
+    label: "Point 2",
+    showPoint: showPoint2,
+    error: isInvalid ? lengthZeroStr : null
+  }, point2, {
+    onTogglePoint: newValue => onChangeProps({
+      showPoint2: newValue
+    }),
+    onChangeProps: newProps => handleChangePoint(newProps, 1)
+  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    showM2Features: props.showM2Features,
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
 };
-const styles$o = aphrodite.StyleSheet.create({
+const styles$k = aphrodite.StyleSheet.create({
   row: {
     display: "flex",
     flexDirection: "row",
     alignItems: "center"
+  },
+  spaceUnder: {
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
+  },
+  selectMarginOffset: {
+    // Align with the point settings accordions.
+    marginInlineEnd: -wonderBlocksTokens.spacing.xxxSmall_4
+  },
+  errorText: {
+    color: wonderBlocksTokens.color.red
   }
 });
 
-const CoordinatePairInput = props => {
+/**
+ * LockedPointSettings is a component that allows the user to edit the
+ * settings of specifically a locked point on the graph.
+ *
+ * Used in the interactive graph editor's locked figures section.
+ */
+const LockedPointSettings = props => {
   const {
     coord,
-    labels,
-    error,
-    onChange
+    color: pointColor,
+    filled = true,
+    onChangeProps,
+    onMove,
+    onRemove
   } = props;
-
-  // Keep track of the coordinates via state as the user is editing them,
-  // before they are updated in the props as a valid number.
-  const [coordState, setCoordState] = React__namespace.useState([
-  // Using strings to make it easier to work with the text fields.
-  coord[0].toString(), coord[1].toString()]);
-  function handleCoordChange(newValue, coordIndex) {
-    // Update the local state (update the input field value).
-    const newCoordState = [...coordState];
-    newCoordState[coordIndex] = newValue;
-    setCoordState(newCoordState);
-
-    // If the new value is not a number, don't update the props.
-    // If it's empty, keep the props the same value instead of setting to 0.
-    if (isNaN(+newValue) || newValue === "") {
-      return;
-    }
-
-    // Update the props (update the graph).
-    const newCoords = [...coord];
-    newCoords[coordIndex] = +newValue;
-    onChange(newCoords);
+  function handleColorChange(newValue) {
+    onChangeProps({
+      color: newValue
+    });
   }
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$n.row, styles$n.spaceUnder]
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: styles$n.row
-  }, labels ? labels[0] : "x coord", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxSmall_6
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
-    type: "number",
-    value: coordState[0],
-    onChange: newValue => handleCoordChange(newValue, 0),
-    style: [styles$n.textField, error ? styles$n.errorField : undefined]
-  })), /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.medium_16
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: styles$n.row
-  }, labels ? labels[1] : "y coord", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxSmall_6
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksForm.TextField, {
-    type: "number",
-    value: coordState[1],
-    onChange: newValue => handleCoordChange(newValue, 1),
-    style: [styles$n.textField, error ? styles$n.errorField : undefined]
-  }))));
+  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    expanded: props.expanded,
+    onToggle: props.onToggle,
+    header:
+    /*#__PURE__*/
+    // Summary: Point, coords, color (filled/open)
+    React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$j.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$j.spaceUnder,
+    onChange: newCoord => {
+      onChangeProps({
+        coord: newCoord
+      });
+    }
+  }), /*#__PURE__*/React__namespace.createElement(ColorSelect, {
+    selectedValue: pointColor,
+    onChange: handleColorChange,
+    style: styles$j.spaceUnder
+  }), /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
+    label: "open point",
+    checked: !filled,
+    onChange: newValue => {
+      onChangeProps({
+        filled: !newValue
+      });
+    }
+  }), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    showM2Features: props.showM2Features,
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
 };
-const styles$n = aphrodite.StyleSheet.create({
+const styles$j = aphrodite.StyleSheet.create({
   row: {
-    display: "flex",
     flexDirection: "row",
     alignItems: "center"
   },
   spaceUnder: {
     marginBottom: wonderBlocksTokens.spacing.xSmall_8
-  },
-  textField: {
-    width: wonderBlocksTokens.spacing.xxxLarge_64
-  },
-  errorField: {
-    borderColor: wonderBlocksTokens.color.red,
-    backgroundColor: wonderBlocksTokens.color.fadedRed8
   }
 });
 
-const EllipseSwatch = props => {
+const PolygonSwatch = props => {
   const {
     color,
     fillStyle,
@@ -30565,128 +30630,44 @@ const EllipseSwatch = props => {
   } = props;
   return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     "aria-label": `${color}, stroke ${strokeStyle}, fill ${fillStyle}`,
-    style: [styles$m.container, {
+    style: [styles$i.container, {
       border: `4px ${strokeStyle} ${perseus.lockedFigureColors[color]}`
     }]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$m.innerCircle, {
+    style: [styles$i.innerSquare, {
       backgroundColor: perseus.lockedFigureColors[color],
-      opacity: perseus.lockedEllipseFillStyles[fillStyle]
+      opacity: perseus.lockedFigureFillStyles[fillStyle]
     }]
   }));
 };
-const styles$m = aphrodite.StyleSheet.create({
+const styles$i = 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.
     outline: `2px solid ${wonderBlocksTokens.color.offWhite}`,
-    borderRadius: "50%",
-    width: wonderBlocksTokens.spacing.xLarge_32,
+    width: wonderBlocksTokens.spacing.large_24,
     height: wonderBlocksTokens.spacing.large_24,
     backgroundColor: wonderBlocksTokens.color.white,
     alignItems: "center",
     justifyContent: "center"
   },
-  innerCircle: {
-    width: 28,
-    height: 20,
-    borderRadius: "50%"
-  }
-});
-
-const LockedFigureSettingsAccordion = props => {
-  const {
-    children,
-    header,
-    expanded,
-    containerStyle,
-    panelStyle,
-    onToggle
-  } = props;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View
-  // More specificity so that we can override the default
-  // .heading > h2 > .header styles from the articles.less
-  // file (which is imported in perseus-renderer.less).
-  , {
-    className: "locked-figure-accordion"
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksAccordion.AccordionSection, {
-    expanded: expanded,
-    onToggle: onToggle,
-    style: [styles$l.container, containerStyle],
-    headerStyle: styles$l.accordionHeader,
-    header: header
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$l.accordionPanel, panelStyle]
-  }, children)));
-};
-const styles$l = aphrodite.StyleSheet.create({
-  container: {
-    backgroundColor: wonderBlocksTokens.color.fadedBlue8,
-    marginTop: wonderBlocksTokens.spacing.xSmall_8
-  },
-  accordionHeader: {
-    padding: wonderBlocksTokens.spacing.small_12,
-    // Don't move the dropdown caret.
-    paddingInlineEnd: 0,
-    // Fixed height so the addition of the color swatch doesn't
-    // change the height of the header when toggling.
-    height: wonderBlocksTokens.spacing.xxLarge_48
-  },
-  accordionPanel: {
-    paddingTop: wonderBlocksTokens.spacing.xxSmall_6,
-    paddingBottom: wonderBlocksTokens.spacing.xxxSmall_4,
-    paddingLeft: wonderBlocksTokens.spacing.small_12,
-    paddingRight: wonderBlocksTokens.spacing.small_12
-  }
-});
-
-/**
- * The part of a locked figure settings panel that contains actions
- * for this panel and its associated locked figure, including
- * the delete button.
- */
-const LockedFigureSettingsActions = props => {
-  const {
-    onRemove,
-    figureAriaLabel
-  } = props;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$k.container
-  }, /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
-    startIcon: trashIcon__default["default"],
-    "aria-label": `Delete ${figureAriaLabel}`,
-    onClick: onRemove,
-    kind: "tertiary",
-    style: styles$k.deleteButton
-  }, "Delete"));
-};
-const styles$k = aphrodite.StyleSheet.create({
-  container: {
-    width: "100%",
-    flexDirection: "row",
-    alignItems: "center",
-    marginTop: wonderBlocksTokens.spacing.xxxSmall_4
-  },
-  deleteButton: {
-    // Line up the delete icon with the rest of the content.
-    marginInlineStart: -wonderBlocksTokens.spacing.xxxSmall_4
+  innerSquare: {
+    width: 20,
+    height: 20
   }
 });
 
-const {
-  InfoTip: InfoTip$c
-} = perseus.components;
-const LockedEllipseSettings = props => {
+const LockedPolygonSettings = props => {
   const {
-    center,
-    radius,
-    angle,
+    points,
     color,
+    showVertices,
     fillStyle,
     strokeStyle,
     expanded,
     onToggle,
     onChangeProps,
+    onMove,
     onRemove
   } = props;
   function handleColorChange(newValue) {
@@ -30699,40 +30680,18 @@ const LockedEllipseSettings = props => {
     onToggle: onToggle,
     header:
     /*#__PURE__*/
-    // Summary: Ellipse, center, radius, color (opacity, dashed)
+    // Summary: Polygon, number of sides, style swatch
     React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$j.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Ellipse (${center[0]}, ${center[1]}), radius ${radius[0]}, ${radius[1]}`), /*#__PURE__*/React__namespace.createElement(Strut, {
+      style: styles$h.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Polygon, ${points.length} sides`), /*#__PURE__*/React__namespace.createElement(Strut, {
       size: wonderBlocksTokens.spacing.xSmall_8
-    }), /*#__PURE__*/React__namespace.createElement(EllipseSwatch, {
-      color: props.color,
+    }), /*#__PURE__*/React__namespace.createElement(PolygonSwatch, {
+      color: color,
       fillStyle: fillStyle,
       strokeStyle: strokeStyle
     }))
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$j.row
-  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: center,
-    onChange: newCoords => onChangeProps({
-      center: newCoords
-    })
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$j.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"],
-    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$j.row, styles$j.spaceUnder]
+    style: [styles$h.row, styles$h.spaceUnder]
   }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
     selectedValue: color,
     onChange: handleColorChange
@@ -30740,7 +30699,7 @@ const LockedEllipseSettings = props => {
     size: wonderBlocksTokens.spacing.medium_16
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$j.row
+    style: styles$h.row
   }, "fill", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
@@ -30751,13 +30710,13 @@ const LockedEllipseSettings = props => {
     // Placeholder is required, but never gets used.
     ,
     placeholder: ""
-  }, Object.keys(perseus.lockedEllipseFillStyles).map(option => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+  }, Object.keys(perseus.lockedFigureFillStyles).map(option => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     key: option,
     value: option,
     label: option
   }, option))))), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     tag: "label",
-    style: styles$j.row
+    style: [styles$h.row, styles$h.spaceUnder]
   }, "stroke", /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.xxSmall_6
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
@@ -30774,683 +30733,1020 @@ const LockedEllipseSettings = props => {
   }, "solid"), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     value: "dashed",
     label: "dashed"
-  }, "dashed"))), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    onRemove: onRemove,
-    figureAriaLabel: `locked ellipse at ${center[0]}, ${center[1]}`
-  }));
-};
-const styles$j = aphrodite.StyleSheet.create({
-  row: {
-    display: "flex",
-    flexDirection: "row",
-    alignItems: "center"
-  },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
-  }
-});
-
-const LabeledSwitch = props => {
-  const {
-    checked,
-    label,
-    style,
-    onChange
-  } = props;
-  const ids = wonderBlocksCore.useUniqueIdWithMock();
-  const switchId = ids.get("switch");
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$i.row, style]
-  }, /*#__PURE__*/React__namespace.createElement(Switch__default["default"], {
-    id: switchId,
-    checked: checked,
-    onChange: onChange
-  }), /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xSmall_8
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    htmlFor: switchId
-  }, label));
-};
-const styles$i = 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 {
-    coord,
-    color: pointColor,
-    filled = true,
-    label,
-    showPoint = "false",
-    error,
-    onChangeProps,
-    onTogglePoint
-  } = props;
-  function handleColorChange(newValue) {
-    onChangeProps({
-      color: newValue
-    });
-  }
-  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
-    expanded: props.expanded,
-    onToggle: props.onToggle,
-    containerStyle: styles$h.container,
-    panelStyle: styles$h.accordionPanel,
-    header:
-    /*#__PURE__*/
-    // Summary: Point, coords, color (filled/open)
-    React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$h.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `${label || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React__namespace.createElement(Strut, {
-      size: wonderBlocksTokens.spacing.xSmall_8
-    }), showPoint && /*#__PURE__*/React__namespace.createElement(ColorSwatch, {
-      color: pointColor,
-      filled: filled
-    }))
-  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: coord,
-    error: !!error,
-    onChange: newCoords => {
-      onChangeProps({
-        coord: newCoords
-      });
-    }
-  }), onTogglePoint && /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
-    label: "show point on graph",
-    checked: !!showPoint,
-    style: showPoint && styles$h.spaceUnder,
-    onChange: onTogglePoint
-  }), showPoint && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
-    selectedValue: pointColor,
-    onChange: handleColorChange,
+  }, "dashed"))), /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
+    label: "show vertices",
+    checked: showVertices,
+    onChange: newValue => onChangeProps({
+      showVertices: newValue
+    }),
     style: styles$h.spaceUnder
-  }), /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
-    label: "open point",
-    checked: !filled,
-    onChange: newValue => {
-      onChangeProps({
-        filled: !newValue
-      });
-    }
-  })));
-};
-const styles$h = aphrodite.StyleSheet.create({
-  container: {
-    marginTop: wonderBlocksTokens.spacing.xSmall_8,
-    marginBottom: 0,
-    marginLeft: -wonderBlocksTokens.spacing.xxxSmall_4,
-    marginRight: -wonderBlocksTokens.spacing.xxxSmall_4,
-    backgroundColor: wonderBlocksTokens.color.white
-  },
-  accordionPanel: {
-    // Need more space since we don't have the actions' margins.
-    paddingBottom: wonderBlocksTokens.spacing.medium_16
-  },
-  row: {
-    flexDirection: "row",
-    alignItems: "center"
-  },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
-  }
-});
-
-const LineSwatch = props => {
-  const {
-    color,
-    lineStyle
-  } = props;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$g.container
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    "aria-label": `${color}, ${lineStyle}`,
-    style: [styles$g.lineSwatch, {
-      border: `5px ${lineStyle} ${perseus.lockedFigureColors[color]}`
-    }]
+  }), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, "Points"),
+    expanded: true,
+    containerStyle: styles$h.pointAccordionContainer,
+    panelStyle: styles$h.pointAccordionPanel
+  }, points.map((point, index) => {
+    const pointLabel = String.fromCharCode(65 + index);
+    return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      key: `locked-polygon-point-${point[0]}-${point[1]}-index-${index}`,
+      style: [styles$h.row, styles$h.spaceUnder]
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `${pointLabel}:`), /*#__PURE__*/React__namespace.createElement(Strut, {
+      size: wonderBlocksTokens.spacing.medium_16
+    }), /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+      coord: point,
+      labels: ["x", "y"],
+      onChange: newValue => {
+        const newPoints = [...points];
+        newPoints[index] = newValue;
+        props.onChangeProps({
+          points: newPoints
+        });
+      }
+    }),
+    // Only show the minus (delete) buttons if there are
+    // more than 3 points. 3 points is the minimum number
+    // of points for a polygon (triangle).
+    points.length > 3 && /*#__PURE__*/React__namespace.createElement(IconButton__default["default"], {
+      "aria-label": `Delete polygon point ${pointLabel}`,
+      icon: minusCircle__default["default"],
+      color: "destructive",
+      onClick: () => {
+        const newPoints = [...points];
+        newPoints.splice(index, 1);
+        props.onChangeProps({
+          points: newPoints
+        });
+      },
+      style: styles$h.icon
+    }));
+  }), /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "tertiary",
+    startIcon: plusCircle__default["default"],
+    onClick: () => {
+      props.onChangeProps({
+        points: [...points, [0, 0]]
+      });
+    }
+  }, "Add point")), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    showM2Features: props.showM2Features,
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
   }));
 };
-const styles$g = aphrodite.StyleSheet.create({
-  container: {
-    backgroundColor: wonderBlocksTokens.color.white,
-    justifyContent: "center",
-    padding: wonderBlocksTokens.spacing.xSmall_8,
-    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4
+const styles$h = aphrodite.StyleSheet.create({
+  row: {
+    display: "flex",
+    flexDirection: "row",
+    alignItems: "center"
   },
-  lineSwatch: {
-    width: 40
+  pointAccordionContainer: {
+    backgroundColor: wonderBlocksTokens.color.white
+  },
+  pointAccordionPanel: {
+    alignItems: "start"
+  },
+  icon: {
+    marginInlineStart: wonderBlocksTokens.spacing.xxxSmall_4
+  },
+  spaceUnder: {
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
   }
 });
 
-const lengthZeroStr = "The line cannot have length 0.";
-const LockedLineSettings = props => {
+/**
+ * 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 {
-    kind,
     points,
     color: lineColor,
-    lineStyle = "solid",
-    showPoint1,
-    showPoint2,
     onChangeProps,
+    onMove,
     onRemove
   } = props;
-  const [point1, point2] = points;
-  const capitalizeKind = kind.charAt(0).toUpperCase() + kind.slice(1);
-  const lineLabel = `${capitalizeKind} (${point1.coord[0]},
-        ${point1.coord[1]}), (${point2.coord[0]}, ${point2.coord[1]})`;
+  const [tail, tip] = points;
+  const lineLabel = `Vector (${tail[0]}, ${tail[1]}), (${tip[0]}, ${tip[1]})`;
 
   // Check if the line has length 0.
-  const isInvalid = kmath.vector.equal(point1.coord, point2.coord);
-  function handleChangePoint(newPointProps, index) {
-    const newPoints = [...points];
-    newPoints[index] = {
-      ...points[index],
-      ...newPointProps
-    };
-    onChangeProps({
-      points: newPoints
-    });
+  const isInvalid = kmath.vector.equal(tail, tip);
+  function handleChangePoint(newCoord, index) {
+    if (typeof newCoord !== "undefined") {
+      const newPoints = [...points];
+      newPoints[index] = [...newCoord];
+      onChangeProps({
+        points: newPoints
+      });
+    }
   }
   function handleColorChange(newColor) {
     onChangeProps({
-      color: newColor,
-      // Keep the line's points' colors in sync with the line color.
-      points: [{
-        ...point1,
-        color: newColor
-      }, {
-        ...point2,
-        color: newColor
-      }]
+      color: newColor
     });
   }
   return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
     expanded: props.expanded,
     onToggle: props.onToggle,
     header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$f.row
+      style: styles$g.row
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, lineLabel), /*#__PURE__*/React__namespace.createElement(Strut, {
       size: wonderBlocksTokens.spacing.xSmall_8
     }), /*#__PURE__*/React__namespace.createElement(LineSwatch, {
       color: lineColor,
-      lineStyle: lineStyle
+      lineStyle: "solid"
     }))
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: [styles$f.row, styles$f.spaceUnder]
-  }, "kind", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxxSmall_4
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: kind,
-    onChange: value => onChangeProps({
-      kind: value
-    })
-    // Placeholder is required, but never gets used.
-    ,
-    placeholder: ""
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "line",
-    label: "line"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "ray",
-    label: "ray"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "segment",
-    label: "segment"
-  }))), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$f.row
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: [styles$g.row, styles$g.spaceUnder]
   }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
     selectedValue: lineColor,
     onChange: handleColorChange
+  })), isInvalid && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    style: styles$g.errorText
+  }, lengthErrorMessage), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    expanded: true // Initial state is expanded
+    ,
+    containerStyle: styles$g.container,
+    panelStyle: styles$g.accordionPanel,
+    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$g.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Tail (${tail[0]}, ${tail[1]})`))
+  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: tail,
+    error: isInvalid,
+    onChange: newProps => {
+      handleChangePoint(newProps, 0);
+    }
+  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
+    expanded: true // Initial state is expanded
+    ,
+    containerStyle: styles$g.container,
+    panelStyle: styles$g.accordionPanel,
+    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$g.row
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Tip (${tip[0]}, ${tip[1]})`))
+  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
+    coord: tip,
+    error: isInvalid,
+    onChange: newProps => {
+      handleChangePoint(newProps, 1);
+    }
+  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
+    showM2Features: props.showM2Features,
+    figureType: props.type,
+    onMove: onMove,
+    onRemove: onRemove
+  }));
+};
+const styles$g = aphrodite.StyleSheet.create({
+  accordionPanel: {
+    paddingBottom: wonderBlocksTokens.spacing.medium_16
+  },
+  container: {
+    marginTop: wonderBlocksTokens.spacing.xSmall_8,
+    marginBottom: 0,
+    marginLeft: -wonderBlocksTokens.spacing.xxxSmall_4,
+    marginRight: -wonderBlocksTokens.spacing.xxxSmall_4,
+    backgroundColor: wonderBlocksTokens.color.white
+  },
+  errorText: {
+    color: wonderBlocksTokens.color.red,
+    marginTop: wonderBlocksTokens.spacing.xSmall_8
+  },
+  row: {
+    flexDirection: "row",
+    alignItems: "center"
+  }
+});
+
+/**
+ * LockedFigureSettings takes in a figure and renders the
+ * respective settings for that figure type.
+ *
+ * Used in the interactive graph editor's locked figures section.
+ */
+
+// Union this type with other locked figure types when they are added.
+
+const LockedFigureSettings = props => {
+  switch (props.type) {
+    case "point":
+      return /*#__PURE__*/React__namespace.createElement(LockedPointSettings, props);
+    case "line":
+      return /*#__PURE__*/React__namespace.createElement(LockedLineSettings, props);
+    case "vector":
+      if (props.showM2Features) {
+        return /*#__PURE__*/React__namespace.createElement(LockedVectorSettings, props);
+      }
+      break;
+    case "ellipse":
+      if (props.showM2Features) {
+        return /*#__PURE__*/React__namespace.createElement(LockedEllipseSettings, props);
+      }
+      break;
+    case "polygon":
+      if (props.showM2Features) {
+        return /*#__PURE__*/React__namespace.createElement(LockedPolygonSettings, props);
+      }
+  }
+  return null;
+};
+
+const LockedFiguresSection = props => {
+  // Keep track of all figures' accordions' expanded states for the
+  // expand/collapse all button. Set the whole array to false initially.
+  const collapsedStateArray = Array((props.figures ?? []).length).fill(false);
+  const [expandedStates, setExpandedStates] = React__namespace.useState(collapsedStateArray);
+  const uniqueId = wonderBlocksCore.useUniqueIdWithMock().get("locked-figures-section");
+  const {
+    figures,
+    onChange
+  } = props;
+  function addLockedFigure(newFigure) {
+    const lockedFigures = figures || [];
+    const newProps = {
+      lockedFigures: [...lockedFigures, getDefaultFigureForType(newFigure)]
+    };
+    onChange(newProps);
+    setExpandedStates([...expandedStates, true]);
+  }
+  function moveLockedFigure(index, movement) {
+    // Don't allow moving the first figure up or the last figure down.
+    if (index === 0 && (movement === "back" || movement === "backward")) {
+      return;
+    }
+    if (figures && index === figures.length - 1 && (movement === "front" || movement === "forward")) {
+      return;
+    }
+    const lockedFigures = figures || [];
+    const newFigures = [...lockedFigures];
+    const newExpandedStates = [...expandedStates];
+
+    // First, remove the figure from its current position
+    // in the figures array and the expanded states array.
+    const [removedFigure] = newFigures.splice(index, 1);
+    newExpandedStates.splice(index, 1);
+
+    // Then, add it back in the new position. Add "true" to the
+    // expanded states array for the new position (it must already
+    // be open since the button to move it is being pressed from there).
+    switch (movement) {
+      case "back":
+        newFigures.unshift(removedFigure);
+        newExpandedStates.unshift(true);
+        break;
+      case "backward":
+        newFigures.splice(index - 1, 0, removedFigure);
+        newExpandedStates.splice(index - 1, 0, true);
+        break;
+      case "forward":
+        newFigures.splice(index + 1, 0, removedFigure);
+        newExpandedStates.splice(index + 1, 0, true);
+        break;
+      case "front":
+        newFigures.push(removedFigure);
+        newExpandedStates.push(true);
+        break;
+    }
+    onChange({
+      lockedFigures: newFigures
+    });
+    setExpandedStates(newExpandedStates);
+  }
+  function removeLockedFigure(index) {
+    // eslint-disable-next-line no-alert
+    if (window.confirm("Are you sure you want to delete this figure?")) {
+      const lockedFigures = figures || [];
+      onChange({
+        lockedFigures: [...lockedFigures.slice(0, index), ...lockedFigures.slice(index + 1)]
+      });
+
+      // Update expanded states
+      const newExpandedStates = [...expandedStates];
+      newExpandedStates.splice(index, 1);
+      setExpandedStates(newExpandedStates);
+    }
+  }
+  function changeProps(index,
+  // Omit the type from the figure props so it doesn't think
+  // we're trying to pass in the props for the wrong type.
+  figureProps) {
+    const lockedFigures = figures || [];
+    const newFigures = {
+      lockedFigures: [...lockedFigures.slice(0, index), {
+        ...lockedFigures[index],
+        ...figureProps
+      }, ...lockedFigures.slice(index + 1)]
+    };
+    onChange(newFigures);
+  }
+  function toggleExpanded(newValue) {
+    setExpandedStates(Array(figures?.length).fill(newValue));
+  }
+  const allCollapsed = expandedStates.every(value => !value);
+  const buttonLabel = allCollapsed ? "Expand all" : "Collapse all";
+  const showExpandButton = !!figures?.length;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, figures?.map((figure, index) => {
+    return /*#__PURE__*/React__namespace.createElement(LockedFigureSettings, _extends({
+      key: `${uniqueId}-locked-${figure}-${index}`,
+      showM2Features: props.showM2Features,
+      showM2bFeatures: props.showM2bFeatures,
+      expanded: expandedStates[index],
+      onToggle: newValue => {
+        const newExpanded = [...expandedStates];
+        newExpanded[index] = newValue;
+        setExpandedStates(newExpanded);
+      }
+    }, figure, {
+      onChangeProps: newProps => changeProps(index, newProps),
+      onMove: movement => moveLockedFigure(index, movement),
+      onRemove: () => removeLockedFigure(index)
+    }));
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: styles$f.buttonContainer
+  }, /*#__PURE__*/React__namespace.createElement(LockedFigureSelect, {
+    showM2Features: props.showM2Features,
+    showM2bFeatures: props.showM2bFeatures,
+    id: `${uniqueId}-select`,
+    onChange: addLockedFigure
   }), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.small_12
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    tag: "label",
-    style: styles$f.row
-  }, "style", /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.xxxSmall_4
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
-    selectedValue: lineStyle,
-    onChange: value => onChangeProps({
-      lineStyle: value
-    })
-    // Placeholder is required, but never gets used.
-    ,
-    placeholder: "",
-    style: styles$f.selectMarginOffset
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "solid",
-    label: "solid"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "dashed",
-    label: "dashed"
-  })))), isInvalid && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    style: styles$f.errorText
-  }, lengthZeroStr), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
-    label: "Point 1",
-    showPoint: showPoint1,
-    error: isInvalid ? lengthZeroStr : null
-  }, point1, {
-    onTogglePoint: newValue => onChangeProps({
-      showPoint1: newValue
-    }),
-    onChangeProps: newProps => handleChangePoint(newProps, 0)
-  })), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
-    label: "Point 2",
-    showPoint: showPoint2,
-    error: isInvalid ? lengthZeroStr : null
-  }, point2, {
-    onTogglePoint: newValue => onChangeProps({
-      showPoint2: newValue
-    }),
-    onChangeProps: newProps => handleChangePoint(newProps, 1)
-  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    onRemove: onRemove,
-    figureAriaLabel: `locked line defined by
-                    ${point1.coord[0]}, ${point1.coord[1]} and
-                    ${point2.coord[0]}, ${point2.coord[1]}.`
-  }));
+  }), showExpandButton && /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
+    kind: "secondary",
+    onClick: () => toggleExpanded(allCollapsed),
+    style: styles$f.button
+  }, buttonLabel)));
 };
 const styles$f = aphrodite.StyleSheet.create({
-  row: {
+  buttonContainer: {
     flexDirection: "row",
     alignItems: "center"
   },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
-  },
-  selectMarginOffset: {
-    // Align with the point settings accordions.
-    marginInlineEnd: -wonderBlocksTokens.spacing.xxxSmall_4
-  },
-  errorText: {
-    color: wonderBlocksTokens.color.red
+  button: {
+    marginTop: wonderBlocksTokens.spacing.xSmall_8,
+    flexGrow: 1
   }
 });
 
-/**
- * LockedPointSettings is a component that allows the user to edit the
- * settings of specifically a locked point on the graph.
- *
- * Used in the interactive graph editor's locked figures section.
- */
-const LockedPointSettings = props => {
-  const {
-    coord,
-    color: pointColor,
-    filled = true,
-    onChangeProps,
-    onRemove
-  } = props;
-  function handleColorChange(newValue) {
-    onChangeProps({
-      color: newValue
-    });
+const UNLIMITED = "unlimited";
+// Parses a string (ostensibly from some UI element that only supports string
+// types, such as a <select />) into a numeric point count or the special sigil
+// "unlimited". Note that 0 is a special case, and means "unlimited".
+const parsePointCount = points => {
+  const parsed = parseInt(points, 10);
+  if (isNaN(parsed)) {
+    return UNLIMITED;
   }
-  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
-    expanded: props.expanded,
-    onToggle: props.onToggle,
-    header:
-    /*#__PURE__*/
-    // Summary: Point, coords, color (filled/open)
-    React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$e.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,
-    onChange: newCoord => {
-      onChangeProps({
-        coord: newCoord
-      });
-    }
-  }), /*#__PURE__*/React__namespace.createElement(ColorSelect, {
-    selectedValue: pointColor,
-    onChange: handleColorChange,
-    style: styles$e.spaceUnder
-  }), /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
-    label: "open point",
-    checked: !filled,
+  return parsed === 0 ? UNLIMITED : parsed;
+};
+
+const GraphPointsCountSelector = _ref => {
+  let {
+    numPoints = 1,
+    onChange
+  } = _ref;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+    selectedValue: `${numPoints}`,
     onChange: newValue => {
-      onChangeProps({
-        filled: !newValue
-      });
+      onChange(parsePointCount(newValue));
+    }
+    // Never uses placeholder, always has value
+    ,
+    placeholder: "",
+    style: styles$e.singleSelectShort
+  }, [...[...Array(7).keys()].map(n => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    key: n,
+    value: `${n}`,
+    label: `${n} point${n > 1 ? "s" : ""}`
+  })), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    key: "unlimited",
+    value: UNLIMITED,
+    label: "unlimited"
+  })]);
+};
+const styles$e = aphrodite.StyleSheet.create({
+  singleSelectShort: {
+    // Non-standard spacing, but it's the smallest we can go
+    // without running into styling issues with the dropdown.
+    height: 26
+  }
+});
+
+const GraphTypeSelector = props => {
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+    selectedValue: props.graphType,
+    onChange: props.onChange,
+    placeholder: "Select a graph type",
+    style: styles$d.singleSelectShort
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "linear",
+    label: "Linear function"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "quadratic",
+    label: "Quadratic function"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "sinusoid",
+    label: "Sinusoid function"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "circle",
+    label: "Circle"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "point",
+    label: "Point(s)"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "linear-system",
+    label: "Linear System"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "polygon",
+    label: "Polygon"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "segment",
+    label: "Line Segment(s)"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "ray",
+    label: "Ray"
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+    value: "angle",
+    label: "Angle"
+  }));
+};
+const styles$d = aphrodite.StyleSheet.create({
+  singleSelectShort: {
+    // Non-standard spacing, but it's the smallest we can go
+    // without running into styling issues with the dropdown.
+    height: 26
+  }
+});
+
+/* eslint-disable react/forbid-prop-types, react/no-unsafe */
+const {
+  ButtonGroup: ButtonGroup$2,
+  InfoTip: InfoTip$c,
+  PropCheckBox: PropCheckBox$7,
+  RangeInput: RangeInput$4
+} = perseus.components;
+const defaultBackgroundImage$1 = {
+  url: null,
+  width: 0,
+  height: 0
+};
+function numSteps(range, step) {
+  return Math.floor((range[1] - range[0]) / step);
+}
+function Heading(_ref) {
+  let {
+    title,
+    isOpen,
+    onToggle
+  } = _ref;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: {
+      flexDirection: "row",
+      justifyContent: "space-between",
+      backgroundColor: wonderBlocksTokens.color.offBlack8,
+      padding: wonderBlocksTokens.spacing.xSmall_8,
+      marginTop: wonderBlocksTokens.spacing.small_12,
+      // NOTE(jeremy): This is the inverse of the @editorPadding CSS
+      // variable found in perseus-editor.less. For now, it must
+      // match otherwise there's a gap from this header to the edge
+      // of the editor borders.
+      marginInline: -10,
+      cursor: "pointer"
+    },
+    onClick: () => onToggle?.(!isOpen)
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelSmall, null, title), /*#__PURE__*/React__namespace.createElement(ToggleableCaret, {
+    isExpanded: isOpen
+  }));
+}
+class InteractiveGraphSettings extends React__namespace.Component {
+  _isMounted = false;
+  bgUrlRef = /*#__PURE__*/React__namespace.createRef();
+  labelXRef = /*#__PURE__*/React__namespace.createRef();
+  labelYRef = /*#__PURE__*/React__namespace.createRef();
+  static stateFromProps(props) {
+    return {
+      labelsTextbox: props.labels,
+      gridStepTextbox: props.gridStep,
+      snapStepTextbox: props.snapStep,
+      stepTextbox: props.step,
+      rangeTextbox: props.range,
+      // Shallow-copied clone
+      backgroundImage: {
+        ...props.backgroundImage
+      }
+    };
+  }
+  constructor(props) {
+    super(props);
+    this.state = {
+      isExpanded: true,
+      ...InteractiveGraphSettings.stateFromProps(props)
+    };
+  }
+  static defaultProps = {
+    box: [perseus.interactiveSizes.defaultBoxSizeSmall, perseus.interactiveSizes.defaultBoxSizeSmall],
+    labels: ["x", "y"],
+    range: [[-10, 10], [-10, 10]],
+    step: [1, 1],
+    gridStep: [1, 1],
+    snapStep: [1, 1],
+    valid: true,
+    backgroundImage: defaultBackgroundImage$1,
+    markings: "graph",
+    showProtractor: false,
+    showRuler: false,
+    showTooltips: false,
+    rulerLabel: "",
+    rulerTicks: 10
+  };
+  componentDidMount() {
+    // TODO(scottgrant): This is a hack to remove the deprecated call to
+    // this.isMounted() but is still considered an anti-pattern.
+    this._isMounted = true;
+    this.changeGraph = ___default["default"].debounce(this.changeGraph, 300);
+  }
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    // Make sure that state updates when switching
+    // between different items in a multi-item editor.
+    if (!___default["default"].isEqual(this.props.labels, nextProps.labels) || !___default["default"].isEqual(this.props.gridStep, nextProps.gridStep) || !___default["default"].isEqual(this.props.snapStep, nextProps.snapStep) || !___default["default"].isEqual(this.props.step, nextProps.step) || !___default["default"].isEqual(this.props.range, nextProps.range) || !___default["default"].isEqual(this.props.backgroundImage, nextProps.backgroundImage)) {
+      this.setState(InteractiveGraphSettings.stateFromProps(nextProps));
     }
-  }), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    onRemove: onRemove,
-    figureAriaLabel: `locked point at ${coord[0]}, ${coord[1]}`
-  }));
-};
-const styles$e = aphrodite.StyleSheet.create({
-  row: {
-    flexDirection: "row",
-    alignItems: "center"
-  },
-  spaceUnder: {
-    marginBottom: wonderBlocksTokens.spacing.xSmall_8
   }
-});
-
-/**
- * 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 {
-    points,
-    color: lineColor,
-    onChangeProps,
-    onRemove
-  } = props;
-  const [tail, tip] = points;
-  const lineLabel = `Vector (${tail[0]}, ${tail[1]}), (${tip[0]}, ${tip[1]})`;
+  componentWillUnmount() {
+    this._isMounted = false;
+  }
+  change = (() => {
+    var _this = this;
+    return function () {
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      return perseus.Changeable.change.apply(_this, args);
+    };
+  })();
 
-  // Check if the line has length 0.
-  const isInvalid = kmath.vector.equal(tail, tip);
-  function handleChangePoint(newCoord, index) {
-    if (typeof newCoord !== "undefined") {
-      const newPoints = [...points];
-      newPoints[index] = [...newCoord];
-      onChangeProps({
-        points: newPoints
+  // TODO(aria): Make either a wrapper for standard events to work
+  // with this.change, or make these use some TextInput/NumberInput box
+  changeRulerLabel = e => {
+    this.change({
+      rulerLabel: e.target.value
+    });
+  };
+  changeRulerTicks = e => {
+    this.change({
+      rulerTicks: +e.target.value
+    });
+  };
+  changeBackgroundUrl = e => {
+    // Only continue on blur or "enter"
+    if (e.type === "keypress" && e.key !== "Enter") {
+      return;
+    }
+    const setUrl = (url, width, height) => {
+      // Shallow-copied clone
+      const image = {
+        ...this.props.backgroundImage
+      };
+      image.url = url;
+      image.width = width;
+      image.height = height;
+      this.setState({
+        backgroundImage: image
+      }, this.changeGraph);
+    };
+    const url = this.bgUrlRef.current?.value;
+    if (url) {
+      perseus.Util.getImageSize(url, (width, height) => {
+        if (this._isMounted) {
+          setUrl(url, width, height);
+        }
       });
+    } else {
+      setUrl(null, 0, 0);
     }
-  }
-  function handleColorChange(newColor) {
-    onChangeProps({
-      color: newColor
+  };
+  renderLabelChoices = choices => {
+    return choices.map(nameAndValue => /*#__PURE__*/React__namespace.createElement("option", {
+      key: nameAndValue[1],
+      value: nameAndValue[1]
+    }, nameAndValue[0]));
+  };
+  validRange = range => {
+    const numbers = ___default["default"].every(range, function (num) {
+      return ___default["default"].isFinite(num);
     });
-  }
-  return /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
-    expanded: props.expanded,
-    onToggle: props.onToggle,
-    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$d.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, lineLabel), /*#__PURE__*/React__namespace.createElement(Strut, {
-      size: wonderBlocksTokens.spacing.xSmall_8
-    }), /*#__PURE__*/React__namespace.createElement(LineSwatch, {
-      color: lineColor,
-      lineStyle: "solid"
-    }))
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: [styles$d.row, styles$d.spaceUnder]
-  }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
-    selectedValue: lineColor,
-    onChange: handleColorChange
-  })), isInvalid && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
-    style: styles$d.errorText
-  }, lengthErrorMessage), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
-    expanded: true // Initial state is expanded
-    ,
-    containerStyle: styles$d.container,
-    panelStyle: styles$d.accordionPanel,
-    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$d.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Tail (${tail[0]}, ${tail[1]})`))
-  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: tail,
-    error: isInvalid,
-    onChange: newProps => {
-      handleChangePoint(newProps, 0);
+    if (!numbers) {
+      return "Range must be a valid number";
     }
-  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsAccordion, {
-    expanded: true // Initial state is expanded
-    ,
-    containerStyle: styles$d.container,
-    panelStyle: styles$d.accordionPanel,
-    header: /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-      style: styles$d.row
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelLarge, null, `Tip (${tip[0]}, ${tip[1]})`))
-  }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
-    coord: tip,
-    error: isInvalid,
-    onChange: newProps => {
-      handleChangePoint(newProps, 1);
+    if (range[0] >= range[1]) {
+      return "Range must have a higher number on the right";
+    }
+    return true;
+  };
+  validateStepValue = settings => {
+    const {
+      step,
+      range,
+      name,
+      minTicks,
+      maxTicks
+    } = settings;
+    const nSteps = numSteps(range, step);
+    if (nSteps < minTicks) {
+      return name + " is too large, there must be at least " + minTicks + " ticks.";
+    }
+    if (nSteps > maxTicks) {
+      return name + " is too small, there can be at most " + maxTicks + " ticks.";
+    }
+    return true;
+  };
+  validSnapStep = (step, range) => {
+    return this.validateStepValue({
+      step: step,
+      range: range,
+      name: "Snap step",
+      minTicks: 5,
+      maxTicks: 60
+    });
+  };
+  validGridStep = (step, range) => {
+    return this.validateStepValue({
+      step: step,
+      range: range,
+      name: "Grid step",
+      minTicks: 3,
+      maxTicks: 60
+    });
+  };
+  validStep = (step, range) => {
+    return this.validateStepValue({
+      step: step,
+      range: range,
+      name: "Step",
+      minTicks: 3,
+      maxTicks: 20
+    });
+  };
+  validBackgroundImageSize = image => {
+    // Ignore empty images
+    if (!image.url) {
+      return true;
+    }
+    const validSize = image.width <= 450 && image.height <= 450;
+    if (!validSize) {
+      return "Image must be smaller than 450px x 450px.";
+    }
+    return true;
+  };
+  validateGraphSettings = (range, step, gridStep, snapStep, image) => {
+    const self = this;
+    let msg;
+    const goodRange = ___default["default"].every(range, function (range) {
+      msg = self.validRange(range);
+      return msg === true;
+    });
+    if (!goodRange) {
+      return msg;
+    }
+    const goodStep = ___default["default"].every(step, function (step, i) {
+      msg = self.validStep(step, range[i]);
+      return msg === true;
+    });
+    if (!goodStep) {
+      return msg;
+    }
+    const goodGridStep = ___default["default"].every(gridStep, function (gridStep, i) {
+      msg = self.validGridStep(gridStep, range[i]);
+      return msg === true;
+    });
+    if (!goodGridStep) {
+      return msg;
+    }
+    const goodSnapStep = ___default["default"].every(snapStep, function (snapStep, i) {
+      msg = self.validSnapStep(snapStep, range[i]);
+      return msg === true;
+    });
+    if (!goodSnapStep) {
+      return msg;
     }
-  })), /*#__PURE__*/React__namespace.createElement(LockedFigureSettingsActions, {
-    onRemove: onRemove,
-    figureAriaLabel: `locked vector defined by starting point
-                    ${tail[0]}, ${tail[1]} and extending to
-                    ${tip[0]}, ${tip[1]}.`
-  }));
-};
-const styles$d = aphrodite.StyleSheet.create({
-  accordionPanel: {
-    paddingBottom: wonderBlocksTokens.spacing.medium_16
-  },
-  container: {
-    marginTop: wonderBlocksTokens.spacing.xSmall_8,
-    marginBottom: 0,
-    marginLeft: -wonderBlocksTokens.spacing.xxxSmall_4,
-    marginRight: -wonderBlocksTokens.spacing.xxxSmall_4,
-    backgroundColor: wonderBlocksTokens.color.white
-  },
-  errorText: {
-    color: wonderBlocksTokens.color.red,
-    marginTop: wonderBlocksTokens.spacing.xSmall_8
-  },
-  row: {
-    flexDirection: "row",
-    alignItems: "center"
-  }
-});
-
-/**
- * LockedFigureSettings takes in a figure and renders the
- * respective settings for that figure type.
- *
- * Used in the interactive graph editor's locked figures section.
- */
-
-// Union this type with other locked figure types when they are added.
-
-const LockedFigureSettings = props => {
-  switch (props.type) {
-    case "point":
-      return /*#__PURE__*/React__namespace.createElement(LockedPointSettings, props);
-    case "line":
-      return /*#__PURE__*/React__namespace.createElement(LockedLineSettings, props);
-    case "ellipse":
-      if (props.showM2Features) {
-        return /*#__PURE__*/React__namespace.createElement(LockedEllipseSettings, props);
-      }
-      break;
-    case "vector":
-      if (props.showM2Features) {
-        return /*#__PURE__*/React__namespace.createElement(LockedVectorSettings, props);
+    const goodImageSize = this.validBackgroundImageSize(image);
+    if (goodImageSize !== true) {
+      msg = goodImageSize;
+      return msg;
+    }
+    return true;
+  };
+  changeLabel = (i, e) => {
+    const val = e.target.value;
+    const labels = this.state.labelsTextbox.slice();
+    labels[i] = val;
+    this.setState({
+      labelsTextbox: labels
+    }, this.changeGraph);
+  };
+  changeRange = (i, values) => {
+    const ranges = this.state.rangeTextbox.slice();
+    ranges[i] = values;
+    const step = this.state.stepTextbox.slice();
+    const gridStep = this.state.gridStepTextbox.slice();
+    const snapStep = this.state.snapStepTextbox.slice();
+    const scale = perseus.Util.scaleFromExtent(ranges[i], this.props.box[i]);
+    if (this.validRange(ranges[i]) === true) {
+      step[i] = perseus.Util.tickStepFromExtent(ranges[i], this.props.box[i]);
+      const gridStepValue = perseus.Util.gridStepFromTickStep(step[i], scale);
+      if (gridStepValue) {
+        gridStep[i] = gridStepValue;
       }
-      break;
-  }
-  return null;
-};
+      snapStep[i] = gridStep[i] / 2;
+    }
+    this.setState({
+      stepTextbox: step,
+      gridStepTextbox: gridStep,
+      snapStepTextbox: snapStep,
+      rangeTextbox: ranges
+    }, this.changeGraph);
+  };
+  changeStep = step => {
+    this.setState({
+      stepTextbox: step
+    }, this.changeGraph);
+  };
+  changeSnapStep = snapStep => {
+    this.setState({
+      snapStepTextbox: snapStep
+    }, this.changeGraph);
+  };
+  changeGridStep = gridStep => {
+    this.setState({
+      gridStepTextbox: gridStep,
+      snapStepTextbox: ___default["default"].map(gridStep, function (step) {
+        return step / 2;
+      })
+    }, this.changeGraph);
+  };
+  changeGraph = () => {
+    const labels = this.state.labelsTextbox;
+    const range = ___default["default"].map(this.state.rangeTextbox, function (range) {
+      return ___default["default"].map(range, Number);
+    });
+    const step = ___default["default"].map(this.state.stepTextbox, Number);
+    const gridStep = this.state.gridStepTextbox;
+    const snapStep = this.state.snapStepTextbox;
+    const image = this.state.backgroundImage;
 
-function focusWithChromeStickyFocusBugWorkaround(element) {
-  // NOTE(marksandstrom) Chrome sticky focus bug.
-  //
-  // There is a bug in Chrome related to sticky positioning and
-  // focus: When a child of an element with sticky positioning is
-  // focused with the focus() method, the scrollable area
-  // containing that element will scroll to the top (even though
-  // the element is already visble on the page). For a dropdown
-  // this means that the area will be scrolled to the top when
-  // the user interacts with the dropdown (since we actively
-  // manage dropdown header and option focus for keyboard users).
-  //
-  // To work around this bug the `preventScroll` focus option is
-  // used.
-  //
-  // Using `focusOptions` is an experimental browser feature
-  // "that should not be used in production code". However, since
-  // Chrome is the only browser we support that exhibits this
-  // buggy behavior and using `focusOptions` works around the
-  // bug, it is perfectly reasonable to use the feature in this
-  // case. We are not relying on the effect of the
-  // `preventScroll` option otherwise.
-  //
-  // focusOptions documentation:
-  //
-  // https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/focus
-  //
-  // Note that there could be cases where we want default focus() behavior.
-  // One that comes to mind is a dropdown with a long list of options that
-  // might be rendered off screen when opened. With this workaround the
-  // selected option would not be scrolled into view if the option is near
-  // the end of the list. We're not aware of any uses of the dropdown where
-  // this is an issue, however, so there isn't currently a way to out of the
-  // `preventScroll` behavior.
+    // validationResult is either:
+    //   true -> the settings are valid
+    //   a string -> the settings are invalid, and the explanation
+    //               is contained in the string
+    // TODO(aria): Refactor this to not be confusing
+    const validationResult = this.validateGraphSettings(range, step, gridStep, snapStep, image);
+    if (validationResult === true) {
+      // either true or a string
+      this.change({
+        valid: true,
+        labels: labels,
+        range: range,
+        step: step,
+        gridStep: gridStep,
+        snapStep: snapStep,
+        backgroundImage: image
+      });
+    } else {
+      this.change({
+        valid: validationResult // a string message, not false
+      });
+    }
+  };
 
-  // @ts-expect-error - TS2339 - Property 'focus' does not exist on type 'Element'.
-  element.focus({
-    preventScroll: true
-  });
-}
-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 "ellipse":
-      return {
-        type: "ellipse",
-        center: [0, 0],
-        radius: [1, 1],
-        angle: 0,
-        color: DEFAULT_COLOR,
-        fillStyle: "none",
-        strokeStyle: "solid"
-      };
-    case "vector":
-      return {
-        type: "vector",
-        points: [[0, 0], [2, 2]],
-        color: DEFAULT_COLOR
-      };
-    default:
-      throw new wonderStuffCore.UnreachableCaseError(type);
+  render() {
+    return /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(Heading, {
+      title: "Common Graph Settings",
+      isOpen: this.state.isExpanded,
+      onToggle: () => this.setState({
+        isExpanded: !this.state.isExpanded
+      })
+    }), this.state.isExpanded && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, /*#__PURE__*/React__namespace.createElement("div", {
+      className: "graph-settings"
+    }, /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-row"
+    }, /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-left-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "x Label"
+    }, /*#__PURE__*/React__namespace.createElement("input", {
+      type: "text",
+      className: "graph-settings-axis-label",
+      ref: this.labelXRef,
+      onChange: e => this.changeLabel(0, e),
+      value: this.state.labelsTextbox[0] || ""
+    }))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-right-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "y Label"
+    }, /*#__PURE__*/React__namespace.createElement("input", {
+      type: "text",
+      className: "graph-settings-axis-label",
+      ref: this.labelYRef,
+      onChange: e => this.changeLabel(1, e),
+      value: this.state.labelsTextbox[1] || ""
+    })))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-row"
+    }, /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-left-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "x Range"
+    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
+      value: this.state.rangeTextbox[0],
+      onChange: vals => this.changeRange(0, vals)
+    }))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-right-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "y Range"
+    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
+      value: this.state.rangeTextbox[1],
+      onChange: vals => this.changeRange(1, vals)
+    })))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-row"
+    }, /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-left-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Tick Step"
+    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
+      value: this.state.stepTextbox,
+      onChange: this.changeStep
+    }))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-right-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Grid Step"
+    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
+      value: this.state.gridStepTextbox,
+      onChange: this.changeGridStep
+    })))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-row"
+    }, /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-left-col"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Snap Step"
+    }, /*#__PURE__*/React__namespace.createElement(RangeInput$4, {
+      value: this.state.snapStepTextbox,
+      onChange: this.changeSnapStep
+    })))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-row"
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Markings:"
+    }, /*#__PURE__*/React__namespace.createElement(ButtonGroup$2, {
+      value: this.props.markings,
+      allowEmpty: false,
+      buttons: [{
+        value: "graph",
+        content: "Graph"
+      }, {
+        value: "grid",
+        content: "Grid"
+      }, {
+        value: "none",
+        content: "None"
+      }],
+      onChange: this.change("markings")
+    }))), /*#__PURE__*/React__namespace.createElement("div", {
+      className: "perseus-widget-left-col"
+    }, /*#__PURE__*/React__namespace.createElement(PropCheckBox$7, {
+      label: "Show tooltips",
+      showTooltips: this.props.showTooltips,
+      onChange: this.change
+    }))), /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Background image URL:",
+      style: styles$c.resetSpaceTop
+    }, /*#__PURE__*/React__namespace.createElement("input", {
+      type: "text",
+      className: aphrodite.css(styles$c.backgroundUrlInput),
+      ref: this.bgUrlRef,
+      value: this.state.backgroundImage.url || "",
+      onChange: e => {
+        // Shallow-copied clone
+        const image = {
+          ...this.props.backgroundImage
+        };
+        image.url = e.target.value;
+        this.setState({
+          backgroundImage: image
+        });
+      },
+      onKeyPress: this.changeBackgroundUrl,
+      onBlur: this.changeBackgroundUrl
+    }), /*#__PURE__*/React__namespace.createElement(InfoTip$c, 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$c.rulerSection
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$c.checkboxRow
+    }, /*#__PURE__*/React__namespace.createElement(PropCheckBox$7, {
+      label: "Show ruler",
+      showRuler: this.props.showRuler,
+      onChange: this.change,
+      style: styles$c.resetSpaceTop
+    }), /*#__PURE__*/React__namespace.createElement(PropCheckBox$7, {
+      label: "Show protractor",
+      showProtractor: this.props.showProtractor,
+      onChange: this.change,
+      style: styles$c.resetSpaceTop
+    })), (this.props.showRuler || this.props.showProtractor) && /*#__PURE__*/React__namespace.createElement(Banner__default["default"], {
+      layout: "floating",
+      text: "The ruler and protractor are not accessible. Please consider an alternate approach.",
+      kind: "warning"
+    }), this.props.showRuler && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+      style: styles$c.spaceTop
+    }, /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Ruler label:",
+      style: styles$c.resetSpaceTop
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+      id: "ruler-label-select",
+      selectedValue: this.props.rulerLabel,
+      onChange: newValue => {
+        this.change({
+          rulerLabel: newValue
+        });
+      },
+      placeholder: "None",
+      style: styles$c.singleSelectShort
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "",
+      label: "None",
+      horizontalRule: "full-width"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "mm",
+      label: "Milimeters"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "cm",
+      label: "Centimeters"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "m",
+      label: "Meters"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "km",
+      label: "Kilometers",
+      horizontalRule: "full-width"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "in",
+      label: "Inches"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "ft",
+      label: "Feet"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "yd",
+      label: "Yards"
+    }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      value: "mi",
+      label: "Miles"
+    }))), /*#__PURE__*/React__namespace.createElement(LabeledRow, {
+      label: "Ruler ticks:"
+    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.SingleSelect, {
+      id: "ruler-ticks-select",
+      selectedValue: `${this.props.rulerTicks}`,
+      onChange: newValue => {
+        this.change({
+          rulerTicks: newValue
+        });
+      },
+      placeholder: "10",
+      style: styles$c.singleSelectShort
+    }, [1, 2, 4, 8, 10, 16].map(value => /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
+      key: value,
+      value: `${value}`,
+      label: `${value}`
+    }))))))));
   }
 }
-
-const LockedFiguresSection = props => {
-  // Keep track of all figures' accordions' expanded states for the
-  // expand/collapse all button. Set the whole array to false initially.
-  const collapsedStateArray = Array((props.figures ?? []).length).fill(false);
-  const [expandedStates, setExpandedStates] = React__namespace.useState(collapsedStateArray);
-  const uniqueId = wonderBlocksCore.useUniqueIdWithMock().get("locked-figures-section");
-  const {
-    figures,
-    onChange
-  } = props;
-  function addLockedFigure(newFigure) {
-    const lockedFigures = figures || [];
-    const newProps = {
-      lockedFigures: [...lockedFigures, getDefaultFigureForType(newFigure)]
-    };
-    onChange(newProps);
-    setExpandedStates([...expandedStates, true]);
-  }
-  function removeLockedFigure(index) {
-    // eslint-disable-next-line no-alert
-    if (window.confirm("Are you sure you want to delete this figure?")) {
-      const lockedFigures = figures || [];
-      onChange({
-        lockedFigures: [...lockedFigures.slice(0, index), ...lockedFigures.slice(index + 1)]
-      });
-
-      // Update expanded states
-      const newExpandedStates = [...expandedStates];
-      newExpandedStates.splice(index, 1);
-      setExpandedStates(newExpandedStates);
-    }
-  }
-  function changeProps(index,
-  // Omit the type from the figure props so it doesn't think
-  // we're trying to pass in the props for the wrong type.
-  figureProps) {
-    const lockedFigures = figures || [];
-    const newFigures = {
-      lockedFigures: [...lockedFigures.slice(0, index), {
-        ...lockedFigures[index],
-        ...figureProps
-      }, ...lockedFigures.slice(index + 1)]
-    };
-    onChange(newFigures);
-  }
-  function toggleExpanded(newValue) {
-    setExpandedStates(Array(figures?.length).fill(newValue));
-  }
-  const allCollapsed = expandedStates.every(value => !value);
-  const buttonLabel = allCollapsed ? "Expand all" : "Collapse all";
-  const showExpandButton = !!figures?.length;
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, figures?.map((figure, index) => {
-    return /*#__PURE__*/React__namespace.createElement(LockedFigureSettings, _extends({
-      key: `${uniqueId}-locked-${figure}-${index}`,
-      showM2Features: props.showM2Features,
-      expanded: expandedStates[index],
-      onToggle: newValue => {
-        const newExpanded = [...expandedStates];
-        newExpanded[index] = newValue;
-        setExpandedStates(newExpanded);
-      }
-    }, figure, {
-      onChangeProps: newProps => changeProps(index, newProps),
-      onRemove: () => removeLockedFigure(index)
-    }));
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: styles$c.buttonContainer
-  }, /*#__PURE__*/React__namespace.createElement(LockedFigureSelect, {
-    showM2Features: props.showM2Features,
-    id: `${uniqueId}-select`,
-    onChange: addLockedFigure
-  }), /*#__PURE__*/React__namespace.createElement(Strut, {
-    size: wonderBlocksTokens.spacing.small_12
-  }), showExpandButton && /*#__PURE__*/React__namespace.createElement(Button__default["default"], {
-    kind: "secondary",
-    onClick: () => toggleExpanded(allCollapsed),
-    style: styles$c.button
-  }, buttonLabel)));
-};
 const styles$c = aphrodite.StyleSheet.create({
-  buttonContainer: {
+  resetSpaceTop: {
+    marginTop: 0
+  },
+  spaceTop: {
+    marginTop: wonderBlocksTokens.spacing.xSmall_8
+  },
+  singleSelectShort: {
+    // Non-standard spacing, but it's the smallest we can go
+    // without running into styling issues with the dropdown.
+    height: 26
+  },
+  backgroundUrlInput: {
+    border: `1px solid ${wonderBlocksTokens.color.offBlack32}`,
+    borderRadius: wonderBlocksTokens.spacing.xxxSmall_4,
+    padding: wonderBlocksTokens.spacing.xxxSmall_4
+  },
+  checkboxRow: {
     flexDirection: "row",
-    alignItems: "center"
+    alignItems: "center",
+    justifyContent: "space-between",
+    marginBottom: wonderBlocksTokens.spacing.xSmall_8
   },
-  button: {
+  rulerSection: {
     marginTop: wonderBlocksTokens.spacing.xSmall_8,
-    flexGrow: 1
+    borderTop: `1px solid ${wonderBlocksTokens.color.offBlack16}`,
+    paddingTop: wonderBlocksTokens.spacing.xSmall_8,
+    paddingBottom: wonderBlocksTokens.spacing.xSmall_8,
+    borderBottom: `1px solid ${wonderBlocksTokens.color.offBlack16}`
   }
 });
 
@@ -31538,6 +31834,15 @@ class InteractiveGraphEditor extends React__namespace.Component {
   UNSAFE_componentWillMount() {
     DeprecationMixin.UNSAFE_componentWillMount.call(this);
   }
+  static buildGraphKey(correct) {
+    const testGraphKey = [];
+    for (const key in correct) {
+      if (correct[key]) {
+        typeof correct[key] === "number" || typeof correct[key] === "string" || typeof correct[key] === "boolean" ? testGraphKey.push(correct[key]) : testGraphKey.push(0);
+      }
+    }
+    return testGraphKey.join(":");
+  }
   render() {
     let graph;
     let equationString;
@@ -31580,10 +31885,9 @@ class InteractiveGraphEditor extends React__namespace.Component {
           });
         }
       };
-
       // This is used to force a remount of the graph component
       // when there's a significant change
-      const graphKey = `${correct.type}:${correct.numSegments || 0}`;
+      const graphKey = InteractiveGraphEditor.buildGraphKey(correct);
       graph =
       /*#__PURE__*/
       // There are a bunch of props that renderer.jsx passes to widgets via
@@ -31796,6 +32100,7 @@ class InteractiveGraphEditor extends React__namespace.Component {
     // is using Mafs.
     this.props.graph && this.props.apiOptions?.flags?.mafs?.[this.props.graph.type] && /*#__PURE__*/React__namespace.createElement(LockedFiguresSection, {
       showM2Features: this.props.apiOptions?.flags?.mafs?.["interactive-graph-locked-features-m2"],
+      showM2bFeatures: this.props.apiOptions?.flags?.mafs?.["interactive-graph-locked-features-m2b"],
       figures: this.props.lockedFigures,
       onChange: this.props.onChange
     }));