From fa519dd7232c0f638a0d4a10dfd4afc8d6f91388 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Wed, 6 Jul 2022 11:48:57 -0700 Subject: [PATCH 1/5] feat(material/legacy-progress-bar): step 1. rename directory --- .github/CODEOWNERS | 474 +++++++++--------- .ng-dev/commit-message.mts | 2 +- .../material/card/BUILD.bazel | 2 +- .../material/card/index.ts | 2 +- .../material/progress-bar/BUILD.bazel | 8 +- .../material/progress-bar/index.ts | 2 +- .../progress-bar-configurable-example.ts | 2 +- .../progress-bar-harness-example.spec.ts | 4 +- .../material/tree/BUILD.bazel | 2 +- .../material/tree/index.ts | 2 +- src/dev-app/card/BUILD.bazel | 2 +- src/dev-app/card/card-demo.ts | 2 +- src/dev-app/progress-bar/BUILD.bazel | 2 +- src/dev-app/progress-bar/progress-bar-demo.ts | 2 +- src/dev-app/tree/BUILD.bazel | 2 +- src/dev-app/tree/tree-demo.ts | 2 +- src/e2e-app/BUILD.bazel | 2 +- .../progress-bar/progress-bar-e2e-module.ts | 2 +- .../mdc-progress-bar/BUILD.bazel | 2 +- .../mdc-progress-bar/README.md | 4 +- .../mdc-progress-bar/progress-bar.ts | 2 +- .../mdc-progress-bar/public-api.ts | 2 +- .../mdc-progress-bar/testing/BUILD.bazel | 4 +- .../testing/progress-bar-harness.spec.ts | 2 +- .../testing/progress-bar-harness.ts | 2 +- .../mdc-progress-bar/testing/public-api.ts | 2 +- src/material/_index.scss | 2 +- src/material/_theming.scss | 2 +- src/material/config.bzl | 4 +- src/material/core/_core.import.scss | 2 +- .../core/color/_all-color.import.scss | 2 +- .../core/theming/_all-theme.import.scss | 4 +- src/material/core/theming/_all-theme.scss | 2 +- .../tests/test-css-variables-theme.scss | 2 +- .../typography/_all-typography.import.scss | 4 +- .../core/typography/_all-typography.scss | 2 +- .../BUILD.bazel | 6 +- .../README.md | 0 .../_progress-bar-legacy-index.scss | 0 .../_progress-bar-theme.import.scss | 0 .../_progress-bar-theme.scss | 2 +- .../index.ts | 0 .../progress-bar-module.ts | 0 .../progress-bar.e2e.spec.ts | 0 .../progress-bar.html | 0 .../progress-bar.md | 0 .../progress-bar.scss | 0 .../progress-bar.spec.ts | 0 .../progress-bar.ts | 0 .../public-api.ts | 0 .../testing/BUILD.bazel | 4 +- .../testing/index.ts | 0 .../testing/progress-bar-harness-filters.ts | 0 .../testing/progress-bar-harness.spec.ts | 4 +- .../testing/progress-bar-harness.ts | 0 .../testing/public-api.ts | 0 .../testing/shared.spec.ts | 2 +- .../kitchen-sink/kitchen-sink.ts | 2 +- ...ting.md => legacy-progress-bar-testing.md} | 0 ...progress-bar.md => legacy-progress-bar.md} | 0 60 files changed, 291 insertions(+), 291 deletions(-) rename src/material/{progress-bar => legacy-progress-bar}/BUILD.bazel (93%) rename src/material/{progress-bar => legacy-progress-bar}/README.md (100%) rename src/material/{progress-bar => legacy-progress-bar}/_progress-bar-legacy-index.scss (100%) rename src/material/{progress-bar => legacy-progress-bar}/_progress-bar-theme.import.scss (100%) rename src/material/{progress-bar => legacy-progress-bar}/_progress-bar-theme.scss (98%) rename src/material/{progress-bar => legacy-progress-bar}/index.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar-module.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar.e2e.spec.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar.html (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar.md (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar.scss (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar.spec.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/progress-bar.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/public-api.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/testing/BUILD.bazel (90%) rename src/material/{progress-bar => legacy-progress-bar}/testing/index.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/testing/progress-bar-harness-filters.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/testing/progress-bar-harness.spec.ts (50%) rename src/material/{progress-bar => legacy-progress-bar}/testing/progress-bar-harness.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/testing/public-api.ts (100%) rename src/material/{progress-bar => legacy-progress-bar}/testing/shared.spec.ts (96%) rename tools/public_api_guard/material/{progress-bar-testing.md => legacy-progress-bar-testing.md} (100%) rename tools/public_api_guard/material/{progress-bar.md => legacy-progress-bar.md} (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a9a090b8309a..103e32aff114 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -21,7 +21,7 @@ /src/material/paginator/** @andrewseguin /src/material/prebuilt-themes/** @andrewseguin /src/material/legacy-prebuilt-themes/** @andrewseguin -/src/material/progress-bar/** @andrewseguin @crisbeto +/src/material/legacy-progress-bar/** @andrewseguin @crisbeto /src/material/progress-spinner/** @andrewseguin @crisbeto /src/material/radio/** @andrewseguin @devversion /src/material/schematics/** @devversion @andrewseguin @@ -41,255 +41,255 @@ /src/material/tree/** @jelbourn @andrewseguin # Angular Material core -/src/material/core/* @andrewseguin -/src/material/core/testing/** @crisbeto -/src/material/core/animation/** @andrewseguin -/src/material/core/color/** @andrewseguin @devversion -/src/material/core/common-behaviors/** @andrewseguin @devversion -/src/material/core/datetime/** @mmalerba -/src/material/core/density/** @devversion -/src/material/core/error/** @crisbeto @mmalerba -/src/material/core/focus-indicators/** @jelbourn -/src/material/core/gestures/** @andrewseguin -/src/material/core/label/** @mmalerba -/src/material/core/line/** @andrewseguin -/src/material/core/mdc-helpers/** @mmalerba -/src/material/core/option/** @crisbeto -/src/material/core/placeholder/** @mmalerba -/src/material/core/ripple/** @devversion -/src/material/core/selection/** @andrewseguin -/src/material/core/selection/pseudo*/** @crisbeto @andrewseguin -/src/material/core/style/** @andrewseguin -/src/material/core/theming/** @andrewseguin @jelbourn -/src/material/core/typography/** @crisbeto -/src/material/core/util/** @andrewseguin -/src/material/legacy-core/* @andrewseguin -/src/material/legacy-core/color/** @andrewseguin @devversion -/src/material/legacy-core/density/** @devversion -/src/material/legacy-core/theming/** @andrewseguin @jelbourn -/src/material/legacy-core/typography/** @crisbeto +/src/material/core/* @andrewseguin +/src/material/core/testing/** @crisbeto +/src/material/core/animation/** @andrewseguin +/src/material/core/color/** @andrewseguin @devversion +/src/material/core/common-behaviors/** @andrewseguin @devversion +/src/material/core/datetime/** @mmalerba +/src/material/core/density/** @devversion +/src/material/core/error/** @crisbeto @mmalerba +/src/material/core/focus-indicators/** @jelbourn +/src/material/core/gestures/** @andrewseguin +/src/material/core/label/** @mmalerba +/src/material/core/line/** @andrewseguin +/src/material/core/mdc-helpers/** @mmalerba +/src/material/core/option/** @crisbeto +/src/material/core/placeholder/** @mmalerba +/src/material/core/ripple/** @devversion +/src/material/core/selection/** @andrewseguin +/src/material/core/selection/pseudo*/** @crisbeto @andrewseguin +/src/material/core/style/** @andrewseguin +/src/material/core/theming/** @andrewseguin @jelbourn +/src/material/core/typography/** @crisbeto +/src/material/core/util/** @andrewseguin +/src/material/legacy-core/* @andrewseguin +/src/material/legacy-core/color/** @andrewseguin @devversion +/src/material/legacy-core/density/** @devversion +/src/material/legacy-core/theming/** @andrewseguin @jelbourn +/src/material/legacy-core/typography/** @crisbeto # Miscellaneous components -/src/google-maps/** @crisbeto -/src/youtube-player/** @crisbeto +/src/google-maps/** @crisbeto +/src/youtube-player/** @crisbeto # CDK -/src/cdk/* @andrewseguin -/src/cdk/a11y/** @jelbourn @devversion -/src/cdk/accordion/** @andrewseguin -/src/cdk/bidi/** @andrewseguin -/src/cdk/clipboard/** @andrewseguin -/src/cdk/coercion/** @andrewseguin -/src/cdk/collections/** @crisbeto @andrewseguin -/src/cdk/dialog/** @jelbourn @crisbeto -/src/cdk/drag-drop/** @crisbeto -/src/cdk/keycodes/** @andrewseguin -/src/cdk/layout/** @andrewseguin -/src/cdk/menu/** @mmalerba @crisbeto -/src/cdk/observers/** @andrewseguin @crisbeto -/src/cdk/overlay/** @jelbourn @crisbeto -/src/cdk/platform/** @andrewseguin @devversion -/src/cdk/portal/** @andrewseguin -/src/cdk/schematics/** @devversion @andrewseguin -/src/cdk/scrolling/** @andrewseguin @crisbeto -/src/cdk/stepper/** @mmalerba -/src/cdk/table/** @andrewseguin -/src/cdk/testing/** @mmalerba @devversion -/src/cdk/text-field/** @mmalerba -/src/cdk/tree/** @jelbourn @andrewseguin +/src/cdk/* @andrewseguin +/src/cdk/a11y/** @jelbourn @devversion +/src/cdk/accordion/** @andrewseguin +/src/cdk/bidi/** @andrewseguin +/src/cdk/clipboard/** @andrewseguin +/src/cdk/coercion/** @andrewseguin +/src/cdk/collections/** @crisbeto @andrewseguin +/src/cdk/dialog/** @jelbourn @crisbeto +/src/cdk/drag-drop/** @crisbeto +/src/cdk/keycodes/** @andrewseguin +/src/cdk/layout/** @andrewseguin +/src/cdk/menu/** @mmalerba @crisbeto +/src/cdk/observers/** @andrewseguin @crisbeto +/src/cdk/overlay/** @jelbourn @crisbeto +/src/cdk/platform/** @andrewseguin @devversion +/src/cdk/portal/** @andrewseguin +/src/cdk/schematics/** @devversion @andrewseguin +/src/cdk/scrolling/** @andrewseguin @crisbeto +/src/cdk/stepper/** @mmalerba +/src/cdk/table/** @andrewseguin +/src/cdk/testing/** @mmalerba @devversion +/src/cdk/text-field/** @mmalerba +/src/cdk/tree/** @jelbourn @andrewseguin # Date adapters -/src/material-moment-adapter/** @mmalerba -/src/material-luxon-adapter/** @crisbeto -/src/material-date-fns-adapter/** @crisbeto +/src/material-moment-adapter/** @mmalerba +/src/material-luxon-adapter/** @crisbeto +/src/material-date-fns-adapter/** @crisbeto # Material experimental package -/src/material-experimental/* @andrewseguin -/src/material-experimental/column-resize/** @andrewseguin -/src/material-experimental/mdc-autocomplete/** @crisbeto -/src/material-experimental/mdc-button/** @andrewseguin -/src/material/card/** @mmalerba -/src/material-experimental/mdc-checkbox/** @mmalerba -/src/material-experimental/mdc-chips/** @mmalerba -/src/material-experimental/mdc-core/** @crisbeto -/src/material-experimental/mdc-dialog/** @devversion -/src/material-experimental/mdc-form-field/** @devversion @mmalerba -/src/material-experimental/mdc-input/** @devversion @mmalerba -/src/material-experimental/mdc-list/** @mmalerba @devversion -/src/material-experimental/mdc-menu/** @crisbeto -/src/material-experimental/mdc-select/** @crisbeto -/src/material-experimental/mdc-paginator/** @crisbeto -/src/material-experimental/mdc-progress-spinner/** @andrewseguin -/src/material-experimental/mdc-progress-bar/** @andrewseguin -/src/material-experimental/mdc-radio/** @mmalerba -/src/material-experimental/mdc-snack-bar/** @andrewseguin -/src/material-experimental/mdc-slide-toggle/** @crisbeto -/src/material-experimental/mdc-slider/** @devversion -/src/material-experimental/mdc-tabs/** @crisbeto -/src/material-experimental/mdc-tooltip/** @crisbeto -/src/material-experimental/mdc-table/** @andrewseguin -/src/material-experimental/menubar/** @jelbourn -/src/material-experimental/popover-edit/** @andrewseguin -/src/material-experimental/selection/** @andrewseguin +/src/material-experimental/* @andrewseguin +/src/material-experimental/column-resize/** @andrewseguin +/src/material-experimental/mdc-autocomplete/** @crisbeto +/src/material-experimental/mdc-button/** @andrewseguin +/src/material/card/** @mmalerba +/src/material-experimental/mdc-checkbox/** @mmalerba +/src/material-experimental/mdc-chips/** @mmalerba +/src/material-experimental/mdc-core/** @crisbeto +/src/material-experimental/mdc-dialog/** @devversion +/src/material-experimental/mdc-form-field/** @devversion @mmalerba +/src/material-experimental/mdc-input/** @devversion @mmalerba +/src/material-experimental/mdc-list/** @mmalerba @devversion +/src/material-experimental/mdc-menu/** @crisbeto +/src/material-experimental/mdc-select/** @crisbeto +/src/material-experimental/mdc-paginator/** @crisbeto +/src/material-experimental/mdc-progress-spinner/** @andrewseguin +/src/material/progress-bar/** @andrewseguin +/src/material-experimental/mdc-radio/** @mmalerba +/src/material-experimental/mdc-snack-bar/** @andrewseguin +/src/material-experimental/mdc-slide-toggle/** @crisbeto +/src/material-experimental/mdc-slider/** @devversion +/src/material-experimental/mdc-tabs/** @crisbeto +/src/material-experimental/mdc-tooltip/** @crisbeto +/src/material-experimental/mdc-table/** @andrewseguin +/src/material-experimental/menubar/** @jelbourn +/src/material-experimental/popover-edit/** @andrewseguin +/src/material-experimental/selection/** @andrewseguin # CDK experimental package -/src/cdk-experimental/* @andrewseguin -/src/cdk-experimental/column-resize/** @andrewseguin -/src/cdk-experimental/combobox/** @jelbourn -/src/cdk-experimental/popover-edit/** @andrewseguin -/src/cdk-experimental/scrolling/** @mmalerba -/src/cdk-experimental/table-scroll-container/** @andrewseguin -/src/cdk-experimental/listbox/** @jelbourn -/src/cdk-experimental/selection/** @andrewseguin +/src/cdk-experimental/* @andrewseguin +/src/cdk-experimental/column-resize/** @andrewseguin +/src/cdk-experimental/combobox/** @jelbourn +/src/cdk-experimental/popover-edit/** @andrewseguin +/src/cdk-experimental/scrolling/** @mmalerba +/src/cdk-experimental/table-scroll-container/** @andrewseguin +/src/cdk-experimental/listbox/** @jelbourn +/src/cdk-experimental/selection/** @andrewseguin # Docs examples & guides -/guides/** @jelbourn -/src/components-examples/** @andrewseguin +/guides/** @jelbourn +/src/components-examples/** @andrewseguin # Dev-app -/src/dev-app/* @devversion -/src/dev-app/autocomplete/** @crisbeto -/src/dev-app/badge/** @andrewseguin -/src/dev-app/baseline/** @mmalerba -/src/dev-app/bottom-sheet/** @andrewseguin @crisbeto -/src/dev-app/button-toggle/** @andrewseguin -/src/dev-app/mdc-autocomplete/** @crisbeto -/src/dev-app/button/** @andrewseguin -/src/dev-app/card/** @andrewseguin -/src/dev-app/cdk-dialog/** @crisbeto -/src/dev-app/cdk-experimental-combobox/** @jelbourn -/src/dev-app/cdk-experimental-listbox/** @jelbourn -/src/dev-app/checkbox/** @jelbourn @devversion -/src/dev-app/chips/** @andrewseguin -/src/dev-app/clipboard/** @andrewseguin -/src/dev-app/column-resize/** @andrewseguin -/src/dev-app/connected-overlay/** @jelbourn @crisbeto -/src/dev-app/dataset/** @andrewseguin -/src/dev-app/datepicker/** @mmalerba @crisbeto @zarend -/src/dev-app/dev-app/** @mmalerba -/src/dev-app/dialog/** @andrewseguin @crisbeto -/src/dev-app/drag-drop/** @crisbeto -/src/dev-app/drawer/** @mmalerba -/src/dev-app/example/** @andrewseguin -/src/dev-app/examples-page/** @andrewseguin -/src/dev-app/expansion/** @andrewseguin -/src/dev-app/focus-origin/** @mmalerba -/src/dev-app/focus-trap/** @jelbourn -/src/dev-app/google-map/** @crisbeto -/src/dev-app/grid-list/** @andrewseguin -/src/dev-app/icon/** @andrewseguin -/src/dev-app/input/** @mmalerba -/src/dev-app/layout/** @andrewseguin -/src/dev-app/cdk-menu/** @mmalerba @crisbeto -/src/dev-app/input-modality/** @jelbourn -/src/dev-app/list/** @andrewseguin @crisbeto @devversion -/src/dev-app/live-announcer/** @jelbourn -/src/dev-app/mdc-button/** @andrewseguin +/src/dev-app/* @devversion +/src/dev-app/autocomplete/** @crisbeto +/src/dev-app/badge/** @andrewseguin +/src/dev-app/baseline/** @mmalerba +/src/dev-app/bottom-sheet/** @andrewseguin @crisbeto +/src/dev-app/button-toggle/** @andrewseguin +/src/dev-app/mdc-autocomplete/** @crisbeto +/src/dev-app/button/** @andrewseguin +/src/dev-app/card/** @andrewseguin +/src/dev-app/cdk-dialog/** @crisbeto +/src/dev-app/cdk-experimental-combobox/** @jelbourn +/src/dev-app/cdk-experimental-listbox/** @jelbourn +/src/dev-app/checkbox/** @jelbourn @devversion +/src/dev-app/chips/** @andrewseguin +/src/dev-app/clipboard/** @andrewseguin +/src/dev-app/column-resize/** @andrewseguin +/src/dev-app/connected-overlay/** @jelbourn @crisbeto +/src/dev-app/dataset/** @andrewseguin +/src/dev-app/datepicker/** @mmalerba @crisbeto @zarend +/src/dev-app/dev-app/** @mmalerba +/src/dev-app/dialog/** @andrewseguin @crisbeto +/src/dev-app/drag-drop/** @crisbeto +/src/dev-app/drawer/** @mmalerba +/src/dev-app/example/** @andrewseguin +/src/dev-app/examples-page/** @andrewseguin +/src/dev-app/expansion/** @andrewseguin +/src/dev-app/focus-origin/** @mmalerba +/src/dev-app/focus-trap/** @jelbourn +/src/dev-app/google-map/** @crisbeto +/src/dev-app/grid-list/** @andrewseguin +/src/dev-app/icon/** @andrewseguin +/src/dev-app/input/** @mmalerba +/src/dev-app/layout/** @andrewseguin +/src/dev-app/cdk-menu/** @mmalerba @crisbeto +/src/dev-app/input-modality/** @jelbourn +/src/dev-app/list/** @andrewseguin @crisbeto @devversion +/src/dev-app/live-announcer/** @jelbourn +/src/dev-app/mdc-button/** @andrewseguin # Note to implementer: please repossess -/src/dev-app/mdc-card/** @mmalerba -/src/dev-app/mdc-checkbox/** @mmalerba -/src/dev-app/mdc-chips/** @mmalerba -/src/dev-app/mdc-dialog/** @devversion -/src/dev-app/mdc-input/** @devversion @mmalerba -/src/dev-app/mdc-list/** @mmalerba -/src/dev-app/mdc-menu/** @crisbeto -/src/dev-app/mdc-paginator/** @crisbeto -/src/dev-app/mdc-progress-bar/** @crisbeto -/src/dev-app/mdc-progress-spinner/** @mmalerba -/src/dev-app/mdc-radio/** @mmalerba -/src/dev-app/mdc-select/** @crisbeto -/src/dev-app/mdc-snack-bar/** @andrewseguin -/src/dev-app/mdc-snack-bar/** @andrewseguin -/src/dev-app/mdc-slide-toggle/** @crisbeto -/src/dev-app/mdc-slider/** @devversion -/src/dev-app/mdc-table/** @andrewseguin -/src/dev-app/mdc-tabs/** @crisbeto -/src/dev-app/mdc-tooltip/** @crisbeto -/src/dev-app/menu/** @crisbeto -/src/dev-app/menubar/** @jelbourn -/src/dev-app/overlay/** @jelbourn @crisbeto -/src/dev-app/paginator/** @andrewseguin -/src/dev-app/platform/** @andrewseguin @devversion -/src/dev-app/portal/** @andrewseguin -/src/dev-app/popover-edit/** @andrewseguin -/src/dev-app/progress-bar/** @andrewseguin @crisbeto -/src/dev-app/progress-spinner/** @andrewseguin @crisbeto -/src/dev-app/radio/** @andrewseguin @devversion -/src/dev-app/ripple/** @devversion -/src/dev-app/screen-type/** @andrewseguin -/src/dev-app/select/** @crisbeto -/src/dev-app/sidenav/** @mmalerba -/src/dev-app/slide-toggle/** @devversion -/src/dev-app/slider/** @mmalerba -/src/dev-app/snack-bar/** @andrewseguin @crisbeto -/src/dev-app/stepper/** @mmalerba -/src/dev-app/table/** @andrewseguin -/src/dev-app/table-scroll-container/** @andrewseguin -/src/dev-app/tabs/** @andrewseguin -/src/dev-app/toolbar/** @devversion -/src/dev-app/tooltip/** @andrewseguin -/src/dev-app/tree/** @andrewseguin -/src/dev-app/typography/** @crisbeto -/src/dev-app/virtual-scroll/** @mmalerba -/src/dev-app/youtube-player/** @crisbeto -/src/dev-app/selection/** @andrewseguin +/src/dev-app/mdc-card/** @mmalerba +/src/dev-app/mdc-checkbox/** @mmalerba +/src/dev-app/mdc-chips/** @mmalerba +/src/dev-app/mdc-dialog/** @devversion +/src/dev-app/mdc-input/** @devversion @mmalerba +/src/dev-app/mdc-list/** @mmalerba +/src/dev-app/mdc-menu/** @crisbeto +/src/dev-app/mdc-paginator/** @crisbeto +/src/dev-app/mdc-progress-bar/** @crisbeto +/src/dev-app/mdc-progress-spinner/** @mmalerba +/src/dev-app/mdc-radio/** @mmalerba +/src/dev-app/mdc-select/** @crisbeto +/src/dev-app/mdc-snack-bar/** @andrewseguin +/src/dev-app/mdc-snack-bar/** @andrewseguin +/src/dev-app/mdc-slide-toggle/** @crisbeto +/src/dev-app/mdc-slider/** @devversion +/src/dev-app/mdc-table/** @andrewseguin +/src/dev-app/mdc-tabs/** @crisbeto +/src/dev-app/mdc-tooltip/** @crisbeto +/src/dev-app/menu/** @crisbeto +/src/dev-app/menubar/** @jelbourn +/src/dev-app/overlay/** @jelbourn @crisbeto +/src/dev-app/paginator/** @andrewseguin +/src/dev-app/platform/** @andrewseguin @devversion +/src/dev-app/portal/** @andrewseguin +/src/dev-app/popover-edit/** @andrewseguin +/src/dev-app/progress-bar/** @andrewseguin @crisbeto +/src/dev-app/progress-spinner/** @andrewseguin @crisbeto +/src/dev-app/radio/** @andrewseguin @devversion +/src/dev-app/ripple/** @devversion +/src/dev-app/screen-type/** @andrewseguin +/src/dev-app/select/** @crisbeto +/src/dev-app/sidenav/** @mmalerba +/src/dev-app/slide-toggle/** @devversion +/src/dev-app/slider/** @mmalerba +/src/dev-app/snack-bar/** @andrewseguin @crisbeto +/src/dev-app/stepper/** @mmalerba +/src/dev-app/table/** @andrewseguin +/src/dev-app/table-scroll-container/** @andrewseguin +/src/dev-app/tabs/** @andrewseguin +/src/dev-app/toolbar/** @devversion +/src/dev-app/tooltip/** @andrewseguin +/src/dev-app/tree/** @andrewseguin +/src/dev-app/typography/** @crisbeto +/src/dev-app/virtual-scroll/** @mmalerba +/src/dev-app/youtube-player/** @crisbeto +/src/dev-app/selection/** @andrewseguin # E2E app -/src/e2e-app/* @andrewseguin -/src/e2e-app/block-scroll-strategy/** @andrewseguin @crisbeto -/src/e2e-app/button/** @andrewseguin -/src/e2e-app/button-toggle/** @andrewseguin -/src/e2e-app/card/** @andrewseguin -/src/e2e-app/checkbox/** @andrewseguin @devversion -/src/e2e-app/component-harness/** @mmalerba -/src/e2e-app/dialog/** @andrewseguin @crisbeto -/src/e2e-app/e2e-app/** @andrewseguin -/src/e2e-app/example-viewer/** @andrewseguin -/src/e2e-app/expansion/** @andrewseguin -/src/e2e-app/grid-list/** @andrewseguin -/src/e2e-app/icon/** @andrewseguin -/src/e2e-app/input/** @mmalerba -/src/e2e-app/list/** @andrewseguin -/src/e2e-app/mdc-button/** @andrewseguin +/src/e2e-app/* @andrewseguin +/src/e2e-app/block-scroll-strategy/** @andrewseguin @crisbeto +/src/e2e-app/button/** @andrewseguin +/src/e2e-app/button-toggle/** @andrewseguin +/src/e2e-app/card/** @andrewseguin +/src/e2e-app/checkbox/** @andrewseguin @devversion +/src/e2e-app/component-harness/** @mmalerba +/src/e2e-app/dialog/** @andrewseguin @crisbeto +/src/e2e-app/e2e-app/** @andrewseguin +/src/e2e-app/example-viewer/** @andrewseguin +/src/e2e-app/expansion/** @andrewseguin +/src/e2e-app/grid-list/** @andrewseguin +/src/e2e-app/icon/** @andrewseguin +/src/e2e-app/input/** @mmalerba +/src/e2e-app/list/** @andrewseguin +/src/e2e-app/mdc-button/** @andrewseguin # Note to implementer: please repossess -/src/e2e-app/mdc-card/** @mmalerba -/src/e2e-app/mdc-checkbox/** @mmalerba -/src/e2e-app/mdc-chips/** @mmalerba -/src/e2e-app/mdc-dialog/** @devversion -/src/e2e-app/mdc-input/** @devversion -/src/e2e-app/mdc-menu/** @crisbeto -/src/e2e-app/mdc-progress-bar/** @crisbeto -/src/e2e-app/mdc-progress-spinner/** @mmalerba -/src/e2e-app/mdc-radio/** @mmalerba -/src/e2e-app/mdc-slider/** @andrewseguin -/src/e2e-app/mdc-slide-toggle/** @crisbeto -/src/e2e-app/mdc-tabs/** @crisbeto -/src/e2e-app/mdc-table/** @andrewseguin -/src/e2e-app/menu/** @crisbeto -/src/e2e-app/progress-bar/** @andrewseguin @crisbeto -/src/e2e-app/progress-spinner/** @andrewseguin @crisbeto -/src/e2e-app/radio/** @andrewseguin @devversion -/src/e2e-app/select/** @crisbeto -/src/e2e-app/sidenav/** @mmalerba -/src/e2e-app/slide-toggle/** @devversion -/src/e2e-app/stepper/** @mmalerba -/src/e2e-app/tabs/** @andrewseguin -/src/e2e-app/test-util/** @andrewseguin -/src/e2e-app/toolbar/** @devversion -/src/e2e-app/virtual-scroll/** @mmalerba +/src/e2e-app/mdc-card/** @mmalerba +/src/e2e-app/mdc-checkbox/** @mmalerba +/src/e2e-app/mdc-chips/** @mmalerba +/src/e2e-app/mdc-dialog/** @devversion +/src/e2e-app/mdc-input/** @devversion +/src/e2e-app/mdc-menu/** @crisbeto +/src/e2e-app/mdc-progress-bar/** @crisbeto +/src/e2e-app/mdc-progress-spinner/** @mmalerba +/src/e2e-app/mdc-radio/** @mmalerba +/src/e2e-app/mdc-slider/** @andrewseguin +/src/e2e-app/mdc-slide-toggle/** @crisbeto +/src/e2e-app/mdc-tabs/** @crisbeto +/src/e2e-app/mdc-table/** @andrewseguin +/src/e2e-app/menu/** @crisbeto +/src/e2e-app/progress-bar/** @andrewseguin @crisbeto +/src/e2e-app/progress-spinner/** @andrewseguin @crisbeto +/src/e2e-app/radio/** @andrewseguin @devversion +/src/e2e-app/select/** @crisbeto +/src/e2e-app/sidenav/** @mmalerba +/src/e2e-app/slide-toggle/** @devversion +/src/e2e-app/stepper/** @mmalerba +/src/e2e-app/tabs/** @andrewseguin +/src/e2e-app/test-util/** @andrewseguin +/src/e2e-app/toolbar/** @devversion +/src/e2e-app/virtual-scroll/** @mmalerba # Universal app -/src/universal-app/** @devversion +/src/universal-app/** @devversion # Integration tests -/integration/** @andrewseguin @devversion +/integration/** @andrewseguin @devversion # Tooling -/.circleci/** @angular/dev-infra-components -/.yarn/** @angular/dev-infra-components -/scripts/** @angular/dev-infra-components -/test/** @angular/dev-infra-components -/tools/** @angular/dev-infra-components +/.circleci/** @angular/dev-infra-components +/.yarn/** @angular/dev-infra-components +/scripts/** @angular/dev-infra-components +/test/** @angular/dev-infra-components +/tools/** @angular/dev-infra-components # Public API golden files /tools/public_api_guard/cdk/a11y** @jelbourn @devversion @@ -333,7 +333,7 @@ /tools/public_api_guard/material/list** @andrewseguin @crisbeto @devversion /tools/public_api_guard/material/menu** @crisbeto /tools/public_api_guard/material/paginator** @andrewseguin -/tools/public_api_guard/material/progress-bar** @andrewseguin @crisbeto +/tools/public_api_guard/material/legacy-progress-bar** @andrewseguin @crisbeto /tools/public_api_guard/material/progress-spinner**@andrewseguin @crisbeto /tools/public_api_guard/material/radio** @andrewseguin @devversion /tools/public_api_guard/material/select** @crisbeto @@ -353,13 +353,13 @@ /tools/public_api_guard/youtube-player/** @andrewseguin # Misc -/.github/** @angular/dev-infra-components -/.husky/** @angular/dev-infra-components -/.github/CODEOWNERS @angular/dev-infra-components @andrewseguin @jelbourn -/.github/ISSUE_TEMPLATE/** @andrewseguin @jelbourn -/.vscode/** @angular/dev-infra-components @mmalerba -/.ng-dev/** @angular/dev-infra-components -/goldens/size-test.yml @andrewseguin @mmalerba @crisbeto -/goldens/** @angular/dev-infra-components -/src/* @angular/dev-infra-components -/* @angular/dev-infra-components +/.github/** @angular/dev-infra-components +/.husky/** @angular/dev-infra-components +/.github/CODEOWNERS @angular/dev-infra-components @andrewseguin @jelbourn +/.github/ISSUE_TEMPLATE/** @andrewseguin @jelbourn +/.vscode/** @angular/dev-infra-components @mmalerba +/.ng-dev/** @angular/dev-infra-components +/goldens/size-test.yml @andrewseguin @mmalerba @crisbeto +/goldens/** @angular/dev-infra-components +/src/* @angular/dev-infra-components +/* @angular/dev-infra-components diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mts index 7c1479a6359f..018551a216fd 100644 --- a/.ng-dev/commit-message.mts +++ b/.ng-dev/commit-message.mts @@ -91,7 +91,7 @@ export const commitMessage: CommitMessageConfig = { 'material/paginator', 'material/prebuilt-themes', 'material/legacy-prebuilt-themes', - 'material/progress-bar', + 'material/legacy-progress-bar', 'material/progress-spinner', 'material/radio', 'material/schematics', diff --git a/src/components-examples/material/card/BUILD.bazel b/src/components-examples/material/card/BUILD.bazel index 28af6994f6a9..2629b622dfc7 100644 --- a/src/components-examples/material/card/BUILD.bazel +++ b/src/components-examples/material/card/BUILD.bazel @@ -20,7 +20,7 @@ ng_module( "//src/material/divider", "//src/material/legacy-card", "//src/material/legacy-card/testing", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", "@npm//@angular/platform-browser", "@npm//@angular/platform-browser-dynamic", "@npm//@types/jasmine", diff --git a/src/components-examples/material/card/index.ts b/src/components-examples/material/card/index.ts index 17b1e8e8f404..977b92b38f24 100644 --- a/src/components-examples/material/card/index.ts +++ b/src/components-examples/material/card/index.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatLegacyCardModule} from '@angular/material/legacy-card'; import {MatDividerModule} from '@angular/material/divider'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {CardFancyExample} from './card-fancy/card-fancy-example'; import {CardOverviewExample} from './card-overview/card-overview-example'; import {CardHarnessExample} from './card-harness/card-harness-example'; diff --git a/src/components-examples/material/progress-bar/BUILD.bazel b/src/components-examples/material/progress-bar/BUILD.bazel index b3fa3320c21b..fd1bbf17635b 100644 --- a/src/components-examples/material/progress-bar/BUILD.bazel +++ b/src/components-examples/material/progress-bar/BUILD.bazel @@ -16,8 +16,8 @@ ng_module( "//src/cdk/testing", "//src/cdk/testing/testbed", "//src/material/legacy-card", - "//src/material/progress-bar", - "//src/material/progress-bar/testing", + "//src/material/legacy-progress-bar", + "//src/material/legacy-progress-bar/testing", "//src/material/radio", "//src/material/slider", "@npm//@angular/forms", @@ -43,8 +43,8 @@ ng_test_library( ":progress-bar", "//src/cdk/testing", "//src/cdk/testing/testbed", - "//src/material/progress-bar", - "//src/material/progress-bar/testing", + "//src/material/legacy-progress-bar", + "//src/material/legacy-progress-bar/testing", "@npm//@angular/platform-browser-dynamic", ], ) diff --git a/src/components-examples/material/progress-bar/index.ts b/src/components-examples/material/progress-bar/index.ts index 58b8486d05f2..7151b5028f1d 100644 --- a/src/components-examples/material/progress-bar/index.ts +++ b/src/components-examples/material/progress-bar/index.ts @@ -2,7 +2,7 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {MatLegacyCardModule} from '@angular/material/legacy-card'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatRadioModule} from '@angular/material/radio'; import {MatSliderModule} from '@angular/material/slider'; import {ProgressBarBufferExample} from './progress-bar-buffer/progress-bar-buffer-example'; diff --git a/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts b/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts index 3d46c32ecec3..5467715f93bc 100644 --- a/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts +++ b/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {ThemePalette} from '@angular/material/core'; -import {ProgressBarMode} from '@angular/material/progress-bar'; +import {ProgressBarMode} from '@angular/material/legacy-progress-bar'; /** * @title Configurable progress-bar diff --git a/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts b/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts index a932f940cb80..1f7d48e0180d 100644 --- a/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts +++ b/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts @@ -1,8 +1,8 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; -import {MatProgressBarHarness} from '@angular/material/progress-bar/testing'; +import {MatProgressBarHarness} from '@angular/material/legacy-progress-bar/testing'; import {HarnessLoader} from '@angular/cdk/testing'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {ProgressBarHarnessExample} from './progress-bar-harness-example'; describe('ProgressBarHarnessExample', () => { diff --git a/src/components-examples/material/tree/BUILD.bazel b/src/components-examples/material/tree/BUILD.bazel index 8ea4f4365480..e754b86d7758 100644 --- a/src/components-examples/material/tree/BUILD.bazel +++ b/src/components-examples/material/tree/BUILD.bazel @@ -19,7 +19,7 @@ ng_module( "//src/material/checkbox", "//src/material/icon", "//src/material/input", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", "//src/material/tree", "//src/material/tree/testing", "@npm//@angular/platform-browser", diff --git a/src/components-examples/material/tree/index.ts b/src/components-examples/material/tree/index.ts index c59986e74635..82969a84666f 100644 --- a/src/components-examples/material/tree/index.ts +++ b/src/components-examples/material/tree/index.ts @@ -4,7 +4,7 @@ import {MatButtonModule} from '@angular/material/button'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatTreeModule} from '@angular/material/tree'; import {TreeChecklistExample} from './tree-checklist/tree-checklist-example'; import {TreeDynamicExample} from './tree-dynamic/tree-dynamic-example'; diff --git a/src/dev-app/card/BUILD.bazel b/src/dev-app/card/BUILD.bazel index 034eac29a0af..ca5fcd850d18 100644 --- a/src/dev-app/card/BUILD.bazel +++ b/src/dev-app/card/BUILD.bazel @@ -13,7 +13,7 @@ ng_module( "//src/material/button", "//src/material/divider", "//src/material/legacy-card", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", ], ) diff --git a/src/dev-app/card/card-demo.ts b/src/dev-app/card/card-demo.ts index 0656a255e29b..6ce5856093df 100644 --- a/src/dev-app/card/card-demo.ts +++ b/src/dev-app/card/card-demo.ts @@ -10,7 +10,7 @@ import {Component} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatLegacyCardModule} from '@angular/material/legacy-card'; import {MatDividerModule} from '@angular/material/divider'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; @Component({ selector: 'card-demo', diff --git a/src/dev-app/progress-bar/BUILD.bazel b/src/dev-app/progress-bar/BUILD.bazel index 963c44c947a8..9c3a1e998c87 100644 --- a/src/dev-app/progress-bar/BUILD.bazel +++ b/src/dev-app/progress-bar/BUILD.bazel @@ -12,7 +12,7 @@ ng_module( deps = [ "//src/material/button", "//src/material/button-toggle", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", "@npm//@angular/forms", ], ) diff --git a/src/dev-app/progress-bar/progress-bar-demo.ts b/src/dev-app/progress-bar/progress-bar-demo.ts index 561f2016c6f1..0463bb19106a 100644 --- a/src/dev-app/progress-bar/progress-bar-demo.ts +++ b/src/dev-app/progress-bar/progress-bar-demo.ts @@ -11,7 +11,7 @@ import {ThemePalette} from '@angular/material/core'; import {FormsModule} from '@angular/forms'; import {MatButtonModule} from '@angular/material/button'; import {MatButtonToggleModule} from '@angular/material/button-toggle'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; // TODO(josephperrott): Add an automatically filling example progress bar. diff --git a/src/dev-app/tree/BUILD.bazel b/src/dev-app/tree/BUILD.bazel index ededda0a52b3..f216c7f1afee 100644 --- a/src/dev-app/tree/BUILD.bazel +++ b/src/dev-app/tree/BUILD.bazel @@ -20,7 +20,7 @@ ng_module( "//src/material/form-field", "//src/material/icon", "//src/material/input", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", "//src/material/tree", ], ) diff --git a/src/dev-app/tree/tree-demo.ts b/src/dev-app/tree/tree-demo.ts index 011775b11ca4..4c6312255e9f 100644 --- a/src/dev-app/tree/tree-demo.ts +++ b/src/dev-app/tree/tree-demo.ts @@ -17,7 +17,7 @@ import {MatExpansionModule} from '@angular/material/expansion'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatTreeModule} from '@angular/material/tree'; @Component({ diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index da0a16a77c98..24c5c93dca88 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -64,9 +64,9 @@ ng_module( "//src/material/grid-list", "//src/material/icon", "//src/material/input", + "//src/material/legacy-progress-bar", "//src/material/list", "//src/material/menu", - "//src/material/progress-bar", "//src/material/progress-spinner", "//src/material/radio", "//src/material/select", diff --git a/src/e2e-app/progress-bar/progress-bar-e2e-module.ts b/src/e2e-app/progress-bar/progress-bar-e2e-module.ts index 7ea219e068ba..8f361ec2eeea 100644 --- a/src/e2e-app/progress-bar/progress-bar-e2e-module.ts +++ b/src/e2e-app/progress-bar/progress-bar-e2e-module.ts @@ -7,7 +7,7 @@ */ import {NgModule} from '@angular/core'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {ProgressBarE2E} from './progress-bar-e2e'; @NgModule({ diff --git a/src/material-experimental/mdc-progress-bar/BUILD.bazel b/src/material-experimental/mdc-progress-bar/BUILD.bazel index 31a1b760c698..06e31ed78f81 100644 --- a/src/material-experimental/mdc-progress-bar/BUILD.bazel +++ b/src/material-experimental/mdc-progress-bar/BUILD.bazel @@ -22,7 +22,7 @@ ng_module( assets = [":progress_bar_scss"] + glob(["**/*.html"]), deps = [ "//src/material-experimental/mdc-core", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", "@npm//@angular/core", ], ) diff --git a/src/material-experimental/mdc-progress-bar/README.md b/src/material-experimental/mdc-progress-bar/README.md index 2fa41969f958..8f9d949bdfa2 100644 --- a/src/material-experimental/mdc-progress-bar/README.md +++ b/src/material-experimental/mdc-progress-bar/README.md @@ -77,8 +77,8 @@ following string replace across your TypeScript files: ```bash grep -lr --include="*.ts" --exclude-dir="node_modules" \ - --exclude="*.d.ts" "['\"]@angular/material/progress-bar['\"]" | xargs sed -i \ - "s/['\"]@angular\/material\/progress-bar['\"]/'@angular\/material-experimental\/mdc-progress-bar'/g" + --exclude="*.d.ts" "['\"]@angular/material/legacy-progress-bar['\"]" | xargs sed -i \ + "s/['\"]@angular\/material\/legacy-progress-bar['\"]/'@angular\/material-experimental\/mdc-progress-bar'/g" ``` CSS styles and tests that depend on implementation details of mat-progress-bar (such as getting diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.ts b/src/material-experimental/mdc-progress-bar/progress-bar.ts index 09d80c96a3c5..c40af895d421 100644 --- a/src/material-experimental/mdc-progress-bar/progress-bar.ts +++ b/src/material-experimental/mdc-progress-bar/progress-bar.ts @@ -27,7 +27,7 @@ import { MatProgressBarDefaultOptions, MAT_PROGRESS_BAR_DEFAULT_OPTIONS, ProgressAnimationEnd, -} from '@angular/material/progress-bar'; +} from '@angular/material/legacy-progress-bar'; // Boilerplate for applying mixins to MatProgressBar. /** @docs-private */ diff --git a/src/material-experimental/mdc-progress-bar/public-api.ts b/src/material-experimental/mdc-progress-bar/public-api.ts index 4150947f5629..f2aaef825bab 100644 --- a/src/material-experimental/mdc-progress-bar/public-api.ts +++ b/src/material-experimental/mdc-progress-bar/public-api.ts @@ -16,4 +16,4 @@ export { MAT_PROGRESS_BAR_LOCATION_FACTORY, MAT_PROGRESS_BAR_DEFAULT_OPTIONS, MatProgressBarDefaultOptions, -} from '@angular/material/progress-bar'; +} from '@angular/material/legacy-progress-bar'; diff --git a/src/material-experimental/mdc-progress-bar/testing/BUILD.bazel b/src/material-experimental/mdc-progress-bar/testing/BUILD.bazel index e5f3dfddc48a..aaaa4b925bf4 100644 --- a/src/material-experimental/mdc-progress-bar/testing/BUILD.bazel +++ b/src/material-experimental/mdc-progress-bar/testing/BUILD.bazel @@ -11,7 +11,7 @@ ng_module( deps = [ "//src/cdk/coercion", "//src/cdk/testing", - "//src/material/progress-bar/testing", + "//src/material/legacy-progress-bar/testing", ], ) @@ -21,7 +21,7 @@ ng_test_library( deps = [ ":testing", "//src/material-experimental/mdc-progress-bar", - "//src/material/progress-bar/testing:harness_tests_lib", + "//src/material/legacy-progress-bar/testing:harness_tests_lib", ], ) diff --git a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.spec.ts b/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.spec.ts index bf21c43b6878..486eb6146bdc 100644 --- a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.spec.ts +++ b/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.spec.ts @@ -1,6 +1,6 @@ import {MatProgressBarModule} from '../index'; import {MatProgressBarHarness} from './progress-bar-harness'; -import {runHarnessTests} from '@angular/material/progress-bar/testing/shared.spec'; +import {runHarnessTests} from '@angular/material/legacy-progress-bar/testing/shared.spec'; describe('MDC-based MatProgressBarHarness', () => { runHarnessTests(MatProgressBarModule, MatProgressBarHarness as any); diff --git a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts b/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts index b904c0e2ad14..7e4ab3b2d6b1 100644 --- a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts +++ b/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts @@ -12,7 +12,7 @@ import { ComponentHarnessConstructor, HarnessPredicate, } from '@angular/cdk/testing'; -import {ProgressBarHarnessFilters} from '@angular/material/progress-bar/testing'; +import {ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing'; /** Harness for interacting with an MDC-based `mat-progress-bar` in tests. */ export class MatProgressBarHarness extends ComponentHarness { diff --git a/src/material-experimental/mdc-progress-bar/testing/public-api.ts b/src/material-experimental/mdc-progress-bar/testing/public-api.ts index 2b714133ac5e..95ed3ff719e3 100644 --- a/src/material-experimental/mdc-progress-bar/testing/public-api.ts +++ b/src/material-experimental/mdc-progress-bar/testing/public-api.ts @@ -7,4 +7,4 @@ */ export * from './progress-bar-harness'; -export {ProgressBarHarnessFilters} from '@angular/material/progress-bar/testing'; +export {ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing'; diff --git a/src/material/_index.scss b/src/material/_index.scss index 26eb7d42a927..491d522c9f5a 100644 --- a/src/material/_index.scss +++ b/src/material/_index.scss @@ -92,7 +92,7 @@ @forward './menu/menu-theme' as menu-* show menu-theme, menu-color, menu-typography; @forward './paginator/paginator-theme' as paginator-* show paginator-theme, paginator-color, paginator-typography; -@forward './progress-bar/progress-bar-theme' as progress-bar-* show progress-bar-theme, +@forward './legacy-progress-bar/progress-bar-theme' as progress-bar-* show progress-bar-theme, progress-bar-color, progress-bar-typography; @forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show progress-spinner-theme, progress-spinner-color, progress-spinner-typography; diff --git a/src/material/_theming.scss b/src/material/_theming.scss index 72a1bd6fd1f3..c0073d03bae0 100644 --- a/src/material/_theming.scss +++ b/src/material/_theming.scss @@ -26,7 +26,7 @@ @forward './list/list-legacy-index'; @forward './menu/menu-legacy-index'; @forward './paginator/paginator-legacy-index'; -@forward './progress-bar/progress-bar-legacy-index'; +@forward './legacy-progress-bar/progress-bar-legacy-index'; @forward './progress-spinner/progress-spinner-legacy-index'; @forward './radio/radio-legacy-index'; @forward './select/select-legacy-index'; diff --git a/src/material/config.bzl b/src/material/config.bzl index 57162646e9af..19455216187f 100644 --- a/src/material/config.bzl +++ b/src/material/config.bzl @@ -40,8 +40,8 @@ entryPoints = [ "menu/testing", "paginator", "paginator/testing", - "progress-bar", - "progress-bar/testing", + "legacy-progress-bar", + "legacy-progress-bar/testing", "progress-spinner", "progress-spinner/testing", "radio", diff --git a/src/material/core/_core.import.scss b/src/material/core/_core.import.scss index b0b533121baf..08cb87d93825 100644 --- a/src/material/core/_core.import.scss +++ b/src/material/core/_core.import.scss @@ -31,7 +31,7 @@ @forward '../icon/icon-theme.import'; @forward '../input/input-theme.import'; @forward '../menu/menu-theme.import'; -@forward '../progress-bar/progress-bar-theme.import'; +@forward '../legacy-progress-bar/progress-bar-theme.import'; @forward '../progress-spinner/progress-spinner-theme.import'; @forward '../radio/radio-theme.import'; @forward '../select/select-theme.import'; diff --git a/src/material/core/color/_all-color.import.scss b/src/material/core/color/_all-color.import.scss index 3a2579da41f9..839e4a28f94f 100644 --- a/src/material/core/color/_all-color.import.scss +++ b/src/material/core/color/_all-color.import.scss @@ -32,7 +32,7 @@ @forward '../../icon/icon-theme.import'; @forward '../../input/input-theme.import'; @forward '../../menu/menu-theme.import'; -@forward '../../progress-bar/progress-bar-theme.import'; +@forward '../../legacy-progress-bar/progress-bar-theme.import'; @forward '../../progress-spinner/progress-spinner-theme.import'; @forward '../../radio/radio-theme.import'; @forward '../../select/select-theme.import'; diff --git a/src/material/core/theming/_all-theme.import.scss b/src/material/core/theming/_all-theme.import.scss index bbf7e7f93643..a2ea7162b610 100644 --- a/src/material/core/theming/_all-theme.import.scss +++ b/src/material/core/theming/_all-theme.import.scss @@ -32,7 +32,7 @@ @forward '../../icon/icon-theme.import'; @forward '../../input/input-theme.import'; @forward '../../menu/menu-theme.import'; -@forward '../../progress-bar/progress-bar-theme.import'; +@forward '../../legacy-progress-bar/progress-bar-theme.import'; @forward '../../progress-spinner/progress-spinner-theme.import'; @forward '../../radio/radio-theme.import'; @forward '../../select/select-theme.import'; @@ -68,7 +68,7 @@ @import '../../list/list-theme'; @import '../../menu/menu-theme'; @import '../../paginator/paginator-theme'; -@import '../../progress-bar/progress-bar-theme'; +@import '../../legacy-progress-bar/progress-bar-theme'; @import '../../progress-spinner/progress-spinner-theme'; @import '../../radio/radio-theme'; @import '../../select/select-theme'; diff --git a/src/material/core/theming/_all-theme.scss b/src/material/core/theming/_all-theme.scss index 4119252cd5ea..06f5f54fd443 100644 --- a/src/material/core/theming/_all-theme.scss +++ b/src/material/core/theming/_all-theme.scss @@ -19,7 +19,7 @@ @use '../../list/list-theme'; @use '../../menu/menu-theme'; @use '../../paginator/paginator-theme'; -@use '../../progress-bar/progress-bar-theme'; +@use '../../legacy-progress-bar/progress-bar-theme'; @use '../../progress-spinner/progress-spinner-theme'; @use '../../radio/radio-theme'; @use '../../select/select-theme'; diff --git a/src/material/core/theming/tests/test-css-variables-theme.scss b/src/material/core/theming/tests/test-css-variables-theme.scss index b811a0f10e29..0d9b99b22c48 100644 --- a/src/material/core/theming/tests/test-css-variables-theme.scss +++ b/src/material/core/theming/tests/test-css-variables-theme.scss @@ -22,7 +22,7 @@ @use '../../../list/list-theme'; @use '../../../menu/menu-theme'; @use '../../../paginator/paginator-theme'; -@use '../../../progress-bar/progress-bar-theme'; +@use '../../../legacy-progress-bar/progress-bar-theme'; @use '../../../progress-spinner/progress-spinner-theme'; @use '../../../radio/radio-theme'; @use '../../../select/select-theme'; diff --git a/src/material/core/typography/_all-typography.import.scss b/src/material/core/typography/_all-typography.import.scss index 0a2350eecd00..36b335b5736a 100644 --- a/src/material/core/typography/_all-typography.import.scss +++ b/src/material/core/typography/_all-typography.import.scss @@ -24,7 +24,7 @@ @forward '../../icon/icon-theme.import'; @forward '../../input/input-theme.import'; @forward '../../menu/menu-theme.import'; -@forward '../../progress-bar/progress-bar-theme.import'; +@forward '../../legacy-progress-bar/progress-bar-theme.import'; @forward '../../progress-spinner/progress-spinner-theme.import'; @forward '../../radio/radio-theme.import'; @forward '../../select/select-theme.import'; @@ -57,7 +57,7 @@ @import '../../list/list-theme'; @import '../../menu/menu-theme'; @import '../../paginator/paginator-theme'; -@import '../../progress-bar/progress-bar-theme'; +@import '../../legacy-progress-bar/progress-bar-theme'; @import '../../progress-spinner/progress-spinner-theme'; @import '../../radio/radio-theme'; @import '../../select/select-theme'; diff --git a/src/material/core/typography/_all-typography.scss b/src/material/core/typography/_all-typography.scss index b4082906baee..cd6374f6c377 100644 --- a/src/material/core/typography/_all-typography.scss +++ b/src/material/core/typography/_all-typography.scss @@ -18,7 +18,7 @@ @use '../../list/list-theme'; @use '../../menu/menu-theme'; @use '../../paginator/paginator-theme'; -@use '../../progress-bar/progress-bar-theme'; +@use '../../legacy-progress-bar/progress-bar-theme'; @use '../../progress-spinner/progress-spinner-theme'; @use '../../radio/radio-theme'; @use '../../select/select-theme'; diff --git a/src/material/progress-bar/BUILD.bazel b/src/material/legacy-progress-bar/BUILD.bazel similarity index 93% rename from src/material/progress-bar/BUILD.bazel rename to src/material/legacy-progress-bar/BUILD.bazel index ab89ddc04aed..1e623c0bf749 100644 --- a/src/material/progress-bar/BUILD.bazel +++ b/src/material/legacy-progress-bar/BUILD.bazel @@ -13,7 +13,7 @@ load( package(default_visibility = ["//visibility:public"]) ng_module( - name = "progress-bar", + name = "legacy-progress-bar", srcs = glob( ["**/*.ts"], exclude = ["**/*.spec.ts"], @@ -30,7 +30,7 @@ ng_module( ) sass_library( - name = "progress_bar_scss_lib", + name = "legacy_progress_bar_scss_lib", srcs = glob(["**/_*.scss"]), deps = ["//src/material/core:core_scss_lib"], ) @@ -51,7 +51,7 @@ ng_test_library( exclude = ["**/*.e2e.spec.ts"], ), deps = [ - ":progress-bar", + ":legacy-progress-bar", "//src/cdk/testing/private", "@npm//@angular/platform-browser", ], diff --git a/src/material/progress-bar/README.md b/src/material/legacy-progress-bar/README.md similarity index 100% rename from src/material/progress-bar/README.md rename to src/material/legacy-progress-bar/README.md diff --git a/src/material/progress-bar/_progress-bar-legacy-index.scss b/src/material/legacy-progress-bar/_progress-bar-legacy-index.scss similarity index 100% rename from src/material/progress-bar/_progress-bar-legacy-index.scss rename to src/material/legacy-progress-bar/_progress-bar-legacy-index.scss diff --git a/src/material/progress-bar/_progress-bar-theme.import.scss b/src/material/legacy-progress-bar/_progress-bar-theme.import.scss similarity index 100% rename from src/material/progress-bar/_progress-bar-theme.import.scss rename to src/material/legacy-progress-bar/_progress-bar-theme.import.scss diff --git a/src/material/progress-bar/_progress-bar-theme.scss b/src/material/legacy-progress-bar/_progress-bar-theme.scss similarity index 98% rename from src/material/progress-bar/_progress-bar-theme.scss rename to src/material/legacy-progress-bar/_progress-bar-theme.scss index 356ff8639a10..5a80ff36644d 100644 --- a/src/material/progress-bar/_progress-bar-theme.scss +++ b/src/material/legacy-progress-bar/_progress-bar-theme.scss @@ -68,7 +68,7 @@ @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-progress-bar') { + @include theming.private-check-duplicate-theme-styles($theme, 'mat-legacy-progress-bar') { $color: theming.get-color-config($theme); $density: theming.get-density-config($theme); $typography: theming.get-typography-config($theme); diff --git a/src/material/progress-bar/index.ts b/src/material/legacy-progress-bar/index.ts similarity index 100% rename from src/material/progress-bar/index.ts rename to src/material/legacy-progress-bar/index.ts diff --git a/src/material/progress-bar/progress-bar-module.ts b/src/material/legacy-progress-bar/progress-bar-module.ts similarity index 100% rename from src/material/progress-bar/progress-bar-module.ts rename to src/material/legacy-progress-bar/progress-bar-module.ts diff --git a/src/material/progress-bar/progress-bar.e2e.spec.ts b/src/material/legacy-progress-bar/progress-bar.e2e.spec.ts similarity index 100% rename from src/material/progress-bar/progress-bar.e2e.spec.ts rename to src/material/legacy-progress-bar/progress-bar.e2e.spec.ts diff --git a/src/material/progress-bar/progress-bar.html b/src/material/legacy-progress-bar/progress-bar.html similarity index 100% rename from src/material/progress-bar/progress-bar.html rename to src/material/legacy-progress-bar/progress-bar.html diff --git a/src/material/progress-bar/progress-bar.md b/src/material/legacy-progress-bar/progress-bar.md similarity index 100% rename from src/material/progress-bar/progress-bar.md rename to src/material/legacy-progress-bar/progress-bar.md diff --git a/src/material/progress-bar/progress-bar.scss b/src/material/legacy-progress-bar/progress-bar.scss similarity index 100% rename from src/material/progress-bar/progress-bar.scss rename to src/material/legacy-progress-bar/progress-bar.scss diff --git a/src/material/progress-bar/progress-bar.spec.ts b/src/material/legacy-progress-bar/progress-bar.spec.ts similarity index 100% rename from src/material/progress-bar/progress-bar.spec.ts rename to src/material/legacy-progress-bar/progress-bar.spec.ts diff --git a/src/material/progress-bar/progress-bar.ts b/src/material/legacy-progress-bar/progress-bar.ts similarity index 100% rename from src/material/progress-bar/progress-bar.ts rename to src/material/legacy-progress-bar/progress-bar.ts diff --git a/src/material/progress-bar/public-api.ts b/src/material/legacy-progress-bar/public-api.ts similarity index 100% rename from src/material/progress-bar/public-api.ts rename to src/material/legacy-progress-bar/public-api.ts diff --git a/src/material/progress-bar/testing/BUILD.bazel b/src/material/legacy-progress-bar/testing/BUILD.bazel similarity index 90% rename from src/material/progress-bar/testing/BUILD.bazel rename to src/material/legacy-progress-bar/testing/BUILD.bazel index 52bc200f4cf0..0dc622c61b7b 100644 --- a/src/material/progress-bar/testing/BUILD.bazel +++ b/src/material/legacy-progress-bar/testing/BUILD.bazel @@ -26,7 +26,7 @@ ng_test_library( ":testing", "//src/cdk/testing", "//src/cdk/testing/testbed", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", "@npm//@angular/platform-browser", ], ) @@ -40,7 +40,7 @@ ng_test_library( deps = [ ":harness_tests_lib", ":testing", - "//src/material/progress-bar", + "//src/material/legacy-progress-bar", ], ) diff --git a/src/material/progress-bar/testing/index.ts b/src/material/legacy-progress-bar/testing/index.ts similarity index 100% rename from src/material/progress-bar/testing/index.ts rename to src/material/legacy-progress-bar/testing/index.ts diff --git a/src/material/progress-bar/testing/progress-bar-harness-filters.ts b/src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts similarity index 100% rename from src/material/progress-bar/testing/progress-bar-harness-filters.ts rename to src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts diff --git a/src/material/progress-bar/testing/progress-bar-harness.spec.ts b/src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts similarity index 50% rename from src/material/progress-bar/testing/progress-bar-harness.spec.ts rename to src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts index 0d78fb97073b..321104094d3d 100644 --- a/src/material/progress-bar/testing/progress-bar-harness.spec.ts +++ b/src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts @@ -1,5 +1,5 @@ -import {MatProgressBarModule} from '@angular/material/progress-bar'; -import {runHarnessTests} from '@angular/material/progress-bar/testing/shared.spec'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {runHarnessTests} from '@angular/material/legacy-progress-bar/testing/shared.spec'; import {MatProgressBarHarness} from './progress-bar-harness'; describe('MatProgressBarHarness', () => { diff --git a/src/material/progress-bar/testing/progress-bar-harness.ts b/src/material/legacy-progress-bar/testing/progress-bar-harness.ts similarity index 100% rename from src/material/progress-bar/testing/progress-bar-harness.ts rename to src/material/legacy-progress-bar/testing/progress-bar-harness.ts diff --git a/src/material/progress-bar/testing/public-api.ts b/src/material/legacy-progress-bar/testing/public-api.ts similarity index 100% rename from src/material/progress-bar/testing/public-api.ts rename to src/material/legacy-progress-bar/testing/public-api.ts diff --git a/src/material/progress-bar/testing/shared.spec.ts b/src/material/legacy-progress-bar/testing/shared.spec.ts similarity index 96% rename from src/material/progress-bar/testing/shared.spec.ts rename to src/material/legacy-progress-bar/testing/shared.spec.ts index 052285d503bc..fb3b5a5c127b 100644 --- a/src/material/progress-bar/testing/shared.spec.ts +++ b/src/material/legacy-progress-bar/testing/shared.spec.ts @@ -2,7 +2,7 @@ import {HarnessLoader} from '@angular/cdk/testing'; import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatProgressBarHarness} from './progress-bar-harness'; export function runHarnessTests( diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts index 2867cb8fded3..7ecb1d10f636 100644 --- a/src/universal-app/kitchen-sink/kitchen-sink.ts +++ b/src/universal-app/kitchen-sink/kitchen-sink.ts @@ -20,7 +20,7 @@ import {MatInputModule} from '@angular/material/input'; import {MatListModule} from '@angular/material/list'; import {MatMenuModule} from '@angular/material/menu'; import {MatPaginatorModule} from '@angular/material/paginator'; -import {MatProgressBarModule} from '@angular/material/progress-bar'; +import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatRadioModule} from '@angular/material/radio'; import {MatSelectModule} from '@angular/material/select'; diff --git a/tools/public_api_guard/material/progress-bar-testing.md b/tools/public_api_guard/material/legacy-progress-bar-testing.md similarity index 100% rename from tools/public_api_guard/material/progress-bar-testing.md rename to tools/public_api_guard/material/legacy-progress-bar-testing.md diff --git a/tools/public_api_guard/material/progress-bar.md b/tools/public_api_guard/material/legacy-progress-bar.md similarity index 100% rename from tools/public_api_guard/material/progress-bar.md rename to tools/public_api_guard/material/legacy-progress-bar.md From 926e52b8f7f8360a9f096147e7a93abe2de254fc Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Thu, 7 Jul 2022 10:00:49 -0700 Subject: [PATCH 2/5] feat(material/legacy-progress-bar): step 2. rename ts symbols --- .../material/card/index.ts | 4 +- .../material/progress-bar/index.ts | 4 +- .../progress-bar-configurable-example.ts | 4 +- .../progress-bar-harness-example.spec.ts | 12 ++--- .../material/tree/index.ts | 4 +- src/dev-app/card/card-demo.ts | 4 +- src/dev-app/progress-bar/progress-bar-demo.ts | 4 +- src/dev-app/tree/tree-demo.ts | 4 +- .../progress-bar/progress-bar-e2e-module.ts | 4 +- .../mdc-progress-bar/progress-bar.ts | 12 ++--- .../mdc-progress-bar/public-api.ts | 12 ++--- .../testing/progress-bar-harness.ts | 4 +- .../mdc-progress-bar/testing/public-api.ts | 2 +- .../progress-bar-module.ts | 8 +-- .../legacy-progress-bar/progress-bar.spec.ts | 14 +++--- .../legacy-progress-bar/progress-bar.ts | 33 ++++++------ .../testing/progress-bar-harness-filters.ts | 2 +- .../testing/progress-bar-harness.spec.ts | 6 +-- .../testing/progress-bar-harness.ts | 10 ++-- .../testing/shared.spec.ts | 8 +-- .../kitchen-sink/kitchen-sink.ts | 4 +- .../material/legacy-progress-bar-testing.md | 12 ++--- .../material/legacy-progress-bar.md | 50 +++++++++---------- 23 files changed, 111 insertions(+), 110 deletions(-) diff --git a/src/components-examples/material/card/index.ts b/src/components-examples/material/card/index.ts index 977b92b38f24..6301affbe18e 100644 --- a/src/components-examples/material/card/index.ts +++ b/src/components-examples/material/card/index.ts @@ -2,7 +2,7 @@ import {NgModule} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatLegacyCardModule} from '@angular/material/legacy-card'; import {MatDividerModule} from '@angular/material/divider'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {CardFancyExample} from './card-fancy/card-fancy-example'; import {CardOverviewExample} from './card-overview/card-overview-example'; import {CardHarnessExample} from './card-harness/card-harness-example'; @@ -32,7 +32,7 @@ const EXAMPLES = [ ]; @NgModule({ - imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatProgressBarModule], + imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatLegacyProgressBarModule], declarations: EXAMPLES, exports: EXAMPLES, }) diff --git a/src/components-examples/material/progress-bar/index.ts b/src/components-examples/material/progress-bar/index.ts index 7151b5028f1d..2343e307b68e 100644 --- a/src/components-examples/material/progress-bar/index.ts +++ b/src/components-examples/material/progress-bar/index.ts @@ -2,7 +2,7 @@ import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {FormsModule} from '@angular/forms'; import {MatLegacyCardModule} from '@angular/material/legacy-card'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatRadioModule} from '@angular/material/radio'; import {MatSliderModule} from '@angular/material/slider'; import {ProgressBarBufferExample} from './progress-bar-buffer/progress-bar-buffer-example'; @@ -34,7 +34,7 @@ const EXAMPLES = [ imports: [ CommonModule, MatLegacyCardModule, - MatProgressBarModule, + MatLegacyProgressBarModule, MatRadioModule, MatSliderModule, FormsModule, diff --git a/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts b/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts index 5467715f93bc..700573f72380 100644 --- a/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts +++ b/src/components-examples/material/progress-bar/progress-bar-configurable/progress-bar-configurable-example.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {ThemePalette} from '@angular/material/core'; -import {ProgressBarMode} from '@angular/material/legacy-progress-bar'; +import {LegacyProgressBarMode} from '@angular/material/legacy-progress-bar'; /** * @title Configurable progress-bar @@ -12,7 +12,7 @@ import {ProgressBarMode} from '@angular/material/legacy-progress-bar'; }) export class ProgressBarConfigurableExample { color: ThemePalette = 'primary'; - mode: ProgressBarMode = 'determinate'; + mode: LegacyProgressBarMode = 'determinate'; value = 50; bufferValue = 75; } diff --git a/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts b/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts index 1f7d48e0180d..6ab5c8657037 100644 --- a/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts +++ b/src/components-examples/material/progress-bar/progress-bar-harness/progress-bar-harness-example.spec.ts @@ -1,8 +1,8 @@ import {ComponentFixture, TestBed} from '@angular/core/testing'; import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; -import {MatProgressBarHarness} from '@angular/material/legacy-progress-bar/testing'; +import {MatLegacyProgressBarHarness} from '@angular/material/legacy-progress-bar/testing'; import {HarnessLoader} from '@angular/cdk/testing'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {ProgressBarHarnessExample} from './progress-bar-harness-example'; describe('ProgressBarHarnessExample', () => { @@ -11,7 +11,7 @@ describe('ProgressBarHarnessExample', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - imports: [MatProgressBarModule], + imports: [MatLegacyProgressBarModule], declarations: [ProgressBarHarnessExample], }).compileComponents(); fixture = TestBed.createComponent(ProgressBarHarnessExample); @@ -20,19 +20,19 @@ describe('ProgressBarHarnessExample', () => { }); it('should load all progress bar harnesses', async () => { - const progressBars = await loader.getAllHarnesses(MatProgressBarHarness); + const progressBars = await loader.getAllHarnesses(MatLegacyProgressBarHarness); expect(progressBars.length).toBe(2); }); it('should get the value', async () => { fixture.componentInstance.value = 50; - const [determinate, indeterminate] = await loader.getAllHarnesses(MatProgressBarHarness); + const [determinate, indeterminate] = await loader.getAllHarnesses(MatLegacyProgressBarHarness); expect(await determinate.getValue()).toBe(50); expect(await indeterminate.getValue()).toBe(null); }); it('should get the mode', async () => { - const [determinate, indeterminate] = await loader.getAllHarnesses(MatProgressBarHarness); + const [determinate, indeterminate] = await loader.getAllHarnesses(MatLegacyProgressBarHarness); expect(await determinate.getMode()).toBe('determinate'); expect(await indeterminate.getMode()).toBe('indeterminate'); }); diff --git a/src/components-examples/material/tree/index.ts b/src/components-examples/material/tree/index.ts index 82969a84666f..b16c64c21420 100644 --- a/src/components-examples/material/tree/index.ts +++ b/src/components-examples/material/tree/index.ts @@ -4,7 +4,7 @@ import {MatButtonModule} from '@angular/material/button'; import {MatCheckboxModule} from '@angular/material/checkbox'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatTreeModule} from '@angular/material/tree'; import {TreeChecklistExample} from './tree-checklist/tree-checklist-example'; import {TreeDynamicExample} from './tree-dynamic/tree-dynamic-example'; @@ -38,7 +38,7 @@ const EXAMPLES = [ MatCheckboxModule, MatIconModule, MatInputModule, - MatProgressBarModule, + MatLegacyProgressBarModule, MatTreeModule, ], declarations: EXAMPLES, diff --git a/src/dev-app/card/card-demo.ts b/src/dev-app/card/card-demo.ts index 6ce5856093df..fb85c3b6fbd7 100644 --- a/src/dev-app/card/card-demo.ts +++ b/src/dev-app/card/card-demo.ts @@ -10,14 +10,14 @@ import {Component} from '@angular/core'; import {MatButtonModule} from '@angular/material/button'; import {MatLegacyCardModule} from '@angular/material/legacy-card'; import {MatDividerModule} from '@angular/material/divider'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; @Component({ selector: 'card-demo', templateUrl: 'card-demo.html', styleUrls: ['card-demo.css'], standalone: true, - imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatProgressBarModule], + imports: [MatButtonModule, MatLegacyCardModule, MatDividerModule, MatLegacyProgressBarModule], }) export class CardDemo { longText = diff --git a/src/dev-app/progress-bar/progress-bar-demo.ts b/src/dev-app/progress-bar/progress-bar-demo.ts index 0463bb19106a..46e2cd3cc81d 100644 --- a/src/dev-app/progress-bar/progress-bar-demo.ts +++ b/src/dev-app/progress-bar/progress-bar-demo.ts @@ -11,7 +11,7 @@ import {ThemePalette} from '@angular/material/core'; import {FormsModule} from '@angular/forms'; import {MatButtonModule} from '@angular/material/button'; import {MatButtonToggleModule} from '@angular/material/button-toggle'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; // TODO(josephperrott): Add an automatically filling example progress bar. @@ -20,7 +20,7 @@ import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; templateUrl: 'progress-bar-demo.html', styleUrls: ['progress-bar-demo.css'], standalone: true, - imports: [FormsModule, MatButtonModule, MatButtonToggleModule, MatProgressBarModule], + imports: [FormsModule, MatButtonModule, MatButtonToggleModule, MatLegacyProgressBarModule], }) export class ProgressBarDemo { color: ThemePalette = 'primary'; diff --git a/src/dev-app/tree/tree-demo.ts b/src/dev-app/tree/tree-demo.ts index 4c6312255e9f..0491b7dc3afd 100644 --- a/src/dev-app/tree/tree-demo.ts +++ b/src/dev-app/tree/tree-demo.ts @@ -17,7 +17,7 @@ import {MatExpansionModule} from '@angular/material/expansion'; import {MatFormFieldModule} from '@angular/material/form-field'; import {MatIconModule} from '@angular/material/icon'; import {MatInputModule} from '@angular/material/input'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatTreeModule} from '@angular/material/tree'; @Component({ @@ -38,7 +38,7 @@ import {MatTreeModule} from '@angular/material/tree'; MatIconModule, MatInputModule, MatTreeModule, - MatProgressBarModule, + MatLegacyProgressBarModule, ], }) export class TreeDemo {} diff --git a/src/e2e-app/progress-bar/progress-bar-e2e-module.ts b/src/e2e-app/progress-bar/progress-bar-e2e-module.ts index 8f361ec2eeea..a8e32ec53c1d 100644 --- a/src/e2e-app/progress-bar/progress-bar-e2e-module.ts +++ b/src/e2e-app/progress-bar/progress-bar-e2e-module.ts @@ -7,11 +7,11 @@ */ import {NgModule} from '@angular/core'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {ProgressBarE2E} from './progress-bar-e2e'; @NgModule({ - imports: [MatProgressBarModule], + imports: [MatLegacyProgressBarModule], declarations: [ProgressBarE2E], }) export class ProgressBarE2eModule {} diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.ts b/src/material-experimental/mdc-progress-bar/progress-bar.ts index c40af895d421..b0dc3d40ae18 100644 --- a/src/material-experimental/mdc-progress-bar/progress-bar.ts +++ b/src/material-experimental/mdc-progress-bar/progress-bar.ts @@ -24,9 +24,9 @@ import { import {CanColor, mixinColor} from '@angular/material-experimental/mdc-core'; import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations'; import { - MatProgressBarDefaultOptions, - MAT_PROGRESS_BAR_DEFAULT_OPTIONS, - ProgressAnimationEnd, + MatLegacyProgressBarDefaultOptions, + MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS, + LegacyProgressAnimationEnd, } from '@angular/material/legacy-progress-bar'; // Boilerplate for applying mixins to MatProgressBar. @@ -73,8 +73,8 @@ export class MatProgressBar private _changeDetectorRef: ChangeDetectorRef, @Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string, @Optional() - @Inject(MAT_PROGRESS_BAR_DEFAULT_OPTIONS) - defaults?: MatProgressBarDefaultOptions, + @Inject(MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS) + defaults?: MatLegacyProgressBarDefaultOptions, ) { super(elementRef); this._isNoopAnimation = _animationMode === 'NoopAnimations'; @@ -118,7 +118,7 @@ export class MatProgressBar * be emitted when animations are disabled, nor will it be emitted for modes with continuous * animations (indeterminate and query). */ - @Output() readonly animationEnd = new EventEmitter(); + @Output() readonly animationEnd = new EventEmitter(); /** * Mode of the progress bar. diff --git a/src/material-experimental/mdc-progress-bar/public-api.ts b/src/material-experimental/mdc-progress-bar/public-api.ts index f2aaef825bab..21f455c4c535 100644 --- a/src/material-experimental/mdc-progress-bar/public-api.ts +++ b/src/material-experimental/mdc-progress-bar/public-api.ts @@ -10,10 +10,10 @@ export * from './progress-bar'; export * from './module'; export { - ProgressAnimationEnd, - MAT_PROGRESS_BAR_LOCATION, - MatProgressBarLocation, - MAT_PROGRESS_BAR_LOCATION_FACTORY, - MAT_PROGRESS_BAR_DEFAULT_OPTIONS, - MatProgressBarDefaultOptions, + LegacyProgressAnimationEnd as ProgressAnimationEnd, + MAT_LEGACY_PROGRESS_BAR_LOCATION as MAT_PROGRESS_BAR_LOCATION, + MatLegacyProgressBarLocation as MatProgressBarLocation, + MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY as MAT_PROGRESS_BAR_LOCATION_FACTORY, + MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS as MAT_PROGRESS_BAR_DEFAULT_OPTIONS, + MatLegacyProgressBarDefaultOptions as MatProgressBarDefaultOptions, } from '@angular/material/legacy-progress-bar'; diff --git a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts b/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts index 7e4ab3b2d6b1..ebb8a7885242 100644 --- a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts +++ b/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts @@ -12,7 +12,7 @@ import { ComponentHarnessConstructor, HarnessPredicate, } from '@angular/cdk/testing'; -import {ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing'; +import {LegacyProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing'; /** Harness for interacting with an MDC-based `mat-progress-bar` in tests. */ export class MatProgressBarHarness extends ComponentHarness { @@ -26,7 +26,7 @@ export class MatProgressBarHarness extends ComponentHarness { */ static with( this: ComponentHarnessConstructor, - options: ProgressBarHarnessFilters = {}, + options: LegacyProgressBarHarnessFilters = {}, ): HarnessPredicate { return new HarnessPredicate(this, options); } diff --git a/src/material-experimental/mdc-progress-bar/testing/public-api.ts b/src/material-experimental/mdc-progress-bar/testing/public-api.ts index 95ed3ff719e3..1327e3894d13 100644 --- a/src/material-experimental/mdc-progress-bar/testing/public-api.ts +++ b/src/material-experimental/mdc-progress-bar/testing/public-api.ts @@ -7,4 +7,4 @@ */ export * from './progress-bar-harness'; -export {ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing'; +export {LegacyProgressBarHarnessFilters as ProgressBarHarnessFilters} from '@angular/material/legacy-progress-bar/testing'; diff --git a/src/material/legacy-progress-bar/progress-bar-module.ts b/src/material/legacy-progress-bar/progress-bar-module.ts index 9b9461cd7a29..7801bf1a7d24 100644 --- a/src/material/legacy-progress-bar/progress-bar-module.ts +++ b/src/material/legacy-progress-bar/progress-bar-module.ts @@ -9,11 +9,11 @@ import {NgModule} from '@angular/core'; import {CommonModule} from '@angular/common'; import {MatCommonModule} from '@angular/material/core'; -import {MatProgressBar} from './progress-bar'; +import {MatLegacyProgressBar} from './progress-bar'; @NgModule({ imports: [CommonModule, MatCommonModule], - exports: [MatProgressBar, MatCommonModule], - declarations: [MatProgressBar], + exports: [MatLegacyProgressBar, MatCommonModule], + declarations: [MatLegacyProgressBar], }) -export class MatProgressBarModule {} +export class MatLegacyProgressBarModule {} diff --git a/src/material/legacy-progress-bar/progress-bar.spec.ts b/src/material/legacy-progress-bar/progress-bar.spec.ts index 8c44999795d9..292537fc694d 100644 --- a/src/material/legacy-progress-bar/progress-bar.spec.ts +++ b/src/material/legacy-progress-bar/progress-bar.spec.ts @@ -2,8 +2,8 @@ import {TestBed, ComponentFixture} from '@angular/core/testing'; import {ApplicationRef, Component, DebugElement, Provider, Type} from '@angular/core'; import {By} from '@angular/platform-browser'; import {dispatchFakeEvent} from '../../cdk/testing/private'; -import {MatProgressBarModule, MAT_PROGRESS_BAR_LOCATION} from './index'; -import {MatProgressBar, MAT_PROGRESS_BAR_DEFAULT_OPTIONS} from './progress-bar'; +import {MatLegacyProgressBarModule, MAT_LEGACY_PROGRESS_BAR_LOCATION} from './index'; +import {MatLegacyProgressBar, MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS} from './progress-bar'; describe('MatProgressBar', () => { let fakePath: string; @@ -15,11 +15,11 @@ describe('MatProgressBar', () => { fakePath = '/fake-path'; TestBed.configureTestingModule({ - imports: [MatProgressBarModule], + imports: [MatLegacyProgressBarModule], declarations: [componentType], providers: [ { - provide: MAT_PROGRESS_BAR_LOCATION, + provide: MAT_LEGACY_PROGRESS_BAR_LOCATION, useValue: {getPathname: () => fakePath}, }, ...providers, @@ -206,7 +206,7 @@ describe('MatProgressBar', () => { it('should be able to configure the default progress bar options via DI', () => { const fixture = createComponent(BasicProgressBar, [ { - provide: MAT_PROGRESS_BAR_DEFAULT_OPTIONS, + provide: MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS, useValue: { mode: 'buffer', color: 'warn', @@ -257,7 +257,7 @@ describe('MatProgressBar', () => { describe('animation trigger on determinate setting', () => { let fixture: ComponentFixture; - let progressComponent: MatProgressBar; + let progressComponent: MatLegacyProgressBar; let primaryValueBar: DebugElement; beforeEach(() => { @@ -285,7 +285,7 @@ describe('MatProgressBar', () => { describe('animation trigger on buffer setting', () => { let fixture: ComponentFixture; - let progressComponent: MatProgressBar; + let progressComponent: MatLegacyProgressBar; let primaryValueBar: DebugElement; beforeEach(() => { diff --git a/src/material/legacy-progress-bar/progress-bar.ts b/src/material/legacy-progress-bar/progress-bar.ts index ac40d65a6ede..49ddc8290ce5 100644 --- a/src/material/legacy-progress-bar/progress-bar.ts +++ b/src/material/legacy-progress-bar/progress-bar.ts @@ -34,7 +34,7 @@ import {filter} from 'rxjs/operators'; // TODO(josephperrott): Add ARIA attributes for progress bar "for". /** Last animation end data. */ -export interface ProgressAnimationEnd { +export interface LegacyProgressAnimationEnd { value: number; } @@ -52,21 +52,21 @@ const _MatProgressBarBase = mixinColor( * Used to handle server-side rendering and to stub out during unit tests. * @docs-private */ -export const MAT_PROGRESS_BAR_LOCATION = new InjectionToken( +export const MAT_LEGACY_PROGRESS_BAR_LOCATION = new InjectionToken( 'mat-progress-bar-location', - {providedIn: 'root', factory: MAT_PROGRESS_BAR_LOCATION_FACTORY}, + {providedIn: 'root', factory: MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY}, ); /** * Stubbed out location for `MatProgressBar`. * @docs-private */ -export interface MatProgressBarLocation { +export interface MatLegacyProgressBarLocation { getPathname: () => string; } /** @docs-private */ -export function MAT_PROGRESS_BAR_LOCATION_FACTORY(): MatProgressBarLocation { +export function MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY(): MatLegacyProgressBarLocation { const _document = inject(DOCUMENT); const _location = _document ? _document.location : null; @@ -77,21 +77,20 @@ export function MAT_PROGRESS_BAR_LOCATION_FACTORY(): MatProgressBarLocation { }; } -export type ProgressBarMode = 'determinate' | 'indeterminate' | 'buffer' | 'query'; +export type LegacyProgressBarMode = 'determinate' | 'indeterminate' | 'buffer' | 'query'; /** Default `mat-progress-bar` options that can be overridden. */ -export interface MatProgressBarDefaultOptions { +export interface MatLegacyProgressBarDefaultOptions { /** Default color of the progress bar. */ color?: ThemePalette; /** Default mode of the progress bar. */ - mode?: ProgressBarMode; + mode?: LegacyProgressBarMode; } /** Injection token to be used to override the default options for `mat-progress-bar`. */ -export const MAT_PROGRESS_BAR_DEFAULT_OPTIONS = new InjectionToken( - 'MAT_PROGRESS_BAR_DEFAULT_OPTIONS', -); +export const MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS = + new InjectionToken('MAT_PROGRESS_BAR_DEFAULT_OPTIONS'); /** Counter used to generate unique IDs for progress bars. */ let progressbarId = 0; @@ -120,7 +119,7 @@ let progressbarId = 0; changeDetection: ChangeDetectionStrategy.OnPush, encapsulation: ViewEncapsulation.None, }) -export class MatProgressBar +export class MatLegacyProgressBar extends _MatProgressBarBase implements CanColor, AfterViewInit, OnDestroy { @@ -132,10 +131,10 @@ export class MatProgressBar * @deprecated `location` parameter to be made required. * @breaking-change 8.0.0 */ - @Optional() @Inject(MAT_PROGRESS_BAR_LOCATION) location?: MatProgressBarLocation, + @Optional() @Inject(MAT_LEGACY_PROGRESS_BAR_LOCATION) location?: MatLegacyProgressBarLocation, @Optional() - @Inject(MAT_PROGRESS_BAR_DEFAULT_OPTIONS) - defaults?: MatProgressBarDefaultOptions, + @Inject(MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS) + defaults?: MatLegacyProgressBarDefaultOptions, /** * @deprecated `_changeDetectorRef` parameter to be made required. * @breaking-change 11.0.0 @@ -199,7 +198,7 @@ export class MatProgressBar * be emitted when animations are disabled, nor will it be emitted for modes with continuous * animations (indeterminate and query). */ - @Output() readonly animationEnd = new EventEmitter(); + @Output() readonly animationEnd = new EventEmitter(); /** Reference to animation end subscription to be unsubscribed on destroy. */ private _animationEndSubscription: Subscription = Subscription.EMPTY; @@ -211,7 +210,7 @@ export class MatProgressBar * 'determinate'. * Mirrored to mode attribute. */ - @Input() mode: ProgressBarMode = 'determinate'; + @Input() mode: LegacyProgressBarMode = 'determinate'; /** ID of the progress bar. */ progressbarId = `mat-progress-bar-${progressbarId++}`; diff --git a/src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts b/src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts index 5f9ba038b4ef..8350b362e8e5 100644 --- a/src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts +++ b/src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts @@ -9,4 +9,4 @@ import {BaseHarnessFilters} from '@angular/cdk/testing'; /** A set of criteria that can be used to filter a list of `MatProgressBarHarness` instances. */ -export interface ProgressBarHarnessFilters extends BaseHarnessFilters {} +export interface LegacyProgressBarHarnessFilters extends BaseHarnessFilters {} diff --git a/src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts b/src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts index 321104094d3d..a348e3654c26 100644 --- a/src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts +++ b/src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts @@ -1,7 +1,7 @@ -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {runHarnessTests} from '@angular/material/legacy-progress-bar/testing/shared.spec'; -import {MatProgressBarHarness} from './progress-bar-harness'; +import {MatLegacyProgressBarHarness} from './progress-bar-harness'; describe('MatProgressBarHarness', () => { - runHarnessTests(MatProgressBarModule, MatProgressBarHarness); + runHarnessTests(MatLegacyProgressBarModule, MatLegacyProgressBarHarness); }); diff --git a/src/material/legacy-progress-bar/testing/progress-bar-harness.ts b/src/material/legacy-progress-bar/testing/progress-bar-harness.ts index f745e009b4e1..14e0cfc95c1c 100644 --- a/src/material/legacy-progress-bar/testing/progress-bar-harness.ts +++ b/src/material/legacy-progress-bar/testing/progress-bar-harness.ts @@ -8,10 +8,10 @@ import {coerceNumberProperty} from '@angular/cdk/coercion'; import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing'; -import {ProgressBarHarnessFilters} from './progress-bar-harness-filters'; +import {LegacyProgressBarHarnessFilters} from './progress-bar-harness-filters'; /** Harness for interacting with a standard mat-progress-bar in tests. */ -export class MatProgressBarHarness extends ComponentHarness { +export class MatLegacyProgressBarHarness extends ComponentHarness { /** The selector for the host element of a `MatProgressBar` instance. */ static hostSelector = '.mat-progress-bar'; @@ -21,8 +21,10 @@ export class MatProgressBarHarness extends ComponentHarness { * @param options Options for filtering which progress bar instances are considered a match. * @return a `HarnessPredicate` configured with the given options. */ - static with(options: ProgressBarHarnessFilters = {}): HarnessPredicate { - return new HarnessPredicate(MatProgressBarHarness, options); + static with( + options: LegacyProgressBarHarnessFilters = {}, + ): HarnessPredicate { + return new HarnessPredicate(MatLegacyProgressBarHarness, options); } /** Gets the progress bar's value. */ diff --git a/src/material/legacy-progress-bar/testing/shared.spec.ts b/src/material/legacy-progress-bar/testing/shared.spec.ts index fb3b5a5c127b..45c17b655b23 100644 --- a/src/material/legacy-progress-bar/testing/shared.spec.ts +++ b/src/material/legacy-progress-bar/testing/shared.spec.ts @@ -2,12 +2,12 @@ import {HarnessLoader} from '@angular/cdk/testing'; import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; -import {MatProgressBarHarness} from './progress-bar-harness'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarHarness} from './progress-bar-harness'; export function runHarnessTests( - progressBarModule: typeof MatProgressBarModule, - progressBarHarness: typeof MatProgressBarHarness, + progressBarModule: typeof MatLegacyProgressBarModule, + progressBarHarness: typeof MatLegacyProgressBarHarness, ) { let fixture: ComponentFixture; let loader: HarnessLoader; diff --git a/src/universal-app/kitchen-sink/kitchen-sink.ts b/src/universal-app/kitchen-sink/kitchen-sink.ts index 7ecb1d10f636..3ef41cf3a493 100644 --- a/src/universal-app/kitchen-sink/kitchen-sink.ts +++ b/src/universal-app/kitchen-sink/kitchen-sink.ts @@ -20,7 +20,7 @@ import {MatInputModule} from '@angular/material/input'; import {MatListModule} from '@angular/material/list'; import {MatMenuModule} from '@angular/material/menu'; import {MatPaginatorModule} from '@angular/material/paginator'; -import {MatProgressBarModule} from '@angular/material/legacy-progress-bar'; +import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar'; import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {MatRadioModule} from '@angular/material/radio'; import {MatSelectModule} from '@angular/material/select'; @@ -117,7 +117,7 @@ export class KitchenSink { MatMenuModule, MatNativeDateModule, MatPaginatorModule, - MatProgressBarModule, + MatLegacyProgressBarModule, MatProgressSpinnerModule, MatRadioModule, MatRippleModule, diff --git a/tools/public_api_guard/material/legacy-progress-bar-testing.md b/tools/public_api_guard/material/legacy-progress-bar-testing.md index 59ed5d9cbe80..f6363beee8e3 100644 --- a/tools/public_api_guard/material/legacy-progress-bar-testing.md +++ b/tools/public_api_guard/material/legacy-progress-bar-testing.md @@ -9,15 +9,15 @@ import { ComponentHarness } from '@angular/cdk/testing'; import { HarnessPredicate } from '@angular/cdk/testing'; // @public -export class MatProgressBarHarness extends ComponentHarness { - getMode(): Promise; - getValue(): Promise; - static hostSelector: string; - static with(options?: ProgressBarHarnessFilters): HarnessPredicate; +export interface LegacyProgressBarHarnessFilters extends BaseHarnessFilters { } // @public -export interface ProgressBarHarnessFilters extends BaseHarnessFilters { +export class MatLegacyProgressBarHarness extends ComponentHarness { + getMode(): Promise; + getValue(): Promise; + static hostSelector: string; + static with(options?: LegacyProgressBarHarnessFilters): HarnessPredicate; } // (No @packageDocumentation comment for this package) diff --git a/tools/public_api_guard/material/legacy-progress-bar.md b/tools/public_api_guard/material/legacy-progress-bar.md index 2198261eefd7..02edbed70644 100644 --- a/tools/public_api_guard/material/legacy-progress-bar.md +++ b/tools/public_api_guard/material/legacy-progress-bar.md @@ -21,20 +21,29 @@ import { OnDestroy } from '@angular/core'; import { ThemePalette } from '@angular/material/core'; // @public -export const MAT_PROGRESS_BAR_DEFAULT_OPTIONS: InjectionToken; +export interface LegacyProgressAnimationEnd { + // (undocumented) + value: number; +} + +// @public (undocumented) +export type LegacyProgressBarMode = 'determinate' | 'indeterminate' | 'buffer' | 'query'; + +// @public +export const MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS: InjectionToken; // @public -export const MAT_PROGRESS_BAR_LOCATION: InjectionToken; +export const MAT_LEGACY_PROGRESS_BAR_LOCATION: InjectionToken; // @public -export function MAT_PROGRESS_BAR_LOCATION_FACTORY(): MatProgressBarLocation; +export function MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY(): MatLegacyProgressBarLocation; // @public -export class MatProgressBar extends _MatProgressBarBase implements CanColor, AfterViewInit, OnDestroy { +export class MatLegacyProgressBar extends _MatProgressBarBase implements CanColor, AfterViewInit, OnDestroy { constructor(elementRef: ElementRef, _ngZone: NgZone, _animationMode?: string | undefined, - location?: MatProgressBarLocation, defaults?: MatProgressBarDefaultOptions, + location?: MatLegacyProgressBarLocation, defaults?: MatLegacyProgressBarDefaultOptions, _changeDetectorRef?: ChangeDetectorRef | undefined); - readonly animationEnd: EventEmitter; + readonly animationEnd: EventEmitter; // (undocumented) _animationMode?: string | undefined; _bufferTransform(): { @@ -43,7 +52,7 @@ export class MatProgressBar extends _MatProgressBarBase implements CanColor, Aft get bufferValue(): number; set bufferValue(v: number); _isNoopAnimation: boolean; - mode: ProgressBarMode; + mode: LegacyProgressBarMode; // (undocumented) ngAfterViewInit(): void; // (undocumented) @@ -58,42 +67,33 @@ export class MatProgressBar extends _MatProgressBarBase implements CanColor, Aft get value(): number; set value(v: NumberInput); // (undocumented) - static ɵcmp: i0.ɵɵComponentDeclaration; + static ɵcmp: i0.ɵɵComponentDeclaration; // (undocumented) - static ɵfac: i0.ɵɵFactoryDeclaration; + static ɵfac: i0.ɵɵFactoryDeclaration; } // @public -export interface MatProgressBarDefaultOptions { +export interface MatLegacyProgressBarDefaultOptions { color?: ThemePalette; - mode?: ProgressBarMode; + mode?: LegacyProgressBarMode; } // @public -export interface MatProgressBarLocation { +export interface MatLegacyProgressBarLocation { // (undocumented) getPathname: () => string; } // @public (undocumented) -export class MatProgressBarModule { +export class MatLegacyProgressBarModule { // (undocumented) - static ɵfac: i0.ɵɵFactoryDeclaration; + static ɵfac: i0.ɵɵFactoryDeclaration; // (undocumented) - static ɵinj: i0.ɵɵInjectorDeclaration; + static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } -// @public -export interface ProgressAnimationEnd { - // (undocumented) - value: number; -} - -// @public (undocumented) -export type ProgressBarMode = 'determinate' | 'indeterminate' | 'buffer' | 'query'; - // (No @packageDocumentation comment for this package) ``` From eec66eb585b477fcffaca8996feec920c14ff786 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Fri, 8 Jul 2022 07:48:00 -0700 Subject: [PATCH 3/5] feat(material/legacy-progress-bar): step 3. rename sass mixins --- src/material/_index.scss | 4 ++-- .../legacy-progress-bar/_progress-bar-legacy-index.scss | 2 +- .../legacy-progress-bar/_progress-bar-theme.import.scss | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/material/_index.scss b/src/material/_index.scss index 491d522c9f5a..6991eb837ca8 100644 --- a/src/material/_index.scss +++ b/src/material/_index.scss @@ -92,8 +92,8 @@ @forward './menu/menu-theme' as menu-* show menu-theme, menu-color, menu-typography; @forward './paginator/paginator-theme' as paginator-* show paginator-theme, paginator-color, paginator-typography; -@forward './legacy-progress-bar/progress-bar-theme' as progress-bar-* show progress-bar-theme, - progress-bar-color, progress-bar-typography; +@forward './legacy-progress-bar/progress-bar-theme' as legacy-progress-bar-* show + legacy-progress-bar-theme, progress-bar-color, progress-bar-typography; @forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show progress-spinner-theme, progress-spinner-color, progress-spinner-typography; @forward './radio/radio-theme' as radio-* show radio-theme, radio-color, radio-typography; diff --git a/src/material/legacy-progress-bar/_progress-bar-legacy-index.scss b/src/material/legacy-progress-bar/_progress-bar-legacy-index.scss index 34a313f57369..a0ad463b58ec 100644 --- a/src/material/legacy-progress-bar/_progress-bar-legacy-index.scss +++ b/src/material/legacy-progress-bar/_progress-bar-legacy-index.scss @@ -1,2 +1,2 @@ @forward 'progress-bar-theme' hide color, theme, typography; -@forward 'progress-bar-theme' as mat-progress-bar-* hide mat-progress-bar-density; +@forward 'progress-bar-theme' as mat-legacy-progress-bar-* hide mat-legacy-progress-bar-density; diff --git a/src/material/legacy-progress-bar/_progress-bar-theme.import.scss b/src/material/legacy-progress-bar/_progress-bar-theme.import.scss index 7fe2df21b04e..5c7fae78c640 100644 --- a/src/material/legacy-progress-bar/_progress-bar-theme.import.scss +++ b/src/material/legacy-progress-bar/_progress-bar-theme.import.scss @@ -1,6 +1,6 @@ @forward '../core/theming/theming.import'; @forward 'progress-bar-theme' hide color, theme, typography; -@forward 'progress-bar-theme' as mat-progress-bar-* hide mat-progress-bar-density; +@forward 'progress-bar-theme' as mat-legacy-progress-bar-* hide mat-legacy-progress-bar-density; @import '../core/theming/palette'; @import '../core/theming/theming'; From ef686516de76d04db0ed7774b46a78c9f8d4c178 Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Fri, 8 Jul 2022 11:13:17 -0700 Subject: [PATCH 4/5] feat(material/legacy-progress-bar): step 4. move mdc folder --- .ng-dev/commit-message.mts | 2 +- src/dev-app/mdc-progress-bar/BUILD.bazel | 2 +- .../mdc-progress-bar/mdc-progress-bar-demo.ts | 2 +- src/e2e-app/BUILD.bazel | 2 +- .../mdc-progress-bar-e2e-module.ts | 2 +- src/material-experimental/_index.scss | 2 - src/material-experimental/config.bzl | 2 - .../mdc-core/color/_all-color.import.scss | 1 - .../mdc-core/density/_all-density.import.scss | 1 - .../mdc-core/theming/BUILD.bazel | 2 +- .../mdc-core/theming/_all-theme.import.scss | 2 - .../mdc-core/theming/_all-theme.scss | 3 +- .../typography/_all-typography.import.scss | 1 - .../mdc-progress-bar/README.md | 88 ------------------- src/material/_index.scss | 4 +- src/material/config.bzl | 2 + .../progress-bar}/BUILD.bazel | 21 +++-- src/material/progress-bar/README.md | 65 ++++++++++++++ .../_progress-bar-theme.import.scss | 0 .../progress-bar}/_progress-bar-theme.scss | 21 ++--- .../progress-bar}/index.ts | 0 .../progress-bar}/module.ts | 2 +- .../progress-bar}/progress-bar.e2e.spec.ts | 0 .../progress-bar}/progress-bar.html | 0 src/material/progress-bar/progress-bar.md | 50 +++++++++++ .../progress-bar}/progress-bar.scss | 6 +- .../progress-bar}/progress-bar.spec.ts | 0 .../progress-bar}/progress-bar.ts | 2 +- .../progress-bar}/public-api.ts | 0 .../progress-bar}/testing/BUILD.bazel | 7 +- .../progress-bar}/testing/index.ts | 0 .../testing/progress-bar-harness.spec.ts | 0 .../testing/progress-bar-harness.ts | 0 .../progress-bar}/testing/public-api.ts | 0 .../kitchen-sink-mdc/kitchen-sink-mdc.ts | 2 +- .../material/progress-bar-testing.md | 25 ++++++ .../public_api_guard/material/progress-bar.md | 78 ++++++++++++++++ 37 files changed, 268 insertions(+), 129 deletions(-) delete mode 100644 src/material-experimental/mdc-progress-bar/README.md rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/BUILD.bazel (83%) create mode 100644 src/material/progress-bar/README.md rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/_progress-bar-theme.import.scss (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/_progress-bar-theme.scss (66%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/index.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/module.ts (85%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/progress-bar.e2e.spec.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/progress-bar.html (100%) create mode 100644 src/material/progress-bar/progress-bar.md rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/progress-bar.scss (84%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/progress-bar.spec.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/progress-bar.ts (98%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/public-api.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/testing/BUILD.bazel (86%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/testing/index.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/testing/progress-bar-harness.spec.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/testing/progress-bar-harness.ts (100%) rename src/{material-experimental/mdc-progress-bar => material/progress-bar}/testing/public-api.ts (100%) create mode 100644 tools/public_api_guard/material/progress-bar-testing.md create mode 100644 tools/public_api_guard/material/progress-bar.md diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mts index 018551a216fd..36af3c60fb67 100644 --- a/.ng-dev/commit-message.mts +++ b/.ng-dev/commit-message.mts @@ -52,7 +52,7 @@ export const commitMessage: CommitMessageConfig = { 'material-experimental/mdc-list', 'material-experimental/mdc-menu', 'material-experimental/mdc-paginator', - 'material-experimental/mdc-progress-bar', + 'material/progress-bar', 'material-experimental/mdc-progress-spinner', 'material-experimental/mdc-radio', 'material-experimental/mdc-select', diff --git a/src/dev-app/mdc-progress-bar/BUILD.bazel b/src/dev-app/mdc-progress-bar/BUILD.bazel index b552bb2302cf..e7870e4a5362 100644 --- a/src/dev-app/mdc-progress-bar/BUILD.bazel +++ b/src/dev-app/mdc-progress-bar/BUILD.bazel @@ -11,8 +11,8 @@ ng_module( ], deps = [ "//src/material-experimental/mdc-button", - "//src/material-experimental/mdc-progress-bar", "//src/material/button-toggle", + "//src/material/progress-bar", "@npm//@angular/forms", ], ) diff --git a/src/dev-app/mdc-progress-bar/mdc-progress-bar-demo.ts b/src/dev-app/mdc-progress-bar/mdc-progress-bar-demo.ts index 57f77addc48e..c2134a684683 100644 --- a/src/dev-app/mdc-progress-bar/mdc-progress-bar-demo.ts +++ b/src/dev-app/mdc-progress-bar/mdc-progress-bar-demo.ts @@ -10,7 +10,7 @@ import {Component} from '@angular/core'; import {ThemePalette} from '@angular/material-experimental/mdc-core'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar'; +import {MatProgressBarModule} from '@angular/material/progress-bar'; import {MatButtonModule} from '@angular/material-experimental/mdc-button'; import {MatButtonToggleModule} from '@angular/material/button-toggle'; diff --git a/src/e2e-app/BUILD.bazel b/src/e2e-app/BUILD.bazel index 24c5c93dca88..a82ce500a312 100644 --- a/src/e2e-app/BUILD.bazel +++ b/src/e2e-app/BUILD.bazel @@ -48,7 +48,6 @@ ng_module( "//src/material-experimental/mdc-dialog", "//src/material-experimental/mdc-input", "//src/material-experimental/mdc-menu", - "//src/material-experimental/mdc-progress-bar", "//src/material-experimental/mdc-progress-spinner", "//src/material-experimental/mdc-radio", "//src/material-experimental/mdc-slide-toggle", @@ -67,6 +66,7 @@ ng_module( "//src/material/legacy-progress-bar", "//src/material/list", "//src/material/menu", + "//src/material/progress-bar", "//src/material/progress-spinner", "//src/material/radio", "//src/material/select", diff --git a/src/e2e-app/mdc-progress-bar/mdc-progress-bar-e2e-module.ts b/src/e2e-app/mdc-progress-bar/mdc-progress-bar-e2e-module.ts index 9be7ddffb199..dc82f4b67d24 100644 --- a/src/e2e-app/mdc-progress-bar/mdc-progress-bar-e2e-module.ts +++ b/src/e2e-app/mdc-progress-bar/mdc-progress-bar-e2e-module.ts @@ -7,7 +7,7 @@ */ import {NgModule} from '@angular/core'; -import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar'; +import {MatProgressBarModule} from '@angular/material/progress-bar'; import {MdcProgressBarE2E} from './mdc-progress-bar-e2e'; @NgModule({ diff --git a/src/material-experimental/_index.scss b/src/material-experimental/_index.scss index 9a06f46f5433..8e9c85f32250 100644 --- a/src/material-experimental/_index.scss +++ b/src/material-experimental/_index.scss @@ -45,8 +45,6 @@ mdc-menu-density, mdc-menu-theme; @forward './mdc-paginator/paginator-theme' as mdc-paginator-* show mdc-paginator-color, mdc-paginator-typography, mdc-paginator-density, mdc-paginator-theme; -@forward './mdc-progress-bar/progress-bar-theme' as mdc-progress-bar-* show mdc-progress-bar-color, - mdc-progress-bar-typography, mdc-progress-bar-density, mdc-progress-bar-theme; @forward './mdc-progress-spinner/progress-spinner-theme' as mdc-progress-spinner-* show mdc-progress-spinner-color, mdc-progress-spinner-typography, mdc-progress-spinner-density, mdc-progress-spinner-theme; diff --git a/src/material-experimental/config.bzl b/src/material-experimental/config.bzl index d008dc158ca8..77cb94860957 100644 --- a/src/material-experimental/config.bzl +++ b/src/material-experimental/config.bzl @@ -22,8 +22,6 @@ entryPoints = [ "mdc-menu/testing", "mdc-paginator", "mdc-paginator/testing", - "mdc-progress-bar", - "mdc-progress-bar/testing", "mdc-progress-spinner", "mdc-progress-spinner/testing", "mdc-radio", diff --git a/src/material-experimental/mdc-core/color/_all-color.import.scss b/src/material-experimental/mdc-core/color/_all-color.import.scss index e3a21e5d70ab..655dbce5ed37 100644 --- a/src/material-experimental/mdc-core/color/_all-color.import.scss +++ b/src/material-experimental/mdc-core/color/_all-color.import.scss @@ -75,7 +75,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @forward '../../mdc-list/list-theme' as mat-mdc-list-*; @forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; @forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; @forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; @forward '../../mdc-input/input-theme' as mat-mdc-input-*; @forward '../../mdc-form-field/form-field-density' as mat-mdc-*; diff --git a/src/material-experimental/mdc-core/density/_all-density.import.scss b/src/material-experimental/mdc-core/density/_all-density.import.scss index 14ed02a5f7ae..def9fe9846fa 100644 --- a/src/material-experimental/mdc-core/density/_all-density.import.scss +++ b/src/material-experimental/mdc-core/density/_all-density.import.scss @@ -75,7 +75,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @forward '../../mdc-list/list-theme' as mat-mdc-list-*; @forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; @forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; @forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; @forward '../../mdc-input/input-theme' as mat-mdc-input-*; @forward '../../mdc-form-field/form-field-density' as mat-mdc-*; diff --git a/src/material-experimental/mdc-core/theming/BUILD.bazel b/src/material-experimental/mdc-core/theming/BUILD.bazel index c97ef27be891..ec134b889eb2 100644 --- a/src/material-experimental/mdc-core/theming/BUILD.bazel +++ b/src/material-experimental/mdc-core/theming/BUILD.bazel @@ -31,7 +31,6 @@ sass_library( "//src/material-experimental/mdc-list:mdc_list_scss_lib", "//src/material-experimental/mdc-menu:mdc_menu_scss_lib", "//src/material-experimental/mdc-paginator:mdc_paginator_scss_lib", - "//src/material-experimental/mdc-progress-bar:mdc_progress_bar_scss_lib", "//src/material-experimental/mdc-progress-spinner:mdc_progress_spinner_scss_lib", "//src/material-experimental/mdc-radio:mdc_radio_scss_lib", "//src/material-experimental/mdc-select:mdc_select_scss_lib", @@ -41,6 +40,7 @@ sass_library( "//src/material-experimental/mdc-table:mdc_table_scss_lib", "//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib", "//src/material/card:card_scss_lib", + "//src/material/progress-bar:progress_bar_scss_lib", "//src/material/tooltip:tooltip_scss_lib", ], ) diff --git a/src/material-experimental/mdc-core/theming/_all-theme.import.scss b/src/material-experimental/mdc-core/theming/_all-theme.import.scss index c2f162535f04..107806bd8b9d 100644 --- a/src/material-experimental/mdc-core/theming/_all-theme.import.scss +++ b/src/material-experimental/mdc-core/theming/_all-theme.import.scss @@ -75,7 +75,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @forward '../../mdc-list/list-theme' as mat-mdc-list-*; @forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; @forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; @forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; @forward '../../mdc-input/input-theme' as mat-mdc-input-*; @forward '../../mdc-form-field/form-field-density' as mat-mdc-*; @@ -99,7 +98,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @import '../../mdc-tabs/tabs-theme'; @import '../../mdc-table/table-theme'; @import '../../mdc-paginator/paginator-theme'; -@import '../../mdc-progress-bar/progress-bar-theme'; @import '../../mdc-progress-spinner/progress-spinner-theme'; @import '../../mdc-input/input-theme'; @import '../../mdc-form-field/form-field-theme'; diff --git a/src/material-experimental/mdc-core/theming/_all-theme.scss b/src/material-experimental/mdc-core/theming/_all-theme.scss index b098e0e9a62b..7997be9023c6 100644 --- a/src/material-experimental/mdc-core/theming/_all-theme.scss +++ b/src/material-experimental/mdc-core/theming/_all-theme.scss @@ -18,7 +18,6 @@ @use '../../mdc-tabs/tabs-theme'; @use '../../mdc-table/table-theme'; @use '../../mdc-paginator/paginator-theme'; -@use '../../mdc-progress-bar/progress-bar-theme'; @use '../../mdc-progress-spinner/progress-spinner-theme'; @use '../../mdc-input/input-theme'; @use '../../mdc-form-field/form-field-theme'; @@ -38,7 +37,7 @@ @include list-theme.theme($theme-or-color-config); @include menu-theme.theme($theme-or-color-config); @include paginator-theme.theme($theme-or-color-config); - @include progress-bar-theme.theme($theme-or-color-config); + @include mat.progress-bar-theme($theme-or-color-config); @include progress-spinner-theme.theme($theme-or-color-config); @include radio-theme.theme($theme-or-color-config); @include select-theme.theme($theme-or-color-config); diff --git a/src/material-experimental/mdc-core/typography/_all-typography.import.scss b/src/material-experimental/mdc-core/typography/_all-typography.import.scss index 79bc57154beb..7b093da7780d 100644 --- a/src/material-experimental/mdc-core/typography/_all-typography.import.scss +++ b/src/material-experimental/mdc-core/typography/_all-typography.import.scss @@ -75,7 +75,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde @forward '../../mdc-list/list-theme' as mat-mdc-list-*; @forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*; @forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*; -@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*; @forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*; @forward '../../mdc-input/input-theme' as mat-mdc-input-*; @forward '../../mdc-form-field/form-field-density' as mat-mdc-*; diff --git a/src/material-experimental/mdc-progress-bar/README.md b/src/material-experimental/mdc-progress-bar/README.md deleted file mode 100644 index 8f9d949bdfa2..000000000000 --- a/src/material-experimental/mdc-progress-bar/README.md +++ /dev/null @@ -1,88 +0,0 @@ -This is prototype of an alternate version of `` built on top of -[MDC Web](https://github.com/material-components/material-components-web). It demonstrates how -Angular Material could use MDC Web under the hood while still exposing the same API Angular users as -the existing ``. This component is experimental and should not be used in -production. - -## How to use -Assuming your application is already up and running using Angular Material, you can add this -component by following these steps: - -1. Install Angular Material Experimental & MDC WEB: - - ```bash - npm i material-components-web @angular/material-experimental - ``` - -2. In your `angular.json`, make sure `node_modules/` is listed as a Sass include path. This is - needed for the Sass compiler to be able to find the MDC Web Sass files. - - ```json - ... - "styles": [ - "src/styles.scss" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "node_modules/" - ] - }, - ... - ``` - -3. Import the experimental `MatProgressBarModule` and add it to the module that declares your - component: - - ```ts - import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar'; - - @NgModule({ - declarations: [MyComponent], - imports: [MatProgressBarModule], - }) - export class MyModule {} - ``` - -4. Add use `` in your component's template, just like you would the normal - ``: - - ```html - - ``` - -5. Add the theme and typography mixins to your Sass. (There is currently no pre-built CSS option for - the experimental ``): - - ```scss - @use '@angular/material' as mat; - @use '@angular/material-experimental' as mat-experimental; - - $my-primary: mat.define-palette(mat.$indigo-palette); - $my-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400); - $my-theme: mat.define-light-theme(( - color: ( - primary: $my-primary, - accent: $my-accent - ) - )); - - @include mat-experimental.mdc-progress-bar-theme($my-theme); - @include mat-experimental.mdc-progress-bar-typography($my-theme); - ``` - -## Replacing the standard progress bar in an existing app -Because the experimental API mirrors the API for the standard progress bar, it can easily be swapped -in by just changing the import paths. There is currently no schematic for this, but you can run the -following string replace across your TypeScript files: - -```bash -grep -lr --include="*.ts" --exclude-dir="node_modules" \ - --exclude="*.d.ts" "['\"]@angular/material/legacy-progress-bar['\"]" | xargs sed -i \ - "s/['\"]@angular\/material\/legacy-progress-bar['\"]/'@angular\/material-experimental\/mdc-progress-bar'/g" -``` - -CSS styles and tests that depend on implementation details of mat-progress-bar (such as getting -elements from the template by class name) will need to be manually updated. - -There are some small visual differences between this progress and the standard `mat-progress-bar`. -This progress bar has slightly different animation timings and easing curves. diff --git a/src/material/_index.scss b/src/material/_index.scss index 6991eb837ca8..4878a7024b51 100644 --- a/src/material/_index.scss +++ b/src/material/_index.scss @@ -93,7 +93,9 @@ @forward './paginator/paginator-theme' as paginator-* show paginator-theme, paginator-color, paginator-typography; @forward './legacy-progress-bar/progress-bar-theme' as legacy-progress-bar-* show - legacy-progress-bar-theme, progress-bar-color, progress-bar-typography; + legacy-progress-bar-theme, legacy-progress-bar-color, legacy-progress-bar-typography; +@forward './progress-bar/progress-bar-theme' as progress-bar-* show + progress-bar-theme, progress-bar-color, progress-bar-typography; @forward './progress-spinner/progress-spinner-theme' as progress-spinner-* show progress-spinner-theme, progress-spinner-color, progress-spinner-typography; @forward './radio/radio-theme' as radio-* show radio-theme, radio-color, radio-typography; diff --git a/src/material/config.bzl b/src/material/config.bzl index 19455216187f..fceb708aa522 100644 --- a/src/material/config.bzl +++ b/src/material/config.bzl @@ -42,6 +42,8 @@ entryPoints = [ "paginator/testing", "legacy-progress-bar", "legacy-progress-bar/testing", + "progress-bar", + "progress-bar/testing", "progress-spinner", "progress-spinner/testing", "radio", diff --git a/src/material-experimental/mdc-progress-bar/BUILD.bazel b/src/material/progress-bar/BUILD.bazel similarity index 83% rename from src/material-experimental/mdc-progress-bar/BUILD.bazel rename to src/material/progress-bar/BUILD.bazel index 06e31ed78f81..e745861c987b 100644 --- a/src/material-experimental/mdc-progress-bar/BUILD.bazel +++ b/src/material/progress-bar/BUILD.bazel @@ -1,6 +1,7 @@ load("//src/e2e-app:test_suite.bzl", "e2e_test_suite") load( "//tools:defaults.bzl", + "markdown_to_html", "ng_e2e_test_library", "ng_module", "ng_test_library", @@ -12,7 +13,7 @@ load( package(default_visibility = ["//visibility:public"]) ng_module( - name = "mdc-progress-bar", + name = "progress-bar", srcs = glob( ["**/*.ts"], exclude = [ @@ -21,18 +22,17 @@ ng_module( ), assets = [":progress_bar_scss"] + glob(["**/*.html"]), deps = [ - "//src/material-experimental/mdc-core", + "//src/material/core", "//src/material/legacy-progress-bar", "@npm//@angular/core", ], ) sass_library( - name = "mdc_progress_bar_scss_lib", + name = "progress_bar_scss_lib", srcs = glob(["**/_*.scss"]), deps = [ "//:mdc_sass_lib", - "//src/material:sass_lib", "//src/material/core:core_scss_lib", ], ) @@ -42,7 +42,6 @@ sass_binary( src = "progress-bar.scss", deps = [ "//:mdc_sass_lib", - "//src/material:sass_lib", "//src/material/core:core_scss_lib", ], ) @@ -54,7 +53,7 @@ ng_test_library( exclude = ["**/*.e2e.spec.ts"], ), deps = [ - ":mdc-progress-bar", + ":progress-bar", "//src/cdk/testing/private", "@npm//@angular/platform-browser", ], @@ -82,3 +81,13 @@ e2e_test_suite( "//src/cdk/testing/private/e2e", ], ) + +markdown_to_html( + name = "overview", + srcs = [":progress-bar.md"], +) + +filegroup( + name = "source-files", + srcs = glob(["**/*.ts"]), +) diff --git a/src/material/progress-bar/README.md b/src/material/progress-bar/README.md new file mode 100644 index 000000000000..bc2f915044ef --- /dev/null +++ b/src/material/progress-bar/README.md @@ -0,0 +1,65 @@ +This version of `` is built on top of +[MDC Web](https://github.com/material-components/material-components-web). + +## How to use +Assuming your application is already up and running using Angular Material, you can add this +component by following these steps: + +1. Install Angular Material & MDC WEB: + + ```bash + npm i material-components-web @angular/material + ``` + +2. In your `angular.json`, make sure `node_modules/` is listed as a Sass include path. This is + needed for the Sass compiler to be able to find the MDC Web Sass files. + + ```json + ... + "styles": [ + "src/styles.scss" + ], + "stylePreprocessorOptions": { + "includePaths": [ + "node_modules/" + ] + }, + ... + ``` + +3. Import the `MatProgressBarModule` and add it to the module that declares your component: + + ```ts + import {MatProgressBarModule} from '@angular/material/progress-bar'; + + @NgModule({ + declarations: [MyComponent], + imports: [MatProgressBarModule], + }) + export class MyModule {} + ``` + +4. Add use `` in your component's template, just like you would the normal + ``: + + ```html + + ``` + +5. Add the theme and typography mixins to your Sass: + + ```scss + @use '@angular/material' as mat; + + $my-primary: mat.define-palette(mat.$indigo-palette); + $my-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400); + $my-theme: mat.define-light-theme(( + color: ( + primary: $my-primary, + accent: $my-accent + ) + )); + + @include mat.progress-bar-theme($my-theme); + @include mat.progress-bar-typography($my-theme); + ``` diff --git a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.import.scss b/src/material/progress-bar/_progress-bar-theme.import.scss similarity index 100% rename from src/material-experimental/mdc-progress-bar/_progress-bar-theme.import.scss rename to src/material/progress-bar/_progress-bar-theme.import.scss diff --git a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss b/src/material/progress-bar/_progress-bar-theme.scss similarity index 66% rename from src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss rename to src/material/progress-bar/_progress-bar-theme.scss index 2b4468cc8c34..165922340b14 100644 --- a/src/material-experimental/mdc-progress-bar/_progress-bar-theme.scss +++ b/src/material/progress-bar/_progress-bar-theme.scss @@ -1,4 +1,5 @@ -@use '@angular/material' as mat; +@use '../core/mdc-helpers/mdc-helpers'; +@use '../core/theming/theming'; @use '@material/theme/theme-color' as mdc-theme-color; @use '@material/linear-progress' as mdc-linear-progress; @use 'sass:color'; @@ -10,14 +11,14 @@ // and doesn't match the Material design spec. For now we approximate the buffer background by // applying an opacity to the color of the bar. $buffer-color: color.adjust(mdc-theme-color.prop-value($color), $alpha: -0.75); - @include mdc-linear-progress.bar-color($color, $query: mat.$private-mdc-theme-styles-query); + @include mdc-linear-progress.bar-color($color, $query: mdc-helpers.$mdc-theme-styles-query); @include mdc-linear-progress.buffer-color($buffer-color, - $query: mat.$private-mdc-theme-styles-query); + $query: mdc-helpers.$mdc-theme-styles-query); } @mixin color($config-or-theme) { - $config: mat.get-color-config($config-or-theme); - @include mat.private-using-mdc-theme($config) { + $config: theming.get-color-config($config-or-theme); + @include mdc-helpers.using-mdc-theme($config) { .mat-mdc-progress-bar { @include _palette-styles(primary); @@ -37,11 +38,11 @@ @mixin density($config-or-theme) {} @mixin theme($theme-or-color-config) { - $theme: mat.private-legacy-get-theme($theme-or-color-config); - @include mat.private-check-duplicate-theme-styles($theme, 'mat-mdc-progress-bar') { - $color: mat.get-color-config($theme); - $density: mat.get-density-config($theme); - $typography: mat.get-typography-config($theme); + $theme: theming.private-legacy-get-theme($theme-or-color-config); + @include theming.private-check-duplicate-theme-styles($theme, 'mat-progress-bar') { + $color: theming.get-color-config($theme); + $density: theming.get-density-config($theme); + $typography: theming.get-typography-config($theme); @if $color != null { @include color($color); diff --git a/src/material-experimental/mdc-progress-bar/index.ts b/src/material/progress-bar/index.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/index.ts rename to src/material/progress-bar/index.ts diff --git a/src/material-experimental/mdc-progress-bar/module.ts b/src/material/progress-bar/module.ts similarity index 85% rename from src/material-experimental/mdc-progress-bar/module.ts rename to src/material/progress-bar/module.ts index be280df99a02..7ae0b60a14ac 100644 --- a/src/material-experimental/mdc-progress-bar/module.ts +++ b/src/material/progress-bar/module.ts @@ -7,7 +7,7 @@ */ import {NgModule} from '@angular/core'; -import {MatCommonModule} from '@angular/material-experimental/mdc-core'; +import {MatCommonModule} from '@angular/material/core'; import {MatProgressBar} from './progress-bar'; @NgModule({ diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.e2e.spec.ts b/src/material/progress-bar/progress-bar.e2e.spec.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/progress-bar.e2e.spec.ts rename to src/material/progress-bar/progress-bar.e2e.spec.ts diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.html b/src/material/progress-bar/progress-bar.html similarity index 100% rename from src/material-experimental/mdc-progress-bar/progress-bar.html rename to src/material/progress-bar/progress-bar.html diff --git a/src/material/progress-bar/progress-bar.md b/src/material/progress-bar/progress-bar.md new file mode 100644 index 000000000000..b9d708c70b24 --- /dev/null +++ b/src/material/progress-bar/progress-bar.md @@ -0,0 +1,50 @@ +`` is a horizontal progress-bar for indicating progress and activity. + +### Progress mode +The progress-bar supports four modes: determinate, indeterminate, buffer and query. + +#### Determinate +Operations where the percentage of the operation complete is known should use the +determinate indicator. + + + +This is the default mode and the progress is represented by the `value` property. + +#### Indeterminate +Operations where the user is asked to wait while something finishes and it’s +not necessary to indicate how long it will take should use the indeterminate indicator. + + + +In this mode the `value` property is ignored. + +#### Buffer +Use the `buffer` mode of the progress-bar to indicate some activity or loading from the server. + + + +In "buffer" mode, `value` determines the progress of the primary bar while the `bufferValue` is +used to show the additional buffering progress. + +#### Query +Use the `query` mode of the progress-bar to indicate pre-loading before the actual loading starts. + + + + +In "query" mode, the progress-bar renders as an inverted "indeterminate" bar. Once the response +progress is available, the `mode` should be changed to determinate to convey the progress. In +this mode the `value` property is ignored. + +### Theming +The color of a progress-bar can be changed by using the `color` property. By default, progress-bars +use the theme's primary color. This can be changed to `'accent'` or `'warn'`. + +### Accessibility + +`MatProgressBar` implements the ARIA `role="progressbar"` pattern. By default, the progress bar +sets `aria-valuemin` to `0` and `aria-valuemax` to `100`. Avoid changing these values, as this may +cause incompatibility with some assistive technology. + +Always provide an accessible label via `aria-label` or `aria-labelledby` for each progress bar. diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.scss b/src/material/progress-bar/progress-bar.scss similarity index 84% rename from src/material-experimental/mdc-progress-bar/progress-bar.scss rename to src/material/progress-bar/progress-bar.scss index 7d46ebee8893..3e3a629859c7 100644 --- a/src/material-experimental/mdc-progress-bar/progress-bar.scss +++ b/src/material/progress-bar/progress-bar.scss @@ -1,8 +1,8 @@ -@use '@angular/material' as mat; +@use '../core/mdc-helpers/mdc-helpers'; @use '@material/linear-progress' as mdc-linear-progress; -@include mat.private-disable-mdc-fallback-declarations { - @include mdc-linear-progress.core-styles($query: mat.$private-mdc-base-styles-query); +@include mdc-helpers.disable-mdc-fallback-declarations { + @include mdc-linear-progress.core-styles($query: mdc-helpers.$mdc-base-styles-query); } .mat-mdc-progress-bar { diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.spec.ts b/src/material/progress-bar/progress-bar.spec.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/progress-bar.spec.ts rename to src/material/progress-bar/progress-bar.spec.ts diff --git a/src/material-experimental/mdc-progress-bar/progress-bar.ts b/src/material/progress-bar/progress-bar.ts similarity index 98% rename from src/material-experimental/mdc-progress-bar/progress-bar.ts rename to src/material/progress-bar/progress-bar.ts index b0dc3d40ae18..4ff7cc2413eb 100644 --- a/src/material-experimental/mdc-progress-bar/progress-bar.ts +++ b/src/material/progress-bar/progress-bar.ts @@ -21,7 +21,7 @@ import { OnDestroy, ChangeDetectorRef, } from '@angular/core'; -import {CanColor, mixinColor} from '@angular/material-experimental/mdc-core'; +import {CanColor, mixinColor} from '@angular/material/core'; import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations'; import { MatLegacyProgressBarDefaultOptions, diff --git a/src/material-experimental/mdc-progress-bar/public-api.ts b/src/material/progress-bar/public-api.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/public-api.ts rename to src/material/progress-bar/public-api.ts diff --git a/src/material-experimental/mdc-progress-bar/testing/BUILD.bazel b/src/material/progress-bar/testing/BUILD.bazel similarity index 86% rename from src/material-experimental/mdc-progress-bar/testing/BUILD.bazel rename to src/material/progress-bar/testing/BUILD.bazel index aaaa4b925bf4..322926c3923a 100644 --- a/src/material-experimental/mdc-progress-bar/testing/BUILD.bazel +++ b/src/material/progress-bar/testing/BUILD.bazel @@ -20,8 +20,8 @@ ng_test_library( srcs = glob(["**/*.spec.ts"]), deps = [ ":testing", - "//src/material-experimental/mdc-progress-bar", "//src/material/legacy-progress-bar/testing:harness_tests_lib", + "//src/material/progress-bar", ], ) @@ -31,3 +31,8 @@ ng_web_test_suite( ":unit_tests_lib", ], ) + +filegroup( + name = "source-files", + srcs = glob(["**/*.ts"]), +) diff --git a/src/material-experimental/mdc-progress-bar/testing/index.ts b/src/material/progress-bar/testing/index.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/testing/index.ts rename to src/material/progress-bar/testing/index.ts diff --git a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.spec.ts b/src/material/progress-bar/testing/progress-bar-harness.spec.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.spec.ts rename to src/material/progress-bar/testing/progress-bar-harness.spec.ts diff --git a/src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts b/src/material/progress-bar/testing/progress-bar-harness.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/testing/progress-bar-harness.ts rename to src/material/progress-bar/testing/progress-bar-harness.ts diff --git a/src/material-experimental/mdc-progress-bar/testing/public-api.ts b/src/material/progress-bar/testing/public-api.ts similarity index 100% rename from src/material-experimental/mdc-progress-bar/testing/public-api.ts rename to src/material/progress-bar/testing/public-api.ts diff --git a/src/universal-app/kitchen-sink-mdc/kitchen-sink-mdc.ts b/src/universal-app/kitchen-sink-mdc/kitchen-sink-mdc.ts index a2ce2d092306..c0cd38132319 100644 --- a/src/universal-app/kitchen-sink-mdc/kitchen-sink-mdc.ts +++ b/src/universal-app/kitchen-sink-mdc/kitchen-sink-mdc.ts @@ -6,7 +6,7 @@ import {MatCheckboxModule} from '@angular/material-experimental/mdc-checkbox'; import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field'; import {MatInputModule} from '@angular/material-experimental/mdc-input'; import {MatListModule} from '@angular/material-experimental/mdc-list'; -import {MatProgressBarModule} from '@angular/material-experimental/mdc-progress-bar'; +import {MatProgressBarModule} from '@angular/material/progress-bar'; import {MatChipsModule} from '@angular/material-experimental/mdc-chips'; import {MatMenuModule} from '@angular/material-experimental/mdc-menu'; import {MatRadioModule} from '@angular/material-experimental/mdc-radio'; diff --git a/tools/public_api_guard/material/progress-bar-testing.md b/tools/public_api_guard/material/progress-bar-testing.md new file mode 100644 index 000000000000..04befba7c3bf --- /dev/null +++ b/tools/public_api_guard/material/progress-bar-testing.md @@ -0,0 +1,25 @@ +## API Report File for "components-srcs" + +> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). + +```ts + +import { ComponentHarness } from '@angular/cdk/testing'; +import { ComponentHarnessConstructor } from '@angular/cdk/testing'; +import { HarnessPredicate } from '@angular/cdk/testing'; +import { LegacyProgressBarHarnessFilters as ProgressBarHarnessFilters } from '@angular/material/legacy-progress-bar/testing'; + +// @public +export class MatProgressBarHarness extends ComponentHarness { + getMode(): Promise; + getValue(): Promise; + // (undocumented) + static hostSelector: string; + static with(this: ComponentHarnessConstructor, options?: ProgressBarHarnessFilters): HarnessPredicate; +} + +export { ProgressBarHarnessFilters } + +// (No @packageDocumentation comment for this package) + +``` diff --git a/tools/public_api_guard/material/progress-bar.md b/tools/public_api_guard/material/progress-bar.md new file mode 100644 index 000000000000..6e9b7493442e --- /dev/null +++ b/tools/public_api_guard/material/progress-bar.md @@ -0,0 +1,78 @@ +## API Report File for "components-srcs" + +> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/). + +```ts + +import { _AbstractConstructor } from '@angular/material/core'; +import { AfterViewInit } from '@angular/core'; +import { CanColor } from '@angular/material/core'; +import { ChangeDetectorRef } from '@angular/core'; +import { _Constructor } from '@angular/material/core'; +import { ElementRef } from '@angular/core'; +import { EventEmitter } from '@angular/core'; +import * as i0 from '@angular/core'; +import * as i2 from '@angular/material/core'; +import { MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS as MAT_PROGRESS_BAR_DEFAULT_OPTIONS } from '@angular/material/legacy-progress-bar'; +import { MAT_LEGACY_PROGRESS_BAR_LOCATION as MAT_PROGRESS_BAR_LOCATION } from '@angular/material/legacy-progress-bar'; +import { MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY as MAT_PROGRESS_BAR_LOCATION_FACTORY } from '@angular/material/legacy-progress-bar'; +import { MatLegacyProgressBarDefaultOptions as MatProgressBarDefaultOptions } from '@angular/material/legacy-progress-bar'; +import { MatLegacyProgressBarLocation as MatProgressBarLocation } from '@angular/material/legacy-progress-bar'; +import { NgZone } from '@angular/core'; +import { OnDestroy } from '@angular/core'; +import { LegacyProgressAnimationEnd as ProgressAnimationEnd } from '@angular/material/legacy-progress-bar'; + +export { MAT_PROGRESS_BAR_DEFAULT_OPTIONS } + +export { MAT_PROGRESS_BAR_LOCATION } + +export { MAT_PROGRESS_BAR_LOCATION_FACTORY } + +// @public (undocumented) +export class MatProgressBar extends _MatProgressBarBase implements AfterViewInit, OnDestroy, CanColor { + constructor(elementRef: ElementRef, _ngZone: NgZone, _changeDetectorRef: ChangeDetectorRef, _animationMode?: string | undefined, defaults?: MatProgressBarDefaultOptions); + readonly animationEnd: EventEmitter; + // (undocumented) + _animationMode?: string | undefined; + get bufferValue(): number; + set bufferValue(v: number); + _getBufferBarFlexBasis(): string; + _getPrimaryBarTransform(): string; + _isIndeterminate(): boolean; + _isNoopAnimation: boolean; + get mode(): ProgressBarMode; + set mode(value: ProgressBarMode); + // (undocumented) + ngAfterViewInit(): void; + // (undocumented) + ngOnDestroy(): void; + get value(): number; + set value(v: number); + // (undocumented) + static ɵcmp: i0.ɵɵComponentDeclaration; + // (undocumented) + static ɵfac: i0.ɵɵFactoryDeclaration; +} + +export { MatProgressBarDefaultOptions } + +export { MatProgressBarLocation } + +// @public (undocumented) +export class MatProgressBarModule { + // (undocumented) + static ɵfac: i0.ɵɵFactoryDeclaration; + // (undocumented) + static ɵinj: i0.ɵɵInjectorDeclaration; + // (undocumented) + static ɵmod: i0.ɵɵNgModuleDeclaration; +} + +export { ProgressAnimationEnd } + +// @public (undocumented) +export type ProgressBarMode = 'determinate' | 'indeterminate' | 'buffer' | 'query'; + +// (No @packageDocumentation comment for this package) + +``` From 2a1e03d676c2296cc78268264ad59eacd2c6d79e Mon Sep 17 00:00:00 2001 From: Wagner Maciel Date: Fri, 8 Jul 2022 14:29:47 -0700 Subject: [PATCH 5/5] feat(material/legacy-progress-bar): step 5. update the all-theme mixins --- src/material/core/_core.import.scss | 2 +- src/material/core/color/_all-color.import.scss | 2 +- src/material/core/density/private/_all-density.scss | 2 ++ src/material/core/theming/_all-theme.import.scss | 4 ++-- src/material/core/theming/_all-theme.scss | 2 +- src/material/core/theming/tests/test-css-variables-theme.scss | 2 -- src/material/core/typography/_all-typography.import.scss | 4 ++-- src/material/core/typography/_all-typography.scss | 2 +- src/material/legacy-core/theming/_all-theme.scss | 2 ++ src/material/legacy-core/typography/_all-typography.scss | 2 ++ 10 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/material/core/_core.import.scss b/src/material/core/_core.import.scss index 08cb87d93825..b0b533121baf 100644 --- a/src/material/core/_core.import.scss +++ b/src/material/core/_core.import.scss @@ -31,7 +31,7 @@ @forward '../icon/icon-theme.import'; @forward '../input/input-theme.import'; @forward '../menu/menu-theme.import'; -@forward '../legacy-progress-bar/progress-bar-theme.import'; +@forward '../progress-bar/progress-bar-theme.import'; @forward '../progress-spinner/progress-spinner-theme.import'; @forward '../radio/radio-theme.import'; @forward '../select/select-theme.import'; diff --git a/src/material/core/color/_all-color.import.scss b/src/material/core/color/_all-color.import.scss index 839e4a28f94f..3a2579da41f9 100644 --- a/src/material/core/color/_all-color.import.scss +++ b/src/material/core/color/_all-color.import.scss @@ -32,7 +32,7 @@ @forward '../../icon/icon-theme.import'; @forward '../../input/input-theme.import'; @forward '../../menu/menu-theme.import'; -@forward '../../legacy-progress-bar/progress-bar-theme.import'; +@forward '../../progress-bar/progress-bar-theme.import'; @forward '../../progress-spinner/progress-spinner-theme.import'; @forward '../../radio/radio-theme.import'; @forward '../../select/select-theme.import'; diff --git a/src/material/core/density/private/_all-density.scss b/src/material/core/density/private/_all-density.scss index 455c693ed583..a4a0babd824b 100644 --- a/src/material/core/density/private/_all-density.scss +++ b/src/material/core/density/private/_all-density.scss @@ -7,6 +7,7 @@ @use '../../../form-field/form-field-theme'; @use '../../../button-toggle/button-toggle-theme'; @use '../../../card/card-theme'; +@use '../../../progress-bar/progress-bar-theme'; @use '../../../tooltip/tooltip-theme'; // Includes all of the density styles. @@ -34,6 +35,7 @@ @include form-field-theme.density($config); @include button-toggle-theme.density($config); @include card-theme.density($config); + @include progress-bar-theme.density($config); @include tooltip-theme.density($config); } diff --git a/src/material/core/theming/_all-theme.import.scss b/src/material/core/theming/_all-theme.import.scss index a2ea7162b610..bbf7e7f93643 100644 --- a/src/material/core/theming/_all-theme.import.scss +++ b/src/material/core/theming/_all-theme.import.scss @@ -32,7 +32,7 @@ @forward '../../icon/icon-theme.import'; @forward '../../input/input-theme.import'; @forward '../../menu/menu-theme.import'; -@forward '../../legacy-progress-bar/progress-bar-theme.import'; +@forward '../../progress-bar/progress-bar-theme.import'; @forward '../../progress-spinner/progress-spinner-theme.import'; @forward '../../radio/radio-theme.import'; @forward '../../select/select-theme.import'; @@ -68,7 +68,7 @@ @import '../../list/list-theme'; @import '../../menu/menu-theme'; @import '../../paginator/paginator-theme'; -@import '../../legacy-progress-bar/progress-bar-theme'; +@import '../../progress-bar/progress-bar-theme'; @import '../../progress-spinner/progress-spinner-theme'; @import '../../radio/radio-theme'; @import '../../select/select-theme'; diff --git a/src/material/core/theming/_all-theme.scss b/src/material/core/theming/_all-theme.scss index 06f5f54fd443..4119252cd5ea 100644 --- a/src/material/core/theming/_all-theme.scss +++ b/src/material/core/theming/_all-theme.scss @@ -19,7 +19,7 @@ @use '../../list/list-theme'; @use '../../menu/menu-theme'; @use '../../paginator/paginator-theme'; -@use '../../legacy-progress-bar/progress-bar-theme'; +@use '../../progress-bar/progress-bar-theme'; @use '../../progress-spinner/progress-spinner-theme'; @use '../../radio/radio-theme'; @use '../../select/select-theme'; diff --git a/src/material/core/theming/tests/test-css-variables-theme.scss b/src/material/core/theming/tests/test-css-variables-theme.scss index 0d9b99b22c48..62db961eb4d9 100644 --- a/src/material/core/theming/tests/test-css-variables-theme.scss +++ b/src/material/core/theming/tests/test-css-variables-theme.scss @@ -22,7 +22,6 @@ @use '../../../list/list-theme'; @use '../../../menu/menu-theme'; @use '../../../paginator/paginator-theme'; -@use '../../../legacy-progress-bar/progress-bar-theme'; @use '../../../progress-spinner/progress-spinner-theme'; @use '../../../radio/radio-theme'; @use '../../../select/select-theme'; @@ -85,7 +84,6 @@ @include list-theme.theme($css-var-theme); @include menu-theme.theme($css-var-theme); @include paginator-theme.theme($css-var-theme); - @include progress-bar-theme.theme($css-var-theme); @include progress-spinner-theme.theme($css-var-theme); @include radio-theme.theme($css-var-theme); @include select-theme.theme($css-var-theme); diff --git a/src/material/core/typography/_all-typography.import.scss b/src/material/core/typography/_all-typography.import.scss index 36b335b5736a..0a2350eecd00 100644 --- a/src/material/core/typography/_all-typography.import.scss +++ b/src/material/core/typography/_all-typography.import.scss @@ -24,7 +24,7 @@ @forward '../../icon/icon-theme.import'; @forward '../../input/input-theme.import'; @forward '../../menu/menu-theme.import'; -@forward '../../legacy-progress-bar/progress-bar-theme.import'; +@forward '../../progress-bar/progress-bar-theme.import'; @forward '../../progress-spinner/progress-spinner-theme.import'; @forward '../../radio/radio-theme.import'; @forward '../../select/select-theme.import'; @@ -57,7 +57,7 @@ @import '../../list/list-theme'; @import '../../menu/menu-theme'; @import '../../paginator/paginator-theme'; -@import '../../legacy-progress-bar/progress-bar-theme'; +@import '../../progress-bar/progress-bar-theme'; @import '../../progress-spinner/progress-spinner-theme'; @import '../../radio/radio-theme'; @import '../../select/select-theme'; diff --git a/src/material/core/typography/_all-typography.scss b/src/material/core/typography/_all-typography.scss index cd6374f6c377..b4082906baee 100644 --- a/src/material/core/typography/_all-typography.scss +++ b/src/material/core/typography/_all-typography.scss @@ -18,7 +18,7 @@ @use '../../list/list-theme'; @use '../../menu/menu-theme'; @use '../../paginator/paginator-theme'; -@use '../../legacy-progress-bar/progress-bar-theme'; +@use '../../progress-bar/progress-bar-theme'; @use '../../progress-spinner/progress-spinner-theme'; @use '../../radio/radio-theme'; @use '../../select/select-theme'; diff --git a/src/material/legacy-core/theming/_all-theme.scss b/src/material/legacy-core/theming/_all-theme.scss index 49c205414307..1240358ba867 100644 --- a/src/material/legacy-core/theming/_all-theme.scss +++ b/src/material/legacy-core/theming/_all-theme.scss @@ -1,5 +1,6 @@ @use '../../core/theming/theming'; @use '../../legacy-card/card-theme'; +@use '../../legacy-progress-bar/progress-bar-theme'; @use '../../legacy-tooltip/tooltip-theme'; // Create a theme. @@ -7,6 +8,7 @@ $dedupe-key: 'angular-material-legacy-theme'; @include theming.private-check-duplicate-theme-styles($theme-or-color-config, $dedupe-key) { @include card-theme.theme($theme-or-color-config); + @include progress-bar-theme.theme($theme-or-color-config); @include tooltip-theme.theme($theme-or-color-config); } } diff --git a/src/material/legacy-core/typography/_all-typography.scss b/src/material/legacy-core/typography/_all-typography.scss index df1a69045f78..b201bcacefb1 100644 --- a/src/material/legacy-core/typography/_all-typography.scss +++ b/src/material/legacy-core/typography/_all-typography.scss @@ -1,6 +1,7 @@ @use '../../core/typography/typography'; @use '../../core/theming/theming'; @use '../../legacy-card/card-theme'; +@use '../../legacy-progress-bar/progress-bar-theme'; @use '../../legacy-tooltip/tooltip-theme'; // Includes all of the typographic styles. @@ -20,6 +21,7 @@ // would then load `all-theme` again. This ultimately results a circular dependency. @include card-theme.typography($config); + @include progress-bar-theme.typography($config); @include tooltip-theme.typography($config); }