@umbraco-cms/backoffice 16.3.3 → 16.4.0-rc

package/dist-cms/packages/property-editors/missing/manifests.js

@@ -5,9 +5,22 @@ export const manifests = [
         name: 'Missing Property Editor UI',
         element: () => import('./property-editor-ui-missing.element.js'),
         meta: {
-            label: 'Missing',
+            label: 'Missing Property Editor',
             propertyEditorSchemaAlias: undefined, // By setting it to undefined, this editor won't appear in the property editor UI picker modal.
-            icon: 'icon-ordered-list',
+            icon: 'icon-circle-dotted',
+            group: '',
+            supportsReadOnly: true,
+        },
+    },
+    {
+        type: 'propertyEditorUi',
+        alias: 'Umb.PropertyEditorUi.MissingUi',
+        name: 'Missing Property Editor UI UI',
+        element: () => import('./property-editor-ui-missing-ui.element.js'),
+        meta: {
+            label: 'Missing Property Editor UI',
+            propertyEditorSchemaAlias: undefined, // By setting it to undefined, this editor won't appear in the property editor UI picker modal.
+            icon: 'icon-circle-dotted',
             group: '',
             supportsReadOnly: true,
         },

package/dist-cms/packages/property-editors/missing/property-editor-ui-missing-base.element.d.ts

@@ -0,0 +1,18 @@
+import { UmbLitElement } from '../../core/lit-element/index.js';
+import type { UmbPropertyEditorUiElement } from '../../core/property-editor/index.js';
+export declare class UmbPropertyEditorUIMissingBaseElement extends UmbLitElement implements UmbPropertyEditorUiElement {
+    #private;
+    value: string;
+    private _expanded;
+    focalPointElement: HTMLElement;
+    private _dataTypeDetailModel?;
+    private _dataTypeDetailRepository;
+    protected _titleKey: string;
+    protected _detailsDescriptionKey: string;
+    protected _displayPropertyEditorUi: boolean;
+    constructor();
+    private _updateEditorAlias;
+    render(): import("lit-html").TemplateResult<1>;
+    private _renderDetails;
+    static styles: import("lit").CSSResult[];
+}

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

@@ -0,0 +1,130 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 { css, html, nothing, property, query, state } from '../../../external/lit/index.js';
+import { UmbLitElement } from '../../core/lit-element/index.js';
+import { UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT } from '../../content/content/index.js';
+import { UmbDataTypeDetailRepository } from '../../data-type/index.js';
+export class UmbPropertyEditorUIMissingBaseElement extends UmbLitElement {
+    constructor() {
+        super();
+        this.value = '';
+        this._expanded = false;
+        this._dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
+        this._titleKey = '';
+        this._detailsDescriptionKey = '';
+        this._displayPropertyEditorUi = true;
+        this.consumeContext(UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT, (propertyContext) => {
+            if (!propertyContext?.dataType)
+                return;
+            this.observe(propertyContext.dataType, (dt) => {
+                if (!dt?.unique)
+                    return;
+                this._updateEditorAlias(dt);
+            });
+        });
+    }
+    async _updateEditorAlias(dataType) {
+        this.observe(await this._dataTypeDetailRepository.byUnique(dataType.unique), (dataType) => {
+            this._dataTypeDetailModel = dataType;
+        });
+    }
+    async #onDetails() {
+        this._expanded = !this._expanded;
+        if (this._expanded) {
+            await this.updateComplete;
+            this.focalPointElement?.focus();
+        }
+    }
+    render() {
+        return html `<uui-box id="info">
+			<div slot="headline"><uui-icon id="alert" name="alert"></uui-icon>${this.localize.term(this._titleKey)}</div>
+			<div id="content">
+				<umb-localize key="missingEditor_description"></umb-localize>
+				${this._expanded ? this._renderDetails() : nothing}
+			</div>
+
+			<uui-button
+				id="details-button"
+				compact
+				label="${this.localize.term(this._expanded ? 'missingEditor_detailsHide' : 'missingEditor_detailsShow')}"
+				@click=${this.#onDetails}>
+				<span>${this.localize.term(this._expanded ? 'missingEditor_detailsHide' : 'missingEditor_detailsShow')}</span
+				><uui-symbol-expand id="expand-symbol" .open=${this._expanded}></uui-symbol-expand>
+			</uui-button>
+		</uui-box>`;
+    }
+    _renderDetails() {
+        return html ` <div id="details" tabindex="0">
+			<umb-localize id="details-title" key="missingEditor_detailsTitle"></umb-localize>
+			<p>
+				<umb-localize key=${this._detailsDescriptionKey}></umb-localize>
+			</p>
+			<p>
+				<strong><umb-localize key="missingEditor_detailsDataType"></umb-localize></strong>:
+				<code>${this._dataTypeDetailModel?.name}</code><br />
+				<strong><umb-localize key="missingEditor_detailsPropertyEditor"></umb-localize></strong>:
+				<code>${this._dataTypeDetailModel?.editorAlias}</code>
+				${this._displayPropertyEditorUi
+            ? html `
+							<br />
+							<strong><umb-localize key="missingEditor_detailsPropertyEditorUi"></umb-localize></strong>:
+							<code>${this._dataTypeDetailModel?.editorUiAlias}</code>
+						`
+            : nothing}
+			</p>
+			<umb-code-block id="codeblock" copy language="${this.localize.term('missingEditor_detailsData')}"
+				>${typeof this.value === 'object' ? JSON.stringify(this.value, null, 2) : String(this.value)}</umb-code-block
+			>
+		</div>`;
+    }
+    static { this.styles = [
+        css `
+			:host {
+				display: flex;
+				flex-direction: column;
+				gap: var(--uui-size-space-3);
+				--uui-box-default-padding: 0;
+			}
+			#content {
+				padding: var(--uui-size-space-5);
+				padding-bottom: var(--uui-size-space-3);
+			}
+			#alert {
+				padding-right: var(--uui-size-space-2);
+			}
+			#details-button {
+				float: right;
+			}
+			#details {
+				margin-top: var(--uui-size-space-5);
+			}
+			#details-title {
+				font-weight: 800;
+			}
+			#expand-symbol {
+				transform: rotate(90deg);
+			}
+			#expand-symbol[open] {
+				transform: rotate(180deg);
+			}
+			#codeblock {
+				max-height: 400px;
+				display: flex;
+				flex-direction: column;
+			}
+		`,
+    ]; }
+}
+__decorate([
+    property()
+], UmbPropertyEditorUIMissingBaseElement.prototype, "value", void 0);
+__decorate([
+    state()
+], UmbPropertyEditorUIMissingBaseElement.prototype, "_expanded", void 0);
+__decorate([
+    query('#details')
+], UmbPropertyEditorUIMissingBaseElement.prototype, "focalPointElement", void 0);

