@umbraco-cms/backoffice 14.0.0--preview006-89e89a2e → 14.0.0--preview006-7bdcb4ac

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

@@ -9,19 +9,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var _UmbPropertyEditorUIBlockGridElement_catalogueModal;
+var _UmbPropertyEditorUIBlockGridElement_context;
+import { UmbBlockGridManagerContext } from '../../context/block-grid-manager.context.js';
+import { UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS } from './manifests.js';
 import { html, customElement, property, state, css } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-import { UMB_BLOCK_CATALOGUE_MODAL, } from '../../../index.js';
-import { UmbModalRouteRegistrationController } from '../../../../core/modal/index.js';
-import { UMB_PROPERTY_CONTEXT } from '../../../../core/property/index.js';
+import { UmbChangeEvent } from '../../../../core/event/index.js';
+import '../../components/block-grid-entries/index.js';
 /**
  * @element umb-property-editor-ui-block-grid
  */
@@ -32,74 +27,64 @@ let UmbPropertyEditorUIBlockGridElement = class UmbPropertyEditorUIBlockGridElem
         const validationLimit = config.getValueByAlias('validationLimit');
         this._limitMin = validationLimit?.min;
         this._limitMax = validationLimit?.max;
-        this._blocks = config.getValueByAlias('blocks') ?? [];
-        this._blockGroups = config.getValueByAlias('blockGroups') ?? [];
-        const customCreateButtonLabel = config.getValueByAlias('createLabel');
-        if (customCreateButtonLabel) {
-            this._createButtonLabel = customCreateButtonLabel;
-        }
-        else if (this._blocks.length === 1) {
-            this._createButtonLabel = this.localize.term('blockEditor_addThis', [this._blocks[0].label]);
-        }
-        //const useInlineEditingAsDefault = config.getValueByAlias<boolean>('useInlineEditingAsDefault');
-        //this.#context.setInlineEditingMode(useInlineEditingAsDefault);
-        //config.useSingleBlockMode
-        //config.useLiveEditing
-        //config.useInlineEditingAsDefault
+        const blocks = config.getValueByAlias('blocks') ?? [];
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").setBlockTypes(blocks);
+        const blockGroups = config.getValueByAlias('blockGroups') ?? [];
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").setBlockGroups(blockGroups);
         this.style.maxWidth = config.getValueByAlias('maxPropertyWidth') ?? '';
-        //this.#context.setEditorConfiguration(config);
+        //config.useLiveEditing, is covered by the EditorConfiguration of context.
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").setEditorConfiguration(config);
+    }
+    get value() {
+        return this._value;
+    }
+    set value(value) {
+        const buildUpValue = value ? { ...value } : {};
+        buildUpValue.layout ?? (buildUpValue.layout = {});
+        buildUpValue.contentData ?? (buildUpValue.contentData = []);
+        buildUpValue.settingsData ?? (buildUpValue.settingsData = []);
+        this._value = buildUpValue;
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").setLayouts(this._value.layout[UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS] ?? []);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").setContents(buildUpValue.contentData);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").setSettings(buildUpValue.settingsData);
     }
     constructor() {
         super();
-        _UmbPropertyEditorUIBlockGridElement_catalogueModal.set(this, void 0);
-        this.value = '';
-        this._layouts = [];
-        this._createButtonLabel = this.localize.term('blockEditor_addBlock');
-        this.consumeContext(UMB_PROPERTY_CONTEXT, (propertyContext) => {
-            this.observe(propertyContext?.alias, (alias) => {
-                __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_catalogueModal, "f").setUniquePathValue('propertyAlias', alias);
-            }, 'observePropertyAlias');
+        _UmbPropertyEditorUIBlockGridElement_context.set(this, new UmbBlockGridManagerContext(this));
+        //
+        this._value = {
+            layout: {},
+            contentData: [],
+            settingsData: [],
+        };
+        this._rootLayouts = [];
+        // TODO: Prevent initial notification from these observes:
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").layouts, (layouts) => {
+            this._value = { ...this._value, layout: { [UMB_BLOCK_GRID_PROPERTY_EDITOR_ALIAS]: layouts } };
+            // Notify that the value has changed.
+            //console.log('layout changed', this._value);
+            // TODO: idea: consider inserting an await here, so other changes could appear first? Maybe some mechanism to only fire change event onces?
+            this._rootLayouts = layouts;
+            this.dispatchEvent(new UmbChangeEvent());
+        });
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").contents, (contents) => {
+            this._value = { ...this._value, contentData: contents };
+            // Notify that the value has changed.
+            //console.log('content changed', this._value);
+            this.dispatchEvent(new UmbChangeEvent());
+        });
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockGridElement_context, "f").settings, (settings) => {
+            this._value = { ...this._value, settingsData: settings };
+            // Notify that the value has changed.
+            //console.log('settings changed', this._value);
+            this.dispatchEvent(new UmbChangeEvent());
         });
