fix(converter): treat w:moveFrom/w:moveTo as tracked-change wrappers in field preservation

Author: luccas-harbour

packages/super-editor/src/editors/v1/core/super-converter/field-references/preProcessNodesForFldChar.js

@@ -3,11 +3,11 @@
  */
 import { getInstructionPreProcessor } from './fld-preprocessors';
 import { carbonCopy } from '@core/utilities/carbonCopy.js';
+import { isTrackChangeElement } from '../v2/importer/trackChangeElements.js';
 
 const SKIP_FIELD_PROCESSING_NODE_NAMES = new Set(['w:drawing', 'w:pict']);
 
 const shouldSkipFieldProcessing = (node) => SKIP_FIELD_PROCESSING_NODE_NAMES.has(node?.name);
-const isTrackChangeWrapper = (node) => node?.name === 'w:del' || node?.name === 'w:ins';
 /**
  * @typedef {object} FldCharProcessResult
  * @property {OpenXmlNode[]} processedNodes - The list of nodes after processing.
@@ -212,7 +212,7 @@ export const preProcessNodesForFldChar = (nodes = [], docx) => {
         // A field started in the children, so this node is part of that field.
         childResult.unpairedBegin.forEach((pendingField) => {
           const fieldInfo = { ...pendingField.fieldInfo };
-          if (fieldInfo.preserveRaw || isTrackChangeWrapper(node)) {
+          if (fieldInfo.preserveRaw || isTrackChangeElement(node)) {
             fieldInfo.preserveRaw = true;
           }
           currentFieldStack.push(fieldInfo);
@@ -226,7 +226,7 @@ export const preProcessNodesForFldChar = (nodes = [], docx) => {
         });
       } else if (childResult.unpairedEnd) {
         // A field from this level or higher ended in the children.
-        const shouldPreserveRaw = childResult.unpairedEndPreserveRaw || isTrackChangeWrapper(node);
+        const shouldPreserveRaw = childResult.unpairedEndPreserveRaw || isTrackChangeElement(node);
         if (collectedNodesStack.length === 0) {
           // Preserve the original subtree; child processing may have stripped the fldChar end marker.
           processedNodes.push(rawNode);

packages/super-editor/src/editors/v1/core/super-converter/field-references/preProcessNodesForFldChar.test.js

@@ -418,6 +418,52 @@ describe('preProcessNodesForFldChar', () => {
     expect(docx['word/_rels/document.xml.rels'].elements[0].elements).toEqual([]);
   });
 
+  it('preserves raw field nodes when an active field ends inside a tracked move wrapper', () => {
+    const expectedNodes = [
+      { name: 'w:r', elements: [{ name: 'w:fldChar', attributes: { 'w:fldCharType': 'begin' } }] },
+      {
+        name: 'w:r',
+        elements: [{ name: 'w:instrText', elements: [{ type: 'text', text: 'HYPERLINK "http://example.com"' }] }],
+      },
+      { name: 'w:r', elements: [{ name: 'w:fldChar', attributes: { 'w:fldCharType': 'separate' } }] },
+      { name: 'w:r', elements: [{ name: 'w:t', elements: [{ type: 'text', text: 'link text' }] }] },
+      {
+        name: 'w:p',
+        elements: [
+          {
+            name: 'w:moveFrom',
+            attributes: { 'w:id': '1', 'w:author': 'Repro', 'w:date': '2026-04-30T00:00:00Z' },
+            elements: [
+              { name: 'w:r', elements: [{ name: 'w:fldChar', attributes: { 'w:fldCharType': 'end' } }] },
+              {
+                name: 'w:r',
+                elements: [
+                  {
+                    name: 'w:t',
+                    attributes: { 'xml:space': 'preserve' },
+                    elements: [{ type: 'text', text: 'moved text after field end' }],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    ];
+    const nodes = structuredClone(expectedNodes);
+    const docx = {
+      'word/_rels/document.xml.rels': {
+        elements: [{ name: 'Relationships', elements: [] }],
+      },
+    };
+    const { processedNodes, unpairedBegin, unpairedEnd } = preProcessNodesForFldChar(nodes, docx);
+
+    expect(processedNodes).toEqual(expectedNodes);
+    expect(unpairedBegin).toBeNull();
+    expect(unpairedEnd).toBeNull();
+    expect(docx['word/_rels/document.xml.rels'].elements[0].elements).toEqual([]);
+  });
+
   it('preserves raw child nodes when an unpaired end bubbles through a non-collecting wrapper', () => {
     const expectedNodes = [
       { name: 'w:r', elements: [{ name: 'w:fldChar', attributes: { 'w:fldCharType': 'begin' } }] },

packages/super-editor/src/editors/v1/core/super-converter/v2/importer/trackChangeElements.js

@@ -0,0 +1,5 @@
+const TRACK_CHANGE_ELEMENT_NAMES = new Set(['w:del', 'w:ins', 'w:moveFrom', 'w:moveTo']);
+const TRANSLATED_TRACK_CHANGE_ELEMENT_NAMES = new Set(['w:del', 'w:ins']);
+
+export const isTrackChangeElement = (node) => TRACK_CHANGE_ELEMENT_NAMES.has(node?.name);
+export const isTranslatedTrackChangeElement = (node) => TRANSLATED_TRACK_CHANGE_ELEMENT_NAMES.has(node?.name);

packages/super-editor/src/editors/v1/core/super-converter/v2/importer/trackChangesImporter.js

@@ -1,14 +1,13 @@
 import { translator as wDelTranslator } from '@converter/v3/handlers/w/del';
 import { translator as wInsTranslator } from '@converter/v3/handlers/w/ins';
-
-const isTrackChangeElement = (node) => node?.name === 'w:del' || node?.name === 'w:ins';
+import { isTranslatedTrackChangeElement } from './trackChangeElements.js';
 
 const unwrapTrackChangeNode = (node) => {
   if (!node) {
     return null;
   }
 
-  if (isTrackChangeElement(node)) {
+  if (isTranslatedTrackChangeElement(node)) {
     return node;
   }