@univerjs/sheets-ui 1.1.0 → 1.3.0

package/lib/cjs/index.js

@@ -11460,6 +11460,29 @@ function processNumberStringWithSpaces(token, numStr) {
 	};
 }
 
+//#endregion
+//#region src/controllers/editor/utils/get-edit-cell-input-position.ts
+/**
+* Get the position of the hidden editor input for the current edit cell.
+*
+* The OS anchors the IME candidate window to the focused input, so the input should stay on the
+* selected cell even before the cell editor opens. The position is kept inside the sheet canvas,
+* so a cell scrolled out of view never moves the input outside the sheet.
+*/
+function getEditCellInputPosition(layout, canvasSize) {
+	const { position, canvasOffset } = layout;
+	const x = canvasOffset.left + position.startX;
+	const y = canvasOffset.top + position.startY;
+	if (!canvasSize) return {
+		x,
+		y
+	};
+	return {
+		x: Math.min(Math.max(x, canvasOffset.left), canvasOffset.left + canvasSize.width),
+		y: Math.min(Math.max(y, canvasOffset.top), canvasOffset.top + canvasSize.height)
+	};
+}
+
 //#endregion
 //#region src/controllers/editor/utils/is-range-selector.ts
 /**
@@ -11676,7 +11699,11 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 			if ((cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 ? void 0 : cellSelectionRenderManager.canFocusing) || (formulaSelectionRenderManager === null || formulaSelectionRenderManager === void 0 ? void 0 : formulaSelectionRenderManager.canFocusing)) {
 				this._univerInstanceService.setCurrentUnitForType(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 				if (this._contextService.getContextValue(_univerjs_ui.DISABLE_AUTO_FOCUS_KEY)) cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 || cellSelectionRenderManager.setInputPosition(HIDDEN_EDITOR_POSITION$1, HIDDEN_EDITOR_POSITION$1);
-				else cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 || cellSelectionRenderManager.activate(HIDDEN_EDITOR_POSITION$1, HIDDEN_EDITOR_POSITION$1, true);
+				else {
+					var _this$_renderManagerS5;
+					const { x, y } = getEditCellInputPosition(state, (_this$_renderManagerS5 = this._renderManagerService.getRenderUnitById(state.unitId)) === null || _this$_renderManagerS5 === void 0 ? void 0 : _this$_renderManagerS5.engine);
+					cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 || cellSelectionRenderManager.activate(x, y, true);
+				}
 			}
 		}));
 	}
@@ -11750,7 +11777,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		}));
 	}
 	_handleEditorVisible(param) {
-		var _documentDataModel$ge, _this$_renderManagerS6;
+		var _documentDataModel$ge, _this$_renderManagerS7;
 		const { eventType, keycode } = param;
 		this._cursorChange = eventType === _univerjs_engine_render.DeviceInputEventType.PointerDown || eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick ? 2 : 1;
 		const editCellState = this._editorBridgeService.getEditLocation();
@@ -11779,8 +11806,8 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 			const resetPointerSelection = isInArrayFormulaRange && eventType === _univerjs_engine_render.DeviceInputEventType.PointerDown;
 			const editorId = this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR) ? _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY : this._editorBridgeService.getCurrentEditorId();
 			if (resetPointerSelection) {
-				var _this$_renderManagerS5;
-				(_this$_renderManagerS5 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS5 === void 0 || _this$_renderManagerS5.with(_univerjs_docs_ui.DocSelectionRenderService).cancelPointerSelection();
+				var _this$_renderManagerS6;
+				(_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS6 === void 0 || _this$_renderManagerS6.with(_univerjs_docs_ui.DocSelectionRenderService).cancelPointerSelection();
 			}
 			this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
 			document.makeDirty();
@@ -11858,7 +11885,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 				collapsed: true
 			});
 		}
-		(_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS6 === void 0 || _this$_renderManagerS6.scene.resetCursor();
+		(_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS7 === void 0 || _this$_renderManagerS7.scene.resetCursor();
 	}
 	_resizeEditorOnOpen(param, editorObject, isInArrayFormulaRange) {
 		var _this$_sheetCellEdito4;
@@ -11874,8 +11901,8 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 			if (!pointerPosition || isInArrayFormulaRange) return;
 			const rect = engine.getCanvasElement().getBoundingClientRect();
 			if (rect.width > 0 && rect.height > 0) {
-				var _this$_renderManagerS7;
-				(_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS7 === void 0 || _this$_renderManagerS7.with(_univerjs_docs_ui.DocSelectionRenderService).setCursorManually((pointerPosition.x - rect.left) * engine.width / rect.width, (pointerPosition.y - rect.top) * engine.height / rect.height, true, true, { strict: false });
+				var _this$_renderManagerS8;
+				(_this$_renderManagerS8 = this._renderManagerService.getRenderUnitById(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS8 === void 0 || _this$_renderManagerS8.with(_univerjs_docs_ui.DocSelectionRenderService).setCursorManually((pointerPosition.x - rect.left) * engine.width / rect.width, (pointerPosition.y - rect.top) * engine.height / rect.height, true, true, { strict: false });
 			}
 		});
 	}
@@ -12077,12 +12104,12 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		return this._univerInstanceService.getUnit(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 	}
 	_getEditorSkeleton(editorId) {
-		var _this$_renderManagerS8;
-		return (_this$_renderManagerS8 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS8 === void 0 ? void 0 : _this$_renderManagerS8.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
+		var _this$_renderManagerS9;
+		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
 	}
 	_getEditorViewModel(editorId) {
-		var _this$_renderManagerS9;
-		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(_univerjs_docs.DocSkeletonManagerService).getViewModel();
+		var _this$_renderManagerS10;
+		return (_this$_renderManagerS10 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS10 === void 0 ? void 0 : _this$_renderManagerS10.with(_univerjs_docs.DocSkeletonManagerService).getViewModel();
 	}
 	_getEditingUnit() {
 		return this._editingUnit ? this._univerInstanceService.getUnit(this._editingUnit, _univerjs_core.UniverInstanceType.UNIVER_SHEET) : null;
@@ -12140,13 +12167,13 @@ function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService,
 		cellData.si = null;
 		cellData.p = snapshot;
 		cellData.t = _univerjs_core.CellValueType.STRING;
-	} else if (cellData.s && (0, _univerjs_core.isTextFormat)(styles === null || styles === void 0 || (_styles$get = styles.get(cellData.s)) === null || _styles$get === void 0 || (_styles$get = _styles$get.n) === null || _styles$get === void 0 ? void 0 : _styles$get.pattern)) {
+	} else if (newDataStream !== "" && cellData.s && (0, _univerjs_core.isTextFormat)(styles === null || styles === void 0 || (_styles$get = styles.get(cellData.s)) === null || _styles$get === void 0 || (_styles$get = _styles$get.n) === null || _styles$get === void 0 ? void 0 : _styles$get.pattern)) {
 		cellData.v = newDataStream;
 		cellData.f = null;
 		cellData.si = null;
 		cellData.p = null;
 		cellData.t = _univerjs_core.CellValueType.STRING;
-		if (isRichText(body) && body.dataStream !== "\r\n") cellData.p = snapshot;
+		if (isRichText(body)) cellData.p = snapshot;
 		const style = getCellStyleBySnapshot(snapshot);
 		if (style) cellData.s = style;
 	} else if ((0, _univerjs_core.isFormulaString)(newDataStream)) {
@@ -12163,21 +12190,14 @@ function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService,
 		cellData.si = null;
 		cellData.p = null;
 		cellData.t = _univerjs_core.CellValueType.FORCE_STRING;
-	} else if (isRichText(body)) {
-		if (body.dataStream === "\r\n") {
-			cellData.v = "";
-			cellData.f = null;
-			cellData.si = null;
-			cellData.p = null;
-		} else {
-			cellData.p = snapshot;
-			cellData.v = null;
-			cellData.f = null;
-			cellData.si = null;
-		}
+	} else if (newDataStream !== "" && isRichText(body)) {
+		cellData.p = snapshot;
+		cellData.v = null;
+		cellData.f = null;
+		cellData.si = null;
 	} else {
-		if (newDataStream === "" && cellData.v == null && cellData.p == null) return null;
-		cellData.v = newDataStream;
+		if (newDataStream === "" && cellData.v == null && cellData.p == null && cellData.f == null && cellData.si == null) return null;
+		cellData.v = newDataStream === "" ? null : newDataStream;
 		cellData.f = null;
 		cellData.si = null;
 		cellData.p = null;
@@ -15897,7 +15917,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 				if (Math.abs(initialType === 0 ? moveChangeY : moveChangeX) >= MINIMAL_OFFSET$1) isStartMove = true;
 				if (initialType === 0) {
 					if (moveChangeY > canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY) moveChangeY = canvasMaxHeight - scrollBarHorizontalHeight + scrollXY.y - cell.startY;
-					if (moveChangeY < -(cell.endY - cell.startY) + 2) moveChangeY = -(cell.endY - cell.startY) + 2;
+					moveChangeY = Math.max(moveChangeY, -(cell.endY - cell.startY));
 					if (isStartMove) {
 						var _this$_resizeHelperSh, _this$_rowResizeRect4, _this$_rowResizeRect5;
 						(_this$_resizeHelperSh = this._resizeHelperShape) === null || _this$_resizeHelperSh === void 0 || _this$_resizeHelperSh.transformByState({ top: currentOffsetY + moveChangeY });
@@ -15907,7 +15927,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 					}
 				} else {
 					if (moveChangeX > canvasMaxWidth - scrollBarVerticalWidth + scrollXY.x - cell.startX) moveChangeX = canvasMaxWidth - scrollBarVerticalWidth + scrollXY.x - cell.startX;
-					if (moveChangeX < -(cell.endX - cell.startX) + 2) moveChangeX = -(cell.endX - cell.startX) + 2;
+					moveChangeX = Math.max(moveChangeX, -(cell.endX - cell.startX));
 					if (isStartMove) {
 						var _this$_resizeHelperSh2, _this$_columnResizeRe4, _this$_columnResizeRe5;
 						(_this$_resizeHelperSh2 = this._resizeHelperShape) === null || _this$_resizeHelperSh2 === void 0 || _this$_resizeHelperSh2.transformByState({ left: currentOffsetX + moveChangeX });
@@ -15917,7 +15937,7 @@ let HeaderResizeRenderController = class HeaderResizeRenderController extends _u
 					}
 				}
 			});
-			this._scenePointerUpSub = scene.onPointerUp$.subscribeEvent((upEvt) => {
+			this._scenePointerUpSub = scene.onPointerUp$.subscribeEvent(() => {
 				var _this$_resizeHelperSh3;
 				const scene = this._context.scene;
 				this._clearObserverEvent();
@@ -16267,6 +16287,7 @@ let HeaderUnhideRenderController = class HeaderUnhideRenderController extends _u
 	dispose() {
 		super.dispose();
 		this._clearShapes();
+		this.interceptor.dispose();
 	}
 	_init() {
 		let activeSheetId = "";
@@ -16295,18 +16316,54 @@ let HeaderUnhideRenderController = class HeaderUnhideRenderController extends _u
 		if (!skeleton) return;
 		const visibleCheck = this.interceptor.fetchThroughInterceptors(HEADER_UNHIDE_RANGE_VISIBLE_CHECK);
 		const shouldRenderRange = (payload) => this._headerUnhideRangeService.shouldRenderRange(visibleCheck(true, payload) ?? true, payload);
-		const hiddenRowRanges = worksheet.getHiddenRows().filter((range) => shouldRenderRange({
+		const zeroHeightRowRanges = [];
+		const rowData = worksheet.getRowManager().getRowData();
+		for (const rowIndex of Object.keys(rowData)) {
+			const row = Number(rowIndex);
+			if (row >= 0 && row < worksheet.getRowCount() && worksheet.getRowVisible(row) && worksheet.getRowHeight(row) === 0) zeroHeightRowRanges.push({
+				startRow: row,
+				endRow: row,
+				startColumn: 0,
+				endColumn: worksheet.getColumnCount() - 1
+			});
+		}
+		const rowRanges = [...worksheet.getHiddenRows(), ..._univerjs_core.Rectangle.mergeRanges(zeroHeightRowRanges)].map((range) => ({
+			...range,
+			rangeType: _univerjs_core.RANGE_TYPE.ROW
+		})).filter((range) => shouldRenderRange({
 			axis: "row",
 			range,
 			workbook,
 			worksheet
 		}));
-		const hiddenColRanges = worksheet.getHiddenCols().filter((range) => shouldRenderRange({
+		const hiddenRowRanges = _univerjs_core.Rectangle.mergeRanges(rowRanges).map((range) => ({
+			...range,
+			rangeType: _univerjs_core.RANGE_TYPE.ROW
+		}));
+		const zeroWidthColRanges = [];
+		const columnData = worksheet.getColumnManager().getColumnData();
+		for (const columnIndex of Object.keys(columnData)) {
+			const column = Number(columnIndex);
+			if (column >= 0 && column < worksheet.getColumnCount() && worksheet.getColVisible(column) && worksheet.getColumnWidth(column) === 0) zeroWidthColRanges.push({
+				startRow: 0,
+				endRow: worksheet.getRowCount() - 1,
+				startColumn: column,
+				endColumn: column
+			});
+		}
+		const columnRanges = [...worksheet.getHiddenCols(), ..._univerjs_core.Rectangle.mergeRanges(zeroWidthColRanges)].map((range) => ({
+			...range,
+			rangeType: _univerjs_core.RANGE_TYPE.COLUMN
+		})).filter((range) => shouldRenderRange({
 			axis: "column",
 			range,
 			workbook,
 			worksheet
 		}));
+		const hiddenColRanges = _univerjs_core.Rectangle.mergeRanges(columnRanges).map((range) => ({
+			...range,
+			rangeType: _univerjs_core.RANGE_TYPE.COLUMN
+		}));
 		const { scene } = this._getSheetObject();
 		const rowCount = worksheet.getRowCount();
 		const rowShapes = hiddenRowRanges.map((range) => {
@@ -18373,11 +18430,7 @@ const MenuItemInput = (props) => {
 		if (compositionEndTimerRef.current !== null) clearTimeout(compositionEndTimerRef.current);
 	}, []);
 	const handleChange = (value) => {
-		if (!value) {
-			setInputValue(min.toString());
-			return;
-		}
-		const inputValue = value.toString();
+		const inputValue = (value ?? min).toString();
 		setInputValue(inputValue);
 		onChange(inputValue);
 	};
@@ -19101,7 +19154,7 @@ function TextColorSelectorMenuItemFactory(accessor) {
 		type: _univerjs_ui.MenuItemType.BUTTON_SELECTOR,
 		selections: [{
 			label: {
-				name: _univerjs_ui.COLOR_PICKER_COMPONENT,
+				name: _univerjs_docs_ui.EditorColorPicker.componentKey,
 				hoverable: false,
 				selectable: false
 			},
@@ -19155,7 +19208,7 @@ function BackgroundColorSelectorMenuItemFactory(accessor) {
 		icon: "PaintBucketDoubleIcon",
 		selections: [{
 			label: {
-				name: _univerjs_ui.COLOR_PICKER_COMPONENT,
+				name: _univerjs_docs_ui.EditorColorPicker.componentKey,
 				hoverable: false,
 				selectable: false
 			},
@@ -19763,7 +19816,7 @@ function SetRowHeightMenuItemFactory(accessor) {
 	const commandService = accessor.get(_univerjs_core.ICommandService);
 	const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 	const selectionManagerService = accessor.get(_univerjs_sheets.SheetsSelectionsService);
-	const min = 2;
+	const min = 0;
 	return {
 		id: _univerjs_sheets.SetRowHeightCommand.id,
 		type: _univerjs_ui.MenuItemType.BUTTON,
@@ -19802,7 +19855,7 @@ function SetColWidthMenuItemFactory(accessor) {
 	const commandService = accessor.get(_univerjs_core.ICommandService);
 	const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 	const selectionManagerService = accessor.get(_univerjs_sheets.SheetsSelectionsService);
-	const min = 2;
+	const min = 0;
 	return {
 		id: _univerjs_sheets.SetColWidthCommand.id,
 		type: _univerjs_ui.MenuItemType.BUTTON,
@@ -20354,15 +20407,35 @@ function RenameSheetMenuItemFactory(accessor) {
 	};
 }
 function ChangeColorSheetMenuItemFactory(accessor) {
+	const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
+	const commandService = accessor.get(_univerjs_core.ICommandService);
 	return {
 		id: _univerjs_sheets.SetTabColorCommand.id,
 		title: "sheets-ui.sheetConfig.changeColor",
 		type: _univerjs_ui.MenuItemType.SELECTOR,
-		selections: [{ label: {
-			name: _univerjs_ui.COLOR_PICKER_COMPONENT,
-			hoverable: false,
-			selectable: false
-		} }],
+		selections: [{
+			label: "sheets-ui.toolbar.resetColor",
+			icon: "NoColorDoubleIcon",
+			value: ""
+		}, {
+			label: {
+				name: _univerjs_docs_ui.EditorColorPicker.componentKey,
+				hoverable: false,
+				selectable: false
+			},
+			value$: new rxjs.Observable((subscriber) => {
+				const updateColor = () => {
+					var _workbook$getActiveSh;
+					const workbook = univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+					subscriber.next((workbook === null || workbook === void 0 || (_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getTabColor()) ?? "");
+				};
+				updateColor();
+				const disposable = commandService.onCommandExecuted(({ id }) => {
+					if (id === _univerjs_sheets.SetTabColorMutation.id || id === _univerjs_sheets.SetWorksheetActiveOperation.id) updateColor();
+				});
+				return () => disposable.dispose();
+			})
+		}],
 		hidden$: getWorkbookPermissionDisable$(accessor, [_univerjs_sheets.WorkbookEditablePermission])
 	};
 }
@@ -22796,6 +22869,7 @@ function keepTextSelected(inputHtml) {
 		if (!selection) return;
 		const range = document.createRange();
 		range.selectNodeContents(inputHtml);
+		if (!getEditorText(inputHtml)) range.collapse(true);
 		selection.removeAllRanges();
 		selection.addRange(range);
 	});
@@ -23695,7 +23769,7 @@ function SheetBarTabs() {
 					embedChildType != null && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(EmbedSheetTabProductIcon, { childType: embedChildType }),
 					hasProtection && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.LockIcon, { className: "univer-shrink-0" }),
 					/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-						className: "univer-truncate univer-outline-none",
+						className: "univer-min-w-px univer-truncate univer-outline-none",
 						children: sheet.getName()
 					})
 				] }),
@@ -25072,7 +25146,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.1.0";
+var version = "1.3.0";
 
 //#endregion
 //#region src/views/cell-popup/config.ts
@@ -27589,7 +27663,7 @@ const DefinedNameContainer = ({ ConfirmComponent = _univerjs_design.Confirm, Def
 									children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 										className: "univer-my-1 univer-max-h-[100px] univer-max-w-[190px] univer-truncate univer-text-sm univer-font-medium univer-text-gray-900 dark:!univer-text-gray-0",
 										children: [definedName.name, /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-											className: "univer-text-xxs univer-ml-1 univer-text-gray-400",
+											className: "univer-ml-1 univer-text-xs univer-text-gray-400",
 											children: definedName.localSheetId === _univerjs_sheets.SCOPE_WORKBOOK_VALUE_DEFINED_NAME || definedName.localSheetId == null ? "" : getSheetNameBySheetId(definedName.localSheetId)
 										})]
 									}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -28717,7 +28791,7 @@ function SheetPermissionPanelListContent({ ActionRowComponent }) {
 					}).filter((r) => !!r).join(",") : ""})`;
 				} else if (rule.unitType === _univerjs_protocol.UnitObject.Worksheet) ruleName = targetName || "";
 				return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-					className: (0, _univerjs_design.clsx)("univer-mt-3 univer-rounded-lg univer-p-3 hover:univer-bg-gray-50", _univerjs_design.borderClassName),
+					className: (0, _univerjs_design.clsx)("univer-mt-3 univer-rounded-lg univer-p-3 hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-800", _univerjs_design.borderClassName),
 					onMouseMove: () => {
 						const { subUnitId, unitType } = rule;
 						const activeSheet = workbook.getActiveSheet();
@@ -28751,14 +28825,14 @@ function SheetPermissionPanelListContent({ ActionRowComponent }) {
 								children: [hasManagerPermission && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Tooltip, {
 									title: localeService.t("sheets-ui.permission.panel.edit"),
 									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-										className: "univer-box-border univer-h-6 univer-rounded-sm univer-p-1 hover:univer-bg-gray-200",
+										className: "univer-box-border univer-h-6 univer-rounded-sm univer-p-1 hover:univer-bg-gray-200 dark:hover:!univer-bg-gray-700",
 										onClick: () => handleEdit(rule),
 										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.WriteIcon, {})
 									})
 								}), hasDeletePermission && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Tooltip, {
 									title: localeService.t("sheets-ui.permission.panel.delete"),
 									children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-										className: "univer-box-border univer-h-6 univer-rounded-sm univer-p-1 hover:univer-bg-gray-200",
+										className: "univer-box-border univer-h-6 univer-rounded-sm univer-p-1 hover:univer-bg-gray-200 dark:hover:!univer-bg-gray-700",
 										onClick: () => handleDelete(rule),
 										children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DeleteIcon, {})
 									})
@@ -28801,7 +28875,7 @@ function SheetPermissionPanelListContent({ ActionRowComponent }) {
 							rule.description && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Tooltip, {
 								title: rule.description,
 								children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-									className: "univer-text-3 univer-mt-2 univer-max-w-64 univer-truncate univer-text-sm univer-text-gray-400",
+									className: "univer-mt-2 univer-max-w-64 univer-truncate univer-text-sm univer-text-gray-400",
 									children: rule.description
 								})
 							})
@@ -32116,7 +32190,6 @@ let SheetUIMobileController = class SheetUIMobileController extends _univerjs_co
 		const visualViewport = window.visualViewport;
 		let stableHeight = Math.round(window.innerHeight);
 		let stableWidth = Math.round(window.innerWidth);
-		let keyboardWasVisible = false;
 		const update = () => {
 			const width = Math.round(window.innerWidth);
 			const visibleBottom = visualViewport ? visualViewport.offsetTop + visualViewport.height : window.innerHeight;
@@ -32126,15 +32199,6 @@ let SheetUIMobileController = class SheetUIMobileController extends _univerjs_co
 			} else if (!isMobileKeyboardVisible(stableHeight, visibleBottom)) stableHeight = Math.round(Math.max(stableHeight, window.innerHeight, visibleBottom));
 			const keyboardVisible = isMobileKeyboardVisible(stableHeight, visibleBottom);
 			this._contextService.setContextValue(MOBILE_KEYBOARD_VISIBLE, keyboardVisible);
-			if (shouldHideMobileEditorOnKeyboardClose(keyboardWasVisible && !keyboardVisible, this._contextService.getContextValue("MOBILE_FX_EDITOR_EXPANDED"), this._contextService.getContextValue("MOBILE_FORMULA_FUNCTION_PANEL_OPEN"), this._editorBridgeService.isForceKeepVisible())) {
-				const visibleState = this._editorBridgeService.isVisible();
-				if (visibleState.visible) this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
-					...visibleState,
-					visible: false,
-					eventType: _univerjs_engine_render.DeviceInputEventType.PointerDown
-				});
-			}
-			keyboardWasVisible = keyboardVisible;
 		};
 		update();
 		window.addEventListener("resize", update);
@@ -32191,9 +32255,6 @@ SheetUIMobileController = __decorate([
 function isMobileKeyboardVisible(stableHeight, visibleBottom) {
 	return stableHeight - visibleBottom > 80;
 }
-function shouldHideMobileEditorOnKeyboardClose(keyboardClosed, editorExpanded, functionPanelOpen, forceKeepVisible) {
-	return keyboardClosed && !editorExpanded && !functionPanelOpen && !forceKeepVisible;
-}
 
 //#endregion
 //#region src/controllers/move-range.controller.ts
@@ -32817,7 +32878,7 @@ let FormatPainterRenderController = class FormatPainterRenderController extends
 			getTarget: (event) => {
 				var _this$_selections$get, _this$_context$unit$g;
 				const picked = this._context.scene.pick(new _univerjs_engine_render.Vector2(event.offsetX, event.offsetY));
-				if (picked && picked !== this._context.mainComponent) return null;
+				if (picked && picked !== this._context.mainComponent && picked !== this._context.components.get("__SpreadsheetRowHeader__") && picked !== this._context.components.get("__SpreadsheetColumnHeader__")) return null;
 				const range = (_this$_selections$get = this._selections.getCurrentLastSelection()) === null || _this$_selections$get === void 0 ? void 0 : _this$_selections$get.range;
 				return range ? {
 					unitId: this._context.unitId,
@@ -33144,27 +33205,22 @@ let MobileHeaderResizeRenderController = class MobileHeaderResizeRenderControlle
 		_defineProperty(this, "_columnResizeButton", void 0);
 		_defineProperty(this, "_resizeHelperShape", void 0);
 		_defineProperty(this, "_isDragging", false);
-		_defineProperty(this, "_touchStartX", 0);
-		_defineProperty(this, "_touchStartY", 0);
-		_defineProperty(this, "_touchMoveHandler", void 0);
-		_defineProperty(this, "_touchEndHandler", void 0);
+		_defineProperty(this, "_resizeListeners", void 0);
 		_defineProperty(this, "_selectionSubscription", void 0);
 		_defineProperty(this, "_scrollSubscription", void 0);
 		this._init();
 	}
 	dispose() {
-		var _this$_rowResizeButto, _this$_columnResizeBu, _this$_resizeHelperSh, _this$_selectionSubsc, _this$_scrollSubscrip;
+		var _this$_rowResizeButto, _this$_columnResizeBu, _this$_selectionSubsc, _this$_scrollSubscrip;
+		this._cancelResize();
 		(_this$_rowResizeButto = this._rowResizeButton) === null || _this$_rowResizeButto === void 0 || _this$_rowResizeButto.dispose();
 		this._rowResizeButton = null;
 		(_this$_columnResizeBu = this._columnResizeButton) === null || _this$_columnResizeBu === void 0 || _this$_columnResizeBu.dispose();
 		this._columnResizeButton = null;
-		(_this$_resizeHelperSh = this._resizeHelperShape) === null || _this$_resizeHelperSh === void 0 || _this$_resizeHelperSh.dispose();
-		this._resizeHelperShape = null;
 		(_this$_selectionSubsc = this._selectionSubscription) === null || _this$_selectionSubsc === void 0 || _this$_selectionSubsc.unsubscribe();
 		this._selectionSubscription = null;
 		(_this$_scrollSubscrip = this._scrollSubscription) === null || _this$_scrollSubscrip === void 0 || _this$_scrollSubscrip.unsubscribe();
 		this._scrollSubscription = null;
-		this._cleanupTouchHandlers();
 		super.dispose();
 	}
 	_init() {
@@ -33185,8 +33241,8 @@ let MobileHeaderResizeRenderController = class MobileHeaderResizeRenderControlle
 			zIndex: 100
 		});
 		scene.addObjects([this._rowResizeButton, this._columnResizeButton], 10);
-		this._bindTouchEventsToButton(this._rowResizeButton, "row");
-		this._bindTouchEventsToButton(this._columnResizeButton, "column");
+		this._bindPointerEventsToButton(this._rowResizeButton, "row");
+		this._bindPointerEventsToButton(this._columnResizeButton, "column");
 	}
 	_initSelectionListener() {
 		this._selectionSubscription = this._selectionManagerService.selectionMoveEnd$.subscribe((selections) => {
@@ -33271,12 +33327,13 @@ let MobileHeaderResizeRenderController = class MobileHeaderResizeRenderControlle
 			});
 		}
 	}
-	_bindTouchEventsToButton(button, type) {
-		button.onPointerDown$.subscribeEvent((evt) => {
+	_bindPointerEventsToButton(button, type) {
+		this.disposeWithMe(button.onPointerDown$.subscribeEvent((evt) => {
+			if (evt.button !== 0) return;
 			if (this._contextService.getContextValue("MOBILE_PINCH_ZOOMING")) return;
 			if (this._contextService.getContextValue("MOBILE_EXPANDING_SELECTION")) return;
 			this._startResize(evt, type);
-		});
+		}));
 	}
 	_startResize(evt, type) {
 		const skeleton = this._sheetSkeletonManagerService.getCurrentSkeleton();
@@ -33285,69 +33342,80 @@ let MobileHeaderResizeRenderController = class MobileHeaderResizeRenderControlle
 		const engine = scene.getEngine();
 		const canvasElement = engine === null || engine === void 0 ? void 0 : engine.getCanvasElement();
 		if (!canvasElement) return;
-		this._touchStartX = evt.offsetX;
-		this._touchStartY = evt.offsetY;
-		this._isDragging = false;
+		this._cancelResize();
 		const currentOffset = type === "row" ? skeleton.getOffsetByRow(this._currentRow) : skeleton.getOffsetByColumn(this._currentColumn);
 		this._createResizeHelper(type, currentOffset, skeleton);
 		scene.disableObjectsEvent();
-		this._setupTouchHandlers(canvasElement, type, currentOffset);
+		this._setupPointerHandlers(canvasElement, evt, type, currentOffset);
 	}
-	_setupTouchHandlers(canvasElement, type, initialOffset) {
-		if (!this._sheetSkeletonManagerService.getCurrentSkeleton()) return;
-		const scene = this._context.scene;
+	_setupPointerHandlers(canvasElement, evt, type, initialOffset) {
 		const worksheet = this._context.unit.getActiveSheet();
-		const zoomRatio = (worksheet === null || worksheet === void 0 ? void 0 : worksheet.getZoomRatio()) || 1;
+		if (!worksheet) {
+			this._cancelResize();
+			return;
+		}
+		const zoomRatio = worksheet.getZoomRatio() || 1;
+		const initialSize = type === "row" ? worksheet.getRowHeight(this._currentRow) : worksheet.getColumnWidth(this._currentColumn);
+		const anchor = type === "row" ? this._currentRow : this._currentColumn;
+		const pointerId = "pointerId" in evt ? evt.pointerId : 0;
+		const startX = evt.offsetX;
+		const startY = evt.offsetY;
 		let totalDelta = 0;
-		this._touchMoveHandler = (e) => {
+		const handlePointerMove = (e) => {
+			if (e.pointerId !== pointerId) return;
 			if (this._contextService.getContextValue("MOBILE_PINCH_ZOOMING")) {
 				this._cancelResize();
 				return;
 			}
-			if (e.touches.length !== 1) return;
-			const touch = e.touches[0];
 			const rect = canvasElement.getBoundingClientRect();
-			const offsetX = touch.clientX - rect.left;
-			const offsetY = touch.clientY - rect.top;
-			const adjustedDelta = (type === "row" ? offsetY - this._touchStartY : offsetX - this._touchStartX) / zoomRatio;
+			const offsetX = e.clientX - rect.left;
+			const offsetY = e.clientY - rect.top;
+			const adjustedDelta = (type === "row" ? offsetY - startY : offsetX - startX) / zoomRatio;
 			if (Math.abs(adjustedDelta) >= MINIMAL_OFFSET) this._isDragging = true;
 			if (this._isDragging) {
-				totalDelta = adjustedDelta;
-				this._updateResizeHelper(type, initialOffset + adjustedDelta);
-				this._updateResizeButton(type, initialOffset + adjustedDelta);
+				totalDelta = Math.max(adjustedDelta, -initialSize);
+				this._updateResizeHelper(type, initialOffset + totalDelta);
+				this._updateResizeButton(type, initialOffset + totalDelta);
 			}
 			e.preventDefault();
 		};
-		this._touchEndHandler = (e) => {
-			scene.enableObjectsEvent();
-			if (this._isDragging && Math.abs(totalDelta) >= MINIMAL_OFFSET) {
-				if (type === "row") this._commandService.executeCommand(_univerjs_sheets.DeltaRowHeightCommand.id, {
-					deltaY: totalDelta,
-					anchorRow: this._currentRow
-				});
-				else this._commandService.executeCommand(_univerjs_sheets.DeltaColumnWidthCommand.id, {
-					deltaX: totalDelta,
-					anchorCol: this._currentColumn
-				});
-			}
+		const handlePointerUp = async (e) => {
+			if (e.pointerId !== pointerId) return;
+			const shouldResize = this._isDragging && totalDelta !== 0;
 			this._cleanupResize();
-			if (this._touchMoveHandler) canvasElement.removeEventListener("touchmove", this._touchMoveHandler);
-			if (this._touchEndHandler) {
-				canvasElement.removeEventListener("touchend", this._touchEndHandler);
-				canvasElement.removeEventListener("touchcancel", this._touchEndHandler);
-			}
 			e.preventDefault();
+			if (shouldResize) await this._commandService.executeCommand(type === "row" ? _univerjs_sheets.DeltaRowHeightCommand.id : _univerjs_sheets.DeltaColumnWidthCommand.id, type === "row" ? {
+				deltaY: totalDelta,
+				anchorRow: anchor
+			} : {
+				deltaX: totalDelta,
+				anchorCol: anchor
+			});
 		};
-		canvasElement.addEventListener("touchmove", this._touchMoveHandler, { passive: false });
-		canvasElement.addEventListener("touchend", this._touchEndHandler, { passive: false });
-		canvasElement.addEventListener("touchcancel", this._touchEndHandler, { passive: false });
-		this.disposeWithMe((0, _univerjs_core.toDisposable)(() => {
-			if (this._touchMoveHandler) canvasElement.removeEventListener("touchmove", this._touchMoveHandler);
-			if (this._touchEndHandler) {
-				canvasElement.removeEventListener("touchend", this._touchEndHandler);
-				canvasElement.removeEventListener("touchcancel", this._touchEndHandler);
-			}
-		}));
+		this._bindResizeListeners(canvasElement, pointerId, handlePointerMove, handlePointerUp);
+	}
+	_bindResizeListeners(canvasElement, pointerId, handlePointerMove, handlePointerUp) {
+		const ownerDocument = canvasElement.ownerDocument;
+		const ownerWindow = ownerDocument.defaultView;
+		const handlePointerCancel = (e) => {
+			if (e.pointerId === pointerId) this._cancelResize();
+		};
+		const handlePointerDown = (e) => {
+			if (e.pointerId !== pointerId) this._cancelResize();
+		};
+		const handleBlur = () => this._cancelResize();
+		ownerDocument.addEventListener("pointermove", handlePointerMove, { passive: false });
+		ownerDocument.addEventListener("pointerup", handlePointerUp);
+		ownerDocument.addEventListener("pointercancel", handlePointerCancel);
+		ownerDocument.addEventListener("pointerdown", handlePointerDown);
+		ownerWindow === null || ownerWindow === void 0 || ownerWindow.addEventListener("blur", handleBlur);
+		this._resizeListeners = (0, _univerjs_core.toDisposable)(() => {
+			ownerDocument.removeEventListener("pointermove", handlePointerMove);
+			ownerDocument.removeEventListener("pointerup", handlePointerUp);
+			ownerDocument.removeEventListener("pointercancel", handlePointerCancel);
+			ownerDocument.removeEventListener("pointerdown", handlePointerDown);
+			ownerWindow === null || ownerWindow === void 0 || ownerWindow.removeEventListener("blur", handleBlur);
+		});
 	}
 	_createResizeHelper(type, offset, skeleton) {
 		const scene = this._context.scene;
@@ -33388,30 +33456,18 @@ let MobileHeaderResizeRenderController = class MobileHeaderResizeRenderControlle
 		else button.transformByState({ left: newOffset - buttonSize / 2 });
 	}
 	_cleanupResize() {
-		var _this$_resizeHelperSh2;
-		(_this$_resizeHelperSh2 = this._resizeHelperShape) === null || _this$_resizeHelperSh2 === void 0 || _this$_resizeHelperSh2.dispose();
+		var _this$_resizeListener, _this$_resizeHelperSh;
+		(_this$_resizeListener = this._resizeListeners) === null || _this$_resizeListener === void 0 || _this$_resizeListener.dispose();
+		this._resizeListeners = null;
+		this._context.scene.enableObjectsEvent();
+		(_this$_resizeHelperSh = this._resizeHelperShape) === null || _this$_resizeHelperSh === void 0 || _this$_resizeHelperSh.dispose();
 		this._resizeHelperShape = null;
 		this._isDragging = false;
 	}
-	_cleanupTouchHandlers() {
-		const engine = this._context.scene.getEngine();
-		const canvasElement = engine === null || engine === void 0 ? void 0 : engine.getCanvasElement();
-		if (canvasElement) {
-			if (this._touchMoveHandler) {
-				canvasElement.removeEventListener("touchmove", this._touchMoveHandler);
-				this._touchMoveHandler = null;
-			}
-			if (this._touchEndHandler) {
-				canvasElement.removeEventListener("touchend", this._touchEndHandler);
-				canvasElement.removeEventListener("touchcancel", this._touchEndHandler);
-				this._touchEndHandler = null;
-			}
-		}
-	}
 	_cancelResize() {
-		this._context.scene.enableObjectsEvent();
+		if (!this._resizeHelperShape && !this._resizeListeners) return;
 		this._cleanupResize();
-		this._cleanupTouchHandlers();
+		this._updateButtonPositionOnScroll();
 	}
 };
 MobileHeaderResizeRenderController = __decorate([
@@ -33425,6 +33481,7 @@ MobileHeaderResizeRenderController = __decorate([
 //#endregion
 //#region src/controllers/render-controllers/mobile/mobile-hover.render-controller.ts
 const TAP_MOVE_THRESHOLD = 10;
+const DOUBLE_TAP_MOVE_THRESHOLD = 20;
 const DOUBLE_TAP_DELAY = 500;
 function getPointerId(event) {
 	return "pointerId" in event ? event.pointerId : void 0;
@@ -33500,6 +33557,7 @@ let MobileHoverRenderController = class MobileHoverRenderController extends _uni
 			next: ([event, state]) => {
 				state.stopPropagation();
 				state.skipNextObservers = true;
+				if (event.deviceType === _univerjs_engine_render.DeviceType.Touch) return;
 				if (this._suppressEngineDoubleClick) {
 					this._clearEngineDoubleClickSuppression();
 					return;
@@ -33550,15 +33608,15 @@ let MobileHoverRenderController = class MobileHoverRenderController extends _uni
 			return;
 		}
 		this._tapState = {
-			offsetX: event.offsetX,
-			offsetY: event.offsetY,
+			clientX: event.clientX,
+			clientY: event.clientY,
 			pointerId: getPointerId(event)
 		};
 	}
 	_updateTapState(event) {
 		const pointerId = getPointerId(event);
 		if (!this._tapState || pointerId != null && pointerId !== this._tapState.pointerId) return;
-		if (Math.abs(event.offsetX - this._tapState.offsetX) > TAP_MOVE_THRESHOLD || Math.abs(event.offsetY - this._tapState.offsetY) > TAP_MOVE_THRESHOLD) this._resetTapSequence();
+		if (Math.abs(event.clientX - this._tapState.clientX) > TAP_MOVE_THRESHOLD || Math.abs(event.clientY - this._tapState.clientY) > TAP_MOVE_THRESHOLD) this._resetTapSequence();
 	}
 	_finishTap(event) {
 		const tapState = this._tapState;
@@ -33568,14 +33626,28 @@ let MobileHoverRenderController = class MobileHoverRenderController extends _uni
 			this._resetCompletedTap();
 			return false;
 		}
-		const completed = Math.abs(event.offsetX - tapState.offsetX) <= TAP_MOVE_THRESHOLD && Math.abs(event.offsetY - tapState.offsetY) <= TAP_MOVE_THRESHOLD && !this._contextService.getContextValue("MOBILE_PINCH_ZOOMING") && !this._contextService.getContextValue("MOBILE_EXPANDING_SELECTION") && !this._contextService.getContextValue("MOBILE_TRIGGER_CONTEXT_MENU");
+		const completed = Math.abs(event.clientX - tapState.clientX) <= TAP_MOVE_THRESHOLD && Math.abs(event.clientY - tapState.clientY) <= TAP_MOVE_THRESHOLD && !this._contextService.getContextValue("MOBILE_PINCH_ZOOMING") && !this._contextService.getContextValue("MOBILE_EXPANDING_SELECTION") && !this._contextService.getContextValue("MOBILE_TRIGGER_CONTEXT_MENU");
 		if (!completed) this._resetCompletedTap();
 		return completed;
 	}
 	_completeTap(unitId, event) {
+		const skeletonParam = this._sheetSkeletonManagerService.getCurrentParam();
+		const cellIndex = skeletonParam && getCellIndexByOffsetWithMerge(event.offsetX, event.offsetY, this._context.scene, skeletonParam.skeleton);
+		if (!cellIndex || !skeletonParam) {
+			this._resetCompletedTap();
+			return;
+		}
+		const cell = {
+			unitId,
+			subUnitId: skeletonParam.sheetId,
+			row: cellIndex.actualRow,
+			col: cellIndex.actualCol
+		};
+		const timeStamp = Number.isFinite(event.timeStamp) ? event.timeStamp : performance.now();
 		const lastCompletedTap = this._lastCompletedTap;
-		if (lastCompletedTap && Math.abs(event.offsetX - lastCompletedTap.offsetX) <= TAP_MOVE_THRESHOLD && Math.abs(event.offsetY - lastCompletedTap.offsetY) <= TAP_MOVE_THRESHOLD) {
+		if (lastCompletedTap && timeStamp >= lastCompletedTap.timeStamp && timeStamp - lastCompletedTap.timeStamp <= DOUBLE_TAP_DELAY && cell.unitId === lastCompletedTap.cell.unitId && cell.subUnitId === lastCompletedTap.cell.subUnitId && cell.row === lastCompletedTap.cell.row && cell.col === lastCompletedTap.cell.col && Math.abs(event.clientX - lastCompletedTap.clientX) <= DOUBLE_TAP_MOVE_THRESHOLD && Math.abs(event.clientY - lastCompletedTap.clientY) <= DOUBLE_TAP_MOVE_THRESHOLD) {
 			this._resetCompletedTap();
+			this._clearEngineDoubleClickSuppression();
 			this._suppressEngineDoubleClick = true;
 			this._suppressEngineDoubleClickTimer = setTimeout(() => {
 				this._suppressEngineDoubleClick = false;
@@ -33586,9 +33658,10 @@ let MobileHoverRenderController = class MobileHoverRenderController extends _uni
 		}
 		this._resetCompletedTap();
 		this._lastCompletedTap = {
-			offsetX: event.offsetX,
-			offsetY: event.offsetY,
-			pointerId: getPointerId(event)
+			clientX: event.clientX,
+			clientY: event.clientY,
+			timeStamp,
+			cell
 		};
 		this._completedTapTimer = setTimeout(() => this._resetCompletedTap(), DOUBLE_TAP_DELAY);
 	}
@@ -35421,7 +35494,7 @@ _defineProperty(UniverSheetsMobileUIPlugin, "packageName", name);
 _defineProperty(UniverSheetsMobileUIPlugin, "version", version);
 _defineProperty(UniverSheetsMobileUIPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 UniverSheetsMobileUIPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_docs.UniverDocsPlugin, _univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_engine_render.UniverRenderEnginePlugin, _univerjs_sheets.UniverSheetsPlugin, _univerjs_ui.UniverMobileUIPlugin, _univerjs_docs_ui.UniverDocsUIPlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_docs.UniverDocsPlugin, _univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_engine_render.UniverRenderEnginePlugin, _univerjs_sheets.UniverSheetsPlugin, _univerjs_ui.UniverMobileUIPlugin, _univerjs_docs_ui.UniverDocsMobileUIPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, _univerjs_engine_render.IRenderManagerService),
 	__decorateParam(3, _univerjs_core.IConfigService),
@@ -35791,6 +35864,12 @@ let DesktopCellEditRenderController = class DesktopCellEditRenderController exte
 			var _params;
 			if (params === null || params === void 0 || (_params = params[params.length - 1]) === null || _params === void 0 ? void 0 : _params.primary) this._updateInputPosition();
 		}));
+		const viewportMain = this._context.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN);
+		if (viewportMain) d.add(viewportMain.onScrollEnd$.subscribeEvent(() => {
+			if (this._editorBridgeService.isVisible().visible) return;
+			this._editorBridgeService.refreshEditCellPosition(false);
+			this._updateInputPosition();
+		}));
 	}
 	_updateInputPosition() {
 		var _this$_renderManagerS;
@@ -35798,8 +35877,8 @@ let DesktopCellEditRenderController = class DesktopCellEditRenderController exte
 		const layout = this._editorBridgeService.getEditCellLayout();
 		const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(_univerjs_docs_ui.DocSelectionRenderService);
 		if (!layout || !docSelectionRenderService) return;
-		const { position, canvasOffset } = layout;
-		docSelectionRenderService.setInputPosition(canvasOffset.left + position.startX, canvasOffset.top + position.startY);
+		const { x, y } = getEditCellInputPosition(layout, this._context.engine);
+		docSelectionRenderService.setInputPosition(x, y);
 	}
 	_focusCellEditorInput() {
 		const focusedChildUnitId = (0, _univerjs_ui.getEmbedChildUnitId)(typeof document === "undefined" ? null : document.activeElement);