Skip to content

Commit

Permalink
feat(dialog): add dialog content elements
Browse files Browse the repository at this point in the history
Adds the following dialog-specific directives:
* `md-dialog-close` - Closes the current dialog.
* `md-dialog-title` - Title of a dialog.
* `md-dialog-content` - Scrollable content for a dialog.
* `md-dialog-actions` - Container for the bottom buttons in a dialog.

Fixes angular#1624.
Fixes angular#2042.
  • Loading branch information
crisbeto committed Dec 14, 2016
1 parent bac0388 commit 33cb741
Show file tree
Hide file tree
Showing 11 changed files with 316 additions and 74 deletions.
4 changes: 3 additions & 1 deletion src/demo-app/demo-app-module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {RouterModule} from '@angular/router';
import {MaterialModule} from '@angular/material';
import {DEMO_APP_ROUTES} from './demo-app/routes';
import {ProgressBarDemo} from './progress-bar/progress-bar-demo';
import {JazzDialog, DialogDemo} from './dialog/dialog-demo';
import {JazzDialog, ContentElementDialog, DialogDemo} 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 @@ -65,6 +65,7 @@ import {InputContainerDemo} from './input/input-container-demo';
InputDemo,
InputContainerDemo,
JazzDialog,
ContentElementDialog,
ListDemo,
LiveAnnouncerDemo,
MdCheckboxDemoNestedChecklist,
Expand Down Expand Up @@ -96,6 +97,7 @@ import {InputContainerDemo} from './input/input-container-demo';
entryComponents: [
DemoApp,
JazzDialog,
ContentElementDialog,
RotiniPanel,
ScienceJoke,
SpagettiPanel,
Expand Down
3 changes: 2 additions & 1 deletion src/demo-app/dialog/dialog-demo.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<h1>Dialog demo</h1>

<button md-raised-button color="primary" (click)="open()" [disabled]="dialogRef">Open dialog</button>
<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>
Expand Down
47 changes: 46 additions & 1 deletion src/demo-app/dialog/dialog-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,18 @@ export class DialogDemo {

constructor(public dialog: MdDialog) { }

open() {
openJazz() {
this.dialogRef = this.dialog.open(JazzDialog, this.config);

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

openContentElement() {
this.dialog.open(ContentElementDialog, this.config);
}
}


Expand All @@ -48,3 +52,44 @@ export class JazzDialog {

constructor(public dialogRef: MdDialogRef<JazzDialog>) { }
}


@Component({
selector: 'demo-content-element-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>
<button
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>
</md-dialog-actions>
`
})
export class ContentElementDialog { }
29 changes: 21 additions & 8 deletions src/lib/dialog/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ MdDialog is a service, which opens dialogs components in the view.

### Methods

| Name | Description |
| --- | --- |
| Name | Description |
| ---- | ----------- |
| `open(component: ComponentType<T>, config: MdDialogConfig): MdDialogRef<T>` | Creates and opens a dialog matching material spec. |
| `closeAll(): void` | Closes all of the dialogs that are currently open. |
| `closeTop(): void` | Closes the topmost of the open dialogs. |

### Config

| Key | Description |
| --- | --- |
| Key | Description |
| --- | ------------ |
| `role: DialogRole = 'dialog'` | The ARIA role of the dialog element. Possible values are `dialog` and `alertdialog`. Optional. |
| `disableClose: boolean = false` | Whether to prevent the user from closing a dialog by clicking on the backdrop or pressing escape. Optional. |
| `width: string = ''` | Width of the dialog. Takes any valid CSS value. Optional. |
Expand All @@ -26,11 +27,19 @@ A reference to the dialog created by the MdDialog `open` method.

### Methods

| Name | Description |
| --- | --- |
| Name | Description |
| ---- | ----------- |
| `close(dialogResult?: any)` | Closes the dialog, pushing a value to the afterClosed observable. |
| `afterClosed(): Observable<any>` | Returns an observable which will emit the dialog result, passed to the `close` method above. |

### Directives
| Name | Description |
| --- | ------------ |
| `md-dialog-title` | Marks the title of the dialog.
| `md-dialog-content` | Scrollable content of the dialog.
| `md-dialog-close` | When added to a `button`, makes the element act as a close button for the dialog.
| `md-dialog-actions` | Wrapper for the set of actions at the bottom of a dialog. Typically contains buttons.

## Example
The service can be injected in a component.

Expand Down Expand Up @@ -62,8 +71,12 @@ export class PizzaComponent {
@Component({
selector: 'pizza-dialog',
template: `
<button type="button" (click)="dialogRef.close('yes')">Yes</button>
<button type="button" (click)="dialogRef.close('no')">No</button>
<h1 md-dialog-title>Would you like to order pizza?</h1>
<md-dialog-actions>
<button (click)="dialogRef.close('yes')">Yes</button>
<button md-dialog-close>No</button>
</md-dialog-actions>
`
})
export class PizzaDialog {
Expand Down
24 changes: 0 additions & 24 deletions src/lib/dialog/dialog-container.scss

This file was deleted.

2 changes: 1 addition & 1 deletion src/lib/dialog/dialog-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import 'rxjs/add/operator/first';
moduleId: module.id,
selector: 'md-dialog-container, mat-dialog-container',
templateUrl: 'dialog-container.html',
styleUrls: ['dialog-container.css'],
styleUrls: ['dialog.css'],
host: {
'class': 'md-dialog-container',
'[attr.role]': 'dialogConfig?.role',
Expand Down
49 changes: 49 additions & 0 deletions src/lib/dialog/dialog-directives.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import {Directive} from '@angular/core';
import {MdDialog} from './dialog';


/**
* Button that will close the current dialog.
*/
@Directive({
selector: 'button[md-dialog-close]',
host: {
'(click)': 'dialog.closeTop()'
}
})
export class MdDialogClose {
constructor(public dialog: MdDialog) { }
}

/**
* Title of a dialog element. Stays fixed to the top of the dialog when scrolling.
*/
@Directive({
selector: '[md-dialog-title]',
host: {
role: 'heading'
}
})
export class MdDialogTitle { }


/**
* Scrollable content container of a dialog.
*/
@Directive({
selector: '[md-dialog-content], md-dialog-content',
host: {
role: 'main'
}
})
export class MdDialogContent { }


/**
* Container for the bottom action buttons in a dialog.
* Stays fixed to the bottom when scrolling.
*/
@Directive({
selector: '[md-dialog-actions], md-dialog-actions'
})
export class MdDialogActions { }
52 changes: 52 additions & 0 deletions src/lib/dialog/dialog.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
@import '../core/style/elevation';
@import '../core/a11y/a11y';


$md-dialog-padding: 24px !default;
$md-dialog-border-radius: 2px !default;
$md-dialog-max-width: 80vw !default;
$md-dialog-max-height: 65vh !default;

md-dialog-container {
@include md-elevation(24);

display: block;
padding: $md-dialog-padding;
border-radius: $md-dialog-border-radius;
box-sizing: border-box;
overflow: auto;
max-width: $md-dialog-max-width;

// The dialog container should completely fill its parent overlay element.
width: 100%;
height: 100%;

@include md-high-contrast {
outline: solid 1px;
}
}

md-dialog-content, [md-dialog-content] {
display: block;
margin: 0 $md-dialog-padding * -1;
padding: 0 $md-dialog-padding;
max-height: $md-dialog-max-height;
overflow: auto;
}

[md-dialog-title] {
font-size: rem(2);
font-weight: bold;
letter-spacing: 0.005em;
margin: 0 0 rem(2);
display: block;
}

md-dialog-actions, [md-dialog-actions] {
padding: $md-dialog-padding / 2 0;
display: block;

&:last-child {
margin-bottom: -$md-dialog-padding;
}
}
Loading

0 comments on commit 33cb741

Please sign in to comment.