@a3s-lab/office 0.48.1 → 0.50.0

package/dist/0~document-editor.js

@@ -1172,6 +1172,7 @@ function documentChangeKindLabel(kind) {
     if ('formatting' === kind) return '格式';
     if ('paragraph-formatting' === kind) return '段落格式';
     if ('numbering' === kind) return '编号格式';
+    if ('move' === kind) return '移动';
     return '删除';
 }
 function documentChangeWindowKey(change) {
@@ -17433,6 +17434,222 @@ function sortJsonValue(value) {
             sortJsonValue(child)
         ]));
 }
+function createComparisonIdentityFactory(currentSignature, revisedSignature, options) {
+    const seed = stableHash(`${options.mode}\u0000${currentSignature}\u0000${revisedSignature}`);
+    const author = boundedMetadata(options.author, 256) || 'A3S Work user';
+    const date = normalizedDate(options.date);
+    const summary = emptyComparisonSummary();
+    let sequence = 0;
+    return {
+        summary,
+        create (kind) {
+            sequence += 1;
+            if ('insertion' === kind) summary.insertions += 1;
+            else if ('deletion' === kind) summary.deletions += 1;
+            else if ('formatting' === kind) summary.formatting += 1;
+            else if ('move' === kind) summary.moves = (summary.moves ?? 0) + 1;
+            else summary.paragraphFormatting += 1;
+            return {
+                id: `compare-${seed}-${kind}-${sequence.toString(36)}`,
+                author,
+                date
+            };
+        },
+        paragraphIdentity (channel) {
+            return {
+                paragraphId: wordParagraphId(`${seed}:${channel}:paragraph`),
+                textId: wordParagraphId(`${seed}:${channel}:text`)
+            };
+        }
+    };
+}
+function summarizeComparisonChanges(changes) {
+    const summary = emptyComparisonSummary();
+    for (const change of changes)if ('insertion' === change.kind) summary.insertions += 1;
+    else if ('deletion' === change.kind) summary.deletions += 1;
+    else if ('formatting' === change.kind) summary.formatting += 1;
+    else if ('move' === change.kind) summary.moves = (summary.moves ?? 0) + 1;
+    else summary.paragraphFormatting += 1;
+    return summary;
+}
+function emptyComparisonSummary() {
+    return {
+        deletions: 0,
+        formatting: 0,
+        insertions: 0,
+        paragraphFormatting: 0
+    };
+}
+const MAX_INFERRED_MOVE_TEXT = 65536;
+const MAX_INFERRED_MOVES = 256;
+function work_document_compare_moves_appendRevisionUnits(target, units, kind, identity, schema, stripReviewMarks) {
+    for (const unit of units)target.push(schema.text(unit.text, [
+        ...stripReviewMarks(unit.marks),
+        schema.marks.documentChange.create({
+            kind,
+            id: identity.id,
+            actorId: identity.actorId ?? '',
+            author: identity.author,
+            date: identity.date,
+            before: ''
+        })
+    ]));
+}
+function inferInlineMovePairs(changes, marksEqual) {
+    const fullCandidates = [];
+    for (const [stepIndex, change] of changes.entries()){
+        if ('equal' === change.kind) continue;
+        const units = 'delete' === change.kind ? change.left : change.right;
+        const candidate = inlineMoveCandidate(stepIndex, change.kind, units);
+        if (candidate) fullCandidates.push(candidate);
+    }
+    const fullPairs = pairInlineMoveCandidates(fullCandidates, marksEqual);
+    const consumedSteps = new Set();
+    for (const pair of fullPairs){
+        consumedSteps.add(pair.deletion.stepIndex);
+        consumedSteps.add(pair.insertion.stepIndex);
+    }
+    const tokenCandidates = [];
+    for (const [stepIndex, change] of changes.entries()){
+        if ('equal' === change.kind || consumedSteps.has(stepIndex)) continue;
+        const units = 'delete' === change.kind ? change.left : change.right;
+        tokenCandidates.push(...inlineMoveTokenCandidates(stepIndex, change.kind, units));
+    }
+    return [
+        ...fullPairs,
+        ...pairInlineMoveCandidates(tokenCandidates, marksEqual)
+    ].sort((left, right)=>left.deletion.stepIndex - right.deletion.stepIndex || left.insertion.stepIndex - right.insertion.stepIndex || left.deletion.start - right.deletion.start).slice(0, MAX_INFERRED_MOVES);
+}
+function appendComparisonRevisionUnits(target, units, kind, schema, factory, stripReviewMarks, appendRevisionUnits, moves) {
+    if (!moves?.length) return void appendRevisionUnits(target, units, kind, factory.create(kind), schema, stripReviewMarks);
+    const byUnit = new Map();
+    for (const move of [
+        ...moves
+    ].sort((left, right)=>left.candidate.start - right.candidate.start))for(let index = move.candidate.start; index < move.candidate.end; index += 1){
+        if (byUnit.has(index)) return void appendRevisionUnits(target, units, kind, factory.create(kind), schema, stripReviewMarks);
+        byUnit.set(index, move);
+    }
+    let ordinary = [];
+    const flushOrdinary = ()=>{
+        if (!ordinary.length) return;
+        appendRevisionUnits(target, ordinary, kind, factory.create(kind), schema, stripReviewMarks);
+        ordinary = [];
+    };
+    for (const [index, unit] of units.entries()){
+        const move = byUnit.get(index);
+        if (!move) {
+            ordinary.push(unit);
+            continue;
+        }
+        const start = index === move.candidate.start ? move.candidate.startOffset : 0;
+        const end = index === move.candidate.end - 1 ? move.candidate.endOffset : unit.text.length;
+        const prefix = unit.text.slice(0, start);
+        const marked = unit.text.slice(start, end);
+        const suffix = unit.text.slice(end);
+        if (prefix) ordinary.push({
+            text: prefix,
+            marks: unit.marks
+        });
+        flushOrdinary();
+        if (marked) appendMoveRevisionUnits(target, [
+            {
+                text: marked,
+                marks: unit.marks
+            }
+        ], move.role, move.identity, schema, stripReviewMarks);
+        ordinary = suffix ? [
+            {
+                text: suffix,
+                marks: unit.marks
+            }
+        ] : [];
+    }
+    flushOrdinary();
+}
+function pairInlineMoveCandidates(candidates, marksEqual) {
+    const grouped = new Map();
+    for (const candidate of candidates){
+        const group = grouped.get(candidate.text) ?? {
+            deletion: [],
+            insertion: []
+        };
+        ('delete' === candidate.kind ? group.deletion : group.insertion).push(candidate);
+        grouped.set(candidate.text, group);
+    }
+    return Array.from(grouped.values()).filter(({ deletion, insertion })=>1 === deletion.length && 1 === insertion.length && inlineMoveCandidatesEqual(deletion[0], insertion[0], marksEqual)).map(({ deletion, insertion })=>({
+            deletion: deletion[0],
+            insertion: insertion[0]
+        })).sort((left, right)=>left.deletion.stepIndex - right.deletion.stepIndex || left.insertion.stepIndex - right.insertion.stepIndex).slice(0, MAX_INFERRED_MOVES);
+}
+function inlineMoveCandidate(stepIndex, kind, units) {
+    let start = 0;
+    while(start < units.length && isWhitespaceUnit(units[start]))start += 1;
+    let end = units.length;
+    while(end > start && isWhitespaceUnit(units[end - 1]))end -= 1;
+    if (start === end) return null;
+    const first = units[start];
+    const last = units[end - 1];
+    const startOffset = first.leadingWhitespaceAttached ? 0 : first.text.length - first.text.trimStart().length;
+    const endOffset = last.leadingWhitespaceAttached ? last.text.length : last.text.trimEnd().length;
+    const text = units.slice(start, end).map((unit, index, selected)=>unit.text.slice(0 === index ? startOffset : 0, index === selected.length - 1 ? endOffset : unit.text.length)).join('');
+    if (!text || text.length > MAX_INFERRED_MOVE_TEXT || !/[\p{L}\p{N}]/u.test(text)) return null;
+    return {
+        stepIndex,
+        kind,
+        units,
+        start,
+        end,
+        startOffset,
+        endOffset,
+        text
+    };
+}
+function inlineMoveTokenCandidates(stepIndex, kind, units) {
+    const candidates = [];
+    for (const [index, unit] of units.entries()){
+        const leadingWhitespace = unit.text.length - unit.text.trimStart().length;
+        const text = unit.text.slice(leadingWhitespace);
+        if (text && !(text.length > MAX_INFERRED_MOVE_TEXT) && /[\p{L}\p{N}]/u.test(text)) candidates.push({
+            stepIndex,
+            kind,
+            units,
+            start: index,
+            end: index + 1,
+            startOffset: leadingWhitespace,
+            endOffset: unit.text.length,
+            text
+        });
+    }
+    return candidates;
+}
+function inlineMoveCandidatesEqual(left, right, marksEqual) {
+    const leftUnits = selectedMoveUnits(left);
+    const rightUnits = selectedMoveUnits(right);
+    return leftUnits.length === rightUnits.length && leftUnits.every((unit, index)=>unit.text === rightUnits[index]?.text && marksEqual(unit.marks, rightUnits[index]?.marks ?? []));
+}
+function selectedMoveUnits(candidate) {
+    return candidate.units.slice(candidate.start, candidate.end).map((unit, index, selected)=>({
+            text: unit.text.slice(0 === index ? candidate.startOffset : 0, index === selected.length - 1 ? candidate.endOffset : unit.text.length),
+            marks: unit.marks
+        })).filter((unit)=>unit.text.length > 0);
+}
+function isWhitespaceUnit(unit) {
+    return '' === unit.text.trim();
+}
+function appendMoveRevisionUnits(target, units, role, identity, schema, stripReviewMarks) {
+    for (const unit of units)target.push(schema.text(unit.text, [
+        ...stripReviewMarks(unit.marks),
+        schema.marks.documentChange.create({
+            kind: 'move',
+            moveRole: role,
+            id: identity.id,
+            actorId: identity.actorId ?? '',
+            author: identity.author,
+            date: identity.date,
+            before: ''
+        })
+    ]));
+}
 const MAX_COMPARISON_BLOCKS = 1024;
 const MAX_COMPARISON_TEXT = 1000000;
 const MAX_BLOCK_ALIGNMENT_CELLS = 1100000;
