Skip to content
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.

Sign up for GitHub

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

Style movable points and segments on Mafs graphs #1068

Merged
merged 8 commits into from
Mar 13, 2024
Merged

Style movable points and segments on Mafs graphs #1068

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
68de771
Style movable points
benchristel Mar 7, 2024
3cce1be
Style movable points and segments on Mafs graphs
benchristel Mar 13, 2024
2e92e19
Add changeset
benchristel Mar 13, 2024
df79343
Update tests
benchristel Mar 13, 2024
aea2b1a
Change the cursor to the grabbing hand when a point is being dragged
benchristel Mar 13, 2024
b3f3e59
Move all point radii to CSS, and de-duplicate magic numbers
benchristel Mar 13, 2024
a12cdeb
Make animation feel a bit snappier
benchristel Mar 13, 2024
162f667
Fix formatting
benchristel Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions packages/perseus/src/widgets/interactive-graphs/mafs-styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@

/* overridden on a per-point basis */
--movable-point-color: var(--mafs-blue);
--movable-point-center-radius: 6px;
--movable-point-ring-radius: calc(2px + var(--movable-point-center-radius));
--movable-point-halo-radius: calc(3px + var(--movable-point-ring-radius));
--movable-point-hover-expansion: 2px;
}

.MafsView .movable-segment {
Expand All @@ -39,29 +43,42 @@
}

.MafsView :is(.movable-point-center, .movable-point-ring, .movable-point-halo) {
transition: r 0.2s ease;
transition: r 0.15s ease-out;
}

.MafsView .movable-point-center {
r: var(--movable-point-center-radius);
}

.MafsView .movable-point-halo {
r: var(--movable-point-halo-radius);
fill: var(--movable-point-color);
opacity: 0.25;
filter: drop-shadow(0 5px 5px #0008);
}

.MafsView .movable-point-ring {
r: var(--movable-point-ring-radius);
fill: #fff;
}

.MafsView .movable-point:hover .movable-point-center {
r: 8px;
r: calc(
var(--movable-point-hover-expansion) +
var(--movable-point-center-radius)
);
}

.MafsView .movable-point:hover .movable-point-ring {
r: 10px;
r: calc(
var(--movable-point-hover-expansion) + var(--movable-point-ring-radius)
);
}

.MafsView .movable-point:hover .movable-point-halo {
r: 13px;
r: calc(
var(--movable-point-hover-expansion) + var(--movable-point-halo-radius)
);
}

.MafsView .movable-point:focus-visible .movable-point-halo {
Expand Down
5 changes: 2 additions & 3 deletions packages/perseus/src/widgets/interactive-graphs/movable-point.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,10 @@ export const MovablePoint = (props: Props) => {
}
>
<circle className="movable-point-hitbox" r={30} cx={x} cy={y} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optional suggestion: Maybe also move the hitbox radius to the styles for consistency?

<circle className="movable-point-halo" r={11} cx={x} cy={y} />
<circle className="movable-point-ring" r={8} cx={x} cy={y} />
<circle className="movable-point-halo" cx={x} cy={y} />
<circle className="movable-point-ring" cx={x} cy={y} />
<circle
className="movable-point-center"
r={6}
cx={x}
cy={y}
style={{fill: Color.blue}}
Expand Down
Loading