Skip to content

Commit f379e80

Browse files
wagnermacielwagnermaciel
committed
refactor(material/legacy-tooltip): rename ts symbols
1 parent f1ebbd8 commit f379e80

File tree

9 files changed

+74
-74
lines changed

9 files changed

+74
-74
lines changed

‎src/dev-app/legacy-tooltip/examples/legacy-tooltip-auto-hide/legacy-tooltip-auto-hide-example.ts

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

99
import {Component} from '@angular/core';
1010
import {FormControl} from '@angular/forms';
11-
import {TooltipPosition} from '@angular/material/legacy-tooltip';
11+
import {LegacyTooltipPosition} from '@angular/material/legacy-tooltip';
1212

1313
/**
1414
* @title Tooltip that demonstrates auto-hiding when it clips out of its scrolling container.
@@ -19,6 +19,6 @@ import {TooltipPosition} from '@angular/material/legacy-tooltip';
1919
styleUrls: ['legacy-tooltip-auto-hide-example.css'],
2020
})
2121
export class LegacyTooltipAutoHideExample {
22-
positionOptions: TooltipPosition[] = ['below', 'above', 'left', 'right'];
22+
positionOptions: LegacyTooltipPosition[] = ['below', 'above', 'left', 'right'];
2323
position = new FormControl(this.positionOptions[0]);
2424
}

‎src/dev-app/legacy-tooltip/examples/legacy-tooltip-modified-defaults/legacy-tooltip-modified-defaults-example.ts

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

99
import {Component} from '@angular/core';
1010
import {
11-
MAT_TOOLTIP_DEFAULT_OPTIONS,
12-
MatTooltipDefaultOptions,
11+
MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
12+
MatLegacyTooltipDefaultOptions,
1313
} from '@angular/material/legacy-tooltip';
1414

1515
/** Custom options the configure the tooltip's default show/hide delays. */
16-
export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
16+
export const myCustomTooltipDefaults: MatLegacyTooltipDefaultOptions = {
1717
showDelay: 1000,
1818
hideDelay: 1000,
1919
touchendHideDelay: 1000,
@@ -25,6 +25,6 @@ export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
2525
@Component({
2626
selector: 'legacy-tooltip-modified-defaults-example',
2727
templateUrl: 'legacy-tooltip-modified-defaults-example.html',
28-
providers: [{provide: MAT_TOOLTIP_DEFAULT_OPTIONS, useValue: myCustomTooltipDefaults}],
28+
providers: [{provide: MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS, useValue: myCustomTooltipDefaults}],
2929
})
3030
export class LegacyTooltipModifiedDefaultsExample {}

‎src/dev-app/legacy-tooltip/examples/legacy-tooltip-position/legacy-tooltip-position-example.ts

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

99
import {Component} from '@angular/core';
1010
import {FormControl} from '@angular/forms';
11-
import {TooltipPosition} from '@angular/material/legacy-tooltip';
11+
import {LegacyTooltipPosition} from '@angular/material/legacy-tooltip';
1212

1313
/**
1414
* @title Tooltip with a custom position
@@ -19,6 +19,6 @@ import {TooltipPosition} from '@angular/material/legacy-tooltip';
1919
styleUrls: ['legacy-tooltip-position-example.css'],
2020
})
2121
export class LegacyTooltipPositionExample {
22-
positionOptions: TooltipPosition[] = ['after', 'before', 'above', 'below', 'left', 'right'];
22+
positionOptions: LegacyTooltipPosition[] = ['after', 'before', 'above', 'below', 'left', 'right'];
2323
position = new FormControl(this.positionOptions[0]);
2424
}

‎src/material/legacy-tooltip/public-api.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
* found in the LICENSE file at https://angular.io/license
77
*/
88

9-
export * from './tooltip-module';
10-
export * from './tooltip';
11-
export * from './tooltip-animations';
9+
export {MatLegacyTooltipModule} from './tooltip-module';
10+
export {MatLegacyTooltip, LegacyTooltipComponent} from './tooltip';
11+
export {matLegacyTooltipAnimations} from './tooltip-animations';
1212

1313
export {
14-
getMatTooltipInvalidPositionError,
15-
MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY,
16-
MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY,
17-
TooltipPosition,
18-
TooltipTouchGestures,
19-
TooltipVisibility,
20-
SCROLL_THROTTLE_MS,
21-
MAT_TOOLTIP_SCROLL_STRATEGY,
22-
MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER,
23-
MatTooltipDefaultOptions,
24-
MAT_TOOLTIP_DEFAULT_OPTIONS,
14+
getMatTooltipInvalidPositionError as getMatLegacyTooltipInvalidPositionError,
15+
MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY as MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY_FACTORY,
16+
MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY as MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS_FACTORY,
17+
TooltipPosition as LegacyTooltipPosition,
18+
TooltipTouchGestures as LegacyTooltipTouchGestures,
19+
TooltipVisibility as LegacyTooltipVisibility,
20+
SCROLL_THROTTLE_MS as LEGACY_SCROLL_THROTTLE_MS,
21+
MAT_TOOLTIP_SCROLL_STRATEGY as MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY,
22+
MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER as MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER,
23+
MatTooltipDefaultOptions as MatLegacyTooltipDefaultOptions,
24+
MAT_TOOLTIP_DEFAULT_OPTIONS as MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
2525
} from '@angular/material/tooltip';

‎src/material/legacy-tooltip/testing/public-api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@
77
*/
88

99
export * from './tooltip-harness';
10-
export {TooltipHarnessFilters} from '@angular/material/tooltip/testing';
10+
export {TooltipHarnessFilters as LegacyTooltipHarnessFilters} from '@angular/material/tooltip/testing';

‎src/material/legacy-tooltip/tooltip-animations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {
1919
* Animations used by MatTooltip.
2020
* @docs-private
2121
*/
22-
export const matTooltipAnimations: {
22+
export const matLegacyTooltipAnimations: {
2323
readonly tooltipState: AnimationTriggerMetadata;
2424
} = {
2525
/** Animation that transitions a tooltip in and out. */

‎src/material/legacy-tooltip/tooltip.spec.ts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import {
3333
import {By} from '@angular/platform-browser';
3434
import {Subject} from 'rxjs';
3535
import {
36-
MAT_TOOLTIP_DEFAULT_OPTIONS,
36+
MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
3737
MatLegacyTooltip,
3838
MatLegacyTooltipModule,
39-
SCROLL_THROTTLE_MS,
40-
TooltipPosition,
41-
TooltipTouchGestures,
39+
LEGACY_SCROLL_THROTTLE_MS,
40+
LegacyTooltipPosition,
41+
LegacyTooltipTouchGestures,
4242
} from './index';
4343
import {NoopAnimationsModule} from '@angular/platform-browser/animations';
4444

@@ -173,7 +173,7 @@ describe('MatTooltip', () => {
173173
declarations: [BasicTooltipDemo],
174174
providers: [
175175
{
176-
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
176+
provide: MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
177177
useValue: {showDelay: 1337, hideDelay: 7331},
178178
},
179179
],
@@ -210,7 +210,7 @@ describe('MatTooltip', () => {
210210
declarations: [TooltipDemoWithoutPositionBinding],
211211
providers: [
212212
{
213-
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
213+
provide: MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
214214
useValue: {position: 'right'},
215215
},
216216
],
@@ -279,7 +279,7 @@ describe('MatTooltip', () => {
279279
declarations: [WideTooltipDemo],
280280
providers: [
281281
{
282-
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
282+
provide: MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
283283
useValue: {positionAtOrigin: true},
284284
},
285285
],
@@ -310,7 +310,7 @@ describe('MatTooltip', () => {
310310
declarations: [TooltipDemoWithoutPositionBinding],
311311
providers: [
312312
{
313-
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
313+
provide: MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS,
314314
useValue: {disableTooltipInteractivity: true},
315315
},
316316
],
@@ -901,7 +901,7 @@ describe('MatTooltip', () => {
901901
expect(classList).not.toContain('mat-tooltip-panel-left');
902902
expect(classList).toContain('mat-tooltip-panel-right');
903903

904-
function setPositionAndShow(position: TooltipPosition) {
904+
function setPositionAndShow(position: LegacyTooltipPosition) {
905905
tooltipDirective.hide(0);
906906
fixture.detectChanges();
907907
tick(0);
@@ -1135,7 +1135,7 @@ describe('MatTooltip', () => {
11351135

11361136
// Scroll the page but tick just before the default throttle should update.
11371137
fixture.componentInstance.scrollDown();
1138-
tick(SCROLL_THROTTLE_MS - 1);
1138+
tick(LEGACY_SCROLL_THROTTLE_MS - 1);
11391139
expect(tooltipDirective._isTooltipVisible())
11401140
.withContext('Expected tooltip to be visible when scrolling, before throttle limit')
11411141
.toBe(true);
@@ -1516,7 +1516,7 @@ class BasicTooltipDemo {
15161516
message: any = initialTooltipMessage;
15171517
showButton: boolean = true;
15181518
showTooltipClass = false;
1519-
touchGestures: TooltipTouchGestures = 'auto';
1519+
touchGestures: LegacyTooltipTouchGestures = 'auto';
15201520
@ViewChild(MatLegacyTooltip) tooltip: MatLegacyTooltip;
15211521
@ViewChild('button') button: ElementRef<HTMLButtonElement>;
15221522
}
@@ -1600,7 +1600,7 @@ class DataBoundAriaLabelTooltip {
16001600
class TooltipOnTextFields {
16011601
@ViewChild('input') input: ElementRef<HTMLInputElement>;
16021602
@ViewChild('textarea') textarea: ElementRef<HTMLTextAreaElement>;
1603-
touchGestures: TooltipTouchGestures = 'auto';
1603+
touchGestures: LegacyTooltipTouchGestures = 'auto';
16041604
}
16051605

16061606
@Component({
@@ -1614,7 +1614,7 @@ class TooltipOnTextFields {
16141614
})
16151615
class TooltipOnDraggableElement {
16161616
@ViewChild('button') button: ElementRef;
1617-
touchGestures: TooltipTouchGestures = 'auto';
1617+
touchGestures: LegacyTooltipTouchGestures = 'auto';
16181618
}
16191619

16201620
@Component({

‎tools/public_api_guard/material/legacy-tooltip-testing.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@
66

77
import { AsyncFactoryFn } from '@angular/cdk/testing';
88
import { HarnessPredicate } from '@angular/cdk/testing';
9+
import { TooltipHarnessFilters as LegacyTooltipHarnessFilters } from '@angular/material/tooltip/testing';
910
import { _MatTooltipHarnessBase } from '@angular/material/tooltip/testing';
1011
import { TestElement } from '@angular/cdk/testing';
11-
import { TooltipHarnessFilters } from '@angular/material/tooltip/testing';
12+
13+
export { LegacyTooltipHarnessFilters }
1214

1315
// @public
1416
export class MatLegacyTooltipHarness extends _MatTooltipHarnessBase {
@@ -22,11 +24,9 @@ export class MatLegacyTooltipHarness extends _MatTooltipHarnessBase {
2224
protected _optionalPanel: AsyncFactoryFn<TestElement | null>;
2325
// (undocumented)
2426
protected _showAnimationName: string;
25-
static with(options?: TooltipHarnessFilters): HarnessPredicate<MatLegacyTooltipHarness>;
27+
static with(options?: LegacyTooltipHarnessFilters): HarnessPredicate<MatLegacyTooltipHarness>;
2628
}
2729

28-
export { TooltipHarnessFilters }
29-
3030
// (No @packageDocumentation comment for this package)
3131

3232
```

‎tools/public_api_guard/material/legacy-tooltip.md

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,33 +12,35 @@ import { ChangeDetectorRef } from '@angular/core';
1212
import { Directionality } from '@angular/cdk/bidi';
1313
import { ElementRef } from '@angular/core';
1414
import { FocusMonitor } from '@angular/cdk/a11y';
15-
import { getMatTooltipInvalidPositionError } from '@angular/material/tooltip';
15+
import { getMatTooltipInvalidPositionError as getMatLegacyTooltipInvalidPositionError } from '@angular/material/tooltip';
1616
import * as i0 from '@angular/core';
1717
import * as i2 from '@angular/cdk/a11y';
1818
import * as i3 from '@angular/common';
1919
import * as i4 from '@angular/cdk/overlay';
2020
import * as i5 from '@angular/material/core';
2121
import * as i6 from '@angular/cdk/scrolling';
22-
import { MAT_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/tooltip';
23-
import { MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY } from '@angular/material/tooltip';
24-
import { MAT_TOOLTIP_SCROLL_STRATEGY } from '@angular/material/tooltip';
25-
import { MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY } from '@angular/material/tooltip';
26-
import { MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER } from '@angular/material/tooltip';
22+
import { SCROLL_THROTTLE_MS as LEGACY_SCROLL_THROTTLE_MS } from '@angular/material/tooltip';
23+
import { TooltipPosition as LegacyTooltipPosition } from '@angular/material/tooltip';
24+
import { TooltipTouchGestures as LegacyTooltipTouchGestures } from '@angular/material/tooltip';
25+
import { TooltipVisibility as LegacyTooltipVisibility } from '@angular/material/tooltip';
26+
import { MAT_TOOLTIP_DEFAULT_OPTIONS as MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS } from '@angular/material/tooltip';
27+
import { MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY as MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS_FACTORY } from '@angular/material/tooltip';
28+
import { MAT_TOOLTIP_SCROLL_STRATEGY as MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY } from '@angular/material/tooltip';
29+
import { MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY as MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY_FACTORY } from '@angular/material/tooltip';
30+
import { MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER as MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER } from '@angular/material/tooltip';
31+
import { MatTooltipDefaultOptions as MatLegacyTooltipDefaultOptions } from '@angular/material/tooltip';
2732
import { _MatTooltipBase } from '@angular/material/tooltip';
28-
import { MatTooltipDefaultOptions } from '@angular/material/tooltip';
2933
import { NgZone } from '@angular/core';
3034
import { Observable } from 'rxjs';
3135
import { Overlay } from '@angular/cdk/overlay';
3236
import { Platform } from '@angular/cdk/platform';
33-
import { SCROLL_THROTTLE_MS } from '@angular/material/tooltip';
3437
import { ScrollDispatcher } from '@angular/cdk/scrolling';
3538
import { _TooltipComponentBase } from '@angular/material/tooltip';
36-
import { TooltipPosition } from '@angular/material/tooltip';
37-
import { TooltipTouchGestures } from '@angular/material/tooltip';
38-
import { TooltipVisibility } from '@angular/material/tooltip';
3939
import { ViewContainerRef } from '@angular/core';
4040

41-
export { getMatTooltipInvalidPositionError }
41+
export { getMatLegacyTooltipInvalidPositionError }
42+
43+
export { LEGACY_SCROLL_THROTTLE_MS }
4244

4345
// @public
4446
export class LegacyTooltipComponent extends _TooltipComponentBase {
@@ -56,19 +58,25 @@ export class LegacyTooltipComponent extends _TooltipComponentBase {
5658
static ɵfac: i0.ɵɵFactoryDeclaration<LegacyTooltipComponent, [null, null, { optional: true; }]>;
5759
}
5860

59-
export { MAT_TOOLTIP_DEFAULT_OPTIONS }
61+
export { LegacyTooltipPosition }
62+
63+
export { LegacyTooltipTouchGestures }
64+
65+
export { LegacyTooltipVisibility }
6066

61-
export { MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY }
67+
export { MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS }
6268

63-
export { MAT_TOOLTIP_SCROLL_STRATEGY }
69+
export { MAT_LEGACY_TOOLTIP_DEFAULT_OPTIONS_FACTORY }
6470

65-
export { MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY }
71+
export { MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY }
6672

67-
export { MAT_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER }
73+
export { MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY_FACTORY }
74+
75+
export { MAT_LEGACY_TOOLTIP_SCROLL_STRATEGY_FACTORY_PROVIDER }
6876

6977
// @public
7078
export class MatLegacyTooltip extends _MatTooltipBase<LegacyTooltipComponent> {
71-
constructor(overlay: Overlay, elementRef: ElementRef<HTMLElement>, scrollDispatcher: ScrollDispatcher, viewContainerRef: ViewContainerRef, ngZone: NgZone, platform: Platform, ariaDescriber: AriaDescriber, focusMonitor: FocusMonitor, scrollStrategy: any, dir: Directionality, defaultOptions: MatTooltipDefaultOptions, _document: any);
79+
constructor(overlay: Overlay, elementRef: ElementRef<HTMLElement>, scrollDispatcher: ScrollDispatcher, viewContainerRef: ViewContainerRef, ngZone: NgZone, platform: Platform, ariaDescriber: AriaDescriber, focusMonitor: FocusMonitor, scrollStrategy: any, dir: Directionality, defaultOptions: MatLegacyTooltipDefaultOptions, _document: any);
7280
// (undocumented)
7381
protected readonly _tooltipComponent: typeof LegacyTooltipComponent;
7482
// (undocumented)
@@ -77,6 +85,13 @@ export class MatLegacyTooltip extends _MatTooltipBase<LegacyTooltipComponent> {
7785
static ɵfac: i0.ɵɵFactoryDeclaration<MatLegacyTooltip, [null, null, null, null, null, null, null, null, null, { optional: true; }, { optional: true; }, null]>;
7886
}
7987

88+
// @public
89+
export const matLegacyTooltipAnimations: {
90+
readonly tooltipState: AnimationTriggerMetadata;
91+
};
92+
93+
export { MatLegacyTooltipDefaultOptions }
94+
8095
// @public (undocumented)
8196
export class MatLegacyTooltipModule {
8297
// (undocumented)
@@ -87,21 +102,6 @@ export class MatLegacyTooltipModule {
87102
static ɵmod: i0.ɵɵNgModuleDeclaration<MatLegacyTooltipModule, [typeof i1.MatLegacyTooltip, typeof i1.LegacyTooltipComponent], [typeof i2.A11yModule, typeof i3.CommonModule, typeof i4.OverlayModule, typeof i5.MatCommonModule], [typeof i1.MatLegacyTooltip, typeof i1.LegacyTooltipComponent, typeof i5.MatCommonModule, typeof i6.CdkScrollableModule]>;
88103
}
89104

90-
// @public
91-
export const matTooltipAnimations: {
92-
readonly tooltipState: AnimationTriggerMetadata;
93-
};
94-
95-
export { MatTooltipDefaultOptions }
96-
97-
export { SCROLL_THROTTLE_MS }
98-
99-
export { TooltipPosition }
100-
101-
export { TooltipTouchGestures }
102-
103-
export { TooltipVisibility }
104-
105105
// (No @packageDocumentation comment for this package)
106106

107107
```

0 commit comments

Comments
 (0)