From 8a60db615b2ebf67e6e1ea40547a33ba221286cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Mon, 5 Jun 2023 10:48:26 +0200 Subject: [PATCH] rename modal handler --- .../backoffice-modal-container.element.ts | 4 ++-- .../interfaces/modal-extension-element.interface.ts | 4 ++-- .../core/modal/common/confirm/confirm-modal.element.ts | 4 ++-- .../embedded-media/embedded-media-modal.element.ts | 4 ++-- .../core/modal/common/folder/folder-modal.element.ts | 4 ++-- .../src/packages/core/modal/modal-handler.ts | 6 +++--- .../packages/core/modal/modal-route-registration.ts | 4 ++-- .../src/packages/core/modal/modal.context.ts | 10 +++++----- .../workspace-modal/workspace-modal.element.ts | 4 ++-- .../document-type-create-options-modal.element.ts | 4 ++-- .../modal/data-type-create-options-modal.element.ts | 4 ++-- ...-type-picker-flow-data-type-picker-modal.element.ts | 4 ++-- .../data-type-picker-flow-modal.element.ts | 4 ++-- .../property-editor-ui-picker-modal.element.ts | 4 ++-- .../components/log-viewer-search-input.element.ts | 4 ++-- .../insert-menu/templating-insert-menu.element.ts | 4 ++-- .../modals/insert-choose-type-sidebar.element.ts | 4 ++-- .../change-password/change-password-modal.element.ts | 6 +++--- .../modals/current-user/current-user-modal.element.ts | 6 +++--- .../src/shared/modal/modal-element.element.ts | 4 ++-- 20 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts index 2e028b6326..36b7854440 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { css, CSSResultGroup, html, repeat, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { - UmbModalHandler, + UmbModalContext, UmbModalManagerContext, UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '@umbraco-cms/backoffice/modal'; @@ -10,7 +10,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-backoffice-modal-container') export class UmbBackofficeModalContainerElement extends UmbLitElement { @state() - private _modals?: UmbModalHandler[]; + private _modals?: UmbModalContext[]; private _modalContext?: UmbModalManagerContext; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts index 672d68c0c3..813c28da2c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts @@ -1,5 +1,5 @@ import type { ManifestModal } from '../models/index.js'; -import type { UmbModalHandler } from '@umbraco-cms/backoffice/modal'; +import type { UmbModalContext } from '@umbraco-cms/backoffice/modal'; export interface UmbModalExtensionElement< UmbModalData extends object = object, @@ -8,7 +8,7 @@ export interface UmbModalExtensionElement< > extends HTMLElement { manifest?: ModalManifestType; - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; data?: UmbModalData; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts index 38a2ce02b9..8ce1a41f8f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts @@ -1,12 +1,12 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; -import { UmbConfirmModalData, UmbConfirmModalResult, UmbModalHandler } from '@umbraco-cms/backoffice/modal'; +import { UmbConfirmModalData, UmbConfirmModalResult, UmbModalContext } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-confirm-modal') export class UmbConfirmModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property({ type: Object }) data?: UmbConfirmModalData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/embedded-media-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/embedded-media-modal.element.ts index 169b7a39e7..b4f81868a5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/embedded-media-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/embedded-media-modal.element.ts @@ -5,7 +5,7 @@ import { OEmbedStatus, UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult, - UmbModalHandler, + UmbModalContext, } from '@umbraco-cms/backoffice/modal'; import { umbracoPath } from '@umbraco-cms/backoffice/utils'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @@ -27,7 +27,7 @@ export class UmbEmbeddedMediaModalElement extends UmbLitElement { #embedResult!: OEmbedResult; @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property({ type: Object }) data?: UmbEmbeddedMediaModalData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/folder/folder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/folder/folder-modal.element.ts index bd4937690c..38bcd0ab11 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/folder/folder-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/folder/folder-modal.element.ts @@ -1,6 +1,6 @@ import { css, html, customElement, property, query, state } from '@umbraco-cms/backoffice/external/lit'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; -import { UmbFolderModalData, UmbFolderModalResult, UmbModalHandler } from '@umbraco-cms/backoffice/modal'; +import { UmbFolderModalData, UmbFolderModalResult, UmbModalContext } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { UmbFolderRepository } from '@umbraco-cms/backoffice/repository'; import { createExtensionClass, ManifestBase } from '@umbraco-cms/backoffice/extension-api'; @@ -11,7 +11,7 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr @customElement('umb-folder-modal') export class UmbFolderModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; private _data?: UmbFolderModalData; @property({ type: Object, attribute: false }) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts index f610794fcc..4051c16739 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts @@ -19,7 +19,7 @@ import { UmbContextProviderController, UmbContextToken } from '@umbraco-cms/back /** * Type which omits the real submit method, and replaces it with a submit method which accepts an optional argument depending on the generic type. */ -export type UmbModalHandler = Omit< +export type UmbModalContext = Omit< UmbModalContextClass, 'submit' > & @@ -110,7 +110,7 @@ export class UmbModalContextClass + this as unknown as UmbModalContext ); } @@ -201,4 +201,4 @@ export class UmbModalContextClass('UmbModalContext'); +export const UMB_MODAL_CONTEXT_TOKEN = new UmbContextToken('UmbModalContext'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts index 77e362bb8f..9adb06dfe1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts @@ -1,4 +1,4 @@ -import { UmbModalHandler } from './modal-handler.js'; +import { UmbModalContext } from './modal-handler.js'; import { UmbModalConfig, UmbModalManagerContext } from './modal.context.js'; import { UmbModalToken } from './token/modal-token.js'; import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot'; @@ -18,7 +18,7 @@ export class UmbModalRouteRegistration void; #onRejectCallback?: () => void; - #modalHandler: UmbModalHandler | undefined; + #modalHandler: UmbModalContext | undefined; #routeBuilder?: UmbModalRouteBuilder; #urlBuilderCallback: ((urlBuilder: UmbModalRouteBuilder) => void) | undefined; 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 2b8d53f14f..512a690e94 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 @@ -1,4 +1,4 @@ -import { UmbModalHandler, UmbModalContextClass } from './modal-handler.js'; +import { UmbModalContext, UmbModalContextClass } from './modal-handler.js'; import type { 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'; @@ -18,7 +18,7 @@ export interface UmbModalConfig { export class UmbModalManagerContext { host: UmbControllerHostElement; // TODO: Investigate if we can get rid of HTML elements in our store, so we can use one of our states. - #modals = new BehaviorSubject(>[]); + #modals = new BehaviorSubject(>[]); public readonly modals = this.#modals.asObservable(); constructor(host: UmbControllerHostElement) { @@ -45,7 +45,7 @@ export class UmbModalManagerContext { modalAlias, data, config - ) as unknown as UmbModalHandler; + ) as unknown as UmbModalContext; modalHandler.modalElement.addEventListener('close-end', () => this.#onCloseEnd(modalHandler)); @@ -76,10 +76,10 @@ export class UmbModalManagerContext { /** * Handles the close-end event * @private - * @param {UmbModalHandler} modalHandler + * @param {UmbModalContext} modalHandler * @memberof UmbModalContext */ - #onCloseEnd(modalHandler: UmbModalHandler) { + #onCloseEnd(modalHandler: UmbModalContext) { modalHandler.modalElement.removeEventListener('close-end', () => this.#onCloseEnd(modalHandler)); this.#remove(modalHandler.key); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts index 3056ad5fd5..4cf4a114c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts @@ -1,12 +1,12 @@ import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { css, CSSResultGroup, html, customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbModalHandler, UmbWorkspaceData, UmbWorkspaceResult } from '@umbraco-cms/backoffice/modal'; +import { UmbModalContext, UmbWorkspaceData, UmbWorkspaceResult } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-workspace-modal') export class UmbWorkspaceModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property() data?: UmbWorkspaceData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts index 58cab764de..f5f3ecb5de 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts @@ -4,7 +4,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/ import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { UmbModalManagerContext, - UmbModalHandler, + UmbModalContext, UMB_FOLDER_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '@umbraco-cms/backoffice/modal'; @@ -13,7 +13,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-document-type-create-options-modal') export class UmbDataTypeCreateOptionsModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property({ type: Object }) data?: UmbDocumentTypeCreateOptionsModalData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/modal/data-type-create-options-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/modal/data-type-create-options-modal.element.ts index 3ad1e85bb9..acc064576e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/modal/data-type-create-options-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/modal/data-type-create-options-modal.element.ts @@ -4,7 +4,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/ import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { UmbModalManagerContext, - UmbModalHandler, + UmbModalContext, UMB_FOLDER_MODAL, UMB_MODAL_MANAGER_CONTEXT_TOKEN, } from '@umbraco-cms/backoffice/modal'; @@ -13,7 +13,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-data-type-create-options-modal') export class UmbDataTypeCreateOptionsModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property({ type: Object }) data?: UmbDataTypeCreateOptionsModalData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts index effc3ccab6..9f4a2a57a7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts @@ -2,7 +2,7 @@ import { UmbDataTypeRepository } from '../../repository/data-type.repository.js' import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; import { - UmbModalHandler, + UmbModalContext, UmbDataTypePickerFlowDataTypePickerModalData, UmbDataTypePickerFlowDataTypePickerModalResult, } from '@umbraco-cms/backoffice/modal'; @@ -72,7 +72,7 @@ export class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbLitEleme } @property({ attribute: false }) - modalHandler?: UmbModalHandler< + modalHandler?: UmbModalContext< UmbDataTypePickerFlowDataTypePickerModalData, UmbDataTypePickerFlowDataTypePickerModalResult >; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts index 15606fd649..f808f4b1fc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts @@ -8,7 +8,7 @@ import { UMB_WORKSPACE_MODAL, UmbDataTypePickerFlowModalData, UmbDataTypePickerFlowModalResult, - UmbModalHandler, + UmbModalContext, UmbModalRouteBuilder, UmbModalRouteRegistrationController, } from '@umbraco-cms/backoffice/modal'; @@ -22,7 +22,7 @@ interface GroupedItems { @customElement('umb-data-type-picker-flow-modal') export class UmbDataTypePickerFlowModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property({ type: Object }) public get data(): UmbDataTypePickerFlowModalData | undefined { diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts index 29f67cf412..d5aa202907 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts @@ -5,7 +5,7 @@ import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui'; import { UmbPropertyEditorUIPickerModalData, UmbPropertyEditorUIPickerModalResult, - UmbModalHandler, + UmbModalContext, } from '@umbraco-cms/backoffice/modal'; import { ManifestPropertyEditorUi, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @@ -76,7 +76,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbLitElement { } @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; private _submit() { this.modalHandler?.submit({ selection: this._selection }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts index e018ccf0b5..19fde14ef0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts @@ -14,7 +14,7 @@ import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/ import { UMB_MODAL_MANAGER_CONTEXT_TOKEN, UmbModalManagerContext, - UmbModalHandler, + UmbModalContext, UmbModalToken, } from '@umbraco-cms/backoffice/modal'; @@ -134,7 +134,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement { this.#logViewerContext?.setFilterExpression(''); } - #modalHandler?: UmbModalHandler; + #modalHandler?: UmbModalContext; #saveSearch(savedSearch: SavedLogSearchResponseModel) { this.#logViewerContext?.saveSearch(savedSearch); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts index c2e8c70cb6..74f96512fa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts @@ -14,7 +14,7 @@ import { UMB_PARTIAL_VIEW_PICKER_MODAL, UmbDictionaryItemPickerModalResult, UmbModalManagerContext, - UmbModalHandler, + UmbModalContext, UmbModalToken, UmbPartialViewPickerModalResult, } from '@umbraco-cms/backoffice/modal'; @@ -35,7 +35,7 @@ export class UmbTemplatingInsertMenuElement extends UmbLitElement { private _modalContext?: UmbModalManagerContext; - #openModal?: UmbModalHandler; + #openModal?: UmbModalContext; #dictionaryRepository = new UmbDictionaryRepository(this); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/modals/insert-choose-type-sidebar.element.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/modals/insert-choose-type-sidebar.element.ts index f80c9c25b0..88895d0678 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/modals/insert-choose-type-sidebar.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/modals/insert-choose-type-sidebar.element.ts @@ -7,7 +7,7 @@ import { UmbModalManagerContext, UmbModalToken, UMB_PARTIAL_VIEW_PICKER_MODAL, - UmbModalHandler, + UmbModalContext, UMB_DICTIONARY_ITEM_PICKER_MODAL, UmbDictionaryItemPickerModalResult, } from '@umbraco-cms/backoffice/modal'; @@ -53,7 +53,7 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement }); } - #openModal?: UmbModalHandler; + #openModal?: UmbModalContext; #openInsertValueSidebar() { this.#openModal = this._modalContext?.open(UMB_MODAL_TEMPLATING_INSERT_FIELD_SIDEBAR_MODAL); diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts index 4772075cca..a54409d4bb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts @@ -1,12 +1,12 @@ import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; -import { css, CSSResultGroup, html, nothing , customElement, property } from '@umbraco-cms/backoffice/external/lit'; -import { UmbModalHandler, UmbChangePasswordModalData } from '@umbraco-cms/backoffice/modal'; +import { css, CSSResultGroup, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit'; +import { UmbModalContext, UmbChangePasswordModalData } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-change-password-modal') export class UmbChangePasswordModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @property() data?: UmbChangePasswordModalData; diff --git a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts index a8f567f82e..9558d82322 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts @@ -1,14 +1,14 @@ import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user.store.js'; import type { UmbLoggedInUser } from '../../types.js'; import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui'; -import { css, CSSResultGroup, html , customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; -import { UmbModalHandler } from '@umbraco-cms/backoffice/modal'; +import { css, CSSResultGroup, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit'; +import { UmbModalContext } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @customElement('umb-current-user-modal') export class UmbCurrentUserModalElement extends UmbLitElement { @property({ attribute: false }) - modalHandler?: UmbModalHandler; + modalHandler?: UmbModalContext; @state() private _currentUser?: UmbLoggedInUser; diff --git a/src/Umbraco.Web.UI.Client/src/shared/modal/modal-element.element.ts b/src/Umbraco.Web.UI.Client/src/shared/modal/modal-element.element.ts index e65bb261b8..8e193465b2 100644 --- a/src/Umbraco.Web.UI.Client/src/shared/modal/modal-element.element.ts +++ b/src/Umbraco.Web.UI.Client/src/shared/modal/modal-element.element.ts @@ -1,6 +1,6 @@ import { property } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; -import { UmbModalHandler } from '@umbraco-cms/backoffice/modal'; +import { UmbModalContext } from '@umbraco-cms/backoffice/modal'; import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; export abstract class UmbModalBaseElement< @@ -15,7 +15,7 @@ export abstract class UmbModalBaseElement< public manifest?: ModalManifestType; @property({ attribute: false }) - public modalHandler?: UmbModalHandler; + public modalHandler?: UmbModalContext; @property({ type: Object, attribute: false }) public data?: ModalDataType;