Skip to content

fix: don't apply modalizer attributes when focus trap isn't configured #29110

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
ling1726 merged 3 commits into from
Sep 8, 2023
Merged

fix: don't apply modalizer attributes when focus trap isn't configured #29110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1431f73
fix: don't apply modalizer attributes when focus trap isn't configured
ling1726 Sep 8, 2023
4198a73
changefile
ling1726 Sep 8, 2023
2ac1012
update snapshot
ling1726 Sep 8, 2023
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-popover-a88a6d1a-e63c-4c03-8d58-35b1065c4396.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: don't apply modalizer attributes when focus trap isn't configured",
"packageName": "@fluentui/react-popover",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/@fluentui-react-tabster-74dae66a-2abe-42d2-87f7-515c21ea4a3e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "fix: don't apply modalizer attributes when focus trap isn't configured",
"packageName": "@fluentui/react-tabster",
"email": "lingfangao@hotmail.com",
"dependentChangeType": "patch"
}
27 changes: 27 additions & 0 deletions packages/react-components/react-popover/src/components/Popover/Popover.cy.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,4 +541,31 @@ describe('Popover', () => {
.should('have.length', 2);
});
});

describe('Without trapFocus', () => {
it('should restore focus on close', () => {
mount(
<Popover>
<PopoverTrigger>
<button id="trigger">trigger</button>
</PopoverTrigger>
<PopoverSurface>
<button id="button">button</button>
</PopoverSurface>
</Popover>,
);

cy.get('#trigger')
.click()
.get(popoverContentSelector)
.should('exist')
.get('#button')
.focus()
.type('{esc}')
.get(popoverContentSelector)
.should('not.exist')
.get('#trigger')
.should('have.focus');
});
});
});
1 change: 1 addition & 0 deletions ...ts/react-popover/src/components/PopoverSurface/__snapshots__/PopoverSurface.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ exports[`PopoverSurface renders a default state 1`] = `
<div
aria-label="test"
class="fui-PopoverSurface"
data-tabster="{\\"restorer\\":{\\"type\\":0}}"
data-testid="component"
role="group"
>
Expand Down
2 changes: 1 addition & 1 deletion packages/react-components/react-popover/src/components/PopoverSurface/usePopoverSurface.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const usePopoverSurface_unstable = (
ref: useMergedRefs(ref, contentRef),
role: trapFocus ? 'dialog' : 'group',
'aria-modal': trapFocus ? true : undefined,
...(trapFocus ? modalAttributes : {}),
...modalAttributes,
...props,
}),
{ elementType: 'div' },
Expand Down
14 changes: 8 additions & 6 deletions packages/react-components/react-tabster/src/hooks/useModalAttributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,14 @@ export const useModalAttributes = (
const id = useId('modal-', options.id);
const modalAttributes = useTabsterAttributes({
restorer: { type: TabsterTypes.RestorerTypes.Source },
modalizer: {
id,
isOthersAccessible: !trapFocus,
isAlwaysAccessible: alwaysFocusable,
isTrapped: legacyTrapFocus && trapFocus,
},
...(trapFocus && {
modalizer: {
id,
isOthersAccessible: !trapFocus,
isAlwaysAccessible: alwaysFocusable,
isTrapped: legacyTrapFocus && trapFocus,
},
}),
});

const triggerAttributes = useTabsterAttributes({
Expand Down