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-ui): dismiss validation tooltips on pointer leave (#8148)

白熱5e490f69a2db
diff --git a/packages/sheets-data-validation-ui/src/controllers/__tests__/dv-alert.controller.spec.ts b/packages/sheets-data-validation-ui/src/controllers/__tests__/dv-alert.controller.spec.ts
index 6c07af0c6f..7647831149 100644
--- a/packages/sheets-data-validation-ui/src/controllers/__tests__/dv-alert.controller.spec.ts
+++ b/packages/sheets-data-validation-ui/src/controllers/__tests__/dv-alert.controller.spec.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import type { Nullable } from '@univerjs/core';
+import type { Nullable, Workbook } from '@univerjs/core';
+import type { IRenderContext } from '@univerjs/engine-render';
import type { IHoverCellPosition } from '@univerjs/sheets-ui';
-import type { Subject } from 'rxjs';
import {
DataValidationOperator,
DataValidationStatus,
@@ -27,7 +27,7 @@ import {
RedoCommand,
UndoCommand,
} from '@univerjs/core';
-import { IRenderManagerService, RenderManagerService } from '@univerjs/engine-render';
+import { IRenderManagerService, Rect, RenderManagerService } from '@univerjs/engine-render';
import { IRefSelectionsService, RefSelectionsService, SetRangeValuesMutation } from '@univerjs/sheets';
import {
AddSheetDataValidationCommand,
@@ -40,9 +40,13 @@ import {
CellAlertManagerService,
CellPopupManagerService,
HoverManagerService,
+ HoverRenderController,
SheetCanvasPopManagerService,
+ SheetScrollManagerService,
+ SheetSkeletonManagerService,
} from '@univerjs/sheets-ui';
import { CanvasPopupService, ICanvasPopupService } from '@univerjs/ui';
+import { Subject } from 'rxjs';
import { afterEach, describe, expect, it, onTestFinished, vi } from 'vitest';
import { createDvUiTestBed } from '../../__tests__/create-dv-ui-test-bed';
import enUS from '../../locale/en-US';
@@ -100,6 +104,37 @@ function createAlertTestBed() {
}
describe('DataValidationAlertController', () => {
+ it.each(['visible', 'pending'] as const)('dismisses a %s validation tooltip when the pointer leaves cells for a canvas control', async (state) => {
+ const { injector, alerts, setValue, addRule, hoverCell } = createAlertTestBed();
+ const mainComponent = new Rect('sheet-hover-test');
+ const context = { unitId: 'test', mainComponent, components: new Map() } as unknown as IRenderContext<Workbook>;
+ injector.add([SheetSkeletonManagerService, { useValue: {
+ getCurrentParam: () => ({}),
+ currentSkeleton$: new Subject(),
+ } as unknown as SheetSkeletonManagerService }]);
+ injector.add([SheetScrollManagerService, { useValue: { validViewportScrollInfo$: new Subject() } as unknown as SheetScrollManagerService }]);
+ injector.add([HoverRenderController, { useFactory: function createHoverController() {
+ return injector.createInstance(HoverRenderController, context);
+ } }]);
+ injector.get(HoverRenderController);
+ injector.get(DataValidationAlertController);
+ onTestFinished(() => mainComponent.dispose());
+ setValue(1);
+ addRule();
+ hoverCell(0);
+ await vi.advanceTimersByTimeAsync(state === 'visible' ? 120 : 50);
+ expect(alerts.currentAlert.size).toBe(state === 'visible' ? 1 : 0);
+
+ mainComponent.onPointerLeave$.emitEvent(new PointerEvent('pointerleave') as never);
+ expect(alerts.currentAlert.size).toBe(0);
+ await vi.advanceTimersByTimeAsync(120);
+ expect(alerts.currentAlert.size).toBe(0);
+
+ hoverCell(0);
+ await vi.advanceTimersByTimeAsync(120);
+ expect(alerts.currentAlert.size).toBe(1);
+ });
+
it('closes on undo and reopens on redo without moving the pointer', async () => {
const { injector, commandService, alerts, setValue, addRule, hoverCell } = createAlertTestBed();
injector.get(DataValidationAlertController);
diff --git a/packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts b/packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts
index 7cd1d50742..a76a6e8610 100644
--- a/packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts
@@ -62,6 +62,7 @@ describe('HoverRenderController', () => {
};
const hoverManagerService = {
triggerMouseMove: vi.fn(),
+ triggerMouseLeave: vi.fn(),
triggerPointerDown: vi.fn(),
triggerPointerUp: vi.fn(),
triggerClick: vi.fn(),
@@ -86,14 +87,17 @@ describe('HoverRenderController', () => {
} }],
[SheetScrollManagerService, { useValue: { validViewportScrollInfo$ } }],
]);
- const controller = injector.createInstance(HoverRenderController, {
- unitId: 'unit-1',
- mainComponent,
- components: new Map([
- [SHEET_VIEW_KEY.ROW, rowHeader],
- [SHEET_VIEW_KEY.COLUMN, colHeader],
- ]),
- } as never);
+ injector.add([HoverRenderController, { useFactory: function createHoverController() {
+ return injector.createInstance(HoverRenderController, {
+ unitId: 'unit-1',
+ mainComponent,
+ components: new Map([
+ [SHEET_VIEW_KEY.ROW, rowHeader],
+ [SHEET_VIEW_KEY.COLUMN, colHeader],
+ ]),
+ } as never);
+ } }]);
+ const controller = injector.get(HoverRenderController);
mainComponent.onPointerEnter$.emit({});
expect(controller.active).toBe(true);
diff --git a/packages/sheets-ui/src/controllers/hover-render.controller.ts b/packages/sheets-ui/src/controllers/hover-render.controller.ts
index 07690bd423..aa517fb7c9 100644
--- a/packages/sheets-ui/src/controllers/hover-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/hover-render.controller.ts
@@ -83,6 +83,7 @@ export class HoverRenderController extends Disposable implements IRenderModule {
disposeSet.add(mainComponent.onPointerLeave$.subscribeEvent(() => {
this._active = false;
+ this._hoverManagerService.triggerMouseLeave();
}));
const rowHeader = components.get(SHEET_VIEW_KEY.ROW);
diff --git a/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-hover.render-controller.spec.ts b/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-hover.render-controller.spec.ts
index 902d5ccc6f..a724e1fd5a 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-hover.render-controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-hover.render-controller.spec.ts
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-import type { Workbook } from '@univerjs/core';
+import type { Nullable, Workbook } from '@univerjs/core';
import type { IRenderContext } from '@univerjs/engine-render';
import { EventSubject, IContextService, LocaleType } from '@univerjs/core';
import { DeviceType, IRenderManagerService } from '@univerjs/engine-render';
import { SheetSkeletonService } from '@univerjs/sheets';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import type { IHoverCellPosition } from '../../../../services/hover-manager.service';
import {
MOBILE_EXPANDING_SELECTION,
MOBILE_PINCH_ZOOMING,
@@ -155,6 +156,21 @@ describe('MobileHoverRenderController', () => {
vi.useRealTimers();
});
+ it('clears cell hover on leave and restores it when returning to the same cell', () => {
+ const { hoverManagerService, onPointerMove$, onPointerLeave$ } = createController();
+ const cells: Array<Nullable<IHoverCellPosition>> = [];
+ const subscription = hoverManagerService.currentCell$.subscribe((cell) => cells.push(cell));
+
+ onPointerMove$.emitEvent(pointer(20, 20));
+ expect(cells.at(-1)?.location).toMatchObject({ row: 0, col: 0 });
+ onPointerLeave$.emitEvent(pointer(20, 20));
+ expect(cells.at(-1)).toBeNull();
+ onPointerMove$.emitEvent(pointer(20, 20));
+ expect(cells.at(-1)?.location).toMatchObject({ row: 0, col: 0 });
+
+ subscription.unsubscribe();
+ });
+
it('allows small finger movements and a wider gap between two taps', () => {
const {
controller,
diff --git a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-hover.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-hover.render-controller.ts
index 12bdf3ad05..1150ab0fbe 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-hover.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-hover.render-controller.ts
@@ -169,6 +169,7 @@ export class MobileHoverRenderController extends Disposable implements IRenderMo
disposeSet.add(mainComponent.onPointerLeave$.subscribeEvent(() => {
this._active = false;
this._tapState = null;
+ this._hoverManagerService.triggerMouseLeave();
}));
}
diff --git a/packages/sheets-ui/src/services/hover-manager.service.ts b/packages/sheets-ui/src/services/hover-manager.service.ts
index 27cafa5e63..a9aad08b72 100644
--- a/packages/sheets-ui/src/services/hover-manager.service.ts
+++ b/packages/sheets-ui/src/services/hover-manager.service.ts
@@ -529,6 +529,11 @@ export class HoverManagerService extends Disposable {
}
}
+ triggerMouseLeave() {
+ // Interactive rich-text popups manage their own hover lifetime.
+ this._currentCell$.next(null);
+ }
+
triggerScroll() {
this._currentCell$.next(null);
}