@khanacademy/perseus-editor 6.1.0 → 6.2.0

package/dist/es/index.js

@@ -21,14 +21,14 @@ import { useMathInputI18n, createMathField } from '@khanacademy/math-input';
 import { SingleSelect, OptionItem, ActionMenu, ActionItem } from '@khanacademy/wonder-blocks-dropdown';
 import { TextField, Checkbox as Checkbox$1 } from '@khanacademy/wonder-blocks-form';
 import { LabelSmall, LabelMedium, LabelLarge, BodyMonospace } from '@khanacademy/wonder-blocks-typography';
+import Switch from '@khanacademy/wonder-blocks-switch';
 import { AccordionSection } from '@khanacademy/wonder-blocks-accordion';
 import Button from '@khanacademy/wonder-blocks-button';
 import trashIcon from '@phosphor-icons/core/bold/trash-bold.svg';
-import Switch from '@khanacademy/wonder-blocks-switch';
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "6.1.0";
+const libVersion = "6.2.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -218,7 +218,7 @@ class SectionControlButton extends React.Component {
       role: "button",
       hideDefaultFocusRing: true,
       "aria-label": title,
-      style: styles$t.button
+      style: styles$u.button
     }, ({
       hovered,
       focused,
@@ -226,7 +226,7 @@ class SectionControlButton extends React.Component {
     }) => /*#__PURE__*/React.createElement(InlineIcon$b, icon));
   }
 }
-const styles$t = StyleSheet.create({
+const styles$u = StyleSheet.create({
   button: {
     backgroundColor: color.gold,
     margin: 2,
@@ -20748,19 +20748,19 @@ class TexErrorView extends React.Component {
     const {
       showErrors
     } = this.state;
-    const iconStyle = showErrors ? styles$s.iconExpanded : styles$s.iconCollapsed;
+    const iconStyle = showErrors ? styles$t.iconExpanded : styles$t.iconCollapsed;
     return /*#__PURE__*/React.createElement(View, {
-      style: styles$s.errorContainer
+      style: styles$t.errorContainer
     }, /*#__PURE__*/React.createElement(View, {
-      style: styles$s.title,
+      style: styles$t.title,
       onClick: this.handleToggleTexErrors
     }, /*#__PURE__*/React.createElement(PhosphorIcon, {
       icon: caretRight,
       style: iconStyle
     }), "\xA0 TeX Errors (", errorList.length, ")"), showErrors && /*#__PURE__*/React.createElement(View, {
-      style: styles$s.errorExplanation
+      style: styles$t.errorExplanation
     }, "If your math doesn't display correctly, these errors might help you troubleshoot. Message #content-kitchen for help."), showErrors && errorList.map((e, index) => /*#__PURE__*/React.createElement(View, {
-      style: styles$s.error,
+      style: styles$t.error,
       key: index
     }, /*#__PURE__*/React.createElement(View, {
       style: {
@@ -20769,7 +20769,7 @@ class TexErrorView extends React.Component {
     }, e.math), /*#__PURE__*/React.createElement(View, null, e.message))));
   }
 }
-const styles$s = StyleSheet.create({
+const styles$t = StyleSheet.create({
   title: {
     backgroundColor: "#eee",
     fontSize: "1.25em",
@@ -24570,7 +24570,7 @@ class SimpleButton extends React.Component {
       } = _this$props,
       otherProps = _objectWithoutPropertiesLoose(_this$props, _excluded$3);
     return /*#__PURE__*/React.createElement("div", _extends({
-      className: css(styles$r.baseButton, color === "green" && styles$r.green, color === "orange" && styles$r.orange),
+      className: css(styles$s.baseButton, color === "green" && styles$s.green, color === "orange" && styles$s.orange),
       onClick: onClick
     }, otherProps), children);
   }
@@ -24585,7 +24585,7 @@ SimpleButton.defaultProps = {
   color: "green",
   onClick: () => {}
 };
-const styles$r = StyleSheet.create({
+const styles$s = StyleSheet.create({
   baseButton: {
     top: "0",
     fontSize: "11px",
@@ -24805,23 +24805,23 @@ const LeafContainer = ({
 }) => {
   const hasPreviewHeading = shape.type === "content" || shape.type === "hint";
   const previewHeading = hasPreviewHeading && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.containerHeader)
+    className: css(styles$r.containerHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$q.containerTitle)
+    className: css(styles$r.containerTitle)
   }, capitalize(name)));
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.container)
+    className: css(styles$r.container)
   }, /*#__PURE__*/React.createElement("span", {
-    className: css(styles$q.row, styles$q.rowHeading)
+    className: css(styles$r.row, styles$r.rowHeading)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft)
+    className: css(styles$r.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: "pod-title " + css(styles$q.containerHeader)
+    className: "pod-title " + css(styles$r.containerHeader)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.containerTitle)
+    className: css(styles$r.containerTitle)
   }, capitalize(name)), controls)), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnRight)
+    className: css(styles$r.columnRight)
   }, previewHeading)), children);
 };
 const ArrayContainer = props => {
@@ -24834,11 +24834,11 @@ const ArrayContainer = props => {
     actions
   } = props;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.container)
+    className: css(styles$r.container)
   }, controls && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft, styles$q.containerHeader)
