Skip to content

Fix toast notification can not be closed #19510

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix toast notification can not be closed #19510

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f4bc15
fix toast notification can not be closed
LanThuyNguyen Jun 9, 2025
9d2dcf5
clean code
LanThuyNguyen Jun 11, 2025
c1ed05b
Fix linting errors
LanThuyNguyen Aug 18, 2025
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
41 changes: 41 additions & 0 deletions ...packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { css, html, repeat, customElement, state, nothing, property } from '@umb
import type { UmbModalManagerContext, UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { UMB_MODAL_MANAGER_CONTEXT, UmbModalElement } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
import type { UUIModalSidebarElement } from '@umbraco-cms/backoffice/external/uui';

@customElement('umb-backoffice-modal-container')
export class UmbBackofficeModalContainerElement extends UmbLitElement {
Expand Down Expand Up @@ -85,6 +86,22 @@ export class UmbBackofficeModalContainerElement extends UmbLitElement {
}

#onCloseEnd(key: string) {
//move notification container out of modal container
const parentNode = this.parentNode;
const uuiModalContainer = this.renderRoot.querySelector('uui-modal-container');
const modalSidebar = uuiModalContainer?.querySelector('uui-modal-sidebar') as UUIModalSidebarElement | null;

if (!modalSidebar) return;

const dialog = modalSidebar.shadowRoot?.querySelector('dialog');
if (!dialog) return;

const notificationContainer = dialog.querySelector('umb-backoffice-notification-container') as HTMLElement;

if (parentNode) {
parentNode.insertBefore(notificationContainer, this);
}

this._modalManager?.remove(key);
}

Expand All @@ -109,6 +126,30 @@ export class UmbBackofficeModalContainerElement extends UmbLitElement {
`;
}

async addNotificationContainer() {
const modalContainer = this.renderRoot.querySelector('uui-modal-container');
if (!modalContainer) return;

await modalContainer.updateComplete;

const modalSidebar = modalContainer.querySelector('uui-modal-sidebar') as UUIModalSidebarElement;
if (!modalSidebar) return;

const parentNode = this.parentNode as HTMLElement;
if (!parentNode) return;

const notificationContainer = parentNode.querySelector('umb-backoffice-notification-container') as HTMLElement;

const dialog = modalSidebar.shadowRoot?.querySelector('dialog');
if (!dialog) return;
//move notification container into modal container
dialog.insertBefore(notificationContainer, dialog.firstChild);
}

override async updated() {
await Promise.all([this.updateComplete, this.addNotificationContainer()]);
}

static override styles: CSSResultGroup = [
UmbTextStyles,
css`
Expand Down
Loading