From ffdb5bda08443feacddcc5d06363622878e19885 Mon Sep 17 00:00:00 2001
From: Jiuqing Song <jisong@microsoft.com>
Date: Tue, 28 May 2024 10:02:02 -0700
Subject: [PATCH] Fix #2578:  Cannot cut tables (#2659)

* Fix #2578

* add test
---
 .../lib/modelApi/selection/setSelection.ts    |  6 ++
 .../modelApi/selection/setSelectionTest.ts    | 99 +++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts b/packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts
index 484f74d863e..1d30893e6e6 100644
--- a/packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts
+++ b/packages/roosterjs-content-model-dom/lib/modelApi/selection/setSelection.ts
@@ -141,7 +141,13 @@ function setSelectionToTable(
     } else {
         table.rows.forEach(row =>
             row.cells.forEach(cell => {
+                const wasInSelection = isInSelection;
+
                 isInSelection = setSelectionToBlockGroup(cell, isInSelection, start, end);
+
+                if (wasInSelection && isInSelection) {
+                    mutateBlock(cell).isSelected = true;
+                }
             })
         );
     }
diff --git a/packages/roosterjs-content-model-dom/test/modelApi/selection/setSelectionTest.ts b/packages/roosterjs-content-model-dom/test/modelApi/selection/setSelectionTest.ts
index b87aa5d56b9..b776c9a0c33 100644
--- a/packages/roosterjs-content-model-dom/test/modelApi/selection/setSelectionTest.ts
+++ b/packages/roosterjs-content-model-dom/test/modelApi/selection/setSelectionTest.ts
@@ -838,4 +838,103 @@ describe('setSelection', () => {
         expect(cell.isSelected).toBeFalsy();
         expect(segment.isSelected).toBeTrue();
     });
+
+    it('Table inside range selection', () => {
+        const model = createContentModelDocument();
+        const table = createTable(1);
+        const cell1 = createTableCell();
+        const cell2 = createTableCell();
+        const para0 = createParagraph();
+        const para1 = createParagraph();
+        const para2 = createParagraph();
+        const para3 = createParagraph();
+        const segment0 = createBr();
+        const segment1 = createBr();
+        const segment2 = createBr();
+        const segment3 = createBr();
+        const segment4 = createBr();
+
+        para0.segments.push(segment0);
+        para1.segments.push(segment1);
+        para2.segments.push(segment2);
+        para3.segments.push(segment3, segment4);
+
+        cell1.blocks.push(para1);
+        cell2.blocks.push(para2);
+
+        table.rows[0].cells.push(cell1, cell2);
+
+        model.blocks.push(para0, table, para3);
+
+        setSelection(model, segment0, segment3);
+
+        expect(model).toEqual({
+            blockGroupType: 'Document',
+            blocks: [
+                {
+                    blockType: 'Paragraph',
+                    segments: [{ segmentType: 'Br', format: {}, isSelected: true }],
+                    format: {},
+                },
+                {
+                    blockType: 'Table',
+                    rows: [
+                        {
+                            height: 0,
+                            format: {},
+                            cells: [
+                                {
+                                    blockGroupType: 'TableCell',
+                                    blocks: [
+                                        {
+                                            blockType: 'Paragraph',
+                                            segments: [
+                                                { segmentType: 'Br', format: {}, isSelected: true },
+                                            ],
+                                            format: {},
+                                        },
+                                    ],
+                                    format: {},
+                                    spanLeft: false,
+                                    spanAbove: false,
+                                    isHeader: false,
+                                    dataset: {},
+                                    isSelected: true,
+                                },
+                                {
+                                    blockGroupType: 'TableCell',
+                                    blocks: [
+                                        {
+                                            blockType: 'Paragraph',
+                                            segments: [
+                                                { segmentType: 'Br', format: {}, isSelected: true },
+                                            ],
+                                            format: {},
+                                        },
+                                    ],
+                                    format: {},
+                                    spanLeft: false,
+                                    spanAbove: false,
+                                    isHeader: false,
+                                    dataset: {},
+                                    isSelected: true,
+                                },
+                            ],
+                        },
+                    ],
+                    format: {},
+                    widths: [],
+                    dataset: {},
+                },
+                {
+                    blockType: 'Paragraph',
+                    segments: [
+                        { segmentType: 'Br', format: {}, isSelected: true },
+                        { segmentType: 'Br', format: {} },
+                    ],
+                    format: {},
+                },
+            ],
+        });
+    });
 });