@khanacademy/perseus 14.0.0 → 15.0.0

package/src/server-item-renderer.tsx

@@ -20,7 +20,6 @@ import {ApiOptions} from "./perseus-api";
 import Renderer from "./renderer";
 import Util from "./util";
 
-import type {KeypadProps} from "./mixins/provide-keypad";
 import type {APIOptions, FocusPath, PerseusDependenciesV2} from "./types";
 import type {KeypadAPI} from "@khanacademy/math-input";
 import type {
@@ -31,19 +30,18 @@ import type {
 
 const {mapObject} = Objective;
 
-type OwnProps = // These props are used by the ProvideKeypad mixin.
-    KeypadProps & {
-        apiOptions: APIOptions;
-        hintsVisible?: number;
-        item: {
-            hints: ReadonlyArray<any>;
-            question: any;
-        };
-        problemNum?: number;
-        reviewMode?: boolean;
-        keypadElement?: KeypadAPI | null | undefined;
-        dependencies: PerseusDependenciesV2;
+type OwnProps = {
+    apiOptions: APIOptions;
+    hintsVisible?: number;
+    item: {
+        hints: ReadonlyArray<any>;
+        question: any;
     };
+    problemNum?: number;
+    reviewMode?: boolean;
+    keypadElement?: KeypadAPI | null | undefined;
+    dependencies: PerseusDependenciesV2;
+};
 
 type HOCProps = {
     onRendered: (isRendered: boolean) => void;
@@ -104,6 +102,7 @@ export class ServerItemRenderer
         this._fullyRendered = false;
     }
 
+    // eslint-disable-next-line react/no-unsafe
     UNSAFE_componentWillReceiveProps(nextProps: Props) {
         this.setState({
             questionHighlightedWidgets: [],

package/src/types.ts

@@ -185,10 +185,6 @@ export type APIOptions = Readonly<{
     // from the math-input repo instead of the existing perseus math
     // input components.
     customKeypad?: boolean;
-    // Whether to use v1 (Legacy) Keypad for MathInput mobile or
-    // use the new v2 Keypad
-    // TODO [LC-1088]: remove after v2 release
-    useV2Keypad?: boolean;
     // If this is provided, it is called instead of appending an instance
     // of `math-input`'s keypad to the body. This is used by the native
     // apps so they can have the keypad be defined on the native side.
@@ -362,7 +358,6 @@ export type APIOptionsWithDefaults = Readonly<
         inModal: NonNullable<APIOptions["inModal"]>;
         isArticle: NonNullable<APIOptions["isArticle"]>;
         isMobile: NonNullable<APIOptions["isMobile"]>;
-        useV2Keypad: NonNullable<APIOptions["useV2Keypad"]>;
         onFocusChange: NonNullable<APIOptions["onFocusChange"]>;
         onInputError: NonNullable<APIOptions["onInputError"]>;
         readOnly: NonNullable<APIOptions["readOnly"]>;

package/src/util.ts

@@ -3,8 +3,8 @@ import _ from "underscore";
 
 import {Errors} from "./logging/log";
 import {PerseusError} from "./perseus-error";
-import * as GraphieUtil from "./util.graphie";
 import KhanAnswerTypes from "./util/answer-types";
+import * as GraphieUtil from "./util.graphie";
 
 import type {Range} from "./perseus-types";
 import type {Widget, PerseusScore} from "./types";

package/src/widgets/__stories__/expression.stories.tsx

@@ -46,7 +46,6 @@ const WrappedKeypadContext = ({
                             apiOptions={{
                                 isMobile: isMobile,
                                 customKeypad: customKeypad,
-                                useV2Keypad: true,
                             }}
                         />
                     );

package/src/widgets/__tests__/expression-mobile.test.tsx

@@ -37,7 +37,6 @@ function RendererWithContext({item}) {
                         apiOptions={{
                             isMobile: true,
                             customKeypad: true,
-                            useV2Keypad: true,
                         }}
                         item={item}
                         problemNum={0}

package/src/widgets/__tests__/expression.test.tsx

@@ -42,7 +42,7 @@ const assertCorrect = (itemData: PerseusItem, input: string) => {
         type: "perseus:expression-evaluated",
         payload: {
             result: "correct",
-            virtualKeypadVersion: "PERSEUS_MATH_INPUT",
+            virtualKeypadVersion: "MATH_INPUT_KEYPAD_V2",
         },
     });
 };
@@ -54,7 +54,7 @@ const assertIncorrect = (itemData: PerseusItem, input: string) => {
         type: "perseus:expression-evaluated",
         payload: {
             result: "incorrect",
-            virtualKeypadVersion: "PERSEUS_MATH_INPUT",
+            virtualKeypadVersion: "MATH_INPUT_KEYPAD_V2",
         },
     });
 };
@@ -224,19 +224,8 @@ describe("Expression Widget", function () {
             );
         });
 
-        it("should set the virtual keypad version to MATH_INPUT_KEYPAD_V1 when customKeypad is set and useV2Keypad is unset", () => {
-            assertKeypadVersion({customKeypad: true}, "MATH_INPUT_KEYPAD_V1");
-        });
-
-        it("should set the virtual keypad version to MATH_INPUT_KEYPAD_V2 when customKeypad is set and useV2Keypad is true", () => {
-            assertKeypadVersion(
-                {customKeypad: true, useV2Keypad: true},
-                "MATH_INPUT_KEYPAD_V2",
-            );
-        });
-
-        it("should default the virtual keypad version to PERSEUS_MATH_INPUT", () => {
-            assertKeypadVersion(Object.freeze({}), "PERSEUS_MATH_INPUT");
+        it("should default the virtual keypad version to MATH_INPUT_KEYPAD_V2", () => {
+            assertKeypadVersion(Object.freeze({}), "MATH_INPUT_KEYPAD_V2");
         });
     });
 });

package/src/widgets/expression.tsx

@@ -64,11 +64,7 @@ const deriveKeypadVersion = (apiOptions: APIOptions) => {
     // can remove this `virtualKeypadVersion` field entirely.
     return apiOptions.nativeKeypadProxy != null
         ? "REACT_NATIVE_KEYPAD"
-        : apiOptions.customKeypad === true
-        ? apiOptions.useV2Keypad === true
-            ? "MATH_INPUT_KEYPAD_V2"
-            : "MATH_INPUT_KEYPAD_V1"
-        : "PERSEUS_MATH_INPUT";
+        : "MATH_INPUT_KEYPAD_V2";
 };
 
 type Rubric = PerseusExpressionWidgetOptions;

package/src/widgets/graded-group.tsx

@@ -24,6 +24,7 @@ import a11y from "../util/a11y";
 
 import GradedGroupAnswerBar from "./graded-group-answer-bar";
 
+import type {ANSWER_BAR_STATES} from "./graded-group-answer-bar";
 import type {PerseusGradedGroupWidgetOptions} from "../perseus-types";
 import type {
     PerseusScore,
@@ -31,7 +32,6 @@ import type {
     WidgetExports,
     WidgetProps,
 } from "../types";
-import type {ANSWER_BAR_STATES} from "./graded-group-answer-bar";
 
 const GRADING_STATUSES = {
     ungraded: "ungraded" as const,

package/src/widgets/label-image/strings.ts

@@ -1,3 +1,5 @@
+import * as i18n from "@khanacademy/wonder-blocks-i18n";
+
 export const strings = {
-    hideAnswersToggleLabel: "Hide answer choices",
+    hideAnswersToggleLabel: i18n._("Hide answer choices"),
 };

package/src/widgets/label-image.tsx

@@ -22,12 +22,12 @@ import mediaQueries from "../styles/media-queries";
 import AnswerChoices from "./label-image/answer-choices";
 import Marker from "./label-image/marker";
 
-import type {ChangeableProps} from "../mixins/changeable";
-import type {APIOptions, PerseusScore, WidgetExports} from "../types";
 import type {
     InteractiveMarkerType,
     InteractiveMarkerScore,
 } from "./label-image/types";
+import type {ChangeableProps} from "../mixins/changeable";
+import type {APIOptions, PerseusScore, WidgetExports} from "../types";
 
 type MarkersState = {
     markers: ReadonlyArray<InteractiveMarkerType>;

package/src/widgets/passage-ref.tsx

@@ -7,6 +7,7 @@ import * as Changeable from "../mixins/changeable";
 import {removeDenylistProps} from "../mixins/widget-prop-denylist";
 import PerseusMarkdown from "../perseus-markdown";
 
+import type {Passage, Reference} from "./passage";
 import type {PerseusPassageRefWidgetOptions} from "../perseus-types";
 import type {
     ChangeFn,
@@ -14,7 +15,6 @@ import type {
     WidgetExports,
     WidgetProps,
 } from "../types";
-import type {Passage, Reference} from "./passage";
 import type {LinterContextProps} from "@khanacademy/perseus-linter";
 
 const EN_DASH = "\u2013";

package/src/widgets/passage.tsx

@@ -12,6 +12,7 @@ import Renderer from "../renderer";
 
 import PassageMarkdown from "./passage/passage-markdown";
 
+import type {ParseState} from "./passage/passage-markdown";
 import type {SerializedHighlightSet} from "../components/highlighting/types";
 import type {ChangeableProps} from "../mixins/changeable";
 import type {PerseusPassageWidgetOptions} from "../perseus-types";
@@ -21,7 +22,6 @@ import type {
     WidgetInfo,
     WidgetProps,
 } from "../types";
-import type {ParseState} from "./passage/passage-markdown";
 import type {SingleASTNode} from "@khanacademy/simple-markdown";
 
 // A fake paragraph to measure the line height of the passage,

package/src/widgets/radio/widget.tsx

@@ -8,12 +8,12 @@ import PassageRef from "../passage-ref";
 
 import BaseRadio from "./base-radio";
 
+import type {FocusFunction, ChoiceType} from "./base-radio";
 import type {
     PerseusRadioChoice,
     PerseusRadioWidgetOptions,
 } from "../../perseus-types";
 import type {PerseusScore, WidgetProps, ChoiceState} from "../../types";
-import type {FocusFunction, ChoiceType} from "./base-radio";
 
 // RenderProps is the return type for radio.jsx#transform
 export type RenderProps = {

package/src/widgets/radio.ts

@@ -5,9 +5,9 @@ import Util from "../util";
 
 import Radio from "./radio/widget";
 
+import type {RenderProps, RadioChoiceWithMetadata} from "./radio/widget";
 import type {PerseusRadioWidgetOptions} from "../perseus-types";
 import type {WidgetExports} from "../types";
-import type {RenderProps, RadioChoiceWithMetadata} from "./radio/widget";
 
 const {shuffle, random} = Util;