From aa4a49673b3478606a968290f0f3b5a28cd2fd72 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 3 Oct 2023 21:02:29 +0200 Subject: [PATCH] remove host from modal context --- .../src/packages/core/modal/modal-manager.context.ts | 11 ++++------- .../src/packages/core/modal/modal.context.ts | 8 -------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-manager.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-manager.context.ts index f3e4533fa4..7e77346fb4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-manager.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-manager.context.ts @@ -41,13 +41,10 @@ export class UmbModalManagerContext { config?: UmbModalConfig, router: IRouterSlot | null = null, ) { - const modalContext = new UmbModalContextClass( - this.host, - router, - modalAlias, - data, - config, - ) as unknown as UmbModalContext; + const modalContext = new UmbModalContextClass(router, modalAlias, data, config) as unknown as UmbModalContext< + ModalData, + ModalValue + >; this.#modals.next( appendToFrozenArray(this.#modals.getValue(), modalContext, (entry) => entry.key === modalContext.key), diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts index 5a8b79cef4..fd0d788b59 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts @@ -2,7 +2,6 @@ import { UmbModalConfig, UmbModalType } from './modal-manager.context.js'; import { UmbModalToken } from './token/modal-token.js'; import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui'; -import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; import { UmbId } from '@umbraco-cms/backoffice/id'; import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api'; import { UmbContextToken } from '@umbraco-cms/backoffice/context-api'; @@ -33,8 +32,6 @@ type OptionalSubmitArgumentIfUndefined = T extends undefined // TODO: consider splitting this into two separate handlers export class UmbModalContextClass extends EventTarget { - #host: UmbControllerHostElement; - #submitPromise: Promise; #submitResolver?: (value: ModalValue) => void; #submitRejecter?: () => void; @@ -49,12 +46,7 @@ export class UmbModalContextClass(undefined); public readonly value = this.#value.asObservable(); - public get controllerAlias() { - return 'umbModalContext:' + this.key; - } - constructor( - host: UmbControllerHostElement, router: IRouterSlot | null, modalAlias: string | UmbModalToken, data?: ModalPreset,