Add showAngles option to polygon locked figure
#3481
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| --- | ||
| "@khanacademy/perseus": minor | ||
| "@khanacademy/perseus-core": minor | ||
| "@khanacademy/perseus-editor": minor | ||
| --- | ||
|
|
||
| Add `showAngles` option to polygon locked figure |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,157 @@ | ||
| import {render, screen} from "@testing-library/react"; | ||
|
Contributor
There was a problem hiding this comment. It seems like we were previously just using the global set of tests in |
||
| import * as React from "react"; | ||
|
|
||
| import * as Dependencies from "../../../dependencies"; | ||
| import {testDependencies} from "../../../testing/test-dependencies"; | ||
| import {MafsGraph} from "../mafs-graph"; | ||
| import {getBaseMafsGraphPropsForTests} from "../utils"; | ||
|
|
||
| import type {NoneGraphState} from "../types"; | ||
| import type {LockedPolygonType} from "@khanacademy/perseus-core"; | ||
| import type {vec} from "mafs"; | ||
|
|
||
| const baseMafsGraphProps = getBaseMafsGraphPropsForTests(); | ||
| const baseGraphState = { | ||
| type: "none", | ||
| range: [ | ||
| [-10, 10], | ||
| [-10, 10], | ||
| ], | ||
| hasBeenInteractedWith: false, | ||
| snapStep: [1, 1], | ||
| } satisfies NoneGraphState; | ||
|
|
||
| const baseLockedPolygonProps = { | ||
| type: "polygon", | ||
| points: [ | ||
| [0, 2], | ||
| [-1, 0], | ||
| [1, 0], | ||
| ], | ||
| color: "grayH", | ||
| showVertices: false, | ||
| showAngles: false, | ||
| fillStyle: "none", | ||
| strokeStyle: "solid", | ||
| weight: "medium", | ||
| labels: [], | ||
| } satisfies LockedPolygonType; | ||
|
|
||
| // Polygon that looks like a chevron, with a concave vertex on the left, | ||
| // drawn from the top left. | ||
| const concavePolygonClockwise = [ | ||
| [-7, 5], | ||
| [1, 5], | ||
| [6, 0], | ||
| [1, -5], | ||
| [-7, -5], | ||
| [-2, 0], // concave vertex | ||
| ] satisfies vec.Vector2[]; | ||
|
|
||
| describe("LockedPolygon", () => { | ||
| beforeEach(() => { | ||
| jest.spyOn(Dependencies, "getDependencies").mockReturnValue( | ||
| testDependencies, | ||
| ); | ||
| }); | ||
|
|
||
| it("renders the polygon element", () => { | ||
| // Arrange, Act | ||
| const {container} = render( | ||
| <MafsGraph | ||
| {...baseMafsGraphProps} | ||
| state={baseGraphState} | ||
| lockedFigures={[baseLockedPolygonProps]} | ||
| />, | ||
| ); | ||
|
|
||
| // Assert | ||
| // eslint-disable-next-line testing-library/no-container, testing-library/no-node-access | ||
| const lockedPolygon = container.querySelector(".locked-polygon"); | ||
| expect(lockedPolygon).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it("does not show angle indicators when showAngles is false", () => { | ||
| // Arrange, Act | ||
| render( | ||
| <MafsGraph | ||
| {...baseMafsGraphProps} | ||
| state={baseGraphState} | ||
| lockedFigures={[ | ||
| { | ||
| ...baseLockedPolygonProps, | ||
| points: concavePolygonClockwise, | ||
| showAngles: false, | ||
| }, | ||
| ]} | ||
| />, | ||
| ); | ||
|
|
||
| // Assert | ||
| const angleIndicators = screen.queryAllByText(/°/); | ||
| expect(angleIndicators).toHaveLength(0); | ||
| }); | ||
|
|
||
| it("shows correct angles for concave polygons when points are clockwise", () => { | ||
| // Arrange | ||
|
|
||
| // Act - render with angles showing | ||
| render( | ||
| <MafsGraph | ||
| {...baseMafsGraphProps} | ||
| state={baseGraphState} | ||
| lockedFigures={[ | ||
| { | ||
| ...baseLockedPolygonProps, | ||
| points: concavePolygonClockwise, | ||
| showAngles: true, | ||
| }, | ||
| ]} | ||
| />, | ||
| ); | ||
|
|
||
| const angleIndicators = screen.getAllByText(/°/); | ||
|
|
||
| // Assert | ||
| expect(angleIndicators).toHaveLength(concavePolygonClockwise.length); | ||
| // Checking angles in render order | ||
| expect(angleIndicators[0]).toHaveTextContent("45°"); | ||
| expect(angleIndicators[1]).toHaveTextContent("135°"); | ||
| expect(angleIndicators[2]).toHaveTextContent("90°"); | ||
| expect(angleIndicators[3]).toHaveTextContent("135°"); | ||
| expect(angleIndicators[4]).toHaveTextContent("45°"); | ||
| // Concave vertex, greater than 180 degrees | ||
| expect(angleIndicators[5]).toHaveTextContent("270°"); | ||
| }); | ||
|
|
||
| it("should show correct angles for concave polygons when the points are counter-clockwise", () => { | ||
| // Arrange | ||
|
|
||
| // Act - render with angles showing | ||
| render( | ||
| <MafsGraph | ||
| {...baseMafsGraphProps} | ||
| state={baseGraphState} | ||
| lockedFigures={[ | ||
| { | ||
| ...baseLockedPolygonProps, | ||
| points: [...concavePolygonClockwise].reverse(), | ||
| showAngles: true, | ||
| }, | ||
| ]} | ||
| />, | ||
| ); | ||
|
|
||
| const angleIndicators = screen.getAllByText(/°/); | ||
|
|
||
| // Assert | ||
| expect(angleIndicators).toHaveLength(concavePolygonClockwise.length); | ||
| // Concave vertex, greater than 180 degrees | ||
| expect(angleIndicators[0]).toHaveTextContent("270°"); | ||
| expect(angleIndicators[1]).toHaveTextContent("45°"); | ||
| expect(angleIndicators[2]).toHaveTextContent("135°"); | ||
| expect(angleIndicators[3]).toHaveTextContent("90°"); | ||
| expect(angleIndicators[4]).toHaveTextContent("135°"); | ||
| expect(angleIndicators[5]).toHaveTextContent("45°"); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should pipe in the
options.showAnglesvalue here so that we can use the builder in tests/storybook. :)