diff --git a/src/components/action-sheet/test/basic/app-module.ts b/src/components/action-sheet/test/basic/app-module.ts index 6ef89081ee..afde358b16 100644 --- a/src/components/action-sheet/test/basic/app-module.ts +++ b/src/components/action-sheet/test/basic/app-module.ts @@ -33,9 +33,10 @@ export class E2EPage { } }, { - text: 'Play', + text: 'Play (open modal)', icon: 'arrow-dropright-circle', handler: () => { + this.result = 'Play (open modal)'; let modal = this.modalCtrl.create(ModalPage); modal.present(); diff --git a/src/components/app/app-root.ts b/src/components/app/app-root.ts index 210fccdd99..f1e462ae00 100644 --- a/src/components/app/app-root.ts +++ b/src/components/app/app-root.ts @@ -19,7 +19,7 @@ export const AppRootToken = new OpaqueToken('USERROOT'); '
' + '' + '' + - '' + + '' + '' }) export class IonicApp extends Ion implements OnInit { diff --git a/src/components/nav/overlay-portal.ts b/src/components/nav/overlay-portal.ts index 2dc638ae07..860e62a7a8 100644 --- a/src/components/nav/overlay-portal.ts +++ b/src/components/nav/overlay-portal.ts @@ -1,4 +1,4 @@ -import { ComponentFactoryResolver, Directive, ElementRef, forwardRef, Inject, NgZone, Optional, Renderer, ViewContainerRef } from '@angular/core'; +import { ComponentFactoryResolver, Directive, ElementRef, forwardRef, Inject, Input, NgZone, Optional, Renderer, ViewContainerRef } from '@angular/core'; import { App } from '../app/app'; import { Config } from '../../config/config'; @@ -12,7 +12,7 @@ import { TransitionController } from '../../transitions/transition-controller'; * @private */ @Directive({ - selector: '[overlay-portal]' + selector: '[overlay-portal]', }) export class OverlayPortal extends NavControllerBase { constructor( @@ -38,4 +38,10 @@ export class OverlayPortal extends NavControllerBase { app.viewDidLeave.subscribe(this.dismissPageChangeViews.bind(this)); } + @Input('overlay-portal') + set _overlayPortal(val: number) { + this._zIndexOffset = (val || 0); + } + } + diff --git a/src/navigation/nav-controller-base.ts b/src/navigation/nav-controller-base.ts index 011ceba9d4..31e1076945 100644 --- a/src/navigation/nav-controller-base.ts +++ b/src/navigation/nav-controller-base.ts @@ -38,6 +38,7 @@ export class NavControllerBase extends Ion implements NavController { _trnsTm: boolean = false; _viewport: ViewContainerRef; _views: ViewController[] = []; + _zIndexOffset: number = 0; viewDidLoad: EventEmitter