@khanacademy/perseus 33.3.0 → 34.0.0

package/dist/perseus-api.d.ts

@@ -107,6 +107,7 @@ export declare const ApiOptions: {
                 "unlimited-point"?: boolean | undefined;
             } & {
                 "interactive-graph-locked-features-labels"?: boolean | undefined;
+                "locked-point-labels"?: boolean | undefined;
             }) | undefined;
         } | undefined;
         onWidgetStartProps?: ((widgets: import("./perseus-types").PerseusWidgetsMap) => void) | undefined;

package/dist/perseus-types.d.ts

@@ -393,6 +393,7 @@ export type LockedPointType = {
     coord: Coord;
     color: LockedFigureColor;
     filled: boolean;
+    labels: LockedLabelType[];
 };
 export type LockedLineType = {
     type: "line";
@@ -665,7 +666,7 @@ export type PerseusSimulatorWidgetOptions = {
 export type PerseusSorterWidgetOptions = {
     correct: ReadonlyArray<string>;
     padding: boolean;
-    layout: string;
+    layout: "horizontal" | "vertical";
 };
 export type PerseusTableWidgetOptions = {
     headers: ReadonlyArray<string>;

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

@@ -152,6 +152,7 @@ declare const ref: React.ForwardRefExoticComponent<Omit<Pick<SharedRendererProps
                 "unlimited-point"?: boolean | undefined;
             } & {
                 "interactive-graph-locked-features-labels"?: boolean | undefined;
+                "locked-point-labels"?: boolean | undefined;
             }) | undefined;
         } | undefined;
         onWidgetStartProps?: ((widgets: import("./perseus-types").PerseusWidgetsMap) => void) | undefined;

package/dist/types.d.ts

@@ -75,7 +75,7 @@ type TrackInteractionArgs = {
     correct?: boolean;
 } & Partial<TrackingGradedGroupExtraArguments> & Partial<TrackingSequenceExtraArguments>;
 export declare const MafsGraphTypeFlags: readonly ["angle", "segment", "linear", "linear-system", "ray", "polygon", "circle", "quadratic", "sinusoid", "point", "unlimited-point", "none"];
-export declare const InteractiveGraphLockedFeaturesFlags: readonly ["interactive-graph-locked-features-labels"];
+export declare const InteractiveGraphLockedFeaturesFlags: readonly ["interactive-graph-locked-features-labels", "locked-point-labels"];
 /**
  * APIOptions provides different ways to customize the behaviour of Perseus.
  *

package/dist/util/answer-types.d.ts

@@ -1,7 +1,7 @@
 import type { PerseusStrings } from "../strings";
 type Guess = any;
 type Predicate = any;
-type Score = {
+export type Score = {
     empty: boolean;
     correct: boolean;
     message: string | null | undefined;

package/dist/widgets/__shared__/noop-validator.d.ts

@@ -0,0 +1,11 @@
+import type { PerseusScore } from "../../types";
+/**
+ * Several widgets don't have "right"/"wrong" validation logic,
+ * so this just says to move on past those widgets
+ *
+ * TODO: widgets that use this probably shouldn't have any
+ * validation logic and the thing validating an exercise
+ * should just know to skip these
+ */
+declare function noopValidator(): PerseusScore;
+export default noopValidator;

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

