@umbraco-cms/backoffice 17.1.0 → 17.2.0-rc

package/dist-cms/libs/extension-api/functions/load-manifest-api.function.js

@@ -10,7 +10,7 @@ export async function loadManifestApi(property) {
             return property;
         }
         else {
-            // Promise function
+            // Promise function (dynamic import)
             const result = await property();
             if (typeof result === 'object' && result != null) {
                 const exportValue = ('api' in result ? result.api : undefined) ||
@@ -31,5 +31,13 @@ export async function loadManifestApi(property) {
             }
         }
     }
+    else if (propType === 'object' && property !== null) {
+        // Already resolved module object (statically imported)
+        const result = property;
+        const exportValue = ('api' in result ? result.api : undefined) || ('default' in result ? result.default : undefined);
+        if (exportValue && typeof exportValue === 'function') {
+            return exportValue;
+        }
+    }
     return undefined;
 }

package/dist-cms/libs/extension-api/functions/load-manifest-element.function.js

@@ -10,7 +10,7 @@ export async function loadManifestElement(property) {
             return property;
         }
         else {
-            // Promise function
+            // Promise function (dynamic import)
             const result = await property();
             if (typeof result === 'object' && result !== null) {
                 const exportValue = ('element' in result ? result.element : undefined) ||
@@ -32,5 +32,13 @@ export async function loadManifestElement(property) {
             }
         }
     }
+    else if (propType === 'object' && property !== null) {
+        // Already resolved module object (statically imported)
+        const result = property;
+        const exportValue = ('element' in result ? result.element : undefined) || ('default' in result ? result.default : undefined);
+        if (exportValue && typeof exportValue === 'function') {
+            return exportValue;
+        }
+    }
     return undefined;
 }

package/dist-cms/libs/extension-api/functions/load-manifest-plain-js.function.d.ts

@@ -1,6 +1,6 @@
-import type { JsLoaderProperty } from '../types/utils.js';
+import type { JsLoaderPromise } from '../types/utils.js';
 /**
  *
  * @param property
  */
-export declare function loadManifestPlainJs<JsType>(property: JsLoaderProperty<JsType>): Promise<JsType | undefined>;
+export declare function loadManifestPlainJs<JsType>(property: string | JsLoaderPromise<JsType> | JsType): Promise<JsType | undefined>;

package/dist-cms/libs/extension-api/functions/load-manifest-plain-js.function.js

