@khanacademy/perseus-editor 37.1.1 → 38.1.2

package/dist/item-editor.d.ts

@@ -1,10 +1,11 @@
 import * as React from "react";
+import CombinedHintsEditor from "./combined-hints-editor";
 import { A11yContext } from "./components/a11y-context";
 import Editor from "./editor";
 import ItemExtrasEditor from "./item-extras-editor";
 import type { A11yReport } from "./preview/use-preview-controller";
 import type { APIOptions, ImageUploader, ChangeHandler, DeviceType } from "@khanacademy/perseus";
-import type { PerseusAnswerArea, PerseusRenderer, PerseusItem } from "@khanacademy/perseus-core";
+import type { PerseusAnswerArea, PerseusRenderer, PerseusItem, Hint } from "@khanacademy/perseus-core";
 type Props = {
     /** Additional templates that the host application would like to display
      * within the Perseus Editor.
@@ -15,6 +16,7 @@ type Props = {
     widgetIsOpen?: boolean;
     imageUploader?: ImageUploader;
     question?: PerseusRenderer;
+    hints: Hint[];
     answerArea?: PerseusAnswerArea | null;
     /** URL of the route to show on initial load of the preview frames. */
     previewURL: string;
@@ -39,6 +41,7 @@ declare class ItemEditor extends React.Component<Props> {
     };
     questionEditor: React.RefObject<Editor>;
     itemExtrasEditor: React.RefObject<ItemExtrasEditor>;
+    hintsEditor: React.RefObject<CombinedHintsEditor>;
     derivePreviewContent: (inputs: import("./util/derive-question-preview-content").DerivePreviewContentInputs) => {
         type: "question";
         data: import("./preview/message-types").QuestionPreviewData;
@@ -48,10 +51,7 @@ declare class ItemEditor extends React.Component<Props> {
     handleItemExtrasChange: (newProps: Partial<PerseusAnswerArea>) => void;
     getSaveWarnings: () => any;
     handleA11yReport: (report: A11yReport | null) => void;
-    serialize(): {
-        answerArea: PerseusAnswerArea;
-        question: PerseusRenderer;
-    };
+    serialize(): PerseusItem;
     render(): React.ReactNode;
 }
 export default ItemEditor;

package/dist/mixins/changeable.d.ts

@@ -0,0 +1,37 @@
+/**
+ * Changeable
+ *
+ * Adds a this.change() function to a component
+ *
+ * This.change takes prop changes as parameters, and calls
+ * this.props.onChange with the modified props.
+ */
+export type ChangeFn = (newPropsOrSinglePropName: string | {
+    [key: string]: any;
+}, propValue?: any, callback?: () => unknown) => any;
+/**
+ * this.change()
+ *
+ * Can be called as follows:
+ * this.change(newProps, callback);
+ *
+ * this.change(propName, propValue, callback);
+ *
+ * this.change(propName) -> returns a lambda that takes a prop value to
+ * set and a callback to call after having set that value.
+ *
+ * TODO(LEMS-3245) remove Changeable
+ *
+ * @deprecated
+ */
+export declare const deprecatedChangeableChange: ChangeFn;
+/**
+ * TODO(LEMS-3245) remove Changeable
+ *
+ * @deprecated
+ */
+export type ChangeableProps = {
+    onChange: (values: {
+        [key: string]: any;
+    }, callback?: (() => unknown) | null | undefined, silent?: boolean) => unknown;
+};

package/dist/mixins/editor-jsonify.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @deprecated do not use EditorJsonify
+ * See LEMS-4108 for more details
+ */
+declare const EditorJsonify: {
+    readonly serialize: () => any;
+};
+export default EditorJsonify;

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

@@ -1,8 +1,8 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
+import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { CategorizerDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends CategorizerDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { PerseusCategorizerWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusCategorizerWidgetOptions, ChangeableProps {
     apiOptions?: APIOptionsWithDefaults;
 }
 /**
@@ -10,7 +10,7 @@ interface Props extends CategorizerDefaultWidgetOptions, Changeable.ChangeablePr
  */
 declare class CategorizerEditor extends React.Component<Props> {
     static widgetName: "categorizer";
-    static defaultProps: CategorizerDefaultWidgetOptions;
+    static defaultProps: PerseusCategorizerWidgetOptions;
     change: (arg1: any, arg2: any, arg3: any) => any;
     serialize: () => any;
     render(): React.ReactNode;

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

@@ -1,10 +1,10 @@
 /**
  * This editor is for embedding Khan Academy CS programs.
  */
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-import type { CSProgramDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface CSProgramEditorProps extends CSProgramDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { ChangeableProps } from "../../mixins/changeable";
+import type { PerseusCSProgramWidgetOptions } from "@khanacademy/perseus-core";
+interface CSProgramEditorProps extends PerseusCSProgramWidgetOptions, ChangeableProps {
 }
 /**
  * This is the main editor for this widget, to specify all the options.

package/dist/widgets/definition-editor/definition-editor.d.ts

@@ -1,9 +1,9 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
 import type { InitializeWidgetOptionsParams } from "../../editor";
+import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { DefinitionDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends DefinitionDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { PerseusDefinitionWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusDefinitionWidgetOptions, ChangeableProps {
     apiOptions?: APIOptionsWithDefaults;
 }
 /**
@@ -12,8 +12,8 @@ interface Props extends DefinitionDefaultWidgetOptions, Changeable.ChangeablePro
  */
 declare class DefinitionEditor extends React.Component<Props> {
     static widgetName: "definition";
-    static defaultProps: DefinitionDefaultWidgetOptions;
-    static initializeWidgetOptions(params: InitializeWidgetOptionsParams): DefinitionDefaultWidgetOptions;
+    static defaultProps: PerseusDefinitionWidgetOptions;
+    static initializeWidgetOptions(params: InitializeWidgetOptionsParams): PerseusDefinitionWidgetOptions;
     change: (arg1: any, arg2: any, arg3: any) => any;
     serialize: () => any;
     render(): React.ReactNode;

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

@@ -1,4 +1,4 @@
-import { type DropdownDefaultWidgetOptions } from "@khanacademy/perseus-core";
+import { type PerseusDropdownWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
 type Props = any;
 /**
@@ -10,7 +10,7 @@ declare class DropdownEditor extends React.Component<Props> {
         placeholder: any;
     };
     static widgetName: "dropdown";
-    static defaultProps: DropdownDefaultWidgetOptions;
+    static defaultProps: PerseusDropdownWidgetOptions;
     onVisibleLabelChange: (arg1: string) => void;
     onAriaLabelChange: (arg1: string) => void;
     onPlaceholderChange: (arg1: string) => void;

package/dist/widgets/explanation-editor/explanation-editor.d.ts

@@ -1,8 +1,8 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
+import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { ExplanationDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends ExplanationDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { PerseusExplanationWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusExplanationWidgetOptions, ChangeableProps {
     apiOptions?: APIOptionsWithDefaults;
 }
 /**
@@ -10,7 +10,7 @@ interface Props extends ExplanationDefaultWidgetOptions, Changeable.ChangeablePr
  */
 declare class ExplanationEditor extends React.Component<Props> {
     static widgetName: "explanation";
-    static defaultProps: ExplanationDefaultWidgetOptions;
+    static defaultProps: PerseusExplanationWidgetOptions;
     change: (arg1: any, arg2: any, arg3: any) => any;
     serialize: () => any;
     render(): React.ReactNode;

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

@@ -1,14 +1,14 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
 import Editor from "../../editor";
+import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { GradedGroupDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends GradedGroupDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { PerseusGradedGroupWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusGradedGroupWidgetOptions, ChangeableProps {
     apiOptions?: APIOptionsWithDefaults;
 }
 declare class GradedGroupEditor extends React.Component<Props> {
     static widgetName: "graded-group";
-    static defaultProps: GradedGroupDefaultWidgetOptions;
+    static defaultProps: PerseusGradedGroupWidgetOptions;
     editor: React.RefObject<Editor>;
     hintEditor: React.RefObject<Editor>;
     change: (arg1: any, arg2: any, arg3: any) => any;

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

@@ -1,14 +1,14 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
+import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { GradedGroupSetDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends GradedGroupSetDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { PerseusGradedGroupSetWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusGradedGroupSetWidgetOptions, ChangeableProps {
     apiOptions?: APIOptionsWithDefaults;
 }
 declare class GradedGroupSetEditor extends React.Component<Props> {
     _editors: Array<any>;
     static widgetName: "graded-group-set";
-    static defaultProps: GradedGroupSetDefaultWidgetOptions;
+    static defaultProps: PerseusGradedGroupSetWidgetOptions;
     UNSAFE_componentWillMount(): void;
     change: (arg1: any, arg2: any, arg3: any) => any;
     getSaveWarnings: () => ReadonlyArray<any>;

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

@@ -1,6 +1,6 @@
 import * as React from "react";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { GrapherAnswerTypes, GrapherDefaultWidgetOptions, PerseusGrapherWidgetOptions } from "@khanacademy/perseus-core";
+import type { GrapherAnswerTypes, PerseusGrapherWidgetOptions } from "@khanacademy/perseus-core";
 type Props = {
     onChange: (newProps: Record<string, unknown>) => void;
     graph: PerseusGrapherWidgetOptions["graph"];
@@ -10,7 +10,7 @@ type Props = {
 };
 declare class GrapherEditor extends React.Component<Props> {
     static widgetName: "grapher";
-    static defaultProps: GrapherDefaultWidgetOptions;
+    static defaultProps: PerseusGrapherWidgetOptions;
     handleAvailableTypesChange: (newAvailableTypes: Array<any>) => void;
     serialize: () => any;
     render(): React.ReactNode;

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

@@ -1,6 +1,6 @@
 import * as React from "react";
 import Editor from "../../editor";
-import type { GroupDefaultWidgetOptions, PerseusRenderer } from "@khanacademy/perseus-core";
+import type { PerseusGroupWidgetOptions, PerseusRenderer } from "@khanacademy/perseus-core";
 type Props = any;
 declare class GroupEditor extends React.Component<Props> {
     static propTypes: {
@@ -10,7 +10,7 @@ declare class GroupEditor extends React.Component<Props> {
         apiOptions: any;
     };
     static widgetName: "group";
-    static defaultProps: GroupDefaultWidgetOptions;
+    static defaultProps: PerseusGroupWidgetOptions;
     editor: React.RefObject<Editor>;
     getSaveWarnings: () => ReadonlyArray<any>;
     serialize(): PerseusRenderer;

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

@@ -1,14 +1,14 @@
-import { Changeable } from "@khanacademy/perseus";
-import { type IFrameDefaultWidgetOptions } from "@khanacademy/perseus-core";
+import { type PerseusIFrameWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
-interface IframeEditorProps extends IFrameDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { ChangeableProps } from "../../mixins/changeable";
+interface IframeEditorProps extends PerseusIFrameWidgetOptions, ChangeableProps {
 }
 /**
  * This is the main editor for this widget, to specify all the options.
  */
 declare class IframeEditor extends React.Component<IframeEditorProps> {
     static widgetName: "iframe";
-    static defaultProps: IFrameDefaultWidgetOptions;
+    static defaultProps: PerseusIFrameWidgetOptions;
     change: (arg1: any, arg2: any, arg3: any) => any;
     handleSettingsChange: (arg1: any) => void;
     serialize: () => any;

package/dist/widgets/image-editor/components/dark-mode-toggle.d.ts

@@ -8,4 +8,9 @@ interface Props {
     onSuppressToggle: ImageEditorProps["onChange"];
 }
 export default function DarkModeToggle({ backgroundImage, onShowToggle, onSuppressToggle, editingDisabled, }: Props): React.JSX.Element;
+/**
+ * Determines whether an image is a "graphical" type (PNG or SVG) with large
+ * flat areas of meaningful color and potentially a transparent background.
+ */
+export declare function isGraphicalImage(url: string | null | undefined): boolean;
 export {};

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

@@ -1,4 +1,4 @@
-import { type ImageDefaultWidgetOptions, type PerseusImageWidgetOptions } from "@khanacademy/perseus-core";
+import { type PerseusImageWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
 import type { APIOptions } from "@khanacademy/perseus";
 export interface Props extends PerseusImageWidgetOptions {
@@ -11,7 +11,7 @@ export interface Props extends PerseusImageWidgetOptions {
 declare class ImageEditor extends React.Component<Props> {
     static displayName: string;
     static widgetName: string;
-    static defaultProps: ImageDefaultWidgetOptions;
+    static defaultProps: PerseusImageWidgetOptions;
     serialize(): any;
     render(): React.JSX.Element;
 }

package/dist/widgets/interaction-editor/constraint-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     constraint: string;
     constraintFn: string;
     constraintXMax: string;

package/dist/widgets/interaction-editor/function-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     value: string;
     rangeMin: string;
     rangeMax: string;

package/dist/widgets/interaction-editor/interaction-editor.d.ts

@@ -1,4 +1,4 @@
-import { type Coords, type InteractionDefaultWidgetOptions, type MarkingsType } from "@khanacademy/perseus-core";
+import { type Coords, type PerseusInteractionWidgetOptions, type MarkingsType } from "@khanacademy/perseus-core";
 import * as React from "react";
 type Graph = {
     box: ReadonlyArray<number>;
@@ -25,7 +25,7 @@ type State = any;
  */
 declare class InteractionEditor extends React.Component<Props, State> {
     static widgetName: "interaction";
-    static defaultProps: InteractionDefaultWidgetOptions;
+    static defaultProps: PerseusInteractionWidgetOptions;
     state: State;
     UNSAFE_componentWillReceiveProps(nextProps: Props): void;
     _getAllVarSubscripts(elements: ReadonlyArray<any>): ReadonlyArray<any>;

package/dist/widgets/interaction-editor/label-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     color: string;
     coordX: string;
     coordY: string;

package/dist/widgets/interaction-editor/line-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     startX: string;
     startY: string;
     endX: string;

package/dist/widgets/interaction-editor/movable-line-editor.d.ts

@@ -1,7 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type ChangeFn = typeof Changeable.change;
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps, ChangeFn } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     startX: string;
     startY: string;
     endX: string;

package/dist/widgets/interaction-editor/movable-point-editor.d.ts

@@ -1,7 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type ChangeFn = typeof Changeable.change;
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps, ChangeFn } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     startX: string;
     startY: string;
     constraint: string;

package/dist/widgets/interaction-editor/parametric-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     x: string;
     y: string;
     rangeMin: string;

package/dist/widgets/interaction-editor/point-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     coordX: string;
     coordY: string;
     color: string;

package/dist/widgets/interaction-editor/rectangle-editor.d.ts

@@ -1,6 +1,6 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-type Props = Changeable.ChangeableProps & {
+import type { ChangeableProps } from "../../mixins/changeable";
+type Props = ChangeableProps & {
     color: string;
     coordX: string;
     coordY: string;

package/dist/widgets/interactive-graph-editor/components/interactive-graph-settings.d.ts

@@ -1,11 +1,7 @@
-/**
- * Used in the editor for the InteractiveGraph widget.
- */
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
+import type { ChangeFn } from "../../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
 import type { AxisLabelLocation, ShowAxisArrows, ShowAxisTicks, MarkingsType, PerseusImageBackground } from "@khanacademy/perseus-core";
-type ChangeFn = typeof Changeable.change;
 type Range = [min: number, max: number];
 interface Props {
     /**

package/dist/widgets/interactive-graph-editor/interactive-graph-editor.d.ts

@@ -1,4 +1,4 @@
-import { type LockedFigure, type PerseusImageBackground, type PerseusInteractiveGraphWidgetOptions, type PerseusGraphType, type MarkingsType, type InteractiveGraphDefaultWidgetOptions, type AxisLabelLocation, type ShowAxisArrows, type ShowAxisTicks } from "@khanacademy/perseus-core";
+import { type LockedFigure, type PerseusImageBackground, type PerseusInteractiveGraphWidgetOptions, type PerseusGraphType, type MarkingsType, type AxisLabelLocation, type ShowAxisArrows, type ShowAxisTicks } from "@khanacademy/perseus-core";
 import * as React from "react";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
 import type { PropsFor } from "@khanacademy/wonder-blocks-core";
@@ -42,7 +42,9 @@ declare const InteractiveGraph: {
                 }>) => void;
                 customKeypad?: boolean;
                 isMobile?: boolean;
-                isMobileApp?: boolean;
+                isMobileApp? /**
+                 * The range of the graph in the x and y directions.
+                 */: boolean;
                 hintProgressColor?: string;
                 flags?: Record<"perseus-renderer-upgrade" | "desmos-calculator", boolean>;
             }> & {
@@ -368,7 +370,9 @@ declare const InteractiveGraph: {
                 }>) => void;
                 customKeypad?: boolean;
                 isMobile?: boolean;
-                isMobileApp?: boolean;
+                isMobileApp? /**
+                 * The range of the graph in the x and y directions.
+                 */: boolean;
                 hintProgressColor?: string;
                 flags?: Record<"perseus-renderer-upgrade" | "desmos-calculator", boolean>;
             }> & {
@@ -770,7 +774,7 @@ declare class InteractiveGraphEditor extends React.Component<Props> {
     };
     displayName: string;
     className: string;
-    static defaultProps: InteractiveGraphDefaultWidgetOptions & {
+    static defaultProps: PerseusInteractiveGraphWidgetOptions & {
         valid: true | string;
     };
     changeStartCoords: (coords: any) => void;

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

@@ -1,7 +1,7 @@
 import * as React from "react";
 import type { PreferredPopoverDirection } from "./behavior";
 import type { APIOptions } from "@khanacademy/perseus";
-import type { PerseusLabelImageWidgetOptions, LabelImageDefaultWidgetOptions } from "@khanacademy/perseus-core";
+import type { PerseusLabelImageWidgetOptions } from "@khanacademy/perseus-core";
 interface Props {
     apiOptions: APIOptions;
     choices: string[];
@@ -24,7 +24,7 @@ interface Props {
  */
 declare class LabelImageEditor extends React.Component<Props> {
     private _questionMarkers;
-    static defaultProps: LabelImageDefaultWidgetOptions;
+    static defaultProps: PerseusLabelImageWidgetOptions;
     static widgetName: "label-image";
     componentDidUpdate(prevProps: Props): void;
     getSaveWarnings: () => ReadonlyArray<any | string>;

package/dist/widgets/matrix-editor/matrix-editor.d.ts

@@ -1,13 +1,13 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
+import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-import type { MatrixDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends MatrixDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { PerseusMatrixWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusMatrixWidgetOptions, ChangeableProps {
     apiOptions: APIOptionsWithDefaults;
 }
 declare class MatrixEditor extends React.Component<Props> {
     static widgetName: "matrix";
-    static defaultProps: MatrixDefaultWidgetOptions;
+    static defaultProps: PerseusMatrixWidgetOptions;
     change: (arg1: any, arg2?: any, arg3?: any) => any;
     onMatrixBoardSizeChange: (arg1: [number, number]) => void;
     serialize: () => any;

package/dist/widgets/measurer-editor/measurer-editor.d.ts

@@ -1,11 +1,11 @@
-import { Changeable } from "@khanacademy/perseus";
 import * as React from "react";
-import type { MeasurerDefaultWidgetOptions } from "@khanacademy/perseus-core";
-interface Props extends MeasurerDefaultWidgetOptions, Changeable.ChangeableProps {
+import type { ChangeableProps } from "../../mixins/changeable";
+import type { PerseusMeasurerWidgetOptions } from "@khanacademy/perseus-core";
+interface Props extends PerseusMeasurerWidgetOptions, ChangeableProps {
 }
 declare class MeasurerEditor extends React.Component<Props> {
     static widgetName: "measurer";
-    static defaultProps: MeasurerDefaultWidgetOptions;
+    static defaultProps: PerseusMeasurerWidgetOptions;
     className: string;
     change: (arg1: any, arg2: any, arg3: any) => any;
     _changeUrl: (arg1: React.ChangeEvent<HTMLInputElement>) => void;

package/dist/widgets/number-line-editor/number-line-editor.d.ts

@@ -1,6 +1,6 @@
-import { type NumberLineDefaultWidgetOptions } from "@khanacademy/perseus-core";
+import { type PerseusNumberLineWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
-import type { Changeable } from "@khanacademy/perseus";
+import type { ChangeableProps } from "../../mixins/changeable";
 type Range = [number, number];
 type Props = {
     range: number[];
@@ -17,14 +17,14 @@ type Props = {
     isTickCtrl?: boolean;
     static?: boolean;
     showTooltips: boolean;
-} & Changeable.ChangeableProps;
+} & ChangeableProps;
 /**
  * An editor for adding a number line widget that allows users to mark
  * positions, intervals, and points on a number line.
  */
 declare class NumberLineEditor extends React.Component<Props> {
     static widgetName: "number-line";
-    static defaultProps: NumberLineDefaultWidgetOptions;
+    static defaultProps: PerseusNumberLineWidgetOptions;
     onRangeChange: (arg1: Range) => void;
     onLabelRangeChange: (arg1: number, arg2: number) => void;
     onDivisionRangeChange: (arg1: Range) => void;

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

@@ -1,8 +1,7 @@
-import { Changeable } from "@khanacademy/perseus";
 import { type PerseusNumericInputWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
+import type { ChangeFn } from "../../mixins/changeable";
 import type { APIOptionsWithDefaults } from "@khanacademy/perseus";
-type ChangeFn = typeof Changeable.change;
 type Props = Omit<PerseusNumericInputWidgetOptions, "static"> & {
     onChange: (results: any) => any;
     apiOptions: APIOptionsWithDefaults;

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

@@ -1,13 +1,8 @@
-import { type PerseusOrdererWidgetOptions, type PerseusRenderer } from "@khanacademy/perseus-core";
+import { type PerseusOrdererWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
 type Props = PerseusOrdererWidgetOptions & {
     onChange: (newOptions: Partial<PerseusOrdererWidgetOptions>, callback?: () => void) => void;
 };
-/**
- * The cards the student picks from: the correct answer and the distractors,
- * with duplicates and empty cards removed.
- */
-export declare const mergeCards: (correctOptions: PerseusRenderer[], otherOptions: PerseusRenderer[]) => PerseusRenderer[];
 declare class OrdererEditor extends React.Component<Props> {
     static widgetName: "orderer";
     static defaultProps: PerseusOrdererWidgetOptions;

package/dist/widgets/phet-simulation-editor/phet-simulation-editor.d.ts

@@ -1,6 +1,6 @@
-import { type PerseusPhetSimulationWidgetOptions, type PhetSimulationDefaultWidgetOptions } from "@khanacademy/perseus-core";
+import { type PerseusPhetSimulationWidgetOptions } from "@khanacademy/perseus-core";
 import * as React from "react";
-type Props = PhetSimulationDefaultWidgetOptions & {
+type Props = PerseusPhetSimulationWidgetOptions & {
     onChange: (arg1: {
         url?: Props["url"];
         description?: Props["description"];
@@ -11,7 +11,7 @@ type Props = PhetSimulationDefaultWidgetOptions & {
  * with physics simulations.
  */
 declare class PhetSimulationEditor extends React.Component<Props> {
-    static defaultProps: PhetSimulationDefaultWidgetOptions;
+    static defaultProps: PerseusPhetSimulationWidgetOptions;
     static widgetName: "phet-simulation";
     serialize(): PerseusPhetSimulationWidgetOptions;
     getSaveWarnings: () => ReadonlyArray<string>;

package/dist/widgets/plotter-editor/plotter-editor.d.ts

@@ -1,6 +1,6 @@
 import * as React from "react";
 import type { APIOptions } from "@khanacademy/perseus";
-import type { PerseusPlotterWidgetOptions, PlotterDefaultWidgetOptions } from "@khanacademy/perseus-core";
+import type { PerseusPlotterWidgetOptions } from "@khanacademy/perseus-core";
 declare const editingStates: string[];
 type EditingState = (typeof editingStates)[number];
 type Props = {
@@ -34,7 +34,7 @@ type State = {
  */
 declare class PlotterEditor extends React.Component<Props, State> {
     static widgetName: "plotter";
-    static defaultProps: PlotterDefaultWidgetOptions;
+    static defaultProps: PerseusPlotterWidgetOptions;
     state: State;
     UNSAFE_componentWillMount(): void;
     UNSAFE_componentWillReceiveProps(nextProps: any): void;