+    className: css(styles$r.columnLeft, styles$r.containerHeader)
   }, controls), /*#__PURE__*/React.createElement("div", null, children), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft)
+    className: css(styles$r.columnLeft)
   }, /*#__PURE__*/React.createElement("a", {
     href: "javascript:void 0",
     onClick: () => actions.addArrayElement(path, shape.elementShape)
@@ -24851,28 +24851,28 @@ const ObjectContainer = ({
   path
 }) => {
   const headingEditor = /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.containerHeader)
+    className: css(styles$r.containerHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$q.containerTitle)
+    className: css(styles$r.containerTitle)
   }, capitalize(name)), controls);
   const headingPreview = (name || controls) && /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.containerHeader, styles$q.previewCollectionHeader)
+    className: css(styles$r.containerHeader, styles$r.previewCollectionHeader)
   }, /*#__PURE__*/React.createElement(Header, {
     depth: path.length,
-    className: css(styles$q.containerTitle)
+    className: css(styles$r.containerTitle)
   }, capitalize(name)));
   const hasBothHeadings = headingEditor && headingPreview;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.container)
+    className: css(styles$r.container)
   }, hasBothHeadings && /*#__PURE__*/React.createElement("span", {
-    className: css(styles$q.row)
+    className: css(styles$r.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft)
+    className: css(styles$r.columnLeft)
   }, headingEditor), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnRight)
+    className: css(styles$r.columnRight)
   }, headingPreview)), /*#__PURE__*/React.createElement("div", {
-    className: css(path.length > 0 && styles$q.contentIndent)
+    className: css(path.length > 0 && styles$r.contentIndent)
   }, children));
 };
 
@@ -24995,11 +24995,11 @@ const ItemNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.row)
+    className: css(styles$r.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft)
+    className: css(styles$r.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$q.sticky)
+    className: css(sticky && styles$r.sticky)
   },
   /*#__PURE__*/
   // @ts-expect-error - TS2769 - No overload matches this call.
@@ -25007,9 +25007,9 @@ const ItemNodeContent = withStickiness(props => {
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions
   })))), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnRight)
+    className: css(styles$r.columnRight)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$q.sticky)
+    className: css(sticky && styles$r.sticky)
   }, preview))));
 });
 const HintNodeContent = withStickiness(props => {
@@ -25025,13 +25025,13 @@ const HintNodeContent = withStickiness(props => {
     className: "framework-perseus"
   }, lens(renderers).get(path));
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.row)
+    className: css(styles$r.row)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft)
+    className: css(styles$r.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$q.sticky)
+    className: css(sticky && styles$r.sticky)
   }, /*#__PURE__*/React.createElement(HintEditor, _extends({}, data, {
-    className: css(styles$q.hintEditor),
+    className: css(styles$r.hintEditor),
     onChange: newVal => actions.mergeValueAtPath(path, newVal),
     apiOptions: apiOptions,
     showTitle: false,
@@ -25046,9 +25046,9 @@ const HintNodeContent = withStickiness(props => {
     isFirst: true,
     isLast: true
   })))), /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnRight)
