@khanacademy/perseus 14.0.0 → 16.0.0

package/dist/multi-items/item-types.d.ts

@@ -8,8 +8,8 @@
  *             interface, so it's compatible with our tree traversal functions.
  * - And the various types of nodes that compose a tree.
  */
-import type { WidgetDict, ImageDict } from "../types";
 import type { Tree, ArrayNode, ObjectNode } from "./tree-types";
+import type { WidgetDict, ImageDict } from "../types";
 export type ContentNode = {
     __type: "content" | "item";
     content?: string | null | undefined;

package/dist/multi-items/multi-renderer.d.ts

@@ -1,11 +1,11 @@
 import * as React from "react";
 import Renderer from "../renderer";
-import type { Widget } from "../renderer";
-import type { APIOptions, FilterCriterion, PerseusDependenciesV2 } from "../types";
 import type { Item, ContentNode, HintNode, TagsNode } from "./item-types";
 import type { Shape, ArrayShape } from "./shape-types";
 import type { Tree } from "./tree-types";
 import type { TreeMapper, ContentMapper, HintMapper, Path } from "./trees";
+import type { Widget } from "../renderer";
+import type { APIOptions, FilterCriterion, PerseusDependenciesV2 } from "../types";
 import type { PropsFor } from "@khanacademy/wonder-blocks-core";
 type Hint = any;
 type Score = any;

package/dist/perseus-api.d.ts

@@ -53,7 +53,6 @@ export declare const ApiOptions: {
         customKeypad: PropTypes.Requireable<boolean>;
         nativeKeypadProxy: PropTypes.Requireable<(...args: any[]) => any>;
         isMobile: PropTypes.Requireable<boolean>;
-        useV2Keypad: PropTypes.Requireable<boolean>;
         setDrawingAreaAvailable: PropTypes.Requireable<(...args: any[]) => any>;
         useDraftEditor: PropTypes.Requireable<boolean>;
         hintProgressColor: PropTypes.Requireable<string>;
@@ -85,7 +84,6 @@ export declare const ApiOptions: {
             correct?: boolean | undefined;
         } & Partial<import("./types").TrackingGradedGroupExtraArguments> & Partial<import("./types").TrackingSequenceExtraArguments>) => void) | undefined;
         customKeypad?: boolean | undefined;
-        useV2Keypad?: boolean | undefined;
         nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
         isMobile?: boolean | undefined;
         setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -107,7 +105,6 @@ export declare const ApiOptions: {
         inModal: NonNullable<boolean | undefined>;
         isArticle: NonNullable<boolean | undefined>;
         isMobile: NonNullable<boolean | undefined>;
-        useV2Keypad: NonNullable<boolean | undefined>;
         onFocusChange: (newFocusPath: import("./types").FocusPath, oldFocusPath: import("./types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
         onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
         readOnly: NonNullable<boolean | undefined>;

package/dist/strings.js

@@ -75,6 +75,7 @@ module.exports = [
     i18n._("Get another hint", {}),
     i18n._("Greater than or equal to sign", {}),
     i18n._("Greater than sign", {}),
+    i18n._("Hide answer choices", {}),
     i18n._("Hide explanation", {}),
     i18n._("Hint #%(pos)s", {}),
     i18n._("Hints", {}),

package/dist/styles/shared.d.ts

@@ -1,2 +1,3 @@
+import type { StyleDeclaration } from "aphrodite";
 declare const _default: StyleDeclaration;
 export default _default;

package/dist/types.d.ts

@@ -102,7 +102,6 @@ export type APIOptions = Readonly<{
     imagePreloader?: (dimensions: Dimensions) => React.ReactNode;
     trackInteraction?: (args: TrackInteractionArgs) => void;
     customKeypad?: boolean;
-    useV2Keypad?: boolean;
     nativeKeypadProxy?: (blur: () => void) => KeypadAPI;
     isMobile?: boolean;
     setDrawingAreaAvailable?: (arg1: boolean) => unknown;
@@ -196,7 +195,6 @@ export type APIOptionsWithDefaults = Readonly<APIOptions & {
     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/dist/util/a11y.d.ts

@@ -1,2 +1,3 @@
+import type { StyleDeclaration } from "aphrodite";
 declare const _default: StyleDeclaration;
 export default _default;

package/dist/widgets/expression.d.ts

@@ -112,7 +112,6 @@ declare const _default: Readonly<{
                 correct?: boolean | undefined;
             } & Partial<import("../types").TrackingGradedGroupExtraArguments> & Partial<import("../types").TrackingSequenceExtraArguments>) => void) | undefined;
             customKeypad?: boolean | undefined;
-            useV2Keypad?: boolean | undefined;
             nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
             isMobile?: boolean | undefined;
             setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -134,7 +133,6 @@ declare const _default: Readonly<{
             inModal: NonNullable<boolean | undefined>;
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
-            useV2Keypad: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../types").FocusPath, oldFocusPath: import("../types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
             onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
@@ -177,7 +175,6 @@ declare const _default: Readonly<{
                 correct?: boolean | undefined;
             } & Partial<import("../types").TrackingGradedGroupExtraArguments> & Partial<import("../types").TrackingSequenceExtraArguments>) => void) | undefined;
             customKeypad?: boolean | undefined;
-            useV2Keypad?: boolean | undefined;
             nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
             isMobile?: boolean | undefined;
             setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -199,7 +196,6 @@ declare const _default: Readonly<{
             inModal: NonNullable<boolean | undefined>;
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
-            useV2Keypad: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../types").FocusPath, oldFocusPath: import("../types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
             onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
@@ -242,7 +238,6 @@ declare const _default: Readonly<{
                 correct?: boolean | undefined;
             } & Partial<import("../types").TrackingGradedGroupExtraArguments> & Partial<import("../types").TrackingSequenceExtraArguments>) => void) | undefined;
             customKeypad?: boolean | undefined;
-            useV2Keypad?: boolean | undefined;
             nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
             isMobile?: boolean | undefined;
             setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -264,7 +259,6 @@ declare const _default: Readonly<{
             inModal: NonNullable<boolean | undefined>;
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
-            useV2Keypad: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../types").FocusPath, oldFocusPath: import("../types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
             onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
@@ -318,7 +312,6 @@ declare const _default: Readonly<{
                 correct?: boolean | undefined;
             } & Partial<import("../types").TrackingGradedGroupExtraArguments> & Partial<import("../types").TrackingSequenceExtraArguments>) => void) | undefined;
             customKeypad?: boolean | undefined;
-            useV2Keypad?: boolean | undefined;
             nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
             isMobile?: boolean | undefined;
             setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -340,7 +333,6 @@ declare const _default: Readonly<{
             inModal: NonNullable<boolean | undefined>;
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
-            useV2Keypad: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../types").FocusPath, oldFocusPath: import("../types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
             onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
@@ -383,7 +375,6 @@ declare const _default: Readonly<{
                 correct?: boolean | undefined;
             } & Partial<import("../types").TrackingGradedGroupExtraArguments> & Partial<import("../types").TrackingSequenceExtraArguments>) => void) | undefined;
             customKeypad?: boolean | undefined;
-            useV2Keypad?: boolean | undefined;
             nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
             isMobile?: boolean | undefined;
             setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -405,7 +396,6 @@ declare const _default: Readonly<{
             inModal: NonNullable<boolean | undefined>;
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
-            useV2Keypad: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../types").FocusPath, oldFocusPath: import("../types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
             onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
@@ -448,7 +438,6 @@ declare const _default: Readonly<{
                 correct?: boolean | undefined;
             } & Partial<import("../types").TrackingGradedGroupExtraArguments> & Partial<import("../types").TrackingSequenceExtraArguments>) => void) | undefined;
             customKeypad?: boolean | undefined;
-            useV2Keypad?: boolean | undefined;
             nativeKeypadProxy?: ((blur: () => void) => import("@khanacademy/math-input").KeypadAPI) | undefined;
             isMobile?: boolean | undefined;
             setDrawingAreaAvailable?: ((arg1: boolean) => unknown) | undefined;
@@ -470,7 +459,6 @@ declare const _default: Readonly<{
             inModal: NonNullable<boolean | undefined>;
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
-            useV2Keypad: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../types").FocusPath, oldFocusPath: import("../types").FocusPath, keypadElement?: Element | Text | null | undefined, focusedElement?: HTMLElement | undefined) => unknown;
             onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;

package/dist/widgets/graded-group.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
+import type { ANSWER_BAR_STATES } from "./graded-group-answer-bar";
 import type { PerseusGradedGroupWidgetOptions } from "../perseus-types";
 import type { TrackingGradedGroupExtraArguments, WidgetProps } from "../types";
-import type { ANSWER_BAR_STATES } from "./graded-group-answer-bar";
 declare const GRADING_STATUSES: {
     readonly ungraded: "ungraded";
     readonly correct: "correct";

package/dist/widgets/label-image.d.ts

@@ -9,9 +9,9 @@ import { Popover } from "@khanacademy/wonder-blocks-popover";
 import * as React from "react";
 import AnswerChoices from "./label-image/answer-choices";
 import Marker from "./label-image/marker";
+import type { InteractiveMarkerType, InteractiveMarkerScore } from "./label-image/types";
 import type { ChangeableProps } from "../mixins/changeable";
 import type { APIOptions, PerseusScore } from "../types";
-import type { InteractiveMarkerType, InteractiveMarkerScore } from "./label-image/types";
 type MarkersState = {
     markers: ReadonlyArray<InteractiveMarkerType>;
 };

package/dist/widgets/matcher.d.ts

@@ -29,7 +29,6 @@ export declare class Matcher extends React.Component<any, any> {
             customKeypad: PropTypes.Requireable<boolean>;
             nativeKeypadProxy: PropTypes.Requireable<(...args: any[]) => any>;
             isMobile: PropTypes.Requireable<boolean>;
-            useV2Keypad: PropTypes.Requireable<boolean>;
             setDrawingAreaAvailable: PropTypes.Requireable<(...args: any[]) => any>;
             useDraftEditor: PropTypes.Requireable<boolean>;
             hintProgressColor: PropTypes.Requireable<string>;

package/dist/widgets/passage.d.ts

@@ -1,9 +1,9 @@
 import * as React from "react";
+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";
 import type { PerseusScore, WidgetInfo, WidgetProps } from "../types";
-import type { ParseState } from "./passage/passage-markdown";
 import type { SingleASTNode } from "@khanacademy/simple-markdown";
 export declare class LineHeightMeasurer extends React.Component<Record<any, any>> {
     _line: HTMLDivElement | null | undefined;

package/dist/widgets/radio/widget.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
+import type { FocusFunction } from "./base-radio";
 import type { PerseusRadioChoice, PerseusRadioWidgetOptions } from "../../perseus-types";
 import type { PerseusScore, WidgetProps, ChoiceState } from "../../types";
-import type { FocusFunction } from "./base-radio";
 export type RenderProps = {
     numCorrect: number;
     hasNoneOfTheAbove?: boolean;

package/dist/widgets/simulator.d.ts

@@ -24,7 +24,6 @@ declare class Simulator extends React.Component<any, any> {
             customKeypad: PropTypes.Requireable<boolean>;
             nativeKeypadProxy: PropTypes.Requireable<(...args: any[]) => any>;
             isMobile: PropTypes.Requireable<boolean>;
-            useV2Keypad: PropTypes.Requireable<boolean>;
             setDrawingAreaAvailable: PropTypes.Requireable<(...args: any[]) => any>;
             useDraftEditor: PropTypes.Requireable<boolean>;
             hintProgressColor: PropTypes.Requireable<string>;

package/dist/widgets/sorter.d.ts

@@ -25,7 +25,6 @@ declare class Sorter extends React.Component<any, any> {
             customKeypad: PropTypes.Requireable<boolean>;
             nativeKeypadProxy: PropTypes.Requireable<(...args: any[]) => any>;
             isMobile: PropTypes.Requireable<boolean>;
-            useV2Keypad: PropTypes.Requireable<boolean>;
             setDrawingAreaAvailable: PropTypes.Requireable<(...args: any[]) => any>;
             useDraftEditor: PropTypes.Requireable<boolean>;
             hintProgressColor: PropTypes.Requireable<string>;

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "14.0.0",
+    "version": "16.0.0",
     "publishConfig": {
         "access": "public"
     },
@@ -22,13 +22,13 @@
         "test": "bash -c 'yarn --silent --cwd \"../..\" test ${@:0} $($([[ ${@: -1} = -* ]] || [[ ${@: -1} = bash ]]) && echo $PWD)'"
     },
     "dependencies": {
-        "@khanacademy/kas": "^0.3.5",
-        "@khanacademy/kmath": "^0.1.6",
-        "@khanacademy/math-input": "^16.0.0",
-        "@khanacademy/perseus-core": "1.3.0",
-        "@khanacademy/perseus-linter": "^0.3.8",
-        "@khanacademy/pure-markdown": "^0.2.11",
-        "@khanacademy/simple-markdown": "^0.11.0"
+        "@khanacademy/kas": "^0.3.6",
+        "@khanacademy/kmath": "^0.1.7",
+        "@khanacademy/math-input": "^16.1.0",
+        "@khanacademy/perseus-core": "1.4.0",
+        "@khanacademy/perseus-linter": "^0.3.9",
+        "@khanacademy/pure-markdown": "^0.2.12",
+        "@khanacademy/simple-markdown": "^0.11.1"
     },
     "devDependencies": {
         "@khanacademy/wonder-blocks-button": "^6.2.2",

package/src/__tests__/server-item-renderer.test.tsx

@@ -25,9 +25,9 @@ import MockAssetLoadingWidgetExport, {
 } from "./mock-asset-loading-widget";
 import MockWidgetExport from "./mock-widget";
 
+import type {MockAssetLoadingWidget} from "./mock-asset-loading-widget";
 import type {PerseusItem} from "../perseus-types";
 import type {APIOptions} from "../types";
-import type {MockAssetLoadingWidget} from "./mock-asset-loading-widget";
 import type {KeypadAPI} from "@khanacademy/math-input";
 import type {PropsFor} from "@khanacademy/wonder-blocks-core";
 

package/src/components/svg-image.tsx

@@ -16,10 +16,10 @@ import FixedToResponsive from "./fixed-to-responsive";
 import Graphie from "./graphie";
 import ImageLoader from "./image-loader";
 
+import type {ImageProps} from "./image-loader";
 import type {Coord} from "../interactive2/types";
 import type {Size} from "../perseus-types";
 import type {Alignment, Dimensions} from "../types";
-import type {ImageProps} from "./image-loader";
 
 // Minimum image width to make an image appear as zoomable.
 const ZOOMABLE_THRESHOLD = 700;

package/src/hints-renderer.tsx

@@ -59,6 +59,7 @@ class HintsRenderer extends React.Component<Props, State> {
         this._cacheHintImages();
     }
 
+    // eslint-disable-next-line react/no-unsafe
     UNSAFE_componentWillReceiveProps(nextProps: Props) {
         // @ts-expect-error - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
         if (nextProps.hintsVisible - this.props.hintsVisible > 1) {

package/src/multi-items/item-types.ts

@@ -8,8 +8,8 @@
  *             interface, so it's compatible with our tree traversal functions.
  * - And the various types of nodes that compose a tree.
  */
-import type {WidgetDict, ImageDict} from "../types";
 import type {Tree, ArrayNode, ObjectNode} from "./tree-types";
+import type {WidgetDict, ImageDict} from "../types";
 
 export type ContentNode = {
     // TODO(mdr): When we first drafted the multi-item feature, we named

package/src/multi-items/multi-renderer.tsx

@@ -50,6 +50,10 @@ import Util from "../util";
 import {itemToTree} from "./items";
 import {buildMapper} from "./trees";
 
+import type {Item, ContentNode, HintNode, TagsNode} from "./item-types";
+import type {Shape, ArrayShape} from "./shape-types";
+import type {Tree} from "./tree-types";
+import type {TreeMapper, ContentMapper, HintMapper, Path} from "./trees";
 import type {Widget} from "../renderer";
 import type {
     APIOptions,
@@ -57,10 +61,6 @@ import type {
     PerseusDependenciesV2,
     PerseusScore,
 } from "../types";
-import type {Item, ContentNode, HintNode, TagsNode} from "./item-types";
-import type {Shape, ArrayShape} from "./shape-types";
-import type {Tree} from "./tree-types";
-import type {TreeMapper, ContentMapper, HintMapper, Path} from "./trees";
 import type {PropsFor} from "@khanacademy/wonder-blocks-core";
 
 type Hint = any; // TODO(mdr)

package/src/perseus-api.tsx

@@ -100,11 +100,6 @@ export const ApiOptions = {
         // Indicates whether or not to use mobile styling.
         isMobile: PropTypes.bool,
 
-        // Whether to use v1 (Legacy) Keypad for MathInput mobile or
-        // use the new v2 Keypad
-        // TODO [LC-1088]: remove after v2 release
-        useV2Keypad: PropTypes.bool,
-
         // A function, called with a bool indicating whether use of the
         // drawing area (scratchpad) should be allowed/disallowed.
         // Previously handled by `Khan.scratchpad.enable/disable`
@@ -150,7 +145,6 @@ export const ApiOptions = {
     defaults: {
         isArticle: false,
         isMobile: false,
-        useV2Keypad: false,
         onInputError: function () {},
         onFocusChange: function () {},
         GroupMetadataEditor: StubTagEditor,

package/src/server-item-renderer.tsx

@@ -104,6 +104,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;