package/dist-cms/packages/property-editors/missing/property-editor-ui-missing-ui.element.d.ts

@@ -0,0 +1,13 @@
+import { UmbPropertyEditorUIMissingBaseElement } from './property-editor-ui-missing-base.element.js';
+/**
+ * @element umb-property-editor-ui-missing-ui
+ */
+export declare class UmbPropertyEditorUIMissingUiElement extends UmbPropertyEditorUIMissingBaseElement {
+    constructor();
+}
+export default UmbPropertyEditorUIMissingUiElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-property-editor-ui-missing-ui': UmbPropertyEditorUIMissingUiElement;
+    }
+}

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

@@ -0,0 +1,24 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 { UmbPropertyEditorUIMissingBaseElement } from './property-editor-ui-missing-base.element.js';
+import { customElement } from '../../../external/lit/index.js';
+/**
+ * @element umb-property-editor-ui-missing-ui
+ */
+let UmbPropertyEditorUIMissingUiElement = class UmbPropertyEditorUIMissingUiElement extends UmbPropertyEditorUIMissingBaseElement {
+    constructor() {
+        super();
+        this._titleKey = 'missingEditor_missingUiTitle';
+        this._detailsDescriptionKey = 'missingEditor_missingUiDetailsDescription';
+        this._displayPropertyEditorUi = true;
+    }
+};
+UmbPropertyEditorUIMissingUiElement = __decorate([
+    customElement('umb-property-editor-ui-missing-ui')
+], UmbPropertyEditorUIMissingUiElement);
+export { UmbPropertyEditorUIMissingUiElement };
+export default UmbPropertyEditorUIMissingUiElement;