+    className: css(styles$r.columnRight)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(sticky && styles$q.sticky)
+    className: css(sticky && styles$r.sticky)
   }, preview)));
 });
 const TagsNodeContent = props => {
@@ -25065,9 +25065,9 @@ const TagsNodeContent = props => {
     return null;
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.columnLeft)
+    className: css(styles$r.columnLeft)
   }, /*#__PURE__*/React.createElement("div", {
-    className: css(styles$q.tagsEditor)
+    className: css(styles$r.tagsEditor)
   }, /*#__PURE__*/React.createElement(GroupMetadataEditor, {
     value: data,
     onChange: newVal => actions.setValueAtPath(path, newVal),
@@ -25098,23 +25098,23 @@ const ArrayNodeContent = props => {
     const subpath = path.concat(i);
     const controls = [i > 0 && /*#__PURE__*/React.createElement("div", {
       key: "moveArrayElementUp",
-      className: css(styles$q.control)
+      className: css(styles$r.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Move up",
       onClick: () => actions.moveArrayElementUp(subpath)
     }, /*#__PURE__*/React.createElement("div", {
-      className: css(styles$q.verticalFlip)
+      className: css(styles$r.verticalFlip)
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconChevronDown)))), i < data.length - 1 && /*#__PURE__*/React.createElement("div", {
       key: "moveArrayElementDown",
-      className: css(styles$q.control)
+      className: css(styles$r.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Move down",
       onClick: () => actions.moveArrayElementDown(subpath)
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconChevronDown))), /*#__PURE__*/React.createElement("div", {
       key: "removeArrayElement",
-      className: css(styles$q.control)
+      className: css(styles$r.control)
     }, /*#__PURE__*/React.createElement(SimpleButton, {
       color: "orange",
       title: "Delete",
@@ -25122,7 +25122,7 @@ const ArrayNodeContent = props => {
     }, /*#__PURE__*/React.createElement(InlineIcon$6, iconTrash$4)))];
     return /*#__PURE__*/React.createElement("div", {
       key: i,
-      className: css(styles$q.arrayElement, !elementIsLeaf && styles$q.arrayElementAndNotLeaf)
+      className: css(styles$r.arrayElement, !elementIsLeaf && styles$r.arrayElementAndNotLeaf)
     }, /*#__PURE__*/React.createElement(NodeContainer, _extends({}, otherProps, {
       key: i,
       shape: shape.elementShape,
@@ -25148,7 +25148,7 @@ const ObjectNodeContent = props => {
   // made sense to the shape's author is the order in which we'll iterate :)
   const children = Object.keys(shape.shape).map(subkey => /*#__PURE__*/React.createElement("div", {
     key: subkey,
-    className: css(styles$q.objectElement)
+    className: css(styles$r.objectElement)
   }, /*#__PURE__*/React.createElement(NodeContainer, _extends({}, otherProps, {
     shape: shape.shape[subkey],
     data: data[subkey],
@@ -25315,7 +25315,7 @@ class MultiRendererEditor extends React.Component {
     }, this._renderContent());
   }
 }
-const styles$q = StyleSheet.create({
+const styles$r = StyleSheet.create({
   // This is used in a number of places throughout this file.
   container: {},
   // eslint-disable-next-line react-native/no-unused-styles
@@ -25467,47 +25467,47 @@ const StatefulArticleEditor = createReactClass({
       screen
     } = this.state;
     return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
-      style: styles$p.controlBar
+      style: styles$q.controlBar
     }, /*#__PURE__*/React.createElement("span", {
-      style: styles$p.controls
+      style: styles$q.controls
     }, "Mode:", " ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         mode: "edit"
       }),
-      style: mode === "edit" ? styles$p.controlSelected : styles$p.control
+      style: mode === "edit" ? styles$q.controlSelected : styles$q.control
     }, "EDIT"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         mode: "preview"
       }),
-      style: mode === "preview" ? styles$p.controlSelected : styles$p.control
+      style: mode === "preview" ? styles$q.controlSelected : styles$q.control
     }, "PREVIEW"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         mode: "json"
       }),
-      style: mode === "json" ? styles$p.controlSelected : styles$p.control
+      style: mode === "json" ? styles$q.controlSelected : styles$q.control
     }, "JSON")), /*#__PURE__*/React.createElement("span", {
-      style: styles$p.controls
+      style: styles$q.controls
     }, "Screen:", " ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         screen: "phone"
       }),
-      style: screen === "phone" ? styles$p.controlSelected : styles$p.control
+      style: screen === "phone" ? styles$q.controlSelected : styles$q.control
     }, "PHONE"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         screen: "tablet"
       }),
-      style: screen === "tablet" ? styles$p.controlSelected : styles$p.control
+      style: screen === "tablet" ? styles$q.controlSelected : styles$q.control
     }, "TABLET"), " | ", /*#__PURE__*/React.createElement("span", {
       onClick: () => this.setState({
         screen: "desktop"
       }),
-      style: screen === "desktop" ? styles$p.controlSelected : styles$p.control
+      style: screen === "desktop" ? styles$q.controlSelected : styles$q.control
     }, "DESKTOP"))), /*#__PURE__*/React.createElement("div", {
-      style: styles$p.editor
+      style: styles$q.editor
     }, /*#__PURE__*/React.createElement(ArticleEditor, this.state)));
   }
 });
