Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(material/tooltip): replicate tooltipClass to default MatTooltipDefaultOptions #29467

Merged
merged 3 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components-examples/material/tooltip/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export {TooltipAutoHideExample} from './tooltip-auto-hide/tooltip-auto-hide-example';
export {TooltipCustomClassExample} from './tooltip-custom-class/tooltip-custom-class-example';
export {TooltipDefaultCustomClassExample} from './tooltip-default-custom-class/tooltip-default-custom-class-example';
jullierme marked this conversation as resolved.
Show resolved Hide resolved
export {TooltipDelayExample} from './tooltip-delay/tooltip-delay-example';
export {TooltipDisabledExample} from './tooltip-disabled/tooltip-disabled-example';
export {TooltipManualExample} from './tooltip-manual/tooltip-manual-example';
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.example-tooltip-default-custom-class {
text-transform: uppercase;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<button mat-raised-button
matTooltip="This tooltip uses the global custom class"
aria-label="Button that displays a tooltip with a globally applied custom class">
Button with custom tooltip class
</button>
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import {Component, ViewEncapsulation} from '@angular/core';
import {
MAT_TOOLTIP_DEFAULT_OPTIONS,
MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY,
MatTooltipDefaultOptions,
MatTooltipModule,
} from '@angular/material/tooltip';
import {MatButtonModule} from '@angular/material/button';

/** Custom options the configure the tooltip's default class. */
export const myCustomTooltipDefaults: MatTooltipDefaultOptions = {
...MAT_TOOLTIP_DEFAULT_OPTIONS_FACTORY(),
tooltipClass: 'example-tooltip-default-custom-class',
};

/**
* @title Tooltip with default custom class
*/
@Component({
selector: 'tooltip-default-custom-class-example',
templateUrl: 'tooltip-default-custom-class-example.html',
styleUrl: 'tooltip-default-custom-class-example.css',
providers: [{provide: MAT_TOOLTIP_DEFAULT_OPTIONS, useValue: myCustomTooltipDefaults}],
standalone: true,
// Need to remove view encapsulation so that the custom tooltip style defined in
// `tooltip-default-custom-class-example.css` will not be scoped to this component's view.
encapsulation: ViewEncapsulation.None,
imports: [MatButtonModule, MatTooltipModule],
})
export class TooltipDefaultCustomClassExample {}
3 changes: 3 additions & 0 deletions src/dev-app/tooltip/tooltip-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ <h3>Tooltip auto hide</h3>
<h3>Tooltip custom class</h3>
<tooltip-custom-class-example></tooltip-custom-class-example>

<h3>Tooltip default custom class</h3>
<tooltip-default-custom-class-example></tooltip-default-custom-class-example>

<h3>Tooltip with delay</h3>
<tooltip-delay-example></tooltip-delay-example>

Expand Down
2 changes: 2 additions & 0 deletions src/dev-app/tooltip/tooltip-demo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import {
TooltipAutoHideExample,
TooltipCustomClassExample,
TooltipDefaultCustomClassExample,
TooltipDelayExample,
TooltipDisabledExample,
TooltipHarnessExample,
Expand All @@ -27,6 +28,7 @@ import {ChangeDetectionStrategy, Component} from '@angular/core';
imports: [
TooltipAutoHideExample,
TooltipCustomClassExample,
TooltipDefaultCustomClassExample,
TooltipDelayExample,
TooltipDisabledExample,
TooltipManualExample,
Expand Down
81 changes: 81 additions & 0 deletions src/material/tooltip/tooltip.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,65 @@ describe('MDC-based MatTooltip', () => {
expect(tooltipDirective._getOverlayPosition().fallback.overlayX).toBe('end');
}));

it('should be able to define a default (global) tooltip class', fakeAsync(() => {
TestBed.resetTestingModule()
.configureTestingModule({
declarations: [TooltipDemoWithoutTooltipClassBinding],
imports: [MatTooltipModule, OverlayModule],
providers: [
{
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
useValue: {tooltipClass: 'my-default-tooltip-class'},
},
],
})
.compileComponents();

const fixture = TestBed.createComponent(TooltipDemoWithoutTooltipClassBinding);
fixture.detectChanges();
tooltipDirective = fixture.componentInstance.tooltip;
tooltipDirective.show();
fixture.detectChanges();
tick();
const overlayRef = tooltipDirective._overlayRef!;
const tooltipElement = overlayRef.overlayElement.querySelector(
'.mat-mdc-tooltip',
) as HTMLElement;

expect(tooltipDirective.tooltipClass).toBe('my-default-tooltip-class');
expect(tooltipElement.classList).toContain('my-default-tooltip-class');
}));

it('should be able to provide tooltip class over the custom default one', fakeAsync(() => {
TestBed.resetTestingModule()
.configureTestingModule({
declarations: [TooltipDemoWithTooltipClassBinding],
imports: [MatTooltipModule, OverlayModule],
providers: [
{
provide: MAT_TOOLTIP_DEFAULT_OPTIONS,
useValue: {tooltipClass: 'my-default-tooltip-class'},
},
],
})
.compileComponents();

const fixture = TestBed.createComponent(TooltipDemoWithTooltipClassBinding);
fixture.detectChanges();
tooltipDirective = fixture.componentInstance.tooltip;
tooltipDirective.show();
fixture.detectChanges();
tick();
const overlayRef = tooltipDirective._overlayRef!;
const tooltipElement = overlayRef.overlayElement.querySelector(
'.mat-mdc-tooltip',
) as HTMLElement;

expect(tooltipDirective.tooltipClass).not.toBe('my-default-tooltip-class');
expect(tooltipElement.classList).not.toContain('my-default-tooltip-class');
expect(tooltipElement.classList).toContain('fixed-tooltip-class');
}));

it('should position on the bottom-left by default', fakeAsync(() => {
// We don't bind mouse events on mobile devices.
if (platform.IOS || platform.ANDROID) {
Expand Down Expand Up @@ -1660,6 +1719,28 @@ class TooltipDemoWithoutPositionBinding {
@ViewChild('button') button: ElementRef<HTMLButtonElement>;
}

@Component({
selector: 'app',
template: `<button #button [matTooltip]="message">Button</button>`,
})
class TooltipDemoWithoutTooltipClassBinding {
message = initialTooltipMessage;
@ViewChild(MatTooltip) tooltip: MatTooltip;
@ViewChild('button') button: ElementRef<HTMLButtonElement>;
}

@Component({
selector: 'app',
template: `
<button #button matTooltipClass="fixed-tooltip-class" [matTooltip]="message">Button</button>
`,
})
class TooltipDemoWithTooltipClassBinding {
message: any = initialTooltipMessage;
@ViewChild(MatTooltip) tooltip: MatTooltip;
@ViewChild('button') button: ElementRef<HTMLButtonElement>;
}

@Component({
selector: 'app',
styles: `button { width: 500px; height: 500px; }`,
Expand Down
11 changes: 11 additions & 0 deletions src/material/tooltip/tooltip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,13 @@ export interface MatTooltipDefaultOptions {

/** Disables the ability for the user to interact with the tooltip element. */
disableTooltipInteractivity?: boolean;

/**
* Default classes to be applied to the tooltip. Supports the same syntax as `ngClass`. These
* default classes will not be applied if `tooltipClass` is defined directly on the tooltip
* element, as it will override the default.
*/
tooltipClass?: string | string[] | Set<string> | {[key: string]: any};
jullierme marked this conversation as resolved.
Show resolved Hide resolved
}

/**
Expand Down Expand Up @@ -389,6 +396,10 @@ export class MatTooltip implements OnDestroy, AfterViewInit {
if (_defaultOptions.touchGestures) {
this.touchGestures = _defaultOptions.touchGestures;
}

if (_defaultOptions.tooltipClass) {
this.tooltipClass = _defaultOptions.tooltipClass;
}
}

_dir.change.pipe(takeUntil(this._destroyed)).subscribe(() => {
Expand Down
Loading