@univerjs/sheets-ui 1.0.0-beta.1 → 1.0.0-beta.2

package/lib/cjs/index.js

@@ -3124,6 +3124,7 @@ var HtmlToUSMService = class HtmlToUSMService {
 			let value = numfmtMatch[1].trim();
 			if (value.startsWith("\"") && value.endsWith("\"")) value = value.slice(1, -1);
 			const decoded = decodeMsoNumberFormat(value);
+			if (!_univerjs_core.numfmt.isValidFormat(decoded)) continue;
 			selectors.split(",").forEach((sel) => {
 				this._msoNumfmtMap.set(sel.trim(), decoded);
 			});
@@ -8349,7 +8350,8 @@ let EditorBridgeService = class EditorBridgeService extends _univerjs_core.Dispo
 			sheetId,
 			documentLayoutObject,
 			editorUnitId: this._editorUnitId,
-			isInArrayFormulaRange: cell === null || cell === void 0 ? void 0 : cell.isInArrayFormulaRange
+			isInArrayFormulaRange: cell === null || cell === void 0 ? void 0 : cell.isInArrayFormulaRange,
+			isPercentFormat: cell === null || cell === void 0 ? void 0 : cell.isPercentFormat
 		};
 	}
 	_getWorkbookForEditUnit(unitId) {
@@ -10021,25 +10023,25 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 	_initialKeyboardListener(d) {
 		let disposable = null;
 		const addEvent = (render) => {
+			disposable === null || disposable === void 0 || disposable.dispose();
+			disposable = null;
 			const docSelectionRenderService = render.with(_univerjs_docs_ui.DocSelectionRenderService);
-			if (docSelectionRenderService) {
-				disposable = (0, _univerjs_core.toDisposable)(docSelectionRenderService.onInputBefore$.subscribe((config) => {
-					var _this$_embedRuntimeFo;
-					if (!this._isCurrentSheetFocused()) return;
-					const isFocusFormulaEditor = this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR);
-					const isFocusSheets = this._contextService.getContextValue(_univerjs_core.FOCUSING_SHEET) || ((_this$_embedRuntimeFo = this._embedRuntimeFocusCoordinator) === null || _this$_embedRuntimeFo === void 0 ? void 0 : _this$_embedRuntimeFo.isChildUnitInActiveSession(this._context.unitId)) === true;
-					const unitId = render.unitId;
-					if (this._editorBridgeService.isVisible().visible) return;
-					if (unitId && isFocusSheets && !isFocusFormulaEditor) this._showEditorByKeyboard(config);
-				}));
-				d.add(disposable);
-			}
+			if (docSelectionRenderService) disposable = (0, _univerjs_core.toDisposable)(docSelectionRenderService.onInputBefore$.subscribe((config) => {
+				var _this$_embedRuntimeFo;
+				if (!this._isCurrentSheetFocused()) return;
+				const isFocusFormulaEditor = this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR);
+				const isFocusSheets = this._contextService.getContextValue(_univerjs_core.FOCUSING_SHEET) || ((_this$_embedRuntimeFo = this._embedRuntimeFocusCoordinator) === null || _this$_embedRuntimeFo === void 0 ? void 0 : _this$_embedRuntimeFo.isChildUnitInActiveSession(this._context.unitId)) === true;
+				const unitId = render.unitId;
+				if (this._editorBridgeService.isVisible().visible) return;
+				if (unitId && isFocusSheets && !isFocusFormulaEditor) this._showEditorByKeyboard(config);
+			}));
 		};
 		const render = this._renderManagerService.getRenderUnitById(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 		if (render) addEvent(render);
-		else this.disposeWithMe(this._renderManagerService.created$.pipe((0, rxjs.filter)((render) => render.unitId === _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY)).subscribe((render) => {
+		d.add(this._renderManagerService.created$.pipe((0, rxjs.filter)((render) => render.unitId === _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY)).subscribe(addEvent));
+		d.add((0, _univerjs_core.toDisposable)(() => {
 			disposable === null || disposable === void 0 || disposable.dispose();
-			addEvent(render);
+			disposable = null;
 		}));
 	}
 	_initSheetFocusListener(d) {
@@ -10788,8 +10790,29 @@ const isRangeSelector = (unitId) => {
 //#endregion
 //#region src/controllers/editor/editing.render-controller.ts
 const HIDDEN_EDITOR_POSITION$1 = -1e3;
+function getPercentOffset(editCellState, dataStream) {
+	if (!editCellState.isPercentFormat || editCellState.isInArrayFormulaRange) return null;
+	const percentSuffix = `%${_univerjs_core.DEFAULT_EMPTY_DOCUMENT_VALUE}`;
+	return (dataStream === null || dataStream === void 0 ? void 0 : dataStream.endsWith(percentSuffix)) ? dataStream.length - percentSuffix.length : null;
+}
+function getPercentEditorSelection(editCellState, visibleParam, dataStream) {
+	const percentOffset = getPercentOffset(editCellState, dataStream);
+	if (percentOffset == null) return null;
+	const { eventType, initialValue, keycode } = visibleParam;
+	if (eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick || eventType === _univerjs_engine_render.DeviceInputEventType.Keyboard && keycode === _univerjs_ui.KeyCode.F2) return {
+		startOffset: percentOffset,
+		endOffset: percentOffset,
+		collapsed: true
+	};
+	if (eventType !== _univerjs_engine_render.DeviceInputEventType.Keyboard || keycode === _univerjs_ui.KeyCode.BACKSPACE || keycode === _univerjs_ui.KeyCode.DELETE || !/^\d/.test(initialValue ?? "")) return null;
+	return {
+		startOffset: 0,
+		endOffset: percentOffset,
+		collapsed: false
+	};
+}
 let EditingRenderController = class EditingRenderController extends _univerjs_core.Disposable {
-	constructor(_undoRedoService, _contextService, _renderManagerService, _editorBridgeService, _cellEditorManagerService, _lexerTreeBuilder, _functionService, _textSelectionManagerService, _commandService, _localService, _editorService, _univerInstanceService, _sheetInterceptorService, _sheetCellEditorResizeService, _selectionManagerService, _configService) {
+	constructor(_undoRedoService, _contextService, _renderManagerService, _editorBridgeService, _cellEditorManagerService, _lexerTreeBuilder, _functionService, _textSelectionManagerService, _commandService, _localService, _editorService, _univerInstanceService, _sheetInterceptorService, _sheetCellEditorResizeService, _selectionManagerService, _configService, _docStateChangeManagerService) {
 		super();
 		this._undoRedoService = _undoRedoService;
 		this._contextService = _contextService;
@@ -10807,6 +10830,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		this._sheetCellEditorResizeService = _sheetCellEditorResizeService;
 		this._selectionManagerService = _selectionManagerService;
 		this._configService = _configService;
+		this._docStateChangeManagerService = _docStateChangeManagerService;
 		_defineProperty(this, "_cursorChange", 0);
 		_defineProperty(this, "_editingUnit", "");
 		_defineProperty(this, "_submitEmptyCellImageEdit", false);
@@ -10881,6 +10905,7 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 			const docSelectionRenderManager = (_this$_renderManagerS2 = this._renderManagerService.getRenderUnitById(docUnitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(_univerjs_docs_ui.DocSelectionRenderService);
 			if (!docSelectionRenderManager) return;
 			docSelectionRenderManager.sync();
+			this._cacheEmptyCellTextStyle();
 		}));
 	}
 	_initSkeletonListener(d) {
@@ -10961,6 +10986,30 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 	* Listen to document edits to refresh the size of the sheet editor, not for normal editor.
 	*/
 	_commandExecutedListener(d) {
+		d.add(this._commandService.beforeCommandExecuted((command) => {
+			var _this$_getDocumentDat;
+			if (command.id !== _univerjs_docs.InsertTextCommand.id) return;
+			const params = command.params;
+			const visibleParam = this._editorBridgeService.isVisible();
+			const editCellState = this._editorBridgeService.getEditLocation();
+			if (params.unitId !== _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY || !visibleParam.visible || editCellState == null) return;
+			const dataStream = (_this$_getDocumentDat = this._getDocumentDataModel()) === null || _this$_getDocumentDat === void 0 || (_this$_getDocumentDat = _this$_getDocumentDat.getBody()) === null || _this$_getDocumentDat === void 0 ? void 0 : _this$_getDocumentDat.dataStream;
+			if (dataStream == null) return;
+			const percentOffset = getPercentOffset(editCellState, dataStream);
+			if (percentOffset != null && !this._editorBridgeService.getEditorDirty() && visibleParam.eventType === _univerjs_engine_render.DeviceInputEventType.Keyboard && /^\d/.test(visibleParam.initialValue ?? "") && /^\d/.test(params.body.dataStream)) {
+				params.range = {
+					startOffset: 0,
+					endOffset: percentOffset,
+					collapsed: false
+				};
+				return;
+			}
+			if (percentOffset != null && params.body.dataStream === "%" && params.range.collapsed && params.range.startOffset === percentOffset && params.range.endOffset === percentOffset) params.range = {
+				...params.range,
+				endOffset: percentOffset + 1,
+				collapsed: false
+			};
+		}));
 		d.add(this._commandService.onCommandExecuted((command) => {
 			if (command.id === _univerjs_docs.RichTextEditingMutation.id) {
 				const { unitId: commandUnitId } = command.params;
@@ -10993,12 +11042,13 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		}));
 	}
 	_handleEditorVisible(param) {
-		var _this$_sheetCellEdito4, _this$_renderManagerS5;
+		var _this$_sheetCellEdito4, _documentDataModel$ge, _this$_renderManagerS5;
 		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();
 		if (editCellState == null) return;
 		const { unitId, isInArrayFormulaRange = false } = editCellState;
+		this._clearEditorHistory();
 		this._commandService.syncExecuteCommand(ScrollToRangeOperation.id, {
 			unitId,
 			range: {
@@ -11038,35 +11088,51 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 				subUnitId: _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY
 			});
 		};
+		const replaceSelection = (selection) => {
+			this._textSelectionManagerService.replaceDocRanges([selection], {
+				unitId: _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
+				subUnitId: _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY
+			});
+		};
+		const percentSelection = getPercentEditorSelection(editCellState, param, (_documentDataModel$ge = documentDataModel.getBody()) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.dataStream);
 		const cellImage = (0, _univerjs_sheets.isCellImage)(documentDataModel.getSnapshot());
 		this._submitEmptyCellImageEdit = cellImage && eventType === _univerjs_engine_render.DeviceInputEventType.Keyboard && keycode === _univerjs_ui.KeyCode.BACKSPACE;
 		if (cellImage) clearAndEdit();
 		else if (eventType === _univerjs_engine_render.DeviceInputEventType.Keyboard && keycode === _univerjs_ui.KeyCode.F2) {
-			var _documentDataModel$ge;
+			var _documentDataModel$ge2;
 			document.makeDirty();
 			this._textSelectionManagerService.replaceDocRanges([{
 				startOffset: 0,
 				endOffset: 0
 			}]);
-			const endOffset = (((_documentDataModel$ge = documentDataModel.getBody()) === null || _documentDataModel$ge === void 0 ? void 0 : _documentDataModel$ge.dataStream.length) ?? 2) - 2;
-			this._textSelectionManagerService.replaceDocRanges([{
+			const endOffset = (((_documentDataModel$ge2 = documentDataModel.getBody()) === null || _documentDataModel$ge2 === void 0 ? void 0 : _documentDataModel$ge2.dataStream.length) ?? 2) - 2;
+			if (percentSelection) replaceSelection(percentSelection);
+			else this._textSelectionManagerService.replaceDocRanges([{
 				startOffset: endOffset,
 				endOffset
 			}], {
 				unitId: _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY,
 				subUnitId: _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY
 			});
-		} else if (eventType === _univerjs_engine_render.DeviceInputEventType.Keyboard || eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick && isInArrayFormulaRange) clearAndEdit();
+		} else if (eventType === _univerjs_engine_render.DeviceInputEventType.Keyboard || eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick && isInArrayFormulaRange) if (percentSelection) replaceSelection(percentSelection);
+		else clearAndEdit();
 		else if (eventType === _univerjs_engine_render.DeviceInputEventType.Dblclick) {
 			if (this._contextService.getContextValue(_univerjs_core.FOCUSING_EDITOR_INPUT_FORMULA)) return;
 			const cursor = documentDataModel.getBody().dataStream.length - 2 || 0;
-			this._textSelectionManagerService.replaceDocRanges([{
+			if (percentSelection) replaceSelection(percentSelection);
+			else this._textSelectionManagerService.replaceDocRanges([{
 				startOffset: cursor,
 				endOffset: cursor
 			}]);
 		}
 		(_this$_renderManagerS5 = this._renderManagerService.getRenderUnitById(unitId)) === null || _this$_renderManagerS5 === void 0 || _this$_renderManagerS5.scene.resetCursor();
 	}
+	_cacheEmptyCellTextStyle() {
+		var _this$_editorBridgeSe, _sourceBody$textRuns;
+		const sourceBody = (_this$_editorBridgeSe = this._editorBridgeService.getEditLocation()) === null || _this$_editorBridgeSe === void 0 || (_this$_editorBridgeSe = _this$_editorBridgeSe.documentLayoutObject.documentModel) === null || _this$_editorBridgeSe === void 0 ? void 0 : _this$_editorBridgeSe.getBody();
+		const textRun = (sourceBody === null || sourceBody === void 0 || (_sourceBody$textRuns = sourceBody.textRuns) === null || _sourceBody$textRuns === void 0 ? void 0 : _sourceBody$textRuns.length) === 1 ? sourceBody.textRuns[0] : null;
+		if ((sourceBody === null || sourceBody === void 0 ? void 0 : sourceBody.dataStream) === _univerjs_core.DEFAULT_EMPTY_DOCUMENT_VALUE && (textRun === null || textRun === void 0 ? void 0 : textRun.st) === 0 && textRun.ed === 0) this._commandService.syncExecuteCommand(_univerjs_docs_ui.SetDocInputStyleCommand.id, { style: _univerjs_core.Tools.deepClone(textRun.ts) });
+	}
 	_refreshCurrentSelections(sheetId) {
 		const selections = this._workbookSelections.getSelectionsOfWorksheet(sheetId);
 		if (selections) {
@@ -11190,8 +11256,13 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 			var _this$_getEditorSkele;
 			(_this$_getEditorSkele = this._getEditorSkeleton(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY)) === null || _this$_getEditorSkele === void 0 || _this$_getEditorSkele.resetInitialWidth();
 		}
-		this._undoRedoService.clearUndoRedo(editorUnitId);
+		this._clearEditorHistory();
+	}
+	_clearEditorHistory() {
+		this._undoRedoService.clearUndoRedo(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 		this._undoRedoService.clearUndoRedo(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
+		this._docStateChangeManagerService.clearHistory(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+		this._docStateChangeManagerService.clearHistory(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
 	}
 	_moveSelection(keycode, currentUnitId, worksheetId) {
 		if (keycode == null || !MOVE_SELECTION_KEYCODE_LIST.includes(keycode)) {
@@ -11295,7 +11366,8 @@ EditingRenderController = __decorate([
 	__decorateParam(12, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
 	__decorateParam(13, (0, _univerjs_core.Inject)(SheetCellEditorResizeService)),
 	__decorateParam(14, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService)),
-	__decorateParam(15, _univerjs_core.IConfigService)
+	__decorateParam(15, _univerjs_core.IConfigService),
+	__decorateParam(16, (0, _univerjs_core.Inject)(_univerjs_docs.DocStateChangeManagerService))
 ], EditingRenderController);
 function getCellDataByInput(cellData, snapshot, lexerTreeBuilder, localeService, functionService, styles) {
 	var _styles$get;
@@ -23125,11 +23197,11 @@ function RenderSheetFooter() {
 	const showFooter = (config === null || config === void 0 ? void 0 : config.footer) ?? true;
 	const workbook = useRootWorkbenchWorkbook();
 	const activeWorkbookEmbeddedRender = useActiveWorkbookIsEmbeddedRender(workbook);
-	const focusedUnitType = useFocusedUnitType();
+	const rootUnitType = useWorkbenchRootUnitType();
 	const activeEmbedTab = useActiveSheetEmbedTabData(workbook);
 	if (!workbook || !showFooter) return null;
 	if (activeWorkbookEmbeddedRender) return null;
-	if (!activeEmbedTab && focusedUnitType != null && focusedUnitType !== _univerjs_core.UniverInstanceType.UNIVER_SHEET) return null;
+	if (rootUnitType !== _univerjs_core.UniverInstanceType.UNIVER_SHEET) return null;
 	const footerMenus = menuManagerService.getMenuByPositionKey(_univerjs_ui.ContextMenuPosition.FOOTER_MENU);
 	const { sheetBar = true, statisticBar = true, menus = true, zoomSlider = true } = (config === null || config === void 0 ? void 0 : config.footer) || {};
 	const showStatisticBar = activeEmbedTab ? false : statisticBar;
@@ -23159,16 +23231,12 @@ function RenderSheetHeader() {
 	const workbook = useRootWorkbenchWorkbook();
 	const hasWorkbook = !!workbook;
 	const activeWorkbookEmbeddedRender = useActiveWorkbookIsEmbeddedRender(workbook);
-	const focusedUnitType = useFocusedUnitType();
+	const rootUnitType = useWorkbenchRootUnitType();
 	const activeEmbedTab = useActiveSheetEmbedTabData(workbook);
 	if (!hasWorkbook) return null;
 	if (activeWorkbookEmbeddedRender) return null;
 	if (activeEmbedTab) return null;
-	if (focusedUnitType != null && focusedUnitType !== _univerjs_core.UniverInstanceType.UNIVER_SHEET) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-		"aria-hidden": true,
-		className: "univer-h-7 univer-border-b univer-border-gray-200 univer-bg-gray-0 dark:!univer-border-gray-700 dark:!univer-bg-gray-900",
-		"data-u-comp": "formula-bar-placeholder"
-	});
+	if (rootUnitType !== _univerjs_core.UniverInstanceType.UNIVER_SHEET) return null;
 	if ((config === null || config === void 0 ? void 0 : config.formulaBar) !== false) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FormulaBar, {});
 	return null;
 }
@@ -23182,8 +23250,7 @@ function RenderSheetContent() {
 	const activeEmbedTab = useActiveSheetEmbedTabData(workbook);
 	const injector = (0, _univerjs_ui.useDependency)(_univerjs_core.Injector);
 	const activeWorkbookEmbeddedRender = useActiveWorkbookIsEmbeddedRender(workbook);
-	const focusedUnitType = useFocusedUnitType();
-	const rootWorkbenchOwnsSheet = activeEmbedTab != null || focusedUnitType == null || focusedUnitType === _univerjs_core.UniverInstanceType.UNIVER_SHEET;
+	const rootWorkbenchOwnsSheet = useWorkbenchRootUnitType() === _univerjs_core.UniverInstanceType.UNIVER_SHEET;
 	const ShapeTextEditorContainer = componentManager.get("SheetShapeTextEditorContainer") ?? componentManager.get("ShapeTextEditorContainer");
 	(0, react.useEffect)(() => {
 		var _tryGetSheetEmbedRunt;
@@ -23280,15 +23347,8 @@ function useRootWorkbenchWorkbook() {
 		(0, _univerjs_ui.useObservable)(() => (runtimeFocusCoordinator === null || runtimeFocusCoordinator === void 0 ? void 0 : runtimeFocusCoordinator.runtimeSessionChanged$) ?? rxjs.EMPTY, null, false, [runtimeFocusCoordinator])
 	]);
 }
-function useFocusedUnitType() {
-	const univerInstanceService = (0, _univerjs_ui.useDependency)(_univerjs_core.IUniverInstanceService);
-	const focusedUnitId = (0, _univerjs_ui.useObservable)(() => univerInstanceService.focused$, null, false, [univerInstanceService]);
-	return (0, react.useMemo)(() => {
-		if (!focusedUnitId) return null;
-		if ((0, _univerjs_core.isInternalEditorID)(focusedUnitId) && univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET)) return _univerjs_core.UniverInstanceType.UNIVER_SHEET;
-		const focusedUnit = univerInstanceService.getUnit(focusedUnitId);
-		return (focusedUnit === null || focusedUnit === void 0 ? void 0 : focusedUnit.type) ?? null;
-	}, [focusedUnitId, univerInstanceService]);
+function useWorkbenchRootUnitType() {
+	return (0, _univerjs_ui.useObservable)((0, _univerjs_ui.useDependency)(_univerjs_ui.IWorkbenchService).rootUnitType$, null, true);
 }
 function useActiveSheetEmbedTabData(workbook) {
 	const worksheet = useActiveWorksheet(workbook);
@@ -23913,7 +23973,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.0.0-beta.1";
+var version = "1.0.0-beta.2";
 
 //#endregion
 //#region src/views/cell-popup/config.ts
@@ -24134,6 +24194,7 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 		const canvasElement = currentRender.engine.getCanvasElement();
 		const scaleAdjust = canvasElement.getBoundingClientRect().width / pxToNum(canvasElement.style.width);
 		const { scaleX, scaleY } = currentRender.scene.getAncestorScale();
+		const viewMain = currentRender.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_MAIN);
 		const id = this._globalPopupManagerService.addPopup({
 			...popup,
 			unitId,
@@ -24143,8 +24204,8 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			anchorRect$: position$,
 			canvasElement,
 			boundaryInsets: popup.constrainToCanvas ? {
-				left: skeleton.rowHeaderWidth * scaleAdjust * scaleX,
-				top: skeleton.columnHeaderHeight * scaleAdjust * scaleY
+				left: ((viewMain === null || viewMain === void 0 ? void 0 : viewMain.left) ?? skeleton.rowHeaderWidth * scaleX) * scaleAdjust,
+				top: ((viewMain === null || viewMain === void 0 ? void 0 : viewMain.top) ?? skeleton.columnHeaderHeight * scaleY) * scaleAdjust
 			} : popup.boundaryInsets
 		});
 		const disposableCollection = new _univerjs_core.DisposableCollection();
@@ -27867,10 +27928,11 @@ let EditorDataSyncController = class EditorDataSyncController extends _univerjs_
 		if (unitId === _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY) this._formulaEditorController.autoScroll();
 	}
 	_checkAndSetRenderStyleConfig(documentDataModel) {
-		var _snapshot$body;
+		var _snapshot$documentSty, _snapshot$body;
 		const snapshot = documentDataModel.getSnapshot();
 		if (snapshot.id !== _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY && snapshot.id !== _univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY) return;
 		const isFormulaBar = snapshot.id === _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY;
+		const previousPageWidth = (_snapshot$documentSty = snapshot.documentStyle) === null || _snapshot$documentSty === void 0 || (_snapshot$documentSty = _snapshot$documentSty.pageSize) === null || _snapshot$documentSty === void 0 ? void 0 : _snapshot$documentSty.width;
 		if (isFormulaBar) snapshot.documentStyle = {
 			...formulaEditorStyle,
 			textStyle: { cl: { rgb: this._themeService.getColorFromTheme("gray.900") } }
@@ -27883,8 +27945,8 @@ let EditorDataSyncController = class EditorDataSyncController extends _univerjs_
 		}
 		const position = isFormulaBar ? this._formulaEditorManagerService.getPosition() : null;
 		if (isFormulaBar && position) {
-			const width = position.width;
-			snapshot.documentStyle.pageSize = {
+			const width = position.width > 0 ? position.width : previousPageWidth;
+			if (width != null && width > 0) snapshot.documentStyle.pageSize = {
 				width,
 				height: Infinity
 			};
@@ -29247,35 +29309,37 @@ FormatPainterRenderController = __decorate([
 //#region src/controllers/render-controllers/header-menu.render-controller.ts
 const HEADER_MENU_CONTROLLER_SHAPE = "__SpreadsheetHeaderMenuSHAPEControllerShape__";
 const HEADER_MENU_CONTROLLER_MENU = "__SpreadsheetHeaderMenuMAINControllerShape__";
-const HEADER_MENU_CONTROLLER_SHAPE_COLOR = "gray.100";
+const HEADER_MENU_CONTROLLER_SHAPE_ALPHA = .1;
 let HeaderMenuRenderController = class HeaderMenuRenderController extends _univerjs_core.Disposable {
-	constructor(_context, _sheetSkeletonManagerService, _contextMenuService, _commandService, _selectionManagerService) {
+	constructor(_context, _sheetSkeletonManagerService, _contextMenuService, _commandService, _selectionManagerService, _themeService) {
 		super();
 		this._context = _context;
 		this._sheetSkeletonManagerService = _sheetSkeletonManagerService;
 		this._contextMenuService = _contextMenuService;
 		this._commandService = _commandService;
 		this._selectionManagerService = _selectionManagerService;
+		this._themeService = _themeService;
 		_defineProperty(this, "_hoverRect", void 0);
 		_defineProperty(this, "_hoverMenu", void 0);
 		_defineProperty(this, "_currentColumn", Number.POSITIVE_INFINITY);
-		_defineProperty(this, "_headerPointerSubs", void 0);
-		_defineProperty(this, "_colHeaderPointerSubs", void 0);
+		_defineProperty(this, "_headerPointerSubs", new rxjs.Subscription());
 		this._initialize();
 	}
 	dispose() {
-		var _this$_hoverRect, _this$_hoverMenu, _this$_headerPointerS;
+		var _this$_hoverRect, _this$_hoverMenu;
+		super.dispose();
 		(_this$_hoverRect = this._hoverRect) === null || _this$_hoverRect === void 0 || _this$_hoverRect.dispose();
 		(_this$_hoverMenu = this._hoverMenu) === null || _this$_hoverMenu === void 0 || _this$_hoverMenu.dispose();
-		(_this$_headerPointerS = this._headerPointerSubs) === null || _this$_headerPointerS === void 0 || _this$_headerPointerS.unsubscribe();
-		this._headerPointerSubs = null;
+		this._headerPointerSubs.unsubscribe();
 	}
 	_initialize() {
 		const scene = this._context.scene;
-		this._hoverRect = new _univerjs_engine_render.Rect(HEADER_MENU_CONTROLLER_SHAPE, {
-			fill: HEADER_MENU_CONTROLLER_SHAPE_COLOR,
-			evented: false
-		});
+		this._hoverRect = new _univerjs_engine_render.Rect(HEADER_MENU_CONTROLLER_SHAPE, { evented: false });
+		this.disposeWithMe(this._themeService.currentTheme$.subscribe(() => {
+			var _this$_hoverRect2;
+			const color = this._themeService.getColorFromTheme("gray.900");
+			(_this$_hoverRect2 = this._hoverRect) === null || _this$_hoverRect2 === void 0 || _this$_hoverRect2.setProps({ fill: new _univerjs_core.ColorKit(color).setAlpha(HEADER_MENU_CONTROLLER_SHAPE_ALPHA).toRgbString() });
+		}));
 		this._hoverMenu = new HeaderMenuShape(HEADER_MENU_CONTROLLER_MENU, {
 			zIndex: 100,
 			visible: false
@@ -29286,7 +29350,6 @@ let HeaderMenuRenderController = class HeaderMenuRenderController extends _unive
 		this._initialHoverMenu();
 	}
 	_initialHover(initialType = 0) {
-		var _this$_headerPointerS2, _this$_headerPointerS3, _this$_headerPointerS4;
 		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
 		const spreadsheetRowHeader = this._context.components.get("__SpreadsheetRowHeader__");
 		const eventBindingObject = initialType === 0 ? spreadsheetRowHeader : spreadsheetColumnHeader;
@@ -29297,17 +29360,17 @@ let HeaderMenuRenderController = class HeaderMenuRenderController extends _unive
 			const { rowBaseWidth, rowGutterWidth, columnBaseHeight, columnGutterHeight } = getHeaderBaseLayout(skeleton);
 			const { startX, startY, endX, endY, column } = getCoordByOffset(evt.offsetX, evt.offsetY, this._context.scene, skeleton);
 			if (initialType === 0) {
-				var _this$_hoverRect2;
-				(_this$_hoverRect2 = this._hoverRect) === null || _this$_hoverRect2 === void 0 || _this$_hoverRect2.transformByState({
+				var _this$_hoverRect3;
+				(_this$_hoverRect3 = this._hoverRect) === null || _this$_hoverRect3 === void 0 || _this$_hoverRect3.transformByState({
 					width: rowBaseWidth,
 					height: endY - startY,
 					left: rowGutterWidth,
 					top: startY
 				});
 			} else {
-				var _this$_hoverRect3;
+				var _this$_hoverRect4;
 				this._currentColumn = column;
-				(_this$_hoverRect3 = this._hoverRect) === null || _this$_hoverRect3 === void 0 || _this$_hoverRect3.transformByState({
+				(_this$_hoverRect4 = this._hoverRect) === null || _this$_hoverRect4 === void 0 || _this$_hoverRect4.transformByState({
 					width: endX - startX,
 					height: columnBaseHeight,
 					left: startX,
@@ -29328,21 +29391,20 @@ let HeaderMenuRenderController = class HeaderMenuRenderController extends _unive
 			}
 		};
 		const pointerEnterHandler = () => {
-			var _this$_hoverRect4;
-			(_this$_hoverRect4 = this._hoverRect) === null || _this$_hoverRect4 === void 0 || _this$_hoverRect4.show();
+			var _this$_hoverRect5;
+			(_this$_hoverRect5 = this._hoverRect) === null || _this$_hoverRect5 === void 0 || _this$_hoverRect5.show();
 		};
 		const pointerLeaveHandler = () => {
-			var _this$_hoverRect5, _this$_hoverMenu2;
-			(_this$_hoverRect5 = this._hoverRect) === null || _this$_hoverRect5 === void 0 || _this$_hoverRect5.hide();
+			var _this$_hoverRect6, _this$_hoverMenu2;
+			(_this$_hoverRect6 = this._hoverRect) === null || _this$_hoverRect6 === void 0 || _this$_hoverRect6.hide();
 			(_this$_hoverMenu2 = this._hoverMenu) === null || _this$_hoverMenu2 === void 0 || _this$_hoverMenu2.hide();
 		};
-		this._headerPointerSubs = new rxjs.Subscription();
 		const headerPointerMoveSub = eventBindingObject.onPointerMove$.subscribeEvent(pointerMoveHandler);
 		const headerPointerEnterSub = eventBindingObject.onPointerEnter$.subscribeEvent(pointerEnterHandler);
 		const headerPointerLeaveSub = eventBindingObject.onPointerLeave$.subscribeEvent(pointerLeaveHandler);
-		(_this$_headerPointerS2 = this._headerPointerSubs) === null || _this$_headerPointerS2 === void 0 || _this$_headerPointerS2.add(headerPointerMoveSub);
-		(_this$_headerPointerS3 = this._headerPointerSubs) === null || _this$_headerPointerS3 === void 0 || _this$_headerPointerS3.add(headerPointerEnterSub);
-		(_this$_headerPointerS4 = this._headerPointerSubs) === null || _this$_headerPointerS4 === void 0 || _this$_headerPointerS4.add(headerPointerLeaveSub);
+		this._headerPointerSubs.add(headerPointerMoveSub);
+		this._headerPointerSubs.add(headerPointerEnterSub);
+		this._headerPointerSubs.add(headerPointerLeaveSub);
 	}
 	_initialHoverMenu() {
 		if (this._hoverMenu == null) return;
@@ -29413,7 +29475,8 @@ HeaderMenuRenderController = __decorate([
 	__decorateParam(1, (0, _univerjs_core.Inject)(SheetSkeletonManagerService)),
 	__decorateParam(2, _univerjs_ui.IContextMenuService),
 	__decorateParam(3, _univerjs_core.ICommandService),
-	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService))
+	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService)),
+	__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.ThemeService))
 ], HeaderMenuRenderController);
 function getHeaderBaseLayout(skeleton) {
 	var _skeleton$worksheet$g, _skeleton$worksheet, _config$rowHeader, _config$columnHeader;
@@ -31794,6 +31857,7 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 		this._selectionRenderService = _selectionRenderService;
 		this._injector = _injector;
 		this._init();
+		this._initEmbedRuntimeSessionListener();
 	}
 	_init() {
 		var _this$_context;
@@ -31841,6 +31905,13 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 		});
 		this.disposeWithMe(colHeaderObserver);
 	}
+	_initEmbedRuntimeSessionListener() {
+		const runtimeFocusCoordinator = this._getSheetEmbedRuntimeFocusCoordinator();
+		if (!runtimeFocusCoordinator) return;
+		this.disposeWithMe(runtimeFocusCoordinator.runtimeSessionChanged$.subscribe(() => {
+			if (shouldHideSheetHostContextMenuForEmbedSession(this._context.unitId, runtimeFocusCoordinator.resolveActiveChildSessionRuntimeScope())) this._contextMenuService.hideContextMenu();
+		}));
+	}
 	_shouldSuppressHostContextMenu() {
 		var _this$_getSheetHostCh, _this$_getSheetHostCh2;
 		return shouldSuppressSheetContextMenuForEmbedOverride(this._context.unitId, (_this$_getSheetHostCh = this._getSheetHostChromeOverrideService()) === null || _this$_getSheetHostCh === void 0 || (_this$_getSheetHostCh2 = _this$_getSheetHostCh.getOverride) === null || _this$_getSheetHostCh2 === void 0 ? void 0 : _this$_getSheetHostCh2.call(_this$_getSheetHostCh));
@@ -31848,6 +31919,9 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 	_getSheetHostChromeOverrideService() {
 		return this._injector.has(ISheetHostChromeOverrideService) ? this._injector.get(ISheetHostChromeOverrideService) : void 0;
 	}
+	_getSheetEmbedRuntimeFocusCoordinator() {
+		return this._injector.has(ISheetEmbedRuntimeFocusCoordinator) ? this._injector.get(ISheetEmbedRuntimeFocusCoordinator) : void 0;
+	}
 };
 SheetContextMenuRenderController = __decorate([
 	__decorateParam(1, _univerjs_ui.IContextMenuService),
@@ -31855,6 +31929,9 @@ SheetContextMenuRenderController = __decorate([
 	__decorateParam(3, ISheetSelectionRenderService),
 	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
 ], SheetContextMenuRenderController);
+function shouldHideSheetHostContextMenuForEmbedSession(hostUnitId, activeScope) {
+	return (activeScope === null || activeScope === void 0 ? void 0 : activeScope.hostUnitId) === hostUnitId && activeScope.sessionMode !== "host-passive";
+}
 function shouldSuppressSheetContextMenuForEmbedOverride(hostUnitId, override) {
 	return override != null && override.hostUnitId === hostUnitId && override.entry === "sheets-sheet-tab";
 }

package/lib/cjs/locale/ca-ES.js

@@ -296,8 +296,8 @@ const locale = { "sheets-ui": {
 			allowedPermissionType: "Tipus de permisos permesos",
 			alert: "Alerta",
 			search: "Cercar",
-			ownerInherit: "Propietario del documento, herencia de permisos habilitada",
-			ownerWithoutInherit: "Propietario del documento, herencia de permisos no habilitada",
+			ownerInherit: "Propietari del document, herència de permisos activada",
+			ownerWithoutInherit: "Propietari del document, herència de permisos desactivada",
 			alertContent: "Aquest interval està protegit i actualment no hi ha permisos d'edició disponibles. Si necessiteu editar, contacteu amb el creador.",
 			userEmpty: "cap persona designada, compartiu l'enllaç per convidar persones específiques.",
 			listEmpty: "No heu configurat cap interval o full com a protegit.",

package/lib/cjs/locale/sk-SK.js

@@ -296,8 +296,8 @@ const locale = { "sheets-ui": {
 			allowedPermissionType: "Povolené typy oprávnení",
 			alert: "Upozornenie",
 			search: "Hľadať",
-			ownerInherit: "Vlastník dokumentu, dědičnost oprávnění povolena",
-			ownerWithoutInherit: "Vlastník dokumentu, dědičnost oprávnění není povolena",
+			ownerInherit: "Vlastník dokumentu, dedenie oprávnení je povolené",
+			ownerWithoutInherit: "Vlastník dokumentu, dedenie oprávnení nie je povolené",
 			alertContent: "Tento rozsah je chránený a momentálne nemáte povolenie na úpravy. Ak potrebujete upravovať, kontaktujte autora.",
 			userEmpty: "žiadna určená osoba, zdieľajte odkaz na pozvanie konkrétnych ľudí.",
 			listEmpty: "Nenastavili ste žiadne rozsahy ani hárky ako chránené.",