@univerjs/sheets-ui 1.1.0 → 1.2.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;
@@ -25072,7 +25092,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/views/cell-popup/config.ts
@@ -27589,7 +27609,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", {
@@ -28801,7 +28821,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
 								})
 							})
@@ -35791,6 +35811,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 +35824,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);

package/lib/es/index.js

@@ -11459,6 +11459,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
 /**
@@ -11675,7 +11698,11 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 			if ((cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 ? void 0 : cellSelectionRenderManager.canFocusing) || (formulaSelectionRenderManager === null || formulaSelectionRenderManager === void 0 ? void 0 : formulaSelectionRenderManager.canFocusing)) {
 				this._univerInstanceService.setCurrentUnitForType(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 				if (this._contextService.getContextValue(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);
+				}
 			}
 		}));
 	}
@@ -11749,7 +11776,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		}));
 	}
 	_handleEditorVisible(param) {
-		var _documentDataModel$ge, _this$_renderManagerS6;
+		var _documentDataModel$ge, _this$_renderManagerS7;
 		const { eventType, keycode } = param;
 		this._cursorChange = eventType === DeviceInputEventType.PointerDown || eventType === DeviceInputEventType.Dblclick ? 2 : 1;
 		const editCellState = this._editorBridgeService.getEditLocation();
@@ -11778,8 +11805,8 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 			const resetPointerSelection = isInArrayFormulaRange && eventType === DeviceInputEventType.PointerDown;
 			const editorId = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR) ? 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(DocSelectionRenderService).cancelPointerSelection();
+				var _this$_renderManagerS6;
+				(_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS6 === void 0 || _this$_renderManagerS6.with(DocSelectionRenderService).cancelPointerSelection();
 			}
 			this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
 			document.makeDirty();
@@ -11857,7 +11884,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 				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;
@@ -11873,8 +11900,8 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 			if (!pointerPosition || isInArrayFormulaRange) return;
 			const rect = engine.getCanvasElement().getBoundingClientRect();
 			if (rect.width > 0 && rect.height > 0) {
-				var _this$_renderManagerS7;
-				(_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS7 === void 0 || _this$_renderManagerS7.with(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(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS8 === void 0 || _this$_renderManagerS8.with(DocSelectionRenderService).setCursorManually((pointerPosition.x - rect.left) * engine.width / rect.width, (pointerPosition.y - rect.top) * engine.height / rect.height, true, true, { strict: false });
 			}
 		});
 	}
@@ -12076,12 +12103,12 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		return this._univerInstanceService.getUnit(DOCS_NORMAL_EDITOR_UNIT_ID_KEY, 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(DocSkeletonManagerService).getSkeleton();
+		var _this$_renderManagerS9;
+		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(DocSkeletonManagerService).getSkeleton();
 	}
 	_getEditorViewModel(editorId) {
-		var _this$_renderManagerS9;
-		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(DocSkeletonManagerService).getViewModel();
+		var _this$_renderManagerS10;
+		return (_this$_renderManagerS10 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS10 === void 0 ? void 0 : _this$_renderManagerS10.with(DocSkeletonManagerService).getViewModel();
 	}
 	_getEditingUnit() {
 		return this._editingUnit ? this._univerInstanceService.getUnit(this._editingUnit, UniverInstanceType.UNIVER_SHEET) : null;
@@ -12139,13 +12166,13 @@ function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService,
 		cellData.si = null;
 		cellData.p = snapshot;
 		cellData.t = CellValueType.STRING;
-	} else if (cellData.s && 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 && 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 = 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 (isFormulaString(newDataStream)) {
@@ -12162,21 +12189,14 @@ function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService,
 		cellData.si = null;
 		cellData.p = null;
 		cellData.t = 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;
@@ -25071,7 +25091,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/views/cell-popup/config.ts
@@ -27588,7 +27608,7 @@ const DefinedNameContainer = ({ ConfirmComponent = Confirm, DefinedNameInputComp
 									children: [/* @__PURE__ */ 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__ */ 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 === SCOPE_WORKBOOK_VALUE_DEFINED_NAME || definedName.localSheetId == null ? "" : getSheetNameBySheetId(definedName.localSheetId)
 										})]
 									}), /* @__PURE__ */ jsx("div", {
@@ -28800,7 +28820,7 @@ function SheetPermissionPanelListContent({ ActionRowComponent }) {
 							rule.description && /* @__PURE__ */ jsx(Tooltip, {
 								title: rule.description,
 								children: /* @__PURE__ */ 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
 								})
 							})
@@ -35790,6 +35810,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(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;
@@ -35797,8 +35823,8 @@ let DesktopCellEditRenderController = class DesktopCellEditRenderController exte
 		const layout = this._editorBridgeService.getEditCellLayout();
 		const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(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 = getEmbedChildUnitId(typeof document === "undefined" ? null : document.activeElement);

package/lib/index.js

@@ -11459,6 +11459,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
 /**
@@ -11675,7 +11698,11 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 			if ((cellSelectionRenderManager === null || cellSelectionRenderManager === void 0 ? void 0 : cellSelectionRenderManager.canFocusing) || (formulaSelectionRenderManager === null || formulaSelectionRenderManager === void 0 ? void 0 : formulaSelectionRenderManager.canFocusing)) {
 				this._univerInstanceService.setCurrentUnitForType(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 				if (this._contextService.getContextValue(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);
+				}
 			}
 		}));
 	}
@@ -11749,7 +11776,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		}));
 	}
 	_handleEditorVisible(param) {
-		var _documentDataModel$ge, _this$_renderManagerS6;
+		var _documentDataModel$ge, _this$_renderManagerS7;
 		const { eventType, keycode } = param;
 		this._cursorChange = eventType === DeviceInputEventType.PointerDown || eventType === DeviceInputEventType.Dblclick ? 2 : 1;
 		const editCellState = this._editorBridgeService.getEditLocation();
@@ -11778,8 +11805,8 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 			const resetPointerSelection = isInArrayFormulaRange && eventType === DeviceInputEventType.PointerDown;
 			const editorId = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR) ? 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(DocSelectionRenderService).cancelPointerSelection();
+				var _this$_renderManagerS6;
+				(_this$_renderManagerS6 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS6 === void 0 || _this$_renderManagerS6.with(DocSelectionRenderService).cancelPointerSelection();
 			}
 			this._emptyDocumentDataModel(documentDataModel.getSnapshot().documentStyle, !!isInArrayFormulaRange);
 			document.makeDirty();
@@ -11857,7 +11884,7 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 				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;
@@ -11873,8 +11900,8 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 			if (!pointerPosition || isInArrayFormulaRange) return;
 			const rect = engine.getCanvasElement().getBoundingClientRect();
 			if (rect.width > 0 && rect.height > 0) {
-				var _this$_renderManagerS7;
-				(_this$_renderManagerS7 = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS7 === void 0 || _this$_renderManagerS7.with(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(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS8 === void 0 || _this$_renderManagerS8.with(DocSelectionRenderService).setCursorManually((pointerPosition.x - rect.left) * engine.width / rect.width, (pointerPosition.y - rect.top) * engine.height / rect.height, true, true, { strict: false });
 			}
 		});
 	}
@@ -12076,12 +12103,12 @@ let EditingRenderController = class EditingRenderController extends Disposable {
 		return this._univerInstanceService.getUnit(DOCS_NORMAL_EDITOR_UNIT_ID_KEY, 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(DocSkeletonManagerService).getSkeleton();
+		var _this$_renderManagerS9;
+		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(DocSkeletonManagerService).getSkeleton();
 	}
 	_getEditorViewModel(editorId) {
-		var _this$_renderManagerS9;
-		return (_this$_renderManagerS9 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS9 === void 0 ? void 0 : _this$_renderManagerS9.with(DocSkeletonManagerService).getViewModel();
+		var _this$_renderManagerS10;
+		return (_this$_renderManagerS10 = this._renderManagerService.getRenderUnitById(editorId)) === null || _this$_renderManagerS10 === void 0 ? void 0 : _this$_renderManagerS10.with(DocSkeletonManagerService).getViewModel();
 	}
 	_getEditingUnit() {
 		return this._editingUnit ? this._univerInstanceService.getUnit(this._editingUnit, UniverInstanceType.UNIVER_SHEET) : null;
@@ -12139,13 +12166,13 @@ function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService,
 		cellData.si = null;
 		cellData.p = snapshot;
 		cellData.t = CellValueType.STRING;
-	} else if (cellData.s && 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 && 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 = 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 (isFormulaString(newDataStream)) {
@@ -12162,21 +12189,14 @@ function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService,
 		cellData.si = null;
 		cellData.p = null;
 		cellData.t = 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;
@@ -25071,7 +25091,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.1.0";
+var version = "1.2.0";
 
 //#endregion
 //#region src/views/cell-popup/config.ts
@@ -27588,7 +27608,7 @@ const DefinedNameContainer = ({ ConfirmComponent = Confirm, DefinedNameInputComp
 									children: [/* @__PURE__ */ 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__ */ 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 === SCOPE_WORKBOOK_VALUE_DEFINED_NAME || definedName.localSheetId == null ? "" : getSheetNameBySheetId(definedName.localSheetId)
 										})]
 									}), /* @__PURE__ */ jsx("div", {
@@ -28800,7 +28820,7 @@ function SheetPermissionPanelListContent({ ActionRowComponent }) {
 							rule.description && /* @__PURE__ */ jsx(Tooltip, {
 								title: rule.description,
 								children: /* @__PURE__ */ 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
 								})
 							})
@@ -35790,6 +35810,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(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;
@@ -35797,8 +35823,8 @@ let DesktopCellEditRenderController = class DesktopCellEditRenderController exte
 		const layout = this._editorBridgeService.getEditCellLayout();
 		const docSelectionRenderService = (_this$_renderManagerS = this._renderManagerService.getRenderUnitById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(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 = getEmbedChildUnitId(typeof document === "undefined" ? null : document.activeElement);

package/lib/types/controllers/editor/utils/get-edit-cell-input-position.d.ts

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { Nullable } from '@univerjs/core';
+import type { ICellEditorLayout } from '../../../services/editor-bridge.service';
+/**
+ * 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.
+ */
+export declare function getEditCellInputPosition(layout: Pick<ICellEditorLayout, 'position' | 'canvasOffset'>, canvasSize?: Nullable<{
+    width: number;
+    height: number;
+}>): {
+    x: number;
+    y: number;
+};