package/dist-cms/packages/property-editors/missing/property-editor-ui-missing.element.d.ts

@@ -1,20 +1,9 @@
-import { UmbLitElement } from '../../core/lit-element/index.js';
-import type { UmbPropertyEditorUiElement } from '../../core/property-editor/index.js';
+import { UmbPropertyEditorUIMissingBaseElement } from './property-editor-ui-missing-base.element.js';
 /**
  * @element umb-property-editor-ui-missing
  */
-export declare class UmbPropertyEditorUIMissingElement extends UmbLitElement implements UmbPropertyEditorUiElement {
-    #private;
-    value: string;
-    private _expanded;
-    focalPointElement: HTMLElement;
-    private _dataTypeDetailModel?;
-    private _dataTypeDetailRepository;
+export declare class UmbPropertyEditorUIMissingElement extends UmbPropertyEditorUIMissingBaseElement {
     constructor();
-    private _updateEditorAlias;
-    render(): import("lit-html").TemplateResult<1>;
-    private _renderDetails;
-    static styles: import("lit").CSSResult[];
 }
 export default UmbPropertyEditorUIMissingElement;
 declare global {

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

@@ -4,125 +4,19 @@ 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 { css, customElement, html, nothing, property, query, state } from '../../../external/lit/index.js';
-import { UmbLitElement } from '../../core/lit-element/index.js';
-import { UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT } from '../../content/content/index.js';
-import { UmbDataTypeDetailRepository } from '../../data-type/index.js';
+import { UmbPropertyEditorUIMissingBaseElement } from './property-editor-ui-missing-base.element.js';
+import { customElement } from '../../../external/lit/index.js';
 /**
  * @element umb-property-editor-ui-missing
  */
-let UmbPropertyEditorUIMissingElement = class UmbPropertyEditorUIMissingElement extends UmbLitElement {
+let UmbPropertyEditorUIMissingElement = class UmbPropertyEditorUIMissingElement extends UmbPropertyEditorUIMissingBaseElement {
     constructor() {
         super();
-        this.value = '';
-        this._expanded = false;
-        this._dataTypeDetailRepository = new UmbDataTypeDetailRepository(this);
-        this.consumeContext(UMB_PROPERTY_TYPE_BASED_PROPERTY_CONTEXT, (propertyContext) => {
-            if (!propertyContext?.dataType)
-                return;
-            this.observe(propertyContext.dataType, (dt) => {
-                if (!dt?.unique)
-                    return;
-                this._updateEditorAlias(dt);
-            });
-        });
+        this._titleKey = 'missingEditor_title';
+        this._detailsDescriptionKey = 'missingEditor_detailsDescription';
+        this._displayPropertyEditorUi = false;
     }
-    async _updateEditorAlias(dataType) {
-        this.observe(await this._dataTypeDetailRepository.byUnique(dataType.unique), (dataType) => {
-            this._dataTypeDetailModel = dataType;
-        });
-    }
-    async #onDetails() {
-        this._expanded = !this._expanded;
-        if (this._expanded) {
-            await this.updateComplete;
-            this.focalPointElement?.focus();
-        }
-    }
-    render() {
-        return html `<uui-box id="info">
-			<div slot="headline">
-				<uui-icon id="alert" name="alert"></uui-icon>${this.localize.term('missingEditor_title')}
-			</div>
-			<div id="content">
-				<umb-localize key="missingEditor_description"></umb-localize>
-				${this._expanded ? this._renderDetails() : nothing}
-			</div>
-
-			<uui-button
-				id="details-button"
-				compact
-				label="${this.localize.term(this._expanded ? 'missingEditor_detailsHide' : 'missingEditor_detailsShow')}"
-				@click=${this.#onDetails}>
-				<span>${this.localize.term(this._expanded ? 'missingEditor_detailsHide' : 'missingEditor_detailsShow')}</span
-				><uui-symbol-expand id="expand-symbol" .open=${this._expanded}></uui-symbol-expand>
-			</uui-button>
-		</uui-box>`;
-    }
-    _renderDetails() {
-        return html ` <div id="details" tabindex="0">
-			<umb-localize id="details-title" key="missingEditor_detailsTitle"></umb-localize>
-			<p>
-				<umb-localize key="missingEditor_detailsDescription"></umb-localize>
-			</p>
-			<p>
-				<strong><umb-localize key="missingEditor_detailsDataType"></umb-localize></strong>:
-				<code>${this._dataTypeDetailModel?.name}</code><br />
-				<strong><umb-localize key="missingEditor_detailsPropertyEditor"></umb-localize></strong>:
-				<code>${this._dataTypeDetailModel?.editorAlias}</code>
-			</p>
-			<umb-code-block id="codeblock" copy language="${this.localize.term('missingEditor_detailsData')}"
-				>${typeof this.value === 'object' ? JSON.stringify(this.value, null, 2) : String(this.value)}</umb-code-block
-			>
-		</div>`;
-    }
-    static { this.styles = [
-        css `
-			:host {
-				display: flex;
-				flex-direction: column;
-				gap: var(--uui-size-space-3);
-				--uui-box-default-padding: 0;
-			}
-			#content {
-				padding: var(--uui-size-space-5);
-				padding-bottom: var(--uui-size-space-3);
-			}
-			#alert {
-				padding-right: var(--uui-size-space-2);
-			}
-			#details-button {
-				float: right;
-			}
-			#details {
-				margin-top: var(--uui-size-space-5);
-			}
-			#details-title {
-				font-weight: 800;
-			}
-			#expand-symbol {
-				transform: rotate(90deg);
-			}
-			#expand-symbol[open] {
-				transform: rotate(180deg);
-			}
-			#codeblock {
-				max-height: 400px;
-				display: flex;
-				flex-direction: column;
-			}
-		`,
-    ]; }
 };
-__decorate([
-    property()
-], UmbPropertyEditorUIMissingElement.prototype, "value", void 0);
-__decorate([
-    state()
-], UmbPropertyEditorUIMissingElement.prototype, "_expanded", void 0);
-__decorate([
-    query('#details')
-], UmbPropertyEditorUIMissingElement.prototype, "focalPointElement", void 0);
 UmbPropertyEditorUIMissingElement = __decorate([
     customElement('umb-property-editor-ui-missing')
 ], UmbPropertyEditorUIMissingElement);

package/dist-cms/packages/property-editors/slider/property-editor-ui-slider.element.d.ts

@@ -1,12 +1,12 @@
 import type { UmbSliderPropertyEditorUiValue } from './types.js';
 import { UmbLitElement } from '../../core/lit-element/index.js';
 import type { UmbPropertyEditorConfigCollection, UmbPropertyEditorUiElement } from '../../core/property-editor/index.js';
+declare const UmbPropertyEditorUISliderElement_base: import("../../../libs/extension-api/index.js").HTMLElementConstructor<import("../../core/validation/index.js").UmbFormControlMixinElement<UmbSliderPropertyEditorUiValue>> & typeof UmbLitElement;
 /**
  * @element umb-property-editor-ui-slider
  */
-export declare class UmbPropertyEditorUISliderElement extends UmbLitElement implements UmbPropertyEditorUiElement {
+export declare class UmbPropertyEditorUISliderElement extends UmbPropertyEditorUISliderElement_base implements UmbPropertyEditorUiElement {
     #private;
-    value: UmbSliderPropertyEditorUiValue | undefined;
     /**
      * Sets the input to readonly mode, meaning value cannot be changed but still able to read and select its content.
      * @type {boolean}

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

@@ -8,10 +8,29 @@ import { UmbChangeEvent } from '../../core/event/index.js';
 import { customElement, html, property, state } from '../../../external/lit/index.js';
 import { UmbLitElement } from '../../core/lit-element/index.js';
 import { UMB_PROPERTY_CONTEXT } from '../../core/property/index.js';
+import { UmbFormControlMixin } from '../../core/validation/index.js';
+function stringToValueObject(value) {
+    const [from, to] = (value ?? ',').split(',');
+    const fromNumber = makeNumberOrUndefined(from);
+    return { from: fromNumber, to: makeNumberOrUndefined(to, fromNumber) };
+}
+function makeNumberOrUndefined(value, fallback) {
+    if (value === undefined) {
+        return fallback;
+    }
+    const n = Number(value);
+    if (isNaN(n)) {
+        return fallback;
+    }
+    return n;
+}
+function undefinedFallback(value, fallback) {
+    return value === undefined ? fallback : value;
+}
 /**
  * @element umb-property-editor-ui-slider
  */
-let UmbPropertyEditorUISliderElement = class UmbPropertyEditorUISliderElement extends UmbLitElement {
+let UmbPropertyEditorUISliderElement = class UmbPropertyEditorUISliderElement extends UmbFormControlMixin(UmbLitElement) {
     set config(config) {
         if (!config)
             return;
@@ -50,6 +69,7 @@ let UmbPropertyEditorUISliderElement = class UmbPropertyEditorUISliderElement ex
         });
     }
     firstUpdated() {
+        this.addFormControlElement(this.shadowRoot.querySelector('umb-input-slider'));
         if (this._min && this._max && this._min > this._max) {
             console.warn(`Property '${this._label}' (Slider) has been misconfigured, 'min' is greater than 'max'. Please correct your data type configuration.`, this);
         }
@@ -58,20 +78,21 @@ let UmbPropertyEditorUISliderElement = class UmbPropertyEditorUISliderElement ex
         const num = Number(input);
         return Number.isNaN(num) ? undefined : num;
     }
-    #getValueObject(value) {
-        const [from, to] = value.split(',').map(Number);
-        return { from, to: to ?? from };
-    }
     #onChange(event) {
-        this.value = this.#getValueObject(event.target.value);
+        const partialValue = stringToValueObject(event.target.value);
+        const handledFrom = undefinedFallback(partialValue.from, this._initVal1);
+        this.value = {
+            from: handledFrom,
+            to: this._enableRange ? undefinedFallback(partialValue.to, this._initVal2) : handledFrom,
+        };
         this.dispatchEvent(new UmbChangeEvent());
     }
     render() {
         return html `
 			<umb-input-slider
 				.label=${this._label ?? 'Slider'}
-				.valueLow=${this.value?.from ?? this._initVal1}
-				.valueHigh=${this.value?.to ?? this._initVal2}
+				.valueLow=${undefinedFallback(this.value?.from, this._initVal1)}
+				.valueHigh=${undefinedFallback(this.value?.to, this._initVal2)}
 				.step=${this._step}
 				.min=${this._min}
 				.max=${this._max}
@@ -82,9 +103,6 @@ let UmbPropertyEditorUISliderElement = class UmbPropertyEditorUISliderElement ex
 		`;
     }
 };
-__decorate([
-    property({ type: Object })
-], UmbPropertyEditorUISliderElement.prototype, "value", void 0);
 __decorate([
     property({ type: Boolean, reflect: true })
 ], UmbPropertyEditorUISliderElement.prototype, "readonly", void 0);

package/dist-cms/packages/property-editors/slider/slider-property-value-preset.d.ts

@@ -2,10 +2,7 @@ import type { UmbSliderPropertyEditorUiValue } from './types.js';
 import type { UmbPropertyValuePreset } from '../../core/property/index.js';
 import type { UmbPropertyEditorConfig } from '../../core/property-editor/index.js';
 export declare class UmbSliderPropertyValuePreset implements UmbPropertyValuePreset<UmbSliderPropertyEditorUiValue, UmbPropertyEditorConfig> {
-    processValue(value: undefined | UmbSliderPropertyEditorUiValue, config: UmbPropertyEditorConfig): Promise<{
-        from: number;
-        to: number;
-    }>;
+    processValue(value: undefined | UmbSliderPropertyEditorUiValue, config: UmbPropertyEditorConfig): Promise<import("./types.js").UmbSliderPropertyEditorUiValueObject>;
     destroy(): void;
 }
 export { UmbSliderPropertyValuePreset as api };

package/dist-cms/packages/property-editors/slider/types.d.ts

@@ -1,7 +1,8 @@
-export type UmbSliderPropertyEditorUiValue = {
+export interface UmbSliderPropertyEditorUiValueObject {
     from: number;
     to: number;
-} | undefined;
+}
+export type UmbSliderPropertyEditorUiValue = UmbSliderPropertyEditorUiValueObject | undefined;
 /**
  * @deprecated this type will be removed in v.17.0, use `UmbPropertyEditorUISliderValue` instead
  */

package/dist-cms/packages/templating/partial-views/entity-actions/create/manifests.js

@@ -10,7 +10,7 @@ export const manifests = [
         forEntityTypes: [UMB_PARTIAL_VIEW_ROOT_ENTITY_TYPE, UMB_PARTIAL_VIEW_FOLDER_ENTITY_TYPE],
         meta: {
             icon: 'icon-add',
-            label: '#actions_create',
+            label: '#actions_createFor',
             additionalOptions: true,
         },
     },

package/dist-cms/packages/templating/scripts/entity-actions/create/manifests.js

@@ -10,7 +10,7 @@ export const manifests = [
         forEntityTypes: [UMB_SCRIPT_ROOT_ENTITY_TYPE, UMB_SCRIPT_FOLDER_ENTITY_TYPE],
         meta: {
             icon: 'icon-add',
-            label: '#actions_create',
+            label: '#actions_createFor',
             additionalOptions: true,
         },
     },

package/dist-cms/packages/templating/templates/entity-actions/manifests.js

@@ -12,7 +12,7 @@ export const manifests = [
         forEntityTypes: [UMB_TEMPLATE_ENTITY_TYPE, UMB_TEMPLATE_ROOT_ENTITY_TYPE],
         meta: {
             icon: 'icon-add',
-            label: '#actions_create',
+            label: '#actions_createFor',
             additionalOptions: true,
         },
     },

package/dist-cms/packages/templating/templates/workspace/template-workspace-editor.element.js

@@ -77,7 +77,7 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
             .catch(() => undefined);
     }
     #resetMasterTemplate() {
