diff --git a/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.ts b/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.ts index 3ab2d22a..008d6341 100644 --- a/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.ts +++ b/src/app/modules/dashboard/sections/navigation-section/navigation-section.component.ts @@ -13,7 +13,7 @@ * this program. If not, see . */ import {Component, OnInit, ViewEncapsulation} from '@angular/core'; -import {IonRouterOutlet, ModalController} from '@ionic/angular'; +import {ModalController} from '@ionic/angular'; import {EditModalComponent} from '../../edit-modal/edit-modal.component'; import {DEFAULT_ACTIVE_MENU_ITEMS, MENU_ITEMS} from './menu-items.config'; import {MenuItemKey} from './menu-item.interface'; @@ -56,7 +56,6 @@ export class NavigationSectionComponent implements OnInit { public modalController: ModalController, private storageProvider: StorageProvider, private translatePipe: TranslatePipe, - private routerOutlet: IonRouterOutlet, ) {} ngOnInit() { @@ -101,7 +100,6 @@ export class NavigationSectionComponent implements OnInit { const modal = await this.modalController.create({ component: EditModalComponent, canDismiss: true, - presentingElement: this.routerOutlet.nativeEl, componentProps: { items: Object.entries(this.menuItems).map(([id, item]) => ({ id, diff --git a/src/app/modules/data/chips/data/add-event-action-chip.component.ts b/src/app/modules/data/chips/data/add-event-action-chip.component.ts index e342e6e4..9974a642 100644 --- a/src/app/modules/data/chips/data/add-event-action-chip.component.ts +++ b/src/app/modules/data/chips/data/add-event-action-chip.component.ts @@ -126,7 +126,6 @@ export class AddEventActionChipComponent implements OnDestroy { component: AddEventReviewModalComponent, canDismiss: true, cssClass: 'add-modal', - presentingElement: await this.modalController.getTop(), componentProps: { dismissAction: () => { modal.dismiss(); diff --git a/src/app/modules/map/page/map-page.html b/src/app/modules/map/page/map-page.html index c10d28f6..9f326f41 100644 --- a/src/app/modules/map/page/map-page.html +++ b/src/app/modules/map/page/map-page.html @@ -133,11 +133,7 @@ - + diff --git a/src/app/util/edit-modal.component.ts b/src/app/util/edit-modal.component.ts index 364e841b..fb1a1751 100644 --- a/src/app/util/edit-modal.component.ts +++ b/src/app/util/edit-modal.component.ts @@ -18,7 +18,6 @@ import { ContentChild, EventEmitter, Input, - OnInit, Output, TemplateRef, ViewChild, @@ -41,7 +40,7 @@ import {TranslatePipe} from '@ngx-translate/core'; selector: 'stapps-edit-modal', templateUrl: 'edit-modal.html', }) -export class EditModalComponent implements OnInit { +export class EditModalComponent { @ContentChild(TemplateRef) content: TemplateRef; @ViewChild('modal') modal: IonModal; @@ -50,8 +49,6 @@ export class EditModalComponent implements OnInit { @Output() save = new EventEmitter(); - presentingElement: HTMLElement; - constructor( readonly modalController: ModalController, readonly routerOutlet: IonRouterOutlet, @@ -61,11 +58,6 @@ export class EditModalComponent implements OnInit { readonly config: Config, ) {} - async ngOnInit() { - this.presentingElement = - (await this.modalController.getTop()) || this.routerOutlet.nativeEl; - } - present() { this.modal.present(); this.pendingChanges = false; diff --git a/src/app/util/edit-modal.html b/src/app/util/edit-modal.html index 8958243f..3e505cb2 100644 --- a/src/app/util/edit-modal.html +++ b/src/app/util/edit-modal.html @@ -13,11 +13,7 @@ ~ this program. If not, see . --> - +