Skip to content

FocusZone: Add the ability to stop focus from propagating outside the FocusZone #4823

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
jspurlin merged 4 commits into from
May 9, 2018
Merged

FocusZone: Add the ability to stop focus from propagating outside the FocusZone #4823

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
7540a78
Add a prop to allow a FocusZone to not let focus events propagate out…
jspurlin May 9, 2018
94d03b3
rush change
jspurlin May 9, 2018
b80a976
revert line that got removed
jspurlin May 9, 2018
14d002f
remove commented line and add description to new prop
jspurlin May 9, 2018
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 ...es/office-ui-fabric-react/jspurlin-FocusZoneAddStopFocusPropagation_2018-05-09-12-17.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": "FocusZone: Add a prop to allow a FocusZone to not let focus events propagate outside of the FocusZone",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
7 changes: 6 additions & 1 deletion packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export class FocusZone extends BaseComponent<IFocusZoneProps, {}> implements IFo
}

private _onFocus = (ev: React.FocusEvent<HTMLElement>): void => {
const { onActiveElementChanged } = this.props;
const { onActiveElementChanged, doNotAllowFocusEventToPropagate } = this.props;

if (this._isImmediateDescendantOfZone(ev.target as HTMLElement)) {
this._activeElement = ev.target as HTMLElement;
Expand All @@ -226,9 +226,14 @@ export class FocusZone extends BaseComponent<IFocusZoneProps, {}> implements IFo
parentElement = getParent(parentElement, ALLOW_VIRTUAL_ELEMENTS) as HTMLElement;
}
}

if (onActiveElementChanged) {
onActiveElementChanged(this._activeElement as HTMLElement, ev);
}

if (doNotAllowFocusEventToPropagate) {
ev.stopPropagation();
}
}

/**
Expand Down
5 changes: 5 additions & 0 deletions packages/office-ui-fabric-react/src/components/FocusZone/FocusZone.types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ export interface IFocusZoneProps extends React.HTMLAttributes<HTMLElement | Focu
* @default false
*/
checkForNoWrap?: boolean;

/**
* Whether the FocusZone should allow focus events to propagate past the FocusZone
*/
doNotAllowFocusEventToPropagate?: boolean;
}

export const enum FocusZoneTabbableElements {
Expand Down