-
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
feat(LEMS-1733): adds aria labels to line segment #2032
base: main
Are you sure you want to change the base?
Changes from 10 commits
776c38b
bf27d16
76391ec
25b8121
de68801
0616ef8
08fd6bf
a4f033a
67b3bd7
06114d8
1f6b8b4
822097d
4981fdc
bacaad4
717bd34
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@khanacademy/perseus": minor | ||
--- | ||
|
||
adds aria labels to line segment |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,18 @@ | ||
import {point as kpoint} from "@khanacademy/kmath"; | ||
import * as React from "react"; | ||
|
||
import {usePerseusI18n} from "../../../components/i18n-context"; | ||
import {X, Y} from "../math"; | ||
import {actions} from "../reducer/interactive-graph-action"; | ||
|
||
import {MovableLine} from "./components/movable-line"; | ||
import {srFormatNumber} from "./screenreader-text"; | ||
|
||
import type { | ||
Dispatch, | ||
InteractiveGraphElementSuite, | ||
MafsGraphProps, | ||
PairOfPoints, | ||
SegmentGraphState, | ||
} from "../types"; | ||
import type {vec} from "mafs"; | ||
|
@@ -24,33 +29,123 @@ export function renderSegmentGraph( | |
|
||
type SegmentProps = MafsGraphProps<SegmentGraphState>; | ||
|
||
const SegmentGraph = (props: SegmentProps) => { | ||
const {dispatch} = props; | ||
const {coords: segments} = props.graphState; | ||
const SegmentGraph = ({dispatch, graphState}: SegmentProps) => { | ||
const {coords: segments} = graphState; | ||
const {strings, locale} = usePerseusI18n(); | ||
|
||
function getLengthOfSegment(segment: PairOfPoints) { | ||
return kpoint.distanceToPoint(...segment); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit (Optional): Since this component is not using stuff inside the component (everything it needs is passed into the parameters), you can move it outside the component, maybe at the top of this file. That way it won't re-initialize on every render. This won't really make a difference in performance in this particular case, so it's really up to you, but I believe that's considered good practice. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oops, I meant to write "Since this function is not using stuff inside the component" |
||
|
||
function getWholeSegmentGraphAriaLabel(): string { | ||
return segments?.length > 1 | ||
? strings.srMultipleSegmentGraphAriaLabel({ | ||
countOfSegments: segments.length, | ||
}) | ||
: strings.srSingleSegmentGraphAriaLabel; | ||
} | ||
|
||
const wholeSegmentGraphAriaLabel = getWholeSegmentGraphAriaLabel(); | ||
|
||
function getIndividualSegmentAriaDescription( | ||
segment: PairOfPoints, | ||
index: number, | ||
) { | ||
return strings.srIndividualSegmentAriaDescription({ | ||
point1X: srFormatNumber(segment[0][X], locale), | ||
point1Y: srFormatNumber(segment[0][Y], locale), | ||
point2X: srFormatNumber(segment[1][X], locale), | ||
point2Y: srFormatNumber(segment[1][Y], locale), | ||
length: srFormatNumber(getLengthOfSegment(segment), locale), | ||
indexOfSegment: index + 1, | ||
}); | ||
anakaren-rojas marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
function getWholeSegmentGraphAriaDescription() { | ||
let description = `${wholeSegmentGraphAriaLabel} `; | ||
|
||
segments.forEach((segment, index) => { | ||
description += | ||
getIndividualSegmentAriaDescription(segment, index) + " "; | ||
}); | ||
|
||
return description; | ||
} | ||
|
||
function formatSegment( | ||
endpointNumber: number, | ||
x: number, | ||
y: number, | ||
index: number, | ||
) { | ||
const segObj = { | ||
endpointNumber: endpointNumber, | ||
x: srFormatNumber(x, locale), | ||
y: srFormatNumber(y, locale), | ||
}; | ||
|
||
return segments.length > 1 | ||
? strings.srMultipleSegmentGraphEndpointAriaLabel({ | ||
...segObj, | ||
indexOfSegment: index, | ||
}) | ||
: strings.srSingleSegmentGraphEndpointAriaLabel(segObj); | ||
} | ||
|
||
return ( | ||
<> | ||
<g | ||
aria-label={wholeSegmentGraphAriaLabel} | ||
aria-describedby="wholeSegmentGraphAriaDescription" | ||
> | ||
{segments?.map((segment, i) => ( | ||
<MovableLine | ||
key={i} | ||
points={segment} | ||
onMoveLine={(delta: vec.Vector2) => { | ||
dispatch(actions.segment.moveLine(i, delta)); | ||
}} | ||
onMovePoint={( | ||
endpointIndex: number, | ||
destination: vec.Vector2, | ||
) => { | ||
dispatch( | ||
actions.segment.movePointInFigure( | ||
i, | ||
endpointIndex, | ||
destination, | ||
<g aria-describedby={`segment-description-${i}`} key={i}> | ||
<MovableLine | ||
key={i} | ||
points={segment} | ||
onMoveLine={(delta: vec.Vector2) => { | ||
dispatch(actions.segment.moveLine(i, delta)); | ||
}} | ||
onMovePoint={( | ||
endpointIndex: number, | ||
destination: vec.Vector2, | ||
) => { | ||
dispatch( | ||
actions.segment.movePointInFigure( | ||
i, | ||
endpointIndex, | ||
destination, | ||
), | ||
); | ||
}} | ||
ariaLabels={{ | ||
point1AriaLabel: formatSegment( | ||
1, | ||
segment[0][X], | ||
segment[0][Y], | ||
i + 1, | ||
), | ||
point2AriaLabel: formatSegment( | ||
2, | ||
segment[1][X], | ||
segment[1][Y], | ||
i + 1, | ||
), | ||
); | ||
}} | ||
/> | ||
}} | ||
/> | ||
<g | ||
id={`segment-description-${i}`} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You still need to use There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh I see, you're talking about having multiple instances of the line segment graph on a single page, right? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You can bubble it down, but I think just adding another I'm not aware of performance issues with |
||
style={{display: "hidden"}} | ||
> | ||
{getIndividualSegmentAriaDescription(segment, i)} | ||
</g> | ||
</g> | ||
))} | ||
</> | ||
<g | ||
style={{display: "hidden"}} | ||
id="wholeSegmentGraphAriaDescription" | ||
> | ||
{getWholeSegmentGraphAriaDescription()} | ||
</g> | ||
</g> | ||
); | ||
}; |
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.
Can you add a period to the end of this?