Skip to content

revert fix to find active element within iframe #8432

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

revert fix to find active element within iframe #8432

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
dc125e0
revert fix to find active element within iframe
aftab-hassan Mar 22, 2019
1dddd5a
add change file
aftab-hassan Mar 22, 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 .../changes/office-ui-fabric-react/revert-active-element-in-iframe-fix_2019-03-22-01-08.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": "Popup: Revert change to find active element within iframe",
"type": "patch"
}
],
"packageName": "office-ui-fabric-react",
"email": "afhassan@microsoft.com"
}
23 changes: 1 addition & 22 deletions packages/office-ui-fabric-react/src/components/Popup/Popup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,7 @@ export class Popup extends BaseComponent<IPopupProps, IPopupState> {
}

public componentWillMount(): void {
let tempActive: Element | null = null;
let tempActiveLastSeen: Element | null = null;
const doc: Document | undefined = getDocument();

if (doc) {
tempActive = doc.activeElement;
}

// Seek inner-most frame's activeElement to set focus on dismissal
while (tempActive !== null && tempActive instanceof HTMLIFrameElement) {
if (tempActive.contentDocument !== null && tempActive.contentDocument.activeElement !== null) {
tempActiveLastSeen = tempActive;
tempActive = tempActive.contentDocument.activeElement;
if (tempActive === tempActiveLastSeen) {
break;
}
}
}

if (tempActive !== null) {
this._originalFocusedElement = tempActive as HTMLElement;
}
this._originalFocusedElement = getDocument()!.activeElement as HTMLElement;
}

public componentDidMount(): void {
Expand Down