hotfix: close modals when url changes drastically (#19466)

nielslyngsoe · web-flow · commit 9ab17e6299fe · 2025-06-03T09:14:09.000+02:00
* close modals when router disconnectes

* correct comment

* reorder code
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/router/route/router-slot.element.ts
@@ -95,9 +95,13 @@ export class UmbRouterSlotElement extends UmbLitElement {
 	}
 
 	override disconnectedCallback() {
-		super.disconnectedCallback();
 		window.removeEventListener('navigationsuccess', this._onNavigationChanged);
 		this.#listening = false;
+
+		// Close modals opened by this router slot.
+		this.#routeContext._internal_modalRouterChanged(undefined);
+
+		super.disconnectedCallback();
 	}
 
 	protected override firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {

Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,13 @@ export class UmbRouterSlotElement extends UmbLitElement {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`override disconnectedCallback() {`
`98`		`- super.disconnectedCallback();`
`99`	`98`	`window.removeEventListener('navigationsuccess', this._onNavigationChanged);`
`100`	`99`	`this.#listening = false;`
	`100`	`+`
	`101`	`+ // Close modals opened by this router slot.`
	`102`	`+ this.#routeContext._internal_modalRouterChanged(undefined);`
	`103`	`+`
	`104`	`+ super.disconnectedCallback();`
`101`	`105`	`}`
`102`	`106`
`103`	`107`	`protected override firstUpdated(_changedProperties: PropertyValueMap<any> \| Map<PropertyKey, unknown>): void {`