diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts index c8a4d24f14..f4e5747bca 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-block-inline.element.ts @@ -1,25 +1,19 @@ import { UMB_BLOCK_GRID_ENTRY_CONTEXT } from '../block-grid-entry/constants.js'; import type { UmbBlockGridWorkspaceOriginData } from '../../workspace/block-grid-workspace.modal-token.js'; import { UMB_BLOCK_GRID_ENTRIES_CONTEXT } from '../block-grid-entries/constants.js'; -import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import { css, customElement, html, nothing, property, state } from '@umbraco-cms/backoffice/external/lit'; -import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type'; -import type { UmbBlockEditorCustomViewConfiguration } from '@umbraco-cms/backoffice/block-custom-view'; -import { - type UMB_BLOCK_WORKSPACE_CONTEXT, - UMB_BLOCK_WORKSPACE_ALIAS, - type UmbBlockDataType, -} from '@umbraco-cms/backoffice/block'; +import { css, customElement, html, property, state, when } from '@umbraco-cms/backoffice/external/lit'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { - UmbExtensionApiInitializer, - UmbExtensionsApiInitializer, - type UmbApiConstructorArgumentsMethodType, -} from '@umbraco-cms/backoffice/extension-api'; -import { UmbLanguageItemRepository } from '@umbraco-cms/backoffice/language'; -import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbDataPathPropertyValueQuery } from '@umbraco-cms/backoffice/validation'; +import { UmbExtensionApiInitializer, UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api'; +import { UmbLanguageItemRepository } from '@umbraco-cms/backoffice/language'; +import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; +import { UMB_BLOCK_WORKSPACE_ALIAS } from '@umbraco-cms/backoffice/block'; +import type { UmbApiConstructorArgumentsMethodType } from '@umbraco-cms/backoffice/extension-api'; +import type { UmbBlockEditorCustomViewConfiguration } from '@umbraco-cms/backoffice/block-custom-view'; +import type { UmbPropertyTypeModel } from '@umbraco-cms/backoffice/content-type'; import type { UmbVariantId } from '@umbraco-cms/backoffice/variant'; +import type { UMB_BLOCK_WORKSPACE_CONTEXT, UmbBlockDataType } from '@umbraco-cms/backoffice/block'; const apiArgsCreator: UmbApiConstructorArgumentsMethodType = (manifest: unknown) => { return [{ manifest }]; @@ -50,6 +44,9 @@ export class UmbBlockGridBlockInlineElement extends UmbLitElement { @property({ attribute: false }) content?: UmbBlockDataType; + @property({ attribute: false }) + settings?: UmbBlockDataType; + @state() _inlineProperty?: UmbPropertyTypeModel; @@ -176,20 +173,23 @@ export class UmbBlockGridBlockInlineElement extends UmbLitElement { } #renderBlockInfo() { + const blockValue = { ...this.content, $settings: this.settings }; return html`
- +
- ${this.unpublished - ? html` + html`` - : nothing} + >`, + )} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts index acbab8698e..c6406db6bf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block/block-grid-block.element.ts @@ -1,5 +1,5 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import { css, customElement, html, nothing, property } from '@umbraco-cms/backoffice/external/lit'; +import { css, customElement, html, property, when } from '@umbraco-cms/backoffice/external/lit'; import type { UmbBlockDataType } from '@umbraco-cms/backoffice/block'; import type { UmbBlockEditorCustomViewConfiguration } from '@umbraco-cms/backoffice/block-custom-view'; @@ -23,19 +23,27 @@ export class UmbBlockGridBlockElement extends UmbLitElement { @property({ attribute: false }) content?: UmbBlockDataType; + @property({ attribute: false }) + settings?: UmbBlockDataType; + override render() { - return html` - - - ${this.unpublished - ? html`` - : nothing} - - `; + const blockValue = { ...this.content, $settings: this.settings }; + return html` + + + + ${when( + this.unpublished, + () => + html``, + )} + + + `; } static override styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts index d15e7cf852..25283f8065 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/inline-list-block/inline-list-block.element.ts @@ -1,21 +1,15 @@ import { UMB_BLOCK_LIST_ENTRY_CONTEXT } from '../../context/index.js'; -import { - UMB_BLOCK_WORKSPACE_ALIAS, - type UmbBlockDataType, - type UMB_BLOCK_WORKSPACE_CONTEXT, -} from '@umbraco-cms/backoffice/block'; -import { - UmbExtensionApiInitializer, - UmbExtensionsApiInitializer, - type UmbApiConstructorArgumentsMethodType, -} from '@umbraco-cms/backoffice/extension-api'; +import { UMB_BLOCK_WORKSPACE_ALIAS } from '@umbraco-cms/backoffice/block'; +import { css, customElement, html, nothing, property, state, when } from '@umbraco-cms/backoffice/external/lit'; +import { UmbExtensionApiInitializer, UmbExtensionsApiInitializer } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; -import { css, customElement, html, nothing, property, state } from '@umbraco-cms/backoffice/external/lit'; +import { UmbLanguageItemRepository } from '@umbraco-cms/backoffice/language'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; +import type { UmbApiConstructorArgumentsMethodType } from '@umbraco-cms/backoffice/extension-api'; +import type { UmbBlockDataType, UMB_BLOCK_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/block'; import '../../../block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js'; -import { UmbLanguageItemRepository } from '@umbraco-cms/backoffice/language'; const apiArgsCreator: UmbApiConstructorArgumentsMethodType = (manifest: unknown) => { return [{ manifest }]; @@ -42,6 +36,9 @@ export class UmbInlineListBlockElement extends UmbLitElement { @property({ attribute: false }) content?: UmbBlockDataType; + @property({ attribute: false }) + settings?: UmbBlockDataType; + @state() private _exposed?: boolean; @@ -156,20 +153,23 @@ export class UmbInlineListBlockElement extends UmbLitElement { } #renderBlockInfo() { + const blockValue = { ...this.content, $settings: this.settings }; return html`
- +
- ${this.unpublished - ? html` + html`` - : nothing} + >`, + )} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts index b45bc07100..1be1ace010 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-list/components/ref-list-block/ref-list-block.element.ts @@ -1,4 +1,4 @@ -import { css, customElement, html, nothing, property } from '@umbraco-cms/backoffice/external/lit'; +import { css, customElement, html, property, when } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; import type { UmbBlockDataType } from '@umbraco-cms/backoffice/block'; @@ -20,19 +20,25 @@ export class UmbRefListBlockElement extends UmbLitElement { @property({ attribute: false }) content?: UmbBlockDataType; + @property({ attribute: false }) + settings?: UmbBlockDataType; + @property({ attribute: false }) config?: UmbBlockEditorCustomViewConfiguration; override render() { + const blockValue = { ...this.content, $settings: this.settings }; return html` - - ${this.unpublished - ? html` + ${when( + this.unpublished, + () => + html`` - : nothing} + >`, + )} `; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts index 183fb365df..b6587eb024 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/components/ref-rte-block/ref-rte-block.element.ts @@ -1,6 +1,7 @@ -import { UMB_BLOCK_ENTRY_CONTEXT, type UmbBlockDataType } from '@umbraco-cms/backoffice/block'; import { css, customElement, html, property, state } from '@umbraco-cms/backoffice/external/lit'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; +import { UMB_BLOCK_ENTRY_CONTEXT } from '@umbraco-cms/backoffice/block'; +import type { UmbBlockDataType } from '@umbraco-cms/backoffice/block'; /** * @element umb-ref-rte-block @@ -20,6 +21,9 @@ export class UmbRefRteBlockElement extends UmbLitElement { @property({ attribute: false }) content?: UmbBlockDataType; + @property({ attribute: false }) + settings?: UmbBlockDataType; + @state() _workspaceEditPath?: string; @@ -38,10 +42,11 @@ export class UmbRefRteBlockElement extends UmbLitElement { } override render() { + const blockValue = { ...this.content, $settings: this.settings }; return html` - + `; }