@khanacademy/perseus 23.6.0 → 24.1.0

package/dist/util/svg.d.ts

@@ -4,6 +4,11 @@ export declare class PathBuilder {
     private scaleFactor;
     build(): string;
     move(x: number, y: number): PathBuilder;
+    line(x: number, y: number): PathBuilder;
+    circularArc(radius: number, toX: number, toY: number, { sweep, largeArc, }?: {
+        sweep?: boolean;
+        largeArc?: boolean;
+    }): PathBuilder;
     curve(control1X: number, control1Y: number, control2X: number, control2Y: number, endX: number, endY: number): PathBuilder;
     scale(factor: number): PathBuilder;
 }

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

@@ -5,7 +5,7 @@ import type { Coord } from "../interactive2/types";
 import type { PerseusGraphType, PerseusGraphTypeAngle, PerseusGraphTypePoint, PerseusGraphTypePolygon, PerseusGraphTypeSegment, PerseusInteractiveGraphWidgetOptions } from "../perseus-types";
 import type { Widget } from "../renderer";
 import type { ChangeHandler, PerseusScore, WidgetProps } from "../types";
-import type { QuadraticCoefficient, SineCoefficient, Range } from "../util/geometry";
+import type { QuadraticCoefficient, Range, SineCoefficient } from "../util/geometry";
 type RenderProps = PerseusInteractiveGraphWidgetOptions;
 export type Rubric = {
     correct: PerseusGraphType;
@@ -168,6 +168,7 @@ declare class InteractiveGraph extends React.Component<Props, State> {
     static validate(userInput: PerseusGraphType, rubric: Rubric, component: any): PerseusScore;
     static getUserInputFromProps(props: Props): PerseusGraphType;
 }
+export declare function shouldUseMafs(mafsFlags: Record<string, boolean> | undefined | boolean, graph: PerseusGraphType): boolean;
 declare const _default: Readonly<{
     name: string;
     displayName: string;

package/dist/widgets/interactive-graphs/graphs/use-draggable.d.ts

@@ -1,6 +1,23 @@
-import type { vec } from "mafs";
+import { vec } from "mafs";
 import type { RefObject } from "react";
-type Params = {
+/**
+ * Code in this file is derived from
+ * https://github.com/stevenpetryk/mafs/blob/4520319379a2cc2df8148d8baaef1f85db117103/src/interaction/useMovable.tsx#L20-L83
+ * and copied here under the terms of the MIT license.
+ *
+ * Copyright 2021 Steven Petryk
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ */
+export type Params = {
     gestureTarget: RefObject<Element>;
     onMove: (point: vec.Vector2) => unknown;
     point: vec.Vector2;
@@ -9,5 +26,5 @@ type Params = {
 type DragState = {
     dragging: boolean;
 };
-export declare function useDraggable(params: Params): DragState;
+export declare function useDraggable(args: Params): DragState;
 export {};

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

@@ -1,4 +1,5 @@
-import type { LockedFigureFillType, LockedFigureColor, PerseusRenderer } from "../../perseus-types";
+import type { LockedFigureFillType, LockedFigureColor, PerseusRenderer, CollinearTuple } from "../../perseus-types";
+import type { Coord } from "@khanacademy/perseus";
 import type { vec } from "mafs";
 export declare function interactiveGraphQuestionBuilder(): InteractiveGraphQuestionBuilder;
 declare class InteractiveGraphQuestionBuilder {
@@ -9,6 +10,7 @@ declare class InteractiveGraphQuestionBuilder {
     private yRange;
     private snapStep;
     private tickStep;
+    private showProtractor;
     private interactiveFigureConfig;
     private lockedFigures;
     build(): PerseusRenderer;
@@ -19,8 +21,15 @@ declare class InteractiveGraphQuestionBuilder {
     withYRange(min: number, max: number): InteractiveGraphQuestionBuilder;
     withSnapStep(x: number, y: number): InteractiveGraphQuestionBuilder;
     withTickStep(x: number, y: number): InteractiveGraphQuestionBuilder;
-    withSegments(numSegments: number): InteractiveGraphQuestionBuilder;
-    withCircle(): InteractiveGraphQuestionBuilder;
+    withProtractor(): InteractiveGraphQuestionBuilder;
+    withSegments(startCoords: CollinearTuple[]): InteractiveGraphQuestionBuilder;
+    withNumSegments(numSegments: number): InteractiveGraphQuestionBuilder;
+    withLinear(startCoords?: CollinearTuple): InteractiveGraphQuestionBuilder;
+    withLinearSystem(startCoords?: CollinearTuple[]): InteractiveGraphQuestionBuilder;
+    withRay(startCoords?: CollinearTuple): InteractiveGraphQuestionBuilder;
+    withCircle(startCoords?: Coord): InteractiveGraphQuestionBuilder;
+    withQuadratic(startCoords?: [Coord, Coord, Coord]): InteractiveGraphQuestionBuilder;
+    withSinusoid(startCoords?: [Coord, Coord]): InteractiveGraphQuestionBuilder;
     withPolygon(snapTo: "grid" | "angles" | "sides"): InteractiveGraphQuestionBuilder;
     addLockedPointAt(x: number, y: number): InteractiveGraphQuestionBuilder;
     addLockedLine(point1: vec.Vector2, point2: vec.Vector2): InteractiveGraphQuestionBuilder;

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

@@ -18,6 +18,7 @@ export type StatefulMafsGraphProps = {
     markings: InteractiveGraphProps["markings"];
     onChange: InteractiveGraphProps["onChange"];
     showTooltips: Required<InteractiveGraphProps["showTooltips"]>;
+    showProtractor: boolean;
     labels: InteractiveGraphProps["labels"];
 };
 export declare const StatefulMafsGraph: React.ForwardRefExoticComponent<StatefulMafsGraphProps & React.RefAttributes<Partial<Widget>>>;
@@ -30,6 +31,7 @@ export type MafsGraphProps = {
     containerSizeClass: InteractiveGraphProps["containerSizeClass"];
     markings: InteractiveGraphProps["markings"];
     showTooltips: Required<InteractiveGraphProps["showTooltips"]>;
+    showProtractor: boolean;
     labels: InteractiveGraphProps["labels"];
     state: InteractiveGraphState;
     dispatch: React.Dispatch<InteractiveGraphAction>;

package/dist/widgets/interactive-graphs/protractor.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="react" />
+import { vec } from "mafs";
+import "./protractor.css";
+export declare const centerToRotationHandle: vec.Vector2;
+export declare function Protractor(): JSX.Element;

package/dist/widgets/interactive-graphs/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Coord } from "../../interactive2/types";
 import type { PerseusInteractiveGraphWidgetOptions } from "../../perseus-types";
-import type { vec } from "mafs";
+import type { Interval, vec } from "mafs";
 /**
  * 44 is touch best practice and AAA compliant for WCAG
  * https://www.w3.org/WAI/WCAG21/Understanding/target-size.html
@@ -9,3 +9,9 @@ export declare const TARGET_SIZE = 44;
 export declare const normalizePoints: <A extends Coord[]>(range: PerseusInteractiveGraphWidgetOptions["range"], step: PerseusInteractiveGraphWidgetOptions["step"], coordsList: A, noSnap?: boolean) => A;
 export declare const normalizeCoords: <A extends Coord[]>(coordsList: A, ranges: PerseusInteractiveGraphWidgetOptions["range"]) => A;
 export declare function snap(snapStep: vec.Vector2, point: vec.Vector2): vec.Vector2;
+export declare function bound({ snapStep, range, point, }: {
+    snapStep: vec.Vector2;
+    range: [Interval, Interval];
+    point: vec.Vector2;
+}): vec.Vector2;
+export declare function clamp(value: number, min: number, max: number): number;

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "23.6.0",
+    "version": "24.1.0",
     "publishConfig": {
         "access": "public"
     },
@@ -46,6 +46,7 @@
         "@khanacademy/perseus-linter": "^0.4.0",
         "@khanacademy/pure-markdown": "^0.3.5",
         "@khanacademy/simple-markdown": "^0.12.0",
+        "@use-gesture/react": "^10.2.27",
         "mafs": "0.18.7"
     },
     "devDependencies": {