@khanacademy/perseus 4.0.1 → 5.0.0

package/src/widgets/__testdata__/expression.testdata.ts

@@ -1,17 +1,13 @@
 import type {
-    PerseusRenderer,
     PerseusExpressionWidgetOptions,
     Version,
+    PerseusItem,
 } from "../../perseus-types";
 
-type Item = {
-    question: PerseusRenderer;
-};
-
 const createItemJson = (
     widgetOptions: PerseusExpressionWidgetOptions,
     version: Version,
-): Item => {
+): PerseusItem => {
     return {
         question: {
             content: "[[☃ expression 1]]",
@@ -25,9 +21,14 @@ const createItemJson = (
                 },
             },
         },
-        // @ts-expect-error [FEI-5003] - TS2322 - Type '{ question: { content: string; images: {}; widgets: { "expression 1": { type: "expression"; graded: true; options: PerseusExpressionWidgetOptions; version: Version; }; }; }; answerArea: { ...; }; itemDataVersion: { ...; }; hints: never[]; }' is not assignable to type 'Item'.
+        _multi: null,
+        answer: null,
         answerArea: {
+            zTable: false,
+            chi2Table: false,
+            tTable: false,
             calculator: false,
+            periodicTable: false,
         },
         itemDataVersion: {
             major: 0,
@@ -37,7 +38,7 @@ const createItemJson = (
     };
 };
 
-export const expressionItem2: Item = createItemJson(
+export const expressionItem2: PerseusItem = createItemJson(
     {
         answerForms: [
             {
@@ -88,7 +89,10 @@ export const expressionItem3Options: PerseusExpressionWidgetOptions = {
     buttonsVisible: "focused",
 };
 
-export const expressionItem3: Item = createItemJson(expressionItem3Options, {
-    major: 1,
-    minor: 0,
-});
+export const expressionItem3: PerseusItem = createItemJson(
+    expressionItem3Options,
+    {
+        major: 1,
+        minor: 0,
+    },
+);

package/src/widgets/__testdata__/group.testdata.ts

@@ -93,7 +93,6 @@ export const question1: PerseusRenderer = {
                             ],
                             coefficient: false,
                             labelText: "value rounded to the nearest ten",
-                            multipleNumberInput: false,
                             rightAlign: false,
                             size: "normal",
                             static: false,
@@ -118,7 +117,6 @@ export const question1: PerseusRenderer = {
                             ],
                             coefficient: false,
                             labelText: "value rounded to the nearest hundred",
-                            multipleNumberInput: false,
                             rightAlign: false,
                             size: "normal",
                             static: false,

package/src/widgets/__testdata__/numeric-input.testdata.ts

@@ -87,7 +87,6 @@ export const percentageProblem: PerseusRenderer = {
                         status: "correct",
                         maxError: null,
                         strict: false,
-                        // $FlowFixMe[incompatible-cast] I need this to be a percent
                         value: "33%",
                         simplify: "required",
                         message: "",

package/src/widgets/__testdata__/transformer.testdata.ts

@@ -59,7 +59,6 @@ export const question: PerseusRenderer = {
                 graphMode: "interactive",
                 listMode: "static",
                 starting: {
-                    // $FlowFixMe[speculation-ambiguous]
                     shape: {
                         coords: [
                             [0, 0],

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

@@ -279,7 +279,6 @@ describe("group widget", () => {
                   "coefficient": false,
                   "currentValue": "99",
                   "labelText": "value rounded to the nearest ten",
-                  "multipleNumberInput": false,
                   "rightAlign": false,
                   "size": "normal",
                   "static": false,
@@ -288,7 +287,6 @@ describe("group widget", () => {
                   "answerForms": [],
                   "coefficient": false,
                   "labelText": "value rounded to the nearest hundred",
-                  "multipleNumberInput": false,
                   "rightAlign": false,
                   "size": "normal",
                   "static": false,

package/src/widgets/__tests__/radio/focus-ring.test.tsx

@@ -10,7 +10,6 @@ describe("choice icon", () => {
     describe.each([[true], [false]])("multipleSelect: %s", (multipleSelect) => {
         it("renders with the correct border radius", () => {
             // Arrange/Act
-            // @ts-expect-error [FEI-5003] - TS2739 - Type '{ multipleSelect: any; }' is missing the following properties from type 'Props': visible, color
             render(<FocusRing multipleSelect={multipleSelect} />);
 
             const focusRing = screen.getByTestId("focus-ring");

package/src/widgets/__tests__/radio.test.ts

@@ -309,7 +309,7 @@ describe("single-choice question", () => {
         questionWithPassage.content = `[[\u2603 passage 1]]\n\nNow what's the answer?\n\n[[\u2603 radio 1]]`;
         questionWithPassage.widgets["passage 1"] = passageWidget;
         const radioOptions = questionWithPassage.widgets["radio 1"];
-        // HACK(jeremy): Flow doesn't know what type these options are because
+        // HACK(jeremy): TypeScript doesn't know what type these options are because
         // we've extracted them out of a generic `PerseusJson` blob and all the
         // `widget` items are just type `Widget`.
         (radioOptions.options as any).choices[0].content =

package/src/widgets/expression.tsx

@@ -87,6 +87,9 @@ type OnInputErrorFunctionType = (
 
 // The new, MathQuill input expression widget
 export class Expression extends React.Component<Props, ExpressionState> {
+    _isMounted = false;
+    errorTimeout: null | number = null;
+
     //#region Previously a class extension
     /* Content creators input a list of answers which are matched from top to
      * bottom. The intent is that they can include spcific solutions which should
@@ -334,9 +337,6 @@ export class Expression extends React.Component<Props, ExpressionState> {
         this._isMounted = false;
     };
 
-    _isMounted = false;
-    errorTimeout: null | number = null;
-
     simpleValidate: (
         rubric: Rubric,
         onInputError: OnInputErrorFunctionType,
@@ -458,7 +458,7 @@ export class Expression extends React.Component<Props, ExpressionState> {
                     onFocus={() => {
                         // this.props.keypadElement should always be set
                         // when apiOptions.customKeypad is set, but how
-                        // to convince Flow of this?
+                        // to convince TypeScript of this?
                         this.props.keypadElement?.configure(
                             this.props.keypadConfiguration,
                             () => {

package/src/widgets/graded-group-set.tsx

@@ -156,7 +156,6 @@ class GradedGroupSet extends React.Component<Props, State> {
                         return (
                             // TODO(jeremy): Don't spread this.props, instead
                             // pass in all props GradedGroup needs explicilty
-                            // $FlowFixMe[prop-missing]
                             // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
                             <GradedGroup
                                 key={i}
@@ -200,7 +199,6 @@ class GradedGroupSet extends React.Component<Props, State> {
                 </div>
                 {/* TODO(jeremy): Don't spread this.props, instead
                     pass in all props GradedGroup needs explicitly */}
-                {/* $FlowFixMe[prop-missing] */}
                 {/* @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call. */}
                 <GradedGroup
                     key={this.state.currentGroup}
@@ -211,9 +209,7 @@ class GradedGroupSet extends React.Component<Props, State> {
                     {...this.props}
                     {...currentGroup}
                     inGradedGroupSet={true}
-                    // $FlowFixMe[incompatible-type]
                     title={null}
-                    // $FlowFixMe[incompatible-type]
                     onNextQuestion={handleNextQuestion}
                     linterContext={this.props.linterContext}
                 />

package/src/widgets/graded-group.tsx

@@ -252,7 +252,6 @@ export class GradedGroup extends React.Component<Props, State> {
             : css(styles.gradedGroup);
 
         const classes = classNames({
-            // $FlowFixMe[invalid-computed-prop]
             [mobileClass]: apiOptions.isMobile,
             "perseus-graded-group": true,
             "answer-correct": apiOptions.isMobile
@@ -283,8 +282,6 @@ export class GradedGroup extends React.Component<Props, State> {
                  * props that are needed.
                  * TODO(FEI-4034): Only pass what the Renderer expects.
                  */}
-                {/* $FlowFixMe[prop-missing] */}
-                {/* $FlowFixMe[incompatible-type] */}
                 {/* @ts-expect-error [FEI-5003] - TS2322 - Type '{ ref: string; apiOptions: any; onInteractWithWidget: (arg1: string) => void; linterContext: LinterContextProps; title: string; hasHint?: boolean | null | undefined; ... 22 more ...; children?: ReactNode; }' is not assignable to type 'Pick<Readonly<Props> & Readonly<{ children?: ReactNode; }>, "children" | "keypadElement" | "problemNum" | "apiOptions" | "legacyPerseusLint">'. */}
                 <Renderer
                     {...this.props}
@@ -355,7 +352,6 @@ export class GradedGroup extends React.Component<Props, State> {
                              * We're passing a couple of props to Renderer that it doesn't
                              * require as part of {...this.props.hint}.
                              */}
-                            {/* $FlowFixMe[prop-missing] */}
                             <Renderer
                                 {...this.props.hint}
                                 // eslint-disable-next-line react/no-string-refs

package/src/widgets/grapher/util.tsx

@@ -149,8 +149,6 @@ const Quadratic = _.extend({}, PlotDefaults, {
         [0.5, 0.5],
         [0.75, 0.75],
     ],
-
-    // $FlowFixMe[prop-missing]
     // @ts-expect-error [FEI-5003] - TS2339 - Property 'Parabola' does not exist on type 'typeof Graphie'.
     Movable: Graphie.Parabola,
 
@@ -208,8 +206,6 @@ const Sinusoid = _.extend({}, PlotDefaults, {
         [0.5, 0.5],
         [0.6, 0.6],
     ],
-
-    // $FlowFixMe[prop-missing]
     // @ts-expect-error [FEI-5003] - TS2339 - Property 'Sinusoid' does not exist on type 'typeof Graphie'.
     Movable: Graphie.Sinusoid,
 
@@ -593,7 +589,7 @@ export const allTypes: any = _.keys(functionTypeMapping);
 
 export function functionForType(
     // TODO(jeremy): Actually `$Keys<typeof functionTypeMapping>` but that
-    // triggers Flow to require all of our Plot types to be fully typed which
+    // triggers TypeScript to require all of our Plot types to be fully typed which
     // is a big amount of work/change.
     type: string,
 ): any {

package/src/widgets/grapher.tsx

@@ -119,10 +119,8 @@ class FunctionGrapher extends React.Component<FunctionGrapherProps> {
                     coord={coord}
                     static={this.props.static}
                     constraints={[
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovablePoint.constraints.bound(),
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovablePoint.constraints.snap(),
                         (coord: any) => {
@@ -205,7 +203,6 @@ class FunctionGrapher extends React.Component<FunctionGrapherProps> {
             const scale = box[0] / interactiveSizes.defaultBoxSize;
             // @ts-expect-error [FEI-5003] - TS2322 - Type 'Element' is not assignable to type 'null'.
             image = (
-                // $FlowFixMe[prop-missing]: alt props is missing
                 // @ts-expect-error [FEI-5003] - TS2741 - Property 'alt' is missing in type '{ src: any; width: any; height: any; scale: number; }' but required in type 'Pick<Readonly<Props> & Readonly<{ children?: ReactNode; }>, "children" | "height" | "width" | "title" | "alt" | "trackInteraction" | "preloader" | "allowFullBleed" | "extraGraphie" | "overrideAriaHidden">'.
                 <SvgImage
                     src={imageDescription.url}
@@ -295,10 +292,8 @@ class FunctionGrapher extends React.Component<FunctionGrapherProps> {
                         });
                     }}
                     constraints={[
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovableLine.constraints.bound(),
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovableLine.constraints.snap(),
                         (newCoord, oldCoord: any) => {

package/src/widgets/group.tsx

@@ -171,7 +171,6 @@ class Group extends React.Component<Props> {
                     onInteractWithWidget={onInteractWithWidget}
                     linterContext={this.props.linterContext}
                 />
-                {/* $FlowFixMe[prop-missing] */}
                 {/* @ts-expect-error [FEI-5003] - TS2339 - Property 'icon' does not exist on type 'Readonly<Props> & Readonly<{ children?: ReactNode; }>'. */}
                 {this.props.icon && (
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'icon' does not exist on type 'Readonly<Props> & Readonly<{ children?: ReactNode; }>'.

package/src/widgets/interaction/element-container.tsx

@@ -10,7 +10,7 @@ import {
     iconTrash,
 } from "../../icon-paths";
 
-type ElementContainerProps = {
+type Props = {
     children: React.ReactElement<any> | ReadonlyArray<React.ReactElement<any>>;
     initiallyVisible: boolean;
     onDelete?: () => void | null | undefined;
@@ -19,12 +19,11 @@ type ElementContainerProps = {
     title: string | React.ReactElement<any>;
 };
 
-class ElementContainer extends React.Component<
-    ElementContainerProps,
-    {
-        show: boolean;
-    }
-> {
+type State = {
+    show: boolean;
+};
+
+class ElementContainer extends React.Component<Props, State> {
     static defaultProps: {
         initiallyVisible: boolean;
         title: string;
@@ -33,7 +32,7 @@ class ElementContainer extends React.Component<
         title: "More",
     };
 
-    constructor(props: ElementContainerProps) {
+    constructor(props: Props) {
         super(props);
 
         this.state = {

package/src/widgets/interaction.tsx

@@ -206,7 +206,6 @@ class Interaction extends React.Component<Props, State> {
                 });
                 compiledVars[name] = function (x: any) {
                     return func(
-                        // $FlowFixMe[extra-arg]
                         _.extend({}, compiledVars, {
                             x: x,
                         }),

package/src/widgets/interactive-graph.tsx

@@ -417,7 +417,6 @@ class InteractiveGraph extends React.Component<Props, State> {
             [-10, 10],
         ],
         step: [1, 1],
-        // $FlowFixMe[prop-missing]
         // @ts-expect-error [FEI-5003] - TS2739 - Type '{ readonly url: null; }' is missing the following properties from type 'PerseusImageBackground': width, height
         backgroundImage: defaultBackgroundImage,
         markings: "graph",
@@ -727,10 +726,8 @@ class InteractiveGraph extends React.Component<Props, State> {
             return Interactive2.addMaybeMobileMovablePoint(this, {
                 coord: coord,
                 constraints: [
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                     Interactive2.MovablePoint.constraints.bound(),
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                     Interactive2.MovablePoint.constraints.snap(),
                 ],
@@ -798,7 +795,6 @@ class InteractiveGraph extends React.Component<Props, State> {
 
         const onMoveHandler = () => {
             const graph = _.extend({}, this.props.graph, {
-                // $FlowFixMe[incompatible-use]
                 // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'. | TS2531 - Object is possibly 'null'. | TS2531 - Object is possibly 'null'.
                 coords: [pointA.coord(), pointB.coord(), pointC.coord()],
             });
@@ -813,19 +809,15 @@ class InteractiveGraph extends React.Component<Props, State> {
         pointA = this.pointA = Interactive2.addMaybeMobileMovablePoint(this, {
             coord: coords[0],
             constraints: [
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.bound(),
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.snap(),
                 (coord) => {
                     return (
                         !pointA ||
-                        // $FlowFixMe[incompatible-use]
                         // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                         (coord[0] !== pointB.coord()[0] &&
-                            // $FlowFixMe[incompatible-use]
                             // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                             coord[0] !== pointC.coord()[0])
                     );
@@ -841,19 +833,15 @@ class InteractiveGraph extends React.Component<Props, State> {
         pointB = this.pointB = Interactive2.addMaybeMobileMovablePoint(this, {
             coord: coords[1],
             constraints: [
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.bound(),
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.snap(),
                 (coord: any) => {
                     return (
                         !pointB ||
-                        // $FlowFixMe[incompatible-use]
                         // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                         (coord[0] !== pointA.coord()[0] &&
-                            // $FlowFixMe[incompatible-use]
                             // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                             coord[0] !== pointC.coord()[0])
                     );
@@ -869,19 +857,15 @@ class InteractiveGraph extends React.Component<Props, State> {
         pointC = this.pointC = Interactive2.addMaybeMobileMovablePoint(this, {
             coord: coords[2],
             constraints: [
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.bound(),
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.snap(),
                 (coord: any) => {
                     return (
                         !pointC ||
-                        // $FlowFixMe[incompatible-use]
                         // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                         (coord[0] !== pointA.coord()[0] &&
-                            // $FlowFixMe[incompatible-use]
                             // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                             coord[0] !== pointB.coord()[0])
                     );
@@ -943,7 +927,6 @@ class InteractiveGraph extends React.Component<Props, State> {
 
         const onMoveHandler = () => {
             const graph = _.extend({}, this.props.graph, {
-                // $FlowFixMe[incompatible-use]
                 // @ts-expect-error [FEI-5003] - TS2531 - Object is possibly 'null'.
                 coords: [pointA.coord(), pointB.coord()],
             });
@@ -958,10 +941,8 @@ class InteractiveGraph extends React.Component<Props, State> {
         pointA = this.pointA = Interactive2.addMaybeMobileMovablePoint(this, {
             coord: coords[0],
             constraints: [
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.bound(),
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.snap(),
                 (coord: any) => {
@@ -976,10 +957,8 @@ class InteractiveGraph extends React.Component<Props, State> {
             {
                 coord: coords[1],
                 constraints: [
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                     Interactive2.MovablePoint.constraints.bound(),
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                     Interactive2.MovablePoint.constraints.snap(),
                     (coord: any) => {
@@ -1049,9 +1028,7 @@ class InteractiveGraph extends React.Component<Props, State> {
 
         $(circle).on("move", () => {
             const graph = _.extend({}, this.props.graph, {
-                // $FlowFixMe[incompatible-use]
                 center: circle.center,
-                // $FlowFixMe[incompatible-use]
                 radius: circle.radius,
             });
             this.onChange({graph: graph});
@@ -1085,10 +1062,8 @@ class InteractiveGraph extends React.Component<Props, State> {
                         Interactive2.addMaybeMobileMovablePoint(this, {
                             coord: coord,
                             constraints: [
-                                // $FlowFixMe[prop-missing]
                                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                                 Interactive2.MovablePoint.constraints.bound(),
-                                // $FlowFixMe[prop-missing]
                                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                                 Interactive2.MovablePoint.constraints.snap(),
                                 (coord) => {
@@ -1152,9 +1127,7 @@ class InteractiveGraph extends React.Component<Props, State> {
         const graphie = this.graphie;
         const screenPoint = graphie?.scalePoint(coord);
         return (
-            // $FlowFixMe[incompatible-use]
             screenPoint[0] >= graphie.xpixels - 40 &&
-            // $FlowFixMe[incompatible-use]
             screenPoint[1] >= graphie.ypixels - 40
         );
     };
@@ -1188,10 +1161,8 @@ class InteractiveGraph extends React.Component<Props, State> {
         point = Interactive2.addMaybeMobileMovablePoint(this, {
             coord: coord,
             constraints: [
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.bound(),
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.snap(),
                 function (coord) {
@@ -1563,12 +1534,10 @@ class InteractiveGraph extends React.Component<Props, State> {
         const point = Interactive2.addMaybeMobileMovablePoint(this, {
             coord: coord,
             constraints: [
-                // $FlowFixMe[prop-missing]
                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                 Interactive2.MovablePoint.constraints.bound(),
                 snapToGrid
-                    ? // $FlowFixMe[prop-missing]
-                      // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
+                    ? // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                       Interactive2.MovablePoint.constraints.snap()
                     : null,
                 graphConstraint,
@@ -1686,10 +1655,8 @@ class InteractiveGraph extends React.Component<Props, State> {
                         createPoint({
                             coord: coord,
                             constraints: [
-                                // $FlowFixMe[prop-missing]
                                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                                 Interactive2.MovablePoint.constraints.bound(),
-                                // $FlowFixMe[prop-missing]
                                 // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                                 Interactive2.MovablePoint.constraints.snap(),
                                 (coord: any) => {
@@ -1718,15 +1685,12 @@ class InteractiveGraph extends React.Component<Props, State> {
                     points: points,
                     static: false,
                     constraints: [
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovableLine.constraints.bound(),
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovableLine.constraints.snap(),
                     ],
                     onMove: [
-                        // $FlowFixMe[prop-missing]
                         // @ts-expect-error [FEI-5003] - TS2339 - Property 'onMove' does not exist on type '(graphie: any, movable: any, options: any) => void'.
                         Interactive2.MovableLine.onMove.updatePoints,
                         updateCoordProps,
@@ -1870,12 +1834,10 @@ class InteractiveGraph extends React.Component<Props, State> {
             const self = this;
             self.polygon = Interactive2.addMovablePolygon(graphie, {
                 constraints: [
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => undefined'.
                     Interactive2.MovablePolygon.constraints.bound(),
                     snapToGrid
-                        ? // $FlowFixMe[prop-missing]
-                          // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => undefined'.
+                        ? // @ts-expect-error [FEI-5003] - TS2339 - Property 'constraints' does not exist on type '(graphie: any, movable: any, options: any) => undefined'.
                           Interactive2.MovablePolygon.constraints.snap()
                         : null,
                 ],
@@ -1886,7 +1848,6 @@ class InteractiveGraph extends React.Component<Props, State> {
                 numArcs: numArcs,
                 sideLabels: sideLabels,
                 onMove: [
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2339 - Property 'onMove' does not exist on type '(graphie: any, movable: any, options: any) => undefined'.
                     Interactive2.MovablePolygon.onMove.updatePoints,
                     function () {
@@ -2135,7 +2096,6 @@ class InteractiveGraph extends React.Component<Props, State> {
         props: Props,
     ): ReadonlyArray<Coord> {
         return (
-            // $FlowFixMe[incompatible-return]
             // @ts-expect-error [FEI-5003] - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'.
             graph.coords ||
             InteractiveGraph.pointsFromNormalized(props, [
@@ -2230,7 +2190,6 @@ class InteractiveGraph extends React.Component<Props, State> {
     ): ReadonlyArray<ReadonlyArray<Coord>> {
         return (
             // The callers assume that we're return an array of points
-            // $FlowFixMe[incompatible-return]
             // @ts-expect-error [FEI-5003] - TS2339 - Property 'coords' does not exist on type 'PerseusGraphType'.
             graph.coords ||
             _.map(
@@ -2323,17 +2282,11 @@ class InteractiveGraph extends React.Component<Props, State> {
         const n = graph.numSegments || 1;
         // @ts-expect-error [FEI-5003] - TS2322 - Type 'number[] | undefined' is not assignable to type 'readonly number[]'.
         const ys: ReadonlyArray<number> = {
-            // $FlowFixMe[unsupported-syntax]
             1: [5],
-            // $FlowFixMe[unsupported-syntax]
             2: [5, -5],
-            // $FlowFixMe[unsupported-syntax]
             3: [5, 0, -5],
-            // $FlowFixMe[unsupported-syntax]
             4: [6, 2, -2, -6],
-            // $FlowFixMe[unsupported-syntax]
             5: [6, 3, 0, -3, -6],
-            // $FlowFixMe[unsupported-syntax]
             6: [5, 3, 1, -1, -3, -5],
         }[n];
         const range = [
@@ -2645,7 +2598,6 @@ class InteractiveGraph extends React.Component<Props, State> {
                 // If both of the guess points are on the correct line, it's
                 // correct.
                 if (
-                    // $FlowFixMe[incompatible-use] - Fix type so coords can't be omitted
                     // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
                     collinear(correct[0], correct[1], guess[0]) &&
                     // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
@@ -2693,8 +2645,6 @@ class InteractiveGraph extends React.Component<Props, State> {
                 // If the parabola coefficients match, it's correct.
                 const guessCoeffs = this.getQuadraticCoefficients(state.coords);
                 const correctCoeffs = this.getQuadraticCoefficients(
-                    // $FlowFixMe[incompatible-call]
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
                     rubric.correct.coords,
                 );
@@ -2713,8 +2663,6 @@ class InteractiveGraph extends React.Component<Props, State> {
             ) {
                 const guessCoeffs = this.getSinusoidCoefficients(state.coords);
                 const correctCoeffs = this.getSinusoidCoefficients(
-                    // $FlowFixMe[incompatible-call]
-                    // $FlowFixMe[prop-missing]
                     // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'readonly Coord[] | undefined' is not assignable to parameter of type 'readonly Coord[]'.
                     rubric.correct.coords,
                 );
@@ -2738,7 +2686,6 @@ class InteractiveGraph extends React.Component<Props, State> {
             ) {
                 if (
                     deepEq(state.center, rubric.correct.center) &&
-                    // $FlowFixMe[prop-missing]
                     eq(state.radius, rubric.correct.radius)
                 ) {
                     return {
@@ -2831,10 +2778,8 @@ class InteractiveGraph extends React.Component<Props, State> {
                 const guess = state.coords;
                 const correct = rubric.correct.coords;
                 if (
-                    // $FlowFixMe[incompatible-use]
                     // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'.
                     deepEq(guess[0], correct[0]) &&
-                    // $FlowFixMe[incompatible-use]
                     // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
                     collinear(correct[0], correct[1], guess[1])
                 ) {
@@ -2869,14 +2814,10 @@ class InteractiveGraph extends React.Component<Props, State> {
                     match = eq(...angles);
                 } else {
                     /* exact */
-                    match =
-                        // $FlowFixMe[incompatible-use]
-                        // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
+                    match = // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
                         deepEq(guess[1], correct[1]) &&
-                        // $FlowFixMe[incompatible-use]
                         // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
                         collinear(correct[1], correct[0], guess[0]) &&
-                        // $FlowFixMe[incompatible-use]
                         // @ts-expect-error [FEI-5003] - TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'. | TS2532 - Object is possibly 'undefined'.
                         collinear(correct[1], correct[2], guess[2]);
                 }