-
Notifications
You must be signed in to change notification settings - Fork 6.8k
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(tooltip): allow tooltip be disabled #3578
Merged
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -33,6 +33,7 @@ import {Platform} from '../core/platform/index'; | |
import 'rxjs/add/operator/first'; | ||
import {ScrollDispatcher} from '../core/overlay/scroll/scroll-dispatcher'; | ||
import {Subscription} from 'rxjs/Subscription'; | ||
import {coerceBooleanProperty} from '../core/coercion/boolean-property'; | ||
|
||
export type TooltipPosition = 'left' | 'right' | 'above' | 'below' | 'before' | 'after'; | ||
|
||
|
@@ -62,6 +63,7 @@ export class MdTooltip implements OnInit, OnDestroy { | |
scrollSubscription: Subscription; | ||
|
||
private _position: TooltipPosition = 'below'; | ||
private _disabled: boolean = false; | ||
|
||
/** Allows the user to define the position of the tooltip relative to the parent element */ | ||
@Input('mdTooltipPosition') | ||
|
@@ -78,6 +80,11 @@ export class MdTooltip implements OnInit, OnDestroy { | |
} | ||
} | ||
|
||
/** Disables the display of the tooltip. */ | ||
@Input('mdTooltipDisabled') | ||
get disabled(): boolean { return this._disabled; } | ||
set disabled(value) { this._disabled = coerceBooleanProperty(value); } | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should setting There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think thats a fair thing to assume, adding that in |
||
|
||
/** @deprecated */ | ||
@Input('tooltip-position') | ||
get _positionDeprecated(): TooltipPosition { return this._position; } | ||
|
@@ -115,6 +122,11 @@ export class MdTooltip implements OnInit, OnDestroy { | |
get _matPosition() { return this.position; } | ||
set _matPosition(v) { this.position = v; } | ||
|
||
// Properties with `mat-` prefix for noconflict mode. | ||
@Input('matTooltipDisabled') | ||
get _matDisabled() { return this.disabled; } | ||
set _matDisabled(v) { this.disabled = v; } | ||
|
||
// Properties with `mat-` prefix for noconflict mode. | ||
@Input('matTooltipHideDelay') | ||
get _matHideDelay() { return this.hideDelay; } | ||
|
@@ -168,7 +180,7 @@ export class MdTooltip implements OnInit, OnDestroy { | |
|
||
/** Shows the tooltip after the delay in ms, defaults to tooltip-delay-show or 0ms if no input */ | ||
show(delay: number = this.showDelay): void { | ||
if (!this._message || !this._message.trim()) { return; } | ||
if (this.disabled || !this._message || !this._message.trim()) { return; } | ||
|
||
if (!this._tooltipInstance) { | ||
this._createTooltip(); | ||
|
@@ -192,7 +204,7 @@ export class MdTooltip implements OnInit, OnDestroy { | |
|
||
/** Returns true if the tooltip is currently visible to the user */ | ||
_isTooltipVisible(): boolean { | ||
return this._tooltipInstance && this._tooltipInstance.isVisible(); | ||
return !!this._tooltipInstance && this._tooltipInstance.isVisible(); | ||
} | ||
|
||
/** Create the tooltip to display */ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it()