From 04e680b9d34516b51f155f62ef58dffa36414037 Mon Sep 17 00:00:00 2001 From: Orlando Pozo Date: Fri, 20 Sep 2019 19:36:45 -0700 Subject: [PATCH 1/3] feat(material-experimental/mdc-snackbar): Add demo. --- .github/CODEOWNERS | 1 + src/dev-app/BUILD.bazel | 1 + src/dev-app/dev-app/dev-app-layout.ts | 1 + src/dev-app/dev-app/routes.ts | 4 ++++ src/dev-app/mdc-snackbar/BUILD.bazel | 22 +++++++++++++++++++ .../mdc-snackbar/mdc-snackbar-demo-module.ts | 22 +++++++++++++++++++ .../mdc-snackbar/mdc-snackbar-demo.html | 2 ++ .../mdc-snackbar/mdc-snackbar-demo.scss | 1 + src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts | 18 +++++++++++++++ .../mdc-snackbar/BUILD.bazel | 1 + .../mdc-snackbar/snackbar.ts | 1 + 11 files changed, 74 insertions(+) create mode 100644 src/dev-app/mdc-snackbar/BUILD.bazel create mode 100644 src/dev-app/mdc-snackbar/mdc-snackbar-demo-module.ts create mode 100644 src/dev-app/mdc-snackbar/mdc-snackbar-demo.html create mode 100644 src/dev-app/mdc-snackbar/mdc-snackbar-demo.scss create mode 100644 src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2e16a96891db..8aa97fd93650 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -162,6 +162,7 @@ /src/dev-app/mdc-menu/** @crisbeto /src/dev-app/mdc-progress-bar/** @crisbeto /src/dev-app/mdc-radio/** @mmalerba +/src/dev-app/mdc-snackbar/** @opozo /src/dev-app/mdc-slide-toggle/** @crisbeto /src/dev-app/mdc-slider/** @devversion /src/dev-app/mdc-tabs/** @crisbeto diff --git a/src/dev-app/BUILD.bazel b/src/dev-app/BUILD.bazel index 90baf42154fe..a5c93a1c2067 100644 --- a/src/dev-app/BUILD.bazel +++ b/src/dev-app/BUILD.bazel @@ -55,6 +55,7 @@ ng_module( "//src/dev-app/mdc-radio", "//src/dev-app/mdc-slide-toggle", "//src/dev-app/mdc-slider", + "//src/dev-app/mdc-snackbar", "//src/dev-app/mdc-tabs", "//src/dev-app/menu", "//src/dev-app/paginator", diff --git a/src/dev-app/dev-app/dev-app-layout.ts b/src/dev-app/dev-app/dev-app-layout.ts index 0a438f7df516..f3c766ab6754 100644 --- a/src/dev-app/dev-app/dev-app-layout.ts +++ b/src/dev-app/dev-app/dev-app-layout.ts @@ -79,6 +79,7 @@ export class DevAppLayout { {name: 'MDC Tabs', route: '/mdc-tabs'}, {name: 'MDC Slide Toggle', route: '/mdc-slide-toggle'}, {name: 'MDC Slider', route: '/mdc-slider'}, + {name: 'MDC Snackbar', route: '/mdc-snackbar'}, ]; constructor( diff --git a/src/dev-app/dev-app/routes.ts b/src/dev-app/dev-app/routes.ts index b73299f770b9..0ffde352be9f 100644 --- a/src/dev-app/dev-app/routes.ts +++ b/src/dev-app/dev-app/routes.ts @@ -65,6 +65,10 @@ export const DEV_APP_ROUTES: Routes = [ {path: 'mdc-chips', loadChildren: 'mdc-chips/mdc-chips-demo-module#MdcChipsDemoModule'}, {path: 'mdc-menu', loadChildren: 'mdc-menu/mdc-menu-demo-module#MdcMenuDemoModule'}, {path: 'mdc-radio', loadChildren: 'mdc-radio/mdc-radio-demo-module#MdcRadioDemoModule'}, + { + path: 'mdc-snackbar', + loadChildren: 'mdc-snackbar/mdc-snackbar-demo-module#MdcSnackbarDemoModule' + }, { path: 'mdc-slide-toggle', loadChildren: 'mdc-slide-toggle/mdc-slide-toggle-demo-module#MdcSlideToggleDemoModule' diff --git a/src/dev-app/mdc-snackbar/BUILD.bazel b/src/dev-app/mdc-snackbar/BUILD.bazel new file mode 100644 index 000000000000..643828e39e6c --- /dev/null +++ b/src/dev-app/mdc-snackbar/BUILD.bazel @@ -0,0 +1,22 @@ +package(default_visibility = ["//visibility:public"]) + +load("@io_bazel_rules_sass//:defs.bzl", "sass_binary") +load("//tools:defaults.bzl", "ng_module") + +ng_module( + name = "mdc-snackbar", + srcs = glob(["**/*.ts"]), + assets = [ + "mdc-snackbar-demo.html", + ":mdc_snackbar_demo_scss", + ], + deps = [ + "//src/material-experimental/mdc-snackbar", + "@npm//@angular/router", + ], +) + +sass_binary( + name = "mdc_snackbar_demo_scss", + src = "mdc-snackbar-demo.scss", +) diff --git a/src/dev-app/mdc-snackbar/mdc-snackbar-demo-module.ts b/src/dev-app/mdc-snackbar/mdc-snackbar-demo-module.ts new file mode 100644 index 000000000000..86fd91914f33 --- /dev/null +++ b/src/dev-app/mdc-snackbar/mdc-snackbar-demo-module.ts @@ -0,0 +1,22 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import {NgModule} from '@angular/core'; +import {MatSnackbarModule} from '@angular/material-experimental/mdc-snackbar'; +import {RouterModule} from '@angular/router'; +import {MdcSnackbarDemo} from './mdc-snackbar-demo'; + +@NgModule({ + imports: [ + MatSnackbarModule, + RouterModule.forChild([{path: '', component: MdcSnackbarDemo}]), + ], + declarations: [MdcSnackbarDemo], +}) +export class MdcSnackbarDemoModule { +} diff --git a/src/dev-app/mdc-snackbar/mdc-snackbar-demo.html b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.html new file mode 100644 index 000000000000..320ef68256ab --- /dev/null +++ b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.html @@ -0,0 +1,2 @@ + +Not yet implemented. diff --git a/src/dev-app/mdc-snackbar/mdc-snackbar-demo.scss b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.scss new file mode 100644 index 000000000000..1c31683b9987 --- /dev/null +++ b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.scss @@ -0,0 +1 @@ +// TODO: copy in demo styles from existing mat-snackbar demo. diff --git a/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts new file mode 100644 index 000000000000..4827062162ce --- /dev/null +++ b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts @@ -0,0 +1,18 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +import {Component} from '@angular/core'; + +@Component({ + moduleId: module.id, + selector: 'mdc-snackbar-demo', + templateUrl: 'mdc-snackbar-demo.html', + styleUrls: ['mdc-snackbar-demo.css'], +}) +export class MdcSnackbarDemo { +} diff --git a/src/material-experimental/mdc-snackbar/BUILD.bazel b/src/material-experimental/mdc-snackbar/BUILD.bazel index 7f9fc116cf12..ff82a2799da7 100644 --- a/src/material-experimental/mdc-snackbar/BUILD.bazel +++ b/src/material-experimental/mdc-snackbar/BUILD.bazel @@ -15,6 +15,7 @@ ng_module( "//src/material/core", "@npm//@angular/common", "@npm//@angular/core", + "@npm//material-components-web", ], ) diff --git a/src/material-experimental/mdc-snackbar/snackbar.ts b/src/material-experimental/mdc-snackbar/snackbar.ts index fdf876b2742e..c4f2b53e4bdb 100644 --- a/src/material-experimental/mdc-snackbar/snackbar.ts +++ b/src/material-experimental/mdc-snackbar/snackbar.ts @@ -9,6 +9,7 @@ import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core'; @Component({ + moduleId: module.id, selector: 'mat-snackbar', templateUrl: 'snackbar.html', styleUrls: ['snackbar.css'], From e6beddada5357afe1737f4415606005f9421d789 Mon Sep 17 00:00:00 2001 From: Orlando Pozo Date: Sun, 15 Dec 2019 21:56:46 -0800 Subject: [PATCH 2/3] Removed module.id from snackbar.ts --- src/material-experimental/mdc-snackbar/snackbar.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/material-experimental/mdc-snackbar/snackbar.ts b/src/material-experimental/mdc-snackbar/snackbar.ts index c4f2b53e4bdb..fdf876b2742e 100644 --- a/src/material-experimental/mdc-snackbar/snackbar.ts +++ b/src/material-experimental/mdc-snackbar/snackbar.ts @@ -9,7 +9,6 @@ import {ChangeDetectionStrategy, Component, ViewEncapsulation} from '@angular/core'; @Component({ - moduleId: module.id, selector: 'mat-snackbar', templateUrl: 'snackbar.html', styleUrls: ['snackbar.css'], From 9033444eac80b7e4808ed3750719cefd48b5b36f Mon Sep 17 00:00:00 2001 From: Orlando Pozo Date: Sun, 15 Dec 2019 22:36:23 -0800 Subject: [PATCH 3/3] Removed module.id from mdc-snackbar-demo.ts --- src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts index 4827062162ce..757be572361b 100644 --- a/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts +++ b/src/dev-app/mdc-snackbar/mdc-snackbar-demo.ts @@ -9,7 +9,6 @@ import {Component} from '@angular/core'; @Component({ - moduleId: module.id, selector: 'mdc-snackbar-demo', templateUrl: 'mdc-snackbar-demo.html', styleUrls: ['mdc-snackbar-demo.css'],