From 5e6c59efc283227138bec161c73c9190755161e1 Mon Sep 17 00:00:00 2001
From: "Shlomi Assaf (shlassaf)" <shlassaf@cisco.com>
Date: Tue, 30 Aug 2016 17:55:24 +0300
Subject: [PATCH] feat: TemplateRef can access the dialog so it can control the
 modal and access the context

---
 src/components/angular2-modal/providers/modal.ts           | 2 +-
 .../bootstrap-demo-page/bootstrap-demo-page.tpl.html       | 7 +++++--
 .../bootstrap-demo-page/bootstrap-demo-page.ts             | 2 +-
 src/demo/app/vex-demo/vex-demo.tpl.html                    | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/angular2-modal/providers/modal.ts b/src/components/angular2-modal/providers/modal.ts
index 763da824..30136c71 100644
--- a/src/components/angular2-modal/providers/modal.ts
+++ b/src/components/angular2-modal/providers/modal.ts
@@ -92,7 +92,7 @@ export abstract class Modal {
     if (typeof content === 'string') {
       nodes = [[this.renderer.createText(null, `${content}`)]];
     } else if (content instanceof TemplateRef) {
-      nodes = [this.overlay.defaultViewContainer.createEmbeddedView(content, dialogRef.context).rootNodes];
+      nodes = [this.overlay.defaultViewContainer.createEmbeddedView(content, { dialogRef }).rootNodes];
     } else {
       nodes = [dialogRef.overlayRef.instance.addEmbeddedComponent({ component: content, bindings: b }).rootNodes];
     }
diff --git a/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.tpl.html b/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.tpl.html
index 41697606..20ba650e 100644
--- a/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.tpl.html
+++ b/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.tpl.html
@@ -10,14 +10,17 @@
         </div>
     </div>
 </demo-head>
-<template #templateRef>
+<template #templateRef let-dialogRef="dialogRef" let-ctx="dialogRef.context">
     <div style="padding: 10px">
         <div class="page-header">
             <h1>TemplateRef Example</h1>
         </div>
         <div class="jumbotron">
             <h1>Hello, modal!</h1>
-            <p> I'm a declarative TemplateRef!</p>
+            <p>I'm a declarative TemplateRef!</p>
+            <p>TemplateRef can also access the DialogRef for context and modal control:</p>
+            <pre>{{ ctx | json }}</pre>
+            <button class="btn btn-primary" (click)="dialogRef.close(true)">Close Me</button>
         </div>
     </div>
 </template>
\ No newline at end of file
diff --git a/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.ts b/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.ts
index b0e05cf6..31808250 100644
--- a/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.ts
+++ b/src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.ts
@@ -46,7 +46,7 @@ export class BootstrapDemoPage {
       {
         text: 'TemplateRef content',
         factory: () => this.modal
-          .open(this.templateRef, new BSModalContextBuilder().isBlocking(false).toOverlayConfig())
+          .open(this.templateRef, new BSModalContextBuilder({ abd: 123 } as any).isBlocking(false).toOverlayConfig())
       },
       {
         text: 'Custom Modal content',
diff --git a/src/demo/app/vex-demo/vex-demo.tpl.html b/src/demo/app/vex-demo/vex-demo.tpl.html
index f3604e2e..802e9e79 100644
--- a/src/demo/app/vex-demo/vex-demo.tpl.html
+++ b/src/demo/app/vex-demo/vex-demo.tpl.html
@@ -23,7 +23,7 @@
         <br><br>
     </div>
 </demo-head>
-<template #templateRef>
+<template #templateRef let-dialogRef="dialogRef" let-ctx="dialogRef.context">
     <div style="padding: 10px">
         <div class="page-header">
             <h1>TemplateRef Example</h1>
@@ -31,6 +31,9 @@ <h1>TemplateRef Example</h1>
         <div class="jumbotron">
             <h1>Hello, modal!</h1>
             <p> I'm a declarative TemplateRef!</p>
+            <p>TemplateRef can also access the DialogRef for context and modal control:</p>
+            <pre>{{ ctx | json }}</pre>
+            <button class="btn btn-primary" (click)="dialogRef.close(true)">Close Me</button>
         </div>
     </div>
 </template>
\ No newline at end of file