@@ -17496,7 +17713,7 @@ function planDocumentCompare(current, revised, options) {
     const limits = comparisonLimits(currentSections, revisedSections);
     if (limits) return unsupportedResult(limits);
     const diagnostics = [];
-    const factory = comparisonIdentityFactory(current, revised, options);
+    const factory = createComparisonIdentityFactory(comparisonSemanticSignature(current), comparisonSemanticSignature(revised), options);
     const comparedSections = [];
     for(let sectionIndex = 0; sectionIndex < currentSections.length; sectionIndex += 1){
         const currentSection = currentSections[sectionIndex];
@@ -17565,7 +17782,7 @@ function planDocumentCombine(current, reviewed) {
     return {
         status: 'applied',
         document: document1,
-        summary: summarizeChanges(reviewedChanges),
+        summary: summarizeComparisonChanges(reviewedChanges),
         diagnostics: []
     };
 }
@@ -17637,11 +17854,11 @@ function comparePairedBlocks(current, revised, factory) {
     return current.type.create(attributes, inline);
 }
 function compareInlineContent(current, revised, factory) {
-    const currentUnits = inlineUnits(current);
-    const revisedUnits = inlineUnits(revised);
+    let currentUnits = inlineUnits(current);
+    let revisedUnits = inlineUnits(revised);
     if (!currentUnits || !revisedUnits) return null;
     const diff = boundedDocumentSequenceDiff(currentUnits, revisedUnits, (left, right)=>left.text === right.text, MAX_INLINE_DIFF_CELLS);
-    const changes = diff ?? [
+    let changes = diff ?? [
         {
             kind: 'delete',
             left: currentUnits,
@@ -17653,14 +17870,48 @@ function compareInlineContent(current, revised, factory) {
             right: revisedUnits
         }
     ];
+    const baseMovePairs = inferInlineMovePairs(changes, work_document_compare_marksEqual);
+    const moveCurrentUnits = inlineUnits(current, true);
+    const moveRevisedUnits = inlineUnits(revised, true);
+    if (moveCurrentUnits && moveRevisedUnits && current.textContent.length + revised.textContent.length <= 131072) {
+        const moveDiff = boundedDocumentSequenceDiff(moveCurrentUnits, moveRevisedUnits, (left, right)=>left.text === right.text, MAX_INLINE_DIFF_CELLS);
+        if (moveDiff) {
+            const moveChanges = moveDiff;
+            const movePairs = inferInlineMovePairs(moveChanges, work_document_compare_marksEqual);
+            if (movePairs.length >= baseMovePairs.length && movePairs.length > 0) {
+                currentUnits = moveCurrentUnits;
+                revisedUnits = moveRevisedUnits;
+                changes = moveChanges;
+            }
+        }
+    }
+    const movePairs = inferInlineMovePairs(changes, work_document_compare_marksEqual);
+    const movesByStep = new Map();
+    for (const pair of movePairs){
+        const identity = factory.create('move');
+        const deletion = movesByStep.get(pair.deletion.stepIndex) ?? [];
+        deletion.push({
+            role: 'from',
+            candidate: pair.deletion,
+            identity
+        });
+        movesByStep.set(pair.deletion.stepIndex, deletion);
+        const insertion = movesByStep.get(pair.insertion.stepIndex) ?? [];
+        insertion.push({
+            role: 'to',
+            candidate: pair.insertion,
+            identity
+        });
+        movesByStep.set(pair.insertion.stepIndex, insertion);
+    }
     const nodes = [];
-    for (const change of changes){
+    for (const [stepIndex, change] of changes.entries()){
         if ('delete' === change.kind) {
-            appendRevisionUnits(nodes, change.left, 'deletion', factory.create('deletion'), current.type.schema);
+            appendComparisonRevisionUnits(nodes, change.left, 'deletion', current.type.schema, factory, withoutReviewMarks, work_document_compare_moves_appendRevisionUnits, movesByStep.get(stepIndex));
             continue;
         }
         if ('insert' === change.kind) {
-            appendRevisionUnits(nodes, change.right, 'insertion', factory.create('insertion'), current.type.schema);
+            appendComparisonRevisionUnits(nodes, change.right, 'insertion', current.type.schema, factory, withoutReviewMarks, work_document_compare_moves_appendRevisionUnits, movesByStep.get(stepIndex));
             continue;
         }
         let formattingIdentity = null;
@@ -17668,7 +17919,7 @@ function compareInlineContent(current, revised, factory) {
         for(let index = 0; index < change.left.length; index += 1){
             const left = change.left[index];
             const right = change.right[index];
-            if (marksEqual(left.marks, right.marks)) {
+            if (work_document_compare_marksEqual(left.marks, right.marks)) {
                 nodes.push(current.type.schema.text(left.text, [
                     ...left.marks
                 ]));
@@ -17692,12 +17943,12 @@ function compareInlineContent(current, revised, factory) {
             }
             const deletion = factory.create('deletion');
             const insertion = factory.create('insertion');
-            appendRevisionUnits(nodes, [
+            work_document_compare_moves_appendRevisionUnits(nodes, [
                 left
-            ], 'deletion', deletion, current.type.schema);
-            appendRevisionUnits(nodes, [
+            ], 'deletion', deletion, current.type.schema, withoutReviewMarks);
+            work_document_compare_moves_appendRevisionUnits(nodes, [
                 right
-            ], 'insertion', insertion, current.type.schema);
+            ], 'insertion', insertion, current.type.schema, withoutReviewMarks);
             formattingIdentity = null;
             formattingSignature = '';
         }
@@ -17712,9 +17963,9 @@ function structuralChangeBlock(block, kind, factory, identityChannel) {
         textId: block.attrs.textId
     };
     const nodes = [];
-    for (const unit of inlineUnits(block) ?? [])appendRevisionUnits(nodes, [
+    for (const unit of inlineUnits(block) ?? [])work_document_compare_moves_appendRevisionUnits(nodes, [
         unit
-    ], kind, identity, block.type.schema);
+    ], kind, identity, block.type.schema, withoutReviewMarks);
     return block.type.create({
         ...block.attrs,
         ...paragraphIdentity,
@@ -17725,19 +17976,6 @@ function structuralChangeBlock(block, kind, factory, identityChannel) {
         blockChangeDate: identity.date
     }, model_Fragment.fromArray(nodes));
 }
-function appendRevisionUnits(target, units, kind, identity, schema) {
-    for (const unit of units)target.push(schema.text(unit.text, [
-        ...withoutReviewMarks(unit.marks),
-        schema.marks.documentChange.create({
-            kind,
-            id: identity.id,
-            actorId: identity.actorId ?? '',
-            author: identity.author,
-            date: identity.date,
-            before: ''
-        })
-    ]));
-}
 function comparisonMark(node, kind, identity, before) {
     return node.type.schema.marks.documentChange.create({
         kind,
@@ -17821,19 +18059,35 @@ function hasStructuralBlockRevisions(document1) {
     });
     return found;
 }
-function inlineUnits(node) {
+function inlineUnits(node, attachLeadingWhitespace = false) {
     if (!isSimpleTextBlock(node)) return null;
     const units = [];
     node.forEach((child)=>{
         const text = child.text ?? '';
-        for (const part of text.match(/\s+|[\p{L}\p{N}_]+|[^\s\p{L}\p{N}_]/gu) ?? [])units.push({
-            text: part,
-            marks: child.marks
+        let pendingWhitespace = '';
+        for (const part of text.match(/\s+|[\p{L}\p{N}_]+|[^\s\p{L}\p{N}_]/gu) ?? []){
+            if (attachLeadingWhitespace && '' === part.trim()) {
+                pendingWhitespace += part;
+                continue;
+            }
+            units.push({
+                text: attachLeadingWhitespace ? `${pendingWhitespace}${part}` : part,
+                marks: child.marks,
+                ...attachLeadingWhitespace ? {
+                    leadingWhitespaceAttached: true
+                } : {}
+            });
+            pendingWhitespace = '';
+        }
+        if (attachLeadingWhitespace && pendingWhitespace) units.push({
+            text: pendingWhitespace,
+            marks: child.marks,
+            leadingWhitespaceAttached: true
         });
     });
     return units;
 }
-function marksEqual(left, right) {
+function work_document_compare_marksEqual(left, right) {
     const normalizedLeft = withoutReviewMarks(left);
     const normalizedRight = withoutReviewMarks(right);
     return normalizedLeft.length === normalizedRight.length && normalizedLeft.every((mark, index)=>mark.eq(normalizedRight[index]));
@@ -17919,42 +18173,6 @@ function transferCombineIdentities(current, reviewed) {
     if ('documentSection' === reviewed.type.name) attributes.id = current.attrs.id;
     return reviewed.isText ? reviewed : reviewed.type.create(attributes, model_Fragment.fromArray(content), reviewed.marks);
 }
-function comparisonIdentityFactory(current, revised, options) {
-    const seed = stableHash(`${options.mode}\u0000${comparisonSemanticSignature(current)}\u0000${comparisonSemanticSignature(revised)}`);
-    const author = boundedMetadata(options.author, 256) || 'A3S Work user';
-    const date = normalizedDate(options.date);
-    const summary = emptyComparisonSummary();
-    let sequence = 0;
-    return {
-        summary,
-        create (kind) {
-            sequence += 1;
-            if ('insertion' === kind) summary.insertions += 1;
-            else if ('deletion' === kind) summary.deletions += 1;
-            else if ('formatting' === kind) summary.formatting += 1;
-            else summary.paragraphFormatting += 1;
-            return {
-                id: `compare-${seed}-${kind}-${sequence.toString(36)}`,
-                author,
-                date
-            };
-        },
-        paragraphIdentity (channel) {
-            return {
-                paragraphId: wordParagraphId(`${seed}:${channel}:paragraph`),
-                textId: wordParagraphId(`${seed}:${channel}:text`)
-            };
-        }
-    };
-}
-function summarizeChanges(changes) {
-    const summary = emptyComparisonSummary();
-    for (const change of changes)if ('insertion' === change.kind) summary.insertions += 1;
-    else if ('deletion' === change.kind) summary.deletions += 1;
-    else if ('formatting' === change.kind) summary.formatting += 1;
-    else summary.paragraphFormatting += 1;
-    return summary;
-}
 function structuralBlockDiagnostic(block, section, blockIndex) {
     return 'paragraph' === block.type.name || 'heading' === block.type.name ? {
         code: 'empty-structural-change',
@@ -17977,14 +18195,6 @@ function unsupportedResult(diagnostic) {
         ]
     };
 }
-function emptyComparisonSummary() {
-    return {
-        deletions: 0,
-        formatting: 0,
-        insertions: 0,
-        paragraphFormatting: 0
-    };
-}
 function childNodes(node) {
     const children = [];
     node.forEach((child)=>{
@@ -18184,7 +18394,7 @@ function DocumentCompareDialog({ initialMode, restoreFocusTarget, onApplied, onC
                             }
                         }),
                         /*#__PURE__*/ jsx("small", {
-                            children: "该名称会显示在生成的插入、删除与格式修订中。"
+                            children: "该名称会显示在生成的插入、删除、移动与格式修订中。"
                         })
                     ]
                 }),
@@ -18222,7 +18432,7 @@ function ComparisonBoundary({ mode }) {
                 children: 'compare' === mode ? '确定性比较边界' : '安全合并边界'
             }),
             /*#__PURE__*/ jsx("p", {
-                children: 'compare' === mode ? '支持同一分节布局中的段落、标题、文字和格式差异；复杂对象或节布局变化会明确停止。' : '审阅副本必须包含修订，且拒绝全部修订后与当前文档一致；现有修订须先处理。'
+                children: 'compare' === mode ? '支持同一分节布局中的段落、标题、文字、格式差异，以及同一段内可安全识别的文本移动；复杂对象或节布局变化会明确停止。' : '审阅副本必须包含修订，且拒绝全部修订后与当前文档一致；现有修订须先处理。'
             })
         ]
     });
@@ -18293,7 +18503,7 @@ function useDocumentComparison({ editor, onApplied }) {
         }
     };
     const applied = (result)=>{
-        const count = result.summary.insertions + result.summary.deletions + result.summary.formatting + result.summary.paragraphFormatting;
+        const count = result.summary.insertions + result.summary.deletions + result.summary.formatting + result.summary.paragraphFormatting + (result.summary.moves ?? 0);
         close();
         onApplied();
         showToast(`已生成 ${count} 项可审阅修订`, 'success');
@@ -19872,7 +20082,10 @@ function createDocumentPaginationRunCoordinator({ cancelFrame, onAbort, onCoales
     };
 }
 const MAX_DOCUMENT_BLOCK_RESIZE_OBSERVATIONS = 4096;
-function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, page, selectionVersion, wasmUrl, layoutFonts, loadedLayoutFontIds }) {
+function neverComposing() {
+    return false;
+}
+function useDocumentPagination({ compositionRevision = 0, editor, documentRevision, enabled, isComposing = neverComposing, layoutKey, page, selectionVersion, wasmUrl, layoutFonts, loadedLayoutFontIds }) {
     const client = useOfficeKernelClient(wasmUrl, layoutFonts);
     const editorMounted = useEditorMounted(editor);
     const revision = useRef(0);
@@ -20011,6 +20224,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             for (const element of observedElements)observer?.observe(element);
         };
         const run = async (signal)=>{
+            if (isComposing()) return void measurementRange.ensureDirty();
             stopObservingBlocks();
             const nextRevision = ++revision.current;
             editor.commands.clearDocumentPagination(nextRevision);
@@ -20040,7 +20254,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                                 documentRevision,
                                 paragraphs
                             }, signal);
-                            if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed) return;
+                            if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed || isComposing()) return;
                             textLayoutEngine ||= textLayout.engine;
                             unsupportedTextLayoutCount += textLayout.unsupportedParagraphIds.length + textLayout.layouts.filter((layout)=>layout.missingGlyphCount > 0).length;
                             for (const layout of textLayout.layouts)if (0 === layout.missingGlyphCount) {
@@ -20051,7 +20265,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                         editorDom.dataset.paginationTextEngine = textLayoutEngine;
                         editorDom.dataset.paginationUnsupportedText = String(unsupportedTextLayoutCount);
                     } catch (error) {
-                        if (signal.aborted || error instanceof DOMException && 'AbortError' === error.name) return;
+                        if (signal.aborted || isComposing() || error instanceof DOMException && 'AbortError' === error.name) return;
                         textLayouts.clear();
                         fallbackGlyphCount = 0;
                         editorDom.dataset.paginationTextEngine = 'dom';
@@ -20069,6 +20283,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                 const snapshot = await measureDocumentLayoutBlocksIncrementally(editor, measurementCache.current, measurementStart, textLayouts, 1000000, {
                     signal
                 });
+                if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed || isComposing()) return;
                 measurementCache.current = snapshot;
                 editorDom.dataset.paginationBlocks = String(snapshot.blocks.length);
                 editorDom.dataset.paginationFlows = String(new Set(snapshot.blocks.flatMap((block)=>block.block.flowId ? [
@@ -20098,7 +20313,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                         pageStyles: snapshot.pageStyles,
                         blocks: layoutPlan.blocks
                     }, signal);
-                    if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed) return;
+                    if (disposed || signal.aborted || nextRevision !== revision.current || editor.isDestroyed || isComposing()) return;
                     const layout = previousPagination && layoutPlan.startPageIndex > 0 ? mergeIncrementalDocumentLayout(previousPagination.layout, partialLayout) : partialLayout;
                     const blockById = new Map(snapshot.blocks.map((block)=>[
                             block.block.id,
@@ -20147,7 +20362,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
                     measurementRange.commit(measurementPass);
                     setPagination(nextPagination);
                 } catch (error) {
-                    if (disposed || signal.aborted || error instanceof DOMException && 'AbortError' === error.name) return;
+                    if (disposed || signal.aborted || isComposing() || error instanceof DOMException && 'AbortError' === error.name) return;
                     editorDom.dataset.paginationState = 'error';
                     editorDom.dataset.paginationError = error instanceof Error ? `${error.name}: ${error.message}` : 'UnknownError';
                     editor.commands.clearDocumentPagination(nextRevision);
@@ -20167,7 +20382,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             onCoalescedRequest: ()=>updateDiagnostic('coalescedRequests', 'paginationCoalescedRequests'),
             onError: (error)=>{
                 measurementRange.restoreActive();
-                if (disposed || editor.isDestroyed) return;
+                if (disposed || editor.isDestroyed || isComposing()) return;
                 editorDom.dataset.paginationState = 'error';
                 editorDom.dataset.paginationError = error instanceof Error ? `${error.name}: ${error.message}` : 'UnknownError';
                 paginationCache.current = null;
@@ -20184,6 +20399,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             run
         });
         const schedule = (invalidateActive = false)=>{
+            if (isComposing()) return;
             coordinator.request({
                 invalidateActive
             });
@@ -20200,6 +20416,15 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             markDirty(earliestChangedPosition(transaction));
             schedule(true);
         };
+        const handleCompositionStart = ()=>{
+            measurementRange.ensureDirty();
+            coordinator.request({
+                invalidateActive: true
+            });
+        };
+        const handleCompositionEnd = ()=>{
+            schedule(true);
+        };
         const handleLoadedAsset = (event)=>{
             updateDiagnostic('assetTriggers', 'paginationAssetTriggers');
             const target = event.target;
@@ -20219,6 +20444,8 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
         };
         const fonts = document.fonts;
         editor.on('update', handleDocumentUpdate);
+        editorDom.addEventListener('compositionstart', handleCompositionStart);
+        editorDom.addEventListener('compositionend', handleCompositionEnd);
         editorDom.addEventListener('load', handleLoadedAsset, true);
         fonts?.addEventListener('loadingdone', handleFontLoading);
         window.addEventListener('resize', handleWindowResize);
@@ -20227,6 +20454,8 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
             disposed = true;
             stopObservingBlocks();
             editor.off('update', handleDocumentUpdate);
+            editorDom.removeEventListener('compositionstart', handleCompositionStart);
+            editorDom.removeEventListener('compositionend', handleCompositionEnd);
             editorDom.removeEventListener('load', handleLoadedAsset, true);
             fonts?.removeEventListener('loadingdone', handleFontLoading);
             window.removeEventListener('resize', handleWindowResize);
@@ -20234,6 +20463,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
         };
     }, [
         client,
+        compositionRevision,
         documentRevision,
         editor,
         editorMounted,
@@ -20243,6 +20473,7 @@ function useDocumentPagination({ editor, documentRevision, enabled, layoutKey, p
         layoutFonts,
         loadedLayoutFontKey,
         loadedLayoutFontIds,
+        isComposing,
         pageKey
     ]);
     const resolveFieldContext = useMemo(()=>pagination ? createDocumentFieldPaginationContextResolver(pagination) : null, [
@@ -20929,12 +21160,24 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
             },
             handleDOMEvents: {
                 compositionstart: ()=>{
-                    composition.start();
+                    composition.start(editorRef.current);
                     return false;
                 },
-                compositionend: ()=>{
+                compositionupdate: ()=>{
+                    composition.start(editorRef.current);
+                    return false;
+                },
+                beforeinput: (_view, event)=>{
+                    composition.noteInput(event);
+                    return false;
+                },
+                input: (_view, event)=>{
+                    composition.noteInput(event);
+                    return false;
+                },
+                compositionend: (_view, event)=>{
                     const current = editorRef.current;
-                    if (current) composition.end(current, (settled)=>settleCompositionRef.current(settled));
+                    if (current) composition.end(current, event.data ?? null, (settled, snapshot)=>settleCompositionRef.current(settled, snapshot));
                     return false;
                 }
             }
@@ -21010,7 +21253,20 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
         publishDocumentUpdate,
         queueLazyDocumentPublication
     ]);
-    settleCompositionRef.current = (current)=>{
+    settleCompositionRef.current = (current, snapshot)=>{
+        if (null !== snapshot.text && snapshot.range && !current.isDestroyed) {
+            const maximum = current.state.doc.content.size;
+            const from = Math.max(0, Math.min(maximum, snapshot.range.from));
+            const to = Math.max(0, Math.min(maximum, snapshot.range.to));
+            const start = Math.min(from, to);
+            const end = Math.max(from, to);
+            const currentText = current.state.doc.textBetween(start, end, '\n', '\n');
+            if (currentText !== snapshot.text) {
+                if (trackChangesRef.current) current.commands.replaceDocumentTextWithTrackedChange(start, end, snapshot.text);
+                else current.view.dispatch(current.state.tr.insertText(snapshot.text, start, end).setMeta('composition', snapshot.id).setMeta('uiEvent', 'input'));
+                current.view.dom.dataset.documentCompositionNormalized = 'true';
+            }
+        }
         const pending = pendingLazyPublicationRef.current;
         if (pending) {
             pending.cancel();
@@ -21065,6 +21321,8 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
             composition.destroy();
         },
         onTransaction: ({ appendedTransactions, editor: current, transaction })=>{
+            composition.recordTransaction(transaction);
+            for (const appended of appendedTransactions ?? [])composition.recordTransaction(appended);
             if (documentTransactionsOnlyHydrateChunks([
                 transaction,
                 ...appendedTransactions
@@ -21429,10 +21687,16 @@ function DocumentEditorSurface({ artifactId, autoFocus = true, collaboration, co
         JSON.stringify(layout.pageMargins),
         layout.pageSize
     ]);
+    const documentCompositionIsActive = useCallback(()=>composition.isBlocking(editor), [
+        composition,
+        editor
+    ]);
     const pagination = useDocumentPagination({
+        compositionRevision,
         editor,
         documentRevision: editorInput.revision,
         enabled: Boolean(editor && 'page' === viewMode),
+        isComposing: documentCompositionIsActive,
         layoutKey: [
             layout.breakAfter,
             layout.columns.count,