fixes

microsoft · Dec 6, 2024 · 72dfb20 · 72dfb20
1 parent 304a15b
commit 72dfb20
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/roosterjs-content-model-core/lib/editor/core/createEditorCore.ts b/packages/roosterjs-content-model-core/lib/editor/core/createEditorCore.ts
@@ -1,6 +1,6 @@
 import { coreApiMap } from '../../coreApi/coreApiMap';
 import { createDarkColorHandler } from './DarkColorHandlerImpl';
-import { createDOMCreator, createTrustedHTMLHandler } from '../../utils/domCreator';
+import { createDOMCreator, createTrustedHTMLHandler, isDOMCreator } from '../../utils/domCreator';
 import { createDOMHelper } from './DOMHelperImpl';
 import { createDomToModelSettings, createModelToDomSettings } from './createEditorDefaultSettings';
 import { createEditorCorePlugins } from '../../corePlugin/createEditorCorePlugins';
@@ -20,7 +20,6 @@ import type {
 export function createEditorCore(contentDiv: HTMLDivElement, options: EditorOptions): EditorCore {
     const corePlugins = createEditorCorePlugins(options, contentDiv);
     const domCreator = createDOMCreator(options.trustedHTMLHandler);
-    const trustedHTMLHandler = createTrustedHTMLHandler(domCreator);
 
     return {
         physicalRoot: contentDiv,
@@ -46,7 +45,10 @@ export function createEditorCore(contentDiv: HTMLDivElement, options: EditorOpti
             options.knownColors,
             options.generateColorKey
         ),
-        trustedHTMLHandler: trustedHTMLHandler,
+        trustedHTMLHandler:
+            options.trustedHTMLHandler && !isDOMCreator(options.trustedHTMLHandler)
+                ? options.trustedHTMLHandler
+                : createTrustedHTMLHandler(domCreator),
         domCreator: domCreator,
         domHelper: createDOMHelper(contentDiv),
         ...getPluginState(corePlugins),

diff --git a/packages/roosterjs-content-model-core/test/editor/core/createEditorCoreTest.ts b/packages/roosterjs-content-model-core/test/editor/core/createEditorCoreTest.ts
@@ -150,7 +150,7 @@ describe('createEditorCore', () => {
         const mockedPlugin1 = 'P1' as any;
         const mockedPlugin2 = 'P2' as any;
         const mockedGetDarkColor = 'DARK' as any;
-        const mockedTrustHtmlHandler = 'TRUSTED' as any;
+        const mockedTrustHtmlHandler = 'OPTIONS TRUSTED' as any;
         const mockedDisposeErrorHandler = 'DISPOSE' as any;
         const mockedGenerateColorKey = 'KEY' as any;
         const mockedKnownColors = 'COLORS' as any;