Skip to content

FocusTrapZone: Fix zero tabbable element scenarios #8274

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
JasonGore merged 4 commits into from
Mar 12, 2019
Merged

FocusTrapZone: Fix zero tabbable element scenarios #8274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be4d0d0
Fix FocusTrapZone with zero tabbable elements by marking the bumper d…
JasonGore Mar 12, 2019
323997a
Change file.
JasonGore Mar 12, 2019
4fde563
Minor cleanup.
JasonGore Mar 12, 2019
58e9200
Somewhat not so minor snapshot updates for minor fix.
JasonGore Mar 12, 2019
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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/jg-fix-ftz-no-tabbable_2019-03-12-04-48.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "FocusTrapZone: Fix for zones that have zero tabbable elements.",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "jagore@microsoft.com"
}
17 changes: 11 additions & 6 deletions packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,15 @@ export class FocusTrapZone extends BaseComponent<IFocusTrapZoneProps, {}> implem
const { className, ariaLabelledBy } = this.props;
const divProps = getNativeProps(this.props, divProperties);

const bumperStyle: React.CSSProperties = {
pointerEvents: 'none',
position: 'fixed' // 'fixed' prevents browsers from scrolling to bumpers when viewport does not contain them
};
const bumperProps = {
style: {
pointerEvents: 'none',
position: 'fixed' // 'fixed' prevents browsers from scrolling to bumpers when viewport does not contain them
},
tabIndex: 0,
'aria-hidden': true,
'data-is-visible': true
} as React.HTMLAttributes<HTMLDivElement>;

return (
<div
Expand All @@ -75,9 +80,9 @@ export class FocusTrapZone extends BaseComponent<IFocusTrapZoneProps, {}> implem
onFocus={this._onRootFocus}
onBlur={this._onRootBlur}
>
<div ref={this._firstBumper} onFocus={this._onFirstBumperFocus} style={bumperStyle} tabIndex={0} aria-hidden={true} />
<div {...bumperProps} ref={this._firstBumper} onFocus={this._onFirstBumperFocus} />
{this.props.children}
<div ref={this._lastBumper} onFocus={this._onLastBumperFocus} style={bumperStyle} tabIndex={0} aria-hidden={true} />
<div {...bumperProps} ref={this._lastBumper} onFocus={this._onLastBumperFocus} />
</div>
);
}
Expand Down
4 changes: 4 additions & 0 deletions ...ges/office-ui-fabric-react/src/components/HoverCard/__snapshots__/HoverCard.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ exports[`HoverCard renders ExpandingCard correctly 1`] = `
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down Expand Up @@ -170,6 +171,7 @@ exports[`HoverCard renders ExpandingCard correctly 1`] = `
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down Expand Up @@ -328,6 +330,7 @@ exports[`HoverCard renders PlainCard correctly 1`] = `
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand All @@ -353,6 +356,7 @@ exports[`HoverCard renders PlainCard correctly 1`] = `
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down
4 changes: 4 additions & 0 deletions packages/office-ui-fabric-react/src/components/Modal/__snapshots__/Modal.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ exports[`Modal renders Modal correctly 1`] = `
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand All @@ -158,6 +159,7 @@ exports[`Modal renders Modal correctly 1`] = `
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down Expand Up @@ -289,6 +291,7 @@ exports[`Modal renders Modeless Modal correctly 1`] = `
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand All @@ -311,6 +314,7 @@ exports[`Modal renders Modeless Modal correctly 1`] = `
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down
2 changes: 2 additions & 0 deletions packages/office-ui-fabric-react/src/components/Panel/__snapshots__/Panel.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ exports[`Panel renders Panel correctly 1`] = `
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down Expand Up @@ -408,6 +409,7 @@ exports[`Panel renders Panel correctly 1`] = `
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down
2 changes: 2 additions & 0 deletions ...-fabric-react/src/components/__snapshots__/CommandBar.CommandBarButtonAs.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2114,6 +2114,7 @@ exports[`Component Examples renders CommandBar.CommandBarButtonAs.Example.tsx co
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down Expand Up @@ -2350,6 +2351,7 @@ exports[`Component Examples renders CommandBar.CommandBarButtonAs.Example.tsx co
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down
2 changes: 2 additions & 0 deletions ...ffice-ui-fabric-react/src/components/__snapshots__/Panel.HiddenOnDismiss.Example.tsx.shot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ exports[`Component Examples renders Panel.HiddenOnDismiss.Example.tsx correctly
>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down Expand Up @@ -493,6 +494,7 @@ exports[`Component Examples renders Panel.HiddenOnDismiss.Example.tsx correctly
</div>
<div
aria-hidden={true}
data-is-visible={true}
onFocus={[Function]}
style={
Object {
Expand Down