@@ -3,20 +3,23 @@
  * @param property
  */
 export async function loadManifestPlainJs(property) {
-    const propType = typeof property;
-    if (propType === 'function') {
-        // Promise function
+    if (typeof property === 'function') {
+        // Promise function (dynamic import)
         const result = await property();
         if (typeof result === 'object' && result != null) {
             return result;
         }
     }
-    else if (propType === 'string') {
+    else if (typeof property === 'string') {
         // Import string
         const result = await import(/* @vite-ignore */ property);
         if (typeof result === 'object' && result != null) {
             return result;
         }
     }
+    else if (typeof property === 'object' && property != null) {
+        // Already resolved module object (statically imported)
+        return property;
+    }
     return undefined;
 }

package/dist-cms/libs/extension-api/package.json

@@ -0,0 +1,8 @@
+{
+    "name": "@umbraco-backoffice-lib/extension-api",
+    "private": true,
+    "type": "module",
+    "scripts": {
+        "build": "vite build"
+    }
+}

package/dist-cms/libs/extension-api/types/utils.d.ts

@@ -30,7 +30,7 @@ export type ElementLoaderPromise<ElementType extends HTMLElement = HTMLElement>
 export type ApiLoaderPromise<ApiType extends UmbApi = UmbApi> = () => Promise<ApiLoaderExports<ApiType>>;
 export type ElementAndApiLoaderPromise<ElementType extends HTMLElement = HTMLElement, ApiType extends UmbApi = UmbApi> = () => Promise<ElementAndApiLoaderExports<ElementType, ApiType>>;
 export type CssLoaderProperty<CssType extends string = string> = string | CssLoaderPromise<CssType>;
-export type JsLoaderProperty<JsExportType> = string | JsLoaderPromise<JsExportType>;
-export type ElementLoaderProperty<ElementType extends HTMLElement = HTMLElement> = string | ElementLoaderPromise<ElementType> | ClassConstructor<ElementType>;
-export type ApiLoaderProperty<ApiType extends UmbApi = UmbApi> = string | ApiLoaderPromise<ApiType> | ClassConstructor<ApiType>;
-export type ElementAndApiLoaderProperty<ElementType extends HTMLElement = HTMLElement, ApiType extends UmbApi = UmbApi> = string | ElementAndApiLoaderPromise<ElementType, ApiType> | ElementLoaderPromise<ElementType> | ApiLoaderPromise<ApiType>;
+export type JsLoaderProperty<JsExportType> = string | JsLoaderPromise<JsExportType> | (JsExportType extends object ? JsExportType : never);
+export type ElementLoaderProperty<ElementType extends HTMLElement = HTMLElement> = string | ElementLoaderPromise<ElementType> | ElementLoaderExports<ElementType> | ClassConstructor<ElementType>;
+export type ApiLoaderProperty<ApiType extends UmbApi = UmbApi> = string | ApiLoaderPromise<ApiType> | ApiLoaderExports<ApiType> | ClassConstructor<ApiType>;
+export type ElementAndApiLoaderProperty<ElementType extends HTMLElement = HTMLElement, ApiType extends UmbApi = UmbApi> = string | ElementAndApiLoaderPromise<ElementType, ApiType> | ElementAndApiLoaderExports<ElementType, ApiType> | ElementLoaderPromise<ElementType> | ElementLoaderExports<ElementType> | ApiLoaderPromise<ApiType> | ApiLoaderExports<ApiType>;

package/dist-cms/libs/extension-api/vite.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vite").UserConfig;
+export default _default;

package/dist-cms/libs/extension-api/vite.config.js

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base.js';
+const dist = '../../../dist-cms/libs/extension-api';
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+export default defineConfig({
+    ...getDefaultConfig({
+        dist,
+        base: '/umbraco/backoffice/libs/extension-api',
+        entry: {
+            index: './index.ts',
+        },
+    }),
+});

package/dist-cms/libs/localization-api/package.json

@@ -0,0 +1,8 @@
+{
+    "name": "@umbraco-backoffice-lib/localization-api",
+    "private": true,
+    "type": "module",
+    "scripts": {
+        "build": "vite build"
+    }
+}

package/dist-cms/libs/localization-api/vite.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vite").UserConfig;
+export default _default;

package/dist-cms/libs/localization-api/vite.config.js

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base.js';
+const dist = '../../../dist-cms/libs/localization-api';
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+export default defineConfig({
+    ...getDefaultConfig({
+        dist,
+        base: '/umbraco/backoffice/libs/localization-api',
+        entry: {
+            index: './index.ts',
+        },
+    }),
+});

package/dist-cms/libs/observable-api/package.json

@@ -0,0 +1,8 @@
+{
+    "name": "@umbraco-backoffice-lib/observable-api",
+    "private": true,
+    "type": "module",
+    "scripts": {
+        "build": "vite build"
+    }
+}

package/dist-cms/libs/observable-api/vite.config.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("vite").UserConfig;
+export default _default;

package/dist-cms/libs/observable-api/vite.config.js

@@ -0,0 +1,15 @@
+import { defineConfig } from 'vite';
+import { rmSync } from 'fs';
+import { getDefaultConfig } from '../../vite-config-base.js';
+const dist = '../../../dist-cms/libs/observable-api';
+// delete the unbundled dist folder
+rmSync(dist, { recursive: true, force: true });
+export default defineConfig({
+    ...getDefaultConfig({
+        dist,
+        base: '/umbraco/backoffice/libs/observable-api',
+        entry: {
+            index: './index.ts',
+        },
+    }),
+});

package/dist-cms/packages/block/block/conditions/manifests.js

@@ -1,20 +1,23 @@
+import UmbBlockEntryShowContentEditCondition from './block-entry-show-content-edit.condition.js';
+import UmbBlockWorkspaceHasSettingsCondition from './block-workspace-has-settings.condition.js';
+import UmbBlockEntryIsExposedCondition from './block-workspace-is-exposed.condition.js';
 export const manifests = [
     {
         type: 'condition',
         name: 'Block Has Settings Condition',
         alias: 'Umb.Condition.BlockWorkspaceHasSettings',
-        api: () => import('./block-workspace-has-settings.condition.js'),
+        api: UmbBlockWorkspaceHasSettingsCondition,
     },
     {
         type: 'condition',
         name: 'Block Show Content Edit Condition',
         alias: 'Umb.Condition.BlockEntryShowContentEdit',
-        api: () => import('./block-entry-show-content-edit.condition.js'),
+        api: UmbBlockEntryShowContentEditCondition,
     },
     {
         type: 'condition',
         name: 'Block Workspace Is Exposed Condition',
         alias: 'Umb.Condition.BlockWorkspaceIsExposed',
-        api: () => import('./block-workspace-is-exposed.condition.js'),
+        api: UmbBlockEntryIsExposedCondition,
     },
 ];

package/dist-cms/packages/block/block/modals/block-catalogue/block-catalogue-modal.element.js

@@ -75,7 +75,7 @@ let UmbBlockCatalogueModalElement = class UmbBlockCatalogueModalElement extends
         const blockGroups = this.data?.blockGroups ?? [];
         const noGroupBlocks = blocks.filter((block) => !blockGroups.find((group) => group.key === block.groupKey));
         const grouped = blockGroups.map((group) => ({
-            name: group.name,
+            name: this.localize.string(group.name),
             blocks: blocks.filter((block) => block.groupKey === group.key),
         }));
         this._groupedBlocks = [{ blocks: noGroupBlocks }, ...grouped];

package/dist-cms/packages/block/block/workspace/block-element-property-dataset.context.js

@@ -1,4 +1,3 @@
-import { UMB_BLOCK_WORKSPACE_CONTEXT } from './block-workspace.context-token.js';
 import { UmbElementPropertyDatasetContext } from '../../../content/content/index.js';
 import { createObservablePart } from '../../../../libs/observable-api/index.js';
 export class UmbBlockElementPropertyDatasetContext extends UmbElementPropertyDatasetContext {
@@ -10,10 +9,5 @@ export class UmbBlockElementPropertyDatasetContext extends UmbElementPropertyDat
         this.getName = elementManager.getName;
         this.culture = createObservablePart(elementManager.variantId, (v) => v?.culture);
         this.segment = createObservablePart(elementManager.variantId, (v) => v?.segment);
-        this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspace) => {
-            this.observe(workspace?.readOnlyGuard.isPermittedForVariant(elementManager.getVariantId()), (isReadOnly) => {
-                this._readOnly.setValue(isReadOnly ?? false);
-            }, 'umbObserveReadOnlyStates');
-        });
     }
 }

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.d.ts

