@khanacademy/perseus-editor 2.6.8 → 2.7.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @khanacademy/perseus-editor
 
+## 2.7.1
+
+### Patch Changes
+
+-   a383823d: Bump @khanacademy/wonder-stuff-core to v1.5.1 (which adds needed support for `isTruthy` helper function)
+-   Updated dependencies [a383823d]
+    -   @khanacademy/perseus@11.2.1
+
+## 2.7.0
+
+### Minor Changes
+
+-   9ff8a575: Fix image widget caption styling
+
+### Patch Changes
+
+-   Updated dependencies [9ff8a575]
+-   Updated dependencies [1b618343]
+    -   @khanacademy/perseus@11.2.0
+
 ## 2.6.8
 
 ### Patch Changes

package/dist/es/index.css

@@ -191,6 +191,9 @@
 #perseus #problemarea #workarea {
   margin: 0;
 }
+#perseus #problemarea #workarea .perseus-image-caption {
+  top: 0px !important;
+}
 #perseus .perseus-question-container > div,
 #perseus .perseus-answer-container > div {
   padding-bottom: 25px;

package/dist/es/index.js

@@ -12,6 +12,7 @@ import ReactDOM__default from 'react-dom';
 import classNames from 'classnames';
 import { point, number, line, ray, vector } from '@khanacademy/kmath';
 import * as KAS from '@khanacademy/kas';
+import { isTruthy } from '@khanacademy/wonder-stuff-core';
 import { View } from '@khanacademy/wonder-blocks-core';
 import Spacing from '@khanacademy/wonder-blocks-spacing';
 import * as Typography from '@khanacademy/wonder-blocks-typography';
