-
Notifications
You must be signed in to change notification settings - Fork 350
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
View a locked point with mafs #1067
Conversation
The ability to view a locked points was added as part of [LEMS-1702](https://khanacademy.atlassian.net/browse/LEMS-1702), but now that we've switched to mafs, we need to implement viewing a point again with mafs. - Add a layer for locked figures to the mafs graph - Createa a new component for said locked feature - Add an interactive graph story to confirm that locked points can be viewed Issue: https://khanacademy.atlassian.net/browse/LEMS-1702 Test plan: - Open http://localhost:6006/?path=/story/perseus-widgets-interactive-graph--segment-with-mafs-and-locked-points - Confirm that red points are there at (-7, -7) and (2, -5) - Drag the points of the line segment over the locked points and confirm that the blue points sit on top of the red points. (Check the interactive layer is on top of the locked layer.)
Size Change: +223 B (0%) Total Size: 810 kB
ℹ️ View Unchanged
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1067 +/- ##
==========================================
+ Coverage 67.25% 68.52% +1.27%
==========================================
Files 435 437 +2
Lines 96468 96515 +47
Branches 6685 10259 +3574
==========================================
+ Hits 64879 66138 +1259
+ Misses 31589 30377 -1212
... and 102 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
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.
The code looks good! The graph in the screenshot doesn't look quite right though—I wonder if you need to import the Mafs CSS? Something like this:
import "mafs/core.css";
import "./mafs-styles.css";
I also left a couple suggestions inline.
packages/perseus/src/widgets/interactive-graphs/mafs-locked-layer.tsx
Outdated
Show resolved
Hide resolved
GeraldRequired Reviewers
Don't want to be involved in this pull request? Comment |
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.
This is really cool...especially how little code you had to write!
packages/perseus/src/widgets/interactive-graphs/mafs-locked-layer.tsx
Outdated
Show resolved
Hide resolved
@@ -0,0 +1,41 @@ | |||
import {UnreachableCaseError} from "@khanacademy/wonder-stuff-core"; |
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.
:til: !
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.
+1 to @jeremywiebe's comment about keeping props readonly. Otherwise, looks great!
packages/perseus/src/widgets/interactive-graphs/mafs-locked-layer.tsx
Outdated
Show resolved
Hide resolved
packages/perseus/src/widgets/interactive-graphs/mafs-locked-layer.tsx
Outdated
Show resolved
Hide resolved
npm Snapshot: PublishedGood news!! We've packaged up the latest commit from this PR (19b34f8) and published it to npm. You Example: yarn add @khanacademy/perseus@PR1067 If you are working in Khan Academy's webapp, you can run: ./dev/tools/bump_perseus_version.sh -t PR1067 |
…led story. Stop the bug where that story would break on input field change.
We changed it (accidentally) to offBlack16 in #1067. This commit fixes it. I removed the `--mafs-line-color` custom property because it's no longer used. Issue: none Test plan: View a Mafs segment graph in the dev UI (`yarn dev`). Verify that the segment is a darker gray than the gridlines.
## Summary: We changed it (accidentally) to offBlack16 in #1067. This commit fixes it. Issue: none Test plan: View the Mafs segment graph in Storybook (http://localhost:6006/?path=/story/perseus-widgets-interactive-graph--segment-with-mafs-and-locked-points). Verify that the segment is a darker gray than the gridlines. <img width="472" alt="Screen Shot 2024-03-13 at 6 11 27 PM" src="https://github.com/Khan/perseus/assets/693920/855b2366-8b97-46cd-9811-4d23d5d73755"> Author: benchristel Reviewers: jeremywiebe, nedredmond, nishasy, mark-fitzgerald Required Reviewers: Approved By: jeremywiebe Checks: ✅ codecov/project, ✅ codecov/patch, ✅ Upload Coverage, ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Jest Coverage (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Extract i18n strings (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ gerald Pull Request URL: #1073
This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @khanacademy/perseus-dev-ui@1.3.0 ### Minor Changes - [#1071](#1071) [`eb637b35`](eb637b3) Thanks [@benchristel](https://github.com/benchristel)! - Add a "check answer" button to interactive graphs displayed in the dev flipbook UI ## @khanacademy/perseus@20.2.0 ### Minor Changes - [#1067](#1067) [`6196375a`](6196375) Thanks [@nishasy](https://github.com/nishasy)! - Can pass a point into `lockedFigures` into MafsGraph and a point will be displayed. - [#1074](#1074) [`a263e940`](a263e94) Thanks [@nishasy](https://github.com/nishasy)! - Add "add a locked figure" UI to interactive graph editor + adding points (mafs graphs only) ### Patch Changes - [#1068](#1068) [`881da724`](881da72) Thanks [@benchristel](https://github.com/benchristel)! - Adjust styling of the movable points and line segments on the Mafs segment graph - [#1071](#1071) [`eb637b35`](eb637b3) Thanks [@benchristel](https://github.com/benchristel)! - Add a "check answer" button to interactive graphs displayed in the dev flipbook UI - [#1073](#1073) [`ea0db7d9`](ea0db7d) Thanks [@benchristel](https://github.com/benchristel)! - Fix color of Mafs line segments ## @khanacademy/perseus-editor@5.1.0 ### Minor Changes - [#1074](#1074) [`a263e940`](a263e94) Thanks [@nishasy](https://github.com/nishasy)! - Add "add a locked figure" UI to interactive graph editor + adding points (mafs graphs only) ### Patch Changes - Updated dependencies \[[`881da724`](881da72), [`eb637b35`](eb637b3), [`6196375a`](6196375), [`a263e940`](a263e94), [`ea0db7d9`](ea0db7d)]: - @khanacademy/perseus@20.2.0 Author: khan-actions-bot Reviewers: benchristel Required Reviewers: Approved By: benchristel Checks: ✅ codecov/project, ✅ codecov/patch, ✅ Upload Coverage, ✅ Jest Coverage (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ⏭️ Publish npm snapshot, ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Extract i18n strings (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ Jest Coverage (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ gerald, ✅ Prime node_modules cache for primary configuration (ubuntu-latest, 20.x) Pull Request URL: #1069
Summary:
The ability to view a locked points was added as part of
LEMS-1702, but now that we've
switched to mafs, we need to implement viewing a point again with mafs.
Issue: https://khanacademy.atlassian.net/browse/LEMS-1702
Test plan:
the blue points sit on top of the red points. (Check the interactive layer
is on top of the locked layer.)
Story