From 811047d4cb49dc66f20e7f59053cf2837d74b84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Tue, 27 Jun 2023 14:01:19 +0200
Subject: [PATCH] router-context use UmbController

---
 .../src/shared/router/route.context.ts            | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts b/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts
index e105dde24c..cd2f85af41 100644
--- a/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/shared/router/route.context.ts
@@ -1,19 +1,15 @@
 import type { UmbRoute } from './route.interface.js';
 import { generateRoutePathBuilder } from './generate-route-path-builder.function.js';
 import type { IRoutingInfo, IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot';
-import {
-	UmbContextConsumerController,
-	UmbContextProviderController,
-	UmbContextToken,
-} from '@umbraco-cms/backoffice/context-api';
-import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+import { UmbController, type UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api';
 import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UmbModalRouteRegistration } from '@umbraco-cms/backoffice/modal';
 
 const EmptyDiv = document.createElement('div');
 
 type UmbRoutePlusModalKey = UmbRoute & { __modalKey: string };
 
-export class UmbRouteContext {
+export class UmbRouteContext extends UmbController {
 	#mainRouter: IRouterSlot;
 	#modalRouter: IRouterSlot;
 	#modalRegistrations: UmbModalRouteRegistration[] = [];
@@ -24,10 +20,11 @@ export class UmbRouteContext {
 	#activeModalPath?: string;
 
 	constructor(host: UmbControllerHostElement, mainRouter: IRouterSlot, modalRouter: IRouterSlot) {
+		super(host);
 		this.#mainRouter = mainRouter;
 		this.#modalRouter = modalRouter;
-		new UmbContextProviderController(host, UMB_ROUTE_CONTEXT_TOKEN, this);
-		new UmbContextConsumerController(host, UMB_MODAL_MANAGER_CONTEXT_TOKEN, (context) => {
+		this.provideContext(UMB_ROUTE_CONTEXT_TOKEN, this);
+		this.consumeContext(UMB_MODAL_MANAGER_CONTEXT_TOKEN, (context) => {
 			this.#modalContext = context;
 			this.#generateModalRoutes();
 		});