From 4fe3ad752b1ec9c2ef5440892f488df5ee0f665e Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Tue, 29 Sep 2026 17:18:20 +0200
Subject: [PATCH 1/4] chore(table): migrate Table node files to Typescript

Assisted-by: ClaudeCode:claude-opus-5.5
Signed-off-by: Jonas <jonas@freesources.org>
---
 cypress/e2e/nodes/Table.spec.js               |  2 +-
 src/extensions/PlainTable.js                  |  2 +-
 src/extensions/RichText.ts                    |  4 +-
 .../{EditableTable.js => EditableTable.ts}    | 21 +++--
 src/nodes/{Table.js => Table.ts}              |  2 +-
 src/nodes/Table/{Table.js => Table.ts}        | 89 ++++++++++++-------
 .../{TableCaption.js => TableCaption.ts}      |  0
 .../Table/{TableCell.js => TableCell.ts}      |  8 +-
 .../{TableHeadRow.js => TableHeadRow.ts}      |  2 +-
 .../Table/{TableHeader.js => TableHeader.ts}  |  0
 src/nodes/Table/TableHeaderView.vue           | 19 +---
 src/nodes/Table/{TableRow.js => TableRow.ts}  |  0
 src/nodes/Table/TableRowView.vue              | 19 +---
 src/nodes/Table/TableView.vue                 | 19 +---
 src/tests/extensions/Markdown.spec.js         |  2 +-
 src/tests/nodes/Table.spec.js                 |  2 +-
 src/tests/nodes/TaskItem.spec.js              |  2 +-
 17 files changed, 89 insertions(+), 104 deletions(-)
 rename src/nodes/{EditableTable.js => EditableTable.ts} (56%)
 rename src/nodes/{Table.js => Table.ts} (80%)
 rename src/nodes/Table/{Table.js => Table.ts} (80%)
 rename src/nodes/Table/{TableCaption.js => TableCaption.ts} (100%)
 rename src/nodes/Table/{TableCell.js => TableCell.ts} (94%)
 rename src/nodes/Table/{TableHeadRow.js => TableHeadRow.ts} (93%)
 rename src/nodes/Table/{TableHeader.js => TableHeader.ts} (100%)
 rename src/nodes/Table/{TableRow.js => TableRow.ts} (100%)

diff --git a/cypress/e2e/nodes/Table.spec.js b/cypress/e2e/nodes/Table.spec.js
index cdecf605031..6a7deedb59e 100644
--- a/cypress/e2e/nodes/Table.spec.js
+++ b/cypress/e2e/nodes/Table.spec.js
@@ -8,7 +8,7 @@ import testData from '../../fixtures/Table.md?raw'
 import { initUserAndFiles, randUser } from '../../utils/index.js'
 import Markdown from './../../../src/extensions/Markdown.js'
 import markdownit from './../../../src/markdownit/index.ts'
-import EditableTable from './../../../src/nodes/EditableTable.js'
+import EditableTable from './../../../src/nodes/EditableTable.ts'
 import { createCustomEditor } from './../../support/components.js'
 import { expectMarkdown, runCommands } from './helpers.js'
 
diff --git a/src/extensions/PlainTable.js b/src/extensions/PlainTable.js
index 4d74d652f59..d2852a56c88 100644
--- a/src/extensions/PlainTable.js
+++ b/src/extensions/PlainTable.js
@@ -5,7 +5,7 @@
 
 import { Extension } from '@tiptap/core'
 import Text from '@tiptap/extension-text'
-import EditableTable from './../nodes/EditableTable.js'
+import EditableTable from './../nodes/EditableTable.ts'
 import Paragraph from './../nodes/Paragraph.js'
 import PlainTableDocument from './../nodes/PlainTableDocument.js'
 import Keymap from './Keymap.js'
diff --git a/src/extensions/RichText.ts b/src/extensions/RichText.ts
index e1162e122ad..0c027081557 100644
--- a/src/extensions/RichText.ts
+++ b/src/extensions/RichText.ts
@@ -30,7 +30,7 @@ import Callouts from '../nodes/Callout.js'
 import CodeBlock from '../nodes/CodeBlock.js'
 import Comments from '../nodes/Comments.ts'
 import Details from '../nodes/Details.js'