-        this.#templateWorkspaceContext?.setMasterTemplate(null);
+        this.#templateWorkspaceContext?.setMasterTemplate(null, true);
     }
     #openMasterTemplatePicker() {
         const modalContext = this.#modalContext?.open(this, UMB_TEMPLATE_PICKER_MODAL, {
@@ -95,7 +95,7 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
             .then((value) => {
             if (!value?.selection)
                 return;
-            this.#templateWorkspaceContext?.setMasterTemplate(value.selection[0] ?? null);
+            this.#templateWorkspaceContext?.setMasterTemplate(value.selection[0] ?? null, true);
         })
             .catch(() => undefined);
     }

package/dist-cms/packages/templating/templates/workspace/template-workspace.context.d.ts

@@ -19,6 +19,6 @@ export declare class UmbTemplateWorkspaceContext extends UmbEntityNamedDetailWor
     setContent(value: string): void;
     getLayoutBlockRegexPattern(): RegExp;
     getHasLayoutBlock(): boolean;
-    setMasterTemplate(unique: string | null): Promise<string | null>;
+    setMasterTemplate(unique: string | null, updateLayoutBlock: boolean): Promise<string | null>;
 }
 export { UmbTemplateWorkspaceContext as api };

package/dist-cms/packages/templating/templates/workspace/template-workspace.context.js

@@ -64,7 +64,13 @@ ${currentContent}`;
     }
     async load(unique) {
         const response = await super.load(unique);
-        await this.setMasterTemplate(response.data?.masterTemplate?.unique ?? null);
+        // On load we want to set the master template details but not update the layout block in the Razor file.
+        // This is because you can still set a layout in code by setting `Layout = "_Layout.cshtml";` in the template file.
+        // This gets set automatically if you create a template under a parent, but you don't have to do that, you can
+        // just set  the `Layout` property in the Razor template file itself.
+        // So even if there's no master template set by there being a parent, there may still be one set in the Razor
+        // code, and we shouldn't overwrite it.
+        await this.setMasterTemplate(response.data?.masterTemplate?.unique ?? null, false);
         return response;
     }
     async create(parent) {
@@ -74,9 +80,9 @@ ${currentContent}`;
                 masterTemplate: parent.unique ? { unique: parent.unique } : null,
             },
         });
-        // Set or reset the master template
-        // This is important to reset when a new template is created so the UI reflects the correct state
-        await this.setMasterTemplate(parent.unique);
+        // On create set or reset the master template depending on whether the template is being created under a parent.
+        // This is important to reset when a new template is created so the UI reflects the correct state.
+        await this.setMasterTemplate(parent.unique, true);
         return data;
     }
     setAlias(value) {
@@ -91,7 +97,7 @@ ${currentContent}`;
     getHasLayoutBlock() {
         return this.getData()?.content ? this.getLayoutBlockRegexPattern().test(this.getData()?.content) : false;
     }
-    async setMasterTemplate(unique) {
+    async setMasterTemplate(unique, updateLayoutBlock) {
         if (unique === null) {
             this.#masterTemplate.setValue(null);
         }
@@ -102,7 +108,9 @@ ${currentContent}`;
                 this.#masterTemplate.setValue(data[0]);
             }
         }
-        this.#updateMasterTemplateLayoutBlock();
+        if (updateLayoutBlock) {
+            this.#updateMasterTemplateLayoutBlock();
+        }
         this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
         return unique;
     }

package/dist-cms/packages/tiptap/components/toolbar/tiptap-toolbar.element.js

@@ -68,10 +68,10 @@ let UmbTiptapToolbarElement = class UmbTiptapToolbarElement extends UmbLitElemen
         return repeat(groups, (group) => html `<div class="group">${this.#renderActions(group)}</div>`);
     }
     #renderActions(aliases) {
-        return repeat(aliases, (alias) => this.#lookup?.get(alias) ?? this.#renderActionPlaceholder());
+        return repeat(aliases, (alias) => this.#lookup?.get(alias) ?? this.#renderActionPlaceholder(alias));
     }
-    #renderActionPlaceholder() {
-        return html `<span class="skeleton" role="none"></span>`;
+    #renderActionPlaceholder(alias) {
+        return html `<span class="skeleton" role="none" title="Loading '${alias}'"></span>`;
     }
     static { this.styles = css `
 		:host([readonly]) {

package/dist-cms/packages/tiptap/extensions/horizontal-rule/manifests.js

@@ -16,6 +16,7 @@ export const manifests = [
         alias: 'Umb.Tiptap.Toolbar.HorizontalRule',
         name: 'Horizontal Rule Tiptap Toolbar Extension',
         api: () => import('./horizontal-rule.tiptap-toolbar-api.js'),
+        forExtensions: ['Umb.Tiptap.HorizontalRule'],
         meta: {
             alias: 'horizontalRule',
             icon: 'icon-horizontal-rule',

package/dist-cms/packages/tiptap/extensions/style-select/manifests.js

@@ -4,6 +4,7 @@ export const manifests = [
         kind: 'styleMenu',
         alias: 'Umb.Tiptap.Toolbar.StyleSelect',
         name: 'Style Select Tiptap Extension',
+        forExtensions: ['Umb.Tiptap.Heading', 'Umb.Tiptap.Blockquote', 'Umb.Tiptap.CodeBlock'],
         items: [
             {
                 label: 'Headers',

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

@@ -4,7 +4,7 @@ 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 { css, customElement, html, ifDefined, nothing, property, state, repeat, when, } from '../../../../external/lit/index.js';
+import { css, customElement, html, nothing, property, state, repeat, when } from '../../../../external/lit/index.js';
 import { umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
 import { UmbLitElement } from '../../../core/lit-element/index.js';
 import { UMB_PROPERTY_DATASET_CONTEXT } from '../../../core/property/index.js';
@@ -102,7 +102,7 @@ let UmbPropertyEditorUiTiptapExtensionsConfigurationElement = class UmbPropertyE
 						<uui-label>${this.localize.string(group.group)}</uui-label>
 						<ul>
 							${repeat(group.extensions, (item) => html `
-									<li title=${ifDefined(item.description)}>
+									<li title=${item.description ?? item.alias}>
 										<uui-checkbox
 											label=${this.localize.string(item.label)}
 											value=${item.alias}