-        __classPrivateFieldSet(this, _UmbPropertyEditorUIBlockGridElement_catalogueModal, new UmbModalRouteRegistrationController(this, UMB_BLOCK_CATALOGUE_MODAL)
-            .addUniquePaths(['propertyAlias'])
-            .addAdditionalPath(':view/:index')
-            .onSetup((routingInfo) => {
-            const index = routingInfo.index ? parseInt(routingInfo.index) : -1;
-            return {
-                data: {
-                    blocks: this._blocks ?? [],
-                    blockGroups: this._blockGroups ?? [],
-                    openClipboard: routingInfo.view === 'clipboard',
-                    blockOriginData: { index: index },
-                },
-            };
-        })
-            .observeRouteBuilder((routeBuilder) => {
-            this._catalogueRouteBuilder = routeBuilder;
-        }), "f");
     }
     render() {
-        if (this._blocks?.length === 1) {
-            const elementKey = this._blocks[0].contentElementTypeKey;
-            this._directRoute =
-                this._catalogueRouteBuilder?.({ view: 'create', index: -1 }) + 'modal/umb-modal-workspace/create/' + elementKey;
-        }
-        return html `<uui-button-group>
-			<uui-button
-				id="add-button"
-				look="placeholder"
-				label=${this._createButtonLabel}
-				href=${this._directRoute ?? this._catalogueRouteBuilder?.({ view: 'create', index: -1 }) ?? ''}></uui-button>
-			<uui-button
-				label=${this.localize.term('content_createFromClipboard')}
-				look="placeholder"
-				href=${this._catalogueRouteBuilder?.({ view: 'clipboard', index: -1 }) ?? ''}>
-				<uui-icon name="icon-paste-in"></uui-icon>
-			</uui-button>
-		</uui-button-group>`;
+        return html `<umb-block-grid-entries .areaKey=${null}></umb-block-grid-entries>`;
     }
 };
-_UmbPropertyEditorUIBlockGridElement_catalogueModal = new WeakMap();
+_UmbPropertyEditorUIBlockGridElement_context = new WeakMap();
 UmbPropertyEditorUIBlockGridElement.styles = [
     UmbTextStyles,
     css `
@@ -121,8 +106,8 @@ UmbPropertyEditorUIBlockGridElement.styles = [
 		`,
 ];
 __decorate([
-    property()
-], UmbPropertyEditorUIBlockGridElement.prototype, "value", void 0);
+    property({ attribute: false })
+], UmbPropertyEditorUIBlockGridElement.prototype, "config", null);
 __decorate([
     state()
 ], UmbPropertyEditorUIBlockGridElement.prototype, "_limitMin", void 0);
