@khanacademy/perseus-editor 17.0.3 → 17.0.6

package/dist/index.js

@@ -6,7 +6,6 @@ var perseusCore = require('@khanacademy/perseus-core');
 var perseus = require('@khanacademy/perseus');
 var React = require('react');
 var _ = require('underscore');
-var createReactClass = require('create-react-class');
 var Clickable = require('@khanacademy/wonder-blocks-clickable');
 var wonderBlocksTokens = require('@khanacademy/wonder-blocks-tokens');
 var aphrodite = require('aphrodite');
@@ -68,7 +67,6 @@ function _interopNamespace(e) {
 
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var ___default = /*#__PURE__*/_interopDefaultLegacy(_);
-var createReactClass__default = /*#__PURE__*/_interopDefaultLegacy(createReactClass);
 var Clickable__default = /*#__PURE__*/_interopDefaultLegacy(Clickable);
 var $__default = /*#__PURE__*/_interopDefaultLegacy($);
 var Switch__default = /*#__PURE__*/_interopDefaultLegacy(Switch);
@@ -98,7 +96,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.0.3";
+const libVersion = "17.0.6";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -196,21 +194,31 @@ const DeviceFramer = _ref => {
 };
 
 /* eslint-disable @babel/no-invalid-this */
-const JsonEditor = createReactClass__default["default"]({
-  displayName: "JsonEditor",
-  getInitialState: function () {
+class JsonEditor extends React__namespace.Component {
+  static displayName;
+  static defaultProps = {
+    value: {}
+  };
+  constructor(props) {
+    super(props);
+    this.state = this.getInitialState();
+    this.handleBlur = this.handleBlur.bind(this);
+    this.handleChange = this.handleChange.bind(this);
+    this.handleKeyDown = this.handleKeyDown.bind(this);
+  }
+  getInitialState() {
     return {
       currentValue: JSON.stringify(this.props.value, null, 4),
       valid: true
     };
-  },
-  UNSAFE_componentWillReceiveProps: function (nextProps) {
-    const shouldReplaceContent = !this.state.valid || !___default["default"].isEqual(nextProps.value, JSON.parse(this.state.currentValue));
+  }
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    const shouldReplaceContent = !this.state.valid || !___default["default"].isEqual(nextProps.value, JSON.parse(this.state.currentValue ? this.state.currentValue : ""));
     if (shouldReplaceContent) {
       this.setState(this.getInitialState());
     }
-  },
-  handleKeyDown: function (e) {
+  }
+  handleKeyDown(e) {
     // This handler allows the tab character to be entered by pressing
     // tab, instead of jumping to the next (non-existant) field
     if (e.key === "Tab") {
@@ -224,8 +232,8 @@ const JsonEditor = createReactClass__default["default"]({
       e.preventDefault();
       this.handleChange(e);
     }
-  },
-  handleChange: function (e) {
+  }
+  handleChange(e) {
     const nextString = e.target.value;
     try {
       let json = JSON.parse(nextString);
@@ -249,10 +257,11 @@ const JsonEditor = createReactClass__default["default"]({
         valid: false
       });
     }
-  },
+  }
+
   // You can type whatever you want as you're typing, but if it's not valid
   // when you blur, it will revert to the last valid value.
-  handleBlur: function (e) {
+  handleBlur(e) {
     const nextString = e.target.value;
     try {
       let json = JSON.parse(nextString);
@@ -276,8 +285,8 @@ const JsonEditor = createReactClass__default["default"]({
         valid: true
       });
     }
-  },
-  render: function () {
+  }
+  render() {
     const classes = "perseus-json-editor " + (this.state.valid ? "valid" : "invalid");
     return /*#__PURE__*/React__namespace.createElement("textarea", {
       className: classes,
@@ -287,7 +296,7 @@ const JsonEditor = createReactClass__default["default"]({
       onBlur: this.handleBlur
     });
   }
-});
+}
 
 const {
   InlineIcon: InlineIcon$a
@@ -25881,63 +25890,58 @@ const defaultBackgroundImage$3 = {
 function numSteps$1(range, step) {
   return Math.floor((range[1] - range[0]) / step);
 }
-const GraphSettings = createReactClass__default["default"]({
-  displayName: "GraphSettings",
-  propTypes: {
-    ...perseus.Changeable.propTypes,
-    editableSettings: PropTypes__default["default"].arrayOf(PropTypes__default["default"].oneOf(["canvas", "graph", "snap", "image", "measure"])),
-    box: PropTypes__default["default"].arrayOf(PropTypes__default["default"].number),
-    labels: PropTypes__default["default"].arrayOf(PropTypes__default["default"].string),
-    range: PropTypes__default["default"].arrayOf(PropTypes__default["default"].arrayOf(PropTypes__default["default"].number)),
-    step: PropTypes__default["default"].arrayOf(PropTypes__default["default"].number),
-    gridStep: PropTypes__default["default"].arrayOf(PropTypes__default["default"].number),
-    snapStep: PropTypes__default["default"].arrayOf(PropTypes__default["default"].number),
-    valid: PropTypes__default["default"].oneOfType([PropTypes__default["default"].bool, PropTypes__default["default"].string]),
-    backgroundImage: PropTypes__default["default"].object,
-    markings: PropTypes__default["default"].oneOf(["graph", "grid", "none"]),
-    showProtractor: PropTypes__default["default"].bool,
-    showRuler: PropTypes__default["default"].bool,
-    showTooltips: PropTypes__default["default"].bool,
-    rulerLabel: PropTypes__default["default"].string,
-    rulerTicks: PropTypes__default["default"].number
-  },
-  getDefaultProps: function () {
-    return {
-      editableSettings: ["graph", "snap", "image", "measure"],
-      box: [perseus.interactiveSizes.defaultBoxSizeSmall, perseus.interactiveSizes.defaultBoxSizeSmall],
-      labels: ["x", "y"],
-      range: [[-10, 10], [-10, 10]],
-      step: [1, 1],
-      gridStep: [1, 1],
-      snapStep: [1, 1],
-      valid: true,
-      backgroundImage: defaultBackgroundImage$3,
-      markings: "graph",
-      showProtractor: false,
-      showRuler: false,
-      showTooltips: false,
-      rulerLabel: "",
-      rulerTicks: 10
-    };
-  },
-  getInitialState: function () {
+class GraphSettings extends React__namespace.Component {
+  static displayName;
+  static defaultProps = {
+    editableSettings: ["graph", "snap", "image", "measure"],
+    box: [perseus.interactiveSizes.defaultBoxSizeSmall, perseus.interactiveSizes.defaultBoxSizeSmall],
+    labels: ["x", "y"],
+    range: [[-10, 10], [-10, 10]],
+    step: [1, 1],
+    gridStep: [1, 1],
+    snapStep: [1, 1],
+    valid: true,
+    backgroundImage: defaultBackgroundImage$3,
+    markings: "graph",
+    rulerLabel: "",
+    rulerTicks: 10,
+    showProtractor: false,
+    showRuler: false,
+    showTooltips: false
+  };
+  _isMounted = false;
+  constructor(props) {
+    super(props);
+    this.state = this.getInitialState();
+    this.change = this.change.bind(this);
+    this.changeBackgroundUrl = this.changeBackgroundUrl.bind(this);
+    this.changeGraph = this.changeGraph.bind(this);
+    this.changeGridStep = this.changeGridStep.bind(this);
+    this.changeLabel = this.changeLabel.bind(this);
+    this.changeRange = this.changeRange.bind(this);
+    this.changeRulerLabel = this.changeRulerLabel.bind(this);
+    this.changeRulerTicks = this.changeRulerTicks.bind(this);
+    this.changeSnapStep = this.changeSnapStep.bind(this);
+    this.changeStep = this.changeStep.bind(this);
+  }
+  getInitialState() {
     return this.stateFromProps(this.props);
-  },
-  componentDidMount: function () {
+  }
+  componentDidMount() {
     // TODO(scottgrant): This is a hack to remove the deprecated call to
     // this.isMounted() but is still considered an anti-pattern.
     this._isMounted = true;
     this.changeGraph = ___default["default"].debounce(this.changeGraph, 300);
-  },
-  UNSAFE_componentWillReceiveProps: function (nextProps) {
+  }
+  UNSAFE_componentWillReceiveProps(nextProps) {
     if (!___default["default"].isEqual(this.props.labels, nextProps.labels) || !___default["default"].isEqual(this.props.gridStep, nextProps.gridStep) || !___default["default"].isEqual(this.props.snapStep, nextProps.snapStep) || !___default["default"].isEqual(this.props.step, nextProps.step) || !___default["default"].isEqual(this.props.range, nextProps.range) || !___default["default"].isEqual(this.props.backgroundImage, nextProps.backgroundImage)) {
       this.setState(this.stateFromProps(nextProps));
     }
-  },
-  componentWillUnmount: function () {
+  }
+  componentWillUnmount() {
     this._isMounted = false;
-  },
-  stateFromProps: function (props) {
+  }
+  stateFromProps(props) {
     return {
       labelsTextbox: props.labels,
       gridStepTextbox: props.gridStep,
@@ -25946,7 +25950,8 @@ const GraphSettings = createReactClass__default["default"]({
       rangeTextbox: props.range,
       backgroundImage: ___default["default"].clone(props.backgroundImage)
     };
-  },
+  }
+
   // TODO(benchristel): Refactor this component to be an ES6 class, so we can
   // type change as ChangeFn.
   change() {
@@ -25956,20 +25961,21 @@ const GraphSettings = createReactClass__default["default"]({
     // TODO(LEMS-2656): remove TS suppression
     // @ts-expect-error: Argument of type 'any[]' is not assignable to parameter of type '[newPropsOrSinglePropName: string | { [key: string]: any; }, propValue?: any, callback?: (() => unknown) | undefined]'. Target requires 1 element(s) but source may have fewer.
     return perseus.Changeable.change.apply(this, args);
-  },
+  }
+
   // TODO(aria): Make either a wrapper for standard events to work
   // with this.change, or make these use some TextInput/NumberInput box
-  changeRulerLabel: function (e) {
+  changeRulerLabel(e) {
     this.change({
       rulerLabel: e.target.value
     });
-  },
-  changeRulerTicks: function (e) {
+  }
+  changeRulerTicks(e) {
     this.change({
       rulerTicks: +e.target.value
     });
-  },
-  changeBackgroundUrl: function (e) {
+  }
+  changeBackgroundUrl(e) {
     // Only continue on blur or "enter"
     if (e.type === "keypress" && e.key !== "Enter") {
       return;
@@ -25995,8 +26001,8 @@ const GraphSettings = createReactClass__default["default"]({
     } else {
       setUrl(null, 0, 0);
     }
-  },
-  renderLabelChoices: function (choices) {
+  }
+  renderLabelChoices(choices) {
     return ___default["default"].map(choices, function (_ref) {
       let [name, value] = _ref;
       return /*#__PURE__*/React__namespace.createElement("option", {
@@ -26004,8 +26010,8 @@ const GraphSettings = createReactClass__default["default"]({
         value: value
       }, name);
     });
-  },
-  validRange: function (range) {
+  }
+  validRange(range) {
     const numbers = ___default["default"].every(range, function (num) {
       return ___default["default"].isFinite(num);
     });
@@ -26016,8 +26022,8 @@ const GraphSettings = createReactClass__default["default"]({
       return "Range must have a higher number on the right";
     }
     return true;
-  },
-  validateStepValue: function (settings) {
+  }
+  validateStepValue(settings) {
     const {
       step,
       range,
@@ -26036,8 +26042,8 @@ const GraphSettings = createReactClass__default["default"]({
       return name + " is too small, there can be at most " + maxTicks + " ticks.";
     }
     return true;
-  },
-  validSnapStep: function (step, range) {
+  }
+  validSnapStep(step, range) {
     return this.validateStepValue({
       step: step,
       range: range,
@@ -26045,8 +26051,8 @@ const GraphSettings = createReactClass__default["default"]({
       minTicks: 5,
       maxTicks: 60
     });
-  },
-  validGridStep: function (step, range) {
+  }
+  validGridStep(step, range) {
     return this.validateStepValue({
       step: step,
       range: range,
@@ -26054,8 +26060,8 @@ const GraphSettings = createReactClass__default["default"]({
       minTicks: 3,
       maxTicks: 60
     });
-  },
-  validStep: function (step, range) {
+  }
+  validStep(step, range) {
     return this.validateStepValue({
       step: step,
       range: range,
@@ -26063,8 +26069,8 @@ const GraphSettings = createReactClass__default["default"]({
       minTicks: 3,
       maxTicks: 20
     });
-  },
-  validBackgroundImageSize: function (image) {
+  }
+  validBackgroundImageSize(image) {
     // Ignore empty images
     if (!image.url) {
       return true;
@@ -26074,8 +26080,8 @@ const GraphSettings = createReactClass__default["default"]({
       return "Image must be smaller than 450px x 450px.";
     }
     return true;
-  },
-  validateGraphSettings: function (range, step, gridStep, snapStep, image) {
+  }
+  validateGraphSettings(range, step, gridStep, snapStep, image) {
     const self = this;
     let msg;
     const goodRange = ___default["default"].every(range, function (range) {
@@ -26112,16 +26118,16 @@ const GraphSettings = createReactClass__default["default"]({
       return msg;
     }
     return true;
-  },
-  changeLabel: function (i, e) {
+  }
+  changeLabel(i, e) {
     const val = e.target.value;
     const labels = this.state.labelsTextbox.slice();
     labels[i] = val;
     this.setState({
       labelsTextbox: labels
     }, this.changeGraph);
-  },
-  changeRange: function (i, values) {
+  }
+  changeRange(i, values) {
     const ranges = this.state.rangeTextbox.slice();
     ranges[i] = values;
     const step = this.state.stepTextbox.slice();
@@ -26130,6 +26136,9 @@ const GraphSettings = createReactClass__default["default"]({
     const scale = perseus.Util.scaleFromExtent(ranges[i], this.props.box[i]);
     if (this.validRange(ranges[i]) === true) {
       step[i] = perseus.Util.tickStepFromExtent(ranges[i], this.props.box[i]);
+      // Need to use the cast to number since gridStepFromTickStep
+      // can return null or undefined. Ideally in the future let's adjust
+      // the code to take this into account.
       gridStep[i] = perseus.Util.gridStepFromTickStep(step[i], scale);
       snapStep[i] = gridStep[i] / 2;
     }
@@ -26139,26 +26148,26 @@ const GraphSettings = createReactClass__default["default"]({
       snapStepTextbox: snapStep,
       rangeTextbox: ranges
     }, this.changeGraph);
-  },
-  changeStep: function (step) {
+  }
+  changeStep(step) {
     this.setState({
       stepTextbox: step
     }, this.changeGraph);
-  },
-  changeSnapStep: function (snapStep) {
+  }
+  changeSnapStep(snapStep) {
     this.setState({
       snapStepTextbox: snapStep
     }, this.changeGraph);
-  },
-  changeGridStep: function (gridStep) {
+  }
+  changeGridStep(gridStep) {
     this.setState({
       gridStepTextbox: gridStep,
       snapStepTextbox: ___default["default"].map(gridStep, function (step) {
         return step / 2;
       })
     }, this.changeGraph);
-  },
-  changeGraph: function () {
+  }
+  changeGraph() {
     const labels = this.state.labelsTextbox;
     const range = ___default["default"].map(this.state.rangeTextbox, function (range) {
       return ___default["default"].map(range, Number);
@@ -26190,9 +26199,9 @@ const GraphSettings = createReactClass__default["default"]({
         valid: validationResult // a string message, not false
       });
     }
-  },
+  }
 
-  render: function () {
+  render() {
     const scale = [perseus.KhanMath.roundTo(2, perseus.Util.scaleFromExtent(this.props.range[0], this.props.box[0])), perseus.KhanMath.roundTo(2, perseus.Util.scaleFromExtent(this.props.range[1], this.props.box[1]))];
     const {
       TeX
@@ -26379,7 +26388,7 @@ const GraphSettings = createReactClass__default["default"]({
       }, n);
     })))))));
   }
-});
+}
 
 const {
   InfoTip: InfoTip$i,
@@ -27930,20 +27939,19 @@ const {
 const {
   unescapeMathMode
 } = perseus.Util;
-const defaultInteractionProps = {
-  graph: {
-    box: [400, 400],
-    labels: ["x", "y"],
-    range: [[-10, 10], [-10, 10]],
-    tickStep: [1, 1],
-    gridStep: [1, 1],
-    markings: "graph"
-  },
-  elements: []
-};
 class InteractionEditor extends React__namespace.Component {
   static widgetName = "interaction";
-  static defaultProps = defaultInteractionProps;
+  static defaultProps = {
+    graph: {
+      box: [400, 400],
+      labels: ["x", "y"],
+      range: [[-10, 10], [-10, 10]],
+      tickStep: [1, 1],
+      gridStep: [1, 1],
+      markings: "graph"
+    },
+    elements: []
+  };
   state = {
     usedVarSubscripts: this._getAllVarSubscripts(this.props.elements),
     usedFunctionNames: this._getAllFunctionNames(this.props.elements)
@@ -28680,7 +28688,7 @@ class InteractiveGraphSettings extends React__namespace.Component {
   }
   static defaultProps = {
     box: [perseus.interactiveSizes.defaultBoxSizeSmall, perseus.interactiveSizes.defaultBoxSizeSmall],
-    labels: ["x", "y"],
+    labels: ["$x$", "$y$"],
     range: [[-10, 10], [-10, 10]],
     step: [1, 1],
     gridStep: [1, 1],