7. reverse the tabs -> legacy-tabs dependency

Author: mmalerba

src/material/legacy-tabs/BUILD.bazel

@@ -34,6 +34,7 @@ ng_module(
         "//src/cdk/portal",
         "//src/cdk/scrolling",
         "//src/material/core",
+        "//src/material/tabs",
         "@npm//@angular/animations",
         "@npm//@angular/common",
         "@npm//@angular/core",

src/material/legacy-tabs/ink-bar.ts

@@ -6,39 +6,10 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {Directive, ElementRef, Inject, InjectionToken, NgZone, Optional} from '@angular/core';
+import {Directive, ElementRef, Inject, NgZone, Optional} from '@angular/core';
 import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
 import {take} from 'rxjs/operators';
-
-/**
- * Interface for a a MatInkBar positioner method, defining the positioning and width of the ink
- * bar in a set of tabs.
- */
-export interface _MatLegacyInkBarPositioner {
-  (element: HTMLElement): {left: string; width: string};
-}
-
-/** Injection token for the MatInkBar's Positioner. */
-export const _MAT_LEGACY_INK_BAR_POSITIONER = new InjectionToken<_MatLegacyInkBarPositioner>(
-  'MatInkBarPositioner',
-  {
-    providedIn: 'root',
-    factory: _MAT_LEGACY_INK_BAR_POSITIONER_FACTORY,
-  },
-);
-
-/**
- * The default positioner function for the MatInkBar.
- * @docs-private
- */
-export function _MAT_LEGACY_INK_BAR_POSITIONER_FACTORY(): _MatLegacyInkBarPositioner {
-  const method = (element: HTMLElement) => ({
-    left: element ? (element.offsetLeft || 0) + 'px' : '0',
-    width: element ? (element.offsetWidth || 0) + 'px' : '0',
-  });
-
-  return method;
-}
+import {_MAT_INK_BAR_POSITIONER, _MatInkBarPositioner} from '@angular/material/tabs';
 
 /**
  * The ink-bar is used to display and animate the line underneath the current active tab label.
@@ -55,7 +26,7 @@ export class MatLegacyInkBar {
   constructor(
     private _elementRef: ElementRef<HTMLElement>,
     private _ngZone: NgZone,
-    @Inject(_MAT_LEGACY_INK_BAR_POSITIONER) private _inkBarPositioner: _MatLegacyInkBarPositioner,
+    @Inject(_MAT_INK_BAR_POSITIONER) private _inkBarPositioner: _MatInkBarPositioner,
     @Optional() @Inject(ANIMATION_MODULE_TYPE) public _animationMode?: string,
   ) {}
 

src/material/legacy-tabs/public-api.ts

@@ -6,32 +6,37 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {_MatTabBase} from '@angular/material/tabs';
+
 export {MatLegacyTabsModule} from './tabs-module';
 export * from './tab-group';
-export {
-  MatLegacyInkBar,
-  _MatLegacyInkBarPositioner,
-  _MAT_LEGACY_INK_BAR_POSITIONER,
-} from './ink-bar';
-export {
-  MatLegacyTabBody,
-  _MatLegacyTabBodyBase,
-  MatLegacyTabBodyOriginState,
-  MatLegacyTabBodyPositionState,
-  MatLegacyTabBodyPortal,
-} from './tab-body';
-export {MatLegacyTabHeader, _MatLegacyTabHeaderBase} from './tab-header';
+export {MatLegacyInkBar} from './ink-bar';
+export {MatLegacyTabBody, MatLegacyTabBodyPortal} from './tab-body';
+export {MatLegacyTabHeader} from './tab-header';
+export {MatLegacyTab} from './tab';
+export {MatLegacyTabNav, MatLegacyTabLink, MatLegacyTabNavPanel} from './tab-nav-bar/index';
+export {MatLegacyTabLabel} from './tab-label';
 export {MatLegacyTabLabelWrapper} from './tab-label-wrapper';
-export {MatLegacyTab, MAT_LEGACY_TAB_GROUP} from './tab';
-export {MatLegacyTabLabel, MAT_LEGACY_TAB} from './tab-label';
-export {
-  MatLegacyTabNav,
-  MatLegacyTabLink,
-  MatLegacyTabNavPanel,
-  _MatLegacyTabNavBase,
-  _MatLegacyTabLinkBase,
-} from './tab-nav-bar/index';
 export {MatLegacyTabContent} from './tab-content';
-export {LegacyScrollDirection} from './paginated-tab-header';
-export * from './tabs-animations';
-export {MAT_LEGACY_TABS_CONFIG, MatLegacyTabsConfig} from './tab-config';
+export {
+  _MatTabNavBase as _MatLegacyTabNavBase,
+  _MatTabLinkBase as _MatLegacyTabLinkBase,
+  MatTabsConfig as MatLegacyTabsConfig,
+  MAT_TABS_CONFIG as MAT_LEGACY_TABS_CONFIG,
+  _MatTabBase as _MatLegacyTabBase,
+  MAT_TAB as MAT_LEGACY_TAB,
+  ScrollDirection as LegacyScrollDirection,
+  MAT_TAB_GROUP as MAT_LEGACY_TAB_GROUP,
+  _MatTabBodyBase as _MatLegacyTabBodyBase,
+  MatTabBodyPositionState as MatLegacyTabBodyPositionState,
+  matTabsAnimations as matLegacyTabsAnimations,
+  MAT_TAB_CONTENT as MAT_LEGACY_TAB_CONTENT,
+  MatTabBodyOriginState as MatLegacyTabBodyOriginState,
+  _MatInkBarPositioner as _MatLegacyInkBarPositioner,
+  _MAT_INK_BAR_POSITIONER as _MAT_LEGACY_INK_BAR_POSITIONER,
+  _MAT_INK_BAR_POSITIONER_FACTORY as _MAT_LEGACY_INK_BAR_POSITIONER_FACTORY,
+  MatTabChangeEvent as MatLegacyTabChangeEvent,
+  _MatTabGroupBase as _MatLegacyTabGroupBase,
+  MatTabHeaderPosition as MatLegacyTabHeaderPosition,
+  _MatTabHeaderBase as _MatLegacyTabHeaderBase,
+} from '@angular/material/tabs';