Skip to content

feat:react-nav-preview Add a handful of accessibility features for Nav #31649

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

Merged
mltejera merged 6 commits into from
Jun 12, 2024
Merged

feat:react-nav-preview Add a handful of accessibility features for Nav #31649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b63c87c
adding more a11y features
mltejera Jun 10, 2024
8080192
change file
mltejera Jun 10, 2024
f2437b0
update change file
mltejera Jun 10, 2024
9d0b4ea
More change file updates
mltejera Jun 10, 2024
64e9404
more updates
mltejera Jun 11, 2024
1939acf
updating change file
mltejera Jun 11, 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
7 changes: 7 additions & 0 deletions change/@fluentui-react-nav-preview-d6e9b504-9ca3-4bbd-8066-2e70a8efba32.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "feat: Adding roles and current where appropriate.",
"packageName": "@fluentui/react-nav-preview",
"email": "matejera@microsoft.com",
"dependentChangeType": "patch"
}
3 changes: 3 additions & 0 deletions ...omponents/react-nav-preview/library/src/components/NavCategoryItem/useNavCategoryItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export const useNavCategoryItem_unstable = (
);

const selected = selectedCategoryValue === value;
// there's more than 2 possible values for aria-current, but this is the only one that's used in this component
const validAriaCurrent: 'page' | 'false' = selected && !open ? 'page' : 'false';

return {
open,
Expand All @@ -42,6 +44,7 @@ export const useNavCategoryItem_unstable = (
root: slot.always(
getIntrinsicElementProps('button', {
ref,
'aria-current': validAriaCurrent,
...props,
onClick: onNavCategoryItemClick,
}),
Expand Down
9 changes: 8 additions & 1 deletion packages/react-components/react-nav-preview/library/src/components/NavItem/useNavItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,14 @@ export const useNavItem_unstable = (
});

const root = slot.always<ARIAButtonSlotProps<'a'>>(
getIntrinsicElementProps(rootElementType, useARIAButtonProps(rootElementType, props)),
getIntrinsicElementProps(
rootElementType,
useARIAButtonProps(rootElementType, {
'aria-current': selected ? 'page' : 'false',
role: rootElementType,
...props,
}),
),
{
elementType: rootElementType,
defaultProps: {
Expand Down
9 changes: 8 additions & 1 deletion ...ges/react-components/react-nav-preview/library/src/components/NavSubItem/useNavSubItem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,14 @@ export const useNavSubItem_unstable = (
});

const root = slot.always<ARIAButtonSlotProps<'a'>>(
getIntrinsicElementProps(rootElementType, useARIAButtonProps(rootElementType, props)),
getIntrinsicElementProps(
rootElementType,
useARIAButtonProps(rootElementType, {
'aria-current': selected ? 'page' : 'false',
role: rootElementType,
...props,
}),
),
{
elementType: rootElementType,
defaultProps: {
Expand Down