Skip to content

fix(table): table cell merging #1446

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

Merged
nperez0111 merged 2 commits into from
Feb 26, 2025
Merged

fix(table): table cell merging #1446

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
7d83fcf
fix: table cell merging
nperez0111 Feb 19, 2025
61abc71
fix: better merging of styled text in table cells
nperez0111 Feb 26, 2025
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
36 changes: 31 additions & 5 deletions packages/core/src/api/nodeConversions/nodeToBlock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,40 @@ export function contentNodeToTableContent<
}
// Mark the cell as a header if it is a tableHeader node.
headerMatrix[rowIndex][cellIndex] = cellNode.type.name === "tableHeader";
// Convert cell content to inline content and merge adjacent styled text nodes
const content = cellNode.content.content
.map((child) =>
contentNodeToInlineContent(child, inlineContentSchema, styleSchema)
)
// The reason that we merge this content is that we allow table cells to contain multiple tableParagraph nodes
// So that we can leverage prosemirror-tables native merging
// If the schema only allowed a single tableParagraph node, then the merging would not work and cause prosemirror to fit the content into a new cell
.reduce((acc, contentPartial) => {
if (!acc.length) {
return contentPartial;
}

const last = acc[acc.length - 1];
const first = contentPartial[0];

// Only merge if the last and first content are both styled text nodes and have the same styles
if (
isStyledTextInlineContent(last) &&
isStyledTextInlineContent(first) &&
JSON.stringify(last.styles) === JSON.stringify(first.styles)
) {
// Join them together if they have the same styles
last.text += "\n" + first.text;
acc.push(...contentPartial.slice(1));
return acc;
}
acc.push(...contentPartial);
return acc;
}, [] as InlineContent<I, S>[]);

return {
type: "tableCell",
content: contentNodeToInlineContent(
cellNode.firstChild!,
inlineContentSchema,
styleSchema
),
content,
props: {
colspan: cellNode.attrs.colspan,
rowspan: cellNode.attrs.rowspan,
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/blocks/TableBlockContent/TableBlockContent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,10 @@ export const Table = createBlockSpecFromStronglyTypedTiptapNode(
TableExtension,
TableParagraph,
TableHeader.extend({
content: "tableContent",
content: "tableContent*",
}),
TableCell.extend({
content: "tableContent",
content: "tableContent*",
}),
TableRow,
]
Expand Down