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(sheets-drawing-ui): float dom scroll not update on drag range (#3840)

zhangw575a6043f2a7
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png
index fb33ebc7ea..41875f2f7d 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png differ
diff --git a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts
index 044ff46cef..92e53cb232 100644
--- a/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts
+++ b/packages/sheets-drawing-ui/src/services/canvas-float-dom-manager.service.ts
@@ -388,10 +388,8 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
}
});
};
- let time = 0;
this.disposeWithMe(
-
this._univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET)
.pipe(
filter((sheet) => !!sheet),
@@ -400,18 +398,14 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
return render ? { render, unitId: sheet.getUnitId(), subUnitId: sheet.getActiveSheet().getSheetId() } : null;
}),
filter((render) => !!render),
- switchMap((render) => fromEventSubject(render.render.scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)!.onMouseWheel$)
- .pipe(
- map(() => ({ unitId: render.unitId, subUnitId: render.subUnitId }))
- )
+ switchMap((render) =>
+ fromEventSubject(render.render.scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)!.onScrollAfter$)
+ .pipe(map(() => ({ unitId: render.unitId, subUnitId: render.subUnitId })))
)
)
.subscribe(({ unitId, subUnitId }) => {
- const now = performance.now();
- time = now;
updateSheet(unitId, subUnitId);
})
-
);
this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
if (commandInfo.id === SetZoomRatioOperation.id) {
diff --git a/packages/ui/src/views/components/dom/FloatDom.tsx b/packages/ui/src/views/components/dom/FloatDom.tsx
index 920b151fb4..fa9fb0c40c 100644
--- a/packages/ui/src/views/components/dom/FloatDom.tsx
+++ b/packages/ui/src/views/components/dom/FloatDom.tsx
@@ -58,8 +58,8 @@ const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) => {
const sizeSubscription = size$.subscribe((size) => {
if (domRef.current) {
- domRef.current.style.width = `${size.endX - size.startX}px`;
- domRef.current.style.height = `${size.endY - size.startY}px`;
+ domRef.current.style.width = `${Math.max(size.endX - size.startX - 2, 0)}px`;
+ domRef.current.style.height = `${Math.max(size.endY - size.startY - 2, 0)}px`;
}
if (innerDomRef.current) {