@khanacademy/perseus 22.0.2 → 22.2.0

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

@@ -103,8 +103,8 @@ declare class LegacyInteractiveGraph extends React.Component<Props, State> {
     addAngleControls: () => void;
     removeAngleControls: () => void;
     toggleShowSides: () => void;
-    getUserInput: () => PerseusGraphType;
-    simpleValidate: (rubric: Rubric) => PerseusScore;
+    getUserInput(): PerseusGraphType;
+    simpleValidate(rubric: Rubric): PerseusScore;
     focus: () => void;
     render(): React.ReactNode;
 }
@@ -113,7 +113,7 @@ declare class InteractiveGraph extends React.Component<Props, State> {
     mafsRef: React.RefObject<Widget>;
     static defaultProps: DefaultProps;
     getUserInput: Widget["getUserInput"];
-    simpleValidate: (rubric: Rubric) => PerseusScore;
+    simpleValidate(rubric: Rubric): PerseusScore;
     render(): JSX.Element;
     static getQuadraticCoefficients(coords: ReadonlyArray<Coord>): QuadraticCoefficient;
     static getSinusoidCoefficients(coords: ReadonlyArray<Coord>): SineCoefficient;

package/dist/widgets/interactive-graphs/axis-labels.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export default function AxisLabels(): JSX.Element;

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

@@ -1,7 +1,9 @@
 /// <reference types="react" />
 import type { LockedFigure } from "../../perseus-types";
+import type { Interval } from "mafs";
 type Props = {
     lockedFigures: ReadonlyArray<LockedFigure>;
+    range: [x: Interval, y: Interval];
 };
 declare const GraphLockedLayer: (props: Props) => JSX.Element;
 export default GraphLockedLayer;

package/dist/widgets/interactive-graphs/graphs/components/arrowhead.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
+import { type vec } from "mafs";
 type Props = {
-    x: number;
-    y: number;
+    tip: vec.Vector2;
     angle: number;
     color?: string;
 };

package/dist/widgets/interactive-graphs/graphs/components/movable-line.d.ts

@@ -13,4 +13,5 @@ type Props = {
     };
 };
 export declare const MovableLine: (props: Props) => JSX.Element;
+export declare function trimRange(range: [Interval, Interval], graphDimensionsInPixels: vec.Vector2): [Interval, Interval];
 export {};

package/dist/widgets/interactive-graphs/graphs/components/vector.d.ts

@@ -1,9 +1,10 @@
-/// <reference types="react" />
 import { vec } from "mafs";
+import * as React from "react";
 type Props = {
     tail: vec.Vector2;
     tip: vec.Vector2;
     color: string;
+    style?: React.SVGProps<SVGLineElement>["style"];
 };
 export declare function Vector(props: Props): JSX.Element;
 export {};

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

@@ -1,2 +1,9 @@
-import { vec } from "mafs";
-export declare const useTransform: (...points: vec.Vector2[]) => vec.Vector2[];
+import { type Interval, vec } from "mafs";
+export type GraphDimensions = {
+    range: [Interval, Interval];
+    width: number;
+    height: number;
+};
+export declare function vectorsToPixels(vectors: vec.Vector2[], graphState: GraphDimensions, translation?: vec.Vector2): vec.Vector2[];
+export declare function pointToPixel(point: vec.Vector2, graphState: GraphDimensions): vec.Vector2;
+export declare const useTransformVectorsToPixels: (...vectors: vec.Vector2[]) => vec.Vector2[];

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

@@ -1,9 +1,11 @@
 import type { CollinearTuple } from "../../../perseus-types";
 import type { Interval, vec } from "mafs";
 /**
- * Given two points, find the tips that extends through the points to the edge of the range.
- * @param collinearPoint - The point that the line passes through. Needed to establish slope.
- * @param extendFrom - The point that the line extends from to the edge of the graph.
+ * Given a ray and a rectangular box, find the point where the ray intersects
+ * the edge of the box. Assumes the `initialPoint` is inside the box.
+ * @param initialPoint - The starting point of the ray.
+ * @param throughPoint - A point that the ray passes through. Must be different from initialPoint.
+ * @param box - The box with which to intersect the ray, in the form [[xMin, xMax], [yMin, yMax]]
  */
-export declare const getRayIntersectionCoords: (collinearPoint: vec.Vector2, extendFrom: vec.Vector2, range: [Interval, Interval]) => [number, number];
+export declare const getIntersectionOfRayWithBox: (initialPoint: vec.Vector2, throughPoint: vec.Vector2, box: [x: Interval, y: Interval]) => [number, number];
 export declare const getLines: (points: readonly vec.Vector2[]) => CollinearTuple[];

package/dist/widgets/interactive-graphs/locked-line.d.ts

@@ -1,4 +1,8 @@
 /// <reference types="react" />
 import type { LockedLineType } from "../../perseus-types";
-declare const LockedLine: (props: LockedLineType) => JSX.Element | null;
+import type { Interval } from "mafs";
+type Props = LockedLineType & {
+    range: [Interval, Interval];
+};
+declare const LockedLine: (props: Props) => JSX.Element;
 export default LockedLine;

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

@@ -17,6 +17,7 @@ export type Props = {
     markings: InteractiveGraphProps["markings"];
     onChange: InteractiveGraphProps["onChange"];
     showTooltips: Required<InteractiveGraphProps["showTooltips"]>;
+    labels: InteractiveGraphProps["labels"];
 };
 export declare const StatefulMafsGraph: React.ForwardRefExoticComponent<Props & React.RefAttributes<Partial<Widget>>>;
 type MafsGraphProps = Props & {

package/dist/widgets/interactive-graphs/reducer/use-graph-config.d.ts

@@ -5,6 +5,10 @@ type GraphConfig = {
     snapStep: vec.Vector2;
     markings: "graph" | "grid" | "none";
     showTooltips: boolean;
+    graphDimensionsInPixels: vec.Vector2;
+    width: number;
+    height: number;
+    labels: readonly string[];
 };
 export declare const GraphConfigContext: React.Context<GraphConfig>;
 export default function useGraphConfig(): GraphConfig;

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "22.0.2",
+    "version": "22.2.0",
     "publishConfig": {
         "access": "public"
     },
@@ -41,12 +41,12 @@
     "dependencies": {
         "@khanacademy/kas": "^0.3.9",
         "@khanacademy/kmath": "^0.1.12",
-        "@khanacademy/math-input": "^18.0.0",
+        "@khanacademy/math-input": "^18.0.1",
         "@khanacademy/perseus-core": "1.4.2",
         "@khanacademy/perseus-linter": "^0.3.12",
-        "@khanacademy/pure-markdown": "^0.3.2",
+        "@khanacademy/pure-markdown": "^0.3.3",
         "@khanacademy/simple-markdown": "^0.11.4",
-        "mafs": "https://github.com/Khan/mafs/releases/download/v0.18.1%2Bbuild-cd8b2467893342ba0b02100073fe21f93f8b1125/mafs-0.18.1.tgz"
+        "mafs": "0.18.5"
     },
     "devDependencies": {
         "@khanacademy/wonder-blocks-banner": "^3.0.41",
@@ -76,7 +76,7 @@
         "jquery": "^2.1.1",
         "katex": "^0.11.1",
         "lodash.debounce": "^4.0.8",
-        "perseus-build-settings": "^0.4.0",
+        "perseus-build-settings": "^0.4.1",
         "prop-types": "^15.6.1",
         "react": "16.14.0",
         "react-dom": "16.14.0",