-import EditableTable from '../nodes/EditableTable.js'
+import EditableTable from '../nodes/EditableTable.ts'
 import Footnotes from '../nodes/Footnotes.ts'
 import FrontMatter from '../nodes/FrontMatter.js'
 import HardBreak from '../nodes/HardBreak.js'
@@ -42,7 +42,7 @@ import { MathBlock, MathInline } from '../nodes/Mathematics.js'
 import OrderedList from '../nodes/OrderedList.ts'
 import Paragraph from '../nodes/Paragraph.js'
 import Preview from '../nodes/Preview.js'
-import Table from '../nodes/Table.js'
+import Table from '../nodes/Table.ts'
 import TaskItem from '../nodes/TaskItem.ts'
 import TaskList from '../nodes/TaskList.ts'
 import TrailingNode from '../nodes/TrailingNode.js'
diff --git a/src/nodes/EditableTable.js b/src/nodes/EditableTable.ts
similarity index 56%
rename from src/nodes/EditableTable.js
rename to src/nodes/EditableTable.ts
index 2ef4b62bb1a..3f7f9f1e5c9 100644
--- a/src/nodes/EditableTable.js
+++ b/src/nodes/EditableTable.ts
@@ -3,23 +3,26 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { Node, NodeViewProps } from '@tiptap/vue-3'
+import type { Component } from 'vue'
+
 import { VueNodeViewRenderer } from '@tiptap/vue-3'
 import TableHeaderView from './Table/TableHeaderView.vue'
 import TableRowView from './Table/TableRowView.vue'
 import TableView from './Table/TableView.vue'
-import Table from './Table/Table.js'
-import TableCaption from './Table/TableCaption.js'
-import TableCell from './Table/TableCell.js'
-import TableHeader from './Table/TableHeader.js'
-import TableHeadRow from './Table/TableHeadRow.js'
-import TableRow from './Table/TableRow.js'
+import Table from './Table/Table.ts'
+import TableCaption from './Table/TableCaption.ts'
+import TableCell from './Table/TableCell.ts'
+import TableHeader from './Table/TableHeader.ts'
+import TableHeadRow from './Table/TableHeadRow.ts'
+import TableRow from './Table/TableRow.ts'
 
 /**
  *
- * @param {object} node - the node to add the view to.
- * @param {object} view - the node view to add to the node.
+ * @param node - the node to add the view to.
+ * @param view - the node view to add to the node.
  */
