Skip to content

Commit fd2811b

Browse files
andrewseguinandrewseguin
authored
feat(material/tooltip): switch to MDC implementation (#25209)
1 parent 039f532 commit fd2811b

File tree

77 files changed

+970
-804
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+970
-804
lines changed

‎.github/CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
/src/material/tabs/** @andrewseguin
3737
/src/material/testing/** @andrewseguin
3838
/src/material/toolbar/** @devversion
39+
/src/material/legacy-tooltip/** @andrewseguin
3940
/src/material/tooltip/** @andrewseguin
4041
/src/material/tree/** @jelbourn @andrewseguin
4142

@@ -345,7 +346,7 @@
345346
/tools/public_api_guard/material/table** @andrewseguin
346347
/tools/public_api_guard/material/tabs** @andrewseguin
347348
/tools/public_api_guard/material/toolbar** @devversion
348-
/tools/public_api_guard/material/tooltip** @andrewseguin
349+
/tools/public_api_guard/material/legacy-tooltip** @andrewseguin
349350
/tools/public_api_guard/material/tree** @jelbourn @andrewseguin
350351
/tools/public_api_guard/material/material** @andrewseguin
351352
/tools/public_api_guard/google-maps/** @crisbeto

‎.ng-dev/commit-message.mts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ export const commitMessage: CommitMessageConfig = {
107107
'material/testing',
108108
'material/theming',
109109
'material/toolbar',
110+
'material/legacy-tooltip',
110111
'material/tooltip',
111112
'material/tree',
112113
'youtube-player',

‎src/components-examples/material/tooltip/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ ng_module(
1919
"//src/material/button",
2020
"//src/material/checkbox",
2121
"//src/material/input",
22+
"//src/material/legacy-tooltip",
23+
"//src/material/legacy-tooltip/testing",
2224
"//src/material/select",
23-
"//src/material/tooltip",
24-
"//src/material/tooltip/testing",
2525
"@npm//@angular/forms",
2626
"@npm//@angular/platform-browser",
2727
"@npm//@angular/platform-browser-dynamic",
@@ -45,8 +45,8 @@ ng_test_library(
4545
":tooltip",
4646
"//src/cdk/testing",
4747
"//src/cdk/testing/testbed",
48-
"//src/material/tooltip",
49-
"//src/material/tooltip/testing",
48+
"//src/material/legacy-tooltip",
49+
"//src/material/legacy-tooltip/testing",
5050
"@npm//@angular/platform-browser",
5151
"@npm//@angular/platform-browser-dynamic",
5252
],

‎src/components-examples/material/tooltip/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {MatButtonModule} from '@angular/material/button';
66
import {MatCheckboxModule} from '@angular/material/checkbox';
77
import {MatInputModule} from '@angular/material/input';
88
import {MatSelectModule} from '@angular/material/select';
9-
import {MatTooltipModule} from '@angular/material/tooltip';
9+
import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
1010
import {TooltipAutoHideExample} from './tooltip-auto-hide/tooltip-auto-hide-example';
1111
import {TooltipCustomClassExample} from './tooltip-custom-class/tooltip-custom-class-example';
1212
import {TooltipDelayExample} from './tooltip-delay/tooltip-delay-example';
@@ -51,7 +51,7 @@ const EXAMPLES = [
5151
MatCheckboxModule,
5252
MatInputModule,
5353
MatSelectModule,
54-
MatTooltipModule,
54+
MatLegacyTooltipModule,
5555
ReactiveFormsModule,
5656
ScrollingModule, // Required for the auto-scrolling example
5757
],

‎src/components-examples/material/tooltip/tooltip-auto-hide/tooltip-auto-hide-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {FormControl} from '@angular/forms';
3-
import {TooltipPosition} from '@angular/material/tooltip';
3+
import {TooltipPosition} from '@angular/material/legacy-tooltip';
44

55
/**
66
* @title Tooltip that demonstrates auto-hiding when it clips out of its scrolling container.

‎src/components-examples/material/tooltip/tooltip-harness/tooltip-harness-example.spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {ComponentFixture, TestBed} from '@angular/core/testing';
22
import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
3-
import {MatTooltipHarness} from '@angular/material/tooltip/testing';
3+
import {MatLegacyTooltipHarness} from '@angular/material/legacy-tooltip/testing';
44
import {HarnessLoader} from '@angular/cdk/testing';
5-
import {MatTooltipModule} from '@angular/material/tooltip';
5+
import {MatLegacyTooltipModule} from '@angular/material/legacy-tooltip';
66
import {TooltipHarnessExample} from './tooltip-harness-example';
77
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
88

@@ -12,7 +12,7 @@ describe('TooltipHarnessExample', () => {
1212

1313
beforeEach(async () => {
1414
await TestBed.configureTestingModule({
15-
imports: [MatTooltipModule, NoopAnimationsModule],
15+
imports: [MatLegacyTooltipModule, NoopAnimationsModule],
1616
declarations: [TooltipHarnessExample],
1717
}).compileComponents();
1818
fixture = TestBed.createComponent(TooltipHarnessExample);
@@ -21,19 +21,19 @@ describe('TooltipHarnessExample', () => {
2121
});
2222

2323
it('should load all tooltip harnesses', async () => {
24-
const tooltips = await loader.getAllHarnesses(MatTooltipHarness);
24+
const tooltips = await loader.getAllHarnesses(MatLegacyTooltipHarness);
2525
expect(tooltips.length).toBe(2);
2626
});
2727

2828
it('should be able to show a tooltip', async () => {
29-
const tooltip = await loader.getHarness(MatTooltipHarness.with({selector: '#one'}));
29+
const tooltip = await loader.getHarness(MatLegacyTooltipHarness.with({selector: '#one'}));
3030
expect(await tooltip.isOpen()).toBe(false);
3131
await tooltip.show();
3232
expect(await tooltip.isOpen()).toBe(true);
3333
});
3434

3535
it('should be able to hide a tooltip', async () => {
36-
const tooltip = await loader.getHarness(MatTooltipHarness.with({selector: '#one'}));
36+
const tooltip = await loader.getHarness(MatLegacyTooltipHarness.with({selector: '#one'}));
3737
expect(await tooltip.isOpen()).toBe(false);
3838
await tooltip.show();
3939
expect(await tooltip.isOpen()).toBe(true);
@@ -42,13 +42,13 @@ describe('TooltipHarnessExample', () => {
4242
});
4343

4444
it('should be able to get the text of a tooltip', async () => {
45-
const tooltip = await loader.getHarness(MatTooltipHarness.with({selector: '#one'}));
45+
const tooltip = await loader.getHarness(MatLegacyTooltipHarness.with({selector: '#one'}));
4646
await tooltip.show();
4747
expect(await tooltip.getTooltipText()).toBe('Tooltip message');
4848
});
4949

5050
it('should return empty when getting the tooltip text while closed', async () => {
51-
const tooltip = await loader.getHarness(MatTooltipHarness.with({selector: '#one'}));
51+
const tooltip = await loader.getHarness(MatLegacyTooltipHarness.with({selector: '#one'}));
5252
expect(await tooltip.getTooltipText()).toBe('');
5353
});
5454
});

‎src/components-examples/material/tooltip/tooltip-modified-defaults/tooltip-modified-defaults-example.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import {Component} from '@angular/core';
2-
import {MAT_TOOLTIP_DEFAULT_OPTIONS, MatTooltipDefaultOptions} from '@angular/material/tooltip';
2+
import {
3+
MAT_TOOLTIP_DEFAULT_OPTIONS,
4+
MatTooltipDefaultOptions,
5+
} from '@angular/material/legacy-tooltip';
36

47
/** Custom options the configure the tooltip's default show/hide delays. */
58
export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {

‎src/components-examples/material/tooltip/tooltip-position/tooltip-position-example.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {Component} from '@angular/core';
22
import {FormControl} from '@angular/forms';
3-
import {TooltipPosition} from '@angular/material/tooltip';
3+
import {TooltipPosition} from '@angular/material/legacy-tooltip';
44

55
/**
66
* @title Tooltip with a custom position

‎src/dev-app/mdc-tooltip/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ng_module(
1414
"//src/material-experimental/mdc-form-field",
1515
"//src/material-experimental/mdc-input",
1616
"//src/material-experimental/mdc-select",
17-
"//src/material-experimental/mdc-tooltip",
17+
"//src/material/tooltip",
1818
"@npm//@angular/common",
1919
"@npm//@angular/forms",
2020
],

‎src/dev-app/mdc-tooltip/mdc-tooltip-demo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import {Component} from '@angular/core';
1010
import {FormControl, ReactiveFormsModule} from '@angular/forms';
11-
import {TooltipPosition, MatTooltipModule} from '@angular/material-experimental/mdc-tooltip';
11+
import {TooltipPosition, MatTooltipModule} from '@angular/material/tooltip';
1212
import {CommonModule} from '@angular/common';
1313
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
1414
import {MatFormFieldModule} from '@angular/material-experimental/mdc-form-field';

‎src/material-experimental/_index.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@
6464
mdc-table-density, mdc-table-theme;
6565
@forward './mdc-tabs/tabs-theme' as mdc-tabs-* show mdc-tabs-color, mdc-tabs-typography,
6666
mdc-tabs-density, mdc-tabs-theme;
67-
@forward './mdc-tooltip/tooltip-theme' as mdc-tooltip-* show mdc-tooltip-color,
68-
mdc-tooltip-typography, mdc-tooltip-density, mdc-tooltip-theme;
6967

7068
// Additional public APIs for individual components
7169
@forward './mdc-dialog/dialog-legacy-padding' as mdc-dialog-* show mdc-dialog-legacy-padding;

‎src/material-experimental/config.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ entryPoints = [
4040
"mdc-table/testing",
4141
"mdc-tabs",
4242
"mdc-tabs/testing",
43-
"mdc-tooltip",
44-
"mdc-tooltip/testing",
4543
"menubar",
4644
"popover-edit",
4745
"selection",

‎src/material-experimental/mdc-core/color/_all-color.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7474
@forward '../../mdc-list/list-option-theme' as mat-mdc-*;
7575
@forward '../../mdc-list/list-theme' as mat-mdc-list-*;
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
77-
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7877
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
7978
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;

‎src/material-experimental/mdc-core/density/_all-density.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7474
@forward '../../mdc-list/list-option-theme' as mat-mdc-*;
7575
@forward '../../mdc-list/list-theme' as mat-mdc-list-*;
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
77-
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7877
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
7978
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;

‎src/material-experimental/mdc-core/theming/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ sass_library(
4040
"//src/material-experimental/mdc-snack-bar:mdc_snack_bar_scss_lib",
4141
"//src/material-experimental/mdc-table:mdc_table_scss_lib",
4242
"//src/material-experimental/mdc-tabs:mdc_tabs_scss_lib",
43-
"//src/material-experimental/mdc-tooltip:mdc_tooltip_scss_lib",
4443
"//src/material/card:card_scss_lib",
44+
"//src/material/tooltip:tooltip_scss_lib",
4545
],
4646
)
4747

‎src/material-experimental/mdc-core/theming/_all-theme.import.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7474
@forward '../../mdc-list/list-option-theme' as mat-mdc-*;
7575
@forward '../../mdc-list/list-theme' as mat-mdc-list-*;
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
77-
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7877
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
7978
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;
@@ -99,7 +98,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
9998
@import '../../mdc-snack-bar/snack-bar-theme';
10099
@import '../../mdc-tabs/tabs-theme';
101100
@import '../../mdc-table/table-theme';
102-
@import '../../mdc-tooltip/tooltip-theme';
103101
@import '../../mdc-paginator/paginator-theme';
104102
@import '../../mdc-progress-bar/progress-bar-theme';
105103
@import '../../mdc-progress-spinner/progress-spinner-theme';

‎src/material-experimental/mdc-core/theming/_all-theme.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
@use '../../mdc-snack-bar/snack-bar-theme';
1818
@use '../../mdc-tabs/tabs-theme';
1919
@use '../../mdc-table/table-theme';
20-
@use '../../mdc-tooltip/tooltip-theme';
2120
@use '../../mdc-paginator/paginator-theme';
2221
@use '../../mdc-progress-bar/progress-bar-theme';
2322
@use '../../mdc-progress-spinner/progress-spinner-theme';
@@ -50,7 +49,7 @@
5049
@include form-field-theme.theme($theme-or-color-config);
5150
@include input-theme.theme($theme-or-color-config);
5251
@include tabs-theme.theme($theme-or-color-config);
53-
@include tooltip-theme.theme($theme-or-color-config);
52+
@include mat.tooltip-theme($theme-or-color-config);
5453
}
5554
}
5655

‎src/material-experimental/mdc-core/typography/_all-typography.import.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ $mat-mdc-mdc-text-field-outlined-idle-border, $mat-mdc-mdc-text-field-placeholde
7474
@forward '../../mdc-list/list-option-theme' as mat-mdc-*;
7575
@forward '../../mdc-list/list-theme' as mat-mdc-list-*;
7676
@forward '../../mdc-menu/menu-theme' as mat-mdc-menu-*;
77-
@forward '../../mdc-tooltip/tooltip-theme' as mat-mdc-tooltip-*;
7877
@forward '../../mdc-paginator/paginator-theme' as mat-mdc-paginator-*;
7978
@forward '../../mdc-progress-bar/progress-bar-theme' as mat-mdc-progress-bar-*;
8079
@forward '../../mdc-progress-spinner/progress-spinner-theme' as mat-mdc-progress-spinner-*;

‎src/material-experimental/mdc-paginator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ ng_module(
1919
deps = [
2020
"//src/material-experimental/mdc-button",
2121
"//src/material-experimental/mdc-select",
22-
"//src/material-experimental/mdc-tooltip",
2322
"//src/material/paginator",
23+
"//src/material/tooltip",
2424
"@npm//@angular/common",
2525
"@npm//@angular/core",
2626
"@npm//@angular/forms", # TODO(jelbourn): transitive dep via generated code

‎src/material-experimental/mdc-paginator/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {NgModule} from '@angular/core';
1111
import {MAT_PAGINATOR_INTL_PROVIDER} from '@angular/material/paginator';
1212
import {MatButtonModule} from '@angular/material-experimental/mdc-button';
1313
import {MatSelectModule} from '@angular/material-experimental/mdc-select';
14-
import {MatTooltipModule} from '@angular/material-experimental/mdc-tooltip';
14+
import {MatTooltipModule} from '@angular/material/tooltip';
1515
import {MatPaginator} from './paginator';
1616

1717
@NgModule({

‎src/material-experimental/mdc-tooltip/BUILD.bazel

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)