Merge remote-tracking branch 'origin/v15/feature/tiptap' into v15/feature/tiptap

Author: JesmoDev

src/packages/block/block-rte/context/block-rte-manager.context.ts

@@ -43,6 +43,6 @@ export class UmbBlockRteManagerContext<
 	 * @internal
 	 */
 	public deleteLayoutElement(contentKey: string) {
-		this.removeBlockUdi(contentKey);
+		this.removeBlockKey(contentKey);
 	}
 }

src/packages/block/block/context/block-manager.context.ts

@@ -307,7 +307,7 @@ export abstract class UmbBlockManagerContext<
 		}
 	}
 
-	protected removeBlockUdi(contentUdi: string) {
-		this.#contents.removeOne(contentUdi);
+	protected removeBlockKey(contentKey: string) {
+		this.#contents.removeOne(contentKey);
 	}
 }

src/packages/rte/components/rte-base.element.ts

@@ -127,7 +127,6 @@ export abstract class UmbRteBaseElement extends UmbLitElement implements UmbProp
 					this.#managerContext.exposes,
 				]).pipe(debounceTime(20)),
 				([layouts, contents, settings, exposes]) => {
-					console.log('new blocks', layouts, contents, exposes);
 					this._value = {
 						...this._value,
 						blocks: {
@@ -137,7 +136,7 @@ export abstract class UmbRteBaseElement extends UmbLitElement implements UmbProp
 							expose: exposes,
 						},
 					};
-					//context.setValue(this._value);
+
 					this._fireChangeEvent();
 				},
 				'motherObserver',

src/packages/rte/tiptap/property-editors/tiptap/property-editor-ui-tiptap.element.ts

@@ -13,12 +13,6 @@ const elementName = 'umb-property-editor-ui-tiptap';
 export class UmbPropertyEditorUiTiptapElement extends UmbRteBaseElement {
 	#onChange(event: CustomEvent & { target: UmbInputTiptapElement }) {
 		const value = event.target.value;
-		this._latestMarkup = value;
-
-		this._value = {
-			...this._value,
-			markup: this._latestMarkup,
-		};
 
 		// Remove unused Blocks of Blocks Layout. Leaving only the Blocks that are present in Markup.
 		const usedContentKeys: string[] = [];
@@ -28,14 +22,21 @@ export class UmbPropertyEditorUiTiptapElement extends UmbRteBaseElement {
 			/<umb-rte-block(?:-inline)?(?: class="(?:.[^"]*)")? data-content-key="(?<key>.[^"]*)">(?:<!--Umbraco-Block-->)?<\/umb-rte-block(?:-inline)?>/gi,
 		);
 		let blockElement: RegExpExecArray | null;
-		while ((blockElement = regex.exec(this._latestMarkup)) !== null) {
+		while ((blockElement = regex.exec(value)) !== null) {
 			if (blockElement.groups?.key) {
 				usedContentKeys.push(blockElement.groups.key);
 			}
 		}
 
 		this._filterUnusedBlocks(usedContentKeys);
 
+		this._latestMarkup = value;
+
+		this._value = {
+			...this._value,
+			markup: this._latestMarkup,
+		};
+
 		this._fireChangeEvent();
 	}