@khanacademy/perseus-editor 1.0.8 → 1.0.10

package/package.json

@@ -3,7 +3,7 @@
     "description": "Perseus editors",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "publishConfig": {
         "access": "public"
     },
@@ -23,7 +23,7 @@
     "dependencies": {
         "@khanacademy/kas": "^0.2.7",
         "@khanacademy/kmath": "^0.0.8",
-        "@khanacademy/perseus": "^1.3.3"
+        "@khanacademy/perseus": "^1.3.5"
     },
     "devDependencies": {
         "@khanacademy/wonder-blocks-button": "^2.11.5",

package/src/editor.jsx

@@ -696,6 +696,7 @@ class Editor extends React.Component<EditorProps, EditorState> {
     _handleKeyDown: (e: SyntheticKeyboardEvent<HTMLTextAreaElement>) => void = (
         e: SyntheticKeyboardEvent<HTMLTextAreaElement>,
     ) => {
+        e.stopPropagation();
         // Tab-completion of widgets. For example, to insert an image:
         // type `[[im`, then tab.
         if (e.key === "Tab") {

package/src/widgets/input-number-editor.jsx

@@ -1,13 +1,14 @@
 /* eslint-disable react/sort-comp */
 // @flow
-import {components, Util} from "@khanacademy/perseus";
-import PropTypes from "prop-types";
+import {components, Util, InputNumber} from "@khanacademy/perseus";
 import * as React from "react";
 import ReactDOM from "react-dom";
 import _ from "underscore";
 
 import BlurInput from "../components/blur-input.jsx";
 
+import type {ParsedValue} from "@khanacademy/perseus";
+
 const {InfoTip} = components;
 
 const answerTypes = {
@@ -45,22 +46,44 @@ const answerTypes = {
     },
 };
 
-type Props = $FlowFixMe;
+type Props = {|
+    value: number,
+    simplify: React.ElementConfig<typeof InputNumber.widget>["simplify"],
+    size: React.ElementConfig<typeof InputNumber.widget>["size"],
+    inexact: React.ElementConfig<
+        typeof InputNumber.widget,
+    >["reviewModeRubric"]["inexact"],
+    maxError: React.ElementConfig<
+        typeof InputNumber.widget,
+    >["reviewModeRubric"]["maxError"],
+    answerType: React.ElementConfig<typeof InputNumber.widget>["answerType"],
+    rightAlign: React.ElementConfig<typeof InputNumber.widget>["rightAlign"],
 
-class InputNumberEditor extends React.Component<Props> {
-    static propTypes = {
-        value: PropTypes.number,
-        simplify: PropTypes.oneOf(["required", "optional", "enforced"]),
-        size: PropTypes.oneOf(["normal", "small"]),
-        inexact: PropTypes.bool,
-        maxError: PropTypes.number,
-        answerType: PropTypes.string,
-        rightAlign: PropTypes.bool,
-    };
+    onChange: ({|
+        value?: ParsedValue | 0,
+        simplify?: Props["simplify"],
+        size?: Props["size"],
+        inexact?: Props["inexact"],
+        maxError?: Props["maxError"],
+        answerType?: Props["answerType"],
+        rightAlign?: Props["rightAlign"],
+    |}) => void,
+|};
+
+type DefaultProps = {|
+    value: Props["value"],
+    simplify: Props["simplify"],
+    size: Props["size"],
+    inexact: Props["inexact"],
+    maxError: Props["maxError"],
+    answerType: Props["answerType"],
+    rightAlign: Props["rightAlign"],
+|};
 
+class InputNumberEditor extends React.Component<Props> {
     static widgetName: "input-number" = "input-number";
 
-    static defaultProps: Props = {
+    static defaultProps: DefaultProps = {
         value: 0,
         simplify: "required",
         size: "normal",
@@ -245,25 +268,22 @@ class InputNumberEditor extends React.Component<Props> {
     };
 
     serialize: () => {|
-        value: $FlowFixMe,
-        simplify: $FlowFixMe,
-        size: $FlowFixMe,
-        inexact: $FlowFixMe,
-        maxError: $FlowFixMe,
-        answerType: $FlowFixMe,
-        rightAlign: $FlowFixMe,
-    |} = () => {
-        return _.pick(
-            this.props,
-            "value",
-            "simplify",
-            "size",
-            "inexact",
-            "maxError",
-            "answerType",
-            "rightAlign",
-        );
-    };
+        value: Props["value"],
+        simplify: Props["simplify"],
+        size: Props["size"],
+        inexact: Props["inexact"],
+        maxError: Props["maxError"],
+        answerType: Props["answerType"],
+        rightAlign: Props["rightAlign"],
+    |} = () => ({
+        value: this.props.value,
+        simplify: this.props.simplify,
+        size: this.props.size,
+        inexact: this.props.inexact,
+        maxError: this.props.maxError,
+        answerType: this.props.answerType,
+        rightAlign: this.props.rightAlign,
+    });
 }
 
 export default InputNumberEditor;

package/src/widgets/radio/editor.jsx

@@ -75,7 +75,11 @@ class ChoiceEditor extends React.Component<$FlowFixMe> {
             <a
                 className="simple-button orange delete-choice"
                 href="#"
-                onClick={this.props.onDelete}
+                onClick={(e) => {
+                    e.stopPropagation();
+                    e.preventDefault();
+                    this.props.onDelete();
+                }}
                 title="Remove this choice"
             >
                 <InlineIcon {...iconTrash} />
@@ -185,7 +189,7 @@ class RadioEditor extends React.Component<$FlowFixMe> {
                     editMode={true}
                     labelWrap={false}
                     apiOptions={this.props.apiOptions}
-                    choices={this.props.choices.map(function (choice, i) {
+                    choices={this.props.choices.map((choice, i) => {
                         return {
                             content: (
                                 <ChoiceEditor
@@ -208,8 +212,7 @@ class RadioEditor extends React.Component<$FlowFixMe> {
                                             );
                                         }
                                     }}
-                                    // eslint-disable-next-line react/jsx-no-bind
-                                    onDelete={this.onDelete.bind(this, i)}
+                                    onDelete={() => this.onDelete(i)}
                                     showDelete={this.props.choices.length >= 2}
                                 />
                             ),
@@ -322,9 +325,7 @@ class RadioEditor extends React.Component<$FlowFixMe> {
         this.props.onChange({choices: choices});
     };
 
-    onDelete: (number, $FlowFixMe) => void = (choiceIndex, e) => {
-        e.preventDefault();
-
+    onDelete: (number) => void = (choiceIndex) => {
         const choices = this.props.choices.slice();
         const deleted = choices[choiceIndex];