Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(docs): defer incompatible worker layout boundaries (#7627)
Univer998ae0032e74
diff --git a/packages/engine-render/src/__tests__/worker-layout.spec.ts b/packages/engine-render/src/__tests__/worker-layout.spec.tsindex 061a2ad479..add24ee20f 100644--- a/packages/engine-render/src/__tests__/worker-layout.spec.ts+++ b/packages/engine-render/src/__tests__/worker-layout.spec.ts@@ -1682,6 +1682,50 @@ describe('worker document layout session', () => {expect(targetSkeleton.getSkeletonData()?.pages[0]).toBe(protectedContinuousPage);targetSkeleton.cancelExternalLayout();+ targetSkeleton.beginExternalLayout({+ reason: 'edit',+ protectedRange: {+ mode: 'continuous',+ startOffset: anchor,+ endOffset: probeProtectedEndOffset,+ },+ });+ const logicalMismatchGeneration = session.start({+ reason: 'edit',+ anchor,+ invalidation: {+ oldStart: anchor,+ oldEnd: anchor,+ newEnd: anchor + insertedText.length,+ },+ });+ let logicalMismatchResult = session.step(logicalMismatchGeneration, 0);+ let deferredBoundaryLogicalMismatch = false;+ for (let step = 0; step < 1_000 && !logicalMismatchResult.progress.complete; step++) {+ const publication = logicalMismatchResult.publication;+ if (publication?.kind === 'block') {+ const transferredPublication = structuredClone(publication);+ const firstUnprotectedLineIndex = transferredPublication.block.flow.lines.findIndex(+ (line) => line.st > probeProtectedEndOffset+ );+ const workerBoundaryLine = transferredPublication.block.flow.lines[firstUnprotectedLineIndex - 1];+ if (workerBoundaryLine != null) {+ workerBoundaryLine.st++;+ workerBoundaryLine.ed++;+ expect(() => targetSkeleton.applyLayoutPublication(+ transferredPublication,+ logicalMismatchResult.progress+ )).not.toThrow();+ deferredBoundaryLogicalMismatch = true;+ break;+ }+ }+ logicalMismatchResult = session.step(logicalMismatchGeneration, 0);+ }+ expect(deferredBoundaryLogicalMismatch).toBe(true);+ expect(targetSkeleton.getSkeletonData()?.pages[0]).toBe(protectedContinuousPage);+ targetSkeleton.cancelExternalLayout();+targetSkeleton.beginExternalLayout({reason: 'edit',protectedRange: {diff --git a/packages/engine-render/src/components/docs/layout/doc-skeleton.ts b/packages/engine-render/src/components/docs/layout/doc-skeleton.tsindex 8a550e4c40..42abab3c49 100644--- a/packages/engine-render/src/components/docs/layout/doc-skeleton.ts+++ b/packages/engine-render/src/components/docs/layout/doc-skeleton.ts@@ -2774,7 +2774,11 @@ export class DocumentSkeleton extends Skeleton {mainBoundaryLine.st !== workerBoundaryLine.st ||mainBoundaryLine.ed !== workerBoundaryLine.ed) {- throw new Error(`Continuous layout Main and Worker boundaries do not share the same continuation checkpoint: Main ${mainBoundaryLine?.st}:${mainBoundaryLine?.ed}@${mainBoundaryLine?.top}/${mainBoundaryLine?.lineHeight}/${mainBoundaryLine?.width}, Worker ${workerBoundaryLine.st}:${workerBoundaryLine.ed}@${workerBoundaryLine.top}/${workerBoundaryLine.lineHeight}/${workerBoundaryLine.width}.`);+ // Async Custom Block measurement can change wrapping while the+ // Worker is already computing the suffix. A different logical+ // boundary cannot be spliced safely, so retain Main's interaction+ // window and apply the queued canonical Worker result at completion.+ return null;}if (mainBoundaryLine.top !== workerBoundaryLine.top ||