@@ -8,6 +8,7 @@ import type { UmbWorkspaceViewElement } from '../../../../../core/workspace/inde
  */
 export declare class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement {
     #private;
+    private _hasRootProperties;
     private _hasRootGroups;
     private _tabs?;
     private _activeTabKey?;

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js

@@ -20,7 +20,7 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
     #tabsStructureHelper;
     constructor() {
         super();
-        // private _hasRootProperties = false;
+        this._hasRootProperties = false;
         this._hasRootGroups = false;
         this.#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
         this.#tabsStructureHelper.setIsRoot(true);
@@ -29,7 +29,10 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
             this._tabs = tabs;
             this.#checkDefaultTabName();
         });
-        // _hasRootProperties can be gotten via _tabsStructureHelper.hasProperties. But we do not support root properties currently.
+        this.observe(this.#tabsStructureHelper.hasProperties, (hasRootProperties) => {
+            this._hasRootProperties = hasRootProperties;
+            this.#checkDefaultTabName();
+        }, 'observeRootProperties');
         this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (context) => {
             this.#blockWorkspace = context;
             this.#tabsStructureHelper.setStructureManager(context?.content.structure);
@@ -49,7 +52,7 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
             return;
         // Find the default tab to grab
         if (this._activeTabKey === undefined) {
-            if (this._hasRootGroups) {
+            if (this._hasRootGroups || this._hasRootProperties) {
                 this._activeTabKey = null;
             }
             else if (this._tabs.length > 0) {
@@ -65,9 +68,9 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
         if (!this._tabs)
             return;
         return html `
-			${this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups)
+			${this._tabs.length > 1 || (this._tabs.length === 1 && (this._hasRootGroups || this._hasRootProperties))
             ? html `<uui-tab-group slot="header">
-						${this._hasRootGroups && this._tabs.length > 0
+						${(this._hasRootGroups || this._hasRootProperties) && this._tabs.length > 0
                 ? html `<uui-tab
 									label=${this.localize.term('general_generic')}
 									.active=${this._activeTabKey === null}
@@ -109,6 +112,9 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
 		`,
     ]; }
 };
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_hasRootProperties", void 0);
 __decorate([
     state()
 ], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_hasRootGroups", void 0);

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.d.ts

@@ -4,6 +4,7 @@ export declare class UmbBlockWorkspaceViewEditElement extends UmbLitElement impl
     #private;
     set manifest(value: ManifestWorkspaceView | undefined);
     get manifest(): ManifestWorkspaceView | undefined;
+    private _hasRootProperties;
     private _hasRootGroups;
     private _routes;
     private _tabs?;

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.js

@@ -24,8 +24,7 @@ let UmbBlockWorkspaceViewEditElement = class UmbBlockWorkspaceViewEditElement ex
     constructor() {
         super();
         this.#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
-        //@state()
-        //private _hasRootProperties = false;
+        this._hasRootProperties = false;
         this._hasRootGroups = false;
         this._routes = [];
         this._activePath = '';
@@ -35,7 +34,10 @@ let UmbBlockWorkspaceViewEditElement = class UmbBlockWorkspaceViewEditElement ex
             this._tabs = tabs;
             this.#createRoutes();
         }, null);
-        // _hasRootProperties can be gotten via _tabsStructureHelper.hasProperties. But we do not support root properties currently.
+        this.observe(this.#tabsStructureHelper.hasProperties, (hasRootProperties) => {
+            this._hasRootProperties = hasRootProperties;
+            this.#createRoutes();
+        }, 'observeRootProperties');
         this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => {
             this.#blockWorkspace = workspaceContext;
             this.#setStructureManager();
@@ -74,7 +76,7 @@ let UmbBlockWorkspaceViewEditElement = class UmbBlockWorkspaceViewEditElement ex
                 });
             });
         }
