@@ -5,7 +5,7 @@ import { uriAttributeSanitizer } from './input-tiny-mce.sanitizer.js';
5
5
import type { UmbTinyMcePluginBase } from './tiny-mce-plugin.js' ;
6
6
import { type ClassConstructor , loadManifestApi } from '@umbraco-cms/backoffice/extension-api' ;
7
7
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' ;
9
9
import { type ManifestTinyMcePlugin , umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry' ;
10
10
import { UmbChangeEvent } from '@umbraco-cms/backoffice/event' ;
11
11
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element' ;
@@ -95,10 +95,10 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
95
95
let config : RawEditorOptions = { } ;
96
96
manifests . forEach ( ( manifest ) => {
97
97
if ( manifest . meta ?. config ) {
98
- // TODO: Deep merge config
99
- config = { ...config , ...manifest . meta . config } ;
98
+ config = umbDeepMerge ( manifest . meta . config , config ) ;
100
99
}
101
100
} ) ;
101
+
102
102
this . #setTinyConfig( config ) ;
103
103
} ) ;
104
104
}
@@ -227,7 +227,7 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
227
227
}
228
228
229
229
// set the default values that will not be modified via configuration
230
- const config : RawEditorOptions = {
230
+ let config : RawEditorOptions = {
231
231
autoresize_bottom_margin : 10 ,
232
232
body_class : 'umb-rte' ,
233
233
contextMenu : false ,
@@ -245,12 +245,12 @@ export class UmbInputTinyMceElement extends UUIFormControlMixin(UmbLitElement, '
245
245
246
246
// Extend with configuration options
247
247
...configurationOptions ,
248
-
249
- // Extend with additional configuration options
250
- //...additionalConfig, // TODO: Deep merge
251
248
} ;
252
249
253
- console . log ( 'tried to set config' , additionalConfig ) ;
250
+ // Extend with additional configuration options
251
+ if ( additionalConfig ) {
252
+ config = umbDeepMerge ( additionalConfig , config ) ;
253
+ }
254
254
255
255
this . #editorRef?. destroy ( ) ;
256
256
0 commit comments