Skip to content

fix: use trigger prop for aria-haspopup #24794

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
chpalac merged 5 commits into from
Sep 19, 2022
Merged

fix: use trigger prop for aria-haspopup #24794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e5fcc00
fix: use trigger prop for ariaa-haspopup
chpalac Sep 14, 2022
a080b4e
chore: add changelog
chpalac Sep 16, 2022
6a05536
Merge branch 'master' into fix/trigger-props-popup
chpalac Sep 16, 2022
c164745
chore: add tests
chpalac Sep 19, 2022
9e6dc48
Merge branch 'fix/trigger-props-popup' of github.com:chpalac/fluentui…
chpalac Sep 19, 2022
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
1 change: 1 addition & 0 deletions packages/fluentui/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
- Remove `rotate(360deg)` from `PopupContent` content styles @yuanboxue-amber ([#24432](https://github.com/microsoft/fluentui/pull/24432))
- Fix `FocusZone` to reset tabindex when focus is outside the zone with prop `shouldResetActiveElementWhenTabFromZone` @yuanboxue-amber ([#24463](https://github.com/microsoft/fluentui/pull/24463))
- Change `useLayoutEffect` in `Dropdown` to `useIsomorphicLayoutEffect` @marwan38 ([#24559](https://github.com/microsoft/fluentui/pull/24559))
- Fix `Popup` trigger attribute being override @chpalac ([#24794](https://github.com/microsoft/fluentui/pull/24794))
- Fix styling mutation when merging themes in `Dropdown` @petrjaros ([#24787](https://github.com/microsoft/fluentui/pull/24787))

### Performance
Expand Down
4 changes: 3 additions & 1 deletion packages/fluentui/accessibility/src/behaviors/Popup/popupBehavior.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ export const popupBehavior: Accessibility<PopupBehaviorProps> = props => {
: undefined;

if (tabbableTriggerProps) {
tabbableTriggerProps['aria-haspopup'] = 'dialog';
tabbableTriggerProps['aria-haspopup'] = props.trigger?.props.hasOwnProperty('aria-haspopup')
Comment thread
chpalac marked this conversation as resolved.
? props.trigger?.props['aria-haspopup']
: 'dialog';

if (process.env.NODE_ENV !== 'production') {
// Override the default trigger's accessibility schema class.
Expand Down
8 changes: 8 additions & 0 deletions packages/fluentui/accessibility/test/behaviors/popupBehavior-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,14 @@ describe('PopupBehavior.ts', () => {
expect(expectedResult.attributes.trigger.tabIndex).toEqual(-1);
});

test('Do not override trigger aria-haspopup attribute', () => {
const expectedResult = popupBehavior({
trigger: <button aria-haspopup={null} />,
tabbableTrigger: true,
});
expect(expectedResult.attributes.trigger['aria-haspopup']).toBeNull();
});

// TODO: Fix me
// test('does not add tabIndex if element is already tabbable', () => {
// const expectedResult = popupBehavior({ trigger: <Button />, tabbableTrigger: true })
Expand Down