@umbraco-cms/backoffice 15.3.0-rc2 → 15.3.1

package/dist-cms/packages/core/workspace/submittable/submittable-workspace-context-base.js

@@ -29,7 +29,10 @@ export class UmbSubmittableWorkspaceContextBase extends UmbContextBase {
         this.#isNew = new UmbBooleanState(undefined);
         this.isNew = this.#isNew.asObservable();
         this.routes = new UmbWorkspaceRouteManager(this);
-        this.#rejectSubmit = () => {
+        this.#rejectSubmit = ( /*error: any*/) => {
+            /*if (error) {
+                throw new Error(error);
+            }*/
             if (this.#submitPromise) {
                 // TODO: Capture the validation contexts messages on open, and then reset to them in this case. [NL]
                 this.#submitReject?.();
@@ -73,7 +76,6 @@ export class UmbSubmittableWorkspaceContextBase extends UmbContextBase {
      * @returns Promise that resolves to void when the validation is complete.
      */
     async validate() {
-        //return this.validation.validate();
         return Promise.all(this.#validationContexts.map((context) => context.validate()));
     }
     async requestSubmit() {
@@ -89,7 +91,12 @@ export class UmbSubmittableWorkspaceContextBase extends UmbContextBase {
         });
         this.validate().then(async () => {
             onValid().then(this.#completeSubmit, this.#rejectSubmit);
-        }, async () => {
+        }, async ( /*error*/) => {
+            /*if (error) {
+                throw new Error(error);
+            }*/
+            // TODO: Implement developer-mode logging here. [NL]
+            console.warn('Validation failed because of these validation messages still begin present: ', this.#validationContexts.flatMap((x) => x.messages.getMessages()));
             onInvalid().then(this.#resolveSubmit, this.#rejectSubmit);
         });
         return this.#submitPromise;

package/dist-cms/packages/documents/document-blueprints/repository/detail/document-blueprint-detail.server.data-source.js

@@ -75,9 +75,9 @@ export class UmbDocumentBlueprintServerDataSource {
             values: data.values.map((value) => {
                 return {
                     editorAlias: value.editorAlias,
-                    alias: value.alias,
                     culture: value.culture || null,
                     segment: value.segment || null,
+                    alias: value.alias,
                     value: value.value,
                 };
             }),

package/dist-cms/packages/documents/documents/components/input-document/input-document.context.js

@@ -23,7 +23,7 @@ export class UmbDocumentPickerInputContext extends UmbPickerInputContext {
             allowedContentTypes: args?.allowedContentTypes,
             ...pickerData?.search?.queryParams,
         };
-        super.openPicker(combinedPickerData);
+        await super.openPicker(combinedPickerData);
     }
     #pickableFilter = (item, allowedContentTypes) => {
         if (allowedContentTypes && allowedContentTypes.length > 0) {

package/dist-cms/packages/documents/documents/publishing/publish-with-descendants/modal/document-publish-with-descendants-modal.element.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UmbDocumentVariantState } from '../../../types.js';
 import { isNotPublishedMandatory } from '../../utils.js';
 import { css, customElement, html, state } from '../../../../../../external/lit/index.js';
-import { umbConfirmModal, UmbModalBaseElement } from '../../../../../core/modal/index.js';
+import { UmbModalBaseElement } from '../../../../../core/modal/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
 import { UmbSelectionManager } from '../../../../../core/utils/index.js';
 import '../../../modals/shared/document-variant-language-picker.element.js';
@@ -16,7 +16,6 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
         super(...arguments);
         this.#selectionManager = new UmbSelectionManager(this);
         this.#includeUnpublishedDescendants = false;
-        this.#forceRepublish = false;
         this._options = [];
         this.#pickableFilter = (option) => {
             if (!option.variant) {
@@ -28,7 +27,6 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
     }
     #selectionManager;
     #includeUnpublishedDescendants;
-    #forceRepublish;
     #pickableFilter;
     firstUpdated() {
         this.#configureSelectionManager();
@@ -64,22 +62,10 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
     #onIncludeUnpublishedDescendantsChange() {
         this.#includeUnpublishedDescendants = !this.#includeUnpublishedDescendants;
     }
-    async #onForceRepublishChange() {
-        this.#forceRepublish = !this.#forceRepublish;
-    }
     async #submit() {
-        if (this.#forceRepublish) {
-            await umbConfirmModal(this, {
-                headline: this.localize.term('content_forceRepublishWarning'),
-                content: this.localize.term('content_forceRepublishAdvisory'),
-                color: 'warning',
-                confirmLabel: this.localize.term('actions_publish'),
-            });
-        }
         this.value = {
             selection: this.#selectionManager.getSelection(),
             includeUnpublishedDescendants: this.#includeUnpublishedDescendants,
-            forceRepublish: this.#forceRepublish,
         };
         this.modalContext?.submit();
     }
@@ -118,14 +104,6 @@ let UmbDocumentPublishWithDescendantsModalElement = class UmbDocumentPublishWith
 					@change=${this.#onIncludeUnpublishedDescendantsChange}></uui-toggle>
 			</uui-form-layout-item>
 
-			<uui-form-layout-item>
-				<uui-toggle
-					id="forceRepublish"
-					label=${this.localize.term('content_forceRepublish')}
-					?checked=${this.value?.forceRepublish}
-					@change=${this.#onForceRepublishChange}></uui-toggle>
-			</uui-form-layout-item>
-
 			<div slot="actions">
 				<uui-button label=${this.localize.term('general_close')} @click=${this.#close}></uui-button>
 				<uui-button

package/dist-cms/packages/documents/documents/publishing/publish-with-descendants/modal/document-publish-with-descendants-modal.token.d.ts

@@ -5,6 +5,5 @@ export interface UmbDocumentPublishWithDescendantsModalData extends UmbDocumentV
 }
 export interface UmbDocumentPublishWithDescendantsModalValue extends UmbDocumentVariantPickerValue {
     includeUnpublishedDescendants?: boolean;
-    forceRepublish?: boolean;
 }
 export declare const UMB_DOCUMENT_PUBLISH_WITH_DESCENDANTS_MODAL: UmbModalToken<UmbDocumentPublishWithDescendantsModalData, UmbDocumentPublishWithDescendantsModalValue>;

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.repository.d.ts

@@ -30,10 +30,9 @@ export declare class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @param id
      * @param variantIds
      * @param includeUnpublishedDescendants
-     * @param forceRepublish
      * @memberof UmbDocumentPublishingRepository
      */
-    publishWithDescendants(id: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean, forceRepublish: boolean): Promise<{
+    publishWithDescendants(id: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<{
         error: import("../../../../../external/backend-api/index.js").ApiError | import("../../../../../external/backend-api/index.js").CancelError | undefined;
     }>;
     /**

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.repository.js

@@ -60,16 +60,15 @@ export class UmbDocumentPublishingRepository extends UmbRepositoryBase {
      * @param id
      * @param variantIds
      * @param includeUnpublishedDescendants
-     * @param forceRepublish
      * @memberof UmbDocumentPublishingRepository
      */
-    async publishWithDescendants(id, variantIds, includeUnpublishedDescendants, forceRepublish) {
+    async publishWithDescendants(id, variantIds, includeUnpublishedDescendants) {
         if (!id)
             throw new Error('id is missing');
         if (!variantIds)
             throw new Error('variant IDs are missing');
         await this.#init;
-        const { error } = await this.#publishingDataSource.publishWithDescendants(id, variantIds, includeUnpublishedDescendants, forceRepublish);
+        const { error } = await this.#publishingDataSource.publishWithDescendants(id, variantIds, includeUnpublishedDescendants);
         if (!error) {
             const notification = { data: { message: `Document published with descendants` } };
             // TODO: Move this to the calling workspace context [JOV]

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.server.data-source.d.ts

@@ -37,10 +37,9 @@ export declare class UmbDocumentPublishingServerDataSource {
      * @param unique
      * @param variantIds
      * @param includeUnpublishedDescendants
-     * @param forceRepublish
      * @memberof UmbDocumentPublishingServerDataSource
      */
-    publishWithDescendants(unique: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean, forceRepublish: boolean): Promise<UmbDataSourceResponse<string>>;
+    publishWithDescendants(unique: string, variantIds: Array<UmbVariantId>, includeUnpublishedDescendants: boolean): Promise<UmbDataSourceResponse<string>>;
     /**
      * Get the published Document by its unique
      * @param {string} unique - Document unique

package/dist-cms/packages/documents/documents/publishing/repository/document-publishing.server.data-source.js

@@ -68,16 +68,14 @@ export class UmbDocumentPublishingServerDataSource {
      * @param unique
      * @param variantIds
      * @param includeUnpublishedDescendants
-     * @param forceRepublish
      * @memberof UmbDocumentPublishingServerDataSource
      */
-    async publishWithDescendants(unique, variantIds, includeUnpublishedDescendants, forceRepublish) {
+    async publishWithDescendants(unique, variantIds, includeUnpublishedDescendants) {
         if (!unique)
             throw new Error('Id is missing');
         const requestBody = {
             cultures: variantIds.map((variant) => variant.toCultureString()),
             includeUnpublishedDescendants,
-            forceRepublish,
         };
         return tryExecuteAndNotify(this.#host, DocumentService.putDocumentByIdPublishWithDescendants({ id: unique, requestBody }));
     }
@@ -101,9 +99,9 @@ export class UmbDocumentPublishingServerDataSource {
             values: data.values.map((value) => {
                 return {
                     editorAlias: value.editorAlias,
-                    alias: value.alias,
                     culture: value.culture || null,
                     segment: value.segment || null,
+                    alias: value.alias,
                     value: value.value,
                 };
             }),

package/dist-cms/packages/documents/documents/publishing/workspace-context/document-publishing.workspace-context.js

@@ -190,7 +190,7 @@ export class UmbDocumentPublishingWorkspaceContext extends UmbContextBase {
         const variantIds = result?.selection.map((x) => UmbVariantId.FromString(x)) ?? [];
         if (!variantIds.length)
             return;
-        const { error } = await this.#publishingRepository.publishWithDescendants(unique, variantIds, result.includeUnpublishedDescendants ?? false, result.forceRepublish ?? false);
+        const { error } = await this.#publishingRepository.publishWithDescendants(unique, variantIds, result.includeUnpublishedDescendants ?? false);
         if (!error) {
             // reload the document so all states are updated after the publish operation
             await this.#documentWorkspaceContext.reload();

package/dist-cms/packages/documents/documents/repository/detail/document-detail.server.data-source.js

@@ -79,9 +79,9 @@ export class UmbDocumentServerDataSource {
             values: data.values.map((value) => {
                 return {
                     editorAlias: value.editorAlias,
-                    alias: value.alias,
                     culture: value.culture || null,
                     segment: value.segment || null,
+                    alias: value.alias,
                     value: value.value,
                 };
             }),

package/dist-cms/packages/media/media/components/input-media/input-media.context.js

@@ -24,7 +24,7 @@ export class UmbMediaPickerInputContext extends UmbPickerInputContext {
             allowedContentTypes: args?.allowedContentTypes,
             ...pickerData?.search?.queryParams,
         };
-        super.openPicker(combinedPickerData);
+        await super.openPicker(combinedPickerData);
     }
     #pickableFilter = (item, allowedContentTypes) => {
         if (allowedContentTypes && allowedContentTypes.length > 0) {

package/dist-cms/packages/members/member/components/input-member/input-member.context.js

@@ -23,7 +23,7 @@ export class UmbMemberPickerInputContext extends UmbPickerInputContext {
             allowedContentTypes: args?.allowedContentTypes,
             ...pickerData?.search?.queryParams,
         };
-        super.openPicker(combinedPickerData);
+        await super.openPicker(combinedPickerData);
     }
     #pickableFilter = (item, allowedContentTypes) => {
         if (allowedContentTypes && allowedContentTypes.length > 0) {

package/dist-cms/packages/multi-url-picker/property-editor/property-editor-ui-multi-url-picker.element.d.ts

@@ -2,12 +2,12 @@ import type { UmbLinkPickerLink } from '../link-picker-modal/types.js';
 import { UmbLitElement } from '../../core/lit-element/index.js';
 import type { UmbPropertyEditorConfigCollection, UmbPropertyEditorUiElement } from '../../core/property-editor/index.js';
 import '../components/input-multi-url/index.js';
+declare const UmbPropertyEditorUIMultiUrlPickerElement_base: import("../../../libs/extension-api/index.js").HTMLElementConstructor<import("../../core/validation/index.js").UmbFormControlMixinElement<UmbLinkPickerLink[] | undefined>> & typeof UmbLitElement;
 /**
  * @element umb-property-editor-ui-multi-url-picker
  */
-export declare class UmbPropertyEditorUIMultiUrlPickerElement extends UmbLitElement implements UmbPropertyEditorUiElement {
+export declare class UmbPropertyEditorUIMultiUrlPickerElement extends UmbPropertyEditorUIMultiUrlPickerElement_base implements UmbPropertyEditorUiElement {
     #private;
-    value: Array<UmbLinkPickerLink>;
     set config(config: UmbPropertyEditorConfigCollection | undefined);
     /**
      * Sets the input to readonly mode, meaning value cannot be changed but still able to read and select its content.

package/dist-cms/packages/multi-url-picker/property-editor/property-editor-ui-multi-url-picker.element.js

@@ -9,10 +9,11 @@ import { UmbLitElement } from '../../core/lit-element/index.js';
 import { UmbPropertyValueChangeEvent } from '../../core/property-editor/index.js';
 import { UMB_PROPERTY_CONTEXT } from '../../core/property/index.js';
 import '../components/input-multi-url/index.js';
+import { UmbFormControlMixin } from '../../core/validation/index.js';
 /**
  * @element umb-property-editor-ui-multi-url-picker
  */
-let UmbPropertyEditorUIMultiUrlPickerElement = class UmbPropertyEditorUIMultiUrlPickerElement extends UmbLitElement {
+let UmbPropertyEditorUIMultiUrlPickerElement = class UmbPropertyEditorUIMultiUrlPickerElement extends UmbFormControlMixin(UmbLitElement) {
     set config(config) {
         if (!config)
             return;
@@ -27,7 +28,6 @@ let UmbPropertyEditorUIMultiUrlPickerElement = class UmbPropertyEditorUIMultiUrl
     }
     constructor() {
         super();
-        this.value = [];
         /**
          * Sets the input to readonly mode, meaning value cannot be changed but still able to read and select its content.
          * @type {boolean}
@@ -47,6 +47,7 @@ let UmbPropertyEditorUIMultiUrlPickerElement = class UmbPropertyEditorUIMultiUrl
         if (this._min && this._max && this._min > this._max) {
             console.warn(`Property '${this._label}' (Multi URL Picker) has been misconfigured, 'min' is greater than 'max'. Please correct your data type configuration.`, this);
         }
+        this.addFormControlElement(this.shadowRoot.querySelector('umb-input-multi-url'));
     }
     #onChange(event) {
         this.value = event.target.urls;
@@ -68,9 +69,6 @@ let UmbPropertyEditorUIMultiUrlPickerElement = class UmbPropertyEditorUIMultiUrl
 		`;
     }
 };
-__decorate([
-    property({ type: Array })
-], UmbPropertyEditorUIMultiUrlPickerElement.prototype, "value", void 0);
 __decorate([
     property({ type: Boolean, reflect: true })
 ], UmbPropertyEditorUIMultiUrlPickerElement.prototype, "readonly", void 0);

package/dist-cms/packages/property-editors/accepted-types/property-editor-ui-accepted-upload-types.element.js

@@ -5,8 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbPropertyEditorUIMultipleTextStringElement } from '../multiple-text-string/property-editor-ui-multiple-text-string.element.js';
-import { css, customElement, html, nothing, state, when } from '../../../external/lit/index.js';
-import { formatBytes } from '../../core/utils/index.js';
+import { css, customElement, html, state } from '../../../external/lit/index.js';
 import { UmbTemporaryFileConfigRepository } from '../../core/temporary-file/index.js';
 /**
  * @element umb-property-editor-ui-accepted-upload-types
@@ -32,7 +31,8 @@ let UmbPropertyEditorUIAcceptedUploadTypesElement = class UmbPropertyEditorUIAcc
         });
     }
     #addValidators(config) {
-        this._inputElement?.addValidator('badInput', () => {
+        const inputElement = this.shadowRoot?.querySelector('umb-input-multiple-text-string');
+        inputElement?.addValidator('badInput', () => {
             let message = this.localize.term('validation_invalidExtensions');
             if (config.allowedUploadedFileExtensions.length) {
                 message += `<br>${this.localize.term('validation_allowedExtensions')} ${config.allowedUploadedFileExtensions.join(', ')}`;
@@ -42,7 +42,7 @@ let UmbPropertyEditorUIAcceptedUploadTypesElement = class UmbPropertyEditorUIAcc
             }
             return message;
         }, () => {
-            const extensions = this._inputElement?.items;
+            const extensions = inputElement?.items;
             if (!extensions)
                 return false;
             if (config.allowedUploadedFileExtensions.length &&
@@ -55,38 +55,8 @@ let UmbPropertyEditorUIAcceptedUploadTypesElement = class UmbPropertyEditorUIAcc
             return false;
         });
     }
-    #renderAcceptedTypes() {
-        if (!this._acceptedTypes.length && !this._disallowedTypes.length && !this._maxFileSize) {
-            return nothing;
-        }
-        return html `
-			<uui-box id="notice" headline=${this.localize.term('general_serverConfiguration')}>
-				<p><umb-localize key="media_noticeExtensionsServerOverride"></umb-localize></p>
-				${when(this._acceptedTypes.length, () => html `
-						<p>
-							<umb-localize key="validation_allowedExtensions"></umb-localize>
-							<strong>${this._acceptedTypes.join(', ')}</strong>
-						</p>
-					`)}
-				${when(this._disallowedTypes.length, () => html `
-						<p>
-							<umb-localize key="validation_disallowedExtensions"></umb-localize>
-							<strong>${this._disallowedTypes.join(', ')}</strong>
-						</p>
-					`)}
-				${when(this._maxFileSize, () => html `
-						<p>
-							${this.localize.term('media_maxFileSize')}
-							<strong title="${this.localize.number(this._maxFileSize)} bytes"
-								>${formatBytes(this._maxFileSize, { decimals: 2 })}</strong
-							>.
-						</p>
-					`)}
-			</uui-box>
-		`;
-    }
     render() {
-        return html `${this.#renderAcceptedTypes()} ${super.render()}`;
+        return html `${super.render()}`;
     }
     static { this.styles = [
         css `

package/dist-cms/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.element.d.ts

@@ -1,13 +1,11 @@
-import { UmbValidationContext } from '../../core/validation/index.js';
 import { UmbLitElement } from '../../core/lit-element/index.js';
-import type { UmbInputMultipleTextStringElement } from '../../core/components/index.js';
 import type { UmbPropertyEditorConfigCollection, UmbPropertyEditorUiElement } from '../../core/property-editor/index.js';
+declare const UmbPropertyEditorUIMultipleTextStringElement_base: import("../../../libs/extension-api/index.js").HTMLElementConstructor<import("../../core/validation/index.js").UmbFormControlMixinElement<string[] | undefined>> & typeof UmbLitElement;
 /**
  * @element umb-property-editor-ui-multiple-text-string
  */
-export declare class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement implements UmbPropertyEditorUiElement {
+export declare class UmbPropertyEditorUIMultipleTextStringElement extends UmbPropertyEditorUIMultipleTextStringElement_base implements UmbPropertyEditorUiElement {
     #private;
-    value?: Array<string>;
     set config(config: UmbPropertyEditorConfigCollection | undefined);
     /**
      * Disables the Multiple Text String Property Editor UI
@@ -33,8 +31,6 @@ export declare class UmbPropertyEditorUIMultipleTextStringElement extends UmbLit
     private _label?;
     private _min;
     private _max;
-    protected _inputElement?: UmbInputMultipleTextStringElement;
-    protected _validationContext: UmbValidationContext;
     constructor();
     protected firstUpdated(): void;
     render(): import("lit-html").TemplateResult<1>;

package/dist-cms/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.element.js

@@ -4,16 +4,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { customElement, html, property, query, state } from '../../../external/lit/index.js';
-import { umbBindToValidation, UmbValidationContext } from '../../core/validation/index.js';
+import { customElement, html, property, state } from '../../../external/lit/index.js';
+import { umbBindToValidation, UmbFormControlMixin } from '../../core/validation/index.js';
 import { UmbLitElement } from '../../core/lit-element/index.js';
 import { UmbPropertyValueChangeEvent } from '../../core/property-editor/index.js';
 import { UMB_PROPERTY_CONTEXT } from '../../core/property/index.js';
-import { UMB_SUBMITTABLE_WORKSPACE_CONTEXT, UmbSubmittableWorkspaceContextBase, } from '../../core/workspace/index.js';
 /**
  * @element umb-property-editor-ui-multiple-text-string
  */
-let UmbPropertyEditorUIMultipleTextStringElement = class UmbPropertyEditorUIMultipleTextStringElement extends UmbLitElement {
+let UmbPropertyEditorUIMultipleTextStringElement = class UmbPropertyEditorUIMultipleTextStringElement extends UmbFormControlMixin(UmbLitElement) {
     set config(config) {
         if (!config)
             return;
@@ -45,20 +44,15 @@ let UmbPropertyEditorUIMultipleTextStringElement = class UmbPropertyEditorUIMult
         this.required = false;
         this._min = 0;
         this._max = Infinity;
-        this._validationContext = new UmbValidationContext(this);
         this.consumeContext(UMB_PROPERTY_CONTEXT, (context) => {
             this._label = context.getLabel();
         });
-        this.consumeContext(UMB_SUBMITTABLE_WORKSPACE_CONTEXT, (context) => {
-            if (context instanceof UmbSubmittableWorkspaceContextBase) {
-                context.addValidationContext(this._validationContext);
-            }
-        });
     }
     firstUpdated() {
         if (this._min && this._max && this._min > this._max) {
             console.warn(`Property '${this._label}' (Multiple Text String) has been misconfigured, 'min' is greater than 'max'. Please correct your data type configuration.`, this);
         }
+        this.addFormControlElement(this.shadowRoot.querySelector('umb-input-multiple-text-string'));
     }
     #onChange(event) {
         event.stopPropagation();
@@ -66,35 +60,21 @@ let UmbPropertyEditorUIMultipleTextStringElement = class UmbPropertyEditorUIMult
         this.value = target.items;
         this.dispatchEvent(new UmbPropertyValueChangeEvent());
     }
-    // Prevent valid events from bubbling outside the message element
-    #onValid(event) {
-        event.stopPropagation();
-    }
-    // Prevent invalid events from bubbling outside the message element
-    #onInvalid(event) {
-        event.stopPropagation();
-    }
     render() {
         return html `
-			<umb-form-validation-message id="validation-message" @invalid=${this.#onInvalid} @valid=${this.#onValid}>
-				<umb-input-multiple-text-string
-					id="input"
-					max=${this._max}
-					min=${this._min}
-					.items=${this.value ?? []}
-					?disabled=${this.disabled}
-					?readonly=${this.readonly}
-					?required=${this.required}
-					@change=${this.#onChange}
-					${umbBindToValidation(this)}>
-				</umb-input-multiple-text-string>
-			</umb-form-validation-message>
+			<umb-input-multiple-text-string
+				max=${this._max}
+				min=${this._min}
+				.items=${this.value ?? []}
+				?disabled=${this.disabled}
+				?readonly=${this.readonly}
+				?required=${this.required}
+				@change=${this.#onChange}
+				${umbBindToValidation(this)}>
+			</umb-input-multiple-text-string>
 		`;
     }
 };
-__decorate([
-    property({ type: Array })
-], UmbPropertyEditorUIMultipleTextStringElement.prototype, "value", void 0);
 __decorate([
     property({ type: Boolean, reflect: true })
 ], UmbPropertyEditorUIMultipleTextStringElement.prototype, "disabled", void 0);
@@ -113,9 +93,6 @@ __decorate([
 __decorate([
     state()
 ], UmbPropertyEditorUIMultipleTextStringElement.prototype, "_max", void 0);
-__decorate([
-    query('#input', true)
-], UmbPropertyEditorUIMultipleTextStringElement.prototype, "_inputElement", void 0);
 UmbPropertyEditorUIMultipleTextStringElement = __decorate([
     customElement('umb-property-editor-ui-multiple-text-string')
 ], UmbPropertyEditorUIMultipleTextStringElement);

package/dist-cms/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.js

@@ -44,10 +44,8 @@ let UmbInputTinyMceElement = class UmbInputTinyMceElement extends UUIFormControl
         return this._editorElement?.querySelector('iframe') ?? undefined;
     }
     set value(newValue) {
-        if (newValue === this.value)
-            return;
-        super.value = newValue;
         const newContent = typeof newValue === 'string' ? newValue : '';
+        super.value = newContent;
         if (this.#editorRef && this.#editorRef.getContent() != newContent) {
             this.#editorRef.setContent(newContent);
         }

package/dist-cms/packages/tiny-mce/property-editors/tiny-mce/property-editor-ui-tiny-mce.element.js

@@ -5,36 +5,33 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { customElement, html } from '../../../../external/lit/index.js';
-import { UmbPropertyEditorUiRteElementBase, UMB_BLOCK_RTE_DATA_CONTENT_KEY } from '../../../rte/index.js';
+import { UmbPropertyEditorUiRteElementBase } from '../../../rte/index.js';
 import '../../components/input-tiny-mce/input-tiny-mce.element.js';
 /**
  * @element umb-property-editor-ui-tiny-mce
  */
 let UmbPropertyEditorUITinyMceElement = class UmbPropertyEditorUITinyMceElement extends UmbPropertyEditorUiRteElementBase {
     #onChange(event) {
-        const value = typeof event.target.value === 'string' ? event.target.value : '';
+        const markup = typeof event.target.value === 'string' ? event.target.value : '';
         // If we don't get any markup clear the property editor value.
-        if (value === '') {
+        if (markup === '') {
             this.value = undefined;
             this._fireChangeEvent();
             return;
         }
-        // Clone the DOM, to remove the classes and attributes on the original:
-        const div = document.createElement('div');
-        div.innerHTML = value;
-        // Loop through used, to remove the classes on these.
-        const blockEls = div.querySelectorAll(`umb-rte-block, umb-rte-block-inline`);
-        blockEls.forEach((blockEl) => {
-            blockEl.removeAttribute('contenteditable');
-            blockEl.removeAttribute('class');
-        });
-        const markup = div.innerHTML;
         // Remove unused Blocks of Blocks Layout. Leaving only the Blocks that are present in Markup.
-        //const blockElements = editor.dom.select(`umb-rte-block, umb-rte-block-inline`);
-        const usedContentKeys = Array.from(blockEls).map((blockElement) => blockElement.getAttribute(UMB_BLOCK_RTE_DATA_CONTENT_KEY));
-        if (super.value) {
-            super.value = {
-                ...super.value,
+        const usedContentKeys = [];
+        // Regex matching all block elements in the markup, and extracting the content key. It's the same as the one used on the backend.
+        const regex = new RegExp(/<umb-rte-block(?:-inline)?(?: class="(?:.[^"]*)")? data-content-key="(?<key>.[^"]*)">(?:<!--Umbraco-Block-->)?<\/umb-rte-block(?:-inline)?>/gi);
+        let blockElement;
+        while ((blockElement = regex.exec(markup)) !== null) {
+            if (blockElement.groups?.key) {
+                usedContentKeys.push(blockElement.groups.key);
+            }
+        }
+        if (this.value) {
+            this.value = {
+                ...this.value,
                 markup: markup,
             };
         }

package/dist-cms/packages/tiptap/property-editors/tiptap/property-editor-ui-tiptap.element.js

@@ -13,7 +13,7 @@ import '../../components/input-tiptap/input-tiptap.element.js';
 let UmbPropertyEditorUiTiptapElement = class UmbPropertyEditorUiTiptapElement extends UmbPropertyEditorUiRteElementBase {
     firstUpdated(_changedProperties) {
         super.firstUpdated(_changedProperties);
-        this.addFormControlElement(this.shadowRoot?.querySelector('umb-input-tiptap'));
+        this.addFormControlElement(this.shadowRoot.querySelector('umb-input-tiptap'));
     }
     #onChange(event) {
         const tipTapElement = event.target;