Remove style "white-space" from empty paragraph (#2820)

* Remove white-space style for empty paragraph * improve
microsoft · Oct 5, 2024 · 2d90d5c · 2d90d5c
1 parent eb4127c
commit 2d90d5c
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/packages/roosterjs-content-model-dom/lib/modelApi/common/normalizeParagraph.ts b/packages/roosterjs-content-model-dom/lib/modelApi/common/normalizeParagraph.ts
@@ -38,6 +38,8 @@ export function normalizeParagraph(paragraph: ReadonlyContentModelParagraph) {
                 mutateBlock(paragraph).segments.pop();
             }
         }
+
+        normalizeParagraphStyle(paragraph);
     }
 
     if (!isWhiteSpacePreserved(paragraph.format.whiteSpace)) {
@@ -51,6 +53,18 @@ export function normalizeParagraph(paragraph: ReadonlyContentModelParagraph) {
     moveUpSegmentFormat(paragraph);
 }
 
+function normalizeParagraphStyle(paragraph: ReadonlyContentModelParagraph) {
+    // New paragraph should not have white-space style
+    if (
+        paragraph.format.whiteSpace &&
+        paragraph.segments.every(
+            seg => seg.segmentType == 'Br' || seg.segmentType == 'SelectionMarker'
+        )
+    ) {
+        delete mutateBlock(paragraph).format.whiteSpace;
+    }
+}
+
 function removeEmptySegments(block: ReadonlyContentModelParagraph) {
     for (let j = block.segments.length - 1; j >= 0; j--) {
         if (isSegmentEmpty(block.segments[j])) {

diff --git a/packages/roosterjs-content-model-dom/test/modelApi/common/normalizeParagraphTest.ts b/packages/roosterjs-content-model-dom/test/modelApi/common/normalizeParagraphTest.ts
@@ -809,4 +809,34 @@ describe('Move up format', () => {
             cachedElement: mockedCache,
         });
     });
+
+    it('Empty paragraph has white-space style', () => {
+        const para = createParagraph(false, { whiteSpace: 'pre-wrap' });
+        const br = createBr();
+
+        para.segments.push(br);
+
+        normalizeParagraph(para);
+
+        expect(para).toEqual({
+            blockType: 'Paragraph',
+            segments: [br],
+            format: {},
+        });
+    });
+
+    it('Paragraph has content and white-space style', () => {
+        const para = createParagraph(false, { whiteSpace: 'pre-wrap' });
+        const text = createText('test');
+
+        para.segments.push(text);
+
+        normalizeParagraph(para);
+
+        expect(para).toEqual({
+            blockType: 'Paragraph',
+            segments: [text],
+            format: { whiteSpace: 'pre-wrap' },
+        });
+    });
 });