Skip to content

Commit c9cc8b4

Browse files
committed
fix: use umbDeepMerge to merge config coming in twice over in order not to overwrite
1 parent 57594a3 commit c9cc8b4

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/packages/tiny-mce/components/input-tiny-mce/input-tiny-mce.element.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { uriAttributeSanitizer } from './input-tiny-mce.sanitizer.js';
55
import type { UmbTinyMcePluginBase } from './tiny-mce-plugin.js';
66
import { type ClassConstructor, loadManifestApi } from '@umbraco-cms/backoffice/extension-api';
77
import { css, customElement, html, property, query } from '@umbraco-cms/backoffice/external/lit';
8-
import { getProcessedImageUrl } from '@umbraco-cms/backoffice/utils';
8+
import { getProcessedImageUrl, umbDeepMerge } from '@umbraco-cms/backoffice/utils';
99
import { type ManifestTinyMcePlugin, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
1010
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event';
1111
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
@@ -95,10 +95,10 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
9595
let config: RawEditorOptions = {};
9696
manifests.forEach((manifest) => {
9797
if (manifest.meta?.config) {
98-
// TODO: Deep merge config
99-
config = { ...config, ...manifest.meta.config };
98+
config = umbDeepMerge(manifest.meta.config, config);
10099
}
101100
});
101+
102102
this.#setTinyConfig(config);
103103
});
104104
}
@@ -227,7 +227,7 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
227227
}
228228

229229
// set the default values that will not be modified via configuration
230-
const config: RawEditorOptions = {
230+
let config: RawEditorOptions = {
231231
autoresize_bottom_margin: 10,
232232
body_class: 'umb-rte',
233233
contextMenu: false,
@@ -245,12 +245,12 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
245245

246246
// Extend with configuration options
247247
...configurationOptions,
248-
249-
// Extend with additional configuration options
250-
//...additionalConfig, // TODO: Deep merge
251248
};
252249

253-
console.log('tried to set config', additionalConfig);
250+
// Extend with additional configuration options
251+
if (additionalConfig) {
252+
config = umbDeepMerge(additionalConfig, config);
253+
}
254254

255255
this.#editorRef?.destroy();
256256

0 commit comments

Comments
 (0)