-function extendNodeWithView(node, view) {
+function extendNodeWithView(node: Node, view: Component<NodeViewProps>) {
 	return node.extend({
 		addNodeView() {
 			return VueNodeViewRenderer(view)
diff --git a/src/nodes/Table.js b/src/nodes/Table.ts
similarity index 80%
rename from src/nodes/Table.js
rename to src/nodes/Table.ts
index 827768f17d7..9ebd80aded4 100644
--- a/src/nodes/Table.js
+++ b/src/nodes/Table.ts
@@ -3,6 +3,6 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import Table from './Table/Table.js'
+import Table from './Table/Table.ts'
 
 export default Table
diff --git a/src/nodes/Table/Table.js b/src/nodes/Table/Table.ts
similarity index 80%
rename from src/nodes/Table/Table.js
rename to src/nodes/Table/Table.ts
index 3fcf9418e3b..33d960cfb50 100644
--- a/src/nodes/Table/Table.js
+++ b/src/nodes/Table/Table.ts
@@ -3,6 +3,9 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { Node as PMNode, ResolvedPos, Schema } from '@tiptap/pm/model'
+import type { Selection } from '@tiptap/pm/state'
+
 import { mergeAttributes } from '@tiptap/core'
 import { Table } from '@tiptap/extension-table'
 import { TextSelection } from '@tiptap/pm/state'
@@ -15,21 +18,43 @@ import {
 	selectionCell,
 } from '@tiptap/pm/tables'
 import { tableToMarkdown } from './markdown.ts'
-import TableCaption from './TableCaption.js'
-import TableCell from './TableCell.js'
-import TableHeader from './TableHeader.js'
-import TableHeadRow from './TableHeadRow.js'
-import TableRow from './TableRow.js'
+import TableCaption from './TableCaption.ts'
+import TableCell from './TableCell.ts'
+import TableHeader from './TableHeader.ts'
+import TableHeadRow from './TableHeadRow.ts'
+import TableRow from './TableRow.ts'
+
+declare module '@tiptap/core' {
+	interface Commands<ReturnType> {
+		text_table: {
+			/**
+			 * Move the selection to the node after the table
+			 */
+			leaveTable: () => ReturnType
+			/**
+			 * Move the selection to the same cell in the next row
+			 */
+			goToNextRow: () => ReturnType
+			/**
+			 * Sort the body rows by the column of the given cell
+			 *
+			 * @param direction Sort direction
+			 * @param cell Table cell or header node of the column to sort by
+			 */
+			sortColumn: (direction?: 'asc' | 'desc', cell?: PMNode | null) => ReturnType
+		}
+	}
+}
 
 /**
  *
- * @param {object} schema - schema of the editor
- * @param {number} rowsCount - number of rows in the table
- * @param {number} colsCount - number of cols in the table
+ * @param schema - schema of the editor
+ * @param rowsCount - number of rows in the table
+ * @param colsCount - number of cols in the table
  */
-function createTable(schema, rowsCount, colsCount) {
-	const headerCells = []
-	const cells = []
+function createTable(schema: Schema, rowsCount: number, colsCount: number) {
+	const headerCells: PMNode[] = []
+	const cells: PMNode[] = []
 	for (let index = 0; index < colsCount; index += 1) {
 		const cell = schema.nodes.tableCell.createAndFill()
 		if (cell) {
@@ -50,9 +75,9 @@ function createTable(schema, rowsCount, colsCount) {
 
 /**
  *
- * @param {object} $cell - resolved position of the current cell
+ * @param $cell - resolved position of the current cell
  */
-function findSameCellInNextRow($cell) {
+function findSameCellInNextRow($cell: ResolvedPos) {
 	if ($cell.index(-1) === $cell.node(-1).childCount - 1) {
 		return null
 	}
@@ -69,14 +94,15 @@ function findSameCellInNextRow($cell) {
 		}
 		cellStart += rowNode.nodeSize
 	}
+	return null
 }
 
 /**
  * Return the node type name if the selection sits inside a listItem/taskItem.
  *
- * @param {object} selection - the editor selection
+ * @param selection - the editor selection
  */
-function findListItemAtSelection(selection) {
+function findListItemAtSelection(selection: Selection) {
 	const { $from } = selection
 	for (let depth = $from.depth; depth > 0; depth--) {
 		const name = $from.node(depth).type.name
@@ -95,7 +121,7 @@ export default Table.extend({
 
 	addCommands() {
 		return {
-			...this.parent(),
+			...this.parent?.(),
 			addRowAfter:
 				() => ({ chain, dispatch }) => {
 					return chain()
@@ -150,11 +176,11 @@ export default Table.extend({
 					})
 					.run(),
 			insertTable:
-				() => ({ tr, dispatch, editor }) => {
-					if (isInTable(tr)) {
+				() => ({ state, tr, dispatch, editor }) => {
+					if (isInTable(state)) {
 						return false
 					}
-					const node = createTable(editor.schema, 3, 3, true)
+					const node = createTable(editor.schema, 3, 3)
 					if (dispatch) {
 						const offset = tr.selection.anchor + 1
 						tr.replaceSelectionWith(node)
@@ -165,8 +191,8 @@ export default Table.extend({
 				},
 			// move to the next node after the table from the last cell
 			leaveTable:
-				() => ({ tr, dispatch }) => {
-					if (!isInTable(tr)) {
+				() => ({ state, tr, dispatch }) => {
+					if (!isInTable(state)) {
 						return false
 					}
 					const { $head, empty } = tr.selection
@@ -183,13 +209,13 @@ export default Table.extend({
 					return true
 				},
 			goToNextRow:
-				() => ({ tr, dispatch }) => {
-					if (!isInTable(tr)) {
+				() => ({ state, tr, dispatch }) => {
+					if (!isInTable(state)) {
 						return false
 					}
-					const cell = findSameCellInNextRow(selectionCell(tr))
+					const cell = findSameCellInNextRow(selectionCell(state))
 					if (cell === null) {
-						return
+						return false
 					}
 					if (dispatch) {
 						const $cell = tr.doc.resolve(cell)
@@ -210,9 +236,10 @@ export default Table.extend({
 						return false
 					}
 
-					// find the table, its position and the column index of the cell
-					let table = null
-					let tablePos = null
+					// Find the table, its position and the column index of the cell
+					// Assigned in the descendants() callback, which TypeScript cannot narrow through
+					let table = null as PMNode | null
+					let tablePos = null as number | null
 					let columnIndex = -1
 
 					state.doc.descendants((node, pos) => {
@@ -247,8 +274,8 @@ export default Table.extend({
 						return false
 					}
 
-					const bodyRows = []
-					const nonBodyChildren = []
+					const bodyRows: PMNode[] = []
+					const nonBodyChildren: PMNode[] = []
 					table.forEach((child) => {
 						if (child.type.name === 'tableRow') {
 							bodyRows.push(child)
@@ -339,7 +366,7 @@ export default Table.extend({
 
 	addKeyboardShortcuts() {
 		return {
-			...this.parent(),
+			...this.parent?.(),
 			/**
 			 * <Tab> inside a table cell
 			 * When inside a list, indent the list item. Otherwise jump to
diff --git a/src/nodes/Table/TableCaption.js b/src/nodes/Table/TableCaption.ts
similarity index 100%
rename from src/nodes/Table/TableCaption.js
rename to src/nodes/Table/TableCaption.ts
diff --git a/src/nodes/Table/TableCell.js b/src/nodes/Table/TableCell.ts
similarity index 94%
rename from src/nodes/Table/TableCell.js
rename to src/nodes/Table/TableCell.ts
index 9a16820f837..4e254597458 100644
--- a/src/nodes/Table/TableCell.js
+++ b/src/nodes/Table/TableCell.ts
@@ -97,15 +97,15 @@ export default TableCell.extend({
 						) {
 							const tableChild = slice.content.firstChild.firstChild
 							if (
-								(tableChild.childCount === 1
+								(tableChild?.childCount === 1
 									&& tableChild.type.name === 'tableRow')
-								|| tableChild.type.name === 'tableHeadRow'
+								|| tableChild?.type.name === 'tableHeadRow'
 							) {
 								const rowChild = tableChild.firstChild
 								if (
-									(rowChild.childCount === 1
+									(rowChild?.childCount === 1
 										&& rowChild.type.name === 'tableCell')
-									|| rowChild.type.name === 'tableHeader'
+									|| rowChild?.type.name === 'tableHeader'
 								) {
 									return new Slice(rowChild.content, 0, 0)
 								}
diff --git a/src/nodes/Table/TableHeadRow.js b/src/nodes/Table/TableHeadRow.ts
similarity index 93%
rename from src/nodes/Table/TableHeadRow.js
rename to src/nodes/Table/TableHeadRow.ts
index 2166f25b596..774abbc021e 100644
--- a/src/nodes/Table/TableHeadRow.js
+++ b/src/nodes/Table/TableHeadRow.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-import TableRow from './TableRow.js'
+import TableRow from './TableRow.ts'
 
 export default TableRow.extend({
 	name: 'tableHeadRow',
diff --git a/src/nodes/Table/TableHeader.js b/src/nodes/Table/TableHeader.ts
similarity index 100%
rename from src/nodes/Table/TableHeader.js
rename to src/nodes/Table/TableHeader.ts
diff --git a/src/nodes/Table/TableHeaderView.vue b/src/nodes/Table/TableHeaderView.vue
index 1819990cef8..506109b28db 100644
--- a/src/nodes/Table/TableHeaderView.vue
+++ b/src/nodes/Table/TableHeaderView.vue
@@ -104,7 +104,7 @@
 
 <script>
 import { t } from '@nextcloud/l10n'
-import { NodeViewContent, NodeViewWrapper } from '@tiptap/vue-3'
+import { NodeViewContent, nodeViewProps, NodeViewWrapper } from '@tiptap/vue-3'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActionButtonGroup from '@nextcloud/vue/components/NcActionButtonGroup'
 import NcActions from '@nextcloud/vue/components/NcActions'
@@ -137,22 +137,7 @@ export default {
 		SortDescending,
 	},
 
-	props: {
-		editor: {
-			type: Object,
-			required: true,
-		},
-
-		getPos: {
-			type: Function,
-			required: true,
-		},
-
-		node: {
-			type: Object,
-			required: true,
-		},
-	},
+	props: nodeViewProps,
 
 	data() {
 		return {
diff --git a/src/nodes/Table/TableRow.js b/src/nodes/Table/TableRow.ts
similarity index 100%
rename from src/nodes/Table/TableRow.js
rename to src/nodes/Table/TableRow.ts
diff --git a/src/nodes/Table/TableRowView.vue b/src/nodes/Table/TableRowView.vue
index 1429d5e5f4b..d911377e5db 100644
--- a/src/nodes/Table/TableRowView.vue
+++ b/src/nodes/Table/TableRowView.vue
@@ -42,7 +42,7 @@
 
 <script>
 import { t } from '@nextcloud/l10n'
-import { NodeViewContent, NodeViewWrapper } from '@tiptap/vue-3'
+import { NodeViewContent, nodeViewProps, NodeViewWrapper } from '@tiptap/vue-3'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import {
@@ -63,22 +63,7 @@ export default {
 		TrashCan,
 	},
 
-	props: {
-		editor: {
-			type: Object,
-			required: true,
-		},
-
-		getPos: {
-			type: Function,
-			required: true,
-		},
-
-		node: {
-			type: Object,
-			required: true,
-		},
-	},
+	props: nodeViewProps,
 
 	data() {
 		return {
diff --git a/src/nodes/Table/TableView.vue b/src/nodes/Table/TableView.vue
index 666f2df417e..196952339de 100644
--- a/src/nodes/Table/TableView.vue
+++ b/src/nodes/Table/TableView.vue
@@ -57,7 +57,7 @@
 
 <script>
 import { t } from '@nextcloud/l10n'
-import { NodeViewContent, NodeViewWrapper } from '@tiptap/vue-3'
+import { NodeViewContent, nodeViewProps, NodeViewWrapper } from '@tiptap/vue-3'
 import NcActionButton from '@nextcloud/vue/components/NcActionButton'
 import NcActions from '@nextcloud/vue/components/NcActions'
 import NcButton from '@nextcloud/vue/components/NcButton'
@@ -82,22 +82,7 @@ export default {
 		TrashCan,
 	},
 
-	props: {
-		editor: {
-			type: Object,
-			required: true,
-		},
-
-		deleteNode: {
-			type: Function,
-			required: true,
-		},
-
-		node: {
-			type: Object,
-			required: true,
-		},
-	},
+	props: nodeViewProps,
 
 	data() {
 		return {
diff --git a/src/tests/extensions/Markdown.spec.js b/src/tests/extensions/Markdown.spec.js
index ebdc0ff833c..9b44e47ee90 100644
--- a/src/tests/extensions/Markdown.spec.js
+++ b/src/tests/extensions/Markdown.spec.js
@@ -13,7 +13,7 @@ import { createMarkdownSerializer } from '../../extensions/Markdown.js'
 import { Italic, Link, Strong, Underline } from '../../marks/index.js'
 import Image from '../../nodes/Image.js'
 import OrderedList from '../../nodes/OrderedList.ts'
-import Table from '../../nodes/Table.js'
+import Table from '../../nodes/Table.ts'
 import TaskItem from '../../nodes/TaskItem.ts'
 import TaskList from '../../nodes/TaskList.ts'
 import createCustomEditor from '../testHelpers/createCustomEditor.ts'
diff --git a/src/tests/nodes/Table.spec.js b/src/tests/nodes/Table.spec.js
index 2ffdb483843..07fe6a99936 100644
--- a/src/tests/nodes/Table.spec.js
+++ b/src/tests/nodes/Table.spec.js
@@ -7,7 +7,7 @@
 import { builders } from 'prosemirror-test-builder'
 import RichText from '../../extensions/RichText.js'
 import markdownit from '../../markdownit/index.ts'
-import EditableTable from '../../nodes/EditableTable.js'
+import EditableTable from '../../nodes/EditableTable.ts'
 import output from '../fixtures/tables/basic/table.html?raw'
 import input from '../fixtures/tables/basic/table.md?raw'
 import otherStructure from '../fixtures/tables/basic/table.structure.html?raw'
diff --git a/src/tests/nodes/TaskItem.spec.js b/src/tests/nodes/TaskItem.spec.js
index 4980686a39f..80ea3f894f5 100644
--- a/src/tests/nodes/TaskItem.spec.js
+++ b/src/tests/nodes/TaskItem.spec.js
@@ -4,7 +4,7 @@
  */
 
 import { getExtensionField } from '@tiptap/core'
-import EditableTable from '../../nodes/EditableTable.js'
+import EditableTable from '../../nodes/EditableTable.ts'
 import testEditor from '../testHelpers/testEditor.js'
 import RichText from './../../extensions/RichText.js'
 import TaskItem from './../../nodes/TaskItem.ts'

From 8ffb415c252dc0029a2d7b0c4ac55339a958f0ed Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Tue, 29 Sep 2026 18:24:58 +0200
Subject: [PATCH 2/4] fix(table): preserve marks in table heading cells

Table cells are serialized one by one with `serializer.serialize()`,
which renders the children of the node it is given. Body cells hold
paragraphs, which render their inline content with marks. Header cells
hold inline content directly, so their text nodes were rendered without
marks. Bold, italic, code and links in table headers were dropped when
the document was saved.

Serialize header cells through their own `toMarkdown()`, which renders
the inline content with marks. It skips escaping of block syntax at the
start of the line (e.g. `#`), because header cells are parsed as inline
content.

Signed-off-by: Jonas <jonas@freesources.org>
Assisted-by: ClaudeCode:claude-opus-5.5
---
 src/nodes/Table/TableHeader.ts |  6 +++++-
 src/nodes/Table/markdown.ts    |  7 +++++--
 src/tests/nodes/Table.spec.js  | 20 ++++++++++++++++++++
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/nodes/Table/TableHeader.ts b/src/nodes/Table/TableHeader.ts
index 6f8135df215..d2e032fe14b 100644
--- a/src/nodes/Table/TableHeader.ts
+++ b/src/nodes/Table/TableHeader.ts
@@ -9,7 +9,11 @@ import { TableHeader } from '@tiptap/extension-table'
 export default TableHeader.extend({
 	content: 'inline*',
 
-	toMarkdown() {},
+	toMarkdown(state, node) {
+		// Header cells are inline-parsed, so no escaping of block syntax at line start
+		state.renderInline(node, false)
+		state.closeBlock(node)
+	},
 
 	parseHTML() {
 		return [
diff --git a/src/nodes/Table/markdown.ts b/src/nodes/Table/markdown.ts
index 6cf8ce7bcfb..ff6264d67ae 100644
--- a/src/nodes/Table/markdown.ts
+++ b/src/nodes/Table/markdown.ts
@@ -175,8 +175,11 @@ function tableToMarkdown(state: MarkdownSerializerState, node: Node) {
 		cellNodes.forEach((node, cellIdx) => {
 			columnWidths[cellIdx] = columnWidths[cellIdx] ?? 0
 
-			// Serialize cell content with all child nodes and split lines
-			const md = serializer.serialize(node)
+			// Serialize cell content with all child nodes and split lines.
+			// Cells with inline content (header cells) are serialized by their own toMarkdown().
+			const md = serializer.serialize(node.inlineContent
+				? node.type.schema.topNodeType.create(null, node)
+				: node)
 			const nodeTypes = new Set<string>()
 			node.descendants((descendant) => {
 				nodeTypes.add(descendant.type.name)
diff --git a/src/tests/nodes/Table.spec.js b/src/tests/nodes/Table.spec.js
index 07fe6a99936..126ed4d2813 100644
--- a/src/tests/nodes/Table.spec.js
+++ b/src/tests/nodes/Table.spec.js
@@ -89,6 +89,26 @@ describe('Table extension', () => {
 		expect(markdownThroughEditor(table)).toBe(table)
 	})
 
+	test('md table with marks in header cells is preserved through editor', ({ markdownThroughEditor }) => {
+		const table = `
+| **bold** | *italic* | ~~strike~~ | \`code\` | [link](https://example.org) |
+|----------|----------|------------|--------|-----------------------------|
+| 1        | 2        | 3          | 4      | 5                           |
+`.trimStart()
+
+		expect(markdownThroughEditor(table)).toBe(table)
+	})
+
+	test('md table with block syntax at start of header cells is preserved through editor', ({ markdownThroughEditor }) => {
+		const table = `
+| # | - item | 1. item | > quote |
+|---|--------|---------|---------|
+| 1 | 2      | 3       | 4       |
+`.trimStart()
+
+		expect(markdownThroughEditor(table)).toBe(table)
+	})
+
 	test('Load into editor', ({ editor, expectDocument }) => {
 		editor.commands.setContent(markdownit.render(input))
 

From 6e50fe5ac71e66360de2a7dd372e6690fec80297 Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Tue, 29 Sep 2026 18:43:06 +0200
Subject: [PATCH 3/4] fix(table): flatten multi-line content pasted into table
 heading cells

Markdown table headers cannot span multiple lines, but pasting
multi-line text into a header cell inserted hard breaks. These were
saved as a multi-line header row. When the document was loaded again,
the header's paragraph did not fit the inline-only header cell, so the
parser put the rest of the table into a new cell. The nested-table
filter then rejected the whole document, and it stayed empty in view
mode.

Flatten content pasted into a header cell to a single line: join
paragraphs, list items and hard breaks with spaces, keeping marks and
other inline nodes.

Also unwrap paragraphs in header cells when parsing, so documents that
already contain a multi-line header load again, with the lines joined.

Fixes: #9297

Signed-off-by: Jonas <jonas@freesources.org>
Assisted-by: ClaudeCode:claude-opus-5.5
---
 src/nodes/Table/TableHeader.ts | 44 ++++++++++++++++++++++++++++++++++
 src/tests/nodes/Table.spec.js  | 20 ++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/src/nodes/Table/TableHeader.ts b/src/nodes/Table/TableHeader.ts
index d2e032fe14b..477e43076a0 100644
--- a/src/nodes/Table/TableHeader.ts
+++ b/src/nodes/Table/TableHeader.ts
@@ -3,8 +3,12 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import type { Node as PMNode } from '@tiptap/pm/model'
+
 import { mergeAttributes } from '@tiptap/core'
 import { TableHeader } from '@tiptap/extension-table'
+import { Fragment, Slice } from '@tiptap/pm/model'
+import { Plugin, PluginKey } from '@tiptap/pm/state'
 
 export default TableHeader.extend({
 	content: 'inline*',
@@ -25,6 +29,8 @@ export default TableHeader.extend({
 			{ tag: 'table tbody :first-child td', priority: 60 },
 			{ tag: 'table > :first-child > th', priority: 60 },
 			{ tag: 'table > :first-child > td', priority: 60 },
+			// Unwrap paragraphs from multiline header cells instead of creating nested tables
+			{ tag: 'p', context: 'tableHeader/', skip: true, priority: 60 },
 		]
 	},
 
@@ -41,4 +47,42 @@ export default TableHeader.extend({
 		}
 		return ['th', attributes, 0]
 	},
+
+	addProseMirrorPlugins() {
+		return [
+			new Plugin({
+				key: new PluginKey('singleLineTableHeader'),
+				props: {
+					// Markdown table headers cannot span multiple lines: flatten pasted content to inline nodes
+					transformPasted: (slice, view) => {
+						if (!this.editor.isActive(this.type.name)) {
+							return slice
+						}
+
+						const { schema } = view.state
+						const nodes: PMNode[] = []
+						const addSpace = () => {
+							const last = nodes[nodes.length - 1]
+							if (last && !(last.isText && last.text?.endsWith(' '))) {
+								nodes.push(schema.text(' '))
+							}
+						}
+						slice.content.descendants((node) => {
+							if (node.isText) {
+								nodes.push(schema.text(node.text!.replace(/\s*\n\s*/g, ' '), node.marks))
+							} else if (node.type.name === 'hardBreak') {
+								addSpace()
+							} else if (node.isInline) {
+								nodes.push(node)
+							} else if (node.isTextblock) {
+								addSpace()
+							}
+						})
+
+						return new Slice(Fragment.from(nodes), 0, 0)
+					},
+				},
+			}),
+		]
+	},
 })
diff --git a/src/tests/nodes/Table.spec.js b/src/tests/nodes/Table.spec.js
index 126ed4d2813..0fb72d0bcf7 100644
--- a/src/tests/nodes/Table.spec.js
+++ b/src/tests/nodes/Table.spec.js
@@ -4,6 +4,7 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
+import { TextSelection } from '@tiptap/pm/state'
 import { builders } from 'prosemirror-test-builder'
 import RichText from '../../extensions/RichText.js'
 import markdownit from '../../markdownit/index.ts'
@@ -294,6 +295,25 @@ describe('Table extension', () => {
 		expect(getBodyColumnValues(editor, 0)).toEqual(['1', '2', '10'])
 		expect(getBodyColumnValues(editor, 1)).toEqual(['c', 'b', 'a'])
 	})
+
+	test('multiline text pasted into header cell is flattened to single line', ({ editor, serializeMarkdown }) => {
+		editor.commands.setContent('<table><tr><th>X</th><th>b</th></tr><tr><td>1</td><td>2</td></tr></table>')
+		editor.view.dispatch(editor.state.tr.setSelection(TextSelection.create(editor.state.doc, 4)))
+		editor.view.pasteText('Street 1\nCity\n\nCountry')
+		expect(serializeMarkdown()).toBe('| XStreet 1 City Country | b |\n|------------------------|---|\n| 1                      | 2 |\n')
+	})
+
+	test('blocks and hard breaks pasted into header cell are flattened keeping marks', ({ editor, serializeMarkdown }) => {
+		editor.commands.setContent('<table><tr><th>X</th></tr><tr><td>1</td></tr></table>')
+		editor.view.dispatch(editor.state.tr.setSelection(TextSelection.create(editor.state.doc, 4)))
+		editor.view.pasteHTML('<p>one <strong>bold</strong></p><ul><li>item</li></ul><p>a<br>b</p>')
+		expect(serializeMarkdown()).toBe('| Xone **bold** item a b |\n|------------------------|\n| 1                      |\n')
+	})
+
+	test('multiline header cell in markdown is loaded as single line', ({ markdownThroughEditor }) => {
+		const table = '| a | b | \\\n| c |   |\n|---|---|\n| 1 | 2 |\n'
+		expect(markdownThroughEditor(table)).toBe('| a c | b |\n|-----|---|\n| 1   | 2 |\n')
+	})
 })
 
 function getHeaderCell(editor, targetIndex = 0) {

From ceb2a9fd9ea125316584194636da0b98792d934b Mon Sep 17 00:00:00 2001
From: Jonas <jonas@freesources.org>
Date: Tue, 29 Sep 2026 18:51:22 +0200
Subject: [PATCH 4/4] fix(table): escape all pipe characters in table cells

Only the first pipe character per line of a cell was escaped when
serializing tables, because the regular expression lacked the global
flag. A cell containing `a|b|c` was saved as `a\|b|c`. On reload the
unescaped pipe split the cell into an extra column.

Signed-off-by: Jonas <jonas@freesources.org>
Assisted-by: ClaudeCode:claude-opus-5.5
---
 src/nodes/Table/markdown.ts   |  2 +-
 src/tests/nodes/Table.spec.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/nodes/Table/markdown.ts b/src/nodes/Table/markdown.ts
index ff6264d67ae..c3ef76ee5c7 100644
--- a/src/nodes/Table/markdown.ts
+++ b/src/nodes/Table/markdown.ts
@@ -187,7 +187,7 @@ function tableToMarkdown(state: MarkdownSerializerState, node: Node) {
 			const lines = md
 				.split(/\r?\n/)
 				// Escape pipe character
-				.map((line) => line.replace(/\|/, '\\$&'))
+				.map((line) => line.replace(/\|/g, '\\$&'))
 
 			row.length = Math.max(row.length, lines.length)
 			const lineLength = Math.max(...lines.map((line) => line.length))
diff --git a/src/tests/nodes/Table.spec.js b/src/tests/nodes/Table.spec.js
index 0fb72d0bcf7..670913466de 100644
--- a/src/tests/nodes/Table.spec.js
+++ b/src/tests/nodes/Table.spec.js
@@ -110,6 +110,16 @@ describe('Table extension', () => {
 		expect(markdownThroughEditor(table)).toBe(table)
 	})
 
+	test('md table with multiple pipes in cells is preserved through editor', ({ markdownThroughEditor }) => {
+		const table = `
+| a \\| b \\| c | d |
+|-------------|---|
+| 1 \\| 2 \\| 3 | 4 |
+`.trimStart()
+
+		expect(markdownThroughEditor(table)).toBe(table)
+	})
+
 	test('Load into editor', ({ editor, expectDocument }) => {
 		editor.commands.setContent(markdownit.render(input))