Skip to content

feat(dialog): add md-dialog component #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

feat(dialog): add md-dialog component #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad9617f
add ability to open dialog with templateRef
Jan 28, 2017
14ef81c
fix lint
Jan 29, 2017
bd19bd3
fix dialog templateRef test
Jan 29, 2017
dbb1676
separate component for content elements dialog demo with templateRef
Jan 29, 2017
1803505
add missing closing tag
Jan 29, 2017
75d2713
dialog element base
Jan 29, 2017
662703b
add md-dialog
Jan 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion src/demo-app/demo-app-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ import {MaterialModule, OverlayContainer,
FullscreenOverlayContainer} from '@angular/material';
import {DEMO_APP_ROUTES} from './demo-app/routes';
import {ProgressBarDemo} from './progress-bar/progress-bar-demo';
import {JazzDialog, ContentElementDialog, DialogDemo, IFrameDialog} from './dialog/dialog-demo';
import {
JazzDialog,
JazzDialogTemplateRef,
ContentElementDialog,
ContentElementTemplateRefDialog,
DialogDemo,
IFrameDialog
} from './dialog/dialog-demo';
import {RippleDemo} from './ripple/ripple-demo';
import {IconDemo} from './icon/icon-demo';
import {GesturesDemo} from './gestures/gestures-demo';
Expand Down Expand Up @@ -64,7 +71,9 @@ import {InputContainerDemo} from './input/input-container-demo';
IconDemo,
InputContainerDemo,
JazzDialog,
JazzDialogTemplateRef,
ContentElementDialog,
ContentElementTemplateRefDialog,
IFrameDialog,
ListDemo,
LiveAnnouncerDemo,
Expand Down Expand Up @@ -100,7 +109,9 @@ import {InputContainerDemo} from './input/input-container-demo';
entryComponents: [
DemoApp,
JazzDialog,
JazzDialogTemplateRef,
ContentElementDialog,
ContentElementTemplateRefDialog,
IFrameDialog,
RotiniPanel,
ScienceJoke,
Expand Down
156 changes: 105 additions & 51 deletions src/demo-app/dialog/dialog-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,107 @@
<h1>Dialog demo</h1>

<button md-raised-button color="primary" (click)="openJazz()" [disabled]="dialogRef">Open dialog</button>
<button md-raised-button color="accent" (click)="openContentElement()">Open dialog with content elements</button>

<md-card class="demo-dialog-card">
<md-card-content>
<h2>Dialog dimensions</h2>

<p>
<md-input-container>
<input mdInput [(ngModel)]="config.width" placeholder="Width">
</md-input-container>
<md-input-container>
<input mdInput [(ngModel)]="config.height" placeholder="Height">
</md-input-container>
</p>

<h2>Dialog position</h2>

<p>
<md-input-container>
<input mdInput [(ngModel)]="config.position.top" (change)="config.position.bottom = ''" placeholder="Top">
</md-input-container>
<md-input-container>
<input mdInput [(ngModel)]="config.position.bottom" (change)="config.position.top = ''" placeholder="Bottom">
</md-input-container>
</p>

<p>
<md-input-container>
<input mdInput [(ngModel)]="config.position.left" (change)="config.position.right = ''" placeholder="Left">
</md-input-container>
<md-input-container>
<input mdInput [(ngModel)]="config.position.right" (change)="config.position.left = ''" placeholder="Right">
</md-input-container>
</p>

<h2>Other options</h2>

<p>
<md-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
<md-option>Start</md-option>
<md-option value="end">End</md-option>
<md-option value="center">Center</md-option>
</md-select>
</p>

<md-checkbox [(ngModel)]="config.disableClose">Disable close</md-checkbox>
</md-card-content>
</md-card>

<p>Last close result: {{lastCloseResult}}</p>
<div class="demo-dialog-section">

<h2>Using <strong>MdDialog</strong> service</h2>

<div class="demo-button-group">
<button md-raised-button color="primary" (click)="openJazz()" [disabled]="dialogRef">Open dialog</button>
<button md-raised-button color="accent" (click)="openContentElement()">Open dialog with content elements</button>
</div>

<div class="demo-button-group">
<button md-raised-button color="primary" (click)="openJazzUsingTemplateRef()" [disabled]="dialogTemplateRef">Open dialog using TemplateRef</button>
<button md-raised-button color="accent" (click)="openContentElementUsingTemplateRef()">Open dialog using TemplateRef with content elements</button>
</div>

<p *ngIf="lastCloseResult">Last close result: {{lastCloseResult}}</p>

<template #jazzDialogRef>
<demo-jazz-dialog-template-ref (close)="closeJazzUsingTemplateRef($event)"></demo-jazz-dialog-template-ref>
</template>

<template #contentElementRef>
<demo-content-element-template-ref-dialog (close)="closeContentElementUsingTemplateRef()" [actionsAlignment]="actionsAlignment"></demo-content-element-template-ref-dialog>
</template>

</div>

<div class="demo-dialog-section">

<h2>Using <strong>md-dialog</strong> element</h2>

<div class="demo-button-group">
<button
md-raised-button
color="primary"
(click)="changeMdDialogState(true)"
[disabled]="mdDialogState">
Open md-dialog with content elements
</button>
</div>

<md-dialog
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a full review for now, but I would do this as a directive that is meant to go on a template element, so it would be either of

<template mdDialog ...>

or

<div *mdDialog ...>

Mainly so that it doesn't leave a phantom md-dialog element in the DOM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jelbourn I think that would make using inputs/outputs impossible, wouldn't it?

[open]="mdDialogState"
(close)="changeMdDialogState(false)">

<demo-content-element-template-ref-dialog
(close)="changeMdDialogState(false)"
[actionsAlignment]="actionsAlignment">
</demo-content-element-template-ref-dialog>

</md-dialog>

</div>

<div class="demo-dialog-section">

<h2>Dialog settings</h2>

<md-card class="demo-dialog-card">
<md-card-content>
<h2>Dialog dimensions</h2>

<p>
<md-input-container>
<input mdInput [(ngModel)]="config.width" placeholder="Width">
</md-input-container>
<md-input-container>
<input mdInput [(ngModel)]="config.height" placeholder="Height">
</md-input-container>
</p>

<h2>Dialog position</h2>

<p>
<md-input-container>
<input mdInput [(ngModel)]="config.position.top" (change)="config.position.bottom = ''" placeholder="Top">
</md-input-container>
<md-input-container>
<input mdInput [(ngModel)]="config.position.bottom" (change)="config.position.top = ''" placeholder="Bottom">
</md-input-container>
</p>

<p>
<md-input-container>
<input mdInput [(ngModel)]="config.position.left" (change)="config.position.right = ''" placeholder="Left">
</md-input-container>
<md-input-container>
<input mdInput [(ngModel)]="config.position.right" (change)="config.position.left = ''" placeholder="Right">
</md-input-container>
</p>

<h2>Other options</h2>

<p>
<md-select placeholder="Button alignment" [(ngModel)]="actionsAlignment">
<md-option>Start</md-option>
<md-option value="end">End</md-option>
<md-option value="center">Center</md-option>
</md-select>
</p>

<md-checkbox [(ngModel)]="config.disableClose">Disable close</md-checkbox>
</md-card-content>
</md-card>

</div>
12 changes: 12 additions & 0 deletions src/demo-app/dialog/dialog-demo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,15 @@
max-width: 350px;
margin: 20px 0;
}

