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

Jump to bottom

[ProgressV2] Make expanding choice levels tab navigable #57899

Merged
merged 2 commits into from
Apr 9, 2024
Merged

[ProgressV2] Make expanding choice levels tab navigable #57899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d50d653
[ProgressV2] Make expanding choice levels tab navigable
lfryemason Apr 9, 2024
626ca27
Add expanded aria
lfryemason Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 54 additions & 26 deletions apps/src/templates/sectionProgressV2/LevelProgressHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,38 @@ export default function ExpandedProgressColumnHeader({
}) {
const isExpandable = level.sublevels?.length > 0;

const getLevelHeaderContent = React.useCallback(
() => (
<>
<div className={styles.expandedHeaderLevelCellLevelNumber}>
{lesson.relative_position + '.' + level.bubbleText}
</div>
{level.kind === 'assessment' && (
<FontAwesome
icon="star"
aria-label="assessment"
className={styles.assessmentLevelIcon}
/>
)}
</>
),
[lesson, level]
);

const expandedLevel = React.useCallback(
isExpanded => (
<button
type="button"
className={styles.expandedHeaderLevelCellExpandable}
aria-expanded={isExpanded}
>
{<FontAwesome icon={isExpanded ? 'caret-down' : 'caret-right'} />}
{getLevelHeaderContent()}
</button>
),
[getLevelHeaderContent]
);

const expandedChoiceLevel = React.useCallback(
() => (
<>
Expand All @@ -31,17 +63,9 @@ export default function ExpandedProgressColumnHeader({
id={getLevelColumnHeaderId(level.id)}
onClick={() => toggleExpandedChoiceLevel(level)}
>
{level.sublevels?.length > 0 && <FontAwesome icon="caret-down" />}
<div className={styles.expandedHeaderLevelCellLevelNumber}>
{lesson.relative_position + '.' + level.bubbleText}
</div>
{level.kind === 'assessment' && (
<FontAwesome
icon="star"
aria-label="assessment"
className={styles.assessmentLevelIcon}
/>
)}
{level.sublevels?.length > 0
? expandedLevel(true)
: getLevelHeaderContent()}
</th>
{level.sublevels?.map((sublevel, index) => (
<th
Expand All @@ -63,7 +87,14 @@ export default function ExpandedProgressColumnHeader({
))}
</>
),
[lesson, level, isExpandable, toggleExpandedChoiceLevel]
[
lesson,
level,
isExpandable,
toggleExpandedChoiceLevel,
expandedLevel,
getLevelHeaderContent,
]
);

const unexpandedLevel = React.useCallback(
Expand All @@ -80,22 +111,19 @@ export default function ExpandedProgressColumnHeader({
onClick={() => toggleExpandedChoiceLevel(level)}
id={getLevelColumnHeaderId(level.id)}
>
{level.sublevels?.length > 0 && <FontAwesome icon="caret-right" />}
<div className={styles.expandedHeaderLevelCellLevelNumber}>
{`${lesson.relative_position}.${
level.isUnplugged ? 0 : level.bubbleText
}`}
</div>
{level.kind === 'assessment' && (
<FontAwesome
icon="star"
aria-label="assessment"
className={styles.assessmentLevelIcon}
/>
)}
{level.sublevels?.length > 0
? expandedLevel(false)
: getLevelHeaderContent()}
</th>
),
[lesson, level, toggleExpandedChoiceLevel, isExpandable]
[
lesson,
level,
toggleExpandedChoiceLevel,
isExpandable,
expandedLevel,
getLevelHeaderContent,
]
);

return level.sublevels?.length > 0 && isLevelExpanded
Expand Down
23 changes: 20 additions & 3 deletions apps/src/templates/sectionProgressV2/progress-table-v2.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
}

// note: unless border is set, you will need to override
// the active border state
// the active border state. Important is necessary to override
// the default !important
// &:active {
// border: ____;
// border: ____ !important;
// }
}

Expand Down Expand Up @@ -232,7 +233,7 @@ $level-cell-width: 52;
align-items: center;

&:active {
border: none;
border: none !important;
}
}

Expand Down Expand Up @@ -272,6 +273,22 @@ $level-cell-width: 52;
color: inherit;
background-color: inherit;

&Expandable {
@include remove-default-button-styles;
display: flex;
flex-direction: row;
line-height: 32px;
align-items: center;
overflow: hidden;
flex-wrap: nowrap;
justify-content: space-evenly;
width: 100%;

&:active {
border: none !important;
}
}

&LevelNumber {
margin-top: 0.0625em;
}
Expand Down