A platform for community discussion. Free, open, simple.
FIX: Map positions when appending trailing inline spaces (#42191)
Renato Atilio540a098520a2
diff --git a/frontend/discourse/app/static/prosemirror/extensions/trailing-inline-space.ts b/frontend/discourse/app/static/prosemirror/extensions/trailing-inline-space.tsindex ba092a44bc8..83a6f316b91 100644--- a/frontend/discourse/app/static/prosemirror/extensions/trailing-inline-space.ts+++ b/frontend/discourse/app/static/prosemirror/extensions/trailing-inline-space.ts@@ -105,7 +105,12 @@ const extension: RichEditorExtension = {}const lastChild = node.lastChild;if (lastChild && isInlineContainer(lastChild)) {- tr.insert(pos + node.nodeSize - 1, newState.schema.text(" "));+ // pos is a new-doc position, so it has to be mapped through the+ // spaces already inserted for earlier nodes.+ tr.insert(+ tr.mapping.map(pos + node.nodeSize - 1),+ newState.schema.text(" ")+ );}});diff --git a/frontend/discourse/tests/integration/components/prosemirror-editor/html-inline-test.js b/frontend/discourse/tests/integration/components/prosemirror-editor/html-inline-test.jsindex 9be6dc9ba93..4cf5cd2cc22 100644--- a/frontend/discourse/tests/integration/components/prosemirror-editor/html-inline-test.js+++ b/frontend/discourse/tests/integration/components/prosemirror-editor/html-inline-test.js@@ -33,6 +33,11 @@ module("<p>Text with <sub>subscript</sub> and <sup>superscript</sup> </p>","Text with <sub>subscript</sub> and <sup>superscript</sup> ",],+ "several blocks ending in inline HTML": [+ "a <sup>1</sup>\n\nb <mark>m</mark>\n\nc <del>d</del>",+ "<p>a <sup>1</sup> </p><p>b <mark>m</mark> </p><p>c <del>d</del> </p>",+ "a <sup>1</sup> \n\nb <mark>m</mark> \n\nc <del>d</del> ",+ ],"HTML mark aliases": ["<b>bold</b> and <i>italic</i>","<p><strong>bold</strong> and <em>italic</em></p>",