.demo-button-group {
margin-bottom: 20px;
}

.demo-dialog-section {
margin-bottom: 40px;

h2 {
font-size: 18px;
}
}
131 changes: 127 additions & 4 deletions src/demo-app/dialog/dialog-demo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
import {Component, Inject} from '@angular/core';
import {
Component,
Inject,
Input,
Output,
ViewChild,
TemplateRef,
EventEmitter
} from '@angular/core';
import {DOCUMENT} from '@angular/platform-browser';
import {MdDialog, MdDialogRef, MdDialogConfig} from '@angular/material';

Expand All @@ -9,9 +17,18 @@ import {MdDialog, MdDialogRef, MdDialogConfig} from '@angular/material';
styleUrls: ['dialog-demo.css'],
})
export class DialogDemo {
@ViewChild('jazzDialogRef')
jazzDialogRef: TemplateRef<JazzDialogTemplateRef>;

@ViewChild('contentElementRef')
contentElementRef: TemplateRef<ContentElementDialog>;

dialogRef: MdDialogRef<JazzDialog>;
dialogTemplateRef: MdDialogRef<JazzDialogTemplateRef>;
dialogContentTemplateRef: MdDialogRef<ContentElementDialog>;
lastCloseResult: string;
actionsAlignment: string;
mdDialogState: boolean = false;
config: MdDialogConfig = {
disableClose: false,
width: '',
Expand Down Expand Up @@ -41,16 +58,47 @@ export class DialogDemo {
openJazz() {
this.dialogRef = this.dialog.open(JazzDialog, this.config);

this.dialogRef.afterClosed().subscribe(result => {
this.dialogRef.afterClosed().first().subscribe(result => {
this.lastCloseResult = result;
this.dialogRef = null;
});
}

openJazzUsingTemplateRef() {
this.dialogTemplateRef = this.dialog.openFromTemplateRef(this.jazzDialogRef, this.config);

this.dialogTemplateRef.afterClosed().first().subscribe(() => {
this.dialogTemplateRef = null;
});
}

closeJazzUsingTemplateRef(result: string) {
this.lastCloseResult = result;

this.dialogTemplateRef.close();
}

openContentElement() {
let dialogRef = this.dialog.open(ContentElementDialog, this.config);
dialogRef.componentInstance.actionsAlignment = this.actionsAlignment;
}

openContentElementUsingTemplateRef() {
this.dialogContentTemplateRef = this.dialog.openFromTemplateRef(
this.contentElementRef,
this.config
);
}

closeContentElementUsingTemplateRef() {
if (this.dialogContentTemplateRef) {
this.dialogContentTemplateRef.close();
}
}

changeMdDialogState(to: boolean) {
this.mdDialogState = to;
}
}


Expand All @@ -69,6 +117,24 @@ export class JazzDialog {
}


@Component({
selector: 'demo-jazz-dialog-template-ref',
template: `
<p>It's Jazz!</p>
<p><label>How much? <input #howMuch></label></p>
<p> {{ jazzMessage }} </p>
<button type="button" (click)="close.emit(howMuch.value)">Close dialog</button>`
})
export class JazzDialogTemplateRef {
jazzMessage = 'Jazzy jazz jazz';

@Output()
close = new EventEmitter<string>(false);

constructor() { }
}


@Component({
selector: 'demo-content-element-dialog',
styles: [
Expand Down Expand Up @@ -98,13 +164,12 @@ export class JazzDialog {
md-raised-button
color="primary"
md-dialog-close>Close</button>

<a
md-button
color="primary"
href="https://en.wikipedia.org/wiki/Neptune"
target="_blank">Read more on Wikipedia</a>

<button
md-button
color="secondary"
Expand All @@ -123,6 +188,64 @@ export class ContentElementDialog {
}
}


@Component({
selector: 'demo-content-element-template-ref-dialog',
styles: [
`img {
max-width: 100%;
}`
],
template: `
<h2 md-dialog-title>Neptune</h2>

<md-dialog-content>
<img src="https://upload.wikimedia.org/wikipedia/commons/5/56/Neptune_Full.jpg"/>

<p>
Neptune is the eighth and farthest known planet from the Sun in the Solar System. In the
Solar System, it is the fourth-largest planet by diameter, the third-most-massive planet,
and the densest giant planet. Neptune is 17 times the mass of Earth and is slightly more
massive than its near-twin Uranus, which is 15 times the mass of Earth and slightly larger
than Neptune. Neptune orbits the Sun once every 164.8 years at an average distance of 30.1
astronomical units (4.50×109 km). It is named after the Roman god of the sea and has the
astronomical symbol ♆, a stylised version of the god Neptune's trident.
</p>
</md-dialog-content>

<md-dialog-actions [attr.align]="actionsAlignment">
<button
md-raised-button
color="primary"
(click)="!!close.emit()">Close</button>
<a
md-button
color="primary"
href="https://en.wikipedia.org/wiki/Neptune"
target="_blank">Read more on Wikipedia</a>

<button
md-button
color="secondary"
(click)="showInStackedDialog()">
Show in Dialog</button>
</md-dialog-actions>
`
})
export class ContentElementTemplateRefDialog {
@Input()
actionsAlignment: string;

@Output()
close = new EventEmitter<void>();

constructor(public dialog: MdDialog) { }

showInStackedDialog() {
this.dialog.open(IFrameDialog);
}
}

@Component({
selector: 'demo-iframe-dialog',
styles: [
Expand Down
Loading