Content Model: keep default format when paste into empty editor (#2232)

microsoft · Dec 1, 2023 · e014196 · e014196
1 parent 5520f04
commit e014196
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/...ges-content-model/roosterjs-content-model-core/lib/publicApi/model/createModelFromHtml.ts b/...ges-content-model/roosterjs-content-model-core/lib/publicApi/model/createModelFromHtml.ts
@@ -1,5 +1,9 @@
 import { createDomToModelContext, domToContentModel } from 'roosterjs-content-model-dom';
-import type { ContentModelDocument, DomToModelOption } from 'roosterjs-content-model-types';
+import type {
+    ContentModelDocument,
+    ContentModelSegmentFormat,
+    DomToModelOption,
+} from 'roosterjs-content-model-types';
 import type { TrustedHTMLHandler } from 'roosterjs-editor-types';
 
 /**
@@ -12,11 +16,20 @@ import type { TrustedHTMLHandler } from 'roosterjs-editor-types';
 export function createModelFromHtml(
     html: string,
     options?: DomToModelOption,
-    trustedHTMLHandler?: TrustedHTMLHandler
+    trustedHTMLHandler?: TrustedHTMLHandler,
+    defaultSegmentFormat?: ContentModelSegmentFormat
 ): ContentModelDocument | undefined {
     const doc = new DOMParser().parseFromString(trustedHTMLHandler?.(html) ?? html, 'text/html');
 
     return doc?.body
-        ? domToContentModel(doc.body, createDomToModelContext(undefined /*editorContext*/, options))
+        ? domToContentModel(
+              doc.body,
+              createDomToModelContext(
+                  {
+                      defaultFormat: defaultSegmentFormat,
+                  },
+                  options
+              )
+          )
         : undefined;
 }
diff --git a/packages-content-model/roosterjs-content-model-core/lib/publicApi/model/paste.ts b/packages-content-model/roosterjs-content-model-core/lib/publicApi/model/paste.ts
@@ -107,7 +107,11 @@ export function paste(
             }
 
             if (originalFormat) {
-                context.newPendingFormat = { ...EmptySegmentFormat, ...originalFormat }; // Use empty format as initial value to clear any other format inherits from pasted content
+                context.newPendingFormat = {
+                    ...EmptySegmentFormat,
+                    ...model.format,
+                    ...originalFormat,
+                }; // Use empty format as initial value to clear any other format inherits from pasted content
             }
 
             return true;

diff --git a/packages-content-model/roosterjs-content-model-editor/lib/editor/createEditorCore.ts b/packages-content-model/roosterjs-content-model-editor/lib/editor/createEditorCore.ts
@@ -32,7 +32,8 @@ export function createEditorCore(
         options.initialModel = createModelFromHtml(
             initContent,
             options.defaultDomToModelOptions,
-            options.trustedHTMLHandler
+            options.trustedHTMLHandler,
+            options.defaultSegmentFormat
         );
     }