@@ -3,7 +3,9 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusCategorizerWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { PerseusScore, WidgetProps } from "../../types";
-type UserInput = any;
+type UserInput = {
+    values: ReadonlyArray<number>;
+};
 export type Rubric = PerseusCategorizerWidgetOptions;
 type Props = WidgetProps<RenderProps, Rubric> & {
     values: ReadonlyArray<string>;

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

@@ -1,28 +1,34 @@
 /**
  * This widget is for embedding Khan Academy CS programs.
  */
-import PropTypes from "prop-types";
 import * as React from "react";
-declare class CSProgram extends React.Component<any> {
-    static propTypes: {
-        programID: PropTypes.Requireable<string>;
-        programType: PropTypes.Requireable<string>;
-        width: PropTypes.Requireable<number>;
-        height: PropTypes.Requireable<number>;
-        settings: PropTypes.Requireable<any[]>;
-        showEditor: PropTypes.Requireable<boolean>;
-        showButtons: PropTypes.Requireable<boolean>;
-        status: PropTypes.Requireable<string>;
-        message: PropTypes.Requireable<string>;
-        onChange: PropTypes.Validator<(...args: any[]) => any>;
-    };
-    static validate(state: any, rubric: any): any;
-    static defaultProps: any;
+import type { PerseusCSProgramWidgetOptions } from "../../perseus-types";
+import type { PerseusScore, WidgetProps } from "../../types";
+type Status = "correct" | "incorrect" | "incomplete";
+type UserInput = {
+    status: Status;
+    message: string | null;
+};
+type RenderProps = PerseusCSProgramWidgetOptions & {
+    status: Status;
+    message: string | null;
+};
+export type Rubric = PerseusCSProgramWidgetOptions;
+type Props = WidgetProps<RenderProps, Rubric>;
+type DefaultProps = {
+    showEditor: Props["showEditor"];
+    showButtons: Props["showButtons"];
+    status: Props["status"];
+    message: Props["message"];
+};
+declare class CSProgram extends React.Component<Props> {
+    static defaultProps: DefaultProps;
+    static validate(state: UserInput, rubric: any): PerseusScore;
     componentDidMount(): void;
     componentWillUnmount(): void;
     handleMessageEvent: (arg1: any) => void;
     change: (...args: ReadonlyArray<unknown>) => any;
-    simpleValidate: (arg1: any) => any;
+    simpleValidate(rubric: any): PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

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

@@ -0,0 +1,4 @@
+import type { Rubric, UserInput } from "./dropdown.types";
+import type { PerseusScore } from "../../types";
+declare function dropdownValidator(userInput: UserInput, rubric: Rubric): PerseusScore;
+export default dropdownValidator;

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

@@ -1,10 +1,6 @@
 import * as React from "react";
-import type { PerseusDropdownWidgetOptions } from "../../perseus-types";
+import type { Rubric, UserInput } from "./dropdown.types";
 import type { PerseusScore, WidgetProps } from "../../types";
-type Rubric = PerseusDropdownWidgetOptions;
-type UserInput = {
-    value: number;
-};
 type Props = WidgetProps<RenderProps, Rubric> & {
     selected: number;
 };

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

@@ -0,0 +1,5 @@
+import type { PerseusDropdownWidgetOptions } from "../../perseus-types";
+export type Rubric = PerseusDropdownWidgetOptions;
+export type UserInput = {
+    value: number;
+};

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

@@ -0,0 +1,5 @@
+import type { Rubric, OnInputErrorFunctionType } from "./expression.types";
+import type { PerseusStrings } from "../../strings";
+import type { PerseusScore } from "../../types";
+declare function expressionValidator(userInput: string, rubric: Rubric, onInputError: OnInputErrorFunctionType | undefined, strings: PerseusStrings, locale: string): PerseusScore;
+export default expressionValidator;

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

@@ -1,12 +1,12 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
+import type { Rubric, OnInputErrorFunctionType } from "./expression.types";
 import type { DependenciesContext } from "../../dependencies";
 import type { PerseusExpressionWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { PerseusScore, WidgetProps } from "../../types";
 import type { Keys as Key, KeypadConfiguration } from "@khanacademy/math-input";
 type InputPath = ReadonlyArray<string>;
-type Rubric = PerseusExpressionWidgetOptions;
 type RenderProps = {
     buttonSets: PerseusExpressionWidgetOptions["buttonSets"];
     buttonsVisible?: PerseusExpressionWidgetOptions["buttonsVisible"];
@@ -44,11 +44,6 @@ type DefaultProps = {
     times: Props["times"];
     value: Props["value"];
 };
-type OnInputErrorFunctionType = (arg1?: any, arg2?: any, arg3?: any) => boolean | null | undefined;
-/**
- *  Get the character used for separating decimals.
- */
-export declare const getDecimalSeparator: (locale: string) => string;
 export declare class Expression extends React.Component<Props, ExpressionState> {
     static contextType: React.Context<{
         strings: PerseusStrings;
@@ -153,6 +148,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -233,6 +229,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -313,6 +310,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -392,6 +390,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -472,6 +471,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -552,6 +552,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../../perseus-types").PerseusWidgetsMap) => void) | undefined;

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

@@ -0,0 +1,3 @@
+import type { PerseusExpressionWidgetOptions } from "../../perseus-types";
+export type Rubric = PerseusExpressionWidgetOptions;
+export type OnInputErrorFunctionType = (arg1?: any, arg2?: any, arg3?: any) => boolean | null | undefined;

package/dist/widgets/expression/get-decimal-separator.d.ts

@@ -0,0 +1,5 @@
+/**
+ *  Get the character used for separating decimals.
+ */
+declare const getDecimalSeparator: (locale: string) => string;
+export default getDecimalSeparator;

package/dist/widgets/iframe/iframe.d.ts

@@ -6,24 +6,33 @@
  * It's particularly well suited for embedding our ProcessingJS programs,
  *  but could also be used for embedding viz's hosted elsewhere.
  */
-import PropTypes from "prop-types";
 import * as React from "react";
-declare class Iframe extends React.Component<any> {
-    static propTypes: {
-        width: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
-        height: PropTypes.Requireable<NonNullable<string | number | null | undefined>>;
-        url: PropTypes.Requireable<string>;
-        settings: PropTypes.Requireable<any[]>;
-        status: PropTypes.Requireable<string>;
-        message: PropTypes.Requireable<string>;
-        allowFullScreen: PropTypes.Requireable<boolean>;
-        allowTopNavigation: PropTypes.Requireable<boolean>;
-        onChange: PropTypes.Validator<(...args: any[]) => any>;
-    };
-    static defaultProps: any;
+import type { PerseusIFrameWidgetOptions } from "../../perseus-types";
+import type { WidgetProps } from "../../types";
+type Status = "correct" | "incorrect" | "incomplete";
+type UserInput = {
+    status: Status;
+    message: string | null;
+};
+type RenderProps = PerseusIFrameWidgetOptions & {
+    status: Status;
+    message: string | null;
+    width: string;
+    height: string;
+};
+export type Rubric = PerseusIFrameWidgetOptions;
+type Props = WidgetProps<RenderProps, Rubric>;
+type DefaultProps = {
+    status: Props["status"];
+    message: Props["message"];
+    allowFullScreen: Props["allowFullScreen"];
+    allowTopNavigation: Props["allowTopNavigation"];
+};
+declare class Iframe extends React.Component<Props> {
+    static defaultProps: DefaultProps;
     componentDidMount(): void;
     componentWillUnmount(): void;
-    getUserInput: () => any;
+    getUserInput(): UserInput;
     handleMessageEvent: (arg1: any) => void;
     change: (...args: ReadonlyArray<unknown>) => any;
     simpleValidate: (arg1: any) => any;

package/dist/widgets/interactive-graphs/graph-locked-labels-layer.d.ts

@@ -1,6 +1,8 @@
 import * as React from "react";
 import type { LockedFigure } from "../../perseus-types";
+import type { APIOptions } from "../../types";
 type Props = {
+    flags?: APIOptions["flags"];
     lockedFigures: ReadonlyArray<LockedFigure>;
 };
 export default function GraphLockedLabelsLayer(props: Props): (React.JSX.Element | null)[];

package/dist/widgets/interactive-graphs/interactive-graph-question-builder.d.ts

@@ -103,6 +103,11 @@ declare class InteractiveGraphQuestionBuilder {
     addLockedPointAt(x: number, y: number, options?: {
         color?: LockedFigureColor;
         filled?: boolean;
+        labels?: {
+            text: string;
+            coord?: Coord;
+            size?: "small" | "medium" | "large";
+        }[];
     }): InteractiveGraphQuestionBuilder;
     addLockedLine(point1: vec.Vector2, point2: vec.Vector2, options?: {
         kind?: "line" | "ray" | "segment";

package/dist/widgets/interactive-graphs/mafs-graph.d.ts

@@ -1,11 +1,12 @@
 import * as React from "react";
 import { type InteractiveGraphAction } from "./reducer/interactive-graph-action";
 import type { InteractiveGraphState, InteractiveGraphProps } from "./types";
+import type { APIOptions } from "../../types";
 import type { vec } from "mafs";
 import "mafs/core.css";
 import "./mafs-styles.css";
 export type MafsGraphProps = {
-    showLabelsFlag?: boolean;
+    flags?: APIOptions["flags"];
     box: [number, number];
     backgroundImage?: InteractiveGraphProps["backgroundImage"];
     lockedFigures?: InteractiveGraphProps["lockedFigures"];

package/dist/widgets/interactive-graphs/stateful-mafs-graph.d.ts

@@ -2,8 +2,9 @@ import * as React from "react";
 import type { InteractiveGraphProps } from "./types";
 import type { PerseusGraphType } from "../../perseus-types";
 import type { Widget } from "../../renderer";
+import type { APIOptions } from "../../types";
 export type StatefulMafsGraphProps = {
-    showLabelsFlag?: boolean;
+    flags?: APIOptions["flags"];
     box: [number, number];
     backgroundImage?: InteractiveGraphProps["backgroundImage"];
     graph: PerseusGraphType;

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

@@ -145,6 +145,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../..").PerseusWidgetsMap) => void) | undefined;
@@ -209,6 +210,7 @@ declare const _default: Readonly<{
                     "unlimited-point"?: boolean | undefined;
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
+                    "locked-point-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../..").PerseusWidgetsMap) => void) | undefined;

package/dist/widgets/matcher/matcher.d.ts

@@ -1,62 +1,33 @@
-import PropTypes from "prop-types";
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { SortableOption } from "../../components/sortable";
+import type { PerseusMatcherWidgetOptions } from "../../perseus-types";
+import type { WidgetProps } from "../../types";
+type RenderProps = PerseusMatcherWidgetOptions;
+type Rubric = PerseusMatcherWidgetOptions;
+type Props = WidgetProps<RenderProps, Rubric>;
+type DefaultProps = {
+    left: Props["left"];
+    right: Props["right"];
+    labels: Props["labels"];
+    orderMatters: Props["orderMatters"];
+    padding: Props["padding"];
+    problemNum: Props["problemNum"];
+    onChange: Props["onChange"];
+    linterContext: Props["linterContext"];
+};
 type State = {
     leftHeight: number;
     rightHeight: number;
     texRendererLoaded: boolean;
 };
-export declare class Matcher extends React.Component<any, any> {
+export declare class Matcher extends React.Component<Props, State> {
     static contextType: React.Context<{
         strings: import("../../strings").PerseusStrings;
         locale: string;
     }>;
     context: React.ContextType<typeof PerseusI18nContext>;
-    static propTypes: {
-        apiOptions: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
-            isArticle: PropTypes.Validator<boolean>;
-            onInputError: PropTypes.Validator<(...args: any[]) => any>;
-            onFocusChange: PropTypes.Validator<(...args: any[]) => any>;
-            GroupMetadataEditor: PropTypes.Validator<(...args: any[]) => any>;
-            showAlignmentOptions: PropTypes.Validator<boolean>;
-            readOnly: PropTypes.Validator<boolean>;
-            answerableCallback: PropTypes.Requireable<(...args: any[]) => any>;
-            getAnotherHint: PropTypes.Requireable<(...args: any[]) => any>;
-            interactionCallback: PropTypes.Requireable<(...args: any[]) => any>;
-            groupAnnotator: PropTypes.Validator<(...args: any[]) => any>;
-            imagePlaceholder: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-            widgetPlaceholder: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-            baseElements: PropTypes.Requireable<PropTypes.InferProps<{
-                Link: PropTypes.Requireable<(...args: any[]) => any>;
-            }>>;
-            imagePreloader: PropTypes.Requireable<(...args: any[]) => any>;
-            trackInteraction: PropTypes.Requireable<(...args: any[]) => any>;
-            customKeypad: PropTypes.Requireable<boolean>;
-            nativeKeypadProxy: PropTypes.Requireable<(...args: any[]) => any>;
-            isMobile: PropTypes.Requireable<boolean>;
-            setDrawingAreaAvailable: PropTypes.Requireable<(...args: any[]) => any>;
-            hintProgressColor: PropTypes.Requireable<string>;
-            canScrollPage: PropTypes.Requireable<boolean>;
-            crossOutEnabled: PropTypes.Requireable<boolean>;
-            editorChangeDelay: PropTypes.Requireable<number>;
-        }>>>;
-        labels: PropTypes.Requireable<any[]>;
-        left: PropTypes.Requireable<any[]>;
-        onChange: PropTypes.Requireable<(...args: any[]) => any>;
-        orderMatters: PropTypes.Requireable<boolean>;
-        padding: PropTypes.Requireable<boolean>;
-        problemNum: PropTypes.Requireable<number>;
-        right: PropTypes.Requireable<any[]>;
-        trackInteraction: PropTypes.Validator<(...args: any[]) => any>;
-        linterContext: PropTypes.Requireable<PropTypes.InferProps<{
-            contentType: PropTypes.Requireable<string>;
-            highlightLint: PropTypes.Requireable<boolean>;
-            paths: PropTypes.Requireable<(string | null | undefined)[]>;
-            stack: PropTypes.Requireable<(string | null | undefined)[]>;
-        }>>;
-    };
-    static defaultProps: any;
+    static defaultProps: DefaultProps;
     state: State;
     changeAndTrack: (arg1: any) => void;
     onMeasureLeft: (arg1: any) => void;

package/dist/widgets/numeric-input/numeric-input-validator.d.ts

@@ -0,0 +1,6 @@
+import type { Rubric, UserInput } from "./numeric-input.types";
+import type { PerseusStrings } from "../../strings";
+import type { PerseusScore } from "../../types";
+export declare function maybeParsePercentInput(inputValue: string | number, normalizedAnswerExpected: boolean): string | number;
+declare function numericInputValidator(userInput: UserInput, rubric: Rubric, strings: PerseusStrings): PerseusScore;
+export default numericInputValidator;

package/dist/widgets/numeric-input/numeric-input.d.ts

@@ -2,13 +2,10 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import InputWithExamples from "../../components/input-with-examples";
 import SimpleKeypadInput from "../../components/simple-keypad-input";
+import type { Rubric, UserInput } from "./numeric-input.types";
 import type { PerseusNumericInputWidgetOptions, PerseusNumericInputAnswerForm } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { FocusPath, PerseusScore, WidgetProps } from "../../types";
-type UserInput = {
-    currentValue: string;
-};
-export type Rubric = PerseusNumericInputWidgetOptions;
 type ExternalProps = WidgetProps<PerseusNumericInputWidgetOptions, Rubric>;
 type Props = ExternalProps & {
     size: NonNullable<ExternalProps["size"]>;
@@ -61,7 +58,6 @@ export declare class NumericInput extends React.Component<Props, State> {
     render(): React.ReactNode;
 }
 export declare const unionAnswerForms: (arg1: ReadonlyArray<ReadonlyArray<PerseusNumericInputAnswerForm>>) => ReadonlyArray<PerseusNumericInputAnswerForm>;
-export declare function maybeParsePercentInput(inputValue: string | number, normalizedAnswerExpected: boolean): string | number;
 declare const _default: Readonly<{
     name: string;
     displayName: string;

package/dist/widgets/numeric-input/numeric-input.types.d.ts

@@ -0,0 +1,5 @@
+import type { PerseusNumericInputWidgetOptions } from "../../perseus-types";
+export type UserInput = {
+    currentValue: string;
+};
+export type Rubric = PerseusNumericInputWidgetOptions;

package/dist/widgets/orderer/orderer.d.ts

@@ -1,6 +1,10 @@
 import * as React from "react";
 import type { PerseusOrdererWidgetOptions } from "../../perseus-types";
 import type { WidgetProps } from "../../types";
+type Position = {
+    left: number;
+    top: number;
+};
 type Rubric = PerseusOrdererWidgetOptions;
 type RenderProps = PerseusOrdererWidgetOptions & {
     current: any;
@@ -23,13 +27,10 @@ type OrdererState = {
     dragWidth: number | null | undefined;
     dragHeight: number | null | undefined;
     dragContent: any;
-    offsetPos: number | null | undefined;
+    offsetPos: Position | null | undefined;
     grabPos: any;
     mousePos?: any;
-    animateTo: {
-        top: number;
-        left: number;
-    } | null | undefined;
+    animateTo: Position | null | undefined;
     onAnimationEnd?: (arg1: any) => void;
 };
 declare class Orderer extends React.Component<OrdererProps, OrdererState> {

package/dist/widgets/sorter/sorter.d.ts

@@ -1,50 +1,24 @@
-import PropTypes from "prop-types";
 import * as React from "react";
 import type { SortableOption } from "../../components/sortable";
-declare class Sorter extends React.Component<any, any> {
+import type { PerseusSorterWidgetOptions } from "../../perseus-types";
+import type { WidgetProps } from "../../types";
+type RenderProps = PerseusSorterWidgetOptions;
+type Rubric = PerseusSorterWidgetOptions;
+type Props = WidgetProps<RenderProps, Rubric>;
+type DefaultProps = {
+    correct: Props["correct"];
+    layout: Props["layout"];
+    padding: Props["padding"];
+    problemNum: Props["problemNum"];
+    onChange: Props["onChange"];
+    linterContext: Props["linterContext"];
+};
+type State = {
+    changed: boolean;
+};
+declare class Sorter extends React.Component<Props, State> {
     _isMounted: boolean;
-    static propTypes: {
-        apiOptions: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
-            isArticle: PropTypes.Validator<boolean>;
-            onInputError: PropTypes.Validator<(...args: any[]) => any>;
-            onFocusChange: PropTypes.Validator<(...args: any[]) => any>;
-            GroupMetadataEditor: PropTypes.Validator<(...args: any[]) => any>;
-            showAlignmentOptions: PropTypes.Validator<boolean>;
-            readOnly: PropTypes.Validator<boolean>;
-            answerableCallback: PropTypes.Requireable<(...args: any[]) => any>;
-            getAnotherHint: PropTypes.Requireable<(...args: any[]) => any>;
-            interactionCallback: PropTypes.Requireable<(...args: any[]) => any>;
-            groupAnnotator: PropTypes.Validator<(...args: any[]) => any>;
-            imagePlaceholder: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-            widgetPlaceholder: PropTypes.Requireable<PropTypes.ReactNodeLike>;
-            baseElements: PropTypes.Requireable<PropTypes.InferProps<{
-                Link: PropTypes.Requireable<(...args: any[]) => any>;
-            }>>;
-            imagePreloader: PropTypes.Requireable<(...args: any[]) => any>;
-            trackInteraction: PropTypes.Requireable<(...args: any[]) => any>;
-            customKeypad: PropTypes.Requireable<boolean>;
-            nativeKeypadProxy: PropTypes.Requireable<(...args: any[]) => any>;
-            isMobile: PropTypes.Requireable<boolean>;
-            setDrawingAreaAvailable: PropTypes.Requireable<(...args: any[]) => any>;
-            hintProgressColor: PropTypes.Requireable<string>;
-            canScrollPage: PropTypes.Requireable<boolean>;
-            crossOutEnabled: PropTypes.Requireable<boolean>;
-            editorChangeDelay: PropTypes.Requireable<number>;
-        }>>>;
-        correct: PropTypes.Requireable<any[]>;
-        layout: PropTypes.Requireable<string>;
-        onChange: PropTypes.Requireable<(...args: any[]) => any>;
-        padding: PropTypes.Requireable<boolean>;
-        problemNum: PropTypes.Requireable<number>;
-        trackInteraction: PropTypes.Validator<(...args: any[]) => any>;
-        linterContext: PropTypes.Requireable<PropTypes.InferProps<{
-            contentType: PropTypes.Requireable<string>;
-            highlightLint: PropTypes.Requireable<boolean>;
-            paths: PropTypes.Requireable<(string | null | undefined)[]>;
-            stack: PropTypes.Requireable<(string | null | undefined)[]>;
-        }>>;
-    };
-    static defaultProps: any;
+    static defaultProps: DefaultProps;
     static validate(state: any, rubric: any): any;
     state: any;
     componentDidMount(): void;

package/dist/widgets/table/table.d.ts

@@ -1,35 +1,31 @@
-import PropTypes from "prop-types";
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
+import type { ChangeableProps } from "../../mixins/changeable";
+import type { PerseusTableWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
-declare class Table extends React.Component<any> {
+import type { WidgetProps } from "../../types";
+type RenderProps = PerseusTableWidgetOptions & {
+    editableHeaders: boolean;
+    Editor: any;
+};
+type Rubric = PerseusTableWidgetOptions;
+type Props = ChangeableProps & WidgetProps<RenderProps, Rubric>;
+type DefaultProps = {
+    apiOptions: Props["apiOptions"];
+    headers: Props["headers"];
+    editableHeaders: Props["editableHeaders"];
+    rows: Props["rows"];
+    columns: Props["columns"];
+    answers: Props["answers"];
+    linterContext: Props["linterContext"];
+};
+declare class Table extends React.Component<Props> {
     static contextType: React.Context<{
         strings: PerseusStrings;
         locale: string;
     }>;
     context: React.ContextType<typeof PerseusI18nContext>;
-    static propTypes: {
-        answers: PropTypes.Requireable<((string | null | undefined)[] | null | undefined)[]>;
-        editableHeaders: PropTypes.Requireable<boolean>;
-        Editor: PropTypes.Requireable<(...args: any[]) => any>;
-        headers: PropTypes.Requireable<(string | null | undefined)[]>;
-        keypadElement: PropTypes.Requireable<PropTypes.InferProps<{
-            activate: PropTypes.Validator<(...args: any[]) => any>;
-            dismiss: PropTypes.Validator<(...args: any[]) => any>;
-            configure: PropTypes.Validator<(...args: any[]) => any>;
-            setCursor: PropTypes.Validator<(...args: any[]) => any>;
-            setKeyHandler: PropTypes.Validator<(...args: any[]) => any>;
-            getDOMNode: PropTypes.Validator<(...args: any[]) => any>;
-        }>>;
-        trackInteraction: PropTypes.Validator<(...args: any[]) => any>;
-        linterContext: PropTypes.Requireable<PropTypes.InferProps<{
-            contentType: PropTypes.Requireable<string>;
-            highlightLint: PropTypes.Requireable<boolean>;
-            paths: PropTypes.Requireable<(string | null | undefined)[]>;
-            stack: PropTypes.Requireable<(string | null | undefined)[]>;
-        }>>;
-    };
-    static defaultProps: any;
+    static defaultProps: DefaultProps;
     _getRows: () => number;
     _getColumns: () => number;
     getUserInput: () => any;