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(drawing): float dom event error (#4035)

Univeree8b93dafe92
diff --git a/packages/engine-render/src/engine.ts b/packages/engine-render/src/engine.ts
index 216a0bc964..e72a922ea1 100644
--- a/packages/engine-render/src/engine.ts
+++ b/packages/engine-render/src/engine.ts
@@ -571,13 +571,11 @@ export class Engine extends ThinEngine<Scene> {
}
if (!document.pointerLockElement) {
this._remainCapture = this._mouseId;
- this.getCanvasElement().setPointerCapture(this._mouseId);
}
} else {
// Touch; Since touches are dynamically assigned, only set capture if we have an id
if (evt.pointerId && !document.pointerLockElement) {
this._remainCapture = evt.pointerId;
- this.getCanvasElement().setPointerCapture(evt.pointerId);
}
}
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 7dbb1c1590..7a24eb78c6 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
@@ -367,6 +367,7 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
unitId,
subUnitId,
};
+
this._canvasFloatDomService.addFloatDom({
position$,
id: drawingId,
@@ -429,6 +430,10 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
}
private _scrollUpdateListener() {
+ const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;
+ if (!workbook) {
+ return;
+ }
const updateSheet = (unitId: string, subUnitId: string) => {
const renderObject = this._getSceneAndTransformerByDrawingSearch(unitId);
const map = this._ensureMap(unitId, subUnitId);
@@ -448,23 +453,23 @@ export class SheetCanvasFloatDomManagerService extends Disposable {
};
this.disposeWithMe(
- this._univerInstanceService.getCurrentTypeOfUnit$<Workbook>(UniverInstanceType.UNIVER_SHEET)
- .pipe(
- filter((sheet) => !!sheet),
- map((sheet) => {
- const render = this._renderManagerService.getRenderById(sheet.getUnitId());
- 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)!.onScrollAfter$)
- .pipe(map(() => ({ unitId: render.unitId, subUnitId: render.subUnitId })))
- )
+ workbook.activeSheet$.pipe(
+ filter((sheet) => !!sheet),
+ map((sheet) => {
+ const render = this._renderManagerService.getRenderById(sheet.getUnitId());
+ return render ? { render, unitId: workbook.getUnitId(), subUnitId: sheet.getSheetId() } : null;
+ }),
+ filter((render) => !!render),
+ switchMap((render) =>
+ fromEventSubject(render.render.scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)!.onScrollAfter$)
+ .pipe(map(() => ({ unitId: render.unitId, subUnitId: render.subUnitId })))
)
+ )
.subscribe(({ unitId, subUnitId }) => {
updateSheet(unitId, subUnitId);
})
);
+
this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
if (commandInfo.id === SetZoomRatioOperation.id) {
const params = (commandInfo.params) as any;
diff --git a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts
index dac618973f..aea47a226c 100644
--- a/packages/sheets-ui/src/services/selection/base-selection-render.service.ts
+++ b/packages/sheets-ui/src/services/selection/base-selection-render.service.ts
@@ -534,6 +534,8 @@ export class BaseSelectionRenderService extends Disposable implements ISheetSele
scene.getTransformer()?.clearSelectedObjects();
+ scene.getEngine()?.setRemainCapture();
+
if (rangeType === RANGE_TYPE.ROW || rangeType === RANGE_TYPE.COLUMN) {
if (rangeType === RANGE_TYPE.ROW) {
viewportPosX = 0;