@khanacademy/perseus-editor 17.2.0 → 17.3.1

package/dist/components/graph-settings.d.ts

@@ -1,7 +1,6 @@
 import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-import type { Coords } from "@khanacademy/perseus";
-import type { MarkingsType } from "@khanacademy/perseus-core";
+import type { Coords, MarkingsType } from "@khanacademy/perseus-core";
 type Props = {
     editableSettings: ReadonlyArray<"canvas" | "graph" | "snap" | "image" | "measure">;
     box: readonly number[];

package/dist/es/index.js

@@ -1,5 +1,5 @@
-import { addLibraryVersionToPerseusDebug, PerseusError, Errors, ItemExtras, PerseusExpressionAnswerFormConsidered, lockedFigureColors, lockedFigureFillStyles, plotterPlotTypes } from '@khanacademy/perseus-core';
-import { components, Widgets, iconChevronDown, iconTrash, WIDGET_PROP_DENYLIST, Util, Log, PerseusMarkdown, preprocessTex, ApiOptions, itemDataVersion, ClassNames, Categorizer as Categorizer$1, Changeable, EditorJsonify, Dependencies, Expression, interactiveSizes, GrapherWidget, GrapherUtil, containerSizeClass, getInteractiveBoxFromSizeClass, PerseusI18nContext, KhanColors, mathOnlyParser, getAngleCoords, getPolygonCoords, getPointCoords, getQuadraticCoords, getSinusoidCoords, getCircleCoords, getLinearSystemCoords, getSegmentCoords, getLineCoords, getClockwiseAngle, InteractiveGraphWidget, bodyXsmallBold, MatrixWidget, makeSafeUrl, PlotterWidget, BaseRadio, TableWidget, widgets } from '@khanacademy/perseus';
+import { addLibraryVersionToPerseusDebug, PerseusError, Errors, ItemExtras, PerseusExpressionAnswerFormConsidered, GrapherUtil as GrapherUtil$1, lockedFigureColors, lockedFigureFillStyles, getMatrixSize, plotterPlotTypes } from '@khanacademy/perseus-core';
+import { components, Widgets, iconChevronDown, iconTrash, WIDGET_PROP_DENYLIST, Util, Log, PerseusMarkdown, preprocessTex, ApiOptions, itemDataVersion, ClassNames, Categorizer as Categorizer$1, Changeable, EditorJsonify, Dependencies, Expression, interactiveSizes, GrapherWidget, GrapherUtil, containerSizeClass, getInteractiveBoxFromSizeClass, PerseusI18nContext, KhanColors, mathOnlyParser, getAngleCoords, getPolygonCoords, getPointCoords, getQuadraticCoords, getSinusoidCoords, getCircleCoords, getLinearSystemCoords, getSegmentCoords, getLineCoords, InteractiveGraphWidget, bodyXsmallBold, MatrixWidget, makeSafeUrl, PlotterWidget, BaseRadio, TableWidget, widgets } from '@khanacademy/perseus';
 export { widgets } from '@khanacademy/perseus';
 import * as React from 'react';
 import { useId, useRef, useEffect, useState } from 'react';
@@ -20,7 +20,8 @@ import ReactDOM from 'react-dom';
 import * as KAS from '@khanacademy/kas';
 import Button from '@khanacademy/wonder-blocks-button';
 import { isTruthy, UnreachableCaseError } from '@khanacademy/wonder-stuff-core';
-import { KhanMath, vector, number } from '@khanacademy/kmath';
+import { KhanMath, vector, angles, number } from '@khanacademy/kmath';
+import { inputNumberAnswerTypes } from '@khanacademy/perseus-score';
 import { useMathInputI18n, createMathField } from '@khanacademy/math-input';
 import { SingleSelect, OptionItem, ActionMenu, ActionItem } from '@khanacademy/wonder-blocks-dropdown';
 import Banner from '@khanacademy/wonder-blocks-banner';
@@ -46,7 +47,7 @@ import arrowCounterClockwise from '@phosphor-icons/core/bold/arrow-counter-clock
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "17.2.0";
+const libVersion = "17.3.1";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -21619,7 +21620,12 @@ class Editor extends React.Component {
     if (!Widgets.getEditor(type)) {
       return;
     }
-    return /*#__PURE__*/React.createElement(WidgetEditor, _extends({
+    return /*#__PURE__*/React.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
@@ -21631,7 +21637,7 @@ class Editor extends React.Component {
       onRemove: this._handleWidgetEditorRemove.bind(this, id),
       apiOptions: this.props.apiOptions,
       widgetIsOpen: this.props.widgetIsOpen
-    }, this.props.widgets[id]));
+    }));
   }
   render() {
     let pieces;
@@ -26337,7 +26343,6 @@ const {
 const Grapher = GrapherWidget.widget;
 const {
   DEFAULT_GRAPHER_PROPS,
-  allTypes,
   chooseType,
   defaultPlotProps,
   getEquationString,
@@ -26432,7 +26437,7 @@ class GrapherEditor extends React.Component {
     }, /*#__PURE__*/React.createElement("label", null, "Available functions: "), /*#__PURE__*/React.createElement(MultiButtonGroup$1, {
       allowEmpty: false,
       values: this.props.availableTypes,
-      buttons: _.map(allTypes, typeToButton),
+      buttons: _.map(GrapherUtil$1.allTypes, typeToButton),
       onChange: this.handleAvailableTypesChange
     })), graph);
   }
@@ -26898,40 +26903,6 @@ ImageEditor.defaultProps = {
 const {
   InfoTip: InfoTip$g
 } = 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.Component {
   constructor(...args) {
     super(...args);
@@ -26958,7 +26929,7 @@ class InputNumberEditor extends React.Component {
     });
   }
   render() {
-    const answerTypeOptions = _.map(answerTypes, function (v, k) {
+    const answerTypeOptions = _.map(inputNumberAnswerTypes, function (v, k) {
       return /*#__PURE__*/React.createElement("option", {
         value: k,
         key: k
@@ -96307,6 +96278,9 @@ const styles$i = StyleSheet.create({
   }
 });
 
+const {
+  getClockwiseAngle
+} = angles;
 function getStartCoords(graph) {
   if ("startCoords" in graph) {
     return graph.startCoords;
@@ -98977,29 +98951,6 @@ const Matrix = 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 getMatrixSize(matrix) {
-  const matrixSize = [1, 1];
-
-  // We need to find the widest row and tallest column to get the correct
-  // matrix size.
-  _(matrix).each((matrixRow, row) => {
-    let rowWidth = 0;
-    _(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.Component {
   constructor(..._args) {
     super(..._args);