Skip to content

Commit d11317e

Browse files
authored
fix(navbar): error when set mcTooltipDisabled on mc-navbar-item (#UIM-882) (#829)
1 parent d16402d commit d11317e

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

packages/mosaic/core/pop-up/pop-up-trigger.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export abstract class McPopUpTrigger<T> {
6060
// tslint:disable-next-line:naming-convention orthodox-getter-and-setter
6161
protected _content: string | TemplateRef<any>;
6262
// tslint:disable-next-line:naming-convention orthodox-getter-and-setter
63-
protected _disabled: boolean = false;
63+
protected _disabled: boolean;
6464
// tslint:disable-next-line:naming-convention orthodox-getter-and-setter
6565
protected _customClass: string;
6666

packages/mosaic/navbar/navbar-item.component.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,9 +385,17 @@ export class McNavbarItem extends McTooltipTrigger {
385385
}
386386

387387
get disabled(): boolean {
388+
if (this._disabled !== undefined) {
389+
return this._disabled;
390+
}
391+
388392
return (!this.collapsed && !this.hasCroppedText) || !this.title;
389393
}
390394

395+
set disabled(value) {
396+
this._disabled = coerceBooleanProperty(value);
397+
}
398+
391399
get hasDropDownTrigger(): boolean {
392400
return !!this.dropdownTrigger;
393401
}

tools/public_api_guard/mosaic/navbar.api.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ export class McNavbarItem extends McTooltipTrigger {
202202
get croppedText(): string;
203203
// (undocumented)
204204
get disabled(): boolean;
205+
set disabled(value: boolean);
205206
// (undocumented)
206207
getTitleWidth(): number;
207208
// (undocumented)

0 commit comments

Comments
 (0)