From eb5ce700055ce012197b6508d8f46e3c32cdb24e Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 11 Oct 2023 13:32:37 +0200
Subject: [PATCH] code editor modal fix

---
 .../input-tiny-mce/input-tiny-mce.element.ts     |  9 +++------
 .../code-editor/code-editor-modal.element.ts     | 16 ++--------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
index 6c530463d7..f46d60853b 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/input-tiny-mce/input-tiny-mce.element.ts
@@ -5,10 +5,7 @@ import { uriAttributeSanitizer } from './input-tiny-mce.sanitizer.js';
 import { FormControlMixin } from '@umbraco-cms/backoffice/external/uui';
 import { renderEditor, type tinymce } from '@umbraco-cms/backoffice/external/tinymce';
 import { UMB_AUTH, UmbLoggedInUser } from '@umbraco-cms/backoffice/auth';
-import {
-	TinyMcePluginArguments,
-	UmbTinyMcePluginBase,
-} from '@umbraco-cms/backoffice/components';
+import { TinyMcePluginArguments, UmbTinyMcePluginBase } from '@umbraco-cms/backoffice/components';
 import { ClassConstructor, hasDefaultExport, loadExtension } from '@umbraco-cms/backoffice/extension-api';
 import { ManifestTinyMcePlugin, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import {
@@ -210,11 +207,11 @@ export class UmbInputTinyMceElement extends FormControlMixin(UmbLitElement) {
 
 		// define keyboard shortcuts
 		editor.addShortcut('Ctrl+S', '', () =>
-			this.dispatchEvent(new CustomEvent('rte.shortcut.save', { composed: true, bubbles: true }))
+			this.dispatchEvent(new CustomEvent('rte.shortcut.save', { composed: true, bubbles: true })),
 		);
 
 		editor.addShortcut('Ctrl+P', '', () =>
-			this.dispatchEvent(new CustomEvent('rte.shortcut.saveAndPublish', { composed: true, bubbles: true }))
+			this.dispatchEvent(new CustomEvent('rte.shortcut.saveAndPublish', { composed: true, bubbles: true })),
 		);
 
 		// bind editor events
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts
index fb8a6522b0..d5e8ef82a9 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/common/code-editor/code-editor-modal.element.ts
@@ -15,12 +15,11 @@ export class UmbCodeEditorModalElement extends UmbModalBaseElement<UmbCodeEditor
 
 	constructor() {
 		super();
-
 		this.#loadCodeEditor();
 	}
 
 	#handleConfirm() {
-		this.modalContext?.submit({ content: this.data?.content ?? '' });
+		this.modalContext?.submit({ content: this._codeEditor?.editor?.monacoEditor?.getValue() ?? '' });
 	}
 
 	#handleCancel() {
@@ -36,21 +35,10 @@ export class UmbCodeEditorModalElement extends UmbModalBaseElement<UmbCodeEditor
 		}
 	}
 
-	// TODO => debounce?
-	#onCodeEditorInput(e: UUIInputEvent) {
-		e.preventDefault();
-		if (!this.data) {
-			return;
-		}
-
-		this.data.content = this._codeEditor?.code ?? '';
-	}
-
 	#renderCodeEditor() {
 		return html`<umb-code-editor
 			language=${ifDefined(this.data?.language)}
-			.code=${this.data?.content ?? ''}
-			@input=${this.#onCodeEditorInput}></umb-code-editor>`;
+			.code=${this.data?.content ?? ''}></umb-code-editor>`;
 	}
 
 	#renderLoading() {