-const styles$p = {
+const styles$q = {
   controlBar: {
     marginBottom: 25,
     marginTop: 5
@@ -26997,10 +26997,10 @@ class GradedGroupEditor extends React.Component {
     }, /*#__PURE__*/React.createElement("div", {
       className: "perseus-widget-row"
     }, /*#__PURE__*/React.createElement("label", {
-      className: css(styles$o.title)
+      className: css(styles$p.title)
     }, "Title:", " ", /*#__PURE__*/React.createElement(TextInput$6, {
       value: this.props.title,
-      className: css(styles$o.input)
+      className: css(styles$p.input)
       // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       ,
       onChange: this.change("title")
@@ -27025,7 +27025,7 @@ class GradedGroupEditor extends React.Component {
     }, /*#__PURE__*/React.createElement(InlineIcon$4, iconPlus$1), " Add a hint"), this.props.hint && /*#__PURE__*/React.createElement("div", {
       className: "perseus-hint-editor"
     }, /*#__PURE__*/React.createElement("div", {
-      className: css(styles$o.hintsTitle)
+      className: css(styles$p.hintsTitle)
     }, "Hint"), /*#__PURE__*/React.createElement(Editor, {
       ref: this.hintEditor,
       content: this.props.hint ? this.props.hint.content : "",
@@ -27062,7 +27062,7 @@ GradedGroupEditor.defaultProps = {
   images: {},
   hint: null
 };
-const styles$o = StyleSheet.create({
+const styles$p = StyleSheet.create({
   title: {
     fontSize: 18,
     fontWeight: "bold"
@@ -28400,13 +28400,13 @@ function MathquillInput(props) {
     }
   });
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$n.outerWrapper
+    style: styles$o.outerWrapper
   }, /*#__PURE__*/React.createElement("span", {
     ref: mathFieldWrapperRef,
     className: "perseus-math-input mq-editable-field mq-math-mode"
   }));
 }
-const styles$n = StyleSheet.create({
+const styles$o = StyleSheet.create({
   outerWrapper: {
     display: "inline-block",
     borderStyle: "solid",
@@ -29467,7 +29467,7 @@ const GraphPointsCountSelector = ({
     // Never uses placeholder, always has value
     ,
     placeholder: "",
-    style: styles$m.singleSelectShort
+    style: styles$n.singleSelectShort
   }, [...[...Array(7).keys()].map(n => /*#__PURE__*/React.createElement(OptionItem, {
     key: n,
     value: `${n}`,
@@ -29478,7 +29478,7 @@ const GraphPointsCountSelector = ({
     label: "unlimited"
   })]);
 };
-const styles$m = StyleSheet.create({
+const styles$n = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29491,7 +29491,7 @@ const GraphTypeSelector = props => {
     selectedValue: props.graphType,
     onChange: props.onChange,
     placeholder: "Select a graph type",
-    style: styles$l.singleSelectShort
+    style: styles$m.singleSelectShort
   }, /*#__PURE__*/React.createElement(OptionItem, {
     value: "linear",
     label: "Linear function"
@@ -29524,7 +29524,7 @@ const GraphTypeSelector = props => {
     label: "Angle"
   }));
 };
-const styles$l = StyleSheet.create({
+const styles$m = StyleSheet.create({
   singleSelectShort: {
     // Non-standard spacing, but it's the smallest we can go
     // without running into styling issues with the dropdown.
@@ -29541,16 +29541,16 @@ const LabeledRow = props => {
     style
   } = props;
   return /*#__PURE__*/React.createElement("label", {
-    className: css(styles$k.label)
+    className: css(styles$l.label)
   }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$k.row, style]
+    style: [styles$l.row, style]
   }, labelSide === "start" || /*#__PURE__*/React.createElement(LabelSmall, {
-    style: styles$k.spaceEnd
+    style: styles$l.spaceEnd
   }, label), children, labelSide === "end" && /*#__PURE__*/React.createElement(LabelSmall, {
-    style: styles$k.spaceStart
+    style: styles$l.spaceStart
   }, label)));
 };
-const styles$k = StyleSheet.create({
+const styles$l = StyleSheet.create({
   label: {
     width: "fit-content"
   },
@@ -29944,10 +29944,10 @@ class InteractiveGraphSettings extends React.Component {
       onChange: this.change
     }))), /*#__PURE__*/React.createElement(LabeledRow, {
       label: "Background image URL:",
-      style: styles$j.resetSpaceTop
+      style: styles$k.resetSpaceTop
     }, /*#__PURE__*/React.createElement("input", {
       type: "text",
-      className: css(styles$j.backgroundUrlInput),
+      className: css(styles$k.backgroundUrlInput),
       ref: this.bgUrlRef,
       value: this.state.backgroundImage.url || "",
       onChange: e => {
@@ -29961,24 +29961,24 @@ class InteractiveGraphSettings extends React.Component {
       onKeyPress: this.changeBackgroundUrl,
       onBlur: this.changeBackgroundUrl
     }), /*#__PURE__*/React.createElement(InfoTip$c, null, /*#__PURE__*/React.createElement("p", null, "Create an image in graphie, or use the \"Add image\" function to create a background."))), /*#__PURE__*/React.createElement(View, {
-      style: styles$j.rulerSection
+      style: styles$k.rulerSection
     }, /*#__PURE__*/React.createElement(View, {
-      style: styles$j.checkboxRow
+      style: styles$k.checkboxRow
     }, /*#__PURE__*/React.createElement(PropCheckBox$7, {
       label: "Show ruler",
       showRuler: this.props.showRuler,
       onChange: this.change,
-      style: styles$j.resetSpaceTop
+      style: styles$k.resetSpaceTop
     }), /*#__PURE__*/React.createElement(PropCheckBox$7, {
       label: "Show protractor",
       showProtractor: this.props.showProtractor,
       onChange: this.change,
-      style: styles$j.resetSpaceTop
+      style: styles$k.resetSpaceTop
     })), this.props.showRuler && /*#__PURE__*/React.createElement(View, {
-      style: styles$j.spaceTop
+      style: styles$k.spaceTop
     }, /*#__PURE__*/React.createElement(LabeledRow, {
       label: "Ruler label:",
-      style: styles$j.resetSpaceTop
+      style: styles$k.resetSpaceTop
     }, /*#__PURE__*/React.createElement(SingleSelect, {
       id: "ruler-label-select",
       selectedValue: this.props.rulerLabel,
@@ -29988,7 +29988,7 @@ class InteractiveGraphSettings extends React.Component {
         });
       },
       placeholder: "None",
-      style: styles$j.singleSelectShort
+      style: styles$k.singleSelectShort
     }, /*#__PURE__*/React.createElement(OptionItem, {
       value: "",
       label: "None",
@@ -30029,7 +30029,7 @@ class InteractiveGraphSettings extends React.Component {
         });
       },
       placeholder: "10",
-      style: styles$j.singleSelectShort
+      style: styles$k.singleSelectShort
     }, [1, 2, 4, 8, 10, 16].map(value => /*#__PURE__*/React.createElement(OptionItem, {
       key: value,
       value: `${value}`,
@@ -30053,7 +30053,7 @@ InteractiveGraphSettings.defaultProps = {
   rulerLabel: "",
   rulerTicks: 10
 };
-const styles$j = StyleSheet.create({
+const styles$k = StyleSheet.create({
   resetSpaceTop: {
     marginTop: 0
   },
@@ -30097,10 +30097,10 @@ const LockedFigureSelect = props => {
     onChange
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$i.container
+    style: styles$j.container
   }, /*#__PURE__*/React.createElement(ActionMenu, {
     menuText: "Add locked figure",
-    style: styles$i.addElementSelect
+    style: styles$j.addElementSelect
   }, [/*#__PURE__*/React.createElement(ActionItem, {
     key: `${id}-point`,
     label: "Point",
@@ -30111,9 +30111,9 @@ const LockedFigureSelect = props => {
     onClick: () => onChange("line")
   }, "Line")]));
 };
-const styles$i = StyleSheet.create({
+const styles$j = StyleSheet.create({
   container: {
-    marginTop: spacing.xxxSmall_4
+    marginTop: spacing.xSmall_8
   },
   addElementSelect: {
     backgroundColor: color.fadedBlue8,
@@ -30211,13 +30211,13 @@ const ColorSwatch = props => {
     "aria-label":
     // Don't include an aria label for decorative circles.
     !decorative ? `Color: ${color$1}, ${filled ? "filled" : "open"}` : undefined,
-    style: [styles$h.colorSwatch, {
+    style: [styles$i.colorSwatch, {
       border: `4px solid ${lockedFigureColors[color$1]}`,
       backgroundColor: filled ? lockedFigureColors[color$1] : color.white
     }]
   });
 };
-const styles$h = StyleSheet.create({
+const styles$i = StyleSheet.create({
   colorSwatch: {
     // Add a white outline so that the color swatch is visible when
     // the dropdown option is highlighted with its blue background.
@@ -30233,15 +30233,16 @@ const ColorSelect = props => {
   const {
     id,
     selectedValue,
+    style,
     onChange
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$g.row
+    style: [styles$h.row, style]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: id,
-    style: styles$g.label,
+    style: styles$h.label,
     tag: "label"
-  }, "Color"), /*#__PURE__*/React.createElement(SingleSelect, {
+  }, "color"), /*#__PURE__*/React.createElement(SingleSelect, {
     id: id,
     selectedValue: selectedValue,
     onChange: onChange
@@ -30258,13 +30259,84 @@ const ColorSelect = props => {
     })
   }, colorName))));
 };
-const styles$g = StyleSheet.create({
+const styles$h = StyleSheet.create({
   row: {
     flexDirection: "row",
     alignItems: "center"
   },
   label: {
-    marginInlineEnd: spacing.xSmall_8
+    marginInlineEnd: spacing.xxxSmall_4
+  }
+});
+
+const LabeledSwitch = props => {
+  const {
+    checked,
+    label,
+    style,
+    onChange
+  } = props;
+  const ids = useUniqueIdWithMock();
+  const switchId = ids.get("switch");
+  return /*#__PURE__*/React.createElement(View, {
+    style: [styles$g.row, style]
+  }, /*#__PURE__*/React.createElement(Switch, {
+    id: switchId,
+    checked: checked,
+    onChange: onChange
+  }), /*#__PURE__*/React.createElement(Strut, {
+    size: spacing.xSmall_8
+  }), /*#__PURE__*/React.createElement(LabelMedium, {
+    tag: "label",
+    htmlFor: switchId
+  }, label));
+};
+const styles$g = StyleSheet.create({
+  row: {
+    flexDirection: "row",
+    alignItems: "center"
+  }
+});
+
+const LockedFigureSettingsAccordion = props => {
+  const {
+    children,
+    header,
+    containerStyle,
+    panelStyle
+  } = props;
+  return /*#__PURE__*/React.createElement(View
+  // More specificity so that we can override the default
+  // .heading > h2 > .header styles from the articles.less
+  // file (which is imported in perseus-renderer.less).
+  , {
+    className: "locked-figure-accordion"
+  }, /*#__PURE__*/React.createElement(AccordionSection, {
+    style: [styles$f.container, containerStyle],
+    headerStyle: styles$f.accordionHeader,
+    header: header
+  }, /*#__PURE__*/React.createElement(View, {
+    style: [styles$f.accordionPanel, panelStyle]
+  }, children)));
+};
+const styles$f = StyleSheet.create({
+  container: {
+    backgroundColor: color.fadedBlue8,
+    marginTop: spacing.xSmall_8
+  },
+  accordionHeader: {
+    padding: 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: spacing.xxLarge_48
+  },
+  accordionPanel: {
+    paddingTop: spacing.xxSmall_6,
+    paddingBottom: spacing.xxxSmall_4,
+    paddingLeft: spacing.small_12,
+    paddingRight: spacing.small_12
   }
 });
 
@@ -30279,20 +30351,21 @@ const LockedFigureSettingsActions = props => {
     figureAriaLabel
   } = props;
   return /*#__PURE__*/React.createElement(View, {
-    style: styles$f.container
+    style: styles$e.container
   }, /*#__PURE__*/React.createElement(Button, {
     startIcon: trashIcon,
     "aria-label": `Delete ${figureAriaLabel}`,
     onClick: onRemove,
     kind: "tertiary",
-    style: styles$f.deleteButton
+    style: styles$e.deleteButton
   }, "Delete"));
 };
-const styles$f = StyleSheet.create({
+const styles$e = StyleSheet.create({
   container: {
     width: "100%",
     flexDirection: "row",
-    alignItems: "center"
+    alignItems: "center",
+    marginTop: spacing.xxxSmall_4
   },
   deleteButton: {
     // Line up the delete icon with the rest of the content.
@@ -30345,13 +30418,14 @@ function getValidNumberFromString(value) {
   // If the value is not a number, return 0.
   return isNaN(parsed) ? 0 : parsed;
 }
+const DEFAULT_COLOR = "green";
 function getDefaultFigureForType(type) {
   switch (type) {
     case "point":
       return {
         type: "point",
         coord: [0, 0],
-        color: "blue",
+        color: DEFAULT_COLOR,
         filled: true
       };
     case "line":
@@ -30361,7 +30435,7 @@ function getDefaultFigureForType(type) {
         points: [getDefaultFigureForType("point"), _extends({}, getDefaultFigureForType("point"), {
           coord: [2, 2]
         })],
-        color: "blue",
+        color: DEFAULT_COLOR,
         lineStyle: "solid",
         showArrows: false,
         showStartPoint: false,
@@ -30403,7 +30477,6 @@ const LockedPointSettings = props => {
   const xCoordId = ids.get("x-coord");
   const yCoordId = ids.get("y-coord");
   const colorSelectId = ids.get("point-color-select");
-  const showPointToggleId = ids.get("show-point-toggle");
   function handleBlur() {
     const validCoord = [getValidNumberFromString(coordState[0]), getValidNumberFromString(coordState[1])];
 
@@ -30424,20 +30497,14 @@ const LockedPointSettings = props => {
       color: newValue
     });
   }
-  return /*#__PURE__*/React.createElement(View
-  // More specificity so that we can override the default
-  // .heading > h2 > .header styles from the articles.less
-  // file (which is imported in perseus-renderer.less).
-  , {
-    className: "locked-figure-accordion"
-  }, /*#__PURE__*/React.createElement(AccordionSection, {
-    style: [styles$e.container, style],
-    headerStyle: styles$e.accordionHeader,
+  return /*#__PURE__*/React.createElement(LockedFigureSettingsAccordion, {
+    containerStyle: style,
+    panelStyle: !onRemove && styles$d.accordionPanelWithoutActions,
     header:
     /*#__PURE__*/
     // Summary: Point, coords, color (filled/open)
     React.createElement(View, {
-      style: styles$e.row
+      style: styles$d.row
     }, /*#__PURE__*/React.createElement(LabelLarge, null, `${label || "Point"} (${coord[0]}, ${coord[1]})`), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
     }), toggled && /*#__PURE__*/React.createElement(ColorSwatch, {
@@ -30445,84 +30512,58 @@ const LockedPointSettings = props => {
       filled: filled
     }))
   }, /*#__PURE__*/React.createElement(View, {
-    style: styles$e.accordionPanel
-  }, /*#__PURE__*/React.createElement(View, {
-    style: styles$e.row
-  }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$e.row, styles$e.spaceUnder]
+    style: [styles$d.row, styles$d.spaceUnder]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: xCoordId,
-    style: styles$e.label,
+    style: styles$d.label,
     tag: "label"
-  }, "x Coord"), /*#__PURE__*/React.createElement(TextField, {
+  }, "x coord"), /*#__PURE__*/React.createElement(TextField, {
     id: xCoordId,
     type: "number",
     value: coordState[0],
     onChange: newValue => handleCoordChange(newValue, 0),
     onBlur: handleBlur,
-    style: styles$e.textField
-  })), /*#__PURE__*/React.createElement(Strut, {
+    style: styles$d.textField
+  }), /*#__PURE__*/React.createElement(Strut, {
     size: spacing.medium_16
-  }), /*#__PURE__*/React.createElement(View, {
-    style: [styles$e.row, styles$e.spaceUnder]
-  }, /*#__PURE__*/React.createElement(LabelMedium, {
+  }), /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: yCoordId,
-    style: styles$e.label,
+    style: styles$d.label,
     tag: "label"
-  }, "y Coord"), /*#__PURE__*/React.createElement(TextField, {
+  }, "y coord"), /*#__PURE__*/React.createElement(TextField, {
     id: yCoordId,
     type: "number",
     value: coordState[1],
     onChange: newValue => handleCoordChange(newValue, 1),
     onBlur: handleBlur,
-    style: styles$e.textField
-  }))), onToggle && /*#__PURE__*/React.createElement(View, {
-    style: [styles$e.row, styles$e.spaceUnder]
-  }, /*#__PURE__*/React.createElement(Switch, {
-    id: showPointToggleId,
+    style: styles$d.textField
+  })), onToggle && /*#__PURE__*/React.createElement(LabeledSwitch, {
+    label: "show point on graph",
     checked: !!toggled,
+    style: toggled && styles$d.spaceUnder,
     onChange: onToggle
-  }), /*#__PURE__*/React.createElement(Strut, {
-    size: spacing.small_12
-  }), /*#__PURE__*/React.createElement(LabelMedium, {
-    tag: "label",
-    htmlFor: showPointToggleId
-  }, "Show point on graph")), toggled && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColorSelect, {
+  }), toggled && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ColorSelect, {
     id: colorSelectId,
-    selectedValue: pointColor || "blue",
-    onChange: handleColorChange
-  }), /*#__PURE__*/React.createElement(Strut, {
-    size: spacing.xSmall_8
-  }), /*#__PURE__*/React.createElement(Checkbox$1, {
-    label: "Open point",
+    selectedValue: pointColor,
+    onChange: handleColorChange,
+    style: styles$d.spaceUnder
+  }), /*#__PURE__*/React.createElement(LabeledSwitch, {
+    label: "open point",
     checked: !filled,
     onChange: newValue => {
       onChangeProps({
         filled: !newValue
       });
-    },
-    style: styles$e.spaceUnder
+    }
   })), onRemove && /*#__PURE__*/React.createElement(LockedFigureSettingsActions, {
     onRemove: onRemove,
     figureAriaLabel: `locked point at ${coordState[0]}, ${coordState[1]}`
-  }))));
+  }));
 };
-const styles$e = StyleSheet.create({
-  container: {
-    backgroundColor: color.fadedBlue8,
-    marginBottom: spacing.small_12
-  },
-  accordionHeader: {
-    paddingTop: spacing.small_12,
-    paddingBottom: spacing.small_12,
-    paddingInlineStart: spacing.medium_16,
-    // Fixed height so the addition of the color swatch doesn't
-    // change the height of the header when toggling.
-    height: spacing.xxLarge_48
-  },
-  accordionPanel: {
-    padding: spacing.medium_16,
-    paddingBottom: spacing.xSmall_8
+const styles$d = StyleSheet.create({
+  accordionPanelWithoutActions: {
+    // Need more space since we don't have the actions' margins.
+    paddingBottom: spacing.medium_16
   },
   row: {
     flexDirection: "row",
@@ -30532,7 +30573,7 @@ const styles$e = StyleSheet.create({
     marginBottom: spacing.xSmall_8
   },
   label: {
-    marginInlineEnd: spacing.xSmall_8
+    marginInlineEnd: spacing.xxSmall_6
   },
   textField: {
     width: spacing.xxxLarge_64
@@ -30543,7 +30584,7 @@ const LockedLineSettings = props => {
   const {
     kind,
     points,
-    color: lineColor = "blue",
+    color: lineColor,
     lineStyle = "solid",
     showArrows,
     showStartPoint,
@@ -30579,31 +30620,21 @@ const LockedLineSettings = props => {
       })]
     });
   }
-  return /*#__PURE__*/React.createElement(View
-  // More specificity so that we can override the default
-  // .heading > h2 > .header styles from the articles.less
-  // file (which is imported in perseus-renderer.less).
-  , {
-    className: "locked-figure-accordion"
-  }, /*#__PURE__*/React.createElement(AccordionSection, {
-    style: styles$d.container,
-    headerStyle: styles$d.accordionHeader,
+  return /*#__PURE__*/React.createElement(LockedFigureSettingsAccordion, {
     header: /*#__PURE__*/React.createElement(View, {
-      style: styles$d.row
+      style: styles$c.row
     }, /*#__PURE__*/React.createElement(LabelLarge, null, lineLabel), /*#__PURE__*/React.createElement(Strut, {
       size: spacing.xSmall_8
     }), /*#__PURE__*/React.createElement(ColorSwatch, {
       color: lineColor
     }))
   }, /*#__PURE__*/React.createElement(View, {
-    style: styles$d.accordionPanel
-  }, /*#__PURE__*/React.createElement(View, {
-    style: [styles$d.row, styles$d.spaceUnder]
+    style: [styles$c.row, styles$c.spaceUnder]
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: kindSelectId,
-    style: styles$d.label,
+    style: styles$c.label,
     tag: "label"
-  }, "Kind"), /*#__PURE__*/React.createElement(SingleSelect, {
+  }, "kind"), /*#__PURE__*/React.createElement(SingleSelect, {
     id: kindSelectId,
     selectedValue: kind,
     onChange: value => onChangeProps({
@@ -30622,20 +30653,20 @@ const LockedLineSettings = props => {
     value: "ray",
     label: "ray"
   }))), /*#__PURE__*/React.createElement(View, {
-    style: [styles$d.row, styles$d.spaceUnder]
+    style: [styles$c.row, styles$c.spaceUnder]
   }, /*#__PURE__*/React.createElement(ColorSelect, {
     id: colorSelectId,
-    selectedValue: lineColor || "blue",
+    selectedValue: lineColor,
     onChange: handleColorChange
   }), /*#__PURE__*/React.createElement(Strut, {
-    size: spacing.medium_16
+    size: spacing.small_12
   }), /*#__PURE__*/React.createElement(View, {
-    style: styles$d.row
+    style: styles$c.row
   }, /*#__PURE__*/React.createElement(LabelMedium, {
     htmlFor: styleSelectId,
-    style: styles$d.label,
+    style: styles$c.label,
     tag: "label"
-  }, "Style"), /*#__PURE__*/React.createElement(SingleSelect, {
+  }, "style"), /*#__PURE__*/React.createElement(SingleSelect, {
     id: styleSelectId,
     selectedValue: lineStyle,
     onChange: value => onChangeProps({
@@ -30643,20 +30674,20 @@ const LockedLineSettings = props => {
     })
     // Placeholder is required, but never gets used.
     ,
-    placeholder: ""
+    placeholder: "",
+    style: styles$c.selectMarginOffset
   }, /*#__PURE__*/React.createElement(OptionItem, {
     value: "solid",
     label: "solid"
   }), /*#__PURE__*/React.createElement(OptionItem, {
     value: "dashed",
     label: "dashed"
-  })))), /*#__PURE__*/React.createElement(Checkbox$1, {
-    label: "Show arrows",
+  })))), /*#__PURE__*/React.createElement(LabeledSwitch, {
+    label: "show arrows",
     checked: showArrows,
     onChange: newValue => onChangeProps({
       showArrows: newValue
-    }),
-    style: styles$d.spaceUnder
+    })
   }), /*#__PURE__*/React.createElement(LockedPointSettings, _extends({
     label: "Start point",
     toggled: showStartPoint
@@ -30665,7 +30696,7 @@ const LockedLineSettings = props => {
       showStartPoint: newValue
     }),
     onChangeProps: newProps => handleChangePoint(newProps, 0),
-    style: styles$d.lockedPointSettingsContainer
+    style: styles$c.lockedPointSettingsContainer
   })), /*#__PURE__*/React.createElement(LockedPointSettings, _extends({
     label: "End point",
     toggled: showEndPoint
@@ -30674,31 +30705,18 @@ const LockedLineSettings = props => {
       showEndPoint: newValue
     }),
     onChangeProps: newProps => handleChangePoint(newProps, 1),
-    style: styles$d.lockedPointSettingsContainer
+    style: styles$c.lockedPointSettingsContainer
   })), /*#__PURE__*/React.createElement(LockedFigureSettingsActions, {
     onRemove: onRemove,
     figureAriaLabel: `locked line defined by
                     ${startPoint.coord[0]}, ${startPoint.coord[1]} and
                     ${endPoint.coord[0]}, ${endPoint.coord[1]}.`
-  }))));
+  }));
 };
-const styles$d = StyleSheet.create({
-  container: {
-    backgroundColor: color.fadedBlue8,
-    marginBottom: spacing.xSmall_8
-  },
-  accordionHeader: {
-    paddingTop: spacing.small_12,
-    paddingBottom: spacing.small_12,
-    paddingInlineStart: spacing.medium_16
-  },
-  accordionPanel: {
-    padding: spacing.medium_16,
-    paddingBottom: spacing.xSmall_8
-  },
+const styles$c = StyleSheet.create({
   lockedPointSettingsContainer: {
     marginTop: spacing.xSmall_8,
-    marginBottom: spacing.xSmall_8,
+    marginBottom: 0,
     marginLeft: -spacing.xxxSmall_4,
     marginRight: -spacing.xxxSmall_4,
     backgroundColor: color.white
@@ -30711,7 +30729,11 @@ const styles$d = StyleSheet.create({
     marginBottom: spacing.xSmall_8
   },
   label: {
-    marginInlineEnd: spacing.xSmall_8
+    marginInlineEnd: spacing.xxxSmall_4
+  },
+  selectMarginOffset: {
+    // Align with the point settings accordions.
+    marginInlineEnd: -spacing.xxxSmall_4
   }
 });
 
@@ -30766,9 +30788,7 @@ const LockedFiguresSection = props => {
     };
     onChange(newFigures);
   }
-  return /*#__PURE__*/React.createElement(View, {
-    style: styles$c.container
-  }, figures == null ? void 0 : figures.map((figure, index) => /*#__PURE__*/React.createElement(LockedFigureSettings, _extends({
+  return /*#__PURE__*/React.createElement(View, null, figures == null ? void 0 : figures.map((figure, index) => /*#__PURE__*/React.createElement(LockedFigureSettings, _extends({
     key: `${uniqueId}-locked-${figure}-${index}`
   }, figure, {
     onChangeProps: newProps => changeProps(index, newProps),
@@ -30778,11 +30798,6 @@ const LockedFiguresSection = props => {
     onChange: addLockedFigure
   }));
 };
-const styles$c = StyleSheet.create({
-  container: {
-    paddingTop: spacing.large_24
-  }
-});
 
 const SegmentCountSelector = ({
   numSegments: _numSegments = 1,