From d800fe4a766b8d46cabc86748ca9e70b74c0c32b Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <madsr@hey.com>
Date: Wed, 8 Mar 2023 14:32:57 +0100
Subject: [PATCH] move basic modal data interface

---
 .../libs/modal/modal.context.ts                     |  6 +++---
 .../shared/modals/basic/basic-modal.element.ts      | 13 ++++---------
 .../src/backoffice/shared/modals/basic/index.ts     |  6 ++++++
 3 files changed, 13 insertions(+), 12 deletions(-)
 create mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/index.ts

diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
index 6e9d6a3ffe..9ca125fac1 100644
--- a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts
@@ -16,12 +16,12 @@ import type { UUIModalDialogElement } from '@umbraco-ui/uui-modal-dialog';
 import type { UmbDocumentPickerModalData } from '../../src/backoffice/documents/documents/modals/document-picker';
 import { UmbChangePasswordModalData } from '../../src/backoffice/users/current-user/modals/change-password';
 import { UmbIconPickerModalData } from '../../src/backoffice/shared/modals/icon-picker';
+import { UmbMediaPickerModalData } from '../../src/backoffice/media/media/modals/media-picker';
+import type { UmbBasicModalData } from '../../src/backoffice/shared/modals/basic';
+import type { UmbLinkPickerModalData } from '../../src/backoffice/shared/modals/link-picker';
 import type { UmbModalConfirmData } from './layouts/confirm/modal-layout-confirm.element';
 import type { UmbModalPropertyEditorUIPickerData } from './layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element';
-import { UmbMediaPickerModalData } from '../../src/backoffice/media/media/modals/media-picker';
-import type { UmbLinkPickerModalData } from '../../src/backoffice/shared/modals/link-picker/link-picker-modal.element';
 import { UmbModalHandler } from './modal-handler';
-import type { UmbBasicModalData } from '../../src/backoffice/shared/modals/basic/basic-modal.element';
 import { UmbPickerModalData } from './layouts/modal-layout-picker-base';
 import { UmbModalToken } from './token/modal-token';
 import { UmbContextToken } from '@umbraco-cms/context-api';
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/basic-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/basic-modal.element.ts
index b8960bc69b..ba99230808 100644
--- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/basic-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/basic-modal.element.ts
@@ -1,14 +1,9 @@
-import { css, html, TemplateResult } from 'lit';
+import { css, html } from 'lit';
 import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
 import { customElement } from 'lit/decorators.js';
-import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar';
+import { ifDefined } from 'lit/directives/if-defined.js';
 import { UmbModalLayoutElement } from '../../../../../libs/modal/layouts/modal-layout.element';
-
-export interface UmbBasicModalData {
-	header: TemplateResult | string;
-	content: TemplateResult | string;
-	overlaySize?: UUIModalSidebarSize;
-}
+import { UmbBasicModalData } from '.';
 
 @customElement('umb-basic-modal')
 export class UmbBasicModalElement extends UmbModalLayoutElement<UmbBasicModalData> {
@@ -34,7 +29,7 @@ export class UmbBasicModalElement extends UmbModalLayoutElement<UmbBasicModalDat
 
 	render() {
 		return html`
-			<umb-workspace-layout .headline=${this.data?.header}>
+			<umb-workspace-layout headline=${ifDefined(this.data?.header)}>
 				<uui-scroll-container>${this.data?.content}</uui-scroll-container>
 				<uui-button slot="actions" look="secondary" label="Close sidebar" @click="${this._close}">Close</uui-button>
 			</umb-workspace-layout>
diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/index.ts
new file mode 100644
index 0000000000..18b9f0c4e2
--- /dev/null
+++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/basic/index.ts
@@ -0,0 +1,6 @@
+import { TemplateResult } from 'lit';
+
+export interface UmbBasicModalData {
+	header: string;
+	content: TemplateResult | string;
+}