@umbraco-cms/backoffice 15.0.0-rc1 → 15.0.0-rc2

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

@@ -57,13 +57,13 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
     }
     getMinAllowed() {
         if (this.#areaKey) {
-            return this.#areaType?.minAllowed ?? 0;
+            return this.#areaType.getValue()?.minAllowed ?? 0;
         }
         return this._manager?.getMinAllowed() ?? 0;
     }
     getMaxAllowed() {
         if (this.#areaKey) {
-            return this.#areaType?.maxAllowed ?? Infinity;
+            return this.#areaType.getValue()?.maxAllowed ?? Infinity;
         }
         return this._manager?.getMaxAllowed() ?? Infinity;
     }
@@ -74,6 +74,9 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
         super(host, UMB_BLOCK_GRID_MANAGER_CONTEXT);
         this.#layoutColumns = new UmbNumberState(undefined);
         this.layoutColumns = this.#layoutColumns.asObservable();
+        this.#areaType = new UmbObjectState(undefined);
+        this.areaType = this.#areaType.asObservable();
+        this.areaTypeCreateLabel = this.#areaType.asObservablePart((x) => x?.createLabel);
         this.#rangeLimits = new UmbObjectState(undefined);
         this.rangeLimits = this.#rangeLimits.asObservable();
         this.#allowedBlockTypes = new UmbArrayState([], (x) => x.contentElementTypeKey);
@@ -90,15 +93,17 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
             .addUniquePaths(['propertyAlias', 'variantId', 'parentUnique', 'areaKey'])
             .addAdditionalPath(':view/:index')
             .onSetup((routingInfo) => {
+            if (!this._manager)
+                return false;
             // 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: this.#allowedBlockTypes.getValue(),
-                    blockGroups: this._manager?.getBlockGroups() ?? [],
+                    blockGroups: this._manager.getBlockGroups() ?? [],
                     openClipboard: routingInfo.view === 'clipboard',
                     originData: { index: index, areaKey: this.#areaKey, parentUnique: this.#parentUnique },
-                    createBlockInWorkspace: true,
+                    createBlockInWorkspace: this._manager.getInlineEditingMode() === false,
                 },
             };
         })