@@ -130,26 +115,11 @@ __decorate([
     state()
 ], UmbPropertyEditorUIBlockGridElement.prototype, "_limitMax", void 0);
 __decorate([
-    state()
-], UmbPropertyEditorUIBlockGridElement.prototype, "_blocks", void 0);
-__decorate([
-    state()
-], UmbPropertyEditorUIBlockGridElement.prototype, "_blockGroups", void 0);
-__decorate([
-    state()
-], UmbPropertyEditorUIBlockGridElement.prototype, "_layouts", void 0);
-__decorate([
-    state()
-], UmbPropertyEditorUIBlockGridElement.prototype, "_catalogueRouteBuilder", void 0);
-__decorate([
-    state()
-], UmbPropertyEditorUIBlockGridElement.prototype, "_directRoute", void 0);
+    property({ attribute: false })
+], UmbPropertyEditorUIBlockGridElement.prototype, "value", null);
 __decorate([
     state()
-], UmbPropertyEditorUIBlockGridElement.prototype, "_createButtonLabel", void 0);
-__decorate([
-    property({ attribute: false })
-], UmbPropertyEditorUIBlockGridElement.prototype, "config", null);
+], UmbPropertyEditorUIBlockGridElement.prototype, "_rootLayouts", void 0);
 UmbPropertyEditorUIBlockGridElement = __decorate([
     customElement('umb-property-editor-ui-block-grid')
 ], UmbPropertyEditorUIBlockGridElement);

package/dist-cms/packages/block/block-grid/property-editors/block-grid-group-configuration/property-editor-ui-block-grid-group-configuration.element.d.ts

@@ -1,12 +1,12 @@
 import type { UmbPropertyEditorUiElement } from '../../../../core/extension-registry/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import type { UmbPropertyEditorConfigCollection } from '../../../../core/property-editor/index.js';
