diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2103311a0e55..a24c2fd7ba72 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -120,7 +120,6 @@ /src/material-experimental/mdc-slider/** @devversion /src/material-experimental/mdc-tabs/** @crisbeto /src/material-experimental/mdc-tooltip/** @crisbeto -/src/material-experimental/mdc-sidenav/** @crisbeto /src/material-experimental/mdc-table/** @andrewseguin /src/material-experimental/mdc-theming/** @mmalerba /src/material-experimental/mdc-typography/** @mmalerba @@ -196,7 +195,6 @@ /src/dev-app/mdc-radio/** @mmalerba /src/dev-app/mdc-select/** @crisbeto /src/dev-app/mdc-snack-bar/** @andrewseguin -/src/dev-app/mdc-sidenav/** @crisbeto /src/dev-app/mdc-snack-bar/** @andrewseguin /src/dev-app/mdc-slide-toggle/** @crisbeto /src/dev-app/mdc-slider/** @devversion diff --git a/.ng-dev/commit-message.ts b/.ng-dev/commit-message.ts index 773ee2e7fc36..59fd200bfa64 100644 --- a/.ng-dev/commit-message.ts +++ b/.ng-dev/commit-message.ts @@ -59,7 +59,6 @@ export const commitMessage: CommitMessageConfig = { 'material-experimental/mdc-progress-spinner', 'material-experimental/mdc-radio', 'material-experimental/mdc-select', - 'material-experimental/mdc-sidenav', 'material-experimental/mdc-slide-toggle', 'material-experimental/mdc-slider', 'material-experimental/mdc-snack-bar', diff --git a/scripts/check-mdc-exports-config.ts b/scripts/check-mdc-exports-config.ts index da69cdf7e4ed..d80dbf57f72a 100644 --- a/scripts/check-mdc-exports-config.ts +++ b/scripts/check-mdc-exports-config.ts @@ -1,6 +1,5 @@ export const config = { - // The MDC sidenav hasn't been implemented yet. - skippedPackages: ['mdc-sidenav'], + skippedPackages: [] as string[], // We have to export some underscored symbols so that they can be used with MDC. // Exclude them from this check since they aren't part of the public API. skippedSymbols: [/^_/], diff --git a/src/dev-app/BUILD.bazel b/src/dev-app/BUILD.bazel index 34afe3bde21d..11c2b511718f 100644 --- a/src/dev-app/BUILD.bazel +++ b/src/dev-app/BUILD.bazel @@ -63,7 +63,6 @@ ng_module( "//src/dev-app/mdc-progress-spinner", "//src/dev-app/mdc-radio", "//src/dev-app/mdc-select", - "//src/dev-app/mdc-sidenav", "//src/dev-app/mdc-slide-toggle", "//src/dev-app/mdc-slider", "//src/dev-app/mdc-snack-bar", diff --git a/src/dev-app/dev-app/dev-app-layout.ts b/src/dev-app/dev-app/dev-app-layout.ts index e7be816d9179..725ecbd43137 100644 --- a/src/dev-app/dev-app/dev-app-layout.ts +++ b/src/dev-app/dev-app/dev-app-layout.ts @@ -102,7 +102,6 @@ export class DevAppLayout { {name: 'MDC Tabs', route: '/mdc-tabs'}, {name: 'MDC Tooltip', route: '/mdc-tooltip'}, {name: 'MDC Select', route: '/mdc-select'}, - {name: 'MDC Sidenav', route: '/mdc-sidenav'}, {name: 'MDC Slide Toggle', route: '/mdc-slide-toggle'}, {name: 'MDC Slider', route: '/mdc-slider'}, {name: 'MDC Snack Bar', route: '/mdc-snack-bar'}, diff --git a/src/dev-app/mdc-sidenav/BUILD.bazel b/src/dev-app/mdc-sidenav/BUILD.bazel deleted file mode 100644 index 1f8b93d549a5..000000000000 --- a/src/dev-app/mdc-sidenav/BUILD.bazel +++ /dev/null @@ -1,21 +0,0 @@ -load("//tools:defaults.bzl", "ng_module", "sass_binary") - -package(default_visibility = ["//visibility:public"]) - -ng_module( - name = "mdc-sidenav", - srcs = glob(["**/*.ts"]), - assets = [ - "mdc-sidenav-demo.html", - ":mdc_sidenav_demo_scss", - ], - deps = [ - "//src/material-experimental/mdc-sidenav", - "@npm//@angular/router", - ], -) - -sass_binary( - name = "mdc_sidenav_demo_scss", - src = "mdc-sidenav-demo.scss", -) diff --git a/src/dev-app/mdc-sidenav/mdc-sidenav-demo-module.ts b/src/dev-app/mdc-sidenav/mdc-sidenav-demo-module.ts deleted file mode 100644 index 59a0ab1edc9a..000000000000 --- a/src/dev-app/mdc-sidenav/mdc-sidenav-demo-module.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @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 {MatSidenavModule} from '@angular/material-experimental/mdc-sidenav'; -import {RouterModule} from '@angular/router'; -import {MdcSidenavDemo} from './mdc-sidenav-demo'; - -@NgModule({ - imports: [MatSidenavModule, RouterModule.forChild([{path: '', component: MdcSidenavDemo}])], - declarations: [MdcSidenavDemo], -}) -export class MdcSidenavDemoModule {} diff --git a/src/dev-app/mdc-sidenav/mdc-sidenav-demo.html b/src/dev-app/mdc-sidenav/mdc-sidenav-demo.html deleted file mode 100644 index f3776973b7c3..000000000000 --- a/src/dev-app/mdc-sidenav/mdc-sidenav-demo.html +++ /dev/null @@ -1,2 +0,0 @@ - -Not yet implemented. diff --git a/src/dev-app/mdc-sidenav/mdc-sidenav-demo.scss b/src/dev-app/mdc-sidenav/mdc-sidenav-demo.scss deleted file mode 100644 index af5dd72000aa..000000000000 --- a/src/dev-app/mdc-sidenav/mdc-sidenav-demo.scss +++ /dev/null @@ -1 +0,0 @@ -// TODO: copy in demo styles from existing mat-sidenav demo. diff --git a/src/dev-app/mdc-sidenav/mdc-sidenav-demo.ts b/src/dev-app/mdc-sidenav/mdc-sidenav-demo.ts deleted file mode 100644 index 4e281eef08d7..000000000000 --- a/src/dev-app/mdc-sidenav/mdc-sidenav-demo.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @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({ - selector: 'mdc-sidenav-demo', - templateUrl: 'mdc-sidenav-demo.html', - styleUrls: ['mdc-sidenav-demo.css'], -}) -export class MdcSidenavDemo {} diff --git a/src/dev-app/routes.ts b/src/dev-app/routes.ts index 8071764bac18..a1c2fe27d92e 100644 --- a/src/dev-app/routes.ts +++ b/src/dev-app/routes.ts @@ -224,11 +224,6 @@ export const DEV_APP_ROUTES: Routes = [ loadChildren: () => import('./mdc-select/mdc-select-demo-module').then(m => m.MdcSelectDemoModule), }, - { - path: 'mdc-sidenav', - loadChildren: () => - import('./mdc-sidenav/mdc-sidenav-demo-module').then(m => m.MdcSidenavDemoModule), - }, { path: 'mdc-snack-bar', loadChildren: () => diff --git a/src/material-experimental/config.bzl b/src/material-experimental/config.bzl index b0750f2d83a2..2bcfe3d246c8 100644 --- a/src/material-experimental/config.bzl +++ b/src/material-experimental/config.bzl @@ -32,7 +32,6 @@ entryPoints = [ "mdc-radio/testing", "mdc-select", "mdc-select/testing", - "mdc-sidenav", "mdc-slide-toggle", "mdc-slide-toggle/testing", "mdc-slider", diff --git a/src/material-experimental/mdc-sidenav/BUILD.bazel b/src/material-experimental/mdc-sidenav/BUILD.bazel deleted file mode 100644 index 7585d1cc6667..000000000000 --- a/src/material-experimental/mdc-sidenav/BUILD.bazel +++ /dev/null @@ -1,57 +0,0 @@ -load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") -load("//tools:defaults.bzl", "ng_e2e_test_library", "ng_module", "sass_binary", "sass_library") - -package(default_visibility = ["//visibility:public"]) - -ng_module( - name = "mdc-sidenav", - srcs = glob( - ["**/*.ts"], - exclude = [ - "**/*.spec.ts", - ], - ), - assets = [ - # TODO: include scss assets - ] + glob(["**/*.html"]), - deps = [ - "//src/material-experimental/mdc-core", - ], -) - -sass_library( - name = "mdc_sidenav_scss_lib", - srcs = glob(["**/_*.scss"]), - deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", - ], -) - -sass_binary( - name = "sidenav_scss", - src = "sidenav.scss", - include_paths = [ - "external/npm/node_modules", - ], - deps = [ - "//src/material-experimental/mdc-helpers:mdc_helpers_scss_lib", - "//src/material-experimental/mdc-helpers:mdc_scss_deps_lib", - ], -) - -ng_e2e_test_library( - name = "e2e_test_sources", - srcs = glob(["**/*.e2e.spec.ts"]), - deps = [ - "//src/cdk/testing/private/e2e", - ], -) - -e2e_test_suite( - name = "e2e_tests", - deps = [ - ":e2e_test_sources", - "//src/cdk/testing/private/e2e", - ], -) diff --git a/src/material-experimental/mdc-sidenav/README.md b/src/material-experimental/mdc-sidenav/README.md deleted file mode 100644 index cf873b4c072b..000000000000 --- a/src/material-experimental/mdc-sidenav/README.md +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/material-experimental/mdc-sidenav/_sidenav-theme.import.scss b/src/material-experimental/mdc-sidenav/_sidenav-theme.import.scss deleted file mode 100644 index 30a855ca525a..000000000000 --- a/src/material-experimental/mdc-sidenav/_sidenav-theme.import.scss +++ /dev/null @@ -1,5 +0,0 @@ -@forward '../mdc-helpers/mdc-helpers.import'; -@forward '../mdc-helpers/mdc-helpers'; -@forward 'sidenav-theme' as mat-mdc-sidenav-*; - -@import '../mdc-helpers/mdc-helpers'; diff --git a/src/material-experimental/mdc-sidenav/_sidenav-theme.scss b/src/material-experimental/mdc-sidenav/_sidenav-theme.scss deleted file mode 100644 index 9c358542f417..000000000000 --- a/src/material-experimental/mdc-sidenav/_sidenav-theme.scss +++ /dev/null @@ -1,28 +0,0 @@ -@use '../../material/core/theming/theming'; - -@mixin color($config-or-theme) {} - -@mixin typography($config-or-theme) {} - -@mixin density($config-or-theme) { - $density-scale: theming.get-density-config($config-or-theme); -} - -@mixin theme($theme-or-color-config) { - $theme: theming.private-legacy-get-theme($theme-or-color-config); - @include theming.private-check-duplicate-theme-styles($theme, 'mat-mdc-sidenav') { - $color: theming.get-color-config($theme); - $density: theming.get-density-config($theme); - $typography: theming.get-typography-config($theme); - - @if $color != null { - @include color($color); - } - @if $density != null { - @include density($density); - } - @if $typography != null { - @include typography($typography); - } - } -} diff --git a/src/material-experimental/mdc-sidenav/index.ts b/src/material-experimental/mdc-sidenav/index.ts deleted file mode 100644 index 676ca90f1ffa..000000000000 --- a/src/material-experimental/mdc-sidenav/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @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 - */ - -export * from './public-api'; diff --git a/src/material-experimental/mdc-sidenav/module.ts b/src/material-experimental/mdc-sidenav/module.ts deleted file mode 100644 index 70bfbd8f4955..000000000000 --- a/src/material-experimental/mdc-sidenav/module.ts +++ /dev/null @@ -1,16 +0,0 @@ -/** - * @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 {MatCommonModule} from '@angular/material-experimental/mdc-core'; - -@NgModule({ - imports: [MatCommonModule], - exports: [MatCommonModule], -}) -export class MatSidenavModule {} diff --git a/src/material-experimental/mdc-sidenav/public-api.ts b/src/material-experimental/mdc-sidenav/public-api.ts deleted file mode 100644 index 508adc834fb3..000000000000 --- a/src/material-experimental/mdc-sidenav/public-api.ts +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @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 - */ - -export * from './module'; diff --git a/src/material-experimental/mdc-sidenav/sidenav.e2e.spec.ts b/src/material-experimental/mdc-sidenav/sidenav.e2e.spec.ts deleted file mode 100644 index 507f760e60cc..000000000000 --- a/src/material-experimental/mdc-sidenav/sidenav.e2e.spec.ts +++ /dev/null @@ -1 +0,0 @@ -// TODO: copy tests from existing mat-sidenav, update as necessary to fix. diff --git a/src/material-experimental/mdc-sidenav/sidenav.scss b/src/material-experimental/mdc-sidenav/sidenav.scss deleted file mode 100644 index 3caa13e6b9fe..000000000000 --- a/src/material-experimental/mdc-sidenav/sidenav.scss +++ /dev/null @@ -1 +0,0 @@ -// TODO: implement MDC-based sidenav