fix(material/progress-bar): remove dependency on legacy progress bar (#25581)

Fixes that the non-legacy progress bar was importing several symbols from the legacy version.

Author: crisbeto

src/material/legacy-progress-bar/BUILD.bazel

@@ -20,6 +20,7 @@ ng_module(
     assets = [":progress-bar.css"] + glob(["**/*.html"]),
     deps = [
         "//src/material/core",
+        "//src/material/progress-bar",
         "@npm//@angular/animations",
         "@npm//@angular/common",
         "@npm//@angular/core",

src/material/legacy-progress-bar/progress-bar.spec.ts

@@ -2,8 +2,12 @@ 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 {MatLegacyProgressBarModule, MAT_LEGACY_PROGRESS_BAR_LOCATION} from './index';
-import {MatLegacyProgressBar, MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS} from './progress-bar';
+import {
+  MatLegacyProgressBarModule,
+  MAT_LEGACY_PROGRESS_BAR_LOCATION,
+  MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS,
+} from './index';
+import {MatLegacyProgressBar} from './progress-bar';
 
 describe('MatProgressBar', () => {
   let fakePath: string;

src/material/legacy-progress-bar/progress-bar.ts

@@ -6,16 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {coerceNumberProperty, NumberInput} from '@angular/cdk/coercion';
-import {DOCUMENT} from '@angular/common';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
   Component,
   ElementRef,
   EventEmitter,
   Inject,
-  inject,
-  InjectionToken,
   Input,
   NgZone,
   OnDestroy,
@@ -25,22 +22,21 @@ import {
   ViewEncapsulation,
   ChangeDetectorRef,
 } from '@angular/core';
-import {CanColor, mixinColor, ThemePalette} from '@angular/material/core';
+import {CanColor, mixinColor} from '@angular/material/core';
+import {
+  MatProgressBarDefaultOptions,
+  MAT_PROGRESS_BAR_DEFAULT_OPTIONS,
+  ProgressAnimationEnd,
+  ProgressBarMode,
+  MAT_PROGRESS_BAR_LOCATION,
+  MatProgressBarLocation,
+} from '@angular/material/progress-bar';
 import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
 import {fromEvent, Observable, Subscription} from 'rxjs';
 import {filter} from 'rxjs/operators';
 
 // TODO(josephperrott): Add ARIA attributes for progress bar "for".
 
-/**
- * Last animation end data.
- * @deprecated Use `ProgressAnimationEnd` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export interface LegacyProgressAnimationEnd {
-  value: number;
-}
-
 // Boilerplate for applying mixins to MatProgressBar.
 /** @docs-private */
 const _MatProgressBarBase = mixinColor(
@@ -50,71 +46,6 @@ const _MatProgressBarBase = mixinColor(
   'primary',
 );
 
-/**
- * Injection token used to provide the current location to `MatProgressBar`.
- * Used to handle server-side rendering and to stub out during unit tests.
- * @docs-private
- * @deprecated Use `MAT_PROGRESS_BAR_LOCATION` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export const MAT_LEGACY_PROGRESS_BAR_LOCATION = new InjectionToken<MatLegacyProgressBarLocation>(
-  'mat-progress-bar-location',
-  {providedIn: 'root', factory: MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY},
-);
-
-/**
- * Stubbed out location for `MatProgressBar`.
- * @docs-private
- * @deprecated Use `MatProgressBarLocation` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export interface MatLegacyProgressBarLocation {
-  getPathname: () => string;
-}
-
-/**
- * @docs-private
- * @deprecated Use `MAT_PROGRESS_BAR_LOCATION_FACTORY` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export function MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY(): MatLegacyProgressBarLocation {
-  const _document = inject(DOCUMENT);
-  const _location = _document ? _document.location : null;
-
-  return {
-    // Note that this needs to be a function, rather than a property, because Angular
-    // will only resolve it once, but we want the current path on each call.
-    getPathname: () => (_location ? _location.pathname + _location.search : ''),
-  };
-}
-
-/**
- * @deprecated Use `ProgressBarMode` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export type LegacyProgressBarMode = 'determinate' | 'indeterminate' | 'buffer' | 'query';
-
-/**
- * Default `mat-progress-bar` options that can be overridden.
- * @deprecated Use `MatProgressBarDefaultOptions` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export interface MatLegacyProgressBarDefaultOptions {
-  /** Default color of the progress bar. */
-  color?: ThemePalette;
-
-  /** Default mode of the progress bar. */
-  mode?: LegacyProgressBarMode;
-}
-
-/**
- * Injection token to be used to override the default options for `mat-progress-bar`.
- * @deprecated Use `MAT_PROGRESS_BAR_DEFAULT_OPTIONS` from `@angular/material/progress-bar` instead. See https://material.angular.io/guide/mdc-migration for information about migrating.
- * @breaking-change 17.0.0
- */
-export const MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS =
-  new InjectionToken<MatLegacyProgressBarDefaultOptions>('MAT_PROGRESS_BAR_DEFAULT_OPTIONS');
-
 /** Counter used to generate unique IDs for progress bars. */
 let progressbarId = 0;
 
@@ -156,10 +87,10 @@ export class MatLegacyProgressBar
      * @deprecated `location` parameter to be made required.
      * @breaking-change 8.0.0
      */
-    @Optional() @Inject(MAT_LEGACY_PROGRESS_BAR_LOCATION) location?: MatLegacyProgressBarLocation,
+    @Optional() @Inject(MAT_PROGRESS_BAR_LOCATION) location?: MatProgressBarLocation,
     @Optional()
-    @Inject(MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS)
-    defaults?: MatLegacyProgressBarDefaultOptions,
+    @Inject(MAT_PROGRESS_BAR_DEFAULT_OPTIONS)
+    defaults?: MatProgressBarDefaultOptions,
     /**
      * @deprecated `_changeDetectorRef` parameter to be made required.
      * @breaking-change 11.0.0
@@ -223,7 +154,7 @@ export class MatLegacyProgressBar
    * be emitted when animations are disabled, nor will it be emitted for modes with continuous
    * animations (indeterminate and query).
    */
-  @Output() readonly animationEnd = new EventEmitter<LegacyProgressAnimationEnd>();
+  @Output() readonly animationEnd = new EventEmitter<ProgressAnimationEnd>();
 
   /** Reference to animation end subscription to be unsubscribed on destroy. */
   private _animationEndSubscription: Subscription = Subscription.EMPTY;
@@ -235,7 +166,7 @@ export class MatLegacyProgressBar
    * 'determinate'.
    * Mirrored to mode attribute.
    */
-  @Input() mode: LegacyProgressBarMode = 'determinate';
+  @Input() mode: ProgressBarMode = 'determinate';
 
   /** ID of the progress bar. */
   progressbarId = `mat-progress-bar-${progressbarId++}`;

src/material/legacy-progress-bar/public-api.ts

@@ -7,13 +7,14 @@
  */
 
 export {MatLegacyProgressBarModule} from './progress-bar-module';
+export {MatLegacyProgressBar} from './progress-bar';
+
 export {
-  LegacyProgressAnimationEnd,
-  MAT_LEGACY_PROGRESS_BAR_LOCATION,
-  MatLegacyProgressBarLocation,
-  MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY,
-  LegacyProgressBarMode,
-  MatLegacyProgressBarDefaultOptions,
-  MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS,
-  MatLegacyProgressBar,
-} from './progress-bar';
+  MatProgressBarDefaultOptions as MatLegacyProgressBarDefaultOptions,
+  MAT_PROGRESS_BAR_DEFAULT_OPTIONS as MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS,
+  ProgressAnimationEnd as LegacyProgressAnimationEnd,
+  ProgressBarMode as LegacyProgressBarMode,
+  MAT_PROGRESS_BAR_LOCATION as MAT_LEGACY_PROGRESS_BAR_LOCATION,
+  MatProgressBarLocation as MatLegacyProgressBarLocation,
+  MAT_PROGRESS_BAR_LOCATION_FACTORY as MAT_LEGACY_PROGRESS_BAR_LOCATION_FACTORY,
+} from '@angular/material/progress-bar';

src/material/legacy-progress-bar/testing/BUILD.bazel

@@ -11,6 +11,7 @@ ts_library(
     deps = [
         "//src/cdk/coercion",
         "//src/cdk/testing",
+        "//src/material/progress-bar/testing",
     ],
 )
 
@@ -19,28 +20,13 @@ filegroup(
     srcs = glob(["**/*.ts"]),
 )
 
-ng_test_library(
-    name = "harness_tests_lib",
-    srcs = ["shared.spec.ts"],
-    deps = [
-        ":testing",
-        "//src/cdk/testing",
-        "//src/cdk/testing/testbed",
-        "//src/material/legacy-progress-bar",
-        "@npm//@angular/platform-browser",
-    ],
-)
-
 ng_test_library(
     name = "unit_tests_lib",
-    srcs = glob(
-        ["**/*.spec.ts"],
-        exclude = ["shared.spec.ts"],
-    ),
+    srcs = glob(["**/*.spec.ts"]),
     deps = [
-        ":harness_tests_lib",
         ":testing",
         "//src/material/legacy-progress-bar",
+        "//src/material/progress-bar/testing:harness_tests_lib",
     ],
 )
 

src/material/legacy-progress-bar/testing/progress-bar-harness-filters.ts

@@ -1,7 +1,7 @@
 import {MatLegacyProgressBarModule} from '@angular/material/legacy-progress-bar';
-import {runHarnessTests} from '@angular/material/legacy-progress-bar/testing/shared.spec';
+import {runHarnessTests} from '@angular/material/progress-bar/testing/shared.spec';
 import {MatLegacyProgressBarHarness} from './progress-bar-harness';
 
 describe('MatProgressBarHarness', () => {
-  runHarnessTests(MatLegacyProgressBarModule, MatLegacyProgressBarHarness);
+  runHarnessTests(MatLegacyProgressBarModule, MatLegacyProgressBarHarness as any);
 });

src/material/legacy-progress-bar/testing/progress-bar-harness.spec.ts

@@ -8,7 +8,7 @@
 
 import {coerceNumberProperty} from '@angular/cdk/coercion';
 import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
-import {LegacyProgressBarHarnessFilters} from './progress-bar-harness-filters';
+import {ProgressBarHarnessFilters} from '@angular/material/progress-bar/testing';
 
 /**
  * Harness for interacting with a standard mat-progress-bar in tests.
@@ -26,7 +26,7 @@ export class MatLegacyProgressBarHarness extends ComponentHarness {
    * @return a `HarnessPredicate` configured with the given options.
    */
   static with(
-    options: LegacyProgressBarHarnessFilters = {},
+    options: ProgressBarHarnessFilters = {},
   ): HarnessPredicate<MatLegacyProgressBarHarness> {
     return new HarnessPredicate(MatLegacyProgressBarHarness, options);
   }

src/material/legacy-progress-bar/testing/progress-bar-harness.ts

@@ -7,4 +7,4 @@
  */
 
 export {MatLegacyProgressBarHarness} from './progress-bar-harness';
-export {LegacyProgressBarHarnessFilters} from './progress-bar-harness-filters';
+export {ProgressBarHarnessFilters as LegacyProgressBarHarnessFilters} from '@angular/material/progress-bar/testing';

src/material/legacy-progress-bar/testing/public-api.ts

@@ -23,7 +23,6 @@ ng_module(
     assets = [":progress_bar_scss"] + glob(["**/*.html"]),
     deps = [
         "//src/material/core",
-        "//src/material/legacy-progress-bar",
         "@npm//@angular/core",
     ],
 )

src/material/progress-bar/BUILD.bazel

@@ -20,16 +20,63 @@ import {
   AfterViewInit,
   OnDestroy,
   ChangeDetectorRef,
+  InjectionToken,
+  inject,
 } from '@angular/core';
-import {CanColor, mixinColor} from '@angular/material/core';
+import {DOCUMENT} from '@angular/common';
+import {CanColor, mixinColor, ThemePalette} from '@angular/material/core';
 import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
-import {
-  MatLegacyProgressBarDefaultOptions,
-  MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS,
-  LegacyProgressAnimationEnd,
-} from '@angular/material/legacy-progress-bar';
 import {coerceNumberProperty, NumberInput} from '@angular/cdk/coercion';
 
+/** Last animation end data. */
+export interface ProgressAnimationEnd {
+  value: number;
+}
+
+/** Default `mat-progress-bar` options that can be overridden. */
+export interface MatProgressBarDefaultOptions {
+  /** Default color of the progress bar. */
+  color?: ThemePalette;
+
+  /** Default mode of the progress bar. */
+  mode?: ProgressBarMode;
+}
+
+/** Injection token to be used to override the default options for `mat-progress-bar`. */
+export const MAT_PROGRESS_BAR_DEFAULT_OPTIONS = new InjectionToken<MatProgressBarDefaultOptions>(
+  'MAT_PROGRESS_BAR_DEFAULT_OPTIONS',
+);
+
+/**
+ * Injection token used to provide the current location to `MatProgressBar`.
+ * Used to handle server-side rendering and to stub out during unit tests.
+ * @docs-private
+ */
+export const MAT_PROGRESS_BAR_LOCATION = new InjectionToken<MatProgressBarLocation>(
+  'mat-progress-bar-location',
+  {providedIn: 'root', factory: MAT_PROGRESS_BAR_LOCATION_FACTORY},
+);
+
+/**
+ * Stubbed out location for `MatProgressBar`.
+ * @docs-private
+ */
+export interface MatProgressBarLocation {
+  getPathname: () => string;
+}
+
+/** @docs-private */
+export function MAT_PROGRESS_BAR_LOCATION_FACTORY(): MatProgressBarLocation {
+  const _document = inject(DOCUMENT);
+  const _location = _document ? _document.location : null;
+
+  return {
+    // Note that this needs to be a function, rather than a property, because Angular
+    // will only resolve it once, but we want the current path on each call.
+    getPathname: () => (_location ? _location.pathname + _location.search : ''),
+  };
+}
+
 // Boilerplate for applying mixins to MatProgressBar.
 /** @docs-private */
 const _MatProgressBarBase = mixinColor(
@@ -74,8 +121,8 @@ export class MatProgressBar
     private _changeDetectorRef: ChangeDetectorRef,
     @Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string,
     @Optional()
-    @Inject(MAT_LEGACY_PROGRESS_BAR_DEFAULT_OPTIONS)
-    defaults?: MatLegacyProgressBarDefaultOptions,
+    @Inject(MAT_PROGRESS_BAR_DEFAULT_OPTIONS)
+    defaults?: MatProgressBarDefaultOptions,
   ) {
     super(elementRef);
     this._isNoopAnimation = _animationMode === 'NoopAnimations';
@@ -119,7 +166,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<LegacyProgressAnimationEnd>();
+  @Output() readonly animationEnd = new EventEmitter<ProgressAnimationEnd>();
 
   /**
    * Mode of the progress bar.