-import type { UmbBlockGridGroupType } from '../../../index.js';
+import type { UmbBlockGridTypeGroupType } from '../../../index.js';
 export declare class UmbPropertyEditorUIBlockGridGroupConfigurationElement extends UmbLitElement implements UmbPropertyEditorUiElement {
     #private;
     private _value;
-    get value(): Array<UmbBlockGridGroupType>;
-    set value(value: Array<UmbBlockGridGroupType>);
+    get value(): Array<UmbBlockGridTypeGroupType>;
+    set value(value: Array<UmbBlockGridTypeGroupType>);
     set config(config: UmbPropertyEditorConfigCollection | undefined);
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/block/block-grid/types.d.ts

@@ -1,6 +1,7 @@
 import type { UmbBlockTypeBaseModel, UmbBlockTypeWithGroupKey } from '../block-type/index.js';
+import type { UmbBlockLayoutBaseModel, UmbBlockValueType } from '../index.js';
 export declare const UMB_BLOCK_GRID_TYPE = "block-grid-type";
-export interface UmbBlockGridType extends UmbBlockTypeBaseModel {
+export interface UmbBlockGridTypeModel extends UmbBlockTypeBaseModel {
     columnSpanOptions: Array<number>;
     allowAtRoot: boolean;
     allowInAreas: boolean;
@@ -10,10 +11,21 @@ export interface UmbBlockGridType extends UmbBlockTypeBaseModel {
     areaGridColumns?: number;
     areas: Array<any>;
 }
-export interface UmbBlockGridGroupType {
+export interface UmbBlockGridTypeGroupType {
     name: string;
     key: string;
 }
-export interface UmbBlockGridGroupTypeConfiguration extends Partial<UmbBlockGridGroupType> {
+export interface UmbBlockGridGroupTypeConfiguration extends Partial<UmbBlockGridTypeGroupType> {
     blocks: Array<UmbBlockTypeWithGroupKey>;
 }
+export interface UmbBlockGridValueModel extends UmbBlockValueType<UmbBlockGridLayoutModel> {
+}
+export interface UmbBlockGridLayoutModel extends UmbBlockLayoutBaseModel {
+    columnSpan: number;
+    rowSpan: number;
+    areas: Array<UmbBlockGridLayoutAreaItemModel>;
+}
+export interface UmbBlockGridLayoutAreaItemModel {
+    key: string;
+    items: Array<UmbBlockGridLayoutModel>;
+}

package/dist-cms/packages/block/block-list/components/block-list-entry/block-list-entry.element.d.ts

@@ -0,0 +1,29 @@
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import type { UmbPropertyEditorUiElement } from '../../../../core/extension-registry/index.js';
+import '../ref-list-block/index.js';
+import '../inline-list-block/index.js';
+/**
+ * @element umb-block-list-entry
+ */
+export declare class UmbBlockListEntryElement extends UmbLitElement implements UmbPropertyEditorUiElement {
+    #private;
+    get contentUdi(): string | undefined;
+    set contentUdi(value: string | undefined);
+    private _contentUdi?;
+    _hasSettings: boolean;
+    _label: string;
+    _workspaceEditPath?: string;
+    _inlineEditingMode?: boolean;
+    _blockViewProps: {
+        label?: string;
+    };
+    constructor();
+    render(): import("lit-html").TemplateResult<1>;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
+}
+export default UmbBlockListEntryElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-block-list-entry': UmbBlockListEntryElement;
+    }
+}

package/dist-cms/packages/block/block-list/components/block-list-entry/block-list-entry.element.js

@@ -0,0 +1,132 @@
+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;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _UmbBlockListEntryElement_instances, _UmbBlockListEntryElement_context, _UmbBlockListEntryElement_renderRefBlock, _UmbBlockListEntryElement_renderInlineBlock, _UmbBlockListEntryElement_renderBlock;
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import { UmbBlockListEntryContext } from '../../context/block-list-entry.context.js';
+import { html, css, customElement, property, state } from '../../../../../external/lit/index.js';
+import '../ref-list-block/index.js';
+import '../inline-list-block/index.js';
+/**
+ * @element umb-block-list-entry
+ */
+let UmbBlockListEntryElement = class UmbBlockListEntryElement extends UmbLitElement {
+    //
+    get contentUdi() {
+        return this._contentUdi;
+    }
+    set contentUdi(value) {
+        if (!value)
+            return;
+        this._contentUdi = value;
+        __classPrivateFieldGet(this, _UmbBlockListEntryElement_context, "f").setContentUdi(value);
+    }
+    constructor() {
+        super();
+        _UmbBlockListEntryElement_instances.add(this);
+        _UmbBlockListEntryElement_context.set(this, new UmbBlockListEntryContext(this));
+        this._hasSettings = false;
+        this._label = '';
+        // TODO: Move type for the Block Properties, and use it on the Element Interface for the Manifest.
+        this._blockViewProps = {};
+        this.observe(__classPrivateFieldGet(this, _UmbBlockListEntryElement_context, "f").workspaceEditPath, (workspaceEditPath) => {
+            this._workspaceEditPath = workspaceEditPath;
+        });
+        this.observe(__classPrivateFieldGet(this, _UmbBlockListEntryElement_context, "f").blockTypeSettingsElementTypeKey, (blockTypeSettingsElementTypeKey) => {
+            this._hasSettings = !!blockTypeSettingsElementTypeKey;
+        });
+        this.observe(__classPrivateFieldGet(this, _UmbBlockListEntryElement_context, "f").label, (label) => {
+            const oldValue = this._label;
+            this._blockViewProps.label = label;
+            this._label = label;
+            this.requestUpdate('label', oldValue);
+        });
+        this.observe(__classPrivateFieldGet(this, _UmbBlockListEntryElement_context, "f").inlineEditingMode, (inlineEditingMode) => {
+            this._inlineEditingMode = inlineEditingMode;
+        });
+    }
+    render() {
+        return __classPrivateFieldGet(this, _UmbBlockListEntryElement_instances, "m", _UmbBlockListEntryElement_renderBlock).call(this);
+    }
+};
+_UmbBlockListEntryElement_context = new WeakMap();
+_UmbBlockListEntryElement_instances = new WeakSet();
+_UmbBlockListEntryElement_renderRefBlock = function _UmbBlockListEntryElement_renderRefBlock() {
+    return html `<umb-ref-list-block .label=${this._label}></umb-ref-list-block>`;
+};
+_UmbBlockListEntryElement_renderInlineBlock = function _UmbBlockListEntryElement_renderInlineBlock() {
+    return html `<umb-inline-list-block .label=${this._label}></umb-inline-list-block>`;
+};
+_UmbBlockListEntryElement_renderBlock = function _UmbBlockListEntryElement_renderBlock() {
+    return html `
+			<umb-extension-slot
+				type="blockEditorCustomView"
+				default-element=${this._inlineEditingMode ? 'umb-inline-list-block' : 'umb-ref-list-block'}
+				.props=${this._blockViewProps}
+				>${this._inlineEditingMode ? __classPrivateFieldGet(this, _UmbBlockListEntryElement_instances, "m", _UmbBlockListEntryElement_renderInlineBlock).call(this) : __classPrivateFieldGet(this, _UmbBlockListEntryElement_instances, "m", _UmbBlockListEntryElement_renderRefBlock).call(this)}</umb-extension-slot
+			>
+			<uui-action-bar>
+				${this._workspaceEditPath
+        ? html `<uui-button label="edit" compact href=${this._workspaceEditPath}>
+							<uui-icon name="icon-edit"></uui-icon>
+					  </uui-button>`
+        : ''}
+				${this._workspaceEditPath && this._hasSettings
+        ? html `<uui-button label="Edit settings" compact href=${this._workspaceEditPath + '/view/settings'}>
+							<uui-icon name="icon-settings"></uui-icon>
+					  </uui-button>`
+        : ''}
+				<uui-button label="delete" compact @click=${() => __classPrivateFieldGet(this, _UmbBlockListEntryElement_context, "f").requestDelete()}>
+					<uui-icon name="icon-remove"></uui-icon>
+				</uui-button>
+			</uui-action-bar>
+		`;
+};
+UmbBlockListEntryElement.styles = [
+    css `
+			:host {
+				position: relative;
+				display: block;
+			}
+			uui-action-bar {
+				position: absolute;
+				top: var(--uui-size-2);
+				right: var(--uui-size-2);
+			}
+
+			:host([drag-placeholder]) {
+				opacity: 0.2;
+			}
+		`,
+];
+__decorate([
+    property({ attribute: false })
+], UmbBlockListEntryElement.prototype, "contentUdi", null);
+__decorate([
+    state()
+], UmbBlockListEntryElement.prototype, "_hasSettings", void 0);
+__decorate([
+    state()
+], UmbBlockListEntryElement.prototype, "_label", void 0);
+__decorate([
+    state()
+], UmbBlockListEntryElement.prototype, "_workspaceEditPath", void 0);
+__decorate([
+    state()
+], UmbBlockListEntryElement.prototype, "_inlineEditingMode", void 0);
+__decorate([
+    state()
+], UmbBlockListEntryElement.prototype, "_blockViewProps", void 0);
+UmbBlockListEntryElement = __decorate([
+    customElement('umb-block-list-entry')
+], UmbBlockListEntryElement);
+export { UmbBlockListEntryElement };
+export default UmbBlockListEntryElement;

package/dist-cms/packages/block/block-list/components/block-list-entry/index.d.ts

@@ -0,0 +1 @@
+export * from './block-list-entry.element.js';

package/dist-cms/packages/block/block-list/components/block-list-entry/index.js

@@ -0,0 +1 @@
+export * from './block-list-entry.element.js';

package/dist-cms/packages/block/block-list/components/inline-list-block/inline-list-block.element.d.ts

@@ -1,5 +1,5 @@
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-import '../../../block/workspace/views/edit/block-workspace-view-edit-no-router.element.js';
+import '../../../block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js';
 /**
  * @element umb-inline-list-block
  */

package/dist-cms/packages/block/block-list/components/inline-list-block/inline-list-block.element.js

@@ -16,13 +16,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _UmbInlineListBlockElement_instances, _UmbInlineListBlockElement_blockContext, _UmbInlineListBlockElement_workspaceContext, _UmbInlineListBlockElement_contentUdi, _UmbInlineListBlockElement_load;
-import { UMB_BLOCK_LIST_CONTEXT } from '../../index.js';
+import { UMB_BLOCK_LIST_ENTRY_CONTEXT } from '../../index.js';
 import { UMB_BLOCK_WORKSPACE_ALIAS } from '../../../block/index.js';
 import { UmbExtensionsApiInitializer, createExtensionApi } from '../../../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../../../core/extension-registry/index.js';
 import { css, customElement, html, property, state } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
-import '../../../block/workspace/views/edit/block-workspace-view-edit-no-router.element.js';
+import '../../../block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
 /**
  * @element umb-inline-list-block
@@ -35,9 +35,9 @@ let UmbInlineListBlockElement = class UmbInlineListBlockElement extends UmbLitEl
         _UmbInlineListBlockElement_workspaceContext.set(this, void 0);
         _UmbInlineListBlockElement_contentUdi.set(this, void 0);
         this._isOpen = false;
-        this.consumeContext(UMB_BLOCK_LIST_CONTEXT, (blockContext) => {
+        this.consumeContext(UMB_BLOCK_LIST_ENTRY_CONTEXT, (blockContext) => {
             __classPrivateFieldSet(this, _UmbInlineListBlockElement_blockContext, blockContext, "f");
-            this.observe(__classPrivateFieldGet(this, _UmbInlineListBlockElement_blockContext, "f").contentUdi, (contentUdi) => {
+            this.observe(__classPrivateFieldGet(this, _UmbInlineListBlockElement_blockContext, "f").unique, (contentUdi) => {
                 __classPrivateFieldSet(this, _UmbInlineListBlockElement_contentUdi, contentUdi, "f");
                 __classPrivateFieldGet(this, _UmbInlineListBlockElement_instances, "m", _UmbInlineListBlockElement_load).call(this);
             }, 'observeContentUdi');
@@ -48,7 +48,6 @@ let UmbInlineListBlockElement = class UmbInlineListBlockElement extends UmbLitEl
                     if (context) {
                         __classPrivateFieldSet(this, _UmbInlineListBlockElement_workspaceContext, context, "f");
                         __classPrivateFieldGet(this, _UmbInlineListBlockElement_instances, "m", _UmbInlineListBlockElement_load).call(this);
-                        __classPrivateFieldGet(this, _UmbInlineListBlockElement_workspaceContext, "f").content.createPropertyDatasetContext(this);
                         new UmbExtensionsApiInitializer(this, umbExtensionsRegistry, 'workspaceContext', [
                             this,
                             __classPrivateFieldGet(this, _UmbInlineListBlockElement_workspaceContext, "f"),
@@ -71,7 +70,7 @@ let UmbInlineListBlockElement = class UmbInlineListBlockElement extends UmbLitEl
 				<span>${this.label}</span>
 			</button>
 			${this._isOpen === true
-            ? html `<umb-block-workspace-view-edit-no-router></umb-block-workspace-view-edit-no-router>`
+            ? html `<umb-block-workspace-view-edit-content-no-router></umb-block-workspace-view-edit-content-no-router>`
             : ''}
 		</uui-box>`;
     }

package/dist-cms/packages/block/block-list/components/ref-list-block/ref-list-block.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 { UMB_BLOCK_LIST_CONTEXT } from '../../context/block-list.context-token.js';
+import { UMB_BLOCK_ENTRY_CONTEXT } from '../../../index.js';
 import { css, customElement, html, property, state } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 /**
@@ -13,7 +13,8 @@ import { UmbLitElement } from '../../../../core/lit-element/index.js';
 let UmbRefListBlockElement = class UmbRefListBlockElement extends UmbLitElement {
     constructor() {
         super();
-        this.consumeContext(UMB_BLOCK_LIST_CONTEXT, (context) => {
+        // UMB_BLOCK_LIST_ENTRY_CONTEXT
+        this.consumeContext(UMB_BLOCK_ENTRY_CONTEXT, (context) => {
             this.observe(context.workspaceEditPath, (workspaceEditPath) => {
                 this._workspaceEditPath = workspaceEditPath;
             }, 'observeWorkspaceEditPath');

package/dist-cms/packages/block/block-list/context/block-list-entries.context-token.d.ts

@@ -0,0 +1,3 @@
+import type { UmbBlockListEntriesContext } from './block-list-entries.context.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export declare const UMB_BLOCK_LIST_ENTRIES_CONTEXT: UmbContextToken<UmbBlockListEntriesContext, UmbBlockListEntriesContext>;

package/dist-cms/packages/block/block-list/context/block-list-entries.context-token.js

@@ -0,0 +1,3 @@
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+// TODO: Make discriminator method for this:
+export const UMB_BLOCK_LIST_ENTRIES_CONTEXT = new UmbContextToken('UmbBlockEntriesContext');

package/dist-cms/packages/block/block-list/context/block-list-entries.context.d.ts

@@ -0,0 +1,23 @@
+import type { UmbBlockDataType } from '../../block/index.js';
+import { UmbBlockEntriesContext } from '../../block/index.js';
+import type { UmbBlockListWorkspaceData } from '../index.js';
+import type { UmbBlockListLayoutModel, UmbBlockListTypeModel } from '../types.js';
+import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context.js';
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+export declare class UmbBlockListEntriesContext extends UmbBlockEntriesContext<typeof UMB_BLOCK_LIST_MANAGER_CONTEXT, typeof UMB_BLOCK_LIST_MANAGER_CONTEXT.TYPE, UmbBlockListTypeModel, UmbBlockListLayoutModel> {
+    #private;
+    constructor(host: UmbControllerHost);
+    protected _gotBlockManager(): void;
+    getPathForCreateBlock(index: number): string | undefined;
+    getPathForClipboard(index: number): string | undefined;
+    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<UmbBlockListLayoutModel, 'contentUdi'>, modalData?: UmbBlockListWorkspaceData): Promise<{
+        layout: UmbBlockListLayoutModel;
+        content: {
+            udi: string;
+            contentTypeKey: string;
+        };
+        settings: UmbBlockDataType | undefined;
+    } | undefined>;
+    insert(layoutEntry: UmbBlockListLayoutModel, content: UmbBlockDataType, settings: UmbBlockDataType | undefined, modalData: UmbBlockListWorkspaceData): Promise<boolean>;
+    delete(contentUdi: string): Promise<void>;
+}

package/dist-cms/packages/block/block-list/context/block-list-entries.context.js

@@ -0,0 +1,81 @@
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _UmbBlockListEntriesContext_catalogueModal, _UmbBlockListEntriesContext_catalogueRouteBuilder;
+import { UMB_BLOCK_CATALOGUE_MODAL, UmbBlockEntriesContext } from '../../block/index.js';
+import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context.js';
+import { UmbModalRouteRegistrationController } from '../../../core/modal/index.js';
+export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
+    constructor(host) {
+        super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT);
+        //
+        _UmbBlockListEntriesContext_catalogueModal.set(this, void 0);
+        _UmbBlockListEntriesContext_catalogueRouteBuilder.set(this, void 0);
+        __classPrivateFieldSet(this, _UmbBlockListEntriesContext_catalogueModal, new UmbModalRouteRegistrationController(this, UMB_BLOCK_CATALOGUE_MODAL)
+            .addUniquePaths(['propertyAlias', 'variantId'])
+            .addAdditionalPath(':view/:index')
+            .onSetup((routingInfo) => {
+            // Idea: Maybe on setup should be async, so it can retrieve the values when needed? [NL]
+            const index = routingInfo.index ? parseInt(routingInfo.index) : -1;
+            return {
+                data: {
+                    blocks: [],
+                    blockGroups: [],
+                    openClipboard: routingInfo.view === 'clipboard',
+                    blockOriginData: { index: index },
+                },
+            };
+        })
+            .observeRouteBuilder((routeBuilder) => {
+            __classPrivateFieldSet(this, _UmbBlockListEntriesContext_catalogueRouteBuilder, routeBuilder, "f");
+            // TODO: Trigger render update?
+        }), "f");
+    }
+    _gotBlockManager() {
+        if (!this._manager)
+            return;
+        this.observe(this._manager.layouts, (layouts) => {
+            this._layoutEntries.setValue(layouts);
+        }, 'observeParentLayouts');
+        this.observe(this.layoutEntries, (layouts) => {
+            this._manager?.setLayouts(layouts);
+        }, 'observeThisLayouts');
+        this.observe(this._manager.propertyAlias, (alias) => {
+            __classPrivateFieldGet(this, _UmbBlockListEntriesContext_catalogueModal, "f").setUniquePathValue('propertyAlias', alias ?? 'null');
+        }, 'observePropertyAlias');
+        this.observe(this._manager.variantId, (variantId) => {
+            if (variantId) {
+                __classPrivateFieldGet(this, _UmbBlockListEntriesContext_catalogueModal, "f").setUniquePathValue('variantId', variantId.toString());
+            }
+        }, 'observePropertyAlias');
+    }
+    getPathForCreateBlock(index) {
+        return __classPrivateFieldGet(this, _UmbBlockListEntriesContext_catalogueRouteBuilder, "f")?.call(this, { view: 'create', index: index });
+    }
+    getPathForClipboard(index) {
+        return __classPrivateFieldGet(this, _UmbBlockListEntriesContext_catalogueRouteBuilder, "f")?.call(this, { view: 'clipboard', index: index });
+    }
+    async create(contentElementTypeKey, partialLayoutEntry, modalData) {
+        await this._retrieveManager;
+        return this._manager?.create(contentElementTypeKey, partialLayoutEntry, modalData);
+    }
+    // insert Block?
+    async insert(layoutEntry, content, settings, modalData) {
+        await this._retrieveManager;
+        return this._manager?.insert(layoutEntry, content, settings, modalData) ?? false;
+    }
+    // create Block?
+    async delete(contentUdi) {
+        // TODO: Loop through children and delete them as well?
+        await super.delete(contentUdi);
+    }
+}
+_UmbBlockListEntriesContext_catalogueModal = new WeakMap(), _UmbBlockListEntriesContext_catalogueRouteBuilder = new WeakMap();

package/dist-cms/packages/block/block-list/context/block-list-entry.context-token.d.ts

@@ -0,0 +1,3 @@
+import type { UmbBlockListEntryContext } from './block-list-entry.context.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export declare const UMB_BLOCK_LIST_ENTRY_CONTEXT: UmbContextToken<UmbBlockListEntryContext, UmbBlockListEntryContext>;

package/dist-cms/packages/block/block-list/context/block-list-entry.context-token.js

@@ -0,0 +1,3 @@
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+// TODO: Make discriminator method for this:
+export const UMB_BLOCK_LIST_ENTRY_CONTEXT = new UmbContextToken('UmbBlockEntryContext');

package/dist-cms/packages/block/block-list/context/block-list-entry.context.d.ts

@@ -0,0 +1,11 @@
+import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context.js';
+import { UMB_BLOCK_LIST_ENTRIES_CONTEXT } from './block-list-entries.context-token.js';
+import { UmbBlockEntryContext } from '../../index.js';
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+export declare class UmbBlockListEntryContext extends UmbBlockEntryContext<typeof UMB_BLOCK_LIST_MANAGER_CONTEXT, typeof UMB_BLOCK_LIST_MANAGER_CONTEXT.TYPE, typeof UMB_BLOCK_LIST_ENTRIES_CONTEXT, typeof UMB_BLOCK_LIST_ENTRIES_CONTEXT.TYPE> {
+    #private;
+    inlineEditingMode: import("rxjs").Observable<boolean | undefined>;
+    constructor(host: UmbControllerHost);
+    _gotManager(): void;
+    _gotEntries(): void;
+}