Skip to content

FocusTrapZone: Refactor trapping behavior #8216

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

FocusTrapZone: Refactor trapping behavior #8216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2913da2
Refactor FocusTrapZone trapping behavior from key handler approach to…
JasonGore Mar 6, 2019
1411547
Change files.
JasonGore Mar 6, 2019
e54a4b7
Remove unnecessary file.
JasonGore Mar 6, 2019
0dc0f9e
Minor cleanup.
JasonGore Mar 6, 2019
1dadaba
Bundle size optimization.
JasonGore Mar 6, 2019
d306aa6
Prevent browsers from focusing on bumpers in cases where viewport doe…
JasonGore Mar 12, 2019
308eaf4
Merge branch 'master' into jg/ftz-refactor-trapping
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/@uifabric/utilities/jg-ftz-refactor-trapping_2019-03-06-18-16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/utilities",
"comment": "Focus utilities: Fix tabbable element issue and add optional argument.",
"type": "minor"
}
],
"packageName": "@uifabric/utilities",
"email": "jagore@microsoft.com"
}
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/jg-ftz-refactor-trapping_2019-03-06-18-16.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: Refactor trapping behavior to fix multiple outstanding issues.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "jagore@microsoft.com"
}
4 changes: 2 additions & 2 deletions packages/office-ui-fabric-react/etc/office-ui-fabric-react.api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,7 +1380,7 @@ export function getFadedOverflowStyle(theme: ITheme, color?: keyof ISemanticColo
export function getFirstFocusable(rootElement: HTMLElement, currentElement: HTMLElement, includeElementsInFocusZones?: boolean): HTMLElement | null;

// @public
export function getFirstTabbable(rootElement: HTMLElement, currentElement: HTMLElement, includeElementsInFocusZones?: boolean): HTMLElement | null;
export function getFirstTabbable(rootElement: HTMLElement, currentElement: HTMLElement, includeElementsInFocusZones?: boolean, checkNode?: boolean): HTMLElement | null;

// @public
export function getFocusableByIndexPath(parent: HTMLElement, path: number[]): HTMLElement | undefined;
Expand Down Expand Up @@ -1413,7 +1413,7 @@ export function getLanguage(): string | null;
export function getLastFocusable(rootElement: HTMLElement, currentElement: HTMLElement, includeElementsInFocusZones?: boolean): HTMLElement | null;

// @public
export function getLastTabbable(rootElement: HTMLElement, currentElement: HTMLElement, includeElementsInFocusZones?: boolean): HTMLElement | null;
export function getLastTabbable(rootElement: HTMLElement, currentElement: HTMLElement, includeElementsInFocusZones?: boolean, checkNode?: boolean): HTMLElement | null;

// @public
export function getNativeProps<T>(props: {}, allowedPropNames: string[], excludedPropNames?: string[]): T;
Expand Down
16 changes: 16 additions & 0 deletions packages/office-ui-fabric-react/src/components/FocusTrapZone/FocusTrapZone.doc.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ const FocusTrapZoneBoxClickExampleCode = require('!raw-loader!office-ui-fabric-r
import FocusTrapZoneNestedExample from './examples/FocusTrapZone.Nested.Example';
const FocusTrapZoneNestedExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/FocusTrapZone/examples/FocusTrapZone.Nested.Example.tsx') as string;

import FocusTrapZoneNoTabbableExample from './examples/FocusTrapZone.NoTabbable.Example';
const FocusTrapZoneNoTabbableExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/FocusTrapZone/examples/FocusTrapZone.NoTabbable.Example.tsx') as string;

import FocusTrapZoneFocusZoneExample from './examples/FocusTrapZone.FocusZone.Example';
const FocusTrapZoneFocusZoneeExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/FocusTrapZone/examples/FocusTrapZone.FocusZone.Example.tsx') as string;

import FocusTrapZoneDialogInPanelExample from './examples/FocusTrapZone.DialogInPanel.Example';
const FocusTrapZoneDialogInPanelExampleCode = require('!raw-loader!office-ui-fabric-react/src/components/FocusTrapZone/examples/FocusTrapZone.DialogInPanel.Example.tsx') as string;

Expand Down Expand Up @@ -42,6 +48,16 @@ export const FocusTrapZonePageProps: IDocPageProps = {
code: FocusTrapZoneNestedExampleCode,
view: <FocusTrapZoneNestedExample />
},
{
title: 'FocusTrapZone with FocusZones',
code: FocusTrapZoneFocusZoneeExampleCode,
view: <FocusTrapZoneFocusZoneExample />
},
{
title: 'FocusTrapZone with No Tabbable Elements',
code: FocusTrapZoneNoTabbableExampleCode,
view: <FocusTrapZoneNoTabbableExample />
},
{
title: 'A Dialog Nested in a Panel',
code: FocusTrapZoneDialogInPanelExampleCode,
Expand Down
Loading