@@ -26733,13 +26734,6 @@ const {
 const {
   getDependencies: getDependencies$2
 } = Dependencies;
-const answerFormType = PropTypes.shape({
-  considered: PropTypes.oneOf(PerseusExpressionAnswerFormConsidered).isRequired,
-  value: PropTypes.string.isRequired,
-  form: PropTypes.bool.isRequired,
-  simplify: PropTypes.bool.isRequired
-});
-
 // Pick a key that isn't currently used by an answer in answerForms
 const _makeNewKey = answerForms => {
   // first note all the currently used keys in an array, used like a map :3
@@ -26769,9 +26763,6 @@ class ExpressionEditor extends React.Component {
     // TODO(joel) - sucks if you edit some expression without
     // backslashes or curly braces, then come back to the question and
     // it's surprisingly not TeX anymore.
-    this.change = (...args) => {
-      return Changeable.change.apply(this, args);
-    };
     this.serialize = () => {
       const formSerializables = ["value", "form", "simplify", "considered",
       // it's a little weird to serialize the react key, but saves some
@@ -26788,7 +26779,7 @@ class ExpressionEditor extends React.Component {
       if (this.props.answerForms.length === 0) {
         issues.push("No answers specified");
       } else {
-        const hasCorrect = !!_(this.props.answerForms).find(form => {
+        const hasCorrect = this.props.answerForms.some(form => {
           return form.considered === "correct";
         });
         if (!hasCorrect) {
@@ -26833,7 +26824,6 @@ class ExpressionEditor extends React.Component {
     this.newAnswer = () => {
       const answerForms = this.props.answerForms.slice();
       answerForms.push(this._newEmptyAnswerForm());
-      // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       this.change({
         answerForms
       });
@@ -26841,39 +26831,34 @@ class ExpressionEditor extends React.Component {
     this.handleRemoveForm = i => {
       const answerForms = this.props.answerForms.slice();
       answerForms.splice(i, 1);
-      // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       this.change({
         answerForms
       });
     };
     this.updateForm = (i, props) => {
       const answerForms = lens(this.props.answerForms).merge([i], props).freeze();
-
-      // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       this.change({
         answerForms
       });
     };
     this.handleReorder = components => {
-      const answerForms = _(components).map(component => {
+      const answerForms = components.map(component => {
         const form = _(component.props).pick("considered", "form", "simplify", "value");
         // @ts-expect-error - TS2339 - Property 'key' does not exist on type 'Pick<any, "form" | "value" | "simplify" | "considered">'.
         form.key = component.key;
         return form;
       });
-
-      // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
       this.change({
         answerForms
       });
     };
     this.handleButtonSet = changingName => {
-      const buttonSetNames = _(TexButtons.buttonSets).keys();
+      const buttonSetNames = Object.keys(TexButtons.buttonSets);
 
       // Filter to preserve order - using .union and .difference would always
       // move the last added button set to the end.
-      const buttonSets = _(buttonSetNames).filter(set => {
-        return _(this.props.buttonSets).contains(set) !== (set === changingName);
+      const buttonSets = buttonSetNames.filter(set => {
+        return this.props.buttonSets.includes(set) !== (set === changingName);
       });
       this.props.onChange({
         buttonSets
@@ -26884,17 +26869,16 @@ class ExpressionEditor extends React.Component {
       // "basic+div". Toggle between the two of them.
       // If someone can think of a more elegant formulation of this (there
       // must be one!) feel free to change it.
-      let keep, remove;
-      if (_(this.props.buttonSets).contains("basic+div")) {
+      let keep;
+      let remove;
+      if (this.props.buttonSets.includes("basic+div")) {
         keep = "basic";
         remove = "basic+div";
       } else {
         keep = "basic+div";
         remove = "basic";
       }
-      const buttonSets = _(this.props.buttonSets).reject(set => set === remove).concat(keep);
-
-      // @ts-expect-error - TS2554 - Expected 3 arguments, but got 2.
+      const buttonSets = this.props.buttonSets.filter(set => set !== remove).concat(keep);
       this.change("buttonSets", buttonSets);
     };
     this.handleTexInsert = str => {
@@ -26904,7 +26888,7 @@ class ExpressionEditor extends React.Component {
     };
     this.handleFunctions = e => {
       const newProps = {};
-      newProps.functions = _.compact(e.target.value.split(/[ ,]+/));
+      newProps.functions = e.target.value.split(/[ ,]+/).filter(isTruthy);
       this.props.onChange(newProps);
     };
     let isTex;
@@ -26912,18 +26896,21 @@ class ExpressionEditor extends React.Component {
     if (_props.answerForms.length === 0) {
       isTex = true;
     } else {
-      isTex = _(_props.answerForms).any(form => {
+      isTex = _props.answerForms.some(form => {
         const {
           value
         } = form;
         // only TeX has backslashes and curly braces
-        return _.indexOf(value, "\\") !== -1 || _.indexOf(value, "{") !== -1;
+        return value.indexOf("\\") !== -1 || value.indexOf("{") !== -1;
       });
     }
     this.state = {
       isTex
     };
   }
+  change(...args) {
+    return Changeable.change.apply(this, args);
+  }
   render() {
     const answerOptions = this.props.answerForms.map((obj, index) => {
       const expressionProps = {
@@ -26957,11 +26944,11 @@ class ExpressionEditor extends React.Component {
     });
 
     // checkboxes to choose which sets of input buttons are shown
-    const buttonSetChoices = _(TexButtons.buttonSets).map((set, name) => {
+    const buttonSetChoices = Object.keys(TexButtons.buttonSets).map(name => {
       // The first one gets special cased to always be checked, disabled,
       // and float left.
       const isFirst = name === "basic";
-      const checked = _.contains(this.props.buttonSets, name) || isFirst;
+      const checked = this.props.buttonSets.includes(name) || isFirst;
       const className = isFirst ? "button-set-label-float" : "button-set-label";
       return /*#__PURE__*/React.createElement("label", {
         className: className,
@@ -27021,12 +27008,6 @@ class ExpressionEditor extends React.Component {
 }
 
 // Find the next element in arr after val, wrapping around to the first.
-ExpressionEditor.propTypes = _extends({}, Changeable.propTypes, {
-  answerForms: PropTypes.arrayOf(answerFormType),
-  times: PropTypes.bool,
-  buttonSets: TexButtons.buttonSetsType,
-  functions: PropTypes.arrayOf(PropTypes.string)
-});
 ExpressionEditor.widgetName = "expression";
 ExpressionEditor.defaultProps = {
   answerForms: [],
@@ -27071,7 +27052,6 @@ class AnswerOption extends React.Component {
   render() {
     let removeButton = null;
     if (this.state.deleteFocused) {
-      // @ts-expect-error - TS2322 - Type 'Element' is not assignable to type 'null'.
       removeButton = /*#__PURE__*/React.createElement("button", {
         type: "button",
         className: "simple-button orange",
@@ -27079,7 +27059,6 @@ class AnswerOption extends React.Component {
         onBlur: this.handleDeleteBlur
       }, "I'm sure!");
     } else {
-      // @ts-expect-error - TS2322 - Type 'Element' is not assignable to type 'null'.
       removeButton = /*#__PURE__*/React.createElement("button", {
         type: "button",
         className: "simple-button orange",
@@ -27118,16 +27097,6 @@ class AnswerOption extends React.Component {
     }, removeButton)));
   }
 }
-AnswerOption.propTypes = _extends({}, Changeable.propTypes, {
-  considered: PropTypes.oneOf(PerseusExpressionAnswerFormConsidered).isRequired,
-  expressionProps: PropTypes.object.isRequired,
-  // Must the answer have the same form as this answer.
-  form: PropTypes.bool.isRequired,
-  // Must the answer be simplified.
-  simplify: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
-  onDelete: PropTypes.func.isRequired
-});
 
 const {
   InlineIcon: InlineIcon$5,