@khanacademy/perseus-editor 4.2.2 → 4.2.4

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

@@ -1,2 +1,85 @@
-declare const GraphSettings: any;
+import * as React from "react";
+import type { PerseusImageBackground } from "@khanacademy/perseus";
+type EditableSetting = "canvas" | "graph" | "snap" | "image" | "measure";
+type Props = {
+    editableSettings: ReadonlyArray<EditableSetting>;
+    box: [number, number];
+    labels: ReadonlyArray<string>;
+    range: [[number, number], [number, number]];
+    step: [number, number];
+    gridStep: [number, number];
+    snapStep: [number, number];
+    valid: boolean | string;
+    backgroundImage: PerseusImageBackground;
+    markings: "graph" | "grid" | "none";
+    showProtractor: boolean;
+    showRuler: boolean;
+    showTooltips: boolean;
+    rulerLabel: string;
+    rulerTicks: number;
+    onChange: (arg1: Partial<Props>) => void;
+};
+type State = {
+    labelsTextbox: ReadonlyArray<string>;
+    gridStepTextbox: [number, number];
+    snapStepTextbox: [number, number];
+    stepTextbox: [number, number];
+    rangeTextbox: [[number, number], [number, number]];
+    backgroundImage: PerseusImageBackground;
+};
+declare class GraphSettings extends React.Component<Props, State> {
+    _isMounted: boolean;
+    static stateFromProps(props: any): {
+        labelsTextbox: any;
+        gridStepTextbox: any;
+        snapStepTextbox: any;
+        stepTextbox: any;
+        rangeTextbox: any;
+        backgroundImage: any;
+    };
+    constructor(props: Props);
+    static defaultProps: {
+        editableSettings: string[];
+        box: 288[];
+        labels: string[];
+        range: number[][];
+        step: number[];
+        gridStep: number[];
+        snapStep: number[];
+        valid: boolean;
+        backgroundImage: {
+            readonly url: null;
+            readonly width: 0;
+            readonly height: 0;
+        };
+        markings: string;
+        showProtractor: boolean;
+        showRuler: boolean;
+        showTooltips: boolean;
+        rulerLabel: string;
+        rulerTicks: number;
+    };
+    componentDidMount(): void;
+    UNSAFE_componentWillReceiveProps(nextProps: any): void;
+    componentWillUnmount(): void;
+    change(...args: any[]): any;
+    changeRulerLabel(e: any): void;
+    changeRulerTicks(e: any): void;
+    changeBackgroundUrl(e: any): void;
+    renderLabelChoices(choices: any): JSX.Element[];
+    validRange(range: any): true | "Range must be a valid number" | "Range must have a higher number on the right";
+    validateStepValue(settings: any): string | true;
+    validSnapStep(step: any, range: any): string | true;
+    validGridStep(step: any, range: any): string | true;
+    validStep(step: any, range: any): string | true;
+    validBackgroundImageSize(image: any): true | "Image must be smaller than 450px x 450px.";
+    validateGraphSettings(range: any, step: any, gridStep: any, snapStep: any, image: any): any;
+    changeLabel(i: any, e: any): void;
+    changeRange(i: any, values: any): void;
+    changeStep(step: any): void;
+    changeSnapStep(snapStep: any): void;
+    changeGridStep(gridStep: any): void;
+    changeGraph(): void;
+    render(): JSX.Element;
+}
 export default GraphSettings;

package/dist/es/index.js

