From ee191f9aba26b41476304b50f30f4648c85a63ef Mon Sep 17 00:00:00 2001 From: Kara Date: Wed, 21 Sep 2016 16:59:52 -0700 Subject: [PATCH] fix(grid-list): hide overflow on tiles (#1299) --- src/lib/grid-list/grid-list.scss | 1 + src/lib/snack-bar/base-snack-bar.ts | 12 ---------- src/lib/snack-bar/package.json | 29 ------------------------- src/lib/snack-bar/simple-snack-bar.scss | 4 ++-- src/lib/snack-bar/simple-snack-bar.ts | 16 ++++++++++++-- src/lib/snack-bar/snack-bar-ref.ts | 4 ++-- src/lib/snack-bar/snack-bar.ts | 14 +++++++----- 7 files changed, 27 insertions(+), 53 deletions(-) delete mode 100644 src/lib/snack-bar/base-snack-bar.ts delete mode 100644 src/lib/snack-bar/package.json diff --git a/src/lib/grid-list/grid-list.scss b/src/lib/grid-list/grid-list.scss index 13c69dc8bf93..cf2ee776125f 100644 --- a/src/lib/grid-list/grid-list.scss +++ b/src/lib/grid-list/grid-list.scss @@ -20,6 +20,7 @@ md-grid-list { md-grid-tile { display: block; position: absolute; + overflow: hidden; figure { display: flex; diff --git a/src/lib/snack-bar/base-snack-bar.ts b/src/lib/snack-bar/base-snack-bar.ts deleted file mode 100644 index ffbcb65bae7e..000000000000 --- a/src/lib/snack-bar/base-snack-bar.ts +++ /dev/null @@ -1,12 +0,0 @@ -import {MdSnackBarRef} from './snack-bar-ref'; - - -export class BaseSnackBarContent { - /** The instance of the component making up the content of the snack bar. */ - snackBarRef: MdSnackBarRef; - - /** Dismisses the snack bar. */ - dismiss(): void { - this.snackBarRef.dismiss(); - } -} diff --git a/src/lib/snack-bar/package.json b/src/lib/snack-bar/package.json deleted file mode 100644 index 5122e38fa551..000000000000 --- a/src/lib/snack-bar/package.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "name": "@angular2-material/snack-bar", - "version": "2.0.0-alpha.8-2", - "description": "Angular 2 Material snack bar", - "main": "./snack-bar.umd.js", - "module": "./index.js", - "typings": "./index.d.ts", - "repository": { - "type": "git", - "url": "https://github.com/angular/material2.git" - }, - "keywords": [ - "angular", - "material", - "material design", - "components", - "snackbar", - "toast", - "notification" - ], - "license": "MIT", - "bugs": { - "url": "https://github.com/angular/material2/issues" - }, - "homepage": "https://github.com/angular/material2#readme", - "peerDependencies": { - "@angular2-material/core": "2.0.0-alpha.8-2" - } -} diff --git a/src/lib/snack-bar/simple-snack-bar.scss b/src/lib/snack-bar/simple-snack-bar.scss index d380adaea3c2..9935cd92950e 100644 --- a/src/lib/snack-bar/simple-snack-bar.scss +++ b/src/lib/snack-bar/simple-snack-bar.scss @@ -1,6 +1,6 @@ md-simple-snackbar { - display: flex; - justify-content: space-between; + display: flex; + justify-content: space-between; } .md-simple-snackbar-message { diff --git a/src/lib/snack-bar/simple-snack-bar.ts b/src/lib/snack-bar/simple-snack-bar.ts index 542cbe08f586..d74d6736c3df 100644 --- a/src/lib/snack-bar/simple-snack-bar.ts +++ b/src/lib/snack-bar/simple-snack-bar.ts @@ -1,20 +1,32 @@ import {Component} from '@angular/core'; -import {BaseSnackBarContent} from './base-snack-bar'; +import {MdSnackBarRef} from './snack-bar-ref'; +/** + * A component used to open as the default snack bar, matching material spec. + * This should only be used internally by the snack bar service. + */ @Component({ moduleId: module.id, selector: 'simple-snack-bar', templateUrl: 'simple-snack-bar.html', styleUrls: ['simple-snack-bar.css'], }) -export class SimpleSnackBar extends BaseSnackBarContent { +export class SimpleSnackBar { /** The message to be shown in the snack bar. */ message: string; /** The label for the button in the snack bar. */ action: string; + /** The instance of the component making up the content of the snack bar. */ + snackBarRef: MdSnackBarRef; + + /** Dismisses the snack bar. */ + dismiss(): void { + this.snackBarRef.dismiss(); + } + /** If the action button should be shown. */ get hasAction(): boolean { return !!this.action; } } diff --git a/src/lib/snack-bar/snack-bar-ref.ts b/src/lib/snack-bar/snack-bar-ref.ts index 4f1581fdd972..2fce54a5a60d 100644 --- a/src/lib/snack-bar/snack-bar-ref.ts +++ b/src/lib/snack-bar/snack-bar-ref.ts @@ -10,7 +10,7 @@ import {Subject} from 'rxjs/Subject'; */ export class MdSnackBarRef { /** The instance of the component making up the content of the snack bar. */ - readonly instance: T|any; + readonly instance: T; /** Subject for notifying the user that the snack bar has closed. */ private _afterClosed: Subject = new Subject(); @@ -18,7 +18,7 @@ export class MdSnackBarRef { /** If the snack bar is active. */ private _isActive: boolean = true; - constructor(instance: T|any, private _overlayRef: OverlayRef) { + constructor(instance: T, private _overlayRef: OverlayRef) { // Sets the readonly instance of the snack bar content component. this.instance = instance; this.afterDismissed().subscribe(null, null, () => { this._isActive = false; }); diff --git a/src/lib/snack-bar/snack-bar.ts b/src/lib/snack-bar/snack-bar.ts index 8053bf3865ee..dba28369f661 100644 --- a/src/lib/snack-bar/snack-bar.ts +++ b/src/lib/snack-bar/snack-bar.ts @@ -5,12 +5,13 @@ import { ComponentRef, } from '@angular/core'; import { - Overlay, - OverlayState, - OverlayRef, ComponentType, ComponentPortal, + MdLiveAnnouncer, + Overlay, OverlayModule, + OverlayRef, + OverlayState, PortalModule, OVERLAY_PROVIDERS, } from '@angular2-material/core'; @@ -35,7 +36,8 @@ export class MdSnackBar { /** A reference to the current snack bar in the view. */ private _snackBarRef: MdSnackBarRef; - constructor(private _overlay: Overlay) {} + constructor(private _overlay: Overlay, + private _live: MdLiveAnnouncer) {} /** * Creates and dispatches a snack bar with a custom component for the content, removing any @@ -59,6 +61,7 @@ export class MdSnackBar { open(message: string, actionLabel: string, config: MdSnackBarConfig): MdSnackBarRef { let simpleSnackBarRef = this.openFromComponent(SimpleSnackBar, config); + simpleSnackBarRef.instance.snackBarRef = simpleSnackBarRef; simpleSnackBarRef.instance.message = message; simpleSnackBarRef.instance.action = actionLabel; return simpleSnackBarRef; @@ -87,7 +90,6 @@ export class MdSnackBar { let portal = new ComponentPortal(component); let contentRef = container.attachComponentPortal(portal); let snackBarRef = > new MdSnackBarRef(contentRef.instance, overlayRef); - snackBarRef.instance.snackBarRef = snackBarRef; this._snackBarRef = snackBarRef; return snackBarRef; @@ -118,7 +120,7 @@ export class MdSnackBarModule { static forRoot(): ModuleWithProviders { return { ngModule: MdSnackBarModule, - providers: [MdSnackBar, OVERLAY_PROVIDERS] + providers: [MdSnackBar, OVERLAY_PROVIDERS, MdLiveAnnouncer] }; } }