Fix Excel Border issue when pasting (#2121)

* init * itChromeOnly
microsoft · Oct 5, 2023 · badefc5 · badefc5
1 parent 05fe924
commit badefc5
Show file tree

Hide file tree

Showing 6 changed files with 2,308 additions and 16 deletions.
diff --git a/...ontent-model-editor/lib/editor/plugins/PastePlugin/Excel/processPastedContentFromExcel.ts b/...ontent-model-editor/lib/editor/plugins/PastePlugin/Excel/processPastedContentFromExcel.ts
@@ -1,6 +1,7 @@
 import addParser from '../utils/addParser';
 import { isNodeOfType } from 'roosterjs-content-model-dom';
 import { moveChildNodes } from 'roosterjs-editor-dom';
+import { setProcessor } from '../utils/setProcessor';
 import type ContentModelBeforePasteEvent from '../../../../publicTypes/event/ContentModelBeforePasteEvent';
 import type { TrustedHTMLHandler } from 'roosterjs-editor-types';
 
@@ -60,6 +61,20 @@ export function processPastedContentFromExcel(
             format.borderTop = DEFAULT_BORDER_STYLE;
         }
     });
+
+    setProcessor(event.domToModelOption, 'child', (group, element, context) => {
+        const segmentFormat = { ...context.segmentFormat };
+        if (group.blockGroupType === 'TableCell' && group.format.textColor) {
+            context.segmentFormat.textColor = group.format.textColor;
+        }
+
+        context.defaultElementProcessors.child(group, element, context);
+
+        if (group.blockGroupType === 'TableCell' && group.format.textColor) {
+            context.segmentFormat = segmentFormat;
+            delete group.format.textColor;
+        }
+    });
 }
 
 /**

diff --git a/...t-model/roosterjs-content-model-editor/test/editor/plugins/ContentModelPastePluginTest.ts b/...t-model/roosterjs-content-model-editor/test/editor/plugins/ContentModelPastePluginTest.ts
@@ -108,7 +108,7 @@ describe('Content Model Paste Plugin Test', () => {
                 trustedHTMLHandler
             );
             expect(addParser.default).toHaveBeenCalledTimes(DEFAULT_TIMES_ADD_PARSER_CALLED + 3);
-            expect(setProcessor.setProcessor).toHaveBeenCalledTimes(0);
+            expect(setProcessor.setProcessor).toHaveBeenCalledTimes(1);
             expect(chainSanitizerCallbackFile.default).toHaveBeenCalledTimes(1);
         });
 
@@ -141,7 +141,7 @@ describe('Content Model Paste Plugin Test', () => {
                 trustedHTMLHandler
             );
             expect(addParser.default).toHaveBeenCalledTimes(DEFAULT_TIMES_ADD_PARSER_CALLED + 1);
-            expect(setProcessor.setProcessor).toHaveBeenCalledTimes(0);
+            expect(setProcessor.setProcessor).toHaveBeenCalledTimes(1);
             expect(chainSanitizerCallbackFile.default).toHaveBeenCalledTimes(1);
         });
 
@@ -157,7 +157,7 @@ describe('Content Model Paste Plugin Test', () => {
                 trustedHTMLHandler
             );
             expect(addParser.default).toHaveBeenCalledTimes(DEFAULT_TIMES_ADD_PARSER_CALLED + 1);
-            expect(setProcessor.setProcessor).toHaveBeenCalledTimes(0);
+            expect(setProcessor.setProcessor).toHaveBeenCalledTimes(1);
             expect(chainSanitizerCallbackFile.default).toHaveBeenCalledTimes(1);
         });