@@ -25,7 +25,7 @@ import * as i18n$1 from '@khanacademy/wonder-blocks-i18n';
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus-editor";
-const libVersion = "4.2.2";
+const libVersion = "4.2.4";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 function _extends() {
@@ -27170,6 +27170,7 @@ GradedGroupSetEditor.defaultProps = {
 };
 const setArrayItem = (list, i, value) => [...list.slice(0, i), value, ...list.slice(i + 1)];
 
+/* eslint-disable react/forbid-prop-types, react/no-unsafe */
 const {
   ButtonGroup: ButtonGroup$3,
   InfoTip: InfoTip$h,
@@ -27187,89 +27188,55 @@ const defaultBackgroundImage$2 = {
 function numSteps(range, step) {
   return Math.floor((range[1] - range[0]) / step);
 }
-const GraphSettings = createReactClass({
-  displayName: "GraphSettings",
-  propTypes: _extends({}, Changeable.propTypes, {
-    editableSettings: PropTypes.arrayOf(PropTypes.oneOf(["canvas", "graph", "snap", "image", "measure"])),
-    box: PropTypes.arrayOf(PropTypes.number),
-    labels: PropTypes.arrayOf(PropTypes.string),
-    range: PropTypes.arrayOf(PropTypes.arrayOf(PropTypes.number)),
-    step: PropTypes.arrayOf(PropTypes.number),
-    gridStep: PropTypes.arrayOf(PropTypes.number),
-    snapStep: PropTypes.arrayOf(PropTypes.number),
-    valid: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
-    backgroundImage: PropTypes.object,
-    markings: PropTypes.oneOf(["graph", "grid", "none"]),
-    showProtractor: PropTypes.bool,
-    showRuler: PropTypes.bool,
-    showTooltips: PropTypes.bool,
-    rulerLabel: PropTypes.string,
-    rulerTicks: PropTypes.number
-  }),
-  getDefaultProps: function () {
+class GraphSettings extends React.Component {
+  static stateFromProps(props) {
     return {
-      editableSettings: ["graph", "snap", "image", "measure"],
-      box: [interactiveSizes.defaultBoxSizeSmall, interactiveSizes.defaultBoxSizeSmall],
-      labels: ["x", "y"],
-      range: [[-10, 10], [-10, 10]],
-      step: [1, 1],
-      gridStep: [1, 1],
-      snapStep: [1, 1],
-      valid: true,
-      backgroundImage: defaultBackgroundImage$2,
-      markings: "graph",
-      showProtractor: false,
-      showRuler: false,
-      showTooltips: false,
-      rulerLabel: "",
-      rulerTicks: 10
+      labelsTextbox: props.labels,
+      gridStepTextbox: props.gridStep,
+      snapStepTextbox: props.snapStep,
+      stepTextbox: props.step,
+      rangeTextbox: props.range,
+      backgroundImage: _.clone(props.backgroundImage)
     };
-  },
-  getInitialState: function () {
-    return this.stateFromProps(this.props);
-  },
-  componentDidMount: function () {
+  }
+  constructor(props) {
+    super(props);
+    this._isMounted = false;
+    this.state = GraphSettings.stateFromProps(props);
+  }
+  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 = _.debounce(this.changeGraph, 300);
-  },
-  UNSAFE_componentWillReceiveProps: function (nextProps) {
+  }
+  UNSAFE_componentWillReceiveProps(nextProps) {
     // Make sure that state updates when switching
     // between different items in a multi-item editor.
     if (!_.isEqual(this.props.labels, nextProps.labels) || !_.isEqual(this.props.gridStep, nextProps.gridStep) || !_.isEqual(this.props.snapStep, nextProps.snapStep) || !_.isEqual(this.props.step, nextProps.step) || !_.isEqual(this.props.range, nextProps.range) || !_.isEqual(this.props.backgroundImage, nextProps.backgroundImage)) {
-      this.setState(this.stateFromProps(nextProps));
+      this.setState(GraphSettings.stateFromProps(nextProps));
     }
-  },
-  componentWillUnmount: function () {
+  }
+  componentWillUnmount() {
     this._isMounted = false;
-  },
-  stateFromProps: function (props) {
-    return {
-      labelsTextbox: props.labels,
-      gridStepTextbox: props.gridStep,
-      snapStepTextbox: props.snapStep,
-      stepTextbox: props.step,
-      rangeTextbox: props.range,
-      backgroundImage: _.clone(props.backgroundImage)
-    };
-  },
+  }
   change(...args) {
     return 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;
@@ -27295,15 +27262,15 @@ const GraphSettings = createReactClass({
     } else {
       setUrl(null, 0, 0);
     }
-  },
-  renderLabelChoices: function (choices) {
+  }
+  renderLabelChoices(choices) {
     return _.map(choices, function (nameAndValue) {
       return /*#__PURE__*/React.createElement("option", {
         value: nameAndValue[1]
       }, nameAndValue[0]);
     });
-  },
-  validRange: function (range) {
+  }
+  validRange(range) {
     const numbers = _.every(range, function (num) {
       return _.isFinite(num);
     });
@@ -27314,8 +27281,8 @@ const GraphSettings = createReactClass({
       return "Range must have a higher number on the right";
     }
     return true;
-  },
-  validateStepValue: function (settings) {
+  }
+  validateStepValue(settings) {
     const {
       step,
       range,
@@ -27334,8 +27301,8 @@ const GraphSettings = createReactClass({
       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,
@@ -27343,8 +27310,8 @@ const GraphSettings = createReactClass({
       minTicks: 5,
       maxTicks: 60
     });
-  },
-  validGridStep: function (step, range) {
+  }
+  validGridStep(step, range) {
     return this.validateStepValue({
       step: step,
       range: range,
@@ -27352,8 +27319,8 @@ const GraphSettings = createReactClass({
       minTicks: 3,
       maxTicks: 60
     });
-  },
-  validStep: function (step, range) {
+  }
+  validStep(step, range) {
     return this.validateStepValue({
       step: step,
       range: range,
@@ -27361,8 +27328,8 @@ const GraphSettings = createReactClass({
       minTicks: 3,
       maxTicks: 20
     });
-  },
-  validBackgroundImageSize: function (image) {
+  }
+  validBackgroundImageSize(image) {
     // Ignore empty images
     if (!image.url) {
       return true;
@@ -27372,8 +27339,8 @@ const GraphSettings = createReactClass({
       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 = _.every(range, function (range) {
@@ -27410,16 +27377,16 @@ const GraphSettings = createReactClass({
       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();
@@ -27428,7 +27395,10 @@ const GraphSettings = createReactClass({
     const scale = Util.scaleFromExtent(ranges[i], this.props.box[i]);
     if (this.validRange(ranges[i]) === true) {
       step[i] = Util.tickStepFromExtent(ranges[i], this.props.box[i]);
-      gridStep[i] = Util.gridStepFromTickStep(step[i], scale);
+      const gridStepValue = Util.gridStepFromTickStep(step[i], scale);
+      if (gridStepValue) {
+        gridStep[i] = gridStepValue;
+      }
       snapStep[i] = gridStep[i] / 2;
     }
     this.setState({
@@ -27437,26 +27407,26 @@ const GraphSettings = createReactClass({
       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: _.map(gridStep, function (step) {
         return step / 2;
       })
     }, this.changeGraph);
-  },
-  changeGraph: function () {
+  }
+  changeGraph() {
     const labels = this.state.labelsTextbox;
     const range = _.map(this.state.rangeTextbox, function (range) {
       return _.map(range, Number);
@@ -27488,9 +27458,9 @@ const GraphSettings = createReactClass({
         valid: validationResult // a string message, not false
       });
     }
-  },
+  }
 
-  render: function () {
+  render() {
     const scale = [KhanMath.roundTo(2, Util.scaleFromExtent(this.props.range[0], this.props.box[0])), KhanMath.roundTo(2, Util.scaleFromExtent(this.props.range[1], this.props.box[1]))];
     const {
       TeX
@@ -27637,7 +27607,24 @@ const GraphSettings = createReactClass({
       }, n);
     })))))));
   }
-});
+}
+GraphSettings.defaultProps = {
+  editableSettings: ["graph", "snap", "image", "measure"],
+  box: [interactiveSizes.defaultBoxSizeSmall, interactiveSizes.defaultBoxSizeSmall],
+  labels: ["x", "y"],
+  range: [[-10, 10], [-10, 10]],
+  step: [1, 1],
+  gridStep: [1, 1],
+  snapStep: [1, 1],
+  valid: true,
+  backgroundImage: defaultBackgroundImage$2,
+  markings: "graph",
+  showProtractor: false,
+  showRuler: false,
+  showTooltips: false,
+  rulerLabel: "",
+  rulerTicks: 10
+};
 
 const {
   InfoTip: InfoTip$g,