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): preserve cell edit position on double click (#7787)

白熱4863675fc842
diff --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.ts
index 377af971c7..c08a1bff40 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
@@ -22,6 +22,7 @@ import {
DataStreamTreeTokenType,
DisposableCollection,
DOC_RANGE_TYPE,
+ DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,
DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
DocumentDataModel,
DocumentFlavor,
@@ -1841,7 +1842,13 @@ describe('DocSelectionRenderService', () => {
]);
});
- it('selects the current word on double click and the paragraph on triple click', () => {
+ it.each([
+ { unitId: 'word-selection-doc', glyphIndex: 7, word: '6:11' },
+ { unitId: 'word-selection-doc', glyphIndex: 11, word: null },
+ { unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY, glyphIndex: 0, word: '0:5' },
+ { unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY, glyphIndex: 11, word: '6:11' },
+ { unitId: DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, glyphIndex: 11, word: '6:11' },
+ ])('selects the nearest sheet-editor word on double click ($unitId, glyph=$glyphIndex)', ({ unitId, glyphIndex, word }) => {
const viewport = {
transformVector2SceneCoord: () => ({ x: 8, y: 12 }),
getAbsoluteVector: () => ({ x: 16, y: 24 }),
@@ -1868,7 +1875,7 @@ describe('DocSelectionRenderService', () => {
mainComponent,
scene,
documentData: {
- id: 'word-selection-doc',
+ id: unitId,
body: { dataStream: 'Hello world\r\n', paragraphs: [{ startIndex: 11, paragraphId: 'word-selection-paragraph' }] },
documentStyle: {},
},
@@ -1878,13 +1885,13 @@ describe('DocSelectionRenderService', () => {
const line = { paragraphIndex: 11, st: 0, parent: column, divides: [] as unknown[] };
const divide = { parent: line, glyphGroup: [] as Array<{ content: string; count: number; glyphType: GlyphType; parent?: unknown }> };
const glyphs: Array<{ content: string; count: number; glyphType: GlyphType; parent?: unknown }> = [];
- for (const content of 'Hello world') {
+ for (const content of 'Hello world\r') {
glyphs.push({ content, count: 1, glyphType: GlyphType.WORD, parent: divide });
}
divide.glyphGroup = glyphs;
line.divides = [divide];
column.lines = [line];
- (service as unknown as { _findNodeByCoord: () => unknown })._findNodeByCoord = () => ({ node: glyphs[7], ratioX: 0.4, segmentPage: -1 });
+ (service as unknown as { _findNodeByCoord: () => unknown })._findNodeByCoord = () => ({ node: glyphs[glyphIndex], ratioX: 0.4, segmentPage: -1 });
getRangeListFromCharIndexMock.mockImplementation((startOffset, endOffset) => ({
textRanges: [{
...createTextRange({ isActive: vi.fn(() => true) }),
@@ -1914,7 +1921,7 @@ describe('DocSelectionRenderService', () => {
service.__handleDblClick({ offsetX: 10, offsetY: 12 } as never);
service.__handleTripleClick({ offsetX: 10, offsetY: 12 } as never);
- expect(selections).toEqual(['6:11', '0:11']);
+ expect(selections).toEqual(word ? [word, '0:11'] : ['0:11']);
});
it('moves the hidden editor to the active visible selection when syncing canvas selection to DOM input', () => {
diff --git a/packages/docs-ui/src/services/selection/__tests__/word-boundary.spec.ts b/packages/docs-ui/src/services/selection/__tests__/word-boundary.spec.ts
index f482af5d8f..507fadc60b 100644
--- a/packages/docs-ui/src/services/selection/__tests__/word-boundary.spec.ts
+++ b/packages/docs-ui/src/services/selection/__tests__/word-boundary.spec.ts
@@ -16,7 +16,7 @@
import { Direction } from '@univerjs/core';
import { describe, expect, it } from 'vitest';
-import { getNextWordBoundaryOffset, getWordBoundaryByIndex } from '../word-boundary';
+import { getNextWordBoundaryOffset, getWordBoundaryByIndex, getWordSelectionByIndex } from '../word-boundary';
describe('word boundary helpers', () => {
it('finds the word under an English character', () => {
@@ -38,6 +38,24 @@ describe('word boundary helpers', () => {
expect(getWordBoundaryByIndex('hello world', 5, 0)).toBeNull();
});
+ it.each([
+ { content: 'alpha beta gamma\r', index: 0, isBack: true, selected: 'alpha' },
+ { content: 'alpha beta gamma\r', index: 16, isBack: false, selected: 'gamma' },
+ { content: 'alpha beta gamma\r', index: 8, isBack: false, selected: 'beta' },
+ { content: 'alpha beta gamma!\r', index: 6, isBack: false, selected: 'alpha ' },
+ { content: 'alpha beta gamma!\r', index: 20, isBack: false, selected: '!' },
+ { content: '中文测试\r', index: 4, isBack: false, selected: '测试' },
+ { content: '25%\r', index: 3, isBack: false, selected: '%' },
+ ])('selects "$selected" when double clicking "$content" at $index', ({ content, index, isBack, selected }) => {
+ const range = getWordSelectionByIndex(content, index, 10, isBack)!;
+
+ expect(content.slice(range.startOffset - 10, range.endOffset - 10)).toBe(selected);
+ });
+
+ it('keeps an empty paragraph unselected on double click', () => {
+ expect(getWordSelectionByIndex('\r', 0, 0, true)).toBeNull();
+ });
+
it('moves to previous and next English word boundaries', () => {
expect(getNextWordBoundaryOffset('hello world', 8, 10, Direction.LEFT)).toBe(16);
expect(getNextWordBoundaryOffset('hello world', 1, 10, Direction.RIGHT)).toBe(15);
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.ts
index f956d9dbcb..9f1bc572dc 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
@@ -37,6 +37,8 @@ import type { RectRange } from './rect-range';
import {
DataStreamTreeTokenType,
DOC_RANGE_TYPE,
+ DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,
+ DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
IContextService,
ILogService,
Inject,
@@ -76,7 +78,7 @@ import {
serializeTextRange,
} from './selection-utils';
import { cursorConvertToTextRange, TextRange } from './text-range';
-import { getWordBoundaryByIndex } from './word-boundary';
+import { getWordBoundaryByIndex, getWordSelectionByIndex } from './word-boundary';
export interface IEditorInputConfig {
event: Event | CompositionEvent | KeyboardEvent;
@@ -386,7 +388,6 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
return true;
}
- // eslint-disable-next-line max-lines-per-function
addDocRanges(
ranges: ISuccinctDocRangeParam[],
isEditing = true,
@@ -506,8 +507,7 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
if (textRange) {
this._addTextRange(textRange);
}
- // eslint-disable-next-line unused-imports/no-unused-vars
- } catch (_e) {
+ } catch {
generalAddRange(startOffset, endOffset, rangeStyle);
}
} else {
@@ -647,7 +647,10 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
return;
}
- const wordBoundary = getWordBoundaryByIndex(content, nodeIndex, st);
+ const isSheetEditor = this._context.unitId === DOCS_NORMAL_EDITOR_UNIT_ID_KEY || this._context.unitId === DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY;
+ const wordBoundary = isSheetEditor
+ ? getWordSelectionByIndex(content, nodeIndex, st, startNode.ratioX < 0.5)
+ : getWordBoundaryByIndex(content, nodeIndex, st);
if (wordBoundary != null) {
this.removeAllRanges();
@@ -699,7 +702,6 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
}
// Handle pointer down.
- // eslint-disable-next-line max-lines-per-function, complexity
__onPointDown(evt: IPointerEvent | IMouseEvent, shouldFocusInput = true) {
const { scene, mainComponent } = this._context;
const skeleton = this._docSkeletonManagerService.getSkeleton();
@@ -1502,7 +1504,6 @@ export class DocSelectionRenderService extends RxDisposable implements IRenderMo
}
// FIXME: listeners here are not correctly disposed
- // eslint-disable-next-line max-lines-per-function
private _initInputEvents() {
this.disposeWithMe(
fromEvent(this._input, 'keydown').subscribe((e) => {
diff --git a/packages/docs-ui/src/services/selection/word-boundary.ts b/packages/docs-ui/src/services/selection/word-boundary.ts
index df1a2b8b22..c66bf927b4 100644
--- a/packages/docs-ui/src/services/selection/word-boundary.ts
+++ b/packages/docs-ui/src/services/selection/word-boundary.ts
@@ -58,6 +58,29 @@ export function getWordBoundaryByIndex(
};
}
+export function getWordSelectionByIndex(
+ content: string,
+ nodeIndex: number,
+ paragraphStartOffset: number,
+ isBack: boolean
+): IWordBoundary | null {
+ const text = content.replace(/[\r\n]+$/, '');
+ if (!text.length || nodeIndex < 0) {
+ return null;
+ }
+
+ const index = Math.min(nodeIndex, text.length - 1);
+ const segments = Array.from(new Intl.Segmenter(undefined, { granularity: 'word' }).segment(text));
+ const segmentIndex = segments.findIndex((segment) => segment.index <= index && index < segment.index + segment.segment.length);
+ const segment = segments[segmentIndex];
+ const whitespace = /^\s+$/.test(segment.segment);
+
+ return {
+ startOffset: paragraphStartOffset + (whitespace ? (segments[segmentIndex - 1]?.index ?? segment.index) : segment.index),
+ endOffset: paragraphStartOffset + (whitespace ? Math.min(nodeIndex + (isBack ? 0 : 1), text.length) : segment.index + segment.segment.length),
+ };
+}
+
export function getNextWordBoundaryOffset(
content: string,
nodeIndex: number,
diff --git a/packages/sheets-ui/src/controllers/__tests__/hover-move-range.controller.spec.ts b/packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts
similarity index 83%
rename from packages/sheets-ui/src/controllers/__tests__/hover-move-range.controller.spec.ts
rename to packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts
index f3fcde7e81..7cd1d50742 100644
--- a/packages/sheets-ui/src/controllers/__tests__/hover-move-range.controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/__tests__/hover-render.controller.spec.ts
@@ -14,9 +14,13 @@
* limitations under the License.
*/
+import { Injector } from '@univerjs/core';
import { Subject } from 'rxjs';
import { describe, expect, it, vi } from 'vitest';
import { SHEET_VIEW_KEY } from '../../common/keys';
+import { HoverManagerService } from '../../services/hover-manager.service';
+import { SheetScrollManagerService } from '../../services/scroll-manager.service';
+import { SheetSkeletonManagerService } from '../../services/sheet-skeleton-manager.service';
import { HoverRenderController } from '../hover-render.controller';
function createEventSubject() {
@@ -74,22 +78,22 @@ describe('HoverRenderController', () => {
triggerColHeaderDbClick: vi.fn(),
triggerScroll: vi.fn(),
};
- const controller = new HoverRenderController(
- {
- unitId: 'unit-1',
- mainComponent,
- components: new Map([
- [SHEET_VIEW_KEY.ROW, rowHeader],
- [SHEET_VIEW_KEY.COLUMN, colHeader],
- ]),
- } as never,
- hoverManagerService as never,
- {
+ const injector = new Injector([
+ [HoverManagerService, { useValue: hoverManagerService }],
+ [SheetSkeletonManagerService, { useValue: {
getCurrentParam: vi.fn(() => ({ skeleton: {} })),
currentSkeleton$,
- } as never,
- { validViewportScrollInfo$ } as never
- );
+ } }],
+ [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);
mainComponent.onPointerEnter$.emit({});
expect(controller.active).toBe(true);
@@ -108,12 +112,13 @@ describe('HoverRenderController', () => {
expect(hoverManagerService.triggerPointerDown).toHaveBeenCalledWith('unit-1', { offsetX: 11, offsetY: 21 });
expect(hoverManagerService.triggerPointerUp).toHaveBeenCalledWith('unit-1', { offsetX: 12, offsetY: 22 });
expect(hoverManagerService.triggerClick).toHaveBeenCalledWith('unit-1', 13, 23);
- expect(hoverManagerService.triggerDbClick).toHaveBeenCalledWith('unit-1', 14, 24);
+ expect(hoverManagerService.triggerDbClick).toHaveBeenCalledWith('unit-1', { offsetX: 14, offsetY: 24 });
expect(hoverManagerService.triggerRowHeaderPoniterUp).toHaveBeenCalledWith('unit-1', 1, 2);
expect(hoverManagerService.triggerRowHeaderClick).toHaveBeenCalledWith('unit-1', 1, 2);
expect(hoverManagerService.triggerColHeaderDbClick).toHaveBeenCalledWith('unit-1', 3, 4);
expect(hoverManagerService.triggerScroll).toHaveBeenCalled();
controller.dispose();
+ injector.dispose();
});
});
diff --git a/packages/sheets-ui/src/controllers/editor/__tests__/editing.render-controller.spec.ts b/packages/sheets-ui/src/controllers/editor/__tests__/editing.render-controller.spec.ts
index 9a393c1537..cab51cbc90 100644
--- a/packages/sheets-ui/src/controllers/editor/__tests__/editing.render-controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/editor/__tests__/editing.render-controller.spec.ts
@@ -44,7 +44,7 @@ import {
UniverInstanceType,
} from '@univerjs/core';
import { DocSelectionManagerService, DocStateChangeManagerService, DocStateEmitService, InsertTextCommand, RichTextEditingMutation } from '@univerjs/docs';
-import { IEditorService, InnerPasteCommand, MoveCursorOperation, MoveSelectionOperation, SetDocInputStyleCommand, VIEWPORT_KEY } from '@univerjs/docs-ui';
+import { DocSelectionRenderService, IEditorService, InnerPasteCommand, MoveCursorOperation, MoveSelectionOperation, SetDocInputStyleCommand, VIEWPORT_KEY } from '@univerjs/docs-ui';
import { FunctionService, IFunctionService, LexerTreeBuilder } from '@univerjs/engine-formula';
import { DeviceInputEventType, IRenderManagerService, NORMAL_TEXT_SELECTION_PLUGIN_STYLE } from '@univerjs/engine-render';
import { SetRangeValuesCommand, SheetInterceptorService, SheetsSelectionsService } from '@univerjs/sheets';
@@ -367,6 +367,43 @@ function createController(initialDataStream = 'new value\r\n', isPercentFormat =
}
describe('EditingRenderController business methods', () => {
+ it.each([
+ { content: 'hello world', percent: false, offset: 5, scale: 1, expected: 'hello! world' },
+ { content: 'hello world', percent: false, offset: 5, scale: 2, expected: 'hello! world' },
+ { content: '25%', percent: true, offset: 1, scale: 1, expected: '2!5%' },
+ { content: '=SUM(A1:A3)', percent: false, offset: 4, scale: 1, expected: '=SUM!(A1:A3)' },
+ { content: 'hello\rworld', percent: false, offset: 7, scale: 1, expected: 'hello\rw!orld' },
+ ])('inserts text at the double-click position in "$content" after layout (scale=$scale)', ({ content, percent, offset, scale, expected }) => {
+ const { controller, commandService, docModel, selectionManager } = createController(`${content}\r\n`, percent);
+ const visible = {
+ visible: true,
+ eventType: DeviceInputEventType.Dblclick,
+ unitId: 'unit-1',
+ pointerPosition: { x: 100 + 45 * scale, y: 200 + 30 * scale },
+ };
+ controller._editorBridgeService.isVisible.mockReturnValue(visible);
+ controller._sheetCellEditorResizeService.fitTextSize.mockImplementation(() => undefined);
+ const render = controller._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+ const setCursorManually = vi.fn(() => selectionManager.replaceDocRanges([
+ { startOffset: offset, endOffset: offset, collapsed: true },
+ ], { unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY, subUnitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY }));
+ render.engine = { width: 300, height: 100, getCanvasElement: () => ({ getBoundingClientRect: () => ({ left: 100, top: 200, width: 300 * scale, height: 100 * scale }) }) };
+ const originalWith = render.with;
+ render.with = (token: unknown) => token === DocSelectionRenderService ? { setCursorManually } : originalWith(token);
+ controller._renderManagerService.getRenderUnitById.mockReturnValue(render);
+
+ controller._editorBridgeService.visible$.next(visible);
+ controller._sheetCellEditorResizeService.fitTextSize.mock.calls.at(-1)[0]();
+ commandService.syncExecuteCommand(InsertTextCommand.id, {
+ unitId: DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
+ body: { dataStream: '!' },
+ range: selectionManager.getActiveTextRange(),
+ });
+
+ expect(docModel.getBody()?.dataStream).toBe(`${expected}\r\n`);
+ expect(setCursorManually).toHaveBeenCalledWith(45, 30, true, true, { strict: false });
+ });
+
it('bypasses parsing, interceptors, and commands when the editor is clean', async () => {
const { controller, worksheet } = createController();
controller._editorBridgeService.getEditorDirty.mockReturnValue(false);
@@ -618,17 +655,17 @@ describe('EditingRenderController business methods', () => {
});
it.each([
- { content: '25%', percent: true, input: '3', expected: '3%' },
- { content: '25%', percent: true, input: '7%', expected: '7%' },
- { content: '-12.5%', percent: true, input: '3', expected: '3%' },
- { content: 'hello world', percent: false, input: '3', expected: '3' },
- { content: '=SUM(A1:A3)', percent: false, input: '=2+3', expected: '=2+3' },
- { content: '=1/4', percent: true, input: '=2+3', expected: '=2+3' },
- { content: '=25%', percent: true, input: '=30%', expected: '=30%' },
- { content: 'hello\rworld', percent: false, input: '3', expected: '3' },
- { content: '25%', percent: false, input: '3', expected: '3' },
+ { content: '25%', percent: true, input: '3', expected: '253%' },
+ { content: '25%', percent: true, input: '7%', expected: '257%' },
+ { content: '-12.5%', percent: true, input: '3', expected: '-12.53%' },
+ { content: 'hello world', percent: false, input: '3', expected: 'hello world3' },
+ { content: '=SUM(A1:A3)', percent: false, input: '+1', expected: '=SUM(A1:A3)+1' },
+ { content: '=1/4', percent: true, input: '+1', expected: '=1/4+1' },
+ { content: '=25%', percent: true, input: '+1', expected: '=25%+1' },
+ { content: 'hello\rworld', percent: false, input: '3', expected: 'hello\rworld3' },
+ { content: '25%', percent: false, input: '3', expected: '25%3' },
{ content: '', percent: false, input: '3', expected: '3' },
- ])('replaces the editable content of "$content" on double click', ({ content, percent, input, expected }) => {
+ ])('keeps an insertion caret for "$content" when editing starts without a pointer position', ({ content, percent, input, expected }) => {
const { controller, commandService, docModel, selectionManager } = createController(`${content}\r\n`, percent);
controller._editorBridgeService.visible$.next({
@@ -668,11 +705,11 @@ describe('EditingRenderController business methods', () => {
});
it.each([
- { content: '25%', percent: true, input: '7%', expected: '7%' },
- { content: '25%', percent: true, input: '7', expected: '7%' },
- { content: '=25%', percent: true, input: '=30%', expected: '=30%' },
- { content: '25%', percent: false, input: '7%', expected: '7%' },
- ])('pastes "$input" over the double-click selection of "$content" (percent=$percent)', ({ content, percent, input, expected }) => {
+ { content: '25%', percent: true, input: '7%', expected: '257%' },
+ { content: '25%', percent: true, input: '7', expected: '257%' },
+ { content: '=25%', percent: true, input: '+30%', expected: '=25%+30%' },
+ { content: '25%', percent: false, input: '7%', expected: '25%7%' },
+ ])('pastes "$input" at the insertion caret in "$content" (percent=$percent)', ({ content, percent, input, expected }) => {
const { controller, commandService, docModel } = createController(`${content}\r\n`, percent);
controller._editorBridgeService.visible$.next({
visible: true,
@@ -691,8 +728,8 @@ describe('EditingRenderController business methods', () => {
});
it.each([
- { eventType: DeviceInputEventType.Dblclick, percent: false, expected: '3' },
- { eventType: DeviceInputEventType.Dblclick, percent: true, expected: '3%' },
+ { eventType: DeviceInputEventType.Dblclick, percent: false, expected: 'hello3' },
+ { eventType: DeviceInputEventType.Dblclick, percent: true, expected: '253%' },
{ eventType: DeviceInputEventType.Keyboard, percent: false, expected: 'hello3' },
{ eventType: DeviceInputEventType.Keyboard, percent: true, expected: '253%' },
])('preserves the host Docs selection when opening an embedded cell editor ($eventType, percent=$percent)', ({ eventType, percent, expected }) => {
@@ -721,7 +758,7 @@ describe('EditingRenderController business methods', () => {
expect(selectionManager.getTextRanges(host)).toEqual([hostRange]);
});
- it('keeps percentage replacement after undoing a paste inside the editor', () => {
+ it('restores the insertion caret after undoing a percentage paste inside the editor', () => {
const { controller, commandService, docModel, docStateEmitService, selectionManager } = createController('25%\r\n', true);
const emit = vi.spyOn(docStateEmitService, 'emitStateChangeInfo');
controller._editorBridgeService.visible$.next({
@@ -747,7 +784,7 @@ describe('EditingRenderController business methods', () => {
range: selectionManager.getActiveTextRange(),
});
- expect(docModel.getBody()?.dataStream).toBe('3%\r\n');
+ expect(docModel.getBody()?.dataStream).toBe('253%\r\n');
});
it('keeps one percent suffix when typing a complete percentage after double click', () => {
@@ -764,7 +801,7 @@ describe('EditingRenderController business methods', () => {
range: selectionManager.getActiveTextRange(),
});
}
- expect(docModel.getBody()?.dataStream).toBe('3%\r\n');
+ expect(docModel.getBody()?.dataStream).toBe('253%\r\n');
});
it('inserts percent operators inside a formula without overtyping an existing operator', () => {
diff --git a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
index 18bc4cac95..c52d5c40a6 100644
--- a/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/editor/editing.render-controller.ts
@@ -36,6 +36,7 @@ import type {
ISetWorksheetActivateCommandParams,
MutationsAffectRange,
} from '@univerjs/sheets';
+import type { IDocObjectParam } from '../../basics/editor/get-editor-object';
import type { IUniverSheetsUIConfig } from '../../config/config';
import type { ICellEditorState, IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';
import {
@@ -144,28 +145,21 @@ function getPercentEditorSelection(
dataStream: string | undefined
): Nullable<ITextRange> {
const percentOffset = getPercentOffset(editCellState, dataStream);
- if (percentOffset == null) {
+ if (percentOffset == null || visibleParam.eventType !== DeviceInputEventType.Keyboard) {
return null;
}
- const { eventType, initialValue, keycode } = visibleParam;
+ const { initialValue, keycode } = visibleParam;
// A formula's trailing percent sign is an operator, not a retained number-format suffix.
- if (isFormulaString(dataStream) && (eventType === DeviceInputEventType.Dblclick || keycode === KeyCode.F2)) {
+ if (isFormulaString(dataStream) && keycode === KeyCode.F2) {
return null;
}
- if (eventType === DeviceInputEventType.Keyboard && keycode === KeyCode.F2) {
+ if (keycode === KeyCode.F2) {
return { startOffset: percentOffset, endOffset: percentOffset, collapsed: true };
}
- if (
- eventType !== DeviceInputEventType.Dblclick && (
- eventType !== DeviceInputEventType.Keyboard ||
- keycode === KeyCode.BACKSPACE ||
- keycode === KeyCode.DELETE ||
- !/^\d/.test(initialValue ?? '')
- )
- ) {
+ if (keycode === KeyCode.BACKSPACE || keycode === KeyCode.DELETE || !/^\d/.test(initialValue ?? '')) {
return null;
}
@@ -584,7 +578,7 @@ export class EditingRenderController extends Disposable {
return;
}
- const { document, scene } = editorObject;
+ const { document } = editorObject;
this._contextService.setContextValue(EDITOR_ACTIVATED, true);
@@ -594,13 +588,7 @@ export class EditingRenderController extends Disposable {
return;
}
- this._sheetCellEditorResizeService?.fitTextSize(() => {
- const viewMain = scene.getViewport(VIEWPORT_KEY.VIEW_MAIN);
- viewMain?.scrollToViewportPos({
- viewportScrollX: Number.POSITIVE_INFINITY,
- viewportScrollY: Number.POSITIVE_INFINITY,
- });
- });
+ this._resizeEditorOnOpen(param, editorObject, !!isInArrayFormulaRange);
const clearAndEdit = () => {
this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
@@ -660,13 +648,43 @@ export class EditingRenderController extends Disposable {
return;
}
- const endOffset = documentDataModel.getBody()!.dataStream.length - 2 || 0;
- replaceSelection(percentSelection ?? { startOffset: 0, endOffset, collapsed: endOffset === 0 });
+ const dataStream = documentDataModel.getBody()!.dataStream;
+ const endOffset = (!isFormulaString(dataStream) ? getPercentOffset(editCellState, dataStream) : null) ?? dataStream.length - 2;
+ replaceSelection({ startOffset: endOffset, endOffset, collapsed: true });
}
this._renderManagerService.getRenderUnitById(unitId)?.scene.resetCursor();
}
+ private _resizeEditorOnOpen(param: IEditorBridgeServiceVisibleParam, editorObject: IDocObjectParam, isInArrayFormulaRange: boolean) {
+ const pointerPosition = param.eventType === DeviceInputEventType.Dblclick ? param.pointerPosition : undefined;
+ this._sheetCellEditorResizeService?.fitTextSize(() => {
+ if (pointerPosition && this._editorBridgeService.isVisible() !== param) {
+ return;
+ }
+
+ const { engine, scene } = editorObject;
+ scene.getViewport(VIEWPORT_KEY.VIEW_MAIN)?.scrollToViewportPos({
+ viewportScrollX: pointerPosition ? 0 : Number.POSITIVE_INFINITY,
+ viewportScrollY: pointerPosition ? 0 : Number.POSITIVE_INFINITY,
+ });
+ if (!pointerPosition || isInArrayFormulaRange) {
+ return;
+ }
+
+ const rect = engine.getCanvasElement().getBoundingClientRect();
+ if (rect.width > 0 && rect.height > 0) {
+ this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)?.with(DocSelectionRenderService).setCursorManually(
+ (pointerPosition.x - rect.left) * engine.width / rect.width,
+ (pointerPosition.y - rect.top) * engine.height / rect.height,
+ true,
+ true,
+ { strict: false }
+ );
+ }
+ });
+ }
+
private _cacheEmptyCellTextStyle(): void {
const sourceBody = this._editorBridgeService.getEditLocation()?.documentLayoutObject.documentModel?.getBody();
const textRun = sourceBody?.textRuns?.length === 1 ? sourceBody.textRuns[0] : null;
diff --git a/packages/sheets-ui/src/controllers/hover-render.controller.ts b/packages/sheets-ui/src/controllers/hover-render.controller.ts
index 16f7bab2bb..07690bd423 100644
--- a/packages/sheets-ui/src/controllers/hover-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/hover-render.controller.ts
@@ -42,10 +42,8 @@ export class HoverRenderController extends Disposable implements IRenderModule {
this._initScrollEvent();
}
- // eslint-disable-next-line max-lines-per-function
private _initPointerEvent() {
const disposeSet = new DisposableCollection();
- // eslint-disable-next-line max-lines-per-function
const handleSkeletonChange = (skeletonParam: Nullable<ISheetSkeletonManagerParam>) => {
disposeSet.dispose();
@@ -58,7 +56,7 @@ export class HoverRenderController extends Disposable implements IRenderModule {
return;
}
- disposeSet.add(mainComponent.onPointerEnter$.subscribeEvent((evt) => {
+ disposeSet.add(mainComponent.onPointerEnter$.subscribeEvent(() => {
this._active = true;
}));
@@ -80,7 +78,7 @@ export class HoverRenderController extends Disposable implements IRenderModule {
}));
disposeSet.add(mainComponent.onDblclick$.subscribeEvent((evt) => {
- this._hoverManagerService.triggerDbClick(unitId, evt.offsetX, evt.offsetY);
+ this._hoverManagerService.triggerDbClick(unitId, evt);
}));
disposeSet.add(mainComponent.onPointerLeave$.subscribeEvent(() => {
diff --git a/packages/sheets-ui/src/controllers/render-controllers/__tests__/editor-bridge-render-business.spec.ts b/packages/sheets-ui/src/controllers/render-controllers/__tests__/desktop-cell-edit.render-controller.spec.ts
similarity index 92%
rename from packages/sheets-ui/src/controllers/render-controllers/__tests__/editor-bridge-render-business.spec.ts
rename to packages/sheets-ui/src/controllers/render-controllers/__tests__/desktop-cell-edit.render-controller.spec.ts
index 02318bb2a2..d940a5597e 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/__tests__/editor-bridge-render-business.spec.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/__tests__/desktop-cell-edit.render-controller.spec.ts
@@ -17,10 +17,10 @@
// @vitest-environment jsdom
import type { EmbedRuntimeFocusCoordinator } from '../../../services/sheet-embed-integration.service';
-import { DOCS_NORMAL_EDITOR_UNIT_ID_KEY, FOCUSING_FX_BAR_EDITOR, FOCUSING_SHEET } from '@univerjs/core';
+import { DOCS_NORMAL_EDITOR_UNIT_ID_KEY, FOCUSING_FX_BAR_EDITOR, FOCUSING_SHEET, ICommandService, IContextService, Injector, IUniverInstanceService } from '@univerjs/core';
import { DocSelectionRenderService } from '@univerjs/docs-ui';
-import { DeviceInputEventType } from '@univerjs/engine-render';
-import { ClearSelectionFormatCommand, SetWorksheetActiveOperation } from '@univerjs/sheets';
+import { DeviceInputEventType, IRenderManagerService } from '@univerjs/engine-render';
+import { ClearSelectionFormatCommand, SetWorksheetActiveOperation, SheetsSelectionsService } from '@univerjs/sheets';
import { DISABLE_AUTO_FOCUS_KEY } from '@univerjs/ui';
import { Subject } from 'rxjs';
import { describe, expect, it, vi } from 'vitest';
@@ -28,7 +28,9 @@ import { SetZoomRatioCommand } from '../../../commands/commands/set-zoom-ratio.c
import { SetActivateCellEditOperation } from '../../../commands/operations/activate-cell-edit.operation';
import { SetCellEditVisibleOperation } from '../../../commands/operations/cell-edit.operation';
import { SHEET_VIEW_KEY } from '../../../common/keys';
-import { EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE } from '../../../services/sheet-embed-integration.service';
+import { IEditorBridgeService } from '../../../services/editor-bridge.service';
+import { EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE, ISheetEmbedRuntimeFocusCoordinator } from '../../../services/sheet-embed-integration.service';
+import { SheetSkeletonManagerService } from '../../../services/sheet-skeleton-manager.service';
import { DesktopCellEditRenderController } from '../desktop-cell-edit.render-controller';
import { EditorBridgeRenderController } from '../editor-bridge.render-controller';
@@ -204,29 +206,23 @@ function createController(options?: {
},
})),
};
- const editorBridgeRenderController = new EditorBridgeRenderController(
- context as never,
- instanceService as never,
- commandService as never,
- editorBridgeService as never,
- selectionManagerService as never,
- sheetSkeletonManagerService as never,
- embedRuntimeFocusCoordinator
- );
- const desktopCellEditRenderController = new DesktopCellEditRenderController(
- context as never,
- instanceService as never,
- commandService as never,
- editorBridgeService as never,
- selectionManagerService as never,
- contextService as never,
- renderManagerService as never,
- embedRuntimeFocusCoordinator
- );
+ const injector = new Injector([
+ [IUniverInstanceService, { useValue: instanceService }],
+ [ICommandService, { useValue: commandService }],
+ [IEditorBridgeService, { useValue: editorBridgeService }],
+ [SheetsSelectionsService, { useValue: selectionManagerService }],
+ [SheetSkeletonManagerService, { useValue: sheetSkeletonManagerService }],
+ [ISheetEmbedRuntimeFocusCoordinator, { useValue: embedRuntimeFocusCoordinator }],
+ [IContextService, { useValue: contextService }],
+ [IRenderManagerService, { useValue: renderManagerService }],
+ ]);
+ const editorBridgeRenderController = injector.createInstance(EditorBridgeRenderController, context as never);
+ const desktopCellEditRenderController = injector.createInstance(DesktopCellEditRenderController, context as never);
const controller = {
dispose: () => {
desktopCellEditRenderController.dispose();
editorBridgeRenderController.dispose();
+ injector.dispose();
},
refreshEditorPosition: () => editorBridgeRenderController.refreshEditorPosition(),
};
@@ -250,7 +246,7 @@ function createController(options?: {
};
}
-describe('EditorBridgeRenderController business flows', () => {
+describe('DesktopCellEditRenderController integration with the editor bridge', () => {
it('moves the sheet editor to the latest selected cell and respects merged-cell coordinates', () => {
const { commandService, controller, selectionMoveEnd$ } = createController();
@@ -321,18 +317,19 @@ describe('EditorBridgeRenderController business flows', () => {
const { commandService, controller, editorBridgeService, inputBefore$, spreadsheet } = createController();
spreadsheet.onDblclick$.emit({ button: 2 });
- expect(commandService.executeCommand).not.toHaveBeenCalledWith(SetCellEditVisibleOperation.id, expect.anything());
+ expect(commandService.syncExecuteCommand).not.toHaveBeenCalledWith(SetCellEditVisibleOperation.id, expect.anything());
- spreadsheet.onDblclick$.emit({ button: 0 });
- expect(commandService.executeCommand).toHaveBeenCalledWith(SetCellEditVisibleOperation.id, {
+ spreadsheet.onDblclick$.emit({ button: 0, clientX: 150, clientY: 180 });
+ expect(commandService.syncExecuteCommand).toHaveBeenCalledWith(SetCellEditVisibleOperation.id, {
visible: true,
eventType: DeviceInputEventType.Dblclick,
unitId: 'unit-1',
+ pointerPosition: { x: 150, y: 180 },
});
inputBefore$.next({ event: { data: 'A', which: 65 } });
inputBefore$.next({ event: { inputType: 'deleteContentBackward', which: 8 } });
- expect(commandService.syncExecuteCommand).toHaveBeenCalledTimes(1);
+ expect(commandService.syncExecuteCommand).toHaveBeenCalledTimes(2);
expect(commandService.syncExecuteCommand).toHaveBeenCalledWith(SetCellEditVisibleOperation.id, {
visible: true,
eventType: DeviceInputEventType.Keyboard,
@@ -359,11 +356,12 @@ describe('EditorBridgeRenderController business flows', () => {
spreadsheet.onPointerDown$.emit({});
expect(docSelectionRenderService.focus).not.toHaveBeenCalled();
- spreadsheet.onDblclick$.emit({ button: 0 });
- expect(commandService.executeCommand).toHaveBeenCalledWith(SetCellEditVisibleOperation.id, {
+ spreadsheet.onDblclick$.emit({ button: 0, clientX: 150, clientY: 180 });
+ expect(commandService.syncExecuteCommand).toHaveBeenCalledWith(SetCellEditVisibleOperation.id, {
visible: true,
eventType: DeviceInputEventType.Dblclick,
unitId: 'unit-1',
+ pointerPosition: { x: 150, y: 180 },
});
controller.dispose();
diff --git a/packages/sheets-ui/src/controllers/render-controllers/desktop-cell-edit.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/desktop-cell-edit.render-controller.ts
index 4a7000d9e1..2507a59361 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/desktop-cell-edit.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/desktop-cell-edit.render-controller.ts
@@ -107,10 +107,11 @@ export class DesktopCellEditRenderController extends RxDisposable implements IRe
return;
}
- this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
+ this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
visible: true,
eventType: DeviceInputEventType.Dblclick,
unitId: this._context.unitId,
+ pointerPosition: { x: evt.clientX, y: evt.clientY },
} as IEditorBridgeServiceVisibleParam);
}));
diff --git a/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-cell-edit.render-controller.spec.ts b/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-cell-edit.render-controller.spec.ts
index 839f66b482..747ffe3d77 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-cell-edit.render-controller.spec.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/mobile/__tests__/mobile-cell-edit.render-controller.spec.ts
@@ -14,37 +14,41 @@
* limitations under the License.
*/
-import { EventSubject } from '@univerjs/core';
+import { EventSubject, ICommandService, Injector } from '@univerjs/core';
import { DeviceInputEventType } from '@univerjs/engine-render';
import { Subject } from 'rxjs';
import { describe, expect, it, vi } from 'vitest';
import { SetCellEditVisibleOperation } from '../../../../commands/operations/cell-edit.operation';
import { SHEET_VIEW_KEY } from '../../../../common/keys';
+import { IEditorBridgeService } from '../../../../services/editor-bridge.service';
+import { HoverManagerService } from '../../../../services/hover-manager.service';
import { MobileCellEditRenderController } from '../mobile-cell-edit.render-controller';
describe('MobileCellEditRenderController', () => {
it('opens the current sheet editor from a mobile double tap', () => {
- const currentDbClickedCell$ = new Subject<{ location: { unitId: string } }>();
+ const currentDbClickedCell$ = new Subject<{ location: { unitId: string }; event: { clientX: number; clientY: number } }>();
const currentPointerDownCell$ = new Subject<never>();
- const commandService = { executeCommand: vi.fn() };
- const controller = new MobileCellEditRenderController(
- { unitId: 'unit-1' } as never,
- commandService as never,
- { getEditCellState: vi.fn(() => null) } as never,
- { currentDbClickedCell$, currentPointerDownCell$ } as never
- );
+ const commandService = { syncExecuteCommand: vi.fn() };
+ const injector = new Injector([
+ [ICommandService, { useValue: commandService }],
+ [IEditorBridgeService, { useValue: { getEditCellState: vi.fn(() => null) } }],
+ [HoverManagerService, { useValue: { currentDbClickedCell$, currentPointerDownCell$ } }],
+ ]);
+ const controller = injector.createInstance(MobileCellEditRenderController, { unitId: 'unit-1' } as never);
- currentDbClickedCell$.next({ location: { unitId: 'unit-2' } });
- expect(commandService.executeCommand).not.toHaveBeenCalled();
+ currentDbClickedCell$.next({ location: { unitId: 'unit-2' }, event: { clientX: 150, clientY: 180 } });
+ expect(commandService.syncExecuteCommand).not.toHaveBeenCalled();
- currentDbClickedCell$.next({ location: { unitId: 'unit-1' } });
- expect(commandService.executeCommand).toHaveBeenCalledExactlyOnceWith(SetCellEditVisibleOperation.id, {
+ currentDbClickedCell$.next({ location: { unitId: 'unit-1' }, event: { clientX: 150, clientY: 180 } });
+ expect(commandService.syncExecuteCommand).toHaveBeenCalledExactlyOnceWith(SetCellEditVisibleOperation.id, {
visible: true,
eventType: DeviceInputEventType.Dblclick,
unitId: 'unit-1',
+ pointerPosition: { x: 150, y: 180 },
});
controller.dispose();
+ injector.dispose();
});
it('keeps editing the current cell and closes the editor when another cell is pressed', () => {
@@ -64,34 +68,29 @@ describe('MobileCellEditRenderController', () => {
executeCommand: vi.fn(),
syncExecuteCommand: vi.fn(),
};
- const controller = new MobileCellEditRenderController(
- {
- unitId: 'unit-1',
- isMainScene: true,
- unit: { getCurrentUnitOfType: vi.fn(() => workbook) },
- mainComponent: { onPointerDown$: spreadsheetPointerDown$ },
- components: new Map([
- [SHEET_VIEW_KEY.ROW, { onPointerDown$: rowHeaderPointerDown$ }],
- [SHEET_VIEW_KEY.COLUMN, { onPointerDown$: columnHeaderPointerDown$ }],
- [SHEET_VIEW_KEY.LEFT_TOP, { onPointerDown$: leftTopPointerDown$ }],
- ]),
- scene: {},
- engine: {},
- } as never,
- commandService as never,
- {
+ const injector = new Injector([
+ [ICommandService, { useValue: commandService }],
+ [IEditorBridgeService, { useValue: {
getEditCellState: vi.fn(() => null),
- getEditLocation: vi.fn(() => ({
- unitId: 'unit-1',
- sheetId: 'sheet-1',
- row: 5,
- column: 0,
- })),
+ getEditLocation: vi.fn(() => ({ unitId: 'unit-1', sheetId: 'sheet-1', row: 5, column: 0 })),
isForceKeepVisible: vi.fn(() => false),
isVisible: vi.fn(() => ({ visible: true })),
- } as never,
- { currentDbClickedCell$, currentPointerDownCell$ } as never
- );
+ } }],
+ [HoverManagerService, { useValue: { currentDbClickedCell$, currentPointerDownCell$ } }],
+ ]);
+ const controller = injector.createInstance(MobileCellEditRenderController, {
+ unitId: 'unit-1',
+ isMainScene: true,
+ unit: { getCurrentUnitOfType: vi.fn(() => workbook) },
+ mainComponent: { onPointerDown$: spreadsheetPointerDown$ },
+ components: new Map([
+ [SHEET_VIEW_KEY.ROW, { onPointerDown$: rowHeaderPointerDown$ }],
+ [SHEET_VIEW_KEY.COLUMN, { onPointerDown$: columnHeaderPointerDown$ }],
+ [SHEET_VIEW_KEY.LEFT_TOP, { onPointerDown$: leftTopPointerDown$ }],
+ ]),
+ scene: {},
+ engine: {},
+ } as never);
currentPointerDownCell$.next({
unitId: 'unit-1',
@@ -118,5 +117,6 @@ describe('MobileCellEditRenderController', () => {
);
controller.dispose();
+ injector.dispose();
});
});
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 341e8514ee..77dd876cc2 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,17 @@
* limitations under the License.
*/
-import { EventSubject } from '@univerjs/core';
+import { EventSubject, IContextService, Injector } from '@univerjs/core';
import { Subject } from 'rxjs';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { HoverManagerService } from '../../../../services/hover-manager.service';
+import { SheetScrollManagerService } from '../../../../services/scroll-manager.service';
+import { SheetSkeletonManagerService } from '../../../../services/sheet-skeleton-manager.service';
import { MobileHoverRenderController } from '../mobile-hover.render-controller';
interface IMobilePointerTestEvent {
+ clientX: number;
+ clientY: number;
isPrimary: boolean;
offsetX: number;
offsetY: number;
@@ -44,28 +49,29 @@ function createController() {
triggerDbClick: vi.fn(),
triggerScroll: vi.fn(),
};
- const controller = new MobileHoverRenderController(
- {
- mainComponent: {
- onPointerEnter$,
- onPointerMove$,
- onPointerDown$,
- onPointerUp$,
- onDblclick$,
- onPointerLeave$,
- },
- components: new Map(),
- scene: { onPointerCancel$ },
- unitId: 'unit-1',
- } as never,
- hoverManagerService as never,
- {
+ const injector = new Injector([
+ [HoverManagerService, { useValue: hoverManagerService }],
+ [SheetSkeletonManagerService, { useValue: {
getCurrentParam: vi.fn(() => ({})),
currentSkeleton$: new Subject(),
- } as never,
- { validViewportScrollInfo$ } as never,
- { getContextValue: vi.fn((key: string) => contextValues.get(key) ?? false) } as never
- );
+ } }],
+ [SheetScrollManagerService, { useValue: { validViewportScrollInfo$ } }],
+ [IContextService, { useValue: { getContextValue: vi.fn((key: string) => contextValues.get(key) ?? false) } }],
+ ]);
+ const controller = injector.createInstance(MobileHoverRenderController, {
+ mainComponent: {
+ onPointerEnter$,
+ onPointerMove$,
+ onPointerDown$,
+ onPointerUp$,
+ onDblclick$,
+ onPointerLeave$,
+ },
+ components: new Map(),
+ scene: { onPointerCancel$ },
+ unitId: 'unit-1',
+ } as never);
+ controller.disposeWithMe(injector);
return {
controller,
@@ -82,7 +88,7 @@ function createController() {
}
function pointer(offsetX: number, offsetY: number, pointerId = 1): IMobilePointerTestEvent {
- return { isPrimary: true, offsetX, offsetY, pointerId };
+ return { isPrimary: true, offsetX, offsetY, clientX: offsetX + 100, clientY: offsetY + 200, pointerId };
}
describe('MobileHoverRenderController', () => {
@@ -114,7 +120,7 @@ describe('MobileHoverRenderController', () => {
onPointerUp$.emitEvent(pointer(34, 20));
expect(hoverManagerService.triggerClick).toHaveBeenCalledTimes(2);
- expect(hoverManagerService.triggerDbClick).toHaveBeenCalledExactlyOnceWith('unit-1', 34, 20);
+ expect(hoverManagerService.triggerDbClick).toHaveBeenCalledExactlyOnceWith('unit-1', pointer(34, 20));
controller.dispose();
});
@@ -150,7 +156,7 @@ describe('MobileHoverRenderController', () => {
const result = onDblclick$.emitEvent(pointer(20, 20));
- expect(hoverManagerService.triggerDbClick).toHaveBeenCalledExactlyOnceWith('unit-1', 20, 20);
+ expect(hoverManagerService.triggerDbClick).toHaveBeenCalledExactlyOnceWith('unit-1', pointer(20, 20));
expect(laterObserver).not.toHaveBeenCalled();
expect(result.stopPropagation).toBe(true);
diff --git a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-cell-edit.render-controller.ts b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-cell-edit.render-controller.ts
index 0e94590566..e681fab2eb 100644
--- a/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-cell-edit.render-controller.ts
+++ b/packages/sheets-ui/src/controllers/render-controllers/mobile/mobile-cell-edit.render-controller.ts
@@ -45,10 +45,11 @@ export class MobileCellEditRenderController extends Disposable implements IRende
return;
}
- this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
+ this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
visible: true,
eventType: DeviceInputEventType.Dblclick,
unitId: this._context.unitId,
+ pointerPosition: { x: cell.event.clientX, y: cell.event.clientY },
} as IEditorBridgeServiceVisibleParam);
}));
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 ac3b799216..030cb090c5 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
@@ -148,7 +148,7 @@ export class MobileHoverRenderController extends Disposable implements IRenderMo
}
this._resetCompletedTap();
- this._hoverManagerService.triggerDbClick(unitId, event.offsetX, event.offsetY);
+ this._hoverManagerService.triggerDbClick(unitId, event);
},
priority: -1,
}));
@@ -263,7 +263,7 @@ export class MobileHoverRenderController extends Disposable implements IRenderMo
this._suppressEngineDoubleClick = false;
this._suppressEngineDoubleClickTimer = null;
});
- this._hoverManagerService.triggerDbClick(unitId, event.offsetX, event.offsetY);
+ this._hoverManagerService.triggerDbClick(unitId, event);
return;
}
diff --git a/packages/sheets-ui/src/services/__tests__/hover-manager.service.spec.ts b/packages/sheets-ui/src/services/__tests__/hover-manager.service.spec.ts
index 87b1803a5c..4154873c51 100644
--- a/packages/sheets-ui/src/services/__tests__/hover-manager.service.spec.ts
+++ b/packages/sheets-ui/src/services/__tests__/hover-manager.service.spec.ts
@@ -309,12 +309,12 @@ describe('HoverManagerService', () => {
const colPointerUps: any[] = [];
service.currentColHeaderPointerUp$.subscribe((v) => colPointerUps.push(v));
- const event = { offsetX: 150, offsetY: 30 } as any;
+ const event = { offsetX: 150, offsetY: 30, clientX: 170, clientY: 60 } as never;
service.triggerMouseMove('u-1', event);
service.triggerPointerDown('u-1', event);
service.triggerPointerUp('u-1', event);
service.triggerClick('u-1', 150, 30);
- service.triggerDbClick('u-1', 150, 30);
+ service.triggerDbClick('u-1', event);
service.triggerMouseMove('u-1', event);
expect(currentCellWithEvent).toEqual(
@@ -332,7 +332,7 @@ describe('HoverManagerService', () => {
expect(pointerDowns.at(-1)).toEqual(expect.objectContaining({ unitId: 'u-1', row: 1, col: 1 }));
expect(pointerUps.at(-1)).toEqual(expect.objectContaining({ unitId: 'u-1', row: 1, col: 1 }));
expect(clicks.at(-1)).toEqual(expect.objectContaining({ location: expect.objectContaining({ row: 1, col: 1 }) }));
- expect(dbClicks.at(-1)).toEqual(expect.objectContaining({ location: expect.objectContaining({ row: 1, col: 1 }) }));
+ expect(dbClicks.at(-1)).toEqual(expect.objectContaining({ location: expect.objectContaining({ row: 1, col: 1 }), event }));
service.triggerMouseMove('u-1', { offsetX: 150, offsetY: 40 } as never);
expect(richTextNoDistinct.at(-1)?.drawing).toBeUndefined();
diff --git a/packages/sheets-ui/src/services/editor-bridge.service.ts b/packages/sheets-ui/src/services/editor-bridge.service.ts
index 5fd6ae5b3e..9d5731a88e 100644
--- a/packages/sheets-ui/src/services/editor-bridge.service.ts
+++ b/packages/sheets-ui/src/services/editor-bridge.service.ts
@@ -58,6 +58,7 @@ export interface IEditorBridgeServiceVisibleParam {
keycode?: KeyCode;
isShift?: boolean;
initialValue?: string;
+ pointerPosition?: { x: number; y: number };
}
export interface ICurrentEditCellParam {
@@ -324,7 +325,6 @@ export class EditorBridgeService extends Disposable implements IEditorBridgeServ
}
}
- // eslint-disable-next-line max-lines-per-function, complexity
getLatestEditCellState() {
if (!this._currentEditCell) return;
diff --git a/packages/sheets-ui/src/services/hover-manager.service.ts b/packages/sheets-ui/src/services/hover-manager.service.ts
index 5be9948e09..27cafa5e63 100644
--- a/packages/sheets-ui/src/services/hover-manager.service.ts
+++ b/packages/sheets-ui/src/services/hover-manager.service.ts
@@ -130,7 +130,7 @@ export class HoverManagerService extends Disposable {
private _currentCell$ = new BehaviorSubject<Nullable<IHoverCellPosition>>(null);
private _currentRichText$ = new BehaviorSubject<Nullable<IHoverRichTextInfo>>(null);
private _currentClickedCell$ = new Subject<IHoverRichTextInfo>();
- private _currentDbClickedCell$ = new Subject<IHoverRichTextInfo>();
+ private _currentDbClickedCell$ = new Subject<IHoverRichTextInfo & ICellWithEvent>();
private _currentCellWithEvent$ = new Subject<Nullable<ICellWithEvent>>();
private _currentPointerDownCell$ = new Subject<ICellPosWithEvent>();
@@ -175,7 +175,6 @@ export class HoverManagerService extends Disposable {
// Notify when hovering over different cells and different custom range or bullet
currentRichText$ = this._currentRichText$.pipe(
distinctUntilChanged(
- // eslint-disable-next-line complexity
(pre, aft) => (
pre?.location?.unitId === aft?.location?.unitId
&& pre?.location?.subUnitId === aft?.location?.subUnitId
@@ -514,17 +513,18 @@ export class HoverManagerService extends Disposable {
}
}
- triggerDbClick(unitId: string, offsetX: number, offsetY: number) {
+ triggerDbClick(unitId: string, event: IPointerEvent | IMouseEvent) {
const deps = this._getCalcDeps(unitId);
if (!deps) {
return;
}
const { currentRender, workbook, worksheet, skeletonParam } = deps;
- const activeCell = this._calcActiveCell(currentRender, workbook, worksheet, skeletonParam, offsetX, offsetY);
+ const activeCell = this._calcActiveCell(currentRender, workbook, worksheet, skeletonParam, event.offsetX, event.offsetY);
if (activeCell) {
this._currentDbClickedCell$.next({
...activeCell,
location: getLocationBase(activeCell.location),
+ event,
});
}
}