Skip to content

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.

fix(render): avoid large cache diff on scrollbar jumps (#6959)

wpxp1234567a8ddbefb52e
diff --git a/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts b/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts
index 3f671b938f..05d00da3e8 100644
--- a/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts
+++ b/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts
@@ -634,4 +634,18 @@ describe('engine scene viewport extra', () => {
scene.dispose();
engine.dispose();
});
+
+ it('does not bridge non-overlapping cache bounds when calculating cache diff', () => {
+ const { engine, scene, viewport } = createFixture();
+ const currentBound = { left: 0, top: 10000, right: 460, bottom: 10280 };
+ const diffBounds = (viewport as any)._calcDiffCacheBound(
+ { left: 0, top: 0, right: 460, bottom: 280 },
+ currentBound
+ );
+
+ expect(diffBounds).toEqual([currentBound]);
+
+ scene.dispose();
+ engine.dispose();
+ });
});
diff --git a/packages/engine-render/src/components/sheets/__tests__/spreadsheet.integration.spec.ts b/packages/engine-render/src/components/sheets/__tests__/spreadsheet.integration.spec.ts
index 575be9b1d2..416b889f47 100644
--- a/packages/engine-render/src/components/sheets/__tests__/spreadsheet.integration.spec.ts
+++ b/packages/engine-render/src/components/sheets/__tests__/spreadsheet.integration.spec.ts
@@ -500,6 +500,30 @@ describe('spreadsheet integration', () => {
expect(skeleton.rowColumnSegment).toEqual(skeleton.getCacheRangeByViewport(viewportInfo));
});
+ it('refreshes cache instead of incremental painting for large scroll jumps', () => {
+ const { spreadsheet, skeleton, mainCanvas, cacheCanvas, scene } = fixture;
+ const context = mainCanvas.getContext();
+ const viewportInfo = createViewportInfo(scene, cacheCanvas, {
+ diffBounds: [createBound(0, 10000, 460, 10280)],
+ diffCacheBounds: [createBound(0, 10000, 460, 10280)],
+ diffX: 0,
+ diffY: -10000,
+ isDirty: 0,
+ isForceDirty: false,
+ shouldCacheUpdate: 1,
+ });
+ spreadsheet.makeDirty(false);
+ spreadsheet.makeForceDirty(false);
+
+ const paintSpy = vi.spyOn(spreadsheet, 'paintNewAreaForScrolling');
+ const refreshSpy = vi.spyOn(spreadsheet, 'refreshCacheCanvas');
+
+ spreadsheet.renderByViewports(context, viewportInfo, skeleton);
+
+ expect(refreshSpy).toHaveBeenCalledOnce();
+ expect(paintSpy).not.toHaveBeenCalled();
+ });
+
it('draws row and column gap areas using defaults from gapConfig', () => {
const { spreadsheet, skeleton, mainCanvas } = fixture;
const context = mainCanvas.getContext() as any;
diff --git a/packages/engine-render/src/components/sheets/spreadsheet.ts b/packages/engine-render/src/components/sheets/spreadsheet.ts
index 2bb1ede254..5eb758e44c 100644
--- a/packages/engine-render/src/components/sheets/spreadsheet.ts
+++ b/packages/engine-render/src/components/sheets/spreadsheet.ts
@@ -263,8 +263,12 @@ export class Spreadsheet extends SheetComponent {
const isForceDirty = isViewportForceDirty || this.isForceDirty();
const isDirty = isViewportDirty || this.isDirty();
- if (diffBounds.length === 0 || (diffX === 0 && diffY === 0) || isForceDirty || isDirty) {
- if (isDirty || isForceDirty) {
+ const isScrollJumpOutsideCache =
+ Math.abs(diffX) * scaleX >= cacheCanvas.getWidth() ||
+ Math.abs(diffY) * scaleY >= cacheCanvas.getHeight();
+ const shouldRefreshCache = isDirty || isForceDirty || isScrollJumpOutsideCache;
+ if (diffBounds.length === 0 || (diffX === 0 && diffY === 0) || shouldRefreshCache) {
+ if (shouldRefreshCache) {
this.addRenderTagToScene('scrolling', false);
this.refreshCacheCanvas(viewportInfo, { cacheCanvas, cacheCtx, mainCtx, topOrigin, leftOrigin, bufferEdgeX, bufferEdgeY });
}
diff --git a/packages/engine-render/src/viewport.ts b/packages/engine-render/src/viewport.ts
index d8f043e7db..4f0ec1663e 100644
--- a/packages/engine-render/src/viewport.ts
+++ b/packages/engine-render/src/viewport.ts
@@ -1458,6 +1458,15 @@ export class Viewport {
if (!prevBound) {
return [currBound];
}
+ if (
+ prevBound.right <= currBound.left ||
+ currBound.right <= prevBound.left ||
+ prevBound.bottom <= currBound.top ||
+ currBound.bottom <= prevBound.top
+ ) {
+ return [currBound];
+ }
+
const additionalAreas: IBoundRectNoAngle[] = [];
// curr has an extra part on the left compared to prev.