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

Merge branch 'feature/modal-events' into feature-entity-user-permissions

Browse Source
This commit is contained in:
Mads Rasmussen
2023-10-02 14:54:44 +02:00
parent 08d8838ec6 3e38c3578a
commit 875ea0cde0
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ import type { UmbRouterSlotElement } from '@umbraco-cms/backoffice/router';
import { createExtensionElement } from '@umbraco-cms/backoffice/extension-api';
import type { UmbControllerHostElement, UmbController } from '@umbraco-cms/backoffice/controller-api';
import { UmbId } from '@umbraco-cms/backoffice/id';
import { UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
import { UmbObjectState, UmbObserverController } from '@umbraco-cms/backoffice/observable-api';
import { UmbContextProvider, UmbContextToken } from '@umbraco-cms/backoffice/context-api';
/**
@@ -64,7 +64,8 @@ export class UmbModalContextClass<ModalPreset extends object = object, ModalValu
public readonly type: UmbModalType = 'dialog';
public readonly size: UUIModalSidebarSize = 'small';
#value?: ModalValue;
#value = new UmbObjectState<ModalValue | undefined>(undefined);
public readonly value = this.#value.asObservable();
public get controllerAlias() {
return 'umbModalContext:' + this.key;
@@ -241,7 +242,7 @@ export class UmbModalContextClass<ModalPreset extends object = object, ModalValu
* @memberof UmbModalContext
*/
public getValue() {
return this.#value;
return this.#value.getValue();
}
/**
@@ -250,7 +251,16 @@ export class UmbModalContextClass<ModalPreset extends object = object, ModalValu
* @memberof UmbModalContext
*/
public setValue(value: ModalValue) {
this.#value = value;
this.#value.update(value);
}
/**
* Updates the current value of this modal.
* @public
* @memberof UmbModalContext
*/
public updateValue(partialValue: Partial<ModalValue>) {
this.#value.update(partialValue);
}
destroy(): void {

11
src/Umbraco.Web.UI.Client/src/shared/modal/modal-element.element.ts
View File

@@ -1,4 +1,4 @@
import { property } from '@umbraco-cms/backoffice/external/lit';
import { property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UmbModalContext } from '@umbraco-cms/backoffice/modal';
import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
@@ -20,6 +20,11 @@ export abstract class UmbModalBaseElement<
@property({ type: Object, attribute: false })
public data?: ModalDataType;
@property({ type: Object, attribute: false })
public value: ModalValueType = null;
@state()
public get _value(): ModalValueType {
return this.modalContext?.getValue() ?? ({} as ModalValueType);
}
public set _value(value: ModalValueType) {
this.modalContext?.setValue(value);
}
}