Skip to content

Commit

Permalink
Merge pull request #3351 from nextcloud/backport/2686/stable24
Browse files Browse the repository at this point in the history
  • Loading branch information
juliushaertl authored Nov 4, 2022
2 parents 3d75028 + 5427733 commit 59c8dc5
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 16 deletions.
4 changes: 2 additions & 2 deletions js/editor.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/editor.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-files.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-files.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-public.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-public.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-text.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-text.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions js/text-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/text-viewer.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/EditorFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ const createEditor = ({ content, onCreate, onUpdate, extensions, enableRichEditi
}
extensions = extensions || []
return new Editor({
content,
content: content + '<p/>',
onCreate,
onUpdate,
extensions: [
Expand Down
2 changes: 2 additions & 0 deletions src/tests/fixtures/tables/basic.out.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@
<td colspan="1" rowspan="1">other cell</td>
</tr>
</table>
<p>
</p>
2 changes: 2 additions & 0 deletions src/tests/fixtures/tables/handbook.out.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,5 @@
<td colspan="1" rowspan="1">16</td>
</tr>
</table>
<p>
</p>
24 changes: 24 additions & 0 deletions src/tests/markdown.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,3 +176,27 @@ describe('Markdown serializer from html', () => {
)).toBe(`::: warn\n!warning!\n\n:::`)
})
})

describe('Trailing nodes', () => {
test('No extra transaction is added after loading', () => {
const source = "# My heading\n\n* test\n* test2"
const tiptap = createEditor({
content: markdownit.render(source),
enableRichEditing: true,
})

const jsonBefore = tiptap.getJSON()

// Focus triggers a transaction which is adding the trailing node
// this pushes a step through the collaboration plugin
// Resulting markdown will not contain the trailing paragraph so everytime the tiptap instance is created from the html, this transaction gets dispatched
tiptap.commands.focus()

const jsonAfter = tiptap.getJSON()
expect(jsonAfter).toStrictEqual(jsonBefore)

const serializer = createMarkdownSerializer(tiptap.schema)
const md = serializer.serialize(tiptap.state.doc)
expect(md).toBe(source)
})
})

0 comments on commit 59c8dc5

Please sign in to comment.