Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit e4fcf9b

Browse files
authored
refactor(dialog): Refactor and export focus-trap for Rollup AoT bundle (#85)
1 parent 7d5f7a7 commit e4fcf9b

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/lib/dialog/dialog.component.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,15 @@ import {
1818
} from '@angular/core';
1919
import { isBrowser } from '../common/platform';
2020
import { EventRegistry } from '../common/event-registry';
21-
import * as createFocusTrap from 'focus-trap';
21+
import focusTrap from 'focus-trap';
2222

2323
import { Ripple } from '.././ripple/ripple.directive';
2424
import { ButtonComponent } from '../button/button.component';
2525

2626
import { MDCDialogAdapter } from './dialog-adapter';
2727
import { MDCDialogFoundation } from '@material/dialog';
2828

29-
export function createFocusTrapInstance(surfaceEl, acceptButtonEl, clickOutsideCloses, focusTrapFactory = createFocusTrap) {
30-
return focusTrapFactory(surfaceEl, {
31-
initialFocus: acceptButtonEl,
32-
clickOutsideDeactivates: clickOutsideCloses,
33-
});
34-
}
29+
export { focusTrap };
3530

3631
@Directive({
3732
selector: '[mdc-dialog-surface], mdc-dialog-surface'
@@ -261,10 +256,12 @@ export class DialogComponent implements AfterViewInit, OnDestroy {
261256
}
262257

263258
show() {
264-
this.focusTrap_ = createFocusTrapInstance(this.dialogSurface.elementRef.nativeElement,
265-
this.dialogAcceptButton ? this.dialogAcceptButton.elementRef.nativeElement :
259+
this.focusTrap_ = focusTrap(this.dialogSurface.elementRef.nativeElement, {
260+
initialFocus: this.dialogAcceptButton ? this.dialogAcceptButton.elementRef.nativeElement :
266261
this.dialogButtons.length > 0 ? this.dialogButtons.find((_) => _.accept).elementRef.nativeElement
267-
: this.dialogSurface.elementRef.nativeElement, this.clickOutsideToClose);
262+
: this.dialogSurface.elementRef.nativeElement,
263+
clickOutsideDeactivates: this.clickOutsideToClose,
264+
});
268265
this._foundation.open();
269266
}
270267

0 commit comments

Comments
 (0)