From ad27f138b3c2b68f3765d3f2c5c771124d36fc36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Fri, 27 Sep 2024 10:08:20 +0200 Subject: [PATCH] move resolver to tinyMCE package --- .../src/packages/block/block-rte/index.ts | 1 - .../tiny-mce/property-editors/tiny-mce/manifests.ts | 2 +- .../rte-block-value-resolver.api.ts | 2 +- .../src/packages/tiny-mce/types.ts | 10 ++-------- 4 files changed, 4 insertions(+), 11 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/{block/block-rte => tiny-mce/property-editors/tiny-mce}/property-value-resolver/rte-block-value-resolver.api.ts (93%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/index.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/index.ts index 7a41c6ea46..5ce24a84b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/index.ts @@ -2,4 +2,3 @@ export * from './components/index.js'; export * from './context/index.js'; export * from './workspace/index.js'; export * from './types.js'; -export * from './property-value-resolver/rte-block-value-resolver.api.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts index 12c188a199..48690a60ea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/manifests.ts @@ -1,5 +1,5 @@ -import { UmbRteBlockValueResolver } from '@umbraco-cms/backoffice/block-rte'; import { manifest as schemaManifest } from './Umbraco.RichText.js'; +import { UmbRteBlockValueResolver } from './property-value-resolver/rte-block-value-resolver.api.js'; export const UMB_BLOCK_RTE_PROPERTY_EDITOR_SCHEMA_ALIAS = 'Umbraco.RichText'; export const UMB_BLOCK_RTE_PROPERTY_EDITOR_UI_ALIAS = 'Umb.PropertyEditorUi.TinyMCE'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/property-value-resolver/rte-block-value-resolver.api.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-value-resolver/rte-block-value-resolver.api.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/block/block-rte/property-value-resolver/rte-block-value-resolver.api.ts rename to src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-value-resolver/rte-block-value-resolver.api.ts index 487596c3e1..edf2726889 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-rte/property-value-resolver/rte-block-value-resolver.api.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/property-editors/tiny-mce/property-value-resolver/rte-block-value-resolver.api.ts @@ -1,4 +1,4 @@ -import type { UmbPropertyEditorUiValueType } from '../../../tiny-mce/types.js'; +import type { UmbPropertyEditorUiValueType } from '../../../types.js'; import { UmbBlockValueResolver, type UmbBlockDataValueModel, diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/types.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/types.ts index 45cad3f26e..35c975e701 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/types.ts @@ -1,12 +1,6 @@ -import type { UmbBlockDataModel, UmbBlockExposeModel } from '@umbraco-cms/backoffice/block'; - -export interface UmbRteBlockValueType { - contentData: Array; - settingsData: Array; - expose: Array; -} +import type { UmbBlockValueDataPropertiesBaseType } from '@umbraco-cms/backoffice/block'; export interface UmbPropertyEditorUiValueType { markup: string; - blocks: UmbRteBlockValueType; + blocks: UmbBlockValueDataPropertiesBaseType; }