diff --git a/src/notification/actionable-notification.component.ts b/src/notification/actionable-notification.component.ts index f216e5b21f..804b63a73a 100644 --- a/src/notification/actionable-notification.component.ts +++ b/src/notification/actionable-notification.component.ts @@ -4,7 +4,7 @@ import { HostBinding } from "@angular/core"; -import { of } from "rxjs"; +import { isObservable, of } from "rxjs"; import { ActionableContent, NotificationVariants } from "./notification-content.interface"; import { I18n } from "carbon-components-angular/i18n"; import { NotificationDisplayService } from "./notification-display.service"; @@ -76,7 +76,7 @@ export class ActionableNotification extends BaseNotification { return this._notificationObj; } set notificationObj(obj: ActionableContent) { - if (obj.closeLabel) { + if (obj.closeLabel && !isObservable(obj.closeLabel)) { obj.closeLabel = of(obj.closeLabel); } this._notificationObj = Object.assign({}, this.defaultNotificationObj, obj); diff --git a/src/notification/notification.component.ts b/src/notification/notification.component.ts index dc8c9e71bd..9c7ed7f3c7 100644 --- a/src/notification/notification.component.ts +++ b/src/notification/notification.component.ts @@ -7,7 +7,7 @@ import { import { NotificationContent } from "./notification-content.interface"; import { I18n } from "carbon-components-angular/i18n"; import { NotificationDisplayService } from "./notification-display.service"; -import { of } from "rxjs"; +import { isObservable, of } from "rxjs"; import { BaseNotification } from "./base-notification.component"; /** @@ -56,7 +56,7 @@ export class Notification extends BaseNotification { return this._notificationObj; } set notificationObj(obj: NotificationContent) { - if (obj.closeLabel) { + if (obj.closeLabel && !isObservable(obj.closeLabel)) { obj.closeLabel = of(obj.closeLabel); } this._notificationObj = Object.assign({}, this.defaultNotificationObj, obj); diff --git a/src/notification/toast.component.ts b/src/notification/toast.component.ts index fa4bc8ce3a..88c92b0b0d 100644 --- a/src/notification/toast.component.ts +++ b/src/notification/toast.component.ts @@ -5,7 +5,7 @@ import { HostBinding } from "@angular/core"; -import { of } from "rxjs"; +import { isObservable, of } from "rxjs"; import { ToastContent } from "./notification-content.interface"; import { NotificationDisplayService } from "./notification-display.service"; import { I18n } from "carbon-components-angular/i18n"; @@ -51,7 +51,7 @@ export class Toast extends BaseNotification implements OnInit { * `type` can be one of `"error"`, `"info"`, `"info-square"`, `"warning"`, `"warning-alt"`, or `"success"` */ @Input() set notificationObj(obj: ToastContent) { - if (obj.closeLabel) { + if (obj.closeLabel && !isObservable(obj.closeLabel)) { obj.closeLabel = of(obj.closeLabel); } this._notificationObj = Object.assign({}, this.defaultNotificationObj, obj);