Skip to content

Commit 671bb8e

Browse files
committed
fix g3 sync issues
1 parent b701209 commit 671bb8e

File tree

8 files changed

+32
-24
lines changed

8 files changed

+32
-24
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ export {
3939
_MatTabGroupBase as _MatLegacyTabGroupBase,
4040
MatTabHeaderPosition as MatLegacyTabHeaderPosition,
4141
_MatTabHeaderBase as _MatLegacyTabHeaderBase,
42+
MatPaginatedTabHeader as MatLegacyPaginatedTabHeader,
4243
} from '@angular/material/tabs';

src/material/legacy-tabs/tab-body.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ import {
2323
import {CdkPortalOutlet} from '@angular/cdk/portal';
2424
import {Directionality} from '@angular/cdk/bidi';
2525
import {DOCUMENT} from '@angular/common';
26-
import {_MatTabBodyBase, MatTabBodyPortal, matTabsAnimations} from '@angular/material/tabs';
26+
import {
27+
_MatTabBodyBase,
28+
MatTabBodyPortal as MatNonLegacyTabBodyPortal,
29+
matTabsAnimations,
30+
} from '@angular/material/tabs';
2731

2832
/**
2933
* The portal host directive for the contents of the tab.
@@ -32,7 +36,7 @@ import {_MatTabBodyBase, MatTabBodyPortal, matTabsAnimations} from '@angular/mat
3236
@Directive({
3337
selector: '[matTabBodyHost]',
3438
})
35-
export class MatLegacyTabBodyPortal extends MatTabBodyPortal {
39+
export class MatLegacyTabBodyPortal extends MatNonLegacyTabBodyPortal {
3640
constructor(
3741
componentFactoryResolver: ComponentFactoryResolver,
3842
viewContainerRef: ViewContainerRef,

src/material/legacy-tabs/tab-content.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*/
88

99
import {Directive} from '@angular/core';
10-
import {MAT_TAB_CONTENT, MatTabContent} from '@angular/material/tabs';
10+
import {MAT_TAB_CONTENT, MatTabContent as MatNonLegacyTabContent} from '@angular/material/tabs';
1111

1212
/** Decorates the `ng-template` tags and reads out the template from it. */
1313
@Directive({
1414
selector: '[matTabContent]',
1515
providers: [{provide: MAT_TAB_CONTENT, useExisting: MatLegacyTabContent}],
1616
})
17-
export class MatLegacyTabContent extends MatTabContent {}
17+
export class MatLegacyTabContent extends MatNonLegacyTabContent {}

src/material/legacy-tabs/tab-label.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
*/
88

99
import {Directive} from '@angular/core';
10-
import {MAT_TAB_LABEL, MatTabLabel} from '@angular/material/tabs';
10+
import {MAT_TAB_LABEL, MatTabLabel as MatNonLegacyTabLabel} from '@angular/material/tabs';
1111

1212
/** Used to flag tab labels for use with the portal directive */
1313
@Directive({
1414
selector: '[mat-tab-label], [matTabLabel]',
1515
providers: [{provide: MAT_TAB_LABEL, useExisting: MatLegacyTabLabel}],
1616
})
17-
export class MatLegacyTabLabel extends MatTabLabel {}
17+
export class MatLegacyTabLabel extends MatNonLegacyTabLabel {}

src/material/legacy-tabs/testing/tab-group-harness.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {ComponentHarness, HarnessPredicate, parallel} from '@angular/cdk/testing';
1010
import {LegacyTabGroupHarnessFilters, LegacyTabHarnessFilters} from './tab-harness-filters';
11-
import {MaLegacytTabHarness} from './tab-harness';
11+
import {MatLegacyTabHarness} from './tab-harness';
1212

1313
/** Harness for interacting with a standard mat-tab-group in tests. */
1414
export class MatLegacyTabGroupHarness extends ComponentHarness {
@@ -38,12 +38,12 @@ export class MatLegacyTabGroupHarness extends ComponentHarness {
3838
* Gets the list of tabs in the tab group.
3939
* @param filter Optionally filters which tabs are included.
4040
*/
41-
async getTabs(filter: LegacyTabHarnessFilters = {}): Promise<MaLegacytTabHarness[]> {
42-
return this.locatorForAll(MaLegacytTabHarness.with(filter))();
41+
async getTabs(filter: LegacyTabHarnessFilters = {}): Promise<MatLegacyTabHarness[]> {
42+
return this.locatorForAll(MatLegacyTabHarness.with(filter))();
4343
}
4444

4545
/** Gets the selected tab of the tab group. */
46-
async getSelectedTab(): Promise<MaLegacytTabHarness> {
46+
async getSelectedTab(): Promise<MatLegacyTabHarness> {
4747
const tabs = await this.getTabs();
4848
const isSelected = await parallel(() => tabs.map(t => t.isSelected()));
4949
for (let i = 0; i < tabs.length; i++) {

src/material/legacy-tabs/testing/tab-harness.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
import {LegacyTabHarnessFilters} from './tab-harness-filters';
1515

1616
/** Harness for interacting with a standard Angular Material tab-label in tests. */
17-
export class MaLegacytTabHarness extends ContentContainerComponentHarness<string> {
17+
export class MatLegacyTabHarness extends ContentContainerComponentHarness<string> {
1818
/** The selector for the host element of a `MatTab` instance. */
1919
static hostSelector = '.mat-tab-label';
2020

@@ -24,8 +24,8 @@ export class MaLegacytTabHarness extends ContentContainerComponentHarness<string
2424
* @param options Options for filtering which tab instances are considered a match.
2525
* @return a `HarnessPredicate` configured with the given options.
2626
*/
27-
static with(options: LegacyTabHarnessFilters = {}): HarnessPredicate<MaLegacytTabHarness> {
28-
return new HarnessPredicate(MaLegacytTabHarness, options).addOption(
27+
static with(options: LegacyTabHarnessFilters = {}): HarnessPredicate<MatLegacyTabHarness> {
28+
return new HarnessPredicate(MatLegacyTabHarness, options).addOption(
2929
'label',
3030
options.label,
3131
(harness, label) => HarnessPredicate.stringMatches(harness.getLabel(), label),

tools/public_api_guard/material/legacy-tabs-testing.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,16 @@ export interface LegacyTabNavPanelHarnessFilters extends BaseHarnessFilters {
3434
}
3535

3636
// @public
37-
export class MaLegacytTabHarness extends ContentContainerComponentHarness<string> {
37+
export class MatLegacyTabGroupHarness extends ComponentHarness {
38+
getSelectedTab(): Promise<MatLegacyTabHarness>;
39+
getTabs(filter?: LegacyTabHarnessFilters): Promise<MatLegacyTabHarness[]>;
40+
static hostSelector: string;
41+
selectTab(filter?: LegacyTabHarnessFilters): Promise<void>;
42+
static with(options?: LegacyTabGroupHarnessFilters): HarnessPredicate<MatLegacyTabGroupHarness>;
43+
}
44+
45+
// @public
46+
export class MatLegacyTabHarness extends ContentContainerComponentHarness<string> {
3847
getAriaLabel(): Promise<string | null>;
3948
getAriaLabelledby(): Promise<string | null>;
4049
getLabel(): Promise<string>;
@@ -45,16 +54,7 @@ export class MaLegacytTabHarness extends ContentContainerComponentHarness<string
4554
isDisabled(): Promise<boolean>;
4655
isSelected(): Promise<boolean>;
4756
select(): Promise<void>;
48-
static with(options?: LegacyTabHarnessFilters): HarnessPredicate<MaLegacytTabHarness>;
49-
}
50-
51-
// @public
52-
export class MatLegacyTabGroupHarness extends ComponentHarness {
53-
getSelectedTab(): Promise<MaLegacytTabHarness>;
54-
getTabs(filter?: LegacyTabHarnessFilters): Promise<MaLegacytTabHarness[]>;
55-
static hostSelector: string;
56-
selectTab(filter?: LegacyTabHarnessFilters): Promise<void>;
57-
static with(options?: LegacyTabGroupHarnessFilters): HarnessPredicate<MatLegacyTabGroupHarness>;
57+
static with(options?: LegacyTabHarnessFilters): HarnessPredicate<MatLegacyTabHarness>;
5858
}
5959

6060
// @public

tools/public_api_guard/material/legacy-tabs.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import { MAT_TAB_CONTENT as MAT_LEGACY_TAB_CONTENT } from '@angular/material/tab
2424
import { MAT_TAB_GROUP as MAT_LEGACY_TAB_GROUP } from '@angular/material/tabs';
2525
import { MAT_TABS_CONFIG as MAT_LEGACY_TABS_CONFIG } from '@angular/material/tabs';
2626
import { _MatInkBarPositioner as _MatLegacyInkBarPositioner } from '@angular/material/tabs';
27+
import { MatPaginatedTabHeader as MatLegacyPaginatedTabHeader } from '@angular/material/tabs';
2728
import { _MatTabBase as _MatLegacyTabBase } from '@angular/material/tabs';
2829
import { _MatTabBodyBase as _MatLegacyTabBodyBase } from '@angular/material/tabs';
2930
import { MatTabBodyOriginState as MatLegacyTabBodyOriginState } from '@angular/material/tabs';
@@ -80,6 +81,8 @@ export class MatLegacyInkBar {
8081

8182
export { _MatLegacyInkBarPositioner }
8283

84+
export { MatLegacyPaginatedTabHeader }
85+
8386
// @public (undocumented)
8487
export class MatLegacyTab extends _MatLegacyTabBase {
8588
_explicitContent: TemplateRef<any>;

0 commit comments

Comments
 (0)