Skip to content

Commit b701209

Browse files
committed
fix issues after rebase
1 parent 2e511ae commit b701209

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

src/dev-app/mdc-slider/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ ng_module(
99
"mdc-slider-demo.html",
1010
],
1111
deps = [
12-
"//src/material/tabs",
1312
"//src/material/slider",
13+
"//src/material/tabs",
1414
"@npm//@angular/forms",
1515
],
1616
)

src/e2e-app/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ ng_module(
7171
"//src/material/select",
7272
"//src/material/sidenav",
7373
"//src/material/slide-toggle",
74+
"//src/material/slider",
7475
"//src/material/tabs",
7576
"@npm//@angular/animations",
7677
"@npm//@angular/core",

tools/public_api_guard/material/tabs.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ import * as i12 from '@angular/cdk/observers';
3535
import * as i13 from '@angular/cdk/a11y';
3636
import * as i9 from '@angular/common';
3737
import { InjectionToken } from '@angular/core';
38-
import { MatPaginatedTabHeader as MatPaginatedTabHeader_2 } from '@angular/material/tabs/paginated-tab-header';
39-
import { MatTabsConfig as MatTabsConfig_2 } from '@angular/material/tabs/tab-config';
4038
import { NgZone } from '@angular/core';
4139
import { NumberInput } from '@angular/cdk/coercion';
4240
import { OnChanges } from '@angular/core';
@@ -71,7 +69,7 @@ export const MAT_TAB_CONTENT: InjectionToken<MatTabContent>;
7169
export const MAT_TAB_GROUP: InjectionToken<any>;
7270

7371
// @public
74-
const MAT_TAB_LABEL: InjectionToken<MatTabLabel>;
72+
export const MAT_TAB_LABEL: InjectionToken<MatTabLabel>;
7573

7674
// @public
7775
export const MAT_TABS_CONFIG: InjectionToken<MatTabsConfig>;
@@ -283,7 +281,7 @@ export class MatTabContent {
283281

284282
// @public
285283
export class MatTabGroup extends _MatTabGroupBase {
286-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, defaultConfig?: MatTabsConfig_2, animationMode?: string);
284+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, defaultConfig?: MatTabsConfig, animationMode?: string);
287285
// (undocumented)
288286
_allTabs: QueryList<MatTab>;
289287
get fitInkBarToContent(): boolean;
@@ -302,7 +300,7 @@ export class MatTabGroup extends _MatTabGroupBase {
302300

303301
// @public
304302
export abstract class _MatTabGroupBase extends _MatTabGroupMixinBase implements AfterContentInit, AfterContentChecked, OnDestroy, CanColor, CanDisableRipple {
305-
constructor(elementRef: ElementRef, _changeDetectorRef: ChangeDetectorRef, defaultConfig?: MatTabsConfig_2, _animationMode?: string | undefined);
303+
constructor(elementRef: ElementRef, _changeDetectorRef: ChangeDetectorRef, defaultConfig?: MatTabsConfig, _animationMode?: string | undefined);
306304
abstract _allTabs: QueryList<MatTab>;
307305
readonly animationDone: EventEmitter<void>;
308306
get animationDuration(): string;
@@ -391,7 +389,7 @@ export class MatTabHeader extends _MatTabHeaderBase implements AfterContentInit
391389
}
392390

393391
// @public
394-
export abstract class _MatTabHeaderBase extends MatPaginatedTabHeader_2 implements AfterContentChecked, AfterContentInit, AfterViewInit, OnDestroy {
392+
export abstract class _MatTabHeaderBase extends MatPaginatedTabHeader implements AfterContentChecked, AfterContentInit, AfterViewInit, OnDestroy {
395393
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, viewportRuler: ViewportRuler, dir: Directionality, ngZone: NgZone, platform: Platform, animationMode?: string);
396394
get disableRipple(): boolean;
397395
set disableRipple(value: BooleanInput);

0 commit comments

Comments
 (0)