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.

Sign up for GitHub

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

fix: 🚑 storybook render message alert #755 #756

Closed
wants to merge 6 commits into from
Closed

fix: 🚑 storybook render message alert #755 #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3c68e1
fix: :ambulance: storybook render message alert #755
iurynogueira Jul 18, 2023
e05d4e3
Merge branch 'main' of https://github.com/iurynogueira/ion into 755-f…
iurynogueira Jul 18, 2023
7c8e12d
fix: :ambulance: storybook render message alert #755
iurynogueira Jul 18, 2023
8655bd1
Merge branch 'main' into 755-fix-storybook-alert-with-message-not-render
AlyssonMascarenhas Jul 24, 2023
dfe4ebe
Merge branch 'main' into 755-fix-storybook-alert-with-message-not-render
iurynogueira Jul 24, 2023
9497509
Merge branch 'main' into 755-fix-storybook-alert-with-message-not-render
iurynogueira Jul 31, 2023
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
8 changes: 5 additions & 3 deletions projects/ion/src/lib/alert/alert.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
class="alert-icon"
[type]="iconType"
></ion-icon>
<span *ngIf="hasPlainText; else customBody" data-testid="ion-alert-message">{{
message
}}</span>
<span
*ngIf="message && !message._def; else customBody"
data-testid="ion-alert-message"
>{{ message }}</span
>

<ng-template #customBody>
<ng-container [ngTemplateOutlet]="message"></ng-container>
Expand Down
6 changes: 1 addition & 5 deletions projects/ion/src/lib/alert/alert.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import {
Input,
OnChanges,
OnInit,
SimpleChanges,
TemplateRef,
ViewChild,
} from '@angular/core';
Expand Down Expand Up @@ -49,10 +48,7 @@ export class IonAlertComponent implements OnInit, OnChanges {
}
}

ngOnChanges(changes: SimpleChanges): void {
ngOnChanges(): void {
this.setIcon();
if (changes.message) {
this.hasPlainText = typeof this.message === 'string';
}
}
}