@khanacademy/perseus-editor 17.3.0 → 17.3.2

package/dist/index.js

@@ -23,6 +23,7 @@ var KAS = require('@khanacademy/kas');
 var Button = require('@khanacademy/wonder-blocks-button');
 var wonderStuffCore = require('@khanacademy/wonder-stuff-core');
 var kmath = require('@khanacademy/kmath');
+var perseusScore = require('@khanacademy/perseus-score');
 var mathInput = require('@khanacademy/math-input');
 var wonderBlocksDropdown = require('@khanacademy/wonder-blocks-dropdown');
 var Banner = require('@khanacademy/wonder-blocks-banner');
@@ -98,7 +99,7 @@ var arrowCounterClockwise__default = /*#__PURE__*/_interopDefaultLegacy(arrowCou
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "17.3.0";
+const libVersion = "17.3.2";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -21212,7 +21213,12 @@ class Editor extends React__namespace.Component {
     if (!perseus.Widgets.getEditor(type)) {
       return;
     }
-    return /*#__PURE__*/React__namespace.createElement(WidgetEditor, _extends({
+    return /*#__PURE__*/React__namespace.createElement(WidgetEditor
+    // The order of props matters here. We need to spread the
+    // widget data before specifying the `key` prop, to ensure the
+    // key overrides any `key` field on the widget (which might not
+    // be unique.
+    , _extends({}, this.props.widgets[id], {
       ref: id,
       id: id,
       key: id
@@ -21224,7 +21230,7 @@ class Editor extends React__namespace.Component {
       onRemove: this._handleWidgetEditorRemove.bind(this, id),
       apiOptions: this.props.apiOptions,
       widgetIsOpen: this.props.widgetIsOpen
-    }, this.props.widgets[id]));
+    }));
   }
   _handleWidgetEditorChange = (id, newWidgetInfo, cb, silent) => {
     const widgets = Object.assign({}, this.props.widgets);
@@ -26405,7 +26411,6 @@ const {
 const Grapher = perseus.GrapherWidget.widget;
 const {
   DEFAULT_GRAPHER_PROPS,
-  allTypes,
   chooseType,
   defaultPlotProps,
   getEquationString,
@@ -26511,7 +26516,7 @@ class GrapherEditor extends React__namespace.Component {
     }, /*#__PURE__*/React__namespace.createElement("label", null, "Available functions: "), /*#__PURE__*/React__namespace.createElement(MultiButtonGroup$1, {
       allowEmpty: false,
       values: this.props.availableTypes,
-      buttons: ___default["default"].map(allTypes, typeToButton),
+      buttons: ___default["default"].map(perseusCore.GrapherUtil.allTypes, typeToButton),
       onChange: this.handleAvailableTypesChange
     })), graph);
   }
@@ -26990,40 +26995,6 @@ class ImageEditor extends React__namespace.Component {
 const {
   InfoTip: InfoTip$g
 } = perseus.components;
-const answerTypes = {
-  number: {
-    name: "Numbers",
-    forms: "integer, decimal, proper, improper, mixed"
-  },
-  decimal: {
-    name: "Decimals",
-    forms: "decimal"
-  },
-  integer: {
-    name: "Integers",
-    forms: "integer"
-  },
-  rational: {
-    name: "Fractions and mixed numbers",
-    forms: "integer, proper, improper, mixed"
-  },
-  improper: {
-    name: "Improper numbers (no mixed)",
-    forms: "integer, proper, improper"
-  },
-  mixed: {
-    name: "Mixed numbers (no improper)",
-    forms: "integer, proper, mixed"
-  },
-  percent: {
-    name: "Numbers or percents",
-    forms: "integer, decimal, proper, improper, mixed, percent"
-  },
-  pi: {
-    name: "Numbers with pi",
-    forms: "pi"
-  }
-};
 class InputNumberEditor extends React__namespace.Component {
   static contextType = perseus.PerseusI18nContext;
   static widgetName = "input-number";
@@ -27057,7 +27028,7 @@ class InputNumberEditor extends React__namespace.Component {
     rightAlign: this.props.rightAlign
   });
   render() {
-    const answerTypeOptions = ___default["default"].map(answerTypes, function (v, k) {
+    const answerTypeOptions = ___default["default"].map(perseusScore.inputNumberAnswerTypes, function (v, k) {
       return /*#__PURE__*/React__namespace.createElement("option", {
         value: k,
         key: k
@@ -96493,6 +96464,9 @@ const styles$i = aphrodite.StyleSheet.create({
   }
 });
 
+const {
+  getClockwiseAngle
+} = kmath.angles;
 function getStartCoords(graph) {
   if ("startCoords" in graph) {
     return graph.startCoords;
@@ -96592,7 +96566,7 @@ const getAngleEquation = function (startCoords) {
   const vertex = startCoords[1];
 
   // Get the angle in degrees and round it to the nearest whole number
-  const roundedAngle = perseus.getClockwiseAngle(startCoords, allowReflexAngles).toFixed(0);
+  const roundedAngle = getClockwiseAngle(startCoords, allowReflexAngles).toFixed(0);
   return `${roundedAngle}\u00B0 angle at (${vertex[0]}, ${vertex[1]})`;
 };
 const shouldShowStartCoordsUI = (graph, isStatic) => {
@@ -99246,29 +99220,6 @@ const Matrix = perseus.MatrixWidget.widget;
 // Really large matrices will cause issues with question formatting, so we
 // have to cap it at some point.
 const MAX_BOARD_SIZE = 6;
-const getMatrixSize = function (matrix) {
-  const matrixSize = [1, 1];
-
-  // We need to find the widest row and tallest column to get the correct
-  // matrix size.
-  ___default["default"](matrix).each((matrixRow, row) => {
-    let rowWidth = 0;
-    ___default["default"](matrixRow).each((matrixCol, col) => {
-      if (matrixCol != null && matrixCol.toString().length) {
-        rowWidth = col + 1;
-      }
-    });
-
-    // Matrix width:
-    matrixSize[1] = Math.max(matrixSize[1], rowWidth);
-
-    // Matrix height:
-    if (rowWidth > 0) {
-      matrixSize[0] = Math.max(matrixSize[0], row + 1);
-    }
-  });
-  return matrixSize;
-};
 class MatrixEditor extends React__namespace.Component {
   static propTypes = {
     ...perseus.Changeable.propTypes,
@@ -99296,7 +99247,7 @@ class MatrixEditor extends React__namespace.Component {
     };
   })();
   onMatrixBoardSizeChange = range => {
-    const matrixSize = getMatrixSize(this.props.answers);
+    const matrixSize = perseusCore.getMatrixSize(this.props.answers);
     if (range[0] !== null && range[1] !== null) {
       range = [Math.round(Math.min(Math.max(range[0], 1), MAX_BOARD_SIZE)), Math.round(Math.min(Math.max(range[1], 1), MAX_BOARD_SIZE))];
       const answers = ___default["default"](Math.min(range[0], matrixSize[0])).times(row => {