add popover

Author: Marcus Williams

Diff for: nativescript-angular/directives/dialogs.ts

@@ -7,6 +7,7 @@ import {
     ReflectiveInjector,
     Type,
     ViewContainerRef,
+    ElementRef,
 } from "@angular/core";
 
 import { NSLocationStrategy } from "../router/ns-location-strategy";
@@ -26,6 +27,8 @@ export interface ModalDialogOptions {
     stretched?: boolean;
     viewContainerRef?: ViewContainerRef;
     moduleRef?: NgModuleRef<any>;
+    sourceView?: ElementRef;
+    ios?: any;
 }
 
 export class ModalDialogParams {
@@ -46,15 +49,17 @@ interface ShowDialogOptions {
     parentView: ViewBase;
     resolver: ComponentFactoryResolver;
     type: Type<any>;
+    ios?: any;
 }
 
 @Injectable()
 export class ModalDialogService {
+    private componentView: View;
     constructor(private location: NSLocationStrategy) {
     }
 
     public showModal(type: Type<any>,
-        { viewContainerRef, moduleRef, context, fullscreen, animated, stretched }: ModalDialogOptions
+        { viewContainerRef, moduleRef, context, fullscreen, animated, stretched, sourceView, ios }: ModalDialogOptions
     ): Promise<any> {
         if (!viewContainerRef) {
             throw new Error(
@@ -63,7 +68,11 @@ export class ModalDialogService {
             );
         }
 
-        let parentView = viewContainerRef.element.nativeElement;
+        if (sourceView) {
+            this.closeModal();
+        }
+
+        let parentView = sourceView ? sourceView.nativeElement : viewContainerRef.element.nativeElement;
         if (parentView instanceof AppHostView && parentView.ngAppRoot) {
             parentView = parentView.ngAppRoot;
         }
@@ -105,6 +114,7 @@ export class ModalDialogService {
                         parentView,
                         resolver,
                         type,
+                        ios
                     });
                 } catch (err) {
                     reject(err);
@@ -113,6 +123,13 @@ export class ModalDialogService {
         });
     }
 
+    public closeModal() {
+        if (this.componentView) {
+            this.componentView.closeModal();
+            this.location._closeModalNavigation();
+        }
+    }
+
     private _showDialog({
         containerRef,
         context,
@@ -124,6 +141,7 @@ export class ModalDialogService {
         parentView,
         resolver,
         type,
+        ios
     }: ShowDialogOptions): void {
         let componentView: View;
         let detachedLoaderRef: ComponentRef<DetachedLoader>;
@@ -161,7 +179,12 @@ export class ModalDialogService {
 
             // TODO: remove <any> cast after https://github.com/NativeScript/NativeScript/pull/5734
             // is in a published version of tns-core-modules.
-            (<any>parentView).showModal(componentView, context, closeCallback, fullscreen, animated, stretched);
+            if (ios) {
+                (<any>parentView).showModal(componentView, { context, closeCallback, fullscreen, animated, stretched, ios });
+            } else {
+                (<any>parentView).showModal(componentView, context, closeCallback, fullscreen, animated, stretched);
+            }
+            this.componentView = componentView;
         });
     }
 }