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): prevent layered table selection highlight (#7476)
Univer2bdddf669bd8
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.tsindex 90a56238d2..edc038a70c 100644--- a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts+++ b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts@@ -91,29 +91,6 @@ test('diff demo sheet content', async ({ page }) => {expect(errored).toBeFalsy();});-/**- * Aim for merged cells rendering.- */-test('diff merged cells rendering', async () => {- const browser = await chromium.launch({- headless: !!isCI, // Set to false to see the browser window- });- const context = await browser.newContext({- viewport: { width: 1280, height: 1280 },- deviceScaleFactor: 2, // Set your desired DPR- });- const page = await context.newPage();- await page.goto('http://localhost:3000/sheets/');- await page.waitForTimeout(2000);-- await page.evaluate(() => window.E2EControllerAPI.loadMergeCellSheet());- await page.waitForTimeout(1000);-- const filename = generateSnapshotName('mergedCellsRendering');- const screenshot = await page.locator(SHEET_MAIN_CANVAS_ID).screenshot();- await expect(screenshot).toMatchSnapshot(filename, { maxDiffPixelRatio: 0.005 });-});-/*** Aim for default sheet style.*/diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-darwin.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-darwin.pngdeleted file mode 100644index 41b9cec22f..0000000000Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-darwin.png and /dev/null differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-linux.pngdeleted file mode 100644index d30fd5fee1..0000000000Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-linux.png and /dev/null differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-win32.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-win32.pngdeleted file mode 100644index 209f1e9ace..0000000000Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-chromium-win32.png and /dev/null differdiff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.pngdeleted file mode 100644index 67a03739f7..0000000000Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.png and /dev/null differdiff --git a/packages/docs-ui/src/services/selection/__tests__/doc-selection-render.service.spec.ts b/packages/docs-ui/src/services/selection/__tests__/doc-selection-render.service.spec.tsindex aeb4f5eb2a..2f0b2d2a60 100644--- a/packages/docs-ui/src/services/selection/__tests__/doc-selection-render.service.spec.ts+++ b/packages/docs-ui/src/services/selection/__tests__/doc-selection-render.service.spec.ts@@ -95,10 +95,14 @@ interface IFakeRectRange {interface IServiceHarness {_anchorNodePosition?: unknown;_focusNodePosition?: unknown;+ _onPointerEvent: boolean;_rangeList: IFakeTextRange[];_rangeListCache: IFakeTextRange[];_rectRangeList: IFakeRectRange[];_rectRangeListCache: IFakeRectRange[];+ _scenePointerMoveSubs: Array<{ unsubscribe: VoidMock }>;+ _scenePointerUpSubs: Array<{ unsubscribe: VoidMock }>;+ _scrollTimers: Array<{ dispose: VoidMock }>;_selectionStyle: { strokeWidth: number };_textSelectionInner$: { next: Mock<(...args: unknown[]) => void> };focus: Mock<() => void>;@@ -121,6 +125,7 @@ interface IServiceHarness {_moving(moveOffsetX: number, moveOffsetY: number): void;_updateInputPosition(): void;addDocRanges(ranges: Array<Record<string, unknown>>, isEditing?: boolean, options?: Record<string, boolean>): void;+ cancelPointerSelection(): void;setCursorManually(evtOffsetX: number, evtOffsetY: number): void;}@@ -153,6 +158,7 @@ function createService() {const skeleton = { name: 'skeleton' };const mainComponent = { name: 'doc-component' };const scene = {+ enableObjectsEvent: vi.fn(),getEngine: vi.fn(() => engine),getViewports: vi.fn(() => []),};@@ -162,6 +168,10 @@ function createService() {_rangeListCache: [],_rectRangeList: [],_rectRangeListCache: [],+ _scenePointerMoveSubs: [],+ _scenePointerUpSubs: [],+ _scrollTimers: [],+ _onPointerEvent: false,_selectionStyle: { strokeWidth: 1 },_currentSegmentId: 'segment-1',_currentSegmentPage: 2,@@ -840,6 +850,48 @@ describe('doc selection render service internals', () => {});describe('DocSelectionRenderService', () => {+ it('cancels an active pointer selection and disposes its cached ranges', () => {+ const { scene, service } = createService();+ const liveTextRange = createTextRange();+ const liveRectRange = createRectRange();+ const cachedTextRange = createTextRange();+ const cachedRectRange = createRectRange();+ const moveSubscription = { unsubscribe: vi.fn() };+ const upSubscription = { unsubscribe: vi.fn() };+ const scrollTimer = { dispose: vi.fn() };+ service._anchorNodePosition = { row: 0 };+ service._focusNodePosition = { row: 1 };+ service._onPointerEvent = true;+ service._rangeList = [liveTextRange];+ service._rectRangeList = [liveRectRange];+ service._rangeListCache = [cachedTextRange];+ service._rectRangeListCache = [cachedRectRange];+ service._scenePointerMoveSubs = [moveSubscription];+ service._scenePointerUpSubs = [upSubscription];+ service._scrollTimers = [scrollTimer];++ service.cancelPointerSelection();++ expect(moveSubscription.unsubscribe).toHaveBeenCalledOnce();+ expect(upSubscription.unsubscribe).toHaveBeenCalledOnce();+ expect(liveTextRange.dispose).toHaveBeenCalledOnce();+ expect(liveRectRange.dispose).toHaveBeenCalledOnce();+ expect(cachedTextRange.dispose).toHaveBeenCalledOnce();+ expect(cachedRectRange.dispose).toHaveBeenCalledOnce();+ expect(scrollTimer.dispose).toHaveBeenCalledOnce();+ expect(scene.enableObjectsEvent).toHaveBeenCalledOnce();+ expect(service._anchorNodePosition).toBeNull();+ expect(service._focusNodePosition).toBeNull();+ expect(service._onPointerEvent).toBe(false);+ expect(service._rangeList).toEqual([]);+ expect(service._rectRangeList).toEqual([]);+ expect(service._rangeListCache).toEqual([]);+ expect(service._rectRangeListCache).toEqual([]);+ expect(service._scenePointerMoveSubs).toEqual([]);+ expect(service._scenePointerUpSubs).toEqual([]);+ expect(service._scrollTimers).toEqual([]);+ });+let cleanup: Array<() => void> = [];beforeEach(() => {diff --git a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts b/packages/docs-ui/src/services/selection/doc-selection-render.service.tsindex 3a2ddbf876..8bc2698134 100644--- a/packages/docs-ui/src/services/selection/doc-selection-render.service.ts+++ b/packages/docs-ui/src/services/selection/doc-selection-render.service.ts@@ -150,6 +150,24 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo);}+ cancelPointerSelection(): void {+ if (!this._onPointerEvent) {+ return;+ }++ this._scenePointerMoveSubs.forEach((subscription) => subscription.unsubscribe());+ this._scenePointerUpSubs.forEach((subscription) => subscription.unsubscribe());+ this._scenePointerMoveSubs = [];+ this._scenePointerUpSubs = [];+ this._onPointerEvent = false;+ this._anchorNodePosition = null;+ this._focusNodePosition = null;+ this._removeAllRanges();+ this._removeAllCacheRanges();+ this._disposeScrollTimers();+ this._context.scene.enableObjectsEvent();+ }+constructor(private readonly _context: IRenderContext<DocumentDataModel>,@ILayoutService private readonly _layoutService: ILayoutService,