@khanacademy/perseus-editor 2.6.0 → 2.6.2

package/src/widgets/plotter-editor.tsx

@@ -1,4 +1,5 @@
-/* eslint-disable @babel/no-invalid-this, one-var, react/no-unsafe, react/sort-comp */
+/* eslint-disable @khanacademy/ts-no-error-suppressions */
+/* eslint-disable react/no-unsafe */
 import {number as knumber} from "@khanacademy/kmath";
 import {
     components,
@@ -6,7 +7,6 @@ import {
     PlotterWidget,
     Util,
 } from "@khanacademy/perseus";
-import PropTypes from "prop-types";
 import * as React from "react";
 import ReactDOM from "react-dom";
 import _ from "underscore";
@@ -16,11 +16,20 @@ import BlurInput from "../components/blur-input";
 const {InfoTip, NumberInput, RangeInput, TextListEditor} = components;
 const Plotter = PlotterWidget.widget;
 
-const BAR = "bar",
-    LINE = "line",
-    PIC = "pic",
-    HISTOGRAM = "histogram",
-    DOTPLOT = "dotplot";
+const BAR = "bar";
+const LINE = "line";
+const PIC = "pic";
+const HISTOGRAM = "histogram";
+const DOTPLOT = "dotplot";
+
+const plotTypes = [BAR, LINE, PIC, HISTOGRAM, DOTPLOT];
+type PlotType = typeof plotTypes[number];
+
+const STARTING = "starting";
+const CORRECT = "correct";
+
+const editingStates = [STARTING, CORRECT];
+type EditingState = typeof editingStates[number];
 
 // Return a copy of array with length n, padded with given value
 function padArray(array: any, n, value: any) {
@@ -38,39 +47,55 @@ const editorDefaults = {
     snapsPerLine: 2,
 } as const;
 
-const widgetPropTypes = {
-    type: PropTypes.oneOf([BAR, LINE, PIC, HISTOGRAM, DOTPLOT]),
-    labels: PropTypes.arrayOf(PropTypes.string),
-    categories: PropTypes.arrayOf(
-        PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-    ),
-
-    scaleY: PropTypes.number,
-    maxY: PropTypes.number,
-    snapsPerLine: PropTypes.number,
-
-    picSize: PropTypes.number,
-    pixBoxHeight: PropTypes.number,
-    picUrl: PropTypes.string,
-
-    plotDimensions: PropTypes.arrayOf(PropTypes.number),
-    labelInterval: PropTypes.number,
-    starting: PropTypes.arrayOf(PropTypes.number),
-    correct: PropTypes.arrayOf(PropTypes.number),
-    static: PropTypes.bool,
-    onChange: PropTypes.func,
-} as const;
+type Props = {
+    type: PlotType;
+    labels: Array<string>;
+    categories: ReadonlyArray<string | number>;
+    scaleY: number;
+    maxY: number;
+    snapsPerLine: number;
+    picSize: number;
+    picBoxHeight: number;
+    picUrl: string;
+    plotDimensions: ReadonlyArray<number>;
+    labelInterval: number;
+    starting: ReadonlyArray<number>;
+    correct: ReadonlyArray<number>;
+    static: boolean;
+    onChange: any;
+};
+
+type DefaultProps = {
+    scaleY: Props["scaleY"];
+    maxY: Props["maxY"];
+    snapsPerLine: Props["snapsPerLine"];
+    correct: Props["correct"];
+    starting: Props["starting"];
+    type: Props["type"];
+    labels: Props["labels"];
+    categories: Props["categories"];
+    picSize: Props["picSize"];
+    picBoxHeight: Props["picBoxHeight"];
+    plotDimensions: Props["plotDimensions"];
+    labelInterval: Props["labelInterval"];
+    picUrl: Props["picUrl"];
+};
+
+type State = {
+    editing: EditingState;
+    pic: any;
+    loadedUrl: string | null;
+    minX: number | null;
+    maxX: number | null;
+    tickStep: number | null;
+};
 
 const formatNumber = (num) => "$" + knumber.round(num, 2) + "$";
 
-type Props = any;
-type State = any;
-
 class PlotterEditor extends React.Component<Props, State> {
-    static propTypes = widgetPropTypes;
     static widgetName = "plotter" as const;
 
-    static defaultProps: Props = {
+    static defaultProps: DefaultProps = {
         ...editorDefaults,
         correct: [1],
         starting: [1],
@@ -84,6 +109,7 @@ class PlotterEditor extends React.Component<Props, State> {
         plotDimensions: [275, 200],
         labelInterval: 1,
 
+        // @ts-expect-error - TS2322
         get picUrl() {
             const staticUrl = Dependencies.getDependencies().staticUrl;
             if (staticUrl) {
@@ -95,7 +121,7 @@ class PlotterEditor extends React.Component<Props, State> {
     };
 
     state: State = {
-        editing: this.props.static ? "starting" : "correct",
+        editing: this.props.static ? STARTING : CORRECT,
         pic: null,
         loadedUrl: null,
         minX: null,
@@ -131,6 +157,169 @@ class PlotterEditor extends React.Component<Props, State> {
         }
     };
 
+    handleChangeTickStep: (arg1: number) => void = (value) => {
+        this.setState({
+            tickStep: value,
+        });
+    };
+
+    handleChangeRange: (arg1: [number, number]) => void = (newValue) => {
+        this.setState({
+            minX: newValue[0],
+            maxX: newValue[1],
+        });
+    };
+
+    changeLabelInterval: (arg1: number) => void = (value) => {
+        this.props.onChange({
+            labelInterval: value,
+        });
+    };
+
+    handlePlotterChange: (arg1: any) => void = (newProps) => {
+        const props: Record<string, any> = {};
+        props[this.state.editing] = newProps.values;
+        this.props.onChange(props);
+    };
+
+    changeType: (arg1: any) => void = (type) => {
+        let categories;
+        if (type === HISTOGRAM) {
+            // Switching to histogram, add a label (0) to the left
+            // @ts-expect-error - TS2769
+            categories = [formatNumber(0)].concat(this.props.categories);
+            this.props.onChange({type: type, categories: categories});
+        } else if (this.props.type === HISTOGRAM) {
+            // Switching from histogram, remove a label from the left
+            categories = this.props.categories.slice(1);
+            this.props.onChange({type: type, categories: categories});
+        } else {
+            this.props.onChange({type: type});
+        }
+
+        if (categories) {
+            // eslint-disable-next-line react/no-string-refs
+            const node = ReactDOM.findDOMNode(this.refs.categories);
+            // @ts-expect-error - TS2531 - Object is possibly 'null'. | TS2339 - Property 'value' does not exist on type 'Element | Text'.
+            node.value = categories.join(", ");
+        }
+    };
+
+    changeLabel: (arg1: number, arg2: any) => void = (i, e) => {
+        const labels = _.clone(this.props.labels);
+        labels[i] = e.target.value;
+        this.props.onChange({labels: labels});
+    };
+
+    changePicUrl: (arg1: string) => void = (value) => {
+        // We don't need the labels and other data in the plotter, so just
+        // extract the raw image and use that.
+        // TODO(emily): Maybe indicate that such a change has happened?
+        const url = Util.getRealImageUrl(value);
+
+        this.props.onChange({picUrl: url});
+    };
+
+    changeCategories: (arg1: any) => void = (categories) => {
+        let n = categories.length;
+        if (this.props.type === HISTOGRAM) {
+            // Histograms with n labels/categories have n - 1 buckets
+            n--;
+        }
+        const value = this.props.scaleY;
+
+        this.props.onChange({
+            categories: categories,
+            correct: padArray(this.props.correct, n, value),
+            starting: padArray(this.props.starting, n, value),
+        });
+    };
+
+    changeScale: (arg1: any) => void = (e) => {
+        const oldScale = this.props.scaleY;
+        const newScale = +e.target.value || editorDefaults.scaleY;
+
+        const scale = function (value: any) {
+            return (value * newScale) / oldScale;
+        };
+
+        const maxY = scale(this.props.maxY);
+
+        this.props.onChange({
+            scaleY: newScale,
+            maxY: maxY,
+            correct: _.map(this.props.correct, scale),
+            starting: _.map(this.props.starting, scale),
+        });
+
+        // @ts-expect-error - TS2531 - Object is possibly 'null'. | TS2339 - Property 'value' does not exist on type 'Element | Text'.
+        ReactDOM.findDOMNode(this.refs.maxY).value = maxY; // eslint-disable-line react/no-string-refs
+    };
+
+    changeMax: (arg1: any) => void = (e) => {
+        this.props.onChange({
+            maxY: +e.target.value || editorDefaults.maxY,
+        });
+    };
+
+    changeSnaps: (arg1: any) => void = (e) => {
+        this.props.onChange({
+            snapsPerLine: +e.target.value || editorDefaults.snapsPerLine,
+        });
+    };
+
+    changeEditing: (arg1: EditingState) => void = (editing) => {
+        this.setState({editing: editing});
+    };
+
+    setCategoriesFromScale: () => void = () => {
+        const scale = this.state.tickStep || 1;
+        const min = this.state.minX || 0;
+        const max = this.state.maxX || 0;
+        const length = Math.floor((max - min) / scale) * scale;
+
+        let categories;
+        if (this.props.type === HISTOGRAM || this.props.type === DOTPLOT) {
+            // Ranges for histogram and dotplot labels should start at zero
+            categories = _.range(0, length + scale, scale);
+        } else {
+            categories = _.range(scale, length + scale, scale);
+        }
+
+        categories = _.map(categories, (num) => num + min);
+        categories = _.map(categories, formatNumber);
+
+        this.changeCategories(categories);
+
+        // eslint-disable-next-line react/no-string-refs
+        const node = ReactDOM.findDOMNode(this.refs.categories);
+
+        // @ts-expect-error - TS2531 - Object is possibly 'null'. | TS2339 - Property 'value' does not exist on type 'Element | Text'.
+        node.value = categories.join(", ");
+    };
+
+    serialize: () => any = () => {
+        const json = _.pick(
+            this.props,
+            "correct",
+            "starting",
+            "type",
+            "labels",
+            "categories",
+            "scaleY",
+            "maxY",
+            "snapsPerLine",
+            "labelInterval",
+        );
+
+        if (this.props.type === PIC) {
+            // @ts-expect-error - TS2339 - Property 'picUrl' does not exist on type 'Pick<Readonly<any> & Readonly<{ children?: ReactNode; }>, "type" | "correct" | "labels" | "categories" | "starting" | "scaleY" | "maxY" | "snapsPerLine" | "labelInterval">'.
+            json.picUrl = this.props.picUrl;
+        }
+
+        return json;
+    };
+
     render(): React.ReactNode {
         const setFromScale = _.contains(
             [LINE, HISTOGRAM, DOTPLOT],
@@ -146,52 +335,34 @@ class PlotterEditor extends React.Component<Props, State> {
             <div className="perseus-widget-plotter-editor">
                 <div>
                     Chart type:{" "}
-                    {_.map(
-                        [BAR, LINE, PIC, HISTOGRAM, DOTPLOT],
-                        function (type) {
-                            return (
-                                <label key={type}>
-                                    <input
-                                        type="radio"
-                                        name="chart-type"
-                                        // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-                                        checked={this.props.type === type}
-                                        onChange={_.partial(
-                                            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-                                            this.changeType,
-                                            type,
-                                        )}
-                                    />
-                                    {type}
-                                </label>
-                            );
-                        },
-                        this,
-                    )}
+                    {plotTypes.map((type) => {
+                        return (
+                            <label key={type}>
+                                <input
+                                    type="radio"
+                                    name="chart-type"
+                                    checked={this.props.type === type}
+                                    onChange={_.partial(this.changeType, type)}
+                                />
+                                {type}
+                            </label>
+                        );
+                    }, this)}
                 </div>
                 <div>
                     Labels:{" "}
-                    {_.map(
-                        ["x", "y"],
-                        function (axis, i) {
-                            return (
-                                <label key={axis}>
-                                    {axis + ":"}
-                                    <input
-                                        type="text"
-                                        onChange={_.partial(
-                                            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-                                            this.changeLabel,
-                                            i,
-                                        )}
-                                        // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-                                        defaultValue={this.props.labels[i]}
-                                    />
-                                </label>
-                            );
-                        },
-                        this,
-                    )}
+                    {["x", "y"].map((axis, i) => {
+                        return (
+                            <label key={axis}>
+                                {axis + ":"}
+                                <input
+                                    type="text"
+                                    onChange={_.partial(this.changeLabel, i)}
+                                    defaultValue={this.props.labels[i]}
+                                />
+                            </label>
+                        );
+                    }, this)}
                 </div>
 
                 {setFromScale && (
@@ -332,16 +503,16 @@ class PlotterEditor extends React.Component<Props, State> {
                 )}
                 <div>
                     Editing values:{" "}
-                    {["correct", "starting"].map((editing) => (
+                    {editingStates.map((editing) => (
                         <label key={editing}>
                             <input
                                 type="radio"
                                 disabled={
-                                    editing === "correct" && this.props.static
+                                    editing === CORRECT && this.props.static
                                 }
                                 checked={
                                     this.props.static
-                                        ? editing === "starting"
+                                        ? editing === STARTING
                                         : this.state.editing === editing
                                 }
                                 onChange={(e) => this.changeEditing(editing)}
@@ -363,6 +534,7 @@ class PlotterEditor extends React.Component<Props, State> {
                         </p>
                     </InfoTip>
                 </div>
+                {/* @ts-expect-error - TS2769 */}
                 <Plotter
                     {...props}
                     starting={this.props[this.state.editing]}
@@ -371,168 +543,6 @@ class PlotterEditor extends React.Component<Props, State> {
             </div>
         );
     }
-
-    handleChangeTickStep: (arg1: number) => void = (value) => {
-        this.setState({
-            tickStep: value,
-        });
-    };
-
-    handleChangeRange: (arg1: [number, number]) => void = (newValue) => {
-        this.setState({
-            minX: newValue[0],
-            maxX: newValue[1],
-        });
-    };
-
-    changeLabelInterval: (arg1: number) => void = (value) => {
-        this.props.onChange({
-            labelInterval: value,
-        });
-    };
-
-    handlePlotterChange: (arg1: any) => void = (newProps) => {
-        const props: Record<string, any> = {};
-        props[this.state.editing] = newProps.values;
-        this.props.onChange(props);
-    };
-
-    changeType: (arg1: any) => void = (type) => {
-        let categories;
-        if (type === HISTOGRAM) {
-            // Switching to histogram, add a label (0) to the left
-            categories = [formatNumber(0)].concat(this.props.categories);
-            this.props.onChange({type: type, categories: categories});
-        } else if (this.props.type === HISTOGRAM) {
-            // Switching from histogram, remove a label from the left
-            categories = this.props.categories.slice(1);
-            this.props.onChange({type: type, categories: categories});
-        } else {
-            this.props.onChange({type: type});
-        }
-
-        if (categories) {
-            // eslint-disable-next-line react/no-string-refs
-            const node = ReactDOM.findDOMNode(this.refs.categories);
-            // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'. | TS2339 - Property 'value' does not exist on type 'Element | Text'.
-            node.value = categories.join(", ");
-        }
-    };
-
-    changeLabel: (arg1: number, arg2: any) => void = (i, e) => {
-        const labels = _.clone(this.props.labels);
-        labels[i] = e.target.value;
-        this.props.onChange({labels: labels});
-    };
-
-    changePicUrl: (arg1: string) => void = (value) => {
-        // We don't need the labels and other data in the plotter, so just
-        // extract the raw image and use that.
-        // TODO(emily): Maybe indicate that such a change has happened?
-        const url = Util.getRealImageUrl(value);
-
-        this.props.onChange({picUrl: url});
-    };
-
-    changeCategories: (arg1: any) => void = (categories) => {
-        let n = categories.length;
-        if (this.props.type === HISTOGRAM) {
-            // Histograms with n labels/categories have n - 1 buckets
-            n--;
-        }
-        const value = this.props.scaleY;
-
-        this.props.onChange({
-            categories: categories,
-            correct: padArray(this.props.correct, n, value),
-            starting: padArray(this.props.starting, n, value),
-        });
-    };
-
-    changeScale: (arg1: any) => void = (e) => {
-        const oldScale = this.props.scaleY;
-        const newScale = +e.target.value || editorDefaults.scaleY;
-
-        const scale = function (value: any) {
-            return (value * newScale) / oldScale;
-        };
-
-        const maxY = scale(this.props.maxY);
-
-        this.props.onChange({
-            scaleY: newScale,
-            maxY: maxY,
-            correct: _.map(this.props.correct, scale),
-            starting: _.map(this.props.starting, scale),
-        });
-
-        // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'. | TS2339 - Property 'value' does not exist on type 'Element | Text'.
-        ReactDOM.findDOMNode(this.refs.maxY).value = maxY; // eslint-disable-line react/no-string-refs
-    };
-
-    changeMax: (arg1: any) => void = (e) => {
-        this.props.onChange({
-            maxY: +e.target.value || editorDefaults.maxY,
-        });
-    };
-
-    changeSnaps: (arg1: any) => void = (e) => {
-        this.props.onChange({
-            snapsPerLine: +e.target.value || editorDefaults.snapsPerLine,
-        });
-    };
-
-    changeEditing: (arg1: string) => void = (editing) => {
-        this.setState({editing: editing});
-    };
-
-    setCategoriesFromScale: () => void = () => {
-        const scale = this.state.tickStep || 1;
-        const min = this.state.minX || 0;
-        const max = this.state.maxX || 0;
-        const length = Math.floor((max - min) / scale) * scale;
-
-        let categories;
-        if (this.props.type === HISTOGRAM || this.props.type === DOTPLOT) {
-            // Ranges for histogram and dotplot labels should start at zero
-            categories = _.range(0, length + scale, scale);
-        } else {
-            categories = _.range(scale, length + scale, scale);
-        }
-
-        categories = _.map(categories, (num) => num + min);
-        categories = _.map(categories, formatNumber);
-
-        this.changeCategories(categories);
-
-        // eslint-disable-next-line react/no-string-refs
-        const node = ReactDOM.findDOMNode(this.refs.categories);
-
-        // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'. | TS2339 - Property 'value' does not exist on type 'Element | Text'.
-        node.value = categories.join(", ");
-    };
-
-    serialize: () => any = () => {
-        const json = _.pick(
-            this.props,
-            "correct",
-            "starting",
-            "type",
-            "labels",
-            "categories",
-            "scaleY",
-            "maxY",
-            "snapsPerLine",
-            "labelInterval",
-        );
-
-        if (this.props.type === PIC) {
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'picUrl' does not exist on type 'Pick<Readonly<any> & Readonly<{ children?: ReactNode; }>, "type" | "correct" | "labels" | "categories" | "starting" | "scaleY" | "maxY" | "snapsPerLine" | "labelInterval">'.
-            json.picUrl = this.props.picUrl;
-        }
-
-        return json;
-    };
 }
 
 export default PlotterEditor;

package/src/widgets/radio/editor.tsx

@@ -248,7 +248,7 @@ class RadioEditor extends React.Component<any> {
     }
 
     change: (...args: ReadonlyArray<unknown>) => any = (...args) => {
-        // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'readonly unknown[]' is not assignable to parameter of type 'any[]'.
+        // @ts-expect-error - TS2345 - Argument of type 'readonly unknown[]' is not assignable to parameter of type 'any[]'.
         return Changeable.change.apply(this, args);
     };
 
@@ -355,7 +355,7 @@ class RadioEditor extends React.Component<any> {
             },
             () => {
                 // eslint-disable-next-line react/no-string-refs
-                // @ts-expect-error [FEI-5003] - TS2339 - Property 'refs' does not exist on type 'ReactInstance'.
+                // @ts-expect-error - TS2339 - Property 'refs' does not exist on type 'ReactInstance'.
                 this.refs[`choice-editor${addIndex}`].refs[
                     "content-editor"
                 ].focus();
@@ -369,7 +369,7 @@ class RadioEditor extends React.Component<any> {
 
     focus: () => boolean = () => {
         // eslint-disable-next-line react/no-string-refs
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'refs' does not exist on type 'ReactInstance'.
+        // @ts-expect-error - TS2339 - Property 'refs' does not exist on type 'ReactInstance'.
         this.refs["choice-editor0"].refs["content-editor"].focus();
         return true;
     };

package/src/widgets/reaction-diagram-editor.tsx

@@ -29,20 +29,20 @@ class ReactionDiagramWidgetEditor extends React.Component<Props> {
 
     updateMolecule: (arg1: number) => (arg1: string) => void = (idx) => {
         return function (newValue: string) {
-            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
+            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
             const newSmiles = [...this.props.smiles];
             newSmiles[idx] = newValue;
-            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
+            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
             this.change({smiles: newSmiles});
         }.bind(this);
     };
 
     updateRotation: (arg1: number) => (arg1: any) => void = (idx) => {
         return function (newValue) {
-            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
+            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
             const newRot = [...this.props.rotationAngle];
             newRot[idx] = newValue;
-            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
+            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
             this.change({rotationAngle: newRot});
         }.bind(this);
     };
@@ -56,7 +56,7 @@ class ReactionDiagramWidgetEditor extends React.Component<Props> {
                 return {...sep};
             });
             newSep[idx][propName] = newValue;
-            // @ts-expect-error [FEI-5003] - TS2554 - Expected 3 arguments, but got 1.
+            // @ts-expect-error - TS2554 - Expected 3 arguments, but got 1.
             this.change({separators: newSep});
         };
     };

package/src/widgets/sequence-editor.tsx

@@ -139,7 +139,7 @@ class SequenceEditor extends React.Component<SequenceEditorProps> {
         return {
             json: _.times(this.props.json.length, (i) => {
                 // eslint-disable-next-line react/no-string-refs
-                // @ts-expect-error [FEI-5003] - TS2339 - Property 'serialize' does not exist on type 'ReactInstance'.
+                // @ts-expect-error - TS2339 - Property 'serialize' does not exist on type 'ReactInstance'.
                 return this.refs["editor" + i].serialize();
             }),
         };