Skip to content
Merged
Changes from all commits
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
10 changes: 7 additions & 3 deletions projects/forge-angular/src/lib/toast/toast.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ export class ToastService {
let toastElement: IToastComponent;
let environmentInjector: EnvironmentInjector | undefined;
let componentRef: ComponentRef<any> | undefined;
let abortController: AbortController | undefined;

const messageText = typeof configOrMessage === 'string' ? configOrMessage : configOrMessage.message;
if (typeof messageText === 'string') {
Expand All @@ -44,8 +45,10 @@ export class ToastService {
const element = (componentRef.hostView as EmbeddedViewRef<any>).rootNodes[0] as HTMLElement;
toastElement = ToastComponent.present({ element, ...config });

toastElement.addEventListener(TOAST_CONSTANTS.events.CLOSE, () => {
environmentInjector?.destroy();
abortController = new AbortController();
toastElement.addEventListener(TOAST_CONSTANTS.events.CLOSE, () => environmentInjector?.destroy(), {
once: true,
signal: abortController.signal
});
} else {
throw new Error('Either a component or a message must be provided.');
Expand All @@ -58,9 +61,10 @@ export class ToastService {
return {
nativeElement: toastElement,
close: async () => {
abortController?.abort();
await toastElement.hide();
environmentInjector?.destroy();
componentRef?.destroy();
await toastElement.hide();
toastElement.remove();
}
};
Expand Down