Skip to content

[Table Improvements] Ignore span cells when merge table cells #3281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juliaroldi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Table Improvements] Ignore span cells when merge table cells #3281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad3ee65
merge model
juliaroldi Feb 6, 2026
6bb06a3
merge model with spans
juliaroldi Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 111 additions & 32 deletions packages/roosterjs-content-model-dom/lib/modelApi/editing/mergeModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import type {
ReadonlyContentModelBlock,
ReadonlyContentModelBlockGroup,
ReadonlyContentModelDocument,
ReadonlyContentModelTable,
ShallowMutableContentModelParagraph,
} from 'roosterjs-content-model-types';

Expand Down Expand Up @@ -191,44 +192,64 @@ function mergeTables(
const { table: readonlyTable, colIndex, rowIndex } = tableContext;
const table = mutateBlock(readonlyTable);

const newTableColCount = newTable.rows[0]?.cells.length || 0;
const newTableRowCount = newTable.rows.length;

const lastTargetColIndex = getTargetColIndex(table, rowIndex, colIndex, newTableColCount);
const extraColsNeeded = lastTargetColIndex - table.rows[0].cells.length;

if (extraColsNeeded > 0) {
const currentColCount = table.rows[0].cells.length;
for (let col = 0; col < extraColsNeeded; col++) {
const newColIndex = currentColCount + col;
for (let k = 0; k < table.rows.length; k++) {
const leftCell = table.rows[k]?.cells[newColIndex - 1];
table.rows[k].cells[newColIndex] = createTableCell(
false /*spanLeft*/,
false /*spanAbove*/,
leftCell?.isHeader,
leftCell?.format
);
}
}
}

const lastTargetRowIndex = getTargetRowIndex(table, rowIndex, newTableRowCount, colIndex);
const extraRowsNeeded = lastTargetRowIndex - table.rows.length;

if (extraRowsNeeded > 0) {
const currentRowCount = table.rows.length;
const colCount = table.rows[0]?.cells.length || 0;
for (let row = 0; row < extraRowsNeeded; row++) {
const newRowIndex = currentRowCount + row;
table.rows[newRowIndex] = {
cells: [],
format: {},
height: 0,
};
for (let k = 0; k < colCount; k++) {
const aboveCell = table.rows[newRowIndex - 1]?.cells[k];
table.rows[newRowIndex].cells[k] = createTableCell(
false /*spanLeft*/,
false /*spanAbove*/,
false /*isHeader*/,
aboveCell?.format
);
}
}
}

for (let i = 0; i < newTable.rows.length; i++) {
const targetRowIndex = getTargetRowIndex(table, rowIndex, i, colIndex);

for (let j = 0; j < newTable.rows[i].cells.length; j++) {
const newCell = newTable.rows[i].cells[j];

if (i == 0 && colIndex + j >= table.rows[0].cells.length) {
for (let k = 0; k < table.rows.length; k++) {
const leftCell = table.rows[k]?.cells[colIndex + j - 1];
table.rows[k].cells[colIndex + j] = createTableCell(
false /*spanLeft*/,
false /*spanAbove*/,
leftCell?.isHeader,
leftCell?.format
);
}
}

if (j == 0 && rowIndex + i >= table.rows.length) {
if (!table.rows[rowIndex + i]) {
table.rows[rowIndex + i] = {
cells: [],
format: {},
height: 0,
};
}
const targetColIndex = getTargetColIndex(table, targetRowIndex, colIndex, j);

for (let k = 0; k < table.rows[rowIndex].cells.length; k++) {
const aboveCell = table.rows[rowIndex + i - 1]?.cells[k];
table.rows[rowIndex + i].cells[k] = createTableCell(
false /*spanLeft*/,
false /*spanAbove*/,
false /*isHeader*/,
aboveCell?.format
);
}
}
const oldCell = table.rows[targetRowIndex]?.cells[targetColIndex];

const oldCell = table.rows[rowIndex + i].cells[colIndex + j];
table.rows[rowIndex + i].cells[colIndex + j] = newCell;
table.rows[targetRowIndex].cells[targetColIndex] = newCell;

if (i == 0 && j == 0) {
const newMarker = createSelectionMarker(marker.format);
Expand Down Expand Up @@ -494,6 +515,7 @@ function getFormatWithoutSegmentFormat(
KeysOfSegmentFormat.forEach(key => delete resultFormat[key]);
return resultFormat;
}

function getHyperlinkTextColor(sourceFormat: ContentModelHyperLinkFormat) {
const result: ContentModelHyperLinkFormat = {};
if (sourceFormat.textColor) {
Expand All @@ -502,3 +524,60 @@ function getHyperlinkTextColor(sourceFormat: ContentModelHyperLinkFormat) {

return result;
}

function getTargetColIndex(
table: ReadonlyContentModelTable,
rowIndex: number,
startColIndex: number,
offset: number
): number {
const row = table.rows[rowIndex];
if (!row) {
return startColIndex + offset;
}

if (offset === 0) {
return startColIndex;
}

let targetColIndex = startColIndex;
let logicalCellsToSkip = offset;

while (logicalCellsToSkip > 0) {
targetColIndex++;

if (targetColIndex >= row.cells.length) {
logicalCellsToSkip--;
} else if (!row.cells[targetColIndex].spanLeft) {
logicalCellsToSkip--;
}
}

return targetColIndex;
}

function getTargetRowIndex(
table: ReadonlyContentModelTable,
startRowIndex: number,
offset: number,
colIndex: number
): number {
if (offset === 0) {
return startRowIndex;
}

let targetRowIndex = startRowIndex;
let logicalRowsToSkip = offset;

while (logicalRowsToSkip > 0) {
targetRowIndex++;

if (targetRowIndex >= table.rows.length) {
logicalRowsToSkip--;
} else if (!table.rows[targetRowIndex]?.cells[colIndex]?.spanAbove) {
logicalRowsToSkip--;
}
}

return targetRowIndex;
}
Loading
Loading