Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/composables/useEditorMethods.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const useEditorMethods = (editor: Editor) => {
editor.extensionManager.extensions.includes(Markdown)
const html = hasMarkdownContent
? markdownit.render(content) + '<p/>'
: `<pre>${escapeHtml(content)}</pre>`
: `<pre>\n${escapeHtml(content)}</pre>`
editor
.chain()
.setContent(html, { emitUpdate: addToHistory })
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/setInitialYjsState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const setInitialYjsState = (
) => {
const html = isRichEditor
? markdownit.render(content) + '<p/>'
: `<pre>${escapeHtml(content)}</pre>`
: `<pre>\n${escapeHtml(content)}</pre>`

const editor = isRichEditor ? createRichEditor() : createPlainEditor()
editor.commands.setContent(html)
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/updateFromContent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const setContent = (
) => {
const html = isRichEditor
? markdownit.render(content) + '<p/>'
: `<pre>${escapeHtml(content)}</pre>`
: `<pre>\n${escapeHtml(content)}</pre>`
const editor = isRichEditor
? createRichEditor({
extensions: [Collaboration.configure({ document: doc })],
Expand Down
9 changes: 1 addition & 8 deletions src/tests/plaintext.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const escapeHTML = (s) => {
}

const plaintextThroughEditor = (markdown) => {
const content = '<pre>' + escapeHTML(markdown) + '</pre>'
const content = '<pre>\n' + escapeHTML(markdown) + '</pre>'
const tiptap = createPlainEditor()
tiptap.commands.setContent(content)
const plaintext = serializePlainText(tiptap.state.doc) || 'failed'
Expand All @@ -27,14 +27,7 @@ const plaintextThroughEditor = (markdown) => {
}

describe('commonmark as plaintext', () => {
// FIXME: Those two tests currently fail as trailing whitespace seems to be stripped,
// if it occurs in the first line which is empty otherwise.
const skippedMarkdownTests = [97, 117]

spec.forEach((entry) => {
if (skippedMarkdownTests.indexOf(entry.example) !== -1) {
return
}
test('commonmark ' + entry.example, () => {
expect(plaintextThroughEditor(entry.markdown)).toBe(entry.markdown)
})
Expand Down
Loading