From d90763a9b41d08a45c57c25831a661e94c42f281 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Fri, 10 May 2024 15:41:43 +0200 Subject: [PATCH] fix: tinymce does not use its default config Specifically for height, width, content_css, and style_formats, tinymce did not use its fallbacks if they were not provided through the data type. --- .../components/input-tiny-mce/input-tiny-mce.defaults.ts | 2 +- .../components/input-tiny-mce/input-tiny-mce.element.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.defaults.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.defaults.ts index 76fe1fff55..1407018f59 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.defaults.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.defaults.ts @@ -35,7 +35,7 @@ export const defaultFallbackConfig: RawEditorOptions = { }, { title: 'Blocks', - items: [{ title: 'Normal', block: 'p' }], + items: [{ title: 'Paragraph', block: 'p' }], }, { title: 'Containers', diff --git a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts index 69c747373e..3f97caead4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts @@ -196,10 +196,10 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, ' // create an object by merging the configuration onto the fallback config const configurationOptions: RawEditorOptions = { ...defaultFallbackConfig, - height: dimensions?.height || undefined, - width: dimensions?.width || undefined, - content_css: stylesheets, - style_formats: styleFormats, + height: dimensions?.height ?? defaultFallbackConfig.height, + width: dimensions?.width ?? defaultFallbackConfig.width, + content_css: stylesheets.length ? stylesheets : defaultFallbackConfig.content_css, + style_formats: styleFormats.length ? styleFormats : defaultFallbackConfig.style_formats, }; // no auto resize when a fixed height is set