Skip to content

Respect "forceintofirstchild" parameter of FocusZone.focus() #3961

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
dzearing merged 2 commits into from
Feb 15, 2018
Merged

Respect "forceintofirstchild" parameter of FocusZone.focus() #3961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75b7343
Add forceIntoFirstChild param for FocusZone.focus and fix implementation
hoovercj Feb 13, 2018
b5cccb3
Add change file
hoovercj Feb 13, 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/issues-3960-focuszone-forceintofirstchild_2018-02-13-16-29.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.Focus now respects forceIntoFirstChild parameter and IFocusZone.ts has been updated to reflect this",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
3 changes: 2 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 @@ -139,6 +139,7 @@ export class FocusZone extends BaseComponent<IFocusZoneProps, {}> implements IFo

/**
* Sets focus to the first tabbable item in the zone.
* @param {boolean} forceIntoFirstElement If true, focus will be forced into the first element, even if focus is already in the focus zone.
* @returns True if focus could be set to an active element, false if no operation was taken.
*/
public focus(forceIntoFirstElement: boolean = false): boolean {
Expand All @@ -153,7 +154,7 @@ export class FocusZone extends BaseComponent<IFocusZoneProps, {}> implements IFo
}

return false;
} else if (this._activeElement && elementContains(this._root, this._activeElement)
} else if (!forceIntoFirstElement && this._activeElement && elementContains(this._root, this._activeElement)
&& isElementTabbable(this._activeElement)) {
this._activeElement.focus();
return true;
Expand Down
3 changes: 2 additions & 1 deletion 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 @@ -7,9 +7,10 @@ import { FocusZone } from './FocusZone';
export interface IFocusZone {
/**
* Sets focus to the first tabbable item in the zone.
* @param {boolean} forceIntoFirstElement If true, focus will be forced into the first element, even if focus is already in the focus zone.
* @returns True if focus could be set to an active element, false if no operation was taken.
*/
focus(): boolean;
focus(forceIntoFirstElement?: boolean): boolean;

/**
* Sets focus to a specific child element within the zone. This can be used in conjunction with
Expand Down