Merge branch 'master' into u/julairoldi/investigate-image

microsoft · Nov 28, 2024 · 9c7f93c · 9c7f93c
2 parents 119c4dd + 9e9305d
commit 9c7f93c
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 0 deletions.
diff --git a/...ontent-model-core/lib/command/createModelFromHtml/createDomToModelContextForSanitizing.ts b/...ontent-model-core/lib/command/createModelFromHtml/createDomToModelContextForSanitizing.ts
@@ -6,6 +6,7 @@ import { getRootComputedStyleForContext } from '../../coreApi/createEditorContex
 import { pasteBlockEntityParser } from '../../override/pasteCopyBlockEntityParser';
 import { pasteDisplayFormatParser } from '../../override/pasteDisplayFormatParser';
 import { pasteTextProcessor } from '../../override/pasteTextProcessor';
+import { pasteWhiteSpaceFormatParser } from '../../override/pasteWhiteSpaceFormatParser';
 import type {
     ContentModelSegmentFormat,
     DomToModelContext,
@@ -52,6 +53,7 @@ export function createDomToModelContextForSanitizing(
             },
             formatParserOverride: {
                 display: pasteDisplayFormatParser,
+                whiteSpace: pasteWhiteSpaceFormatParser,
             },
             additionalFormatParsers: {
                 container: [containerSizeFormatParser],

diff --git a/packages/roosterjs-content-model-core/lib/override/pasteWhiteSpaceFormatParser.ts b/packages/roosterjs-content-model-core/lib/override/pasteWhiteSpaceFormatParser.ts
@@ -0,0 +1,17 @@
+import type { FormatParser, WhiteSpaceFormat } from 'roosterjs-content-model-types';
+
+const WhiteSpacePre = 'pre';
+
+/**
+ * @internal
+ */
+export const pasteWhiteSpaceFormatParser: FormatParser<WhiteSpaceFormat> = (
+    format,
+    element,
+    context,
+    defaultStyle
+) => {
+    if (element.style.whiteSpace != WhiteSpacePre) {
+        context.defaultFormatParsers.whiteSpace?.(format, element, context, defaultStyle);
+    }
+};
diff --git a/...t-model-core/test/command/createModelFromHtml/createDomToModelContextForSanitizingTest.ts b/...t-model-core/test/command/createModelFromHtml/createDomToModelContextForSanitizingTest.ts
@@ -7,6 +7,7 @@ import { DomToModelOptionForSanitizing } from 'roosterjs-content-model-types';
 import { pasteBlockEntityParser } from '../../../lib/override/pasteCopyBlockEntityParser';
 import { pasteDisplayFormatParser } from '../../../lib/override/pasteDisplayFormatParser';
 import { pasteTextProcessor } from '../../../lib/override/pasteTextProcessor';
+import { pasteWhiteSpaceFormatParser } from '../../../lib/override/pasteWhiteSpaceFormatParser';
 
 describe('createDomToModelContextForSanitizing', () => {
     const mockedPasteGeneralProcessor = 'GENERALPROCESSOR' as any;
@@ -61,6 +62,7 @@ describe('createDomToModelContextForSanitizing', () => {
                 },
                 formatParserOverride: {
                     display: pasteDisplayFormatParser,
+                    whiteSpace: pasteWhiteSpaceFormatParser,
                 },
                 additionalFormatParsers: {
                     container: [containerSizeFormatParser],
@@ -106,6 +108,7 @@ describe('createDomToModelContextForSanitizing', () => {
                 },
                 formatParserOverride: {
                     display: pasteDisplayFormatParser,
+                    whiteSpace: pasteWhiteSpaceFormatParser,
                 },
                 additionalFormatParsers: {
                     container: [containerSizeFormatParser],

diff --git a/packages/roosterjs-content-model-core/test/overrides/pasteWhiteSpaceFormatParserTest.ts b/packages/roosterjs-content-model-core/test/overrides/pasteWhiteSpaceFormatParserTest.ts
@@ -0,0 +1,39 @@
+import { pasteWhiteSpaceFormatParser } from '../../lib/override/pasteWhiteSpaceFormatParser';
+import { WhiteSpaceFormat } from 'roosterjs-content-model-types/lib';
+
+describe('pasteWhiteSpaceFormatParser', () => {
+    let format: WhiteSpaceFormat;
+    let element: HTMLElement;
+    let context: any;
+    let defaultStyle: any;
+    let defaultParserSpy: jasmine.Spy;
+
+    beforeEach(() => {
+        format = {};
+        element = document.createElement('div');
+        defaultParserSpy = jasmine.createSpy();
+        context = {
+            defaultFormatParsers: {
+                whiteSpace: defaultParserSpy,
+            },
+        };
+        defaultStyle = {};
+    });
+
+    it('should call default whiteSpace parser when element.style.whiteSpace is not "pre"', () => {
+        element.style.whiteSpace = 'normal';
+        pasteWhiteSpaceFormatParser(format, element, context, defaultStyle);
+        expect(context.defaultFormatParsers.whiteSpace).toHaveBeenCalledWith(
+            format,
+            element,
+            context,
+            defaultStyle
+        );
+    });
+
+    it('should not call default whiteSpace parser when element.style.whiteSpace is "pre"', () => {
+        element.style.whiteSpace = 'pre';
+        pasteWhiteSpaceFormatParser(format, element, context, defaultStyle);
+        expect(context.defaultFormatParsers.whiteSpace).not.toHaveBeenCalled();
+    });
+});