@@ -203,7 +208,7 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
                 }
             }, 'observeThisLayouts');
             this.observe(this.#parentEntry.areaType(this.#areaKey), (areaType) => {
-                this.#areaType = areaType;
+                this.#areaType.setValue(areaType);
                 const hostEl = this.getHostElement();
                 if (!hostEl)
                     return;
@@ -229,14 +234,15 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
             return;
         //const range = this.#retrieveRangeLimits();
         if (this.#areaKey != null) {
+            const areaType = this.#areaType.getValue();
             this.removeUmbControllerByAlias('observeConfigurationRootLimits');
             // Area entries:
-            if (!this.#areaType)
+            if (!areaType)
                 return undefined;
             // No need to observe as this method is called every time the area is changed.
             this.#rangeLimits.setValue({
-                min: this.#areaType.minAllowed ?? 0,
-                max: this.#areaType.maxAllowed ?? Infinity,
+                min: areaType.minAllowed ?? 0,
+                max: areaType.maxAllowed ?? Infinity,
             });
         }
         else if (this.#areaKey === null) {
@@ -285,17 +291,18 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
     }
     /**
      * @internal
-     * @returns an Array of ElementTypeKeys that are allowed in the current area. Or undefined if not ready jet.
+     * @returns {Array<UmbBlockGridTypeModel>} an Array of ElementTypeKeys that are allowed in the current area. Or undefined if not ready jet.
      */
     #retrieveAllowedElementTypes() {
         if (!this._manager)
             return [];
         if (this.#areaKey) {
+            const areaType = this.#areaType.getValue();
             // Area entries:
-            if (!this.#areaType)
+            if (!areaType)
                 return [];
-            if (this.#areaType.specifiedAllowance && this.#areaType.specifiedAllowance?.length > 0) {
-                return (this.#areaType.specifiedAllowance
+            if (areaType.specifiedAllowance && areaType.specifiedAllowance?.length > 0) {
+                return (areaType.specifiedAllowance
                     .flatMap((permission) => {
                     if (permission.groupKey) {
                         return (this._manager?.getBlockTypes().filter((blockType) => blockType.groupKey === permission.groupKey) ?? []);
@@ -325,10 +332,11 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
         if (!this._manager)
             return;
         if (this.#areaKey) {
+            const areaType = this.#areaType.getValue();
             // Area entries:
-            if (!this.#areaType)
+            if (!areaType)
                 return;
-            if (this.#areaType.specifiedAllowance && this.#areaType.specifiedAllowance?.length > 0) {
+            if (areaType.specifiedAllowance && areaType.specifiedAllowance?.length > 0) {
                 this.#hasTypeLimits.setValue(true);
             }
         }
@@ -345,10 +353,11 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
      * @returns {boolean} - True if the block type limits are valid, otherwise false.
      */
     checkBlockTypeLimitsValidity() {
-        if (!this.#areaType || !this.#areaType.specifiedAllowance)
+        const areaType = this.#areaType.getValue();
+        if (!areaType || !areaType.specifiedAllowance)
             return false;
         const layoutEntries = this._layoutEntries.getValue();
-        this.#invalidBlockTypeLimits = this.#areaType.specifiedAllowance
+        this.#invalidBlockTypeLimits = areaType.specifiedAllowance
             .map((rule) => {
             const minAllowed = rule.minAllowed || 0;
             const maxAllowed = rule.maxAllowed || 0;
@@ -400,7 +409,7 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
     }
     /**
      * Check if given contentKey is allowed in the current area.
-     * @param contentKey {string} - The contentKey of the content to check.
+     * @param {string} contentKey - The contentKey of the content to check.
      * @returns {boolean} - True if the content is allowed in the current area, otherwise false.
      */
     allowDrop(contentKey) {

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

@@ -14,6 +14,7 @@ export declare class UmbBlockGridEntryContext extends UmbBlockEntryContext<typeo
     readonly areaTypeGridColumns: import("rxjs/internal/Observable").Observable<number | undefined>;
     readonly areas: import("rxjs/internal/Observable").Observable<import("../index.js").UmbBlockGridTypeAreaType[]>;
     readonly minMaxRowSpan: import("rxjs/internal/Observable").Observable<number[] | undefined>;
+    readonly forceHideContentEditorInOverlay: import("rxjs/internal/Observable").Observable<boolean | undefined>;
     getMinMaxRowSpan(): [number, number] | undefined;
     readonly inlineEditingMode: import("rxjs/internal/Observable").Observable<boolean>;
     readonly relevantColumnSpanOptions: import("rxjs/internal/Observable").Observable<number[]>;

package/dist-cms/packages/block/block-grid/context/block-grid-entry.context.js

@@ -2,7 +2,7 @@ import { closestColumnSpanOption } from '../utils/index.js';
 import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from './block-grid-manager.context-token.js';
 import { UMB_BLOCK_GRID_ENTRIES_CONTEXT } from './block-grid-entries.context-token.js';
 import { UmbBlockGridScaleManager, } from './block-grid-scale-manager/block-grid-scale-manager.controller.js';
-import { UmbArrayState, UmbBooleanState, UmbNumberState, UmbObjectState, appendToFrozenArray, observeMultiple, } from '../../../../libs/observable-api/index.js';
+import { UmbArrayState, UmbBooleanState, UmbNumberState, UmbObjectState, appendToFrozenArray, mergeObservables, observeMultiple, } from '../../../../libs/observable-api/index.js';
 import { UmbBlockEntryContext } from '../../block/index.js';
 export class UmbBlockGridEntryContext extends UmbBlockEntryContext {
     getMinMaxRowSpan() {
@@ -28,6 +28,7 @@ export class UmbBlockGridEntryContext extends UmbBlockEntryContext {
         this.areaTypeGridColumns = this._blockType.asObservablePart((x) => x?.areaGridColumns);
         this.areas = this._blockType.asObservablePart((x) => x?.areas ?? []);
         this.minMaxRowSpan = this._blockType.asObservablePart((x) => x ? [x.rowMinSpan ?? 1, x.rowMaxSpan ?? 1] : undefined);
+        this.forceHideContentEditorInOverlay = this._blockType.asObservablePart((x) => x ? (x.forceHideContentEditorInOverlay ?? false) : undefined);
         this.inlineEditingMode = this._blockType.asObservablePart((x) => x?.inlineEditing === true);
         this.#relevantColumnSpanOptions = new UmbArrayState([], (x) => x);
         this.relevantColumnSpanOptions = this.#relevantColumnSpanOptions.asObservable();
@@ -35,7 +36,7 @@ export class UmbBlockGridEntryContext extends UmbBlockEntryContext {
         this.canScale = this.#canScale.asObservable();
         this.#areaGridColumns = new UmbNumberState(undefined);
         this.areaGridColumns = this.#areaGridColumns.asObservable();
-        this.showContentEdit = this._blockType.asObservablePart((x) => !x?.forceHideContentEditorInOverlay);
+        this.showContentEdit = mergeObservables([this._contentStructureHasProperties, this.forceHideContentEditorInOverlay], ([a, b]) => a === true && b === false);
         this.#firstPropertyType = new UmbObjectState(undefined);
         this.firstPropertyType = this.#firstPropertyType.asObservable();
         this.scaleManager = new UmbBlockGridScaleManager(this);

package/dist-cms/packages/block/block-grid/context/block-grid-manager.context.d.ts

@@ -10,6 +10,9 @@ export declare const UMB_BLOCK_GRID_DEFAULT_LAYOUT_STYLESHEET = "/umbraco/backof
  */
 export declare class UmbBlockGridManagerContext<BlockLayoutType extends UmbBlockGridLayoutModel = UmbBlockGridLayoutModel> extends UmbBlockManagerContext<UmbBlockGridTypeModel, UmbBlockGridLayoutModel, UmbBlockGridWorkspaceOriginData> {
     #private;
+    readonly inlineEditingMode: import("rxjs/internal/Observable").Observable<boolean | undefined>;
+    setInlineEditingMode(inlineEditingMode: boolean | undefined): void;
+    getInlineEditingMode(): boolean | undefined;
     readonly blockGroups: import("rxjs/internal/Observable").Observable<UmbBlockTypeGroup[]>;
     layoutStylesheet: import("rxjs/internal/Observable").Observable<string | undefined>;
     gridColumns: import("rxjs/internal/Observable").Observable<number>;

package/dist-cms/packages/block/block-grid/context/block-grid-manager.context.js

@@ -1,4 +1,4 @@
-import { UmbArrayState, appendToFrozenArray, pushAtToUniqueArray } from '../../../../libs/observable-api/index.js';
+import { UmbArrayState, UmbBooleanState, appendToFrozenArray, pushAtToUniqueArray, } from '../../../../libs/observable-api/index.js';
 import { removeLastSlashFromPath, transformServerPathToClientPath } from '../../../core/utils/index.js';
 import { UMB_APP_CONTEXT } from '../../../../apps/app/index.js';
 import { UmbBlockManagerContext } from '../../block/index.js';
@@ -8,6 +8,13 @@ export const UMB_BLOCK_GRID_DEFAULT_LAYOUT_STYLESHEET = '/umbraco/backoffice/css
  */
 export class UmbBlockGridManagerContext extends UmbBlockManagerContext {
     //
+    #inlineEditingMode;
+    setInlineEditingMode(inlineEditingMode) {
+        this.#inlineEditingMode.setValue(inlineEditingMode ?? false);
+    }
+    getInlineEditingMode() {
+        return this.#inlineEditingMode.getValue();
+    }
     #initAppUrl;
     #appUrl;
     #blockGroups;
@@ -34,6 +41,9 @@ export class UmbBlockGridManagerContext extends UmbBlockManagerContext {
     }
     constructor(host) {
         super(host);
+        //
+        this.#inlineEditingMode = new UmbBooleanState(undefined);
+        this.inlineEditingMode = this.#inlineEditingMode.asObservable();
         this.#blockGroups = new UmbArrayState([], (x) => x.key);
         this.blockGroups = this.#blockGroups.asObservable();
         this.layoutStylesheet = this._editorConfiguration.asObservablePart((x) => {
@@ -117,7 +127,7 @@ export class UmbBlockGridManagerContext extends UmbBlockManagerContext {
     // TODO: Remove dependency on modalData object here. [NL] Maybe change it into requiring the originData object instead.
     insert(layoutEntry, content, settings, originData) {
         this.setOneLayout(layoutEntry, originData);
-        this.insertBlockData(layoutEntry, content, settings);
+        this.insertBlockData(layoutEntry, content, settings, originData);
         return true;
     }
     setOneLayout(layoutEntry, originData) {

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

@@ -30,6 +30,8 @@ let UmbPropertyEditorUIBlockGridElement = class UmbPropertyEditorUIBlockGridElem
         this.#managerContext.setBlockTypes(blocks);
         const blockGroups = config.getValueByAlias('blockGroups') ?? [];
         this.#managerContext.setBlockGroups(blockGroups);
+        const useInlineEditingAsDefault = config.getValueByAlias('useInlineEditingAsDefault');
+        this.#managerContext.setInlineEditingMode(useInlineEditingAsDefault);
         this.style.maxWidth = config.getValueByAlias('maxPropertyWidth') ?? '';
         //config.useLiveEditing, is covered by the EditorConfiguration of context. [NL]
         this.#managerContext.setEditorConfiguration(config);

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

@@ -24,6 +24,7 @@ export interface UmbBlockGridTypeAreaType {
     minAllowed?: number;
     maxAllowed?: number;
     specifiedAllowance?: Array<UmbBlockGridTypeAreaTypePermission>;
+    createLabel?: string;
 }
 export interface UmbBlockGridTypeAreaTypePermission {
     elementTypeKey?: string;

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

@@ -12,7 +12,7 @@ export declare class UmbBlockListEntriesContext extends UmbBlockEntriesContext<t
     getPathForCreateBlock(index: number): string | undefined;
     getPathForClipboard(index: number): string | undefined;
     setLayouts(layouts: Array<UmbBlockListLayoutModel>): Promise<void>;
-    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<UmbBlockListLayoutModel, 'contentKey'>): Promise<{
+    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<UmbBlockListLayoutModel, 'contentKey'>, originData?: UmbBlockListWorkspaceOriginData): Promise<{
         layout: UmbBlockListLayoutModel;
         content: {
             key: string;

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

@@ -32,7 +32,7 @@ export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
         })
             .onSubmit(async (value, data) => {
             if (value?.create && data) {
-                const created = await this.create(value.create.contentElementTypeKey, {});
+                const created = await this.create(value.create.contentElementTypeKey, {}, data.originData);
                 if (created) {
                     this.insert(created.layout, created.content, created.settings, data.originData);
                 }
@@ -87,14 +87,18 @@ export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
         await this._retrieveManager;
         this._manager?.setLayouts(layouts);
     }
-    async create(contentElementTypeKey, partialLayoutEntry) {
+    async create(contentElementTypeKey, partialLayoutEntry, originData) {
         await this._retrieveManager;
-        return this._manager?.create(contentElementTypeKey, partialLayoutEntry);
+        return this._manager?.create(contentElementTypeKey, partialLayoutEntry, originData);
     }
     // insert Block?
     async insert(layoutEntry, content, settings, originData) {
         await this._retrieveManager;
-        return this._manager?.insert(layoutEntry, content, settings, originData) ?? false;
+        const success = this._manager?.insert(layoutEntry, content, settings, originData) ?? false;
+        if (success) {
+            this._manager?.setOneExpose(layoutEntry.contentKey);
+        }
+        return success;
     }
     // create Block?
     async delete(contentKey) {

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

@@ -5,7 +5,7 @@ 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;
     readonly inlineEditingMode: import("rxjs/internal/Observable").Observable<boolean | undefined>;
-    readonly forceHideContentEditorInOverlay: import("rxjs/internal/Observable").Observable<boolean>;
+    readonly forceHideContentEditorInOverlay: import("rxjs/internal/Observable").Observable<boolean | undefined>;
     readonly showContentEdit: import("rxjs/internal/Observable").Observable<boolean>;
     constructor(host: UmbControllerHost);
     _gotManager(): void;

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

@@ -8,9 +8,9 @@ export class UmbBlockListEntryContext extends UmbBlockEntryContext {
         super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT, UMB_BLOCK_LIST_ENTRIES_CONTEXT);
         this.#inlineEditingMode = new UmbBooleanState(undefined);
         this.inlineEditingMode = this.#inlineEditingMode.asObservable();
-        this.forceHideContentEditorInOverlay = this._blockType.asObservablePart((x) => !!x?.forceHideContentEditorInOverlay);
-        this.showContentEdit = mergeObservables([this.forceHideContentEditorInOverlay, this.inlineEditingMode], ([forceHide, inlineMode]) => {
-            return !forceHide && !inlineMode;
+        this.forceHideContentEditorInOverlay = this._blockType.asObservablePart((x) => x ? (x.forceHideContentEditorInOverlay ?? false) : undefined);
+        this.showContentEdit = mergeObservables([this._contentStructureHasProperties, this.forceHideContentEditorInOverlay, this.inlineEditingMode], ([a, b, c]) => {
+            return a === true && b === false && c === false;
         });
     }
     _gotManager() {

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

@@ -10,7 +10,7 @@ export declare class UmbBlockListManagerContext<BlockLayoutType extends UmbBlock
     readonly inlineEditingMode: import("rxjs/internal/Observable").Observable<boolean | undefined>;
     setInlineEditingMode(inlineEditingMode: boolean | undefined): void;
     getInlineEditingMode(): boolean | undefined;
-    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<BlockLayoutType, 'contentKey'>): {
+    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<BlockLayoutType, 'contentKey'>, _originData?: UmbBlockListWorkspaceOriginData): {
         layout: BlockLayoutType;
         content: {
             key: string;

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

@@ -18,12 +18,15 @@ export class UmbBlockListManagerContext extends UmbBlockManagerContext {
     getInlineEditingMode() {
         return this.#inlineEditingMode.getValue();
     }
-    create(contentElementTypeKey, partialLayoutEntry) {
+    create(contentElementTypeKey, partialLayoutEntry, 
+    // This property is used by some implementations, but not used in this. Do not remove. [NL]
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _originData) {
         return super._createBlockData(contentElementTypeKey, partialLayoutEntry);
     }
     insert(layoutEntry, content, settings, originData) {
         this._layouts.appendOneAt(layoutEntry, originData.index ?? -1);
-        this.insertBlockData(layoutEntry, content, settings);
+        this.insertBlockData(layoutEntry, content, settings, originData);
         return true;
     }
 }

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

@@ -12,7 +12,7 @@ export declare class UmbBlockRteEntriesContext extends UmbBlockEntriesContext<ty
     getPathForCreateBlock(): string | undefined;
     getPathForClipboard(): string | undefined;
     setLayouts(layouts: Array<UmbBlockRteLayoutModel>): Promise<void>;
-    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<UmbBlockRteLayoutModel, 'contentKey'>): Promise<{
+    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<UmbBlockRteLayoutModel, 'contentKey'>, originData?: UmbBlockRteWorkspaceOriginData): Promise<{
         layout: UmbBlockRteLayoutModel;
         content: {
             key: string;
@@ -21,6 +21,6 @@ export declare class UmbBlockRteEntriesContext extends UmbBlockEntriesContext<ty
         };
         settings: UmbBlockDataModel | undefined;
     } | undefined>;
-    insert(layoutEntry: UmbBlockRteLayoutModel, content: UmbBlockDataModel, settings: UmbBlockDataModel | undefined): Promise<boolean>;
+    insert(layoutEntry: UmbBlockRteLayoutModel, content: UmbBlockDataModel, settings: UmbBlockDataModel | undefined, originData: UmbBlockRteWorkspaceOriginData): Promise<boolean>;
     delete(contentKey: string): Promise<void>;
 }

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

@@ -32,7 +32,7 @@ export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext {
                 // We can parse an empty object, cause the rest will be filled in by others.
                 {});
                 if (created) {
-                    this.insert(created.layout, created.content, created.settings);
+                    this.insert(created.layout, created.content, created.settings, data.originData);
                 }
                 else {
                     throw new Error('Failed to create block');
@@ -82,14 +82,14 @@ export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext {
         await this._retrieveManager;
         this._manager?.setLayouts(layouts);
     }
-    async create(contentElementTypeKey, partialLayoutEntry) {
+    async create(contentElementTypeKey, partialLayoutEntry, originData) {
         await this._retrieveManager;
-        return this._manager?.create(contentElementTypeKey, partialLayoutEntry);
+        return this._manager?.create(contentElementTypeKey, partialLayoutEntry, originData);
     }
     // insert Block?
-    async insert(layoutEntry, content, settings) {
+    async insert(layoutEntry, content, settings, originData) {
         await this._retrieveManager;
-        return this._manager?.insert(layoutEntry, content, settings) ?? false;
+        return this._manager?.insert(layoutEntry, content, settings, originData) ?? false;
     }
     // create Block?
     async delete(contentKey) {

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

@@ -6,7 +6,7 @@ import type { UmbControllerHost } from '../../../../libs/controller-api/index.js
 export declare class UmbBlockRteEntryContext extends UmbBlockEntryContext<typeof UMB_BLOCK_RTE_MANAGER_CONTEXT, typeof UMB_BLOCK_RTE_MANAGER_CONTEXT.TYPE, typeof UMB_BLOCK_RTE_ENTRIES_CONTEXT, typeof UMB_BLOCK_RTE_ENTRIES_CONTEXT.TYPE, UmbBlockRteTypeModel, UmbBlockRteLayoutModel> {
     readonly displayInline: import("rxjs/internal/Observable").Observable<boolean | undefined>;
     readonly displayInlineConfig: import("rxjs/internal/Observable").Observable<boolean | undefined>;
-    readonly forceHideContentEditorInOverlay: import("rxjs/internal/Observable").Observable<boolean>;
+    readonly forceHideContentEditorInOverlay: import("rxjs/internal/Observable").Observable<boolean | undefined>;
     readonly showContentEdit: import("rxjs/internal/Observable").Observable<boolean>;
     constructor(host: UmbControllerHost);
     _gotManager(): void;

package/dist-cms/packages/block/block-rte/context/block-rte-entry.context.js

@@ -1,14 +1,16 @@
 import { UMB_BLOCK_RTE_MANAGER_CONTEXT } from './block-rte-manager.context-token.js';
 import { UMB_BLOCK_RTE_ENTRIES_CONTEXT } from './block-rte-entries.context-token.js';
 import { UmbBlockEntryContext } from '../../block/index.js';
-import { observeMultiple } from '../../../../libs/observable-api/index.js';
+import { mergeObservables, observeMultiple } from '../../../../libs/observable-api/index.js';
 export class UmbBlockRteEntryContext extends UmbBlockEntryContext {
     constructor(host) {
         super(host, UMB_BLOCK_RTE_MANAGER_CONTEXT, UMB_BLOCK_RTE_ENTRIES_CONTEXT);
         this.displayInline = this._layout.asObservablePart((x) => (x ? (x.displayInline ?? false) : undefined));
         this.displayInlineConfig = this._blockType.asObservablePart((x) => (x ? (x.displayInline ?? false) : undefined));
-        this.forceHideContentEditorInOverlay = this._blockType.asObservablePart((x) => !!x?.forceHideContentEditorInOverlay);
-        this.showContentEdit = this._blockType.asObservablePart((x) => !x?.forceHideContentEditorInOverlay);
+        this.forceHideContentEditorInOverlay = this._blockType.asObservablePart((x) => x ? (x.forceHideContentEditorInOverlay ?? false) : undefined);
+        this.showContentEdit = mergeObservables([this._contentStructureHasProperties, this.forceHideContentEditorInOverlay], ([a, b]) => {
+            return a === true && b === false;
+        });
     }
     _gotManager() { }
     _gotEntries() {

package/dist-cms/packages/block/block-rte/context/block-rte-manager.context.d.ts

@@ -1,3 +1,4 @@
+import type { UmbBlockRteWorkspaceOriginData } from '../workspace/block-rte-workspace.modal-token.js';
 import type { UmbBlockRteLayoutModel, UmbBlockRteTypeModel } from '../types.js';
 import type { UmbBlockDataModel } from '../../block/types.js';
 import { UmbBlockManagerContext } from '../../block/index.js';
@@ -7,7 +8,7 @@ import '../components/block-rte-entry/index.js';
  */
 export declare class UmbBlockRteManagerContext<BlockLayoutType extends UmbBlockRteLayoutModel = UmbBlockRteLayoutModel> extends UmbBlockManagerContext<UmbBlockRteTypeModel, BlockLayoutType> {
     removeOneLayout(contentKey: string): void;
-    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<BlockLayoutType, 'contentKey'>): {
+    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<BlockLayoutType, 'contentKey'>, _originData?: UmbBlockRteWorkspaceOriginData): {
         layout: BlockLayoutType;
         content: {
             key: string;
@@ -16,7 +17,7 @@ export declare class UmbBlockRteManagerContext<BlockLayoutType extends UmbBlockR
         };
         settings: UmbBlockDataModel | undefined;
     };
-    insert(layoutEntry: BlockLayoutType, content: UmbBlockDataModel, settings: UmbBlockDataModel | undefined): boolean;
+    insert(layoutEntry: BlockLayoutType, content: UmbBlockDataModel, settings: UmbBlockDataModel | undefined, originData: UmbBlockRteWorkspaceOriginData): boolean;
     /**
      * @param contentKey
      * @internal

package/dist-cms/packages/block/block-rte/context/block-rte-manager.context.js

@@ -7,7 +7,10 @@ export class UmbBlockRteManagerContext extends UmbBlockManagerContext {
     removeOneLayout(contentKey) {
         this._layouts.removeOne(contentKey);
     }
-    create(contentElementTypeKey, partialLayoutEntry) {
+    create(contentElementTypeKey, partialLayoutEntry, 
+    // This property is used by some implementations, but not used in this, do not remove. [NL]
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _originData) {
         const data = super._createBlockData(contentElementTypeKey, partialLayoutEntry);
         // Find block type.
         const blockType = this.getBlockTypes().find((x) => x.contentElementTypeKey === contentElementTypeKey);
@@ -19,9 +22,9 @@ export class UmbBlockRteManagerContext extends UmbBlockManagerContext {
         }
         return data;
     }
-    insert(layoutEntry, content, settings) {
+    insert(layoutEntry, content, settings, originData) {
         this._layouts.appendOne(layoutEntry);
-        this.insertBlockData(layoutEntry, content, settings);
+        this.insertBlockData(layoutEntry, content, settings, originData);
         return true;
     }
     /**

package/dist-cms/packages/core/collection/extensions/collection-action.extension.d.ts

@@ -3,7 +3,7 @@ import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '../..
  * An action to perform on an entity
  * For example for content you may wish to create a new document etc
  */
-export interface ManifestCollectionAction extends ManifestElementAndApi, ManifestWithDynamicConditions<UmbExtensionCondition> {
+export interface ManifestCollectionAction extends ManifestElementAndApi, ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
     type: 'collectionAction';
     meta: MetaCollectionAction;
 }

package/dist-cms/packages/core/collection/extensions/collection-view.extension.d.ts

@@ -1,5 +1,5 @@
 import type { ManifestElement, ManifestWithDynamicConditions } from '../../../../libs/extension-api/index.js';
-export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions<UmbExtensionCondition> {
+export interface ManifestCollectionView extends ManifestElement, ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
     type: 'collectionView';
     meta: MetaCollectionView;
 }

package/dist-cms/packages/core/collection/extensions/collection.extension.d.ts

@@ -1,5 +1,5 @@
 import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '../../../../libs/extension-api/index.js';
-export interface ManifestCollection extends ManifestElementAndApi, ManifestWithDynamicConditions<UmbExtensionCondition> {
+export interface ManifestCollection extends ManifestElementAndApi, ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
     type: 'collection';
     meta: MetaCollection;
 }

package/dist-cms/packages/core/content-type/structure/content-type-structure-manager.class.d.ts

@@ -16,6 +16,7 @@ export declare class UmbContentTypeStructureManager<T extends UmbContentTypeMode
     readonly contentTypes: import("rxjs/internal/Observable").Observable<T[]>;
     readonly ownerContentType: import("rxjs/internal/Observable").Observable<T | undefined>;
     readonly ownerContentTypeAlias: import("rxjs/internal/Observable").Observable<string | undefined>;
+    readonly ownerContentTypeName: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly ownerContentTypeCompositions: import("rxjs/internal/Observable").Observable<import("../types.js").UmbContentTypeCompositionModel[] | undefined>;
     readonly contentTypeProperties: import("rxjs/internal/Observable").Observable<UmbPropertyTypeModel[]>;
     readonly contentTypeDataTypeUniques: import("rxjs/internal/Observable").Observable<string[]>;

package/dist-cms/packages/core/content-type/structure/content-type-structure-manager.class.js

@@ -27,8 +27,9 @@ export class UmbContentTypeStructureManager extends UmbControllerBase {
         this.#contentTypes = new UmbArrayState([], (x) => x.unique);
         this.contentTypes = this.#contentTypes.asObservable();
         this.ownerContentType = this.#contentTypes.asObservablePart((x) => x.find((y) => y.unique === this.#ownerContentTypeUnique));
-        this.ownerContentTypeAlias = this.#contentTypes.asObservablePart((x) => x.find((y) => y.unique === this.#ownerContentTypeUnique)?.alias);
-        this.ownerContentTypeCompositions = this.#contentTypes.asObservablePart((x) => x.find((y) => y.unique === this.#ownerContentTypeUnique)?.compositions);
+        this.ownerContentTypeAlias = createObservablePart(this.ownerContentType, (x) => x?.alias);
+        this.ownerContentTypeName = createObservablePart(this.ownerContentType, (x) => x?.name);
+        this.ownerContentTypeCompositions = createObservablePart(this.ownerContentType, (x) => x?.compositions);
         this.#contentTypeContainers = this.#contentTypes.asObservablePart((contentTypes) => {
             // Notice this may need to use getValue to avoid resetting it self. [NL]
             return contentTypes.flatMap((x) => x.containers ?? []);

package/dist-cms/packages/core/culture/manifests.d.ts

@@ -1 +1 @@
-export declare const manifests: (import("../collection/types.js").ManifestCollection | import("../modal/types.js").ManifestModal | import("../tree/types.js").ManifestTreeItem | import("../tree/types.js").ManifestTree | import("../collection/types.js").ManifestCollectionAction | import("../collection/types.js").ManifestCollectionView | import("../auth/auth-provider.extension.js").ManifestAuthProvider | import("../extension-registry/index.js").ManifestTypes | import("../workspace/types.js").ManifestWorkspaceActionMenuItem<import("../workspace/types.js").MetaWorkspaceActionMenuItem> | import("../workspace/types.js").ManifestWorkspaceActionMenuItemDefaultKind<import("../workspace/types.js").MetaWorkspaceActionMenuItemDefaultKind> | import("../workspace/types.js").ManifestWorkspaceAction<import("../workspace/types.js").MetaWorkspaceAction> | import("../workspace/types.js").ManifestWorkspaceActionDefaultKind | import("../workspace/types.js").ManifestWorkspaceFooterApp | import("../workspace/types.js").ManifestWorkspaceFooterAppMenuBreadcrumbKind | import("../workspace/types.js").ManifestWorkspaceFooterAppVariantMenuBreadcrumbKind | import("../workspace/types.js").ManifestWorkspaceView<import("../workspace/types.js").MetaWorkspaceView> | import("../workspace/types.js").ManifestWorkspaceViewContentTypeDesignEditorKind | import("../workspace/types.js").ManifestWorkspace<import("../workspace/types.js").MetaWorkspace, import("../../../libs/controller-api/index.js").UmbControllerHostElement, import("../workspace/workspace-context.interface.js").UmbWorkspaceContext> | import("../workspace/types.js").ManifestWorkspaceRoutableKind | import("../workspace/types.js").ManifestWorkspaceContext | (import("../property-editor/index.js").ManifestPropertyEditorSchema | import("../property-editor/index.js").ManifestPropertyEditorUi) | import("../../ufm/index.js").ManifestUfmFilter | import("../../ufm/index.js").ManifestUfmComponent | import("../property/types.js").ManifestPropertyValueResolver | import("../entity-action/entity-action.extension.js").ManifestEntityAction<import("../entity-action/entity-action.extension.js").MetaEntityAction> | import("../entity-action/index.js").ManifestEntityActionDefaultKind | import("../entity-action/common/delete/types.js").ManifestEntityActionDeleteKind | import("../tree/entity-actions/reload-tree-item-children/types.js").ManifestEntityActionReloadTreeItemChildrenKind | (import("../section/types.js").ManifestSectionSidebarApp | import("../section/types.js").ManifestSection | import("../section/types.js").ManifestSectionRoute | import("../section/types.js").ManifestSectionView) | import("../dashboard/dashboard.extension.js").ManifestDashboard | import("../menu/menu.extension.js").ManifestMenu | import("../menu/menu-item.extension.js").ManifestMenuItem | import("../menu/index.js").ManifestMenuItemLinkKind | import("../tree/index.js").ManifestMenuItemTreeKind | import("../tree/index.js").ManifestEntityActionCreateFolderKind | import("../tree/index.js").ManifestEntityActionDeleteFolderKind | import("../tree/index.js").ManifestEntityActionUpdateFolderKind | import("../tree/index.js").ManifestEntityActionSortChildrenOfKind | import("../tree/index.js").ManifestEntityActionMoveToKind | import("../tree/index.js").ManifestEntityActionDuplicateToKind | import("../icon-registry/index.js").ManifestIcons | import("../recycle-bin/index.js").ManifestEntityActionTrashKind | import("../recycle-bin/index.js").ManifestEntityActionRestoreFromRecycleBinKind | import("../recycle-bin/index.js").ManifestEntityActionEmptyRecycleBinKind | import("../../search/index.js").ManifestSearchProvider | import("../../search/index.js").ManifestSearchResultItem | import("../picker/index.js").ManifestPickerSearchResultItem | import("../extension-registry/index.js").ManifestAppEntryPoint | import("../extension-registry/index.js").ManifestBackofficeEntryPoint | import("../extension-registry/index.js").ManifestEntryPoint | import("../extension-registry/index.js").UmbEntityBulkActionExtensions | import("../extension-registry/index.js").ManifestExternalLoginProvider | import("../extension-registry/index.js").ManifestGlobalContext | import("../extension-registry/index.js").ManifestHeaderApp | import("../extension-registry/index.js").ManifestHeaderAppButtonKind | import("../extension-registry/index.js").ManifestMfaLoginProvider | import("../extension-registry/index.js").ManifestPreviewAppProvider | import("../extension-registry/index.js").ManifestRepository<import("../../../libs/extension-api/index.js").UmbApi> | import("../extension-registry/index.js").UmbStoreExtensions | import("../collection/workspace-view/types.js").ManifestWorkspaceViewCollectionKind | import("../localization/index.js").ManifestLocalization | import("../property-action/index.js").UmbPropertyActionExtensions | import("../../user/current-user/index.js").ManifestCurrentUserAction<import("../../user/current-user/index.js").MetaCurrentUserAction> | import("../../media/media/index.js").ManifestFileUploadPreview | import("../../user/current-user/index.js").ManifestUserProfileApp | import("../server-file-system/index.js").ManifestEntityActionRenameServerFileKind | import("../themes/theme.extension.js").ManifestTheme | import("../workspace/kinds/default/types.js").ManifestWorkspaceDefaultKind | import("../../block/block-custom-view/index.js").ManifestBlockEditorCustomView | import("../../user/user-permission/index.js").ManifestEntityUserPermission | import("../../user/user-permission/index.js").ManifestGranularUserPermission | import("../../health-check/index.js").ManifestHealthCheck | import("../../tiny-mce/index.js").ManifestTinyMcePlugin | import("../../packages/package/index.js").ManifestPackageView | import("src/packages/property-editors/content-picker/index.js").ManifestDynamicRootOrigin | import("src/packages/property-editors/content-picker/index.js").ManifestDynamicRootQueryStep | import("../../tiptap/index.js").ManifestTiptapToolbarExtension<import("../../tiptap/index.js").MetaTiptapToolbarExtension> | import("../../tiptap/index.js").ManifestTiptapToolbarExtensionButtonKind<import("../../tiptap/index.js").MetaTiptapToolbarExtension> | import("../../tiptap/index.js").ManifestTiptapExtension<import("../../tiptap/index.js").MetaTiptapExtension> | import("../../markdown-editor/index.js").ManifestMonacoMarkdownEditorAction | import("../content/collection/types.js").ManifestWorkspaceViewContentCollectionKind)[];
+export declare const manifests: (import("../collection/types.js").ManifestCollection | import("../modal/types.js").ManifestModal | import("../tree/types.js").ManifestTreeItem | import("../tree/types.js").ManifestTree | import("../collection/types.js").ManifestCollectionAction | import("../collection/types.js").ManifestCollectionView | import("../auth/auth-provider.extension.js").ManifestAuthProvider | import("../extension-registry/index.js").ManifestTypes | import("../workspace/types.js").ManifestWorkspaceActionMenuItem<import("../workspace/types.js").MetaWorkspaceActionMenuItem> | import("../workspace/types.js").ManifestWorkspaceActionMenuItemDefaultKind<import("../workspace/types.js").MetaWorkspaceActionMenuItemDefaultKind> | import("../workspace/types.js").ManifestWorkspaceAction<import("../workspace/types.js").MetaWorkspaceAction> | import("../workspace/types.js").ManifestWorkspaceActionDefaultKind | import("../workspace/types.js").ManifestWorkspaceFooterApp | import("../workspace/types.js").ManifestWorkspaceFooterAppMenuBreadcrumbKind | import("../workspace/types.js").ManifestWorkspaceFooterAppVariantMenuBreadcrumbKind | import("../workspace/types.js").ManifestWorkspaceView<import("../workspace/types.js").MetaWorkspaceView> | import("../workspace/types.js").ManifestWorkspaceViewContentTypeDesignEditorKind | import("../workspace/types.js").ManifestWorkspace<import("../workspace/types.js").MetaWorkspace, import("../../../libs/controller-api/index.js").UmbControllerHostElement, import("../workspace/workspace-context.interface.js").UmbWorkspaceContext> | import("../workspace/types.js").ManifestWorkspaceRoutableKind | import("../workspace/types.js").ManifestWorkspaceContext | (import("../property-editor/index.js").ManifestPropertyEditorSchema | import("../property-editor/index.js").ManifestPropertyEditorUi) | import("../../ufm/index.js").ManifestUfmFilter | import("../../ufm/index.js").ManifestUfmComponent | import("../property/types.js").ManifestPropertyValueResolver | import("../entity-action/entity-action.extension.js").ManifestEntityAction<import("../entity-action/entity-action.extension.js").MetaEntityAction> | import("../entity-action/index.js").ManifestEntityActionDefaultKind | import("../entity-action/common/delete/types.js").ManifestEntityActionDeleteKind | import("../tree/entity-actions/reload-tree-item-children/types.js").ManifestEntityActionReloadTreeItemChildrenKind | (import("../section/types.js").ManifestSectionSidebarApp | import("../section/types.js").ManifestSection | import("../section/types.js").ManifestSectionRoute | import("../section/types.js").ManifestSectionView) | import("../dashboard/dashboard.extension.js").ManifestDashboard | import("../menu/menu.extension.js").ManifestMenu | import("../menu/menu-item.extension.js").ManifestMenuItem | import("../menu/index.js").ManifestMenuItemLinkKind | import("../tree/index.js").ManifestMenuItemTreeKind | import("../tree/index.js").ManifestEntityActionCreateFolderKind | import("../tree/index.js").ManifestEntityActionDeleteFolderKind | import("../tree/index.js").ManifestEntityActionUpdateFolderKind | import("../tree/index.js").ManifestEntityActionSortChildrenOfKind | import("../tree/index.js").ManifestEntityActionMoveToKind | import("../tree/index.js").ManifestEntityActionDuplicateToKind | import("../icon-registry/index.js").ManifestIcons | import("../recycle-bin/index.js").ManifestEntityActionTrashKind | import("../recycle-bin/index.js").ManifestEntityActionRestoreFromRecycleBinKind | import("../recycle-bin/index.js").ManifestEntityActionEmptyRecycleBinKind | import("../collection/workspace-view/types.js").ManifestWorkspaceViewCollectionKind | import("../extension-registry/index.js").UmbEntityBulkActionExtensions | import("../localization/index.js").ManifestLocalization | import("../../search/index.js").ManifestSearchProvider | import("../../search/index.js").ManifestSearchResultItem | import("../picker/index.js").ManifestPickerSearchResultItem | import("../property-action/index.js").UmbPropertyActionExtensions | import("../../user/current-user/index.js").ManifestCurrentUserAction<import("../../user/current-user/index.js").MetaCurrentUserAction> | import("../../media/media/index.js").ManifestFileUploadPreview | import("../../user/current-user/index.js").ManifestUserProfileApp | import("../server-file-system/index.js").ManifestEntityActionRenameServerFileKind | import("../themes/theme.extension.js").ManifestTheme | import("../workspace/kinds/default/types.js").ManifestWorkspaceDefaultKind | import("../../block/block-custom-view/index.js").ManifestBlockEditorCustomView | import("../../user/user-permission/index.js").ManifestEntityUserPermission | import("../../user/user-permission/index.js").ManifestGranularUserPermission | import("../../health-check/index.js").ManifestHealthCheck | import("../../tiny-mce/index.js").ManifestTinyMcePlugin | import("../../packages/package/index.js").ManifestPackageView | import("src/packages/property-editors/content-picker/index.js").ManifestDynamicRootOrigin | import("src/packages/property-editors/content-picker/index.js").ManifestDynamicRootQueryStep | import("../../tiptap/index.js").ManifestTiptapToolbarExtension<import("../../tiptap/index.js").MetaTiptapToolbarExtension> | import("../../tiptap/index.js").ManifestTiptapToolbarExtensionButtonKind<import("../../tiptap/index.js").MetaTiptapToolbarExtension> | import("../../tiptap/index.js").ManifestTiptapExtension<import("../../tiptap/index.js").MetaTiptapExtension> | import("../extension-registry/index.js").ManifestAppEntryPoint | import("../extension-registry/index.js").ManifestBackofficeEntryPoint | import("../extension-registry/index.js").ManifestEntryPoint | import("../extension-registry/index.js").ManifestExternalLoginProvider | import("../extension-registry/index.js").ManifestGlobalContext | import("../extension-registry/index.js").ManifestHeaderApp | import("../extension-registry/index.js").ManifestHeaderAppButtonKind | import("../extension-registry/index.js").ManifestMfaLoginProvider | import("../extension-registry/index.js").ManifestPreviewAppProvider | import("../extension-registry/index.js").ManifestRepository<import("../../../libs/extension-api/index.js").UmbApi> | import("../extension-registry/index.js").UmbStoreExtensions | import("../../markdown-editor/index.js").ManifestMonacoMarkdownEditorAction | import("../content/collection/types.js").ManifestWorkspaceViewContentCollectionKind)[];

package/dist-cms/packages/core/dashboard/dashboard.extension.d.ts

@@ -1,6 +1,6 @@
 import type { UmbDashboardElement } from './dashboard-element.interface.js';
 import type { ManifestElement, ManifestWithDynamicConditions } from '../../../libs/extension-api/index.js';
-export interface ManifestDashboard extends ManifestElement<UmbDashboardElement>, ManifestWithDynamicConditions<UmbExtensionCondition> {
+export interface ManifestDashboard extends ManifestElement<UmbDashboardElement>, ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
     type: 'dashboard';
     meta: MetaDashboard;
 }

package/dist-cms/packages/core/entity-action/entity-action.extension.d.ts

@@ -4,7 +4,7 @@ import type { UmbEntityAction, UmbEntityActionElement } from './index.js';
  * An action to perform on an entity
  * For example for content you may wish to create a new document etc
  */
-export interface ManifestEntityAction<MetaType extends MetaEntityAction = MetaEntityAction> extends ManifestElementAndApi<UmbEntityActionElement, UmbEntityAction<MetaType>>, ManifestWithDynamicConditions<UmbExtensionCondition> {
+export interface ManifestEntityAction<MetaType extends MetaEntityAction = MetaEntityAction> extends ManifestElementAndApi<UmbEntityActionElement, UmbEntityAction<MetaType>>, ManifestWithDynamicConditions<UmbExtensionConditionConfig> {
     type: 'entityAction';
     forEntityTypes: Array<string>;
     meta: MetaType;

package/dist-cms/packages/core/extension-registry/conditions/index.d.ts

@@ -1,3 +1,3 @@
 export { UmbSwitchCondition } from './switch.condition.js';
 export { UmbConditionBase } from './condition-base.controller.js';
-export type { ConditionTypes } from './types.js';
+export type { UmbCoreConditionConfigs } from './types.js';