yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove host from modal context

Browse Source
This commit is contained in:
Mads Rasmussen
2023-10-03 21:02:29 +02:00
parent bb87ffac05
commit aa4a49673b
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-manager.context.ts
View File

@@ -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<ModalData, ModalValue>;
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),

8
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts
View File

@@ -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> = T extends undefined
// TODO: consider splitting this into two separate handlers
export class UmbModalContextClass<ModalPreset extends object = object, ModalValue = unknown> extends EventTarget {
#host: UmbControllerHostElement;
#submitPromise: Promise<ModalValue>;
#submitResolver?: (value: ModalValue) => void;
#submitRejecter?: () => void;
@@ -49,12 +46,7 @@ export class UmbModalContextClass<ModalPreset extends object = object, ModalValu
#value = new UmbObjectState<ModalValue | undefined>(undefined);
public readonly value = this.#value.asObservable();
public get controllerAlias() {
return 'umbModalContext:' + this.key;
}
constructor(
host: UmbControllerHostElement,
router: IRouterSlot | null,
modalAlias: string | UmbModalToken<ModalPreset, ModalValue>,
data?: ModalPreset,