-        if (this._hasRootGroups) {
+        if (this._hasRootGroups || this._hasRootProperties) {
             routes.push({
                 path: '',
                 component: () => import('./block-workspace-view-edit-tab.element.js'),
@@ -104,9 +106,9 @@ let UmbBlockWorkspaceViewEditElement = class UmbBlockWorkspaceViewEditElement ex
             return;
         return html `
 			<umb-body-layout header-fit-height>
-				${this._routerPath && (this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups))
+				${this._routerPath && (this._tabs.length > 1 || (this._tabs.length === 1 && (this._hasRootGroups || this._hasRootProperties)))
             ? html ` <uui-tab-group slot="header">
-							${this._hasRootGroups && this._tabs.length > 0
+							${(this._hasRootGroups || this._hasRootProperties) && this._tabs.length > 0
                 ? html `
 										<uui-tab
 											label="Content"
@@ -154,6 +156,9 @@ let UmbBlockWorkspaceViewEditElement = class UmbBlockWorkspaceViewEditElement ex
 __decorate([
     property({ attribute: false })
 ], UmbBlockWorkspaceViewEditElement.prototype, "manifest", null);
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditElement.prototype, "_hasRootProperties", void 0);
 __decorate([
     state()
 ], UmbBlockWorkspaceViewEditElement.prototype, "_hasRootGroups", void 0);

package/dist-cms/packages/block/block-grid/components/block-grid-area/block-grid-area.element.d.ts

@@ -3,13 +3,13 @@ import { UmbBlockGridEntriesElement } from '../block-grid-entries/block-grid-ent
  * @description
  * This element is used to render a single block grid area.
  */
-export declare class UmbBlockGridAreasContainerElement extends UmbBlockGridEntriesElement {
+export declare class UmbBlockGridAreaElement extends UmbBlockGridEntriesElement {
     constructor();
     connectedCallback(): void;
 }
-export default UmbBlockGridAreasContainerElement;
+export default UmbBlockGridAreaElement;
 declare global {
     interface HTMLElementTagNameMap {
-        'umb-block-grid-area': UmbBlockGridAreasContainerElement;
+        'umb-block-grid-area': UmbBlockGridAreaElement;
     }
 }

package/dist-cms/packages/block/block-grid/components/block-grid-area/block-grid-area.element.js

@@ -11,7 +11,7 @@ import { customElement } from '../../../../../external/lit/index.js';
  * @description
  * This element is used to render a single block grid area.
  */
-let UmbBlockGridAreasContainerElement = class UmbBlockGridAreasContainerElement extends UmbBlockGridEntriesElement {
+let UmbBlockGridAreaElement = class UmbBlockGridAreaElement extends UmbBlockGridEntriesElement {
     //
     constructor() {
         super();
@@ -27,8 +27,8 @@ let UmbBlockGridAreasContainerElement = class UmbBlockGridAreasContainerElement
         this.classList.add('umb-block-grid__area');
     }
 };
-UmbBlockGridAreasContainerElement = __decorate([
+UmbBlockGridAreaElement = __decorate([
     customElement('umb-block-grid-area')
-], UmbBlockGridAreasContainerElement);
-export { UmbBlockGridAreasContainerElement };
-export default UmbBlockGridAreasContainerElement;
+], UmbBlockGridAreaElement);
+export { UmbBlockGridAreaElement };
+export default UmbBlockGridAreaElement;

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

@@ -441,12 +441,16 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
         const layoutEntries = this._layoutEntries.getValue();
         this.#invalidBlockTypeLimits = areaType.specifiedAllowance
             .map((rule) => {
+            if (!this._manager) {
+                // There is no manager at this point so we cannot validate, this is properly in a very early or a deconstruction phase.
+                return undefined;
+            }
             const minAllowed = rule.minAllowed || 0;
             const maxAllowed = rule.maxAllowed || 0;
             // For block groups:
             if (rule.groupKey) {
                 const groupElementTypeKeys = this._manager
-                    ?.getBlockTypes()
+                    .getBlockTypes()
                     .filter((blockType) => blockType.groupKey === rule.groupKey && blockType.allowInAreas === true)
                     .map((x) => x.contentElementTypeKey) ?? [];
                 const groupAmount = layoutEntries.filter((entry) => {

package/dist-cms/packages/block/block-grid/property-editors/block-grid-area-type-permission/block-grid-area-type-permission.element.js

@@ -142,7 +142,7 @@ let UmbPropertyEditorUIBlockGridAreaTypePermissionElement = class UmbPropertyEdi
     #renderBlockGroups(area) {
         return repeat(this._blockGroups, (group) => group.key, (group) => html `<uui-combobox-list-option .value=${group.key} ?selected=${area.groupKey === group.key}>
 					<umb-icon name="icon-folder"></umb-icon>
-					${group.name}
+					${this.localize.string(group.name)}
 				</uui-combobox-list-option>`);
     }
     #renderBlockTypes(area) {
@@ -150,7 +150,7 @@ let UmbPropertyEditorUIBlockGridAreaTypePermissionElement = class UmbPropertyEdi
 					.value=${block.type.contentElementTypeKey}
 					?selected=${area.elementTypeKey === block.type.contentElementTypeKey}>
 					<umb-icon name=${block.icon}></umb-icon>
-					${block.name}
+					${this.localize.string(block.name)}
 				</uui-combobox-list-option>`);
     }
     static { this.styles = [

package/dist-cms/packages/block/block-list/property-editors/block-list-editor/manifests.js

@@ -15,12 +15,6 @@ const propertyEditorUi = {
         supportsReadOnly: true,
         settings: {
             properties: [
-                {
-                    alias: 'useSingleBlockMode',
-                    label: 'Single block mode',
-                    description: 'When in Single block mode, the output will be BlockListItem<>, instead of BlockListModel.\n\n**NOTE:**\nSingle block mode requires a maximum of one available block, and an amount set to minimum 1 and maximum 1 blocks.',
-                    propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle',
-                },
                 {
                     alias: 'useLiveEditing',
                     label: 'Live editing mode',
@@ -39,6 +33,12 @@ const propertyEditorUi = {
                     description: 'Optional CSS override, example: 800px or 100%',
                     propertyEditorUiAlias: 'Umb.PropertyEditorUi.TextBox',
                 },
+                {
+                    alias: 'useSingleBlockMode',
+                    label: 'Single block mode',
+                    description: '_Deprecated: Use the Property Editor "Single Block" instead._',
+                    propertyEditorUiAlias: 'Umb.PropertyEditorUi.Toggle',
+                },
             ],
         },
     },

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

@@ -184,7 +184,12 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         this.observe(this.#managerContext.isSortMode, (isSortMode) => (this._isSortMode = isSortMode ?? false));
         this.addValidator('rangeUnderflow', () => this.localize.term('validation_entriesShort', this._limitMin, (this._limitMin ?? 0) - this.#entriesContext.getLength()), () => !!this._limitMin && this.#entriesContext.getLength() < this._limitMin);
         this.addValidator('rangeOverflow', () => this.localize.term('validation_entriesExceed', this._limitMax, this.#entriesContext.getLength() - (this._limitMax || 0)), () => !!this._limitMax && this.#entriesContext.getLength() > this._limitMax);
-        this.addValidator('valueMissing', () => this.mandatoryMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, () => !!this.mandatory && this.#entriesContext.getLength() === 0);
+        this.addValidator('valueMissing', () => this.mandatoryMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, () => {
+            if (!this.mandatory || this.readonly)
+                return false;
+            const count = this.value?.layout?.[UMB_BLOCK_LIST_PROPERTY_EDITOR_SCHEMA_ALIAS]?.length ?? 0;
+            return count === 0;
+        });
         this.observe(this.#entriesContext.layoutEntries, (layouts) => {
             this._layouts = layouts;
             // Update sorter.

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

@@ -4,6 +4,7 @@ import { UMB_BLOCK_RTE_ENTRIES_CONTEXT } from './block-rte-entries.context-token
 import { UmbBlockEntryContext } from '../../block/index.js';
 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> {
+    /** @deprecated Use `displayInlineConfig` instead. This field will be removed in Umbraco 19. [LK] */
     readonly displayInline: import("rxjs").Observable<boolean | undefined>;
     readonly displayInlineConfig: import("rxjs").Observable<boolean | undefined>;
     readonly forceHideContentEditorInOverlay: import("rxjs").Observable<boolean | undefined>;

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

@@ -1,10 +1,11 @@
 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 { mergeObservables, observeMultiple } from '../../../../libs/observable-api/index.js';
+import { mergeObservables } 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);
+        /** @deprecated Use `displayInlineConfig` instead. This field will be removed in Umbraco 19. [LK] */
         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 ? (x.forceHideContentEditorInOverlay ?? false) : undefined);
@@ -13,19 +14,6 @@ export class UmbBlockRteEntryContext extends UmbBlockEntryContext {
         });
     }
     _gotManager() { }
-    _gotEntries() {
-        // Secure displayInline fits configuration:
-        this.observe(observeMultiple([this.displayInline, this.displayInlineConfig]), ([displayInline, displayInlineConfig]) => {
-            if (displayInlineConfig !== undefined && displayInline !== undefined && displayInlineConfig !== displayInline) {
-                const layoutValue = this._layout.getValue();
-                if (!layoutValue)
-                    return;
-                this._layout.setValue({
-                    ...layoutValue,
-                    displayInline: displayInlineConfig,
-                });
-            }
-        }, 'displayInlineCorrection');
-    }
+    _gotEntries() { }
     _gotContentType() { }
 }

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

@@ -24,9 +24,6 @@ export class UmbBlockRteManagerContext extends UmbBlockManagerContext {
         if (!blockType) {
             throw new Error(`Cannot create block, missing block type for ${contentElementTypeKey}`);
         }
-        if (blockType.displayInline) {
-            data.layout.displayInline = true;
-        }
         return data;
     }
     insert(layoutEntry, content, settings, originData) {

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

@@ -4,6 +4,7 @@ export interface UmbBlockRteTypeModel extends UmbBlockTypeBaseModel {
     displayInline: boolean;
 }
 export interface UmbBlockRteLayoutModel extends UmbBlockLayoutBaseModel {
+    /** @deprecated Use `displayInline` on `UmbBlockRteTypeModel` instead. This field will be removed in Umbraco 19. [LK] */
     displayInline?: boolean;
 }
 export interface UmbBlockRteValueModel extends UmbBlockValueType<UmbBlockRteLayoutModel> {

package/dist-cms/packages/block/block-single/property-editors/block-single-editor/manifests.js

@@ -5,10 +5,10 @@ export const manifests = [
     {
         type: 'propertyEditorUi',
         alias: 'Umb.PropertyEditorUi.BlockSingle',
-        name: 'Block Single Property Editor UI',
+        name: 'Single Block Property Editor UI',
         element: () => import('./property-editor-ui-block-single.element.js'),
         meta: {
-            label: 'Block Single',
+            label: 'Single Block',
             propertyEditorSchemaAlias: UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS,
             icon: 'icon-shape-square',
             group: 'richContent',

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

@@ -180,7 +180,12 @@ let UmbPropertyEditorUIBlockSingleElement = class UmbPropertyEditorUIBlockSingle
             }, 'observeContextualVariantId');
         });
         this.addValidator('rangeOverflow', () => this.localize.term('validation_entriesExceed', 1, this.#entriesContext.getLength() - 1), () => this.#entriesContext.getLength() > 1);
-        this.addValidator('valueMissing', () => this.mandatoryMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, () => !!this.mandatory && this.#entriesContext.getLength() === 0);
+        this.addValidator('valueMissing', () => this.mandatoryMessage ?? UMB_VALIDATION_EMPTY_LOCALIZATION_KEY, () => {
+            if (!this.mandatory || this.readonly)
+                return false;
+            const count = this.value?.layout?.[UMB_BLOCK_SINGLE_PROPERTY_EDITOR_SCHEMA_ALIAS]?.length ?? 0;
+            return count === 0;
+        });
         this.observe(this.#entriesContext.layoutEntries, (layouts) => {
             this._layouts = layouts;
             // Update sorter.

package/dist-cms/packages/clipboard/clipboard-entry/detail/manifests.js

@@ -1,6 +1,7 @@
 import { UMB_CLIPBOARD_ENTRY_ENTITY_TYPE } from '../entity.js';
 import { UMB_CLIPBOARD_ENTRY_ITEM_REPOSITORY_ALIAS } from '../item/index.js';
 import { UMB_CLIPBOARD_ENTRY_DETAIL_REPOSITORY_ALIAS, UMB_CLIPBOARD_ENTRY_DETAIL_STORE_ALIAS } from './constants.js';
+import { UmbClipboardEntryDetailStore } from './clipboard-entry-detail.store.js';
 export const manifests = [
     {
         type: 'repository',
@@ -12,7 +13,7 @@ export const manifests = [
         type: 'store',
         alias: UMB_CLIPBOARD_ENTRY_DETAIL_STORE_ALIAS,
         name: 'Clipboard Detail Store',
-        api: () => import('./clipboard-entry-detail.store.js'),
+        api: UmbClipboardEntryDetailStore,
     },
     {
         type: 'entityAction',

package/dist-cms/packages/clipboard/clipboard-entry/item/manifests.js

@@ -1,4 +1,5 @@
 import { UMB_CLIPBOARD_ENTRY_ITEM_REPOSITORY_ALIAS, UMB_CLIPBOARD_ENTRY_ITEM_STORE_ALIAS } from './constants.js';
+import { UmbClipboardEntryItemStore } from './clipboard-entry-item.store.js';
 export const manifests = [
     {
         type: 'repository',
@@ -10,6 +11,6 @@ export const manifests = [
         type: 'itemStore',
         alias: UMB_CLIPBOARD_ENTRY_ITEM_STORE_ALIAS,
         name: 'Clipboard Entry Item Store',
-        api: () => import('./clipboard-entry-item.store.js'),
+        api: UmbClipboardEntryItemStore,
     },
 ];

package/dist-cms/packages/content/content/collection/workspace-has-content-collection/manifests.js

@@ -1,9 +1,10 @@
 import { UMB_WORKSPACE_HAS_CONTENT_COLLECTION_CONDITION_ALIAS } from './constants.js';
+import { UmbWorkspaceHasContentCollectionCondition } from './workspace-has-content-collection.condition.js';
 export const manifests = [
     {
         type: 'condition',
         name: 'Workspace Has Collection Condition',
         alias: UMB_WORKSPACE_HAS_CONTENT_COLLECTION_CONDITION_ALIAS,
-        api: () => import('./workspace-has-content-collection.condition.js'),
+        api: UmbWorkspaceHasContentCollectionCondition,
     },
 ];