From fc5c3e8dcfb685a32dbfdc8e16585fc6d40a5402 Mon Sep 17 00:00:00 2001
From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
Date: Thu, 19 Sep 2024 16:08:39 +0200
Subject: [PATCH] fix: move options back to UmbImage element to ensure
 everything is available when the editor loads

---
 .../extensions/tiptap-umb-image.extension.ts  |  3 ++
 .../tiptap-media-upload.extension.ts          | 32 -------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-umb-image.extension.ts b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-umb-image.extension.ts
index 6db61379c9..5b3737576e 100644
--- a/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-umb-image.extension.ts
+++ b/src/Umbraco.Web.UI.Client/src/external/tiptap/extensions/tiptap-umb-image.extension.ts
@@ -20,6 +20,8 @@ export const UmbImage = Image.extend({
 			sizes: {
 				default: null,
 			},
+			'data-tmpimg': { default: null },
+			'data-udi': { default: null },
 		};
 	},
 });
@@ -44,6 +46,7 @@ declare module '@tiptap/core' {
 				loading?: string;
 				srcset?: string;
 				sizes?: string;
+				'data-tmpimg'?: string;
 			}) => ReturnType;
 		};
 	}
diff --git a/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/tiptap-media-upload.extension.ts b/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/tiptap-media-upload.extension.ts
index 7f4e34a2c9..a56d7184f7 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/tiptap-media-upload.extension.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/rte/tiptap/extensions/tiptap-media-upload.extension.ts
@@ -50,12 +50,6 @@ export default class UmbTiptapMediaUploadExtension extends UmbTiptapExtensionApi
 		return [
 			UmbImage.extend({
 				name: 'umbMediaUpload',
-				addAttributes() {
-					return {
-						...this.parent?.(),
-						'data-tmpimg': { default: null },
-					};
-				},
 				onCreate() {
 					this.parent?.();
 					const host = this.editor.view.dom;
@@ -167,29 +161,3 @@ export default class UmbTiptapMediaUploadExtension extends UmbTiptapExtensionApi
 		return promise;
 	}
 }
-
-declare module '@tiptap/core' {
-	interface Commands<ReturnType> {
-		umbMediaUpload: {
-			/**
-			 * Add an image
-			 * @param options The image attributes
-			 * @example
-			 * editor
-			 *   .commands
-			 *   .setImage({ src: 'https://tiptap.dev/logo.png', alt: 'tiptap', title: 'tiptap logo' })
-			 */
-			setImage: (options: {
-				src: string;
-				alt?: string;
-				title?: string;
-				width?: string;
-				height?: string;
-				loading?: string;
-				srcset?: string;
-				sizes?: string;
-				'data-tmpimg'?: string;
-			}) => ReturnType;
-		};
-	}
-}