Fix 265959: extra empty line generated when get plain text (#2566)

Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com>
microsoft · Apr 5, 2024 · a4457db · a4457db
1 parent 86cc784
commit a4457db
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 5 deletions.
diff --git a/demo/scripts/controlsV2/demoButtons/exportContentButton.ts b/demo/scripts/controlsV2/demoButtons/exportContentButton.ts
@@ -4,7 +4,10 @@ import type { RibbonButton } from '../roosterjsReact/ribbon';
 /**
  * Key of localized strings of Zoom button
  */
-export type ExportButtonStringKey = 'buttonNameExport';
+export type ExportButtonStringKey =
+    | 'buttonNameExport'
+    | 'menuNameExportHTML'
+    | 'menuNameExportText';
 
 /**
  * "Export content" button on the format ribbon
@@ -14,9 +17,22 @@ export const exportContentButton: RibbonButton<ExportButtonStringKey> = {
     unlocalizedText: 'Export',
     iconName: 'Export',
     flipWhenRtl: true,
-    onClick: editor => {
+    dropDownMenu: {
+        items: {
+            menuNameExportHTML: 'as HTML',
+            menuNameExportText: 'as Plain Text',
+        },
+    },
+    onClick: (editor, key) => {
         const win = editor.getDocument().defaultView.open();
-        const html = exportContent(editor);
+        let html = '';
+
+        if (key == 'menuNameExportHTML') {
+            html = exportContent(editor);
+        } else if (key == 'menuNameExportText') {
+            html = `<pre>${exportContent(editor, 'PlainText')}</pre>`;
+        }
+
         win.document.write(editor.getTrustedHTMLHandler()(html));
     },
     commandBarProperties: {

diff --git a/packages/roosterjs-content-model-dom/lib/modelToText/contentModelToText.ts b/packages/roosterjs-content-model-dom/lib/modelToText/contentModelToText.ts
@@ -1,5 +1,7 @@
 import type { ContentModelBlockGroup, ContentModelDocument } from 'roosterjs-content-model-types';
 
+const TextForHR = '________________________________________';
+
 /**
  * Convert Content Model to plain text
  * @param model The source Content Model
@@ -46,10 +48,16 @@ function contentModelToTextArray(group: ContentModelBlockGroup, textArray: strin
                             break;
                     }
                 });
-                textArray.push(text);
+
+                if (text) {
+                    textArray.push(text);
+                }
+
                 break;
 
             case 'Divider':
+                textArray.push(block.tagName == 'hr' ? TextForHR : '');
+                break;
             case 'Entity':
                 textArray.push('');
                 break;

diff --git a/packages/roosterjs-content-model-dom/test/modelToText/contentModelToTextTest.ts b/packages/roosterjs-content-model-dom/test/modelToText/contentModelToTextTest.ts
@@ -63,6 +63,21 @@ describe('modelToText', () => {
         expect(text).toBe('text1\r\ntext2');
     });
 
+    it('model with empty lines (BR only in paragraph)', () => {
+        const model = createContentModelDocument();
+        const para1 = createParagraph();
+        const para2 = createParagraph();
+
+        para1.segments.push(createBr());
+        para2.segments.push(createBr());
+
+        model.blocks.push(para1, para2);
+
+        const text = contentModelToText(model);
+
+        expect(text).toBe('\r\n');
+    });
+
     it('model with paragraph and image', () => {
         const model = createContentModelDocument();
         const para1 = createParagraph();
@@ -76,7 +91,7 @@ describe('modelToText', () => {
         expect(text).toBe('text1 text2');
     });
 
-    it('model with divider', () => {
+    it('model with divider (DIV)', () => {
         const model = createContentModelDocument();
         const para1 = createParagraph();
         const para2 = createParagraph();
@@ -91,6 +106,21 @@ describe('modelToText', () => {
         expect(text).toBe('text1\r\n\r\ntext2');
     });
 
+    it('model with divider (HR)', () => {
+        const model = createContentModelDocument();
+        const para1 = createParagraph();
+        const para2 = createParagraph();
+
+        para1.segments.push(createText('text1'));
+        para2.segments.push(createText('text2'));
+
+        model.blocks.push(para1, createDivider('hr'), para2);
+
+        const text = contentModelToText(model);
+
+        expect(text).toBe('text1\r\n________________________________________\r\ntext2');
+    });
+
     it('model with list', () => {
         const model = createContentModelDocument();
         const para1 = createParagraph();