platform: trailing space on reference when inserting note

- added trailing space back in on `fr` and `xo`

Author: irahopkinson

libs/shared-react/src/nodes/usj/node-react-utils.test.ts

@@ -539,7 +539,7 @@ describe("$insertNote()", () => {
 
       // First should be fr with chapter:verse
       expect(charNodes[0].getMarker()).toBe("fr");
-      expect(charNodes[0].getTextContent()).toBe("1:5");
+      expect(charNodes[0].getTextContent()).toBe("1:5 ");
 
       // Last should be ft with placeholder
       const ftNode = charNodes.find((node) => node.getMarker() === "ft");
@@ -624,7 +624,7 @@ describe("$insertNote()", () => {
 
       const xoNode = charNodes.find((node) => node.getMarker() === "xo");
       expect(xoNode).toBeDefined();
-      expect(xoNode?.getTextContent()).toBe("3:16");
+      expect(xoNode?.getTextContent()).toBe("3:16 ");
 
       const xtNode = charNodes.find((node) => node.getMarker() === "xt");
       expect(xtNode).toBeDefined();

libs/shared-react/src/nodes/usj/node-react.utils.ts

@@ -188,7 +188,7 @@ export function $createNoteChildren(
     case "ef":
     case "efe":
       if (chapterNum !== undefined && verseNum !== undefined) {
-        children.push($createCharNode("fr").append($createTextNode(`${chapterNum}:${verseNum}`)));
+        children.push($createCharNode("fr").append($createTextNode(`${chapterNum}:${verseNum} `)));
       }
       if (!selection.isCollapsed()) {
         const selectedText = selection.getTextContent().trim();
@@ -202,7 +202,7 @@ export function $createNoteChildren(
     case "x":
     case "ex":
       if (chapterNum !== undefined && verseNum !== undefined) {
-        children.push($createCharNode("xo").append($createTextNode(`${chapterNum}:${verseNum}`)));
+        children.push($createCharNode("xo").append($createTextNode(`${chapterNum}:${verseNum} `)));
       }
       if (!selection.isCollapsed()) {
         const selectedText = selection.getTextContent().trim();

packages/platform/src/editor/adaptors/usj-marker-action-utils.test.ts

@@ -236,22 +236,30 @@ describe("USJ Marker Action Utils", () => {
   });
 
   describe("should insert a note", () => {
+    const referenceCVText = `${reference.chapterNum}:${reference.verseNum} `;
+
     it("of type footnote", () => {
       const { editor } = createBasicTestEnvironment(nodes, $defaultInitialEditorState);
       const markerAction = getUsjMarkerAction("f", expandedNoteKeyRef, undefined, undefined, {
         discrete: true,
       });
+      // caret after the word "second"
       updateSelection(editor, secondVerseTextNode, 6);
 
       markerAction.action({ editor, reference });
 
       editor.getEditorState().read(() => {
         expect(secondVerseTextNode.getTextContent()).toBe("second");
         const insertedNode = secondVerseTextNode.getNextSibling();
-        if (!$isNoteNode(insertedNode)) throw new Error("Inserted node is not a note");
+        if (!$isNoteNode(insertedNode)) throw new Error("Expected a NoteNode");
         expect(insertedNode.getMarker()).toBe("f");
+
+        const frChar = insertedNode.getChildAtIndex(2);
+        if (!$isCharNode(frChar)) throw new Error("Expected a CharNode");
+        expect(frChar.getTextContent()).toBe(referenceCVText);
+
         const tailTextNode = insertedNode.getNextSibling();
-        if (!$isTextNode(tailTextNode)) throw new Error("Tail node is not text");
+        if (!$isTextNode(tailTextNode)) throw new Error("Expected a TextNode");
         expect(tailTextNode.getTextContent()).toBe(" verse text ");
       });
     });
@@ -261,6 +269,7 @@ describe("USJ Marker Action Utils", () => {
       const markerAction = getUsjMarkerAction("fe", expandedNoteKeyRef, undefined, undefined, {
         discrete: true,
       });
+      // caret after the word "second"
       updateSelection(editor, secondVerseTextNode, 6);
 
       markerAction.action({ editor, reference });
@@ -281,6 +290,7 @@ describe("USJ Marker Action Utils", () => {
       const markerAction = getUsjMarkerAction("ef", expandedNoteKeyRef, undefined, undefined, {
         discrete: true,
       });
+      // caret after the word "second"
       updateSelection(editor, secondVerseTextNode, 6);
 
       markerAction.action({ editor, reference });
@@ -301,17 +311,23 @@ describe("USJ Marker Action Utils", () => {
       const markerAction = getUsjMarkerAction("x", expandedNoteKeyRef, undefined, undefined, {
         discrete: true,
       });
+      // caret after the word "second"
       updateSelection(editor, secondVerseTextNode, 6);
 
       markerAction.action({ editor, reference });
 
       editor.getEditorState().read(() => {
         expect(secondVerseTextNode.getTextContent()).toBe("second");
         const insertedNode = secondVerseTextNode.getNextSibling();
-        if (!$isNoteNode(insertedNode)) throw new Error("Inserted node is not a note");
+        if (!$isNoteNode(insertedNode)) throw new Error("Expected a NoteNode");
         expect(insertedNode.getMarker()).toBe("x");
+
+        const xoChar = insertedNode.getChildAtIndex(2);
+        if (!$isCharNode(xoChar)) throw new Error("Expected a CharNode");
+        expect(xoChar.getTextContent()).toBe(referenceCVText);
+
         const tailTextNode = insertedNode.getNextSibling();
-        if (!$isTextNode(tailTextNode)) throw new Error("Tail node is not text");
+        if (!$isTextNode(tailTextNode)) throw new Error("Expected a TextNode");
         expect(tailTextNode.getTextContent()).toBe(" verse text ");
       });
     });
@@ -321,6 +337,7 @@ describe("USJ Marker Action Utils", () => {
       const markerAction = getUsjMarkerAction("ex", expandedNoteKeyRef, undefined, undefined, {
         discrete: true,
       });
+      // caret after the word "second"
       updateSelection(editor, secondVerseTextNode, 6);
 
       markerAction.action({ editor, reference });

packages/platform/src/editor/adaptors/usj-marker-action.utils.ts

@@ -65,7 +65,7 @@ const getFootnoteMarkerAction: (footnoteMarker: string) => UsjMarkerAction = (fo
         noteChildren.push({
           type: "char",
           marker: "fr",
-          content: [`${chapterNum}:${verseNum}`],
+          content: [`${chapterNum}:${verseNum} `],
         });
       if (currentEditor.noteText)
         noteChildren.push({
@@ -101,7 +101,7 @@ const getCrossReferenceMarkerAction: (crossReferenceMarker: string) => UsjMarker
         noteChildren.push({
           type: "char",
           marker: "xo",
-          content: [`${chapterNum}:${verseNum}`],
+          content: [`${chapterNum}:${verseNum} `],
         });
       if (currentEditor.noteText)
         noteChildren.push({