@umbraco-cms/backoffice 17.4.0-rc2 → 18.0.0-beta1

package/dist-cms/packages/templating/templates/global-components/template-card/template-card.element.d.ts

@@ -1,5 +1,5 @@
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-declare const UmbTemplateCardElement_base: (new (...args: any[]) => import("@umbraco-ui/uui-base").UUIFormControlMixinElement<FormDataEntryValue | FormData>) & typeof UmbLitElement;
+declare const UmbTemplateCardElement_base: (new (...args: any[]) => import("@umbraco-ui/uui").UUIFormControlWithBasicsMixinElement<FormData | FormDataEntryValue>) & typeof UmbLitElement;
 /**
  * @element umb-template-card
  * @slot actions

package/dist-cms/packages/templating/templates/global-components/template-card/template-card.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { css, html, customElement, property } from '../../../../../external/lit/index.js';
-import { UUIFormControlMixin } from '../../../../../external/uui/index.js';
+import { UUIFormControlWithBasicsMixin } from '../../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 /**
  * @element umb-template-card
@@ -15,7 +15,7 @@ import { UmbLitElement } from '../../../../core/lit-element/index.js';
  */
 // TODO: This should extends the UUICardElement, and the visual look of this should be like the UserCard or similarly.
 // TOOD: Consider if this should be select in the 'persisted'-select style when it is selected as a default. (But its should not use the runtime-selection style)
-let UmbTemplateCardElement = class UmbTemplateCardElement extends UUIFormControlMixin(UmbLitElement, '') {
+let UmbTemplateCardElement = class UmbTemplateCardElement extends UUIFormControlWithBasicsMixin(UmbLitElement, '') {
     constructor() {
         super(...arguments);
         this.name = '';

package/dist-cms/packages/templating/templates/repository/detail/template-detail.server.data-source.d.ts

@@ -30,7 +30,7 @@ export declare class UmbTemplateServerDataSource implements UmbDetailDataSource<
      * @memberof UmbTemplateServerDataSource
      */
     read(unique: string): Promise<{
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     } | {
         data: UmbTemplateDetailModel;
@@ -43,7 +43,7 @@ export declare class UmbTemplateServerDataSource implements UmbDetailDataSource<
      * @memberof UmbTemplateServerDataSource
      */
     create(model: UmbTemplateDetailModel): Promise<{
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     } | {
         data: UmbTemplateDetailModel;
@@ -57,7 +57,7 @@ export declare class UmbTemplateServerDataSource implements UmbDetailDataSource<
      * @memberof UmbTemplateServerDataSource
      */
     update(model: UmbTemplateDetailModel): Promise<{
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     } | {
         data: UmbTemplateDetailModel;

package/dist-cms/packages/templating/templates/repository/detail/template-detail.server.data-source.js

@@ -31,7 +31,7 @@ export class UmbTemplateServerDataSource {
             name: '',
             alias: '',
             content: scaffold,
-            masterTemplate: preset.masterTemplate ?? null,
+            layoutTemplate: preset.layoutTemplate ?? null,
             ...preset,
         };
         return { data };
@@ -56,7 +56,7 @@ export class UmbTemplateServerDataSource {
             name: data.name,
             content: data.content || null,
             alias: data.alias,
-            masterTemplate: data.masterTemplate ? { unique: data.masterTemplate.id } : null,
+            layoutTemplate: data.layoutTemplate ? { unique: data.layoutTemplate.id } : null,
         };
         return { data: template };
     }

package/dist-cms/packages/templating/templates/repository/item/template-item.server.data-source.d.ts

@@ -17,6 +17,6 @@ export declare class UmbTemplateItemServerDataSource extends UmbItemServerDataSo
     constructor(host: UmbControllerHost);
     getItems(uniques: Array<string>): Promise<{
         data: UmbTemplateItemModel[] | undefined;
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
     }>;
 }

package/dist-cms/packages/templating/templates/search/template-search.repository.d.ts

@@ -13,7 +13,7 @@ export declare class UmbTemplateSearchRepository extends UmbControllerBase imple
         };
         error?: undefined;
     } | {
-        error: import("../../../core/resources/index.js").UmbApiError | import("../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../core/resources/index.js").UmbCancelError | import("../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     }>;
 }

package/dist-cms/packages/templating/templates/search/template-search.server.data-source.d.ts

@@ -27,7 +27,7 @@ export declare class UmbTemplateSearchServerDataSource implements UmbSearchDataS
         };
         error?: undefined;
     } | {
-        error: import("../../../core/resources/index.js").UmbApiError | import("../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../core/resources/index.js").UmbCancelError | import("../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     }>;
 }

package/dist-cms/packages/templating/templates/search/template.search-provider.d.ts

@@ -13,7 +13,7 @@ export declare class UmbTemplateSearchProvider extends UmbControllerBase impleme
         };
         error?: undefined;
     } | {
-        error: import("../../../core/resources/index.js").UmbApiError | import("../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../core/resources/index.js").UmbCancelError | import("../../../core/resources/index.js").UmbApiError | undefined;
         data?: undefined;
     }>;
     destroy(): void;

package/dist-cms/packages/templating/templates/tree/index.d.ts

@@ -1,5 +1,4 @@
 export { UmbTemplateTreeRepository } from './template-tree.repository.js';
-export { UMB_TEMPLATE_TREE_STORE_ALIAS, UMB_TEMPLATE_TREE_ALIAS } from './manifests.js';
-export { UMB_TEMPLATE_TREE_STORE_CONTEXT } from './template-tree.store.context-token.js';
-export { type UmbTemplateTreeStore } from './template-tree.store.js';
+export { UMB_TEMPLATE_TREE_ALIAS } from './manifests.js';
+export { UMB_TEMPLATE_TREE_REPOSITORY_ALIAS } from './constants.js';
 export type * from './types.js';

package/dist-cms/packages/templating/templates/tree/index.js

@@ -1,4 +1,3 @@
 export { UmbTemplateTreeRepository } from './template-tree.repository.js';
-export { UMB_TEMPLATE_TREE_STORE_ALIAS, UMB_TEMPLATE_TREE_ALIAS } from './manifests.js';
-export { UMB_TEMPLATE_TREE_STORE_CONTEXT } from './template-tree.store.context-token.js';
-export {} from './template-tree.store.js';
+export { UMB_TEMPLATE_TREE_ALIAS } from './manifests.js';
+export { UMB_TEMPLATE_TREE_REPOSITORY_ALIAS } from './constants.js';

package/dist-cms/packages/templating/templates/tree/manifests.d.ts

@@ -1,6 +1,2 @@
-/**
- * @deprecated Use {@link UMB_TEMPLATE_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
- */
-export declare const UMB_TEMPLATE_TREE_STORE_ALIAS = "Umb.Store.Template.Tree";
 export declare const UMB_TEMPLATE_TREE_ALIAS = "Umb.Tree.Template";
 export declare const manifests: Array<UmbExtensionManifest>;

package/dist-cms/packages/templating/templates/tree/manifests.js

@@ -2,13 +2,8 @@ import { UMB_TEMPLATE_ENTITY_TYPE, UMB_TEMPLATE_ROOT_ENTITY_TYPE } from '../enti
 import { UMB_TEMPLATE_TREE_ITEM_CHILDREN_COLLECTION_ALIAS } from './tree-item-children/constants.js';
 import { manifests as reloadTreeItemChildrenManifest } from './reload-tree-item-children/manifests.js';
 import { manifests as treeItemChildrenManifests } from './tree-item-children/manifests.js';
-import { UmbTemplateTreeStore } from './template-tree.store.js';
 import { UMB_TEMPLATE_TREE_REPOSITORY_ALIAS } from './constants.js';
 import { UMB_WORKSPACE_CONDITION_ALIAS } from '../../../core/workspace/index.js';
-/**
- * @deprecated Use {@link UMB_TEMPLATE_TREE_REPOSITORY_ALIAS} instead. This will be removed in Umbraco 18.
- */
-export const UMB_TEMPLATE_TREE_STORE_ALIAS = 'Umb.Store.Template.Tree';
 export const UMB_TEMPLATE_TREE_ALIAS = 'Umb.Tree.Template';
 const UMB_TEMPLATE_ROOT_WORKSPACE_ALIAS = 'Umb.Workspace.Template.Root';
 export const manifests = [
@@ -18,12 +13,6 @@ export const manifests = [
         name: 'Template Tree Repository',
         api: () => import('./template-tree.repository.js'),
     },
-    {
-        type: 'treeStore',
-        alias: UMB_TEMPLATE_TREE_STORE_ALIAS,
-        name: 'Template Tree Store',
-        api: UmbTemplateTreeStore,
-    },
     {
         type: 'tree',
         kind: 'default',

package/dist-cms/packages/templating/templates/tree/server-data-source/template-tree.server.data-source.d.ts

@@ -27,6 +27,6 @@ export declare class UmbTemplateTreeServerDataSource extends UmbControllerBase i
     }>;
     getAncestorsOf(args: UmbTreeAncestorsOfRequestArgs): Promise<{
         data: UmbTemplateTreeItemModel[] | undefined;
-        error: import("../../../../core/resources/index.js").UmbApiError | import("../../../../core/resources/index.js").UmbCancelError | undefined;
+        error: import("../../../../core/resources/index.js").UmbCancelError | import("../../../../core/resources/index.js").UmbApiError | undefined;
     }>;
 }

package/dist-cms/packages/templating/templates/tree/template-tree.repository.js

@@ -1,13 +1,12 @@
 import { UMB_TEMPLATE_ROOT_ENTITY_TYPE } from '../entity.js';
 import { UmbTemplateTreeServerDataSource } from './server-data-source/template-tree.server.data-source.js';
-import { UMB_TEMPLATE_TREE_STORE_CONTEXT } from './template-tree.store.context-token.js';
 import { UmbTreeRepositoryBase } from '../../../core/tree/index.js';
 export class UmbTemplateTreeRepository extends UmbTreeRepositoryBase {
     constructor(host) {
-        super(host, UmbTemplateTreeServerDataSource, UMB_TEMPLATE_TREE_STORE_CONTEXT);
+        super(host, UmbTemplateTreeServerDataSource);
     }
     async requestTreeRoot() {
-        const { data: treeRootData } = await this._treeSource.getRootItems({ skip: 0, take: 0 });
+        const { data: treeRootData } = await this._treeSource.getRootItems({ paging: { skip: 0, take: 0 } });
         const hasChildren = treeRootData ? treeRootData.total > 0 : false;
         const data = {
             unique: null,

package/dist-cms/packages/templating/templates/types.d.ts

@@ -5,7 +5,13 @@ export interface UmbTemplateDetailModel {
     name: string;
     alias: string;
     content: string | null;
-    masterTemplate: {
+    layoutTemplate: {
+        unique: string;
+    } | null;
+    /**
+     * @deprecated Use layoutTemplate instead. Scheduled for removal in Umbraco 20.
+     */
+    masterTemplate?: {
         unique: string;
     } | null;
 }

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

@@ -6,7 +6,7 @@ export declare class UmbTemplateWorkspaceEditorElement extends UmbLitElement {
     private _name?;
     private _content?;
     private _alias?;
-    private _masterTemplateName?;
+    private _layoutTemplateName?;
     /**
      * Whether editing is restricted. True when in production mode OR when runtime mode is still unknown.
      * This ensures a safe default (restricted) until we confirm the runtime mode.

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

@@ -25,20 +25,20 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
     #modalContext;
     #templateWorkspaceContext;
     #isNew;
-    #masterTemplateUnique;
+    #layoutTemplateUnique;
     constructor() {
         super();
         this._name = '';
         this._content = '';
         this._alias = '';
-        this._masterTemplateName = null;
+        this._layoutTemplateName = null;
         /**
          * Whether editing is restricted. True when in production mode OR when runtime mode is still unknown.
          * This ensures a safe default (restricted) until we confirm the runtime mode.
          */
         this._isRestricted = true;
         this.#isNew = false;
-        this.#masterTemplateUnique = null;
+        this.#layoutTemplateUnique = null;
         this.consumeContext(UMB_MODAL_MANAGER_CONTEXT, (instance) => {
             this.#modalContext = instance;
         });
@@ -59,9 +59,9 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
             this.observe(this.#templateWorkspaceContext?.content, (content) => {
                 this._content = content;
             });
-            this.observe(this.#templateWorkspaceContext?.masterTemplate, (masterTemplate) => {
-                this.#masterTemplateUnique = masterTemplate?.unique ?? null;
-                this._masterTemplateName = masterTemplate?.name ?? null;
+            this.observe(this.#templateWorkspaceContext?.layoutTemplate, (layoutTemplate) => {
+                this.#layoutTemplateUnique = layoutTemplate?.unique ?? null;
+                this._layoutTemplateName = layoutTemplate?.name ?? null;
             });
             this.observe(this.#templateWorkspaceContext?.isNew, (isNew) => {
                 this.#isNew = !!isNew;
@@ -93,10 +93,10 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
         })
             .catch(() => undefined);
     }
-    #resetMasterTemplate() {
-        this.#templateWorkspaceContext?.setMasterTemplate(null, true);
+    #resetLayoutTemplate() {
+        this.#templateWorkspaceContext?.setLayoutTemplate(null, true);
     }
-    #openMasterTemplatePicker() {
+    #openLayoutTemplatePicker() {
         const modalContext = this.#modalContext?.open(this, UMB_TEMPLATE_PICKER_MODAL, {
             data: {
                 pickableFilter: (item) => {
@@ -104,7 +104,7 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
                 },
             },
             value: {
-                selection: [this.#masterTemplateUnique],
+                selection: [this.#layoutTemplateUnique],
             },
         });
         modalContext
@@ -112,7 +112,7 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
             .then((value) => {
             if (!value?.selection)
                 return;
-            this.#templateWorkspaceContext?.setMasterTemplate(value.selection[0] ?? null, true);
+            this.#templateWorkspaceContext?.setLayoutTemplate(value.selection[0] ?? null, true);
         })
             .catch(() => undefined);
     }
@@ -127,23 +127,23 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
         })
             .catch(() => undefined);
     }
-    #renderMasterTemplatePicker() {
+    #renderLayoutTemplatePicker() {
         return html `
 			<uui-button-group>
 				<uui-button
-					@click=${this.#openMasterTemplatePicker}
+					@click=${this.#openLayoutTemplatePicker}
 					look="secondary"
-					id="master-template-button"
+					id="layout-template-button"
 					?disabled=${this._isRestricted}
-					label="${this.localize.term('template_mastertemplate')}: ${this._masterTemplateName
-            ? this._masterTemplateName
-            : this.localize.term('template_noMaster')}"></uui-button>
-				${this._masterTemplateName
+					label="${this.localize.term('template_layouttemplate')}: ${this._layoutTemplateName
+            ? this._layoutTemplateName
+            : this.localize.term('template_noLayout')}"></uui-button>
+				${this._layoutTemplateName
             ? html `<uui-button
 							look="secondary"
 							label=${this.localize.term('actions_remove')}
 							?disabled=${this._isRestricted}
-							@click=${this.#resetMasterTemplate}
+							@click=${this.#resetLayoutTemplate}
 							compact>
 							<uui-icon name="icon-delete"></uui-icon>
 						</uui-button>`
@@ -172,7 +172,7 @@ let UmbTemplateWorkspaceEditorElement = class UmbTemplateWorkspaceEditorElement
 				</umb-input-with-alias>
 
 				<uui-box>
-					<div slot="header" id="code-editor-menu-container">${this.#renderMasterTemplatePicker()}</div>
+					<div slot="header" id="code-editor-menu-container">${this.#renderLayoutTemplatePicker()}</div>
 					<div slot="header-actions">
 						<umb-templating-insert-menu @insert=${this.#insertSnippet} ?disabled=${this._isRestricted}>
 						</umb-templating-insert-menu>
@@ -276,7 +276,7 @@ __decorate([
 ], UmbTemplateWorkspaceEditorElement.prototype, "_alias", void 0);
 __decorate([
     state()
-], UmbTemplateWorkspaceEditorElement.prototype, "_masterTemplateName", void 0);
+], UmbTemplateWorkspaceEditorElement.prototype, "_layoutTemplateName", void 0);
 __decorate([
     state()
 ], UmbTemplateWorkspaceEditorElement.prototype, "_isRestricted", void 0);

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

@@ -8,10 +8,10 @@ import type { UmbEntityModel } from '../../../core/entity/index.js';
 export declare class UmbTemplateWorkspaceContext extends UmbEntityNamedDetailWorkspaceContextBase<UmbTemplateDetailModel, UmbTemplateDetailRepository> implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext {
     #private;
     readonly itemRepository: UmbTemplateItemRepository;
-    masterTemplate: import("rxjs").Observable<UmbTemplateItemModel | null>;
+    layoutTemplate: import("rxjs").Observable<UmbTemplateItemModel | null>;
     readonly alias: import("rxjs").Observable<string | undefined>;
     readonly content: import("rxjs").Observable<string | null | undefined>;
-    readonly masterTemplateUnique: import("rxjs").Observable<string | undefined>;
+    readonly layoutTemplateUnique: import("rxjs").Observable<string | undefined>;
     constructor(host: UmbControllerHost);
     load(unique: string): Promise<import("../../../core/repository/index.js").UmbRepositoryResponse<UmbTemplateDetailModel> | import("../../../core/repository/index.js").UmbRepositoryResponseWithAsObservable<UmbTemplateDetailModel, UmbTemplateDetailModel>>;
     create(parent: UmbEntityModel): Promise<UmbTemplateDetailModel | undefined>;
@@ -19,6 +19,6 @@ export declare class UmbTemplateWorkspaceContext extends UmbEntityNamedDetailWor
     setContent(value: string): void;
     getLayoutBlockRegexPattern(): RegExp;
     getHasLayoutBlock(): boolean;
-    setMasterTemplate(unique: string | null, updateLayoutBlock: boolean): Promise<string | null>;
+    setLayoutTemplate(unique: string | null, updateLayoutBlock: boolean): Promise<string | null>;
 }
 export { UmbTemplateWorkspaceContext as api };

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

@@ -5,7 +5,7 @@ import { UmbTemplateWorkspaceEditorElement } from './template-workspace-editor.e
 import { UmbEntityNamedDetailWorkspaceContextBase, UmbWorkspaceIsNewRedirectController, UmbWorkspaceIsNewRedirectControllerAlias, } from '../../../core/workspace/index.js';
 import { UmbObjectState } from '../../../../libs/observable-api/index.js';
 export class UmbTemplateWorkspaceContext extends UmbEntityNamedDetailWorkspaceContextBase {
-    #masterTemplate;
+    #layoutTemplate;
     constructor(host) {
         super(host, {
             workspaceAlias: UMB_TEMPLATE_WORKSPACE_ALIAS,
@@ -13,29 +13,29 @@ export class UmbTemplateWorkspaceContext extends UmbEntityNamedDetailWorkspaceCo
             detailRepositoryAlias: UMB_TEMPLATE_DETAIL_REPOSITORY_ALIAS,
         });
         this.itemRepository = new UmbTemplateItemRepository(this);
-        this.#masterTemplate = new UmbObjectState(null);
-        this.masterTemplate = this.#masterTemplate.asObservable();
+        this.#layoutTemplate = new UmbObjectState(null);
+        this.layoutTemplate = this.#layoutTemplate.asObservable();
         this.alias = this._data.createObservablePartOfCurrent((data) => data?.alias);
         this.content = this._data.createObservablePartOfCurrent((data) => data?.content);
-        this.masterTemplateUnique = this._data.createObservablePartOfCurrent((data) => data?.masterTemplate?.unique);
-        this.#updateMasterTemplateLayoutBlock = () => {
+        this.layoutTemplateUnique = this._data.createObservablePartOfCurrent((data) => data?.layoutTemplate?.unique);
+        this.#updateLayoutTemplateLayoutBlock = () => {
             const currentContent = this._data.getCurrent()?.content;
-            const newMasterTemplateAlias = this.#masterTemplate?.getValue()?.alias;
+            const newLayoutTemplateAlias = this.#layoutTemplate?.getValue()?.alias;
             const hasLayoutBlock = this.getHasLayoutBlock();
-            if (this.#masterTemplate.getValue() === null && hasLayoutBlock && currentContent) {
+            if (this.#layoutTemplate.getValue() === null && hasLayoutBlock && currentContent) {
                 const newString = currentContent.replace(this.getLayoutBlockRegexPattern(), `$1null$3`);
                 this.setContent(newString);
                 return;
             }
             //if has layout block in the content
             if (hasLayoutBlock && currentContent) {
-                const string = currentContent.replace(this.getLayoutBlockRegexPattern(), `$1"${newMasterTemplateAlias}.cshtml"$3`);
+                const string = currentContent.replace(this.getLayoutBlockRegexPattern(), `$1"${newLayoutTemplateAlias}.cshtml"$3`);
                 this.setContent(string);
                 return;
             }
             //if no layout block in the content insert it at the beginning
             const string = `@{
-	Layout = "${newMasterTemplateAlias}.cshtml";
+	Layout = "${newLayoutTemplateAlias}.cshtml";
 }
 ${currentContent}`;
             this.setContent(string);
@@ -64,25 +64,25 @@ ${currentContent}`;
     }
     async load(unique) {
         const response = await super.load(unique);
-        // On load we want to set the master template details but not update the layout block in the Razor file.
+        // On load we want to set the layout 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
+        // So even if there's no layout 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);
+        await this.setLayoutTemplate(response.data?.layoutTemplate?.unique ?? null, false);
         return response;
     }
     async create(parent) {
         const data = await this.createScaffold({
             parent,
             preset: {
-                masterTemplate: parent.unique ? { unique: parent.unique } : null,
+                layoutTemplate: parent.unique ? { unique: parent.unique } : null,
             },
         });
-        // On create set or reset the master template depending on whether the template is being created under a parent.
+        // On create set or reset the layout 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);
+        await this.setLayoutTemplate(parent.unique, true);
         return data;
     }
     setAlias(value) {
@@ -97,23 +97,23 @@ ${currentContent}`;
     getHasLayoutBlock() {
         return this.getData()?.content ? this.getLayoutBlockRegexPattern().test(this.getData()?.content) : false;
     }
-    async setMasterTemplate(unique, updateLayoutBlock) {
+    async setLayoutTemplate(unique, updateLayoutBlock) {
         if (unique === null) {
-            this.#masterTemplate.setValue(null);
+            this.#layoutTemplate.setValue(null);
         }
         else {
             // We need the whole template model if the unique id is provided
             const { data } = await this.itemRepository.requestItems([unique]);
             if (data) {
-                this.#masterTemplate.setValue(data[0]);
+                this.#layoutTemplate.setValue(data[0]);
             }
         }
         if (updateLayoutBlock) {
-            this.#updateMasterTemplateLayoutBlock();
-            this._data.updateCurrent({ masterTemplate: unique ? { unique } : null });
+            this.#updateLayoutTemplateLayoutBlock();
+            this._data.updateCurrent({ layoutTemplate: unique ? { unique } : null });
         }
         return unique;
     }
-    #updateMasterTemplateLayoutBlock;
+    #updateLayoutTemplateLayoutBlock;
 }
 export { UmbTemplateWorkspaceContext as api };

package/dist-cms/packages/tiptap/components/input-tiptap/input-tiptap.element.d.ts

@@ -26,6 +26,7 @@ export declare class UmbInputTiptapElement extends UmbInputTiptapElement_base {
     private _statusbar;
     constructor();
     protected firstUpdated(): Promise<void>;
+    protected updated(changedProperties: Map<string, unknown>): void;
     /**
      * Checks if the editor is empty.
      * @returns {boolean} returns true if the editor contains no markup

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

@@ -61,6 +61,12 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
         await this.#loadExtensions();
         await this.#loadEditor();
     }
+    updated(changedProperties) {
+        super.updated(changedProperties);
+        if (changedProperties.has('readonly')) {
+            this._editor?.setEditable(!this.readonly);
+        }
+    }
     /**
      * Checks if the editor is empty.
      * @returns {boolean} returns true if the editor contains no markup
@@ -153,7 +159,11 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
             onContentError: ({ error }) => {
                 console.error('contentError', [error.message, error.cause]);
             },
-            onUpdate: ({ editor }) => {
+            onUpdate: ({ editor, transaction }) => {
+                // Tiptap also fires `update` for no-op transactions (e.g. setEditable),
+                // which would otherwise dirty the workspace with a phantom change.
+                if (!transaction.docChanged)
+                    return;
                 this.#value = editor.getHTML();
                 this._runValidators();
                 this.dispatchEvent(new UmbChangeEvent());
@@ -181,20 +191,19 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
 		`;
     }
     #renderToolbar() {
-        if (!this.#hasToolbar)
+        if (!this.#hasToolbar || this.readonly)
             return;
         return html `
 			<umb-tiptap-toolbar
 				data-mark="tiptap-toolbar"
 				.toolbar=${this._toolbar}
 				.editor=${this._editor}
-				.configuration=${this.configuration}
-				?readonly=${this.readonly}>
+				.configuration=${this.configuration}>
 			</umb-tiptap-toolbar>
 		`;
     }
     #renderStatusbar() {
-        if (!this.#hasStatusbar)
+        if (!this.#hasStatusbar || this.readonly)
             return;
         return html `
 			<umb-tiptap-statusbar
@@ -202,7 +211,6 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
 				.statusbar=${this._statusbar}
 				.editor=${this._editor}
 				.configuration=${this.configuration}
-				?readonly=${this.readonly}
 				${umbDestroyOnDisconnect()}>
 			</umb-tiptap-statusbar>
 		`;
@@ -233,8 +241,6 @@ let UmbInputTiptapElement = class UmbInputTiptapElement extends UmbFormControlMi
 			}
 
 			:host([readonly]) {
-				pointer-events: none;
-
 				#editor {
 					background-color: var(--uui-color-surface-alt);
 				}

package/dist-cms/packages/tiptap/components/statusbar/tiptap-statusbar.element.d.ts

@@ -9,7 +9,6 @@ import type { UmbPropertyEditorConfigCollection } from '../../../core/property-e
  */
 export declare class UmbTiptapStatusbarElement extends UmbLitElement {
     #private;
-    readonly: boolean;
     editor?: Editor;
     configuration?: UmbPropertyEditorConfigCollection;
     set statusbar(value: UmbTiptapStatusbarValue);

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

@@ -15,18 +15,10 @@ import { UmbExtensionsElementInitializer } from '../../../../libs/extension-api/
  * @cssprop --umb-tiptap-edge-border-color - Defines the edge border color
  */
 let UmbTiptapStatusbarElement = class UmbTiptapStatusbarElement extends UmbLitElement {
-    constructor() {
-        super(...arguments);
-        this.#attached = false;
-        this.#debouncer = debounce(() => this.requestUpdate(), 100);
-        this.#lookup = new Map();
-        this.readonly = false;
-        this.#statusbar = [[], []];
-    }
-    #attached;
-    #debouncer;
+    #attached = false;
+    #debouncer = debounce(() => this.requestUpdate(), 100);
     #extensionsController;
-    #lookup;
+    #lookup = new Map();
     set statusbar(value) {
         if (typeof value === 'string') {
             value = [[], [value]];
@@ -40,7 +32,7 @@ let UmbTiptapStatusbarElement = class UmbTiptapStatusbarElement extends UmbLitEl
     get statusbar() {
         return this.#statusbar;
     }
-    #statusbar;
+    #statusbar = [[], []];
     connectedCallback() {
         super.connectedCallback();
         this.#attached = true;
@@ -89,10 +81,6 @@ let UmbTiptapStatusbarElement = class UmbTiptapStatusbarElement extends UmbLitEl
         this.#extensionsController = undefined;
     }
     static { this.styles = css `
-		:host([readonly]) {
-			display: none;
-		}
-
 		:host {
 			--uui-button-height: var(--uui-size-layout-2);
 
@@ -125,9 +113,6 @@ let UmbTiptapStatusbarElement = class UmbTiptapStatusbarElement extends UmbLitEl
 		}
 	`; }
 };
-__decorate([
-    property({ type: Boolean, reflect: true })
-], UmbTiptapStatusbarElement.prototype, "readonly", void 0);
 __decorate([
     property({ attribute: false })
 ], UmbTiptapStatusbarElement.prototype, "editor", void 0);

package/dist-cms/packages/tiptap/components/toolbar/tiptap-toolbar.element.d.ts

@@ -11,7 +11,6 @@ import '../cascading-menu-popover/cascading-menu-popover.element.js';
  */
 export declare class UmbTiptapToolbarElement extends UmbLitElement {
     #private;
-    readonly: boolean;
     editor?: Editor;
     configuration?: UmbPropertyEditorConfigCollection;
     toolbar: UmbTiptapToolbarValue;