@khanacademy/perseus 65.7.0 → 66.0.0

package/dist/perseus-markdown.d.ts

@@ -1,6 +1,6 @@
 declare const _default: {
     characterCount: (source: string) => number;
-    traverseContent: (ast: any, cb: (arg1: any) => unknown) => void;
+    traverseContent: (ast: any, cb: (node: any) => void) => void;
     parse: (source: string, state: any) => any;
     parseInline: (source: string, state: any) => any;
     reactFor: (arg1: import("@khanacademy/simple-markdown").ReactNodeOutput) => import("@khanacademy/simple-markdown").ReactOutput;

package/dist/renderer.d.ts

@@ -6,9 +6,10 @@ import WidgetContainer from "./widget-container";
 import type { DependenciesContext } from "./dependencies";
 import type { PerseusStrings } from "./strings";
 import type { APIOptions, APIOptionsWithDefaults, FilterCriterion, FocusPath, SerializedState, Widget, WidgetProps } from "./types";
+import type { HandleUserInputCallback, InitializeUserInputCallback, RestoreUserInputFromSerializedStateCallback } from "./user-input-manager";
 import type { GetPromptJSONInterface, RendererPromptJSON } from "./widget-ai-utils/prompt-types";
 import type { KeypadAPI } from "@khanacademy/math-input";
-import type { PerseusRenderer, PerseusWidget, PerseusWidgetOptions, PerseusWidgetsMap, ShowSolutions, PerseusScore, UserInputArray, UserInputMap, UserInput } from "@khanacademy/perseus-core";
+import type { PerseusRenderer, PerseusWidget, PerseusWidgetOptions, PerseusWidgetsMap, ShowSolutions, PerseusScore, UserInputMap, UserInputArray } from "@khanacademy/perseus-core";
 import type { LinterContextProps } from "@khanacademy/perseus-linter";
 import "./styles/perseus-renderer.css";
 type WidgetState = {
@@ -20,6 +21,10 @@ type WidgetState = {
     baseElements?: any;
 };
 type Props = Partial<React.ContextType<typeof DependenciesContext>> & {
+    userInput?: UserInputMap;
+    handleUserInput?: HandleUserInputCallback;
+    initializeUserInput?: InitializeUserInputCallback;
+    restoreUserInputFromSerializedState?: RestoreUserInputFromSerializedStateCallback;
     apiOptions?: APIOptions;
     alwaysUpdate?: boolean;
     findExternalWidgets: any;
@@ -61,11 +66,21 @@ type State = {
     widgetProps: Readonly<{
         [id: string]: any | null | undefined;
     }>;
-    userInput: UserInputMap;
     jiptContent: any;
     lastUsedWidgetId: string | null | undefined;
 };
 type DefaultProps = Required<Pick<Props, "alwaysUpdate" | "content" | "findExternalWidgets" | "highlightedWidgets" | "images" | "linterContext" | "onInteractWithWidget" | "onRender" | "questionCompleted" | "showSolutions" | "reviewMode" | "serializedState" | "widgets">>;
+/**
+ * We want to be able to reset the question state when we go
+ * from one question to another question. However it's kind of tricky:
+ * 1. Content could be the same
+ * 2. Problem number could be the same
+ * 3. We don't want to reset when going from answerless to answerful data
+ * So compare the prev props to the next props, but use
+ * answerless for both for the comparison
+ */
+export type DifferentQuestionPartialProps = Pick<Props, "content" | "widgets" | "problemNum">;
+export declare function isDifferentQuestion(propsA: DifferentQuestionPartialProps, propsB: DifferentQuestionPartialProps): boolean;
 declare class Renderer extends React.Component<Props, State> implements GetPromptJSONInterface {
     static contextType: React.Context<import("./components/i18n-context").I18nContextType>;
     context: React.ContextType<typeof PerseusI18nContext>;
@@ -94,9 +109,7 @@ declare class Renderer extends React.Component<Props, State> implements GetPromp
     _getInitialWidgetState: (props: Props) => {
         widgetInfo: State["widgetInfo"];
         widgetProps: State["widgetProps"];
-        userInput: State["userInput"];
     };
-    _getAllWidgetsStartUserInput(props: Props): UserInputMap;
     _getAllWidgetsStartProps: (allWidgetInfo: PerseusWidgetsMap, props: Props) => PerseusWidgetsMap;
     _getDefaultWidgetInfo: (widgetId: string) => any;
     _getWidgetInfo: (widgetId: string) => PerseusWidget;
@@ -194,9 +207,7 @@ declare class Renderer extends React.Component<Props, State> implements GetPromp
      */
     emptyWidgets(): ReadonlyArray<string>;
     handleStateUpdate(id: string, cb: () => boolean, silent?: boolean): void;
-    _setUserInput(id: string, nextUserInput: UserInput, cb: () => boolean, silent?: boolean): void;
     _setWidgetProps(id: string, nextWidgetProps: any, cb: () => boolean, silent?: boolean): void;
-    setInputValue: (path: FocusPath, newValue: string, cb?: () => void) => void;
     /**
      * Returns an array of the widget `.getUserInput()` results
      *

package/dist/server-item-renderer.d.ts

@@ -67,6 +67,7 @@ export declare class ServerItemRenderer extends React.Component<Props, State> im
     _currentFocus: FocusPath;
     _fullyRendered: boolean;
     blurTimeoutID: number | null | undefined;
+    userInput: UserInputMap;
     static defaultProps: DefaultProps;
     constructor(props: Props);
     componentDidMount(): void;
@@ -83,7 +84,6 @@ export declare class ServerItemRenderer extends React.Component<Props, State> im
      * for the whole answer area (if the answer area is a single widget).
      */
     _setWidgetProps(widgetId: string, newProps: Props, callback: any): void;
-    setInputValue(path: FocusPath, newValue: any, focus: () => void): void;
     focusPath(path: FocusPath): void;
     blurPath(path: FocusPath): void;
     getDOMNodeForPath(path: FocusPath): Element | Text | null | undefined;

package/dist/types.d.ts

@@ -3,7 +3,7 @@ import type { PerseusStrings } from "./strings";
 import type { SizeClass } from "./util/sizing-utils";
 import type { WidgetPromptJSON } from "./widget-ai-utils/prompt-types";
 import type { KeypadAPI } from "@khanacademy/math-input";
-import type { Hint, PerseusAnswerArea, PerseusFeatureFlags, PerseusWidget, PerseusWidgetsMap, AnalyticsEventHandlerFn, Version, Rubric, UserInput, UserInputArray, UserInputMap, LabelImageMarkerPublicData, PerseusLabelImageMarker, ShowSolutions } from "@khanacademy/perseus-core";
+import type { Hint, PerseusAnswerArea, PerseusFeatureFlags, PerseusWidget, PerseusWidgetsMap, AnalyticsEventHandlerFn, Version, LabelImageMarkerPublicData, PerseusLabelImageMarker, ShowSolutions } from "@khanacademy/perseus-core";
 import type { LinterContextProps } from "@khanacademy/perseus-linter";
 import type { Result } from "@khanacademy/wonder-blocks-data";
 import type * as React from "react";
@@ -63,21 +63,6 @@ export interface Widget {
     blurInputPath?: (path: FocusPath) => void;
     focusInputPath?: (path: FocusPath) => void;
     getInputPaths?: () => ReadonlyArray<FocusPath>;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     */
-    setInputValue?: (path: FocusPath, newValue: string, focus?: () => unknown) => void;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     */
-    getUserInputMap?: () => UserInputMap | undefined;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     */
-    getUserInput?: () => UserInputArray | UserInput | undefined;
     getPromptJSON?: () => WidgetPromptJSON;
 }
 export type ImageDict = {
@@ -395,13 +380,13 @@ export type WidgetExports<T extends React.ComponentType<any> & Widget = React.Co
      * @deprecated see LEMS-3199
      */
     staticTransform?: WidgetTransform;
-    getOneCorrectAnswerFromRubric?: (rubric: Rubric) => string | null | undefined;
+    getOneCorrectAnswerFromRubric?: (rubric: WidgetOptions) => string | null | undefined;
     /**
      * @deprecated - do not use in new code.
      */
-    getUserInputFromSerializedState?: (props: any) => TUserInput;
-    getCorrectUserInput?: (widgetOptions: any) => TUserInput;
-    getStartUserInput?: (widgetOptions: any, problemNum: number) => TUserInput;
+    getUserInputFromSerializedState?: (serializedState: unknown, widgetOptions?: WidgetOptions) => TUserInput;
+    getCorrectUserInput?: (widgetOptions: WidgetOptions) => TUserInput;
+    getStartUserInput?: (widgetOptions: WidgetOptions, problemNum: number) => TUserInput;
 }>;
 export type FilterCriterion = string | ((id: string, widgetInfo: PerseusWidget, widget?: Widget | null | undefined) => boolean);
 /**

package/dist/user-input-manager.d.ts

@@ -0,0 +1,45 @@
+import type { PerseusWidgetsMap, UserInputMap } from "@khanacademy/perseus-core";
+export type InitializeUserInputCallback = (widgetOptions: PerseusWidgetsMap, problemNum: number) => void;
+export type RestoreUserInputFromSerializedStateCallback = (serializedState: unknown, widgetOptions: PerseusWidgetsMap) => void;
+export type HandleUserInputCallback = (widgetId: string, userInput: UserInputMap[keyof UserInputMap]) => void;
+type FunctionChildParams = {
+    userInput: UserInputMap;
+    handleUserInput: HandleUserInputCallback;
+    initializeUserInput: InitializeUserInputCallback;
+    /**
+     * @deprecated - do not use in new code.
+     */
+    restoreUserInputFromSerializedState: RestoreUserInputFromSerializedStateCallback;
+};
+type Props = {
+    widgets: PerseusWidgetsMap;
+    problemNum: number;
+    handleUserInput?: (userInput: UserInputMap) => void;
+    children: (payload: FunctionChildParams) => JSX.Element | null;
+};
+/**
+ * Initialize the starting UserInput state:
+ * - for static widgets, that's the correct UserInput
+ * - some widgets just like having something to start with
+ * - some widgets use initial UserInput state as the "shuffled state"
+ *   (which is why we need problemNum since it's the seed)
+ */
+export declare function sharedInitializeUserInput(widgetOptions: PerseusWidgetsMap, problemNum: number): UserInputMap;
+/**
+ * Restore user input from serialized state. It's tricky
+ * because there is no definite type for serialized state,
+ * so widgets need to handle it themselves and overall the process
+ * is very fragile.
+ *
+ * @deprecated - do not use in new code.
+ */
+export declare function sharedRestoreUserInputFromSerializedState(serializedState: unknown, widgetsMap: PerseusWidgetsMap): UserInputMap;
+/**
+ * UserInputManager is a stateful wrapper for handling and storing user input.
+ * Ideally we'll get to a place where widgets are functional components
+ * (or wrapped in functional components) and we can replace this with a
+ * combination of Context/Hooks so that it can just wrap all of Perseus and
+ * widgets can managing fetching/updating their own state via hooks.
+ */
+export default function UserInputManager(props: Props): JSX.Element | null;
+export {};

package/dist/widget-ai-utils/categorizer/categorizer-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type categorizer from "../../widgets/categorizer/categorizer";
-import type { PerseusCategorizerUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type CategorizerPromptJSON = {
     type: "categorizer";
@@ -11,4 +10,4 @@ export type CategorizerPromptJSON = {
         itemToCategoryMapping: ReadonlyArray<number>;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof categorizer.widget>, userInput: PerseusCategorizerUserInput) => CategorizerPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof categorizer.widget>) => CategorizerPromptJSON;

package/dist/widget-ai-utils/dropdown/dropdown-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type dropdown from "../../widgets/dropdown/dropdown";
-import type { PerseusDropdownUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type DropdownPromptJSON = {
     type: "dropdown";
@@ -10,4 +9,4 @@ export type DropdownPromptJSON = {
         selectedIndex: number;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof dropdown.widget>, userInput: PerseusDropdownUserInput) => DropdownPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof dropdown.widget>) => DropdownPromptJSON;

package/dist/widget-ai-utils/grapher/grapher-ai-utils.d.ts

@@ -1,5 +1,5 @@
 import type grapher from "../../widgets/grapher/grapher";
-import type { GrapherAnswerTypes, PerseusGrapherUserInput } from "@khanacademy/perseus-core";
+import type { GrapherAnswerTypes } from "@khanacademy/perseus-core";
 import type React from "react";
 export type GrapherPromptJSON = {
     type: "grapher";
@@ -14,4 +14,4 @@ export type GrapherPromptJSON = {
     };
     userInput: GrapherAnswerTypes;
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof grapher.widget>, userInput: PerseusGrapherUserInput) => GrapherPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof grapher.widget>) => GrapherPromptJSON;

package/dist/widget-ai-utils/input-number/input-number-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type inputNumber from "../../widgets/input-number/input-number";
-import type { PerseusInputNumberUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type InputNumberPromptJSON = {
     type: "input-number";
@@ -11,4 +10,4 @@ export type InputNumberPromptJSON = {
         value: string;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof inputNumber.widget>, userInput: PerseusInputNumberUserInput) => InputNumberPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof inputNumber.widget>) => InputNumberPromptJSON;

package/dist/widget-ai-utils/label-image/label-image-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type labelImage from "../../widgets/label-image/label-image";
-import type { PerseusLabelImageUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 type BaseMarker = {
     label: string;
@@ -21,5 +20,5 @@ export type LabelImagePromptJSON = {
         markers: UserInputMarker[];
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof labelImage.widget>, userInput: PerseusLabelImageUserInput) => LabelImagePromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof labelImage.widget>) => LabelImagePromptJSON;
 export {};

package/dist/widget-ai-utils/matcher/matcher-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type matcher from "../../widgets/matcher/matcher";
-import type { PerseusMatcherUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type MatcherPromptJSON = {
     type: "matcher";
@@ -14,4 +13,5 @@ export type MatcherPromptJSON = {
         right: ReadonlyArray<string>;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof matcher.widget>, userInput: PerseusMatcherUserInput) => MatcherPromptJSON;
+export type RenderPropsPartial = Pick<React.ComponentProps<typeof matcher.widget>, "userInput" | "labels" | "left" | "right" | "orderMatters">;
+export declare const getPromptJSON: (renderProps: RenderPropsPartial) => MatcherPromptJSON;

package/dist/widget-ai-utils/matrix/matrix-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type matrix from "../../widgets/matrix/matrix";
-import type { PerseusMatrixUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type MatrixPromptJSON = {
     type: "matrix";
@@ -11,4 +10,4 @@ export type MatrixPromptJSON = {
         answerRows: ReadonlyArray<ReadonlyArray<number>>;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof matrix.widget>, userInput: PerseusMatrixUserInput) => MatrixPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof matrix.widget>) => MatrixPromptJSON;

package/dist/widget-ai-utils/mock-widget/prompt-utils.d.ts

@@ -1,5 +1,4 @@
 import type mockWidget from "../../widgets/mock-widgets/mock-widget";
-import type { PerseusMockWidgetUserInput } from "@khanacademy/perseus-score";
 import type React from "react";
 export type MockWidgetPromptJSON = {
     type: "mock-widget";
@@ -10,4 +9,4 @@ export type MockWidgetPromptJSON = {
         value: string;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof mockWidget.widget>, userInput: PerseusMockWidgetUserInput) => MockWidgetPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof mockWidget.widget>) => MockWidgetPromptJSON;

package/dist/widget-ai-utils/number-line/number-line-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type numberLine from "../../widgets/number-line/number-line";
-import type { PerseusNumberLineUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type NumberLinePromptJSON = {
     type: "number-line";
@@ -13,4 +12,4 @@ export type NumberLinePromptJSON = {
         rel: string;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof numberLine.widget>, userInput: PerseusNumberLineUserInput) => NumberLinePromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof numberLine.widget>) => NumberLinePromptJSON;

package/dist/widget-ai-utils/numeric-input/prompt-utils.d.ts

@@ -1,5 +1,4 @@
 import type numericInput from "../../widgets/numeric-input/numeric-input.class";
-import type { PerseusNumericInputUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type NumericInputPromptJSON = {
     type: "numeric-input";
@@ -8,4 +7,4 @@ export type NumericInputPromptJSON = {
         value: string;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof numericInput.widget>, userInput: PerseusNumericInputUserInput) => NumericInputPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof numericInput.widget>) => NumericInputPromptJSON;

package/dist/widget-ai-utils/orderer/orderer-ai-utils.d.ts

@@ -1,5 +1,4 @@
 import type orderer from "../../widgets/orderer/orderer";
-import type { PerseusOrdererUserInput } from "@khanacademy/perseus-core";
 import type React from "react";
 export type OrdererPromptJSON = {
     type: "orderer";
@@ -10,4 +9,4 @@ export type OrdererPromptJSON = {
         values: ReadonlyArray<string>;
     };
 };
-export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof orderer.widget>, userInput: PerseusOrdererUserInput) => OrdererPromptJSON;
+export declare const getPromptJSON: (renderProps: React.ComponentProps<typeof orderer.widget>) => OrdererPromptJSON;

package/dist/widgets/categorizer/categorizer.d.ts

@@ -18,11 +18,6 @@ export declare class Categorizer extends React.Component<Props, State> implement
     context: React.ContextType<typeof PerseusI18nContext>;
     static defaultProps: DefaultProps;
     state: State;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     */
-    getUserInput(): PerseusCategorizerUserInput;
     /**
      * @deprecated and likely very broken API
      * [LEMS-3185] do not trust serializedState/restoreSerializedState
@@ -48,6 +43,7 @@ declare function getUserInputFromSerializedState(serializedState: any): PerseusC
  * used to populate correct input and now can't
  */
 declare function getCorrectUserInput(options: PerseusCategorizerWidgetOptions): PerseusCategorizerUserInput;
+declare function getStartUserInput(): PerseusCategorizerUserInput;
 declare function transform(widgetOptions: CategorizerPublicWidgetOptions): RenderProps;
 declare const _default: {
     name: string;
@@ -58,6 +54,7 @@ declare const _default: {
     staticTransform: typeof transform;
     getUserInputFromSerializedState: typeof getUserInputFromSerializedState;
     getCorrectUserInput: typeof getCorrectUserInput;
+    getStartUserInput: typeof getStartUserInput;
     isLintable: true;
 };
 export default _default;

package/dist/widgets/cs-program/cs-program.d.ts

@@ -17,7 +17,6 @@ declare class CSProgram extends React.Component<Props> implements Widget {
     componentDidMount(): void;
     componentWillUnmount(): void;
     handleMessageEvent: (arg1: any) => void;
-    getUserInput(): PerseusCSProgramUserInput;
     getPromptJSON(): UnsupportedWidgetPromptJSON;
     render(): React.ReactNode;
 }
@@ -26,11 +25,13 @@ declare class CSProgram extends React.Component<Props> implements Widget {
  * [LEMS-3185] do not trust serializedState/restoreSerializedState
  */
 declare function getUserInputFromSerializedState(serializedState: any): PerseusCSProgramUserInput;
+declare function getStartUserInput(): PerseusCSProgramUserInput;
 declare const _default: {
     name: string;
     displayName: string;
     widget: typeof CSProgram;
     hidden: true;
+    getStartUserInput: typeof getStartUserInput;
     getUserInputFromSerializedState: typeof getUserInputFromSerializedState;
 };
 export default _default;

package/dist/widgets/dropdown/dropdown.d.ts

@@ -23,11 +23,6 @@ declare class Dropdown extends React.Component<Props> implements Widget {
     focus: () => boolean;
     _handleChangeEvent: (arg1: React.ChangeEvent<HTMLInputElement>) => void;
     _handleChange: (arg1: number) => void;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     */
-    getUserInput(): PerseusDropdownUserInput;
     getPromptJSON(): DropdownPromptJSON;
     /**
      * @deprecated and likely very broken API
@@ -42,11 +37,13 @@ declare function transform(widgetOptions: DropdownPublicWidgetOptions): RenderPr
  * [LEMS-3185] do not trust serializedState/restoreSerializedState
  */
 declare function getUserInputFromSerializedState(serializedState: any): PerseusDropdownUserInput;
+declare function getStartUserInput(): PerseusDropdownUserInput;
 declare const _default: {
     name: string;
     displayName: string;
     widget: typeof Dropdown;
     transform: typeof transform;
+    getStartUserInput: typeof getStartUserInput;
     getUserInputFromSerializedState: typeof getUserInputFromSerializedState;
 };
 export default _default;

package/dist/widgets/expression/expression.d.ts

@@ -1,7 +1,7 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { DependenciesContext } from "../../dependencies";
-import type { WidgetProps, Widget, FocusPath } from "../../types";
+import type { WidgetProps, Widget } from "../../types";
 import type { ExpressionPromptJSON } from "../../widget-ai-utils/expression/expression-ai-utils";
 import type { PerseusExpressionWidgetOptions, ExpressionPublicWidgetOptions, KeypadConfiguration, KeypadKey, PerseusExpressionRubric, PerseusExpressionUserInput } from "@khanacademy/perseus-core";
 type InputPath = ReadonlyArray<string>;
@@ -26,11 +26,6 @@ type Props = ExternalProps & Partial<React.ContextType<typeof DependenciesContex
     visibleLabel: PerseusExpressionWidgetOptions["visibleLabel"];
     ariaLabel: PerseusExpressionWidgetOptions["ariaLabel"];
 };
-type ExpressionState = {
-    invalid: boolean;
-    showErrorTooltip: boolean;
-    showErrorStyle: boolean;
-};
 type DefaultProps = {
     apiOptions: Props["apiOptions"];
     buttonSets: Props["buttonSets"];
@@ -41,25 +36,17 @@ type DefaultProps = {
     times: Props["times"];
     userInput: Props["userInput"];
 };
-export declare class Expression extends React.Component<Props, ExpressionState> implements Widget {
+export declare class Expression extends React.Component<Props> implements Widget {
     static contextType: React.Context<import("../../components/i18n-context").I18nContextType>;
     context: React.ContextType<typeof PerseusI18nContext>;
     _textareaId: string;
     _isMounted: boolean;
     static defaultProps: DefaultProps;
     displayName: string;
-    state: ExpressionState;
     componentDidMount: () => void;
-    componentDidUpdate: (prevProps: Props) => void;
     componentWillUnmount: () => void;
-    _handleMouseDown: () => void;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     */
     getUserInput(): PerseusExpressionUserInput;
     getPromptJSON(): ExpressionPromptJSON;
-    parse: (value: string, props: Props) => any;
     changeAndTrack: (userInput: string, cb: () => void) => void;
     _handleFocus: () => void;
     _handleBlur: () => void;
@@ -68,11 +55,6 @@ export declare class Expression extends React.Component<Props, ExpressionState>
     blurInputPath(inputPath: InputPath): void;
     insert(keyPressed: KeypadKey): void;
     getInputPaths: () => ReadonlyArray<ReadonlyArray<any>>;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated set user input in a parent component
-     */
-    setInputValue(path: FocusPath, newValue: string, cb?: any): void;
     /**
      * @deprecated and likely very broken API
      * [LEMS-3185] do not trust serializedState/restoreSerializedState
@@ -94,7 +76,7 @@ export declare class Expression extends React.Component<Props, ExpressionState>
         problemNum: number | null | undefined;
         apiOptions: Readonly<Readonly<{
             isArticle?: boolean;
-            onFocusChange?: (newFocusPath: FocusPath, oldFocusPath: FocusPath, keypadHeight?: number, focusedElement?: HTMLElement) => unknown;
+            onFocusChange?: (newFocusPath: import("../..").FocusPath, oldFocusPath: import("../..").FocusPath, keypadHeight?: number, focusedElement?: HTMLElement) => unknown;
             GroupMetadataEditor?: React.ComponentType<any>;
             showAlignmentOptions?: boolean;
             readOnly?: boolean;
@@ -142,8 +124,8 @@ export declare class Expression extends React.Component<Props, ExpressionState>
         }>;
         keypadElement?: any;
         questionCompleted?: boolean;
-        onFocus: (blurPath: FocusPath) => void;
-        onBlur: (blurPath: FocusPath) => void;
+        onFocus: (blurPath: import("../..").FocusPath) => void;
+        onBlur: (blurPath: import("../..").FocusPath) => void;
         findWidgets: (criterion: import("../../types").FilterCriterion) => ReadonlyArray<Widget>;
         reviewMode: boolean;
         showSolutions?: import("@khanacademy/perseus-core").ShowSolutions;
@@ -166,6 +148,7 @@ export declare class Expression extends React.Component<Props, ExpressionState>
  * [LEMS-3185] do not trust serializedState/restoreSerializedState
  */
 declare function getUserInputFromSerializedState(serializedState: any): PerseusExpressionUserInput;
+declare function getStartUserInput(): PerseusExpressionUserInput;
 declare const _default: {
     name: string;
     displayName: string;
@@ -181,11 +164,11 @@ declare const _default: {
         ariaLabel: PerseusExpressionWidgetOptions["ariaLabel"];
     }, "static" | "onChange" | "ariaLabel" | "buttonsVisible" | "trackInteraction" | "containerSizeClass" | "widgetId" | "problemNum" | "questionCompleted" | "findWidgets" | "keypadElement" | "isLastUsedWidget" | "handleUserInput" | "showSolutions" | "reviewMode" | "reviewModeRubric" | keyof import("../..").PerseusDependenciesV2 | "alignment" | "visibleLabel" | "keypadConfiguration"> & {
         buttonSets?: import("@khanacademy/perseus-core").LegacyButtonSets | undefined;
-        onFocus?: ((blurPath: FocusPath) => void) | undefined;
-        onBlur?: ((blurPath: FocusPath) => void) | undefined;
+        onFocus?: ((blurPath: import("../..").FocusPath) => void) | undefined;
+        onBlur?: ((blurPath: import("../..").FocusPath) => void) | undefined;
         apiOptions?: Readonly<Readonly<{
             isArticle?: boolean;
-            onFocusChange?: (newFocusPath: FocusPath, oldFocusPath: FocusPath, keypadHeight?: number, focusedElement?: HTMLElement) => unknown;
+            onFocusChange?: (newFocusPath: import("../..").FocusPath, oldFocusPath: import("../..").FocusPath, keypadHeight?: number, focusedElement?: HTMLElement) => unknown;
             GroupMetadataEditor?: React.ComponentType<any>;
             showAlignmentOptions?: boolean;
             readOnly?: boolean;
@@ -240,6 +223,7 @@ declare const _default: {
     version: import("@khanacademy/perseus-core").Version | undefined;
     isLintable: true;
     getOneCorrectAnswerFromRubric(rubric: PerseusExpressionRubric): string | null | undefined;
+    getStartUserInput: typeof getStartUserInput;
     getUserInputFromSerializedState: typeof getUserInputFromSerializedState;
 };
 export default _default;

package/dist/widgets/free-response/free-response.d.ts

@@ -14,13 +14,9 @@ type DefaultProps = Pick<Props, "userInput">;
 export declare class FreeResponse extends React.Component<Props> implements Widget {
     static contextType: React.Context<import("../../components/i18n-context").I18nContextType>;
     context: React.ContextType<typeof PerseusI18nContext>;
+    isWidget: true;
     static defaultProps: DefaultProps;
     characterCount: () => number;
-    /**
-     * TODO: remove this when everything is pulling from Renderer state
-     * @deprecated get user input from Renderer state
-     * */
-    getUserInput(): PerseusFreeResponseUserInput;
     _handleUserInput: (newValue: string) => void;
     isOverLimit(): boolean;
     renderCharacterCount(): React.ReactNode;

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

@@ -12,7 +12,7 @@ declare const GRADING_STATUSES: {
     readonly invalid: "invalid";
 };
 type RenderProps = PerseusGradedGroupWidgetOptions;
-type Props = WidgetProps<RenderProps, undefined, TrackingGradedGroupExtraArguments> & {
+type Props = WidgetProps<RenderProps, Empty, TrackingGradedGroupExtraArguments> & {
     inGradedGroupSet?: boolean;
     onNextQuestion?: () => unknown;
 };
@@ -40,11 +40,10 @@ export declare class GradedGroup extends React.Component<Props, State> implement
     hintRendererRef: React.RefObject<Renderer>;
     shouldComponentUpdate(nextProps: Props, nextState: State): boolean;
     change: (...args: ReadonlyArray<unknown>) => any;
-    _onInteractWithWidget: (arg1: string) => void;
+    _handleUserInput(): void;
     _checkAnswer: () => void;
     getInputPaths: () => ReadonlyArray<FocusPath>;
     getPromptJSON(): GradedGroupPromptJSON;
-    setInputValue: (arg1: any, arg2: any, arg3: any) => any;
     focus: () => boolean;
     focusInputPath: (arg1: any) => void;
     blurInputPath: (arg1: any) => void;

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

@@ -21,7 +21,6 @@ declare class GradedGroupSet extends React.Component<Props, State> implements Wi
     shouldComponentUpdate(nextProps: Props, nextState: State): boolean;
     getInputPaths: () => ReadonlyArray<FocusPath>;
     getPromptJSON(): GradedGroupSetPromptJSON;
-    setInputValue: (arg1: FocusPath, arg2: any, arg3: any) => any;
     focus: () => boolean;
     focusInputPath: (arg1: FocusPath) => void;
     blurInputPath: (arg1: FocusPath) => void;

package/dist/widgets/grapher/grapher.d.ts

@@ -21,7 +21,6 @@ declare class Grapher extends React.Component<Props> implements Widget {
     _setupGraphie: (arg1: any, arg2: any) => void;
     showHairlines: (arg1: Coord) => void;
     hideHairlines: () => void;
-    getUserInput(): PerseusGrapherUserInput;
     getPromptJSON(): GrapherPromptJSON;
     /**
      * @deprecated and likely very broken API
@@ -125,7 +124,7 @@ declare class Grapher extends React.Component<Props> implements Widget {
 }
 declare function transform(options: GrapherPublicWidgetOptions): RenderProps;
 declare function staticTransform(options: PerseusGrapherWidgetOptions): {
-    availableTypes: ("linear" | "quadratic" | "sinusoid" | "absolute_value" | "exponential" | "logarithm" | "tangent")[];
+    availableTypes: ("linear" | "quadratic" | "sinusoid" | "tangent" | "exponential" | "logarithm" | "absolute_value")[];
     plot: import("@khanacademy/perseus-core").GrapherAnswerTypes;
     graph: {
         backgroundImage: {
@@ -158,6 +157,7 @@ declare function staticTransform(options: PerseusGrapherWidgetOptions): {
  */
 declare function getUserInputFromSerializedState(serializedState: any): PerseusGrapherUserInput;
 declare function getStartUserInput(options: GrapherPublicWidgetOptions): PerseusGrapherUserInput;
+declare function getCorrectUserInput(options: PerseusGrapherWidgetOptions): PerseusGrapherUserInput;
 declare const _default: {
     name: string;
     displayName: string;
@@ -167,5 +167,6 @@ declare const _default: {
     staticTransform: typeof staticTransform;
     getUserInputFromSerializedState: typeof getUserInputFromSerializedState;
     getStartUserInput: typeof getStartUserInput;
+    getCorrectUserInput: typeof getCorrectUserInput;
 };
 export default _default;

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

@@ -11,9 +11,9 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import Renderer from "../../renderer";
 import type { ChangeFn, FocusPath, Widget, WidgetProps } from "../../types";
 import type { GroupPromptJSON } from "../../widget-ai-utils/group/group-ai-utils";
-import type { PerseusGroupWidgetOptions, UserInputArray, UserInputMap } from "@khanacademy/perseus-core";
+import type { PerseusGroupUserInput, PerseusGroupWidgetOptions, PerseusRenderer } from "@khanacademy/perseus-core";
 type RenderProps = PerseusGroupWidgetOptions;
-type Props = WidgetProps<RenderProps>;
+type Props = WidgetProps<RenderProps, PerseusGroupUserInput>;
 type DefaultProps = {
     content: Props["content"];
     widgets: Props["widgets"];
@@ -27,11 +27,6 @@ declare class Group extends React.Component<Props> implements Widget {
     static defaultProps: DefaultProps;
     componentDidMount(): void;
     change: ChangeFn;
-    getUserInputMap(): UserInputMap | undefined;
-    /**
-     * @deprecated getUserInputMap should be used for Groups
-     */
-    getUserInput(): UserInputArray | undefined;
     getPromptJSON(): GroupPromptJSON;
     /**
      * @deprecated - do not use in new code.
@@ -42,17 +37,20 @@ declare class Group extends React.Component<Props> implements Widget {
      */
     restoreSerializedState: (arg1: any, arg2: any) => null;
     getInputPaths(): readonly FocusPath[];
-    setInputValue: (arg1: FocusPath, arg2: string, arg3?: () => unknown) => void;
     focus(): boolean;
     focusInputPath: (arg1: FocusPath) => void;
     blurInputPath: (arg1: FocusPath) => void;
     render(): React.ReactNode;
 }
+declare function getStartUserInput(options: PerseusRenderer, problemNum: number): PerseusGroupUserInput;
+declare function getUserInputFromSerializedState(serializedState: unknown, widgetOptions: PerseusGroupWidgetOptions): PerseusGroupUserInput;
 declare const _default: {
     name: string;
     displayName: string;
     widget: typeof Group;
     hidden: true;
     isLintable: true;
+    getStartUserInput: typeof getStartUserInput;
+    getUserInputFromSerializedState: typeof getUserInputFromSerializedState;
 };
 export default _default;