@khanacademy/perseus-editor 6.4.1 → 6.5.0

package/dist/index.js

@@ -67,7 +67,7 @@ var trashIcon__default = /*#__PURE__*/_interopDefaultLegacy(trashIcon);
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "6.4.1";
+const libVersion = "6.5.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -262,13 +262,13 @@ class SectionControlButton extends React__namespace.Component {
       role: "button",
       hideDefaultFocusRing: true,
       "aria-label": title,
-      style: styles$y.button
+      style: styles$z.button
     }, _ref => {
       return /*#__PURE__*/React__namespace.createElement(InlineIcon$b, icon);
     });
   }
 }
-const styles$y = aphrodite.StyleSheet.create({
+const styles$z = aphrodite.StyleSheet.create({
   button: {
     backgroundColor: wonderBlocksTokens.color.gold,
     margin: 2,
@@ -20768,6 +20768,27 @@ class WidgetSelect extends React__namespace.Component {
   }
 }
 
+/**
+ * Displays a caret in either expanded or collapsed state. For use in headings
+ * that collapse a region.
+ */
+function ToggleableCaret(props) {
+  const iconStyle = props.isExpanded ? styles$y.expanded : styles$y.collapsed;
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksIcon.PhosphorIcon, {
+    icon: caretRight__default["default"],
+    style: iconStyle
+  });
+}
+const styles$y = aphrodite.StyleSheet.create({
+  collapsed: {
+    transition: ".15s"
+  },
+  expanded: {
+    transform: "rotate(90deg)",
+    transition: ".15s"
+  }
+});
+
 /**
  * Displays a collapsable list of TeX rendering errors.
  */
@@ -20787,15 +20808,13 @@ class TexErrorView extends React__namespace.Component {
     const {
       showErrors
     } = this.state;
-    const iconStyle = showErrors ? styles$x.iconExpanded : styles$x.iconCollapsed;
     return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       style: styles$x.errorContainer
     }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       style: styles$x.title,
       onClick: this.handleToggleTexErrors
-    }, /*#__PURE__*/React__namespace.createElement(wonderBlocksIcon.PhosphorIcon, {
-      icon: caretRight__default["default"],
-      style: iconStyle
+    }, /*#__PURE__*/React__namespace.createElement(ToggleableCaret, {
+      isExpanded: showErrors
     }), "\xA0 TeX Errors (", errorList.length, ")"), showErrors && /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
       style: styles$x.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, {
@@ -20828,13 +20847,6 @@ const styles$x = aphrodite.StyleSheet.create({
   },
   error: {
     padding: "4px 10px"
-  },
-  iconCollapsed: {
-    transition: ".15s"
-  },
-  iconExpanded: {
-    transform: "rotate(90deg)",
-    transition: ".15s"
   }
 });
 
@@ -29664,6 +29676,31 @@ const defaultBackgroundImage$1 = {
 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();
@@ -29684,7 +29721,10 @@ class InteractiveGraphSettings extends React__namespace.Component {
   }
   constructor(props) {
     super(props);
-    this.state = InteractiveGraphSettings.stateFromProps(props);
+    this.state = {
+      isExpanded: true,
+      ...InteractiveGraphSettings.stateFromProps(props)
+    };
   }
   static defaultProps = {
     box: [perseus.interactiveSizes.defaultBoxSizeSmall, perseus.interactiveSizes.defaultBoxSizeSmall],
@@ -29962,7 +30002,13 @@ class InteractiveGraphSettings extends React__namespace.Component {
   };
 
   render() {
-    return /*#__PURE__*/React__namespace.createElement("div", null, /*#__PURE__*/React__namespace.createElement("div", {
+    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"
@@ -30149,7 +30195,7 @@ class InteractiveGraphSettings extends React__namespace.Component {
       key: value,
       value: `${value}`,
       label: `${value}`
-    })))))));
+    }))))))));
   }
 }
 const styles$o = aphrodite.StyleSheet.create({
@@ -30373,6 +30419,7 @@ const styles$l = aphrodite.StyleSheet.create({
 const CoordinatePairInput = props => {
   const {
     coord,
+    error,
     onChangeProps
   } = props;
 
@@ -30406,7 +30453,7 @@ const CoordinatePairInput = props => {
       coord: newCoords
     });
   }
-  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+  return /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, null, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
     style: [styles$k.row, styles$k.spaceUnder]
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
     htmlFor: xCoordId,
@@ -30417,7 +30464,7 @@ const CoordinatePairInput = props => {
     type: "number",
     value: coordState[0],
     onChange: newValue => handleCoordChange(newValue, 0),
-    style: styles$k.textField
+    style: [styles$k.textField, error ? styles$k.errorField : undefined]
   }), /*#__PURE__*/React__namespace.createElement(Strut, {
     size: wonderBlocksTokens.spacing.medium_16
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
@@ -30429,8 +30476,8 @@ const CoordinatePairInput = props => {
     type: "number",
     value: coordState[1],
     onChange: newValue => handleCoordChange(newValue, 1),
-    style: styles$k.textField
-  }));
+    style: [styles$k.textField, error ? styles$k.errorField : undefined]
+  })));
 };
 const styles$k = aphrodite.StyleSheet.create({
   row: {
@@ -30445,6 +30492,10 @@ const styles$k = aphrodite.StyleSheet.create({
   },
   textField: {
     width: wonderBlocksTokens.spacing.xxxLarge_64
+  },
+  errorField: {
+    borderColor: wonderBlocksTokens.color.red,
+    backgroundColor: wonderBlocksTokens.color.fadedRed8
   }
 });
 
@@ -30536,6 +30587,7 @@ const DefiningPointSettings = props => {
     filled = true,
     label,
     showPoint = "false",
+    error,
     onChangeProps,
     onTogglePoint
   } = props;
@@ -30562,6 +30614,7 @@ const DefiningPointSettings = props => {
     }))
   }, /*#__PURE__*/React__namespace.createElement(CoordinatePairInput, {
     coord: coord,
+    error: !!error,
     onChangeProps: onChangeProps
   }), onTogglePoint && /*#__PURE__*/React__namespace.createElement(LabeledSwitch, {
     label: "show point on graph",
@@ -30662,6 +30715,7 @@ const styles$f = aphrodite.StyleSheet.create({
   }
 });
 
+const lengthZeroStr = "The line cannot have length 0.";
 const LockedLineSettings = props => {
   const {
     kind,
@@ -30683,6 +30737,7 @@ const LockedLineSettings = props => {
   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 isInvalid = point1.coord[0] === point2.coord[0] && point1.coord[1] === point2.coord[1];
   function handleChangePoint(newPointProps, index) {
     const newPoints = [...points];
     newPoints[index] = {
@@ -30735,12 +30790,12 @@ const LockedLineSettings = props => {
   }, /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     value: "line",
     label: "line"
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
-    value: "segment",
-    label: "segment"
   }), /*#__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$e.row, styles$e.spaceUnder]
   }, /*#__PURE__*/React__namespace.createElement(ColorSelect, {
@@ -30770,9 +30825,12 @@ const LockedLineSettings = props => {
   }), /*#__PURE__*/React__namespace.createElement(wonderBlocksDropdown.OptionItem, {
     value: "dashed",
     label: "dashed"
-  })))), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
+  })))), isInvalid && /*#__PURE__*/React__namespace.createElement(wonderBlocksTypography.LabelMedium, {
+    style: styles$e.errorText
+  }, lengthZeroStr), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
     label: "Point 1",
-    showPoint: showPoint1
+    showPoint: showPoint1,
+    error: isInvalid ? lengthZeroStr : null
   }, point1, {
     onTogglePoint: newValue => onChangeProps({
       showPoint1: newValue
@@ -30780,7 +30838,8 @@ const LockedLineSettings = props => {
     onChangeProps: newProps => handleChangePoint(newProps, 0)
   })), /*#__PURE__*/React__namespace.createElement(DefiningPointSettings, _extends({
     label: "Point 2",
-    showPoint: showPoint2
+    showPoint: showPoint2,
+    error: isInvalid ? lengthZeroStr : null
   }, point2, {
     onTogglePoint: newValue => onChangeProps({
       showPoint2: newValue
@@ -30807,6 +30866,9 @@ const styles$e = aphrodite.StyleSheet.create({
   selectMarginOffset: {
     // Align with the point settings accordions.
     marginInlineEnd: -wonderBlocksTokens.spacing.xxxSmall_4
+  },
+  errorText: {
+    color: wonderBlocksTokens.color.red
   }
 });
 
@@ -30963,7 +31025,8 @@ function getDefaultFigureForType(type) {
 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 [expandedStates, setExpandedStates] = React__namespace.useState(Array(props.figures?.length).fill(false));
+  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,