@univerjs/sheets-ui 1.0.0-alpha.1 → 1.0.0-alpha.3

package/lib/cjs/index.js

@@ -1,31 +1,4 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-//#region \0rolldown/runtime.js
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") {
-		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-			key = keys[i];
-			if (!__hasOwnProp.call(to, key) && key !== except) {
-				__defProp(to, key, {
-					get: ((k) => from[k]).bind(null, key),
-					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-				});
-			}
-		}
-	}
-	return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
-	value: mod,
-	enumerable: true
-}) : target, mod));
-
-//#endregion
 let _univerjs_docs_ui = require("@univerjs/docs-ui");
 let _univerjs_core = require("@univerjs/core");
 let _univerjs_ui = require("@univerjs/ui");
@@ -37,7 +10,6 @@ let _univerjs_protocol = require("@univerjs/protocol");
 let _univerjs_design = require("@univerjs/design");
 let _univerjs_icons = require("@univerjs/icons");
 let react = require("react");
-react = __toESM(react);
 let react_jsx_runtime = require("react/jsx-runtime");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let _univerjs_telemetry = require("@univerjs/telemetry");
@@ -489,6 +461,19 @@ var BaseSelectionRenderService = class extends _univerjs_core.Disposable {
 		this._initSelectionThemeFromThemeService();
 		this._initMoving();
 	}
+	dispose() {
+		var _this$_escapeShortcut;
+		if (this._disposed) return;
+		this._clearUpdatingListeners();
+		this._reset();
+		(_this$_escapeShortcut = this._escapeShortcutDisposable) === null || _this$_escapeShortcut === void 0 || _this$_escapeShortcut.dispose();
+		this._escapeShortcutDisposable = null;
+		this._controlFillConfig$.complete();
+		this._selectionMoveEnd$.complete();
+		this._selectionMoving$.complete();
+		this._selectionMoveStart$.complete();
+		super.dispose();
+	}
 	/**
 	* If true, the selector will respond to the range of merged cells and automatically extend the selected range. If false, it will ignore the merged cells.
 	*/
@@ -665,10 +650,10 @@ var BaseSelectionRenderService = class extends _univerjs_core.Disposable {
 		}
 	}
 	endSelection() {
-		var _this$_escapeShortcut;
+		var _this$_escapeShortcut2;
 		this._clearUpdatingListeners();
 		this._selectionMoveEnd$.next(this.getSelectionDataWithStyle());
-		(_this$_escapeShortcut = this._escapeShortcutDisposable) === null || _this$_escapeShortcut === void 0 || _this$_escapeShortcut.dispose();
+		(_this$_escapeShortcut2 = this._escapeShortcutDisposable) === null || _this$_escapeShortcut2 === void 0 || _this$_escapeShortcut2.dispose();
 		this._escapeShortcutDisposable = null;
 	}
 	/**
@@ -1116,10 +1101,7 @@ let SheetSkeletonManagerService = class SheetSkeletonManagerService extends _uni
 		render.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_ROW_BOTTOM).setViewportSize({ top: size });
 		render.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_ROW_TOP).setViewportSize({ top: size });
 		render.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP).setViewportSize({ height: size });
-		const selectionService = render === null || render === void 0 ? void 0 : render.with(_univerjs_sheets.SheetsSelectionsService);
-		const selectionRenderService = render === null || render === void 0 ? void 0 : render.with(ISheetSelectionRenderService);
-		const currSelections = selectionService.getCurrentSelections();
-		selectionRenderService.resetSelectionsByModelData(currSelections);
+		this._resetSelectionsIfAvailable(render);
 		const sheetSkeletonManagerParam = this._sheetSkeletonService.getSkeletonParam(render.unitId, sheetId);
 		if (sheetSkeletonManagerParam) {
 			sheetSkeletonManagerParam.commandId = SetColumnHeaderHeightCommand.id;
@@ -1140,16 +1122,28 @@ let SheetSkeletonManagerService = class SheetSkeletonManagerService extends _uni
 		const prevLeft = render.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT).left || 0;
 		render.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_COLUMN_RIGHT).setViewportSize({ left: prevLeft + deltaX });
 		render.scene.getViewport(_univerjs_engine_render.SHEET_VIEWPORT_KEY.VIEW_LEFT_TOP).setViewportSize({ width: size });
-		const selectionService = render === null || render === void 0 ? void 0 : render.with(_univerjs_sheets.SheetsSelectionsService);
-		const selectionRenderService = render === null || render === void 0 ? void 0 : render.with(ISheetSelectionRenderService);
-		const currSelections = selectionService.getCurrentSelections();
-		selectionRenderService.resetSelectionsByModelData(currSelections);
+		this._resetSelectionsIfAvailable(render);
 		const sheetSkeletonManagerParam = this._sheetSkeletonService.getSkeletonParam(render.unitId, sheetId);
 		if (sheetSkeletonManagerParam) {
 			sheetSkeletonManagerParam.commandId = SetRowHeaderWidthCommand.id;
 			this._currentSkeleton$.next(sheetSkeletonManagerParam);
 		}
 	}
+	_resetSelectionsIfAvailable(render) {
+		const selectionService = this._tryGetRenderDependency(render, _univerjs_sheets.SheetsSelectionsService);
+		const selectionRenderService = this._tryGetRenderDependency(render, ISheetSelectionRenderService);
+		if (!selectionService || !selectionRenderService) return;
+		const currSelections = selectionService.getCurrentSelections();
+		selectionRenderService.resetSelectionsByModelData(currSelections);
+	}
+	_tryGetRenderDependency(render, dependency) {
+		try {
+			return render.with(dependency);
+		} catch (error) {
+			if (error instanceof Error && (error.message.includes("DependencyNotFoundError") || error.message.includes("Cannot find"))) return null;
+			throw error;
+		}
+	}
 };
 SheetSkeletonManagerService = __decorate([__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetSkeletonService))], SheetSkeletonManagerService);
 
@@ -1259,7 +1253,7 @@ var SelectionShapeExtension = class {
 		].forEach((control) => {
 			control.onPointerEnter$.subscribeEvent(() => {
 				var _this$_injector$get;
-				if (((_this$_injector$get = this._injector.get(ISheetSelectionRenderService, _univerjs_core.Quantity.OPTIONAL)) === null || _this$_injector$get === void 0 ? void 0 : _this$_injector$get.interceptor.fetchThroughInterceptors(RANGE_MOVE_PERMISSION_CHECK)(false, null)) === false) return;
+				if (((_this$_injector$get = this._injector.get(ISheetSelectionRenderService, _univerjs_core.Quantity.OPTIONAL, _univerjs_core.LookUp.SELF)) === null || _this$_injector$get === void 0 ? void 0 : _this$_injector$get.interceptor.fetchThroughInterceptors(RANGE_MOVE_PERMISSION_CHECK)(false, null)) === false) return;
 				control.setCursor(_univerjs_engine_render.CURSOR_TYPE.MOVE);
 			});
 			control.onPointerLeave$.subscribeEvent(() => {
@@ -1364,7 +1358,7 @@ var SelectionShapeExtension = class {
 			var _this$_injector$get2;
 			if (this._disabled) return;
 			const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;
-			if (((_this$_injector$get2 = this._injector.get(ISheetSelectionRenderService, _univerjs_core.Quantity.OPTIONAL)) === null || _this$_injector$get2 === void 0 ? void 0 : _this$_injector$get2.interceptor.fetchThroughInterceptors(RANGE_MOVE_PERMISSION_CHECK)(false, null)) === false) return;
+			if (((_this$_injector$get2 = this._injector.get(ISheetSelectionRenderService, _univerjs_core.Quantity.OPTIONAL, _univerjs_core.LookUp.SELF)) === null || _this$_injector$get2 === void 0 ? void 0 : _this$_injector$get2.interceptor.fetchThroughInterceptors(RANGE_MOVE_PERMISSION_CHECK)(false, null)) === false) return;
 			const { x: newMoveOffsetX, y: newMoveOffsetY } = scene.getCoordRelativeToViewport(_univerjs_engine_render.Vector2.FromArray([moveOffsetX, moveOffsetY]));
 			this._controlMoving(newMoveOffsetX, newMoveOffsetY);
 			scene.setCursor(_univerjs_engine_render.CURSOR_TYPE.MOVE);
@@ -1529,7 +1523,7 @@ var SelectionShapeExtension = class {
 	_initialAutoFill() {
 		const { fillControl } = this._control;
 		fillControl.onPointerEnter$.subscribeEvent((evt) => {
-			if (!this._injector.get(ISheetSelectionRenderService).interceptor.fetchThroughInterceptors(RANGE_FILL_PERMISSION_CHECK)(false, {
+			if (!this._injector.get(ISheetSelectionRenderService, _univerjs_core.LookUp.SELF).interceptor.fetchThroughInterceptors(RANGE_FILL_PERMISSION_CHECK)(false, {
 				x: evt.offsetX,
 				y: evt.offsetY,
 				skeleton: this._skeleton,
@@ -1660,7 +1654,7 @@ var SelectionShapeExtension = class {
 			var _this$_activeViewport;
 			const { offsetX: moveOffsetX, offsetY: moveOffsetY } = moveEvt;
 			const currentViewport = scene.getActiveViewportByCoord(_univerjs_engine_render.Vector2.FromArray([moveOffsetX, moveOffsetY]));
-			if (!this._injector.get(ISheetSelectionRenderService).interceptor.fetchThroughInterceptors(RANGE_FILL_PERMISSION_CHECK)(false, {
+			if (!this._injector.get(ISheetSelectionRenderService, _univerjs_core.LookUp.SELF).interceptor.fetchThroughInterceptors(RANGE_FILL_PERMISSION_CHECK)(false, {
 				x: evt.offsetX,
 				y: evt.offsetY,
 				skeleton: this._skeleton,
@@ -7329,12 +7323,14 @@ let SheetsScrollRenderController = class SheetsScrollRenderController extends _u
 		this.disposeWithMe(viewportMain.onScrollByBar$.subscribeEvent((param) => {
 			var _this$_sheetSkeletonM3;
 			const skeleton = (_this$_sheetSkeletonM3 = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM3 === void 0 ? void 0 : _this$_sheetSkeletonM3.skeleton;
-			if (skeleton == null || param.isTrigger === false) return;
+			if (skeleton == null || param.isTrigger === false || param.isBarDragging && !param.isBarDragEnd) return;
 			const sheetObject = this._getSheetObject();
 			if (skeleton == null || sheetObject == null) return;
 			const { viewportScrollX = 0, viewportScrollY = 0 } = param;
 			const { row, column, rowOffset, columnOffset } = skeleton.getOffsetRelativeToRowCol(viewportScrollX, viewportScrollY);
 			this._commandService.executeCommand(ScrollCommand.id, {
+				unitId: this._context.unitId,
+				sheetId: skeleton.getLocation()[1],
 				sheetViewStartRow: row,
 				sheetViewStartColumn: column,
 				offsetX: columnOffset,
@@ -7422,8 +7418,11 @@ let SheetsScrollRenderController = class SheetsScrollRenderController extends _u
 	* @returns {boolean} - true if scroll is successful
 	*/
 	scrollToCell(row, column, duration) {
-		const { ySplit: freezeYSplit, xSplit: freezeXSplit } = this._context.unit.getActiveSheet().getFreeze();
+		const worksheet = this._context.unit.getActiveSheet();
+		const { ySplit: freezeYSplit, xSplit: freezeXSplit } = worksheet.getFreeze();
 		return this._commandService.syncExecuteCommand(ScrollCommand.id, {
+			unitId: this._context.unitId,
+			sheetId: worksheet.getSheetId(),
 			sheetViewStartRow: row - freezeYSplit,
 			sheetViewStartColumn: column - freezeXSplit,
 			offsetX: 0,
@@ -7596,6 +7595,8 @@ let SheetsScrollRenderController = class SheetsScrollRenderController extends _u
 			startSheetViewRow = startSheetViewRow - hiddenRows.length;
 		}
 		return this._commandService.syncExecuteCommand(ScrollCommand.id, {
+			unitId: this._context.unitId,
+			sheetId: worksheet.getSheetId(),
 			sheetViewStartRow: Math.max(0, startSheetViewRow - freezedRowCount),
 			sheetViewStartColumn: Math.max(0, startSheetViewColumn - freezedColCount),
 			offsetX,
@@ -7684,10 +7685,12 @@ const ScrollCommand = {
 		if (!params) return false;
 		const univerInstanceService = accessor.get(_univerjs_core.IUniverInstanceService);
 		const renderManagerSrv = accessor.get(_univerjs_engine_render.IRenderManagerService);
-		const target = (0, _univerjs_sheets.getSheetCommandTarget)(univerInstanceService);
+		const target = params.unitId ? getScrollCommandTargetByParams(univerInstanceService, params) : (0, _univerjs_sheets.getSheetCommandTarget)(univerInstanceService);
 		if (!target) return false;
 		const { workbook, worksheet, unitId } = target;
-		const currentScroll = renderManagerSrv.getRenderById(unitId).with(SheetScrollManagerService).getCurrentScrollState();
+		const renderUnit = renderManagerSrv.getRenderById(unitId);
+		if (!renderUnit) return false;
+		const currentScroll = renderUnit.with(SheetScrollManagerService).getCurrentScrollState();
 		if (!worksheet) return false;
 		const { sheetViewStartRow, sheetViewStartColumn, offsetX, offsetY, duration } = params;
 		const { sheetViewStartColumn: currentColumn, sheetViewStartRow: currentRow, offsetX: currentOffsetX, offsetY: currentOffsetY } = currentScroll || {};
@@ -7703,6 +7706,18 @@ const ScrollCommand = {
 		});
 	}
 };
+function getScrollCommandTargetByParams(univerInstanceService, params) {
+	if (!params.unitId) return null;
+	const workbook = univerInstanceService.getUnit(params.unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET);
+	const worksheet = params.sheetId ? workbook === null || workbook === void 0 ? void 0 : workbook.getSheetBySheetId(params.sheetId) : workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
+	if (!workbook || !worksheet) return null;
+	return {
+		workbook,
+		worksheet,
+		unitId: params.unitId,
+		subUnitId: worksheet.getSheetId()
+	};
+}
 /**
 * The command is used to scroll to the specific cell if the target cell is not in the viewport.
 */
@@ -7898,7 +7913,7 @@ let EditorBridgeService = class EditorBridgeService extends _univerjs_core.Dispo
 	refreshEditCellPosition(resetSizeOnly) {
 		if (!this._currentEditCell || !this._currentEditCellState) return;
 		const { unitId, sheetId, primary, scene, engine } = this._currentEditCell;
-		const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		const workbook = this._getWorkbookForEditUnit(unitId);
 		if (!workbook || workbook.getUnitId() !== unitId) return;
 		const worksheet = workbook.getActiveSheet();
 		if (!worksheet || worksheet.getSheetId() !== sheetId) return;
@@ -7997,7 +8012,7 @@ let EditorBridgeService = class EditorBridgeService extends _univerjs_core.Dispo
 		var _documentLayoutObject, _documentLayoutObject2;
 		if (!this._currentEditCell) return;
 		const { unitId, sheetId, primary, scene, engine } = this._currentEditCell;
-		const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+		const workbook = this._getWorkbookForEditUnit(unitId);
 		if (!workbook || workbook.getUnitId() !== unitId) return;
 		const worksheet = workbook.getActiveSheet();
 		if (!worksheet || worksheet.getSheetId() !== sheetId) return;
@@ -8075,6 +8090,10 @@ let EditorBridgeService = class EditorBridgeService extends _univerjs_core.Dispo
 			isInArrayFormulaRange: cell === null || cell === void 0 ? void 0 : cell.isInArrayFormulaRange
 		};
 	}
+	_getWorkbookForEditUnit(unitId) {
+		var _this$_univerInstance;
+		return (_this$_univerInstance = this._univerInstanceService.getUnit(unitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) !== null && _this$_univerInstance !== void 0 ? _this$_univerInstance : this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
+	}
 	getCurrentEditorId() {
 		return this._editorUnitId;
 	}
@@ -8453,9 +8472,15 @@ const ScrollToRangeOperation = {
 	id: "sheet.operation.scroll-to-range",
 	type: _univerjs_core.CommandType.OPERATION,
 	handler: (accessor, params) => {
+		var _params$unitId, _instanceService$getC;
 		if (!params) return false;
 		const instanceService = accessor.get(_univerjs_core.IUniverInstanceService);
-		return accessor.get(_univerjs_engine_render.IRenderManagerService).getRenderById(instanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getUnitId()).with(SheetsScrollRenderController).scrollToRange(params.range, params.forceTop, params.forceLeft);
+		const renderManagerService = accessor.get(_univerjs_engine_render.IRenderManagerService);
+		const unitId = (_params$unitId = params.unitId) !== null && _params$unitId !== void 0 ? _params$unitId : (_instanceService$getC = instanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _instanceService$getC === void 0 ? void 0 : _instanceService$getC.getUnitId();
+		if (!unitId) return false;
+		const renderUnit = renderManagerService.getRenderById(unitId);
+		if (!renderUnit) return false;
+		return renderUnit.with(SheetsScrollRenderController).scrollToRange(params.range, params.forceTop, params.forceLeft);
 	}
 };
 
@@ -8767,18 +8792,19 @@ let SheetsRenderService = class SheetsRenderService extends _univerjs_core.RxDis
 	}
 	_initWorkbookListener() {
 		this._instanceSrv.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs.takeUntil)(this.dispose$)).subscribe((event) => this._createRenderer(event.unit, event.options));
-		this._instanceSrv.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => this._createRenderer(workbook));
+		this._instanceSrv.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).forEach((workbook) => {
+			var _this$_instanceSrv$ge;
+			return this._createRenderer(workbook, (_this$_instanceSrv$ge = this._instanceSrv.getUnitCreateOptions(workbook.getUnitId())) !== null && _this$_instanceSrv$ge !== void 0 ? _this$_instanceSrv$ge : void 0);
+		});
 		this._instanceSrv.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs.takeUntil)(this.dispose$)).subscribe((workbook) => this._disposeRenderer(workbook));
 	}
 	_createRenderer(workbook, createUnitOptions) {
+		if (createUnitOptions === null || createUnitOptions === void 0 ? void 0 : createUnitOptions.skipAutoRender) return;
 		const unitId = workbook.getUnitId();
-		this._renderManagerService.created$.subscribe((renderer) => {
-			if (renderer.unitId === unitId) {
-				renderer.engine.getCanvas().setId(`${SHEET_MAIN_CANVAS_ID}_${unitId}`);
-				renderer.engine.getCanvas().getContext().setId(`${SHEET_MAIN_CANVAS_ID}_${unitId}`);
-			}
-		});
-		this._renderManagerService.createRender(unitId, createUnitOptions);
+		const canvas = this._renderManagerService.createRender(unitId, createUnitOptions).engine.getCanvas();
+		canvas.setId(`${SHEET_MAIN_CANVAS_ID}_${unitId}`);
+		canvas.getCanvasEle().dataset.uUnitId = unitId;
+		canvas.getContext().setId(`${SHEET_MAIN_CANVAS_ID}_${unitId}`);
 	}
 	_disposeRenderer(workbook) {
 		const unitId = workbook.getUnitId();
@@ -8873,11 +8899,28 @@ let AutoFillUIController = class AutoFillUIController extends _univerjs_core.Dis
 	}
 	_initSelectionControlFillChanged() {
 		const disposableCollection = new _univerjs_core.DisposableCollection();
+		let pendingRetry = false;
+		let retryCount = 0;
+		const scheduleUpdateListener = (listener) => {
+			if (pendingRetry) return;
+			pendingRetry = true;
+			setTimeout(() => {
+				pendingRetry = false;
+				listener();
+			}, 0);
+		};
 		const updateListener = () => {
 			disposableCollection.dispose();
 			const currentRenderer = (0, _univerjs_engine_render.getCurrentTypeOfRenderer)(_univerjs_core.UniverInstanceType.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService);
 			if (!currentRenderer) return;
-			currentRenderer.with(ISheetSelectionRenderService).getSelectionControls().forEach((controlSelection) => {
+			const selectionRenderService = getResolvedSelectionRenderService(currentRenderer);
+			if (!selectionRenderService) {
+				retryCount += 1;
+				if (retryCount <= 3) scheduleUpdateListener(updateListener);
+				return;
+			}
+			retryCount = 0;
+			selectionRenderService.getSelectionControls().forEach((controlSelection) => {
 				disposableCollection.add(controlSelection.selectionFilled$.subscribe((filled) => {
 					if (filled == null || filled.startColumn === -1 || filled.startRow === -1 || filled.endColumn === -1 || filled.endRow === -1) return;
 					const source = {
@@ -8915,11 +8958,11 @@ let AutoFillUIController = class AutoFillUIController extends _univerjs_core.Dis
 				}));
 			});
 		};
-		updateListener();
+		scheduleUpdateListener(updateListener);
 		this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
-			if (command.id === _univerjs_sheets.SetSelectionsOperation.id) updateListener();
+			if (command.id === _univerjs_sheets.SetSelectionsOperation.id) scheduleUpdateListener(updateListener);
 		}));
-		this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe(() => updateListener()));
+		this.disposeWithMe(this._univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe(() => scheduleUpdateListener(updateListener)));
 	}
 	_handleDbClickFill(source) {
 		const selection = this._detectFillRange(source);
@@ -8969,6 +9012,13 @@ AutoFillUIController = __decorate([
 	__decorateParam(5, _univerjs_engine_render.IRenderManagerService),
 	__decorateParam(6, (0, _univerjs_core.Inject)(SheetsRenderService))
 ], AutoFillUIController);
+function getResolvedSelectionRenderService(renderer) {
+	var _getInjector, _resolvedDependencyCo;
+	const injector = (_getInjector = renderer.getInjector) === null || _getInjector === void 0 ? void 0 : _getInjector.call(renderer);
+	const resolvedDependencies = injector === null || injector === void 0 || (_resolvedDependencyCo = injector.resolvedDependencyCollection) === null || _resolvedDependencyCo === void 0 ? void 0 : _resolvedDependencyCo.resolvedDependencies;
+	if (!resolvedDependencies) return;
+	for (const [identifier, values] of resolvedDependencies) if (identifier.decoratorName === ISheetSelectionRenderService.decoratorName) return values.length === 1 ? values[0] : void 0;
+}
 
 //#endregion
 //#region src/controllers/auto-height.controller.ts
@@ -9421,12 +9471,60 @@ var CellEditorManagerService = class {
 };
 const ICellEditorManagerService = (0, _univerjs_core.createIdentifier)("univer.sheet-cell-editor-manager.service");
 
+//#endregion
+//#region src/services/sheet-embed-integration.service.ts
+const SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE = "data-embed-interaction-boundary-owner";
+const SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE = "data-embed-runtime-focus-role";
+const SHEET_EMBED_FLOAT_DOM_ATTRIBUTE = "data-embed-float-dom";
+const SHEET_EMBED_ID_ATTRIBUTE = "data-embed-id";
+const SHEET_EMBED_HOST_UNIT_ID_ATTRIBUTE = "data-embed-host-unit-id";
+const SHEET_EMBED_CHILD_UNIT_ID_ATTRIBUTE = "data-embed-child-unit-id";
+const SHEET_EMBED_CHILD_TYPE_ATTRIBUTE = "data-embed-child-type";
+const ISheetEmbedInteractionBoundaryService = (0, _univerjs_core.createIdentifier)("sheets-ui.embed-interaction-boundary.service");
+const ISheetEmbedRuntimeFocusCoordinator = (0, _univerjs_core.createIdentifier)("sheets-ui.embed-runtime-focus-coordinator");
+const ISheetEmbedFloatingGeometryService = (0, _univerjs_core.createIdentifier)("sheets-ui.embed-floating-geometry.service");
+function resolveSheetEmbedRuntimeDomScope(element) {
+	var _element$closest$getA, _element$closest, _container$getAttribu, _container$getAttribu2, _container$getAttribu3;
+	if (!element) return;
+	const embedId = (_element$closest$getA = (_element$closest = element.closest(`[${"data-embed-interaction-boundary-owner"}]`)) === null || _element$closest === void 0 ? void 0 : _element$closest.getAttribute("data-embed-interaction-boundary-owner")) !== null && _element$closest$getA !== void 0 ? _element$closest$getA : void 0;
+	const container = resolveSheetEmbedFloatDomContainer(element, embedId);
+	const resolvedEmbedId = (_container$getAttribu = container === null || container === void 0 ? void 0 : container.getAttribute("data-embed-id")) !== null && _container$getAttribu !== void 0 ? _container$getAttribu : embedId;
+	if (!resolvedEmbedId) return;
+	return {
+		embedId: resolvedEmbedId,
+		hostUnitId: (_container$getAttribu2 = container === null || container === void 0 ? void 0 : container.getAttribute("data-embed-host-unit-id")) !== null && _container$getAttribu2 !== void 0 ? _container$getAttribu2 : void 0,
+		childUnitId: (_container$getAttribu3 = container === null || container === void 0 ? void 0 : container.getAttribute("data-embed-child-unit-id")) !== null && _container$getAttribu3 !== void 0 ? _container$getAttribu3 : void 0,
+		childType: readChildType(container)
+	};
+}
+function resolveActiveSheetEmbedRuntimeDomScope(ownerDocument = document) {
+	const activeContainer = ownerDocument.querySelector(`[${SHEET_EMBED_FLOAT_DOM_ATTRIBUTE}="true"][data-embed-float-stage="stage2"]`);
+	if (!activeContainer) return;
+	return resolveSheetEmbedRuntimeDomScope(activeContainer);
+}
+function resolveSheetEmbedFloatDomContainer(element, embedId) {
+	var _element$ownerDocumen, _ownerDocument$queryS;
+	const ownContainer = element === null || element === void 0 ? void 0 : element.closest(`[${SHEET_EMBED_FLOAT_DOM_ATTRIBUTE}="true"]`);
+	if (ownContainer && (!embedId || ownContainer.getAttribute("data-embed-id") === embedId)) return ownContainer;
+	const ownerDocument = (_element$ownerDocumen = element === null || element === void 0 ? void 0 : element.ownerDocument) !== null && _element$ownerDocumen !== void 0 ? _element$ownerDocumen : typeof document === "undefined" ? void 0 : document;
+	if (!ownerDocument || !embedId) return ownContainer !== null && ownContainer !== void 0 ? ownContainer : void 0;
+	return (_ownerDocument$queryS = ownerDocument.querySelector(`[${"data-embed-float-dom"}="true"][${"data-embed-id"}="${escapeAttributeValue(embedId)}"]`)) !== null && _ownerDocument$queryS !== void 0 ? _ownerDocument$queryS : void 0;
+}
+function escapeAttributeValue(value) {
+	return value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"");
+}
+function readChildType(container) {
+	const value = container === null || container === void 0 ? void 0 : container.getAttribute(SHEET_EMBED_CHILD_TYPE_ATTRIBUTE);
+	if (value == null || value === "") return;
+	return Number(value);
+}
+
 //#endregion
 //#region src/services/editor/cell-editor-resize.service.ts
 const EDITOR_INPUT_SELF_EXTEND_GAP = 5;
 const EDITOR_BORDER_SIZE = 2;
 let SheetCellEditorResizeService = class SheetCellEditorResizeService extends _univerjs_core.Disposable {
-	constructor(_layoutService, _cellEditorManagerService, _editorBridgeService, _renderManagerService, _univerInstanceService, _configService) {
+	constructor(_layoutService, _cellEditorManagerService, _editorBridgeService, _renderManagerService, _univerInstanceService, _configService, _embedFloatingGeometryService) {
 		super();
 		this._layoutService = _layoutService;
 		this._cellEditorManagerService = _cellEditorManagerService;
@@ -9434,6 +9532,7 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends _u
 		this._renderManagerService = _renderManagerService;
 		this._univerInstanceService = _univerInstanceService;
 		this._configService = _configService;
+		this._embedFloatingGeometryService = _embedFloatingGeometryService;
 	}
 	get _currentRenderer() {
 		return (0, _univerjs_engine_render.getCurrentTypeOfRenderer)(_univerjs_core.UniverInstanceType.UNIVER_SHEET, this._univerInstanceService, this._renderManagerService);
@@ -9446,9 +9545,8 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends _u
 		return this._renderManagerService.getRenderById(this._editingUnitId);
 	}
 	get _renderer() {
-		var _this$_univerInstance;
-		const currentUnitId = (_this$_univerInstance = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getUnitId();
-		return this._editingUnitId === currentUnitId ? this._editingRenderer : this._currentRenderer;
+		var _this$_editingRendere;
+		return (_this$_editingRendere = this._editingRenderer) !== null && _this$_editingRendere !== void 0 ? _this$_editingRendere : this._currentRenderer;
 	}
 	get _sheetSkeletonManagerService() {
 		var _this$_renderer;
@@ -9552,13 +9650,14 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends _u
 		const { startX, startY, endX } = position;
 		const enginWidth = engine.width;
 		const maxHeight = height - startY - EDITOR_BORDER_SIZE * 2;
+		const cellWidth = endX - startX;
 		let maxWidth = width - startX;
 		if (horizontalAlign === _univerjs_core.HorizontalAlign.CENTER) {
 			const rightGap = enginWidth - endX;
-			const leftGap = startX;
-			maxWidth = endX - startX + Math.min(leftGap, rightGap) * 2;
+			maxWidth = cellWidth + Math.min(startX, rightGap) * 2;
 		} else if (horizontalAlign === _univerjs_core.HorizontalAlign.RIGHT) maxWidth = endX;
 		maxWidth = maxWidth - EDITOR_BORDER_SIZE * 2;
+		maxWidth = Math.max(maxWidth, cellWidth);
 		return {
 			height: maxHeight,
 			width: maxWidth,
@@ -9615,7 +9714,7 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends _u
 			docEngine.resizeBySize((0, _univerjs_engine_render.fixLineWidthByScale)(editorWidth, precisionScaleX), (0, _univerjs_engine_render.fixLineWidthByScale)(physicHeight, precisionScaleY));
 			callback === null || callback === void 0 || callback();
 		}, 0);
-		const contentBoundingRect = this._layoutService.getContentElement().getBoundingClientRect();
+		const contentBoundingRect = this._getEditorContentElement().getBoundingClientRect();
 		const canvasBoundingRect = canvasElement.getBoundingClientRect();
 		startX = startX * scaleAdjust + (canvasBoundingRect.left - contentBoundingRect.left);
 		startY = startY * scaleAdjust + (canvasBoundingRect.top - contentBoundingRect.top);
@@ -9630,6 +9729,10 @@ let SheetCellEditorResizeService = class SheetCellEditorResizeService extends _u
 			show: true
 		});
 	}
+	_getEditorContentElement() {
+		var _this$_embedFloatingG, _this$_embedFloatingG2;
+		return (_this$_embedFloatingG = (_this$_embedFloatingG2 = this._embedFloatingGeometryService) === null || _this$_embedFloatingG2 === void 0 || (_this$_embedFloatingG2 = _this$_embedFloatingG2.getRegistrationByChildUnitId(this._editingUnitId)) === null || _this$_embedFloatingG2 === void 0 ? void 0 : _this$_embedFloatingG2.contentRoot) !== null && _this$_embedFloatingG !== void 0 ? _this$_embedFloatingG : this._layoutService.getContentElement();
+	}
 	/**
 	* Since the document does not support cell background color, an additional rect needs to be added.
 	*/
@@ -9692,13 +9795,14 @@ SheetCellEditorResizeService = __decorate([
 	__decorateParam(2, IEditorBridgeService),
 	__decorateParam(3, _univerjs_engine_render.IRenderManagerService),
 	__decorateParam(4, _univerjs_core.IUniverInstanceService),
-	__decorateParam(5, _univerjs_core.IConfigService)
+	__decorateParam(5, _univerjs_core.IConfigService),
+	__decorateParam(6, (0, _univerjs_core.Optional)(ISheetEmbedFloatingGeometryService))
 ], SheetCellEditorResizeService);
 
 //#endregion
 //#region src/controllers/render-controllers/editor-bridge.render-controller.ts
 let EditorBridgeRenderController = class EditorBridgeRenderController extends _univerjs_core.RxDisposable {
-	constructor(_context, _instanceSrv, _commandService, _editorBridgeService, _selectionManagerService, _contextService, _renderManagerService, _sheetSkeletonManagerService) {
+	constructor(_context, _instanceSrv, _commandService, _editorBridgeService, _selectionManagerService, _contextService, _renderManagerService, _sheetSkeletonManagerService, _embedRuntimeFocusCoordinator) {
 		super();
 		this._context = _context;
 		this._instanceSrv = _instanceSrv;
@@ -9708,10 +9812,13 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 		this._contextService = _contextService;
 		this._renderManagerService = _renderManagerService;
 		this._sheetSkeletonManagerService = _sheetSkeletonManagerService;
+		this._embedRuntimeFocusCoordinator = _embedRuntimeFocusCoordinator;
 		_defineProperty(this, "_d", void 0);
 		this.disposeWithMe(this._instanceSrv.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).subscribe((workbook) => {
-			if (workbook && workbook.getUnitId() === this._context.unitId) this._d = this._init();
-			else this._disposeCurrent();
+			if (workbook && workbook.getUnitId() === this._context.unitId) {
+				if (this._d) return;
+				this._d = this._init();
+			} else this._disposeCurrent();
 		}));
 	}
 	_init() {
@@ -9720,6 +9827,7 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 		this._initEventListener(d);
 		this._commandExecutedListener(d);
 		this._initialKeyboardListener(d);
+		this._initSheetFocusListener(d);
 		return d;
 	}
 	_disposeCurrent() {
@@ -9736,7 +9844,9 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 		const primary = params === null || params === void 0 || (_params = params[params.length - 1]) === null || _params === void 0 ? void 0 : _params.primary;
 		if (primary) {
 			var _this$_context$unit$g, _this$_sheetSkeletonM;
-			const { scene, engine } = this._getSheetObject();
+			const sheetObject = this._getSheetObject();
+			if (!sheetObject) return;
+			const { scene, engine } = sheetObject;
 			const unitId = this._context.unitId;
 			const sheetId = (_this$_context$unit$g = this._context.unit.getActiveSheet()) === null || _this$_context$unit$g === void 0 ? void 0 : _this$_context$unit$g.getSheetId();
 			if (!sheetId) return;
@@ -9751,6 +9861,7 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 				endColumn: mergeInfo.mergeInfo.endColumn,
 				isMergedMainCell: mergeInfo.isMergedMainCell
 			} : primary;
+			if (isSameEditCell(this._editorBridgeService.getEditLocation(), unitId, sheetId, newPrimary)) return;
 			this._commandService.executeCommand(SetActivateCellEditOperation.id, {
 				scene,
 				engine,
@@ -9768,7 +9879,9 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 		}
 	}
 	_initEventListener(d) {
-		const { spreadsheet, spreadsheetColumnHeader, spreadsheetLeftTopPlaceholder, spreadsheetRowHeader } = this._getSheetObject();
+		const sheetObject = this._getSheetObject();
+		if (!sheetObject) return;
+		const { spreadsheet, spreadsheetColumnHeader, spreadsheetLeftTopPlaceholder, spreadsheetRowHeader } = sheetObject;
 		d.add(spreadsheet.onDblclick$.subscribeEvent((evt) => {
 			if (evt.button === 2) return;
 			this._commandService.executeCommand(SetCellEditVisibleOperation.id, {
@@ -9778,19 +9891,19 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 			});
 		}));
 		d.add(spreadsheet.onPointerDown$.subscribeEvent({
-			next: this._tryHideEditor.bind(this),
+			next: (payload) => this._tryHideEditor(resolvePointerEventPayload(payload)),
 			priority: -1
 		}));
 		d.add(spreadsheetColumnHeader.onPointerDown$.subscribeEvent({
-			next: this._tryHideEditor.bind(this),
+			next: (payload) => this._tryHideEditor(resolvePointerEventPayload(payload)),
 			priority: -1
 		}));
 		d.add(spreadsheetLeftTopPlaceholder.onPointerDown$.subscribeEvent({
-			next: this._tryHideEditor.bind(this),
+			next: (payload) => this._tryHideEditor(resolvePointerEventPayload(payload)),
 			priority: -1
 		}));
 		d.add(spreadsheetRowHeader.onPointerDown$.subscribeEvent({
-			next: this._tryHideEditor.bind(this),
+			next: (payload) => this._tryHideEditor(resolvePointerEventPayload(payload)),
 			priority: -1
 		}));
 	}
@@ -9804,9 +9917,10 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 			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);
+					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);
@@ -9821,6 +9935,17 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 			addEvent(render);
 		}));
 	}
+	_initSheetFocusListener(d) {
+		d.add(this._contextService.subscribeContextValue$(_univerjs_core.FOCUSING_SHEET).subscribe((isFocusingSheet) => {
+			if (!isFocusingSheet || !this._isCurrentSheetFocused() || this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR) || this._editorBridgeService.isVisible().visible) return;
+			this._focusCellEditorInput();
+		}));
+	}
+	_focusCellEditorInput() {
+		const render = this._renderManagerService.getRenderById(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+		const docSelectionRenderService = render === null || render === void 0 ? void 0 : render.with(_univerjs_docs_ui.DocSelectionRenderService);
+		if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
+	}
 	_commandExecutedListener(d) {
 		const refreshCommandSet = /* @__PURE__ */ new Set([_univerjs_sheets.ClearSelectionFormatCommand.id, SetZoomRatioCommand.id]);
 		d.add(this._commandService.onCommandExecuted((command) => {
@@ -9835,19 +9960,35 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 		}));
 	}
 	_showEditorByKeyboard(config) {
+		var _ref, _config$content;
 		const event = config === null || config === void 0 ? void 0 : config.event;
 		if (config == null || !event.data && event.inputType !== "InsertParagraph") return;
+		const initialValue = (_ref = (_config$content = config.content) !== null && _config$content !== void 0 ? _config$content : event.data) !== null && _ref !== void 0 ? _ref : "";
 		this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
 			visible: true,
 			eventType: _univerjs_engine_render.DeviceInputEventType.Keyboard,
 			keycode: event.which,
+			initialValue,
 			unitId: this._context.unitId
 		});
 	}
-	_tryHideEditor() {
+	_tryHideEditor(evt) {
 		if (this._editorBridgeService.isForceKeepVisible()) return;
+		if (!evt && this._isEmbeddedFormulaEditorActive()) return;
+		if (this._isEmbeddedFormulaEditorActive() && this._isCurrentEmbedRuntimeEvent(evt)) return;
+		if (isEmbedCellEditorInteraction(evt)) return;
 		this._hideEditor();
 	}
+	_isEmbeddedFormulaEditorActive() {
+		var _this$_embedRuntimeFo2, _this$_editorBridgeSe;
+		if (((_this$_embedRuntimeFo2 = this._embedRuntimeFocusCoordinator) === null || _this$_embedRuntimeFo2 === void 0 ? void 0 : _this$_embedRuntimeFo2.isChildUnitInActiveSession(this._context.unitId)) !== true) return false;
+		const dataStream = (_this$_editorBridgeSe = this._editorBridgeService.getEditCellState()) === null || _this$_editorBridgeSe === void 0 || (_this$_editorBridgeSe = _this$_editorBridgeSe.documentLayoutObject.documentModel) === null || _this$_editorBridgeSe === void 0 || (_this$_editorBridgeSe = _this$_editorBridgeSe.getSnapshot().body) === null || _this$_editorBridgeSe === void 0 ? void 0 : _this$_editorBridgeSe.dataStream;
+		return typeof dataStream === "string" && dataStream.startsWith("=");
+	}
+	_isCurrentEmbedRuntimeEvent(evt) {
+		var _this$_embedRuntimeFo3;
+		return ((_this$_embedRuntimeFo3 = this._embedRuntimeFocusCoordinator) === null || _this$_embedRuntimeFo3 === void 0 ? void 0 : _this$_embedRuntimeFo3.isChildUnitRuntimeEvent(this._context.unitId, evt === null || evt === void 0 ? void 0 : evt.target, evt instanceof Event ? evt : evt)) === true;
+	}
 	_hideEditor() {
 		if (this._editorBridgeService.isVisible().visible !== true) return;
 		this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
@@ -9857,11 +9998,12 @@ let EditorBridgeRenderController = class EditorBridgeRenderController extends _u
 		});
 	}
 	_getSheetObject() {
+		if (!this._context.unit) return null;
 		return getSheetObject(this._context.unit, this._context);
 	}
 	_isCurrentSheetFocused() {
-		var _this$_instanceSrv$ge;
-		return ((_this$_instanceSrv$ge = this._instanceSrv.getFocusedUnit()) === null || _this$_instanceSrv$ge === void 0 ? void 0 : _this$_instanceSrv$ge.getUnitId()) === this._context.unitId;
+		var _this$_instanceSrv$ge, _this$_embedRuntimeFo4;
+		return ((_this$_instanceSrv$ge = this._instanceSrv.getFocusedUnit()) === null || _this$_instanceSrv$ge === void 0 ? void 0 : _this$_instanceSrv$ge.getUnitId()) === this._context.unitId || ((_this$_embedRuntimeFo4 = this._embedRuntimeFocusCoordinator) === null || _this$_embedRuntimeFo4 === void 0 ? void 0 : _this$_embedRuntimeFo4.isChildUnitInActiveSession(this._context.unitId)) === true;
 	}
 };
 EditorBridgeRenderController = __decorate([
@@ -9871,8 +10013,46 @@ EditorBridgeRenderController = __decorate([
 	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService)),
 	__decorateParam(5, _univerjs_core.IContextService),
 	__decorateParam(6, _univerjs_engine_render.IRenderManagerService),
-	__decorateParam(7, (0, _univerjs_core.Inject)(SheetSkeletonManagerService))
+	__decorateParam(7, (0, _univerjs_core.Inject)(SheetSkeletonManagerService)),
+	__decorateParam(8, (0, _univerjs_core.Optional)(ISheetEmbedRuntimeFocusCoordinator))
 ], EditorBridgeRenderController);
+function resolvePointerEventPayload(payload) {
+	return Array.isArray(payload) ? payload[0] : payload;
+}
+function isEmbedCellEditorInteraction(evt) {
+	return isEmbedCellEditorInteractionTarget(evt === null || evt === void 0 ? void 0 : evt.target) || isEmbedCellEditorInteractionPoint(resolvePointerEventPoint(evt));
+}
+function isEmbedCellEditorInteractionTarget(target) {
+	if (typeof HTMLElement === "undefined" || !(target instanceof HTMLElement)) return false;
+	return target.closest(`[${"data-embed-runtime-focus-role"}="child-editor"]`) != null || target.closest("[data-u-comp=\"editor\"]") != null || target.closest("[id^=\"__editor___INTERNAL_EDITOR__\"]") != null || target.closest("[id^=\"univer-doc-selection-container-__INTERNAL_EDITOR__\"]") != null;
+}
+function resolvePointerEventPoint(evt) {
+	if (!evt) return;
+	return {
+		clientX: "clientX" in evt ? evt.clientX : void 0,
+		clientY: "clientY" in evt ? evt.clientY : void 0,
+		x: "x" in evt ? evt.x : void 0,
+		y: "y" in evt ? evt.y : void 0
+	};
+}
+function isEmbedCellEditorInteractionPoint(evt) {
+	if (typeof document === "undefined") return false;
+	const clientX = Number.isFinite(evt === null || evt === void 0 ? void 0 : evt.clientX) ? evt === null || evt === void 0 ? void 0 : evt.clientX : evt === null || evt === void 0 ? void 0 : evt.x;
+	const clientY = Number.isFinite(evt === null || evt === void 0 ? void 0 : evt.clientY) ? evt === null || evt === void 0 ? void 0 : evt.clientY : evt === null || evt === void 0 ? void 0 : evt.y;
+	if (!Number.isFinite(clientX) || !Number.isFinite(clientY)) return false;
+	return [...document.querySelectorAll([
+		`[${SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE}="child-editor"]`,
+		"[data-u-comp=\"editor\"]",
+		"[id^=\"__editor___INTERNAL_EDITOR__\"]",
+		"[id^=\"univer-doc-selection-container-__INTERNAL_EDITOR__\"]"
+	].join(","))].some((element) => {
+		const rect = element.getBoundingClientRect();
+		return rect.width > 0 && rect.height > 0 && clientX >= rect.left && clientX <= rect.right && clientY >= rect.top && clientY <= rect.bottom;
+	});
+}
+function isSameEditCell(current, unitId, sheetId, primary) {
+	return (current === null || current === void 0 ? void 0 : current.unitId) === unitId && current.sheetId === sheetId && current.row === primary.startRow && current.column === primary.startColumn;
+}
 
 //#endregion
 //#region src/services/repeat-last-action.service.ts
@@ -10589,10 +10769,11 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 	}
 	_initialCursorSync(d) {
 		d.add(this._cellEditorManagerService.focus$.pipe((0, rxjs.filter)((f) => !!f)).subscribe(() => {
-			var _this$_renderManagerS2;
-			const currentDoc = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_DOC);
-			if (!currentDoc) return;
-			const docSelectionRenderManager = (_this$_renderManagerS2 = this._renderManagerService.getRenderById(currentDoc === null || currentDoc === void 0 ? void 0 : currentDoc.getUnitId())) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(_univerjs_docs_ui.DocSelectionRenderService);
+			var _this$_univerInstance, _this$_renderManagerS2;
+			const editorId = this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR) ? _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY : this._editorBridgeService.getCurrentEditorId();
+			const docUnitId = editorId !== null && editorId !== void 0 ? editorId : (_this$_univerInstance = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_DOC)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getUnitId();
+			if (!docUnitId) return;
+			const docSelectionRenderManager = (_this$_renderManagerS2 = this._renderManagerService.getRenderById(docUnitId)) === null || _this$_renderManagerS2 === void 0 ? void 0 : _this$_renderManagerS2.with(_univerjs_docs_ui.DocSelectionRenderService);
 			if (!docSelectionRenderManager) return;
 			docSelectionRenderManager.sync();
 		}));
@@ -10713,14 +10894,17 @@ let EditingRenderController = class EditingRenderController extends _univerjs_co
 		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;
-		this._commandService.syncExecuteCommand(ScrollToRangeOperation.id, { range: {
-			startRow: editCellState.row,
-			startColumn: editCellState.column,
-			endRow: editCellState.row,
-			endColumn: editCellState.column
-		} });
-		this._editorBridgeService.refreshEditCellPosition(false);
 		const { unitId, isInArrayFormulaRange = false } = editCellState;
+		this._commandService.syncExecuteCommand(ScrollToRangeOperation.id, {
+			unitId,
+			range: {
+				startRow: editCellState.row,
+				startColumn: editCellState.column,
+				endRow: editCellState.row,
+				endColumn: editCellState.column
+			}
+		});
+		this._editorBridgeService.refreshEditCellPosition(false);
 		const editorObject = this._getEditorObject();
 		if (editorObject == null) return;
 		const { document, scene } = editorObject;
@@ -11106,8 +11290,9 @@ function getCellStyleBySnapshot(snapshot) {
 	return null;
 }
 function emptyBody(body, removeStyle = false) {
+	var _body$textRuns;
 	body.dataStream = _univerjs_core.DEFAULT_EMPTY_DOCUMENT_VALUE;
-	if (body.textRuns != null) if (body.textRuns.length === 1 && !removeStyle) {
+	if ((_body$textRuns = body.textRuns) === null || _body$textRuns === void 0 ? void 0 : _body$textRuns.length) if (body.textRuns.length === 1 && !removeStyle) {
 		body.textRuns[0].st = 0;
 		body.textRuns[0].ed = 1;
 	} else body.textRuns = void 0;
@@ -11474,7 +11659,10 @@ function generateBody(text) {
 	return {
 		dataStream,
 		paragraphs,
-		sectionBreaks: [{ startIndex: dataStream.indexOf("\n") }]
+		sectionBreaks: [{
+			sectionId: (0, _univerjs_core.createSectionId)(/* @__PURE__ */ new Set()),
+			startIndex: dataStream.indexOf("\n")
+		}]
 	};
 }
 
@@ -12210,11 +12398,18 @@ let FormulaEditorController = class FormulaEditorController extends _univerjs_co
 		});
 		this._create(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
 		this.disposeWithMe(this._editorService.focus$.subscribe(() => {
-			var _this$_editorService$;
-			if (((_this$_editorService$ = this._editorService.getFocusEditor()) === null || _this$_editorService$ === void 0 ? void 0 : _this$_editorService$.getEditorId()) !== _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY) this._contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, false);
-			else this._contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, true);
+			this._syncFxBarFocusContext();
 		}));
 	}
+	_syncFxBarFocusContext() {
+		var _this$_editorService$;
+		if (((_this$_editorService$ = this._editorService.getFocusEditor()) === null || _this$_editorService$ === void 0 ? void 0 : _this$_editorService$.getEditorId()) === _univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY) {
+			this._contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, true);
+			return;
+		}
+		if (this._contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR) && this._contextService.getContextValue(_univerjs_core.EDITOR_ACTIVATED)) return;
+		this._contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, false);
+	}
 	_handleContentChange() {
 		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id === _univerjs_docs.RichTextEditingMutation.id) {
@@ -12236,7 +12431,7 @@ let FormulaEditorController = class FormulaEditorController extends _univerjs_co
 			if (this._contextService.getContextValue(_univerjs_core.FOCUSING_EDITOR_BUT_HIDDEN) && !this._contextService.getContextValue(_univerjs_core.EDITOR_ACTIVATED)) {
 				var _formulaEditorDataMod;
 				this._univerInstanceService.setCurrentUnitForType(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
-				const formulaEditorDataModel = this._univerInstanceService.getUniverDocInstance(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
+				const formulaEditorDataModel = this._univerInstanceService.getUnit(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 				if (this._editorBridgeService.isVisible().visible === false) this._commandService.syncExecuteCommand(SetCellEditVisibleOperation.id, {
 					visible: true,
 					eventType: _univerjs_engine_render.DeviceInputEventType.PointerDown,
@@ -12276,7 +12471,7 @@ let FormulaEditorController = class FormulaEditorController extends _univerjs_co
 		this.disposeWithMe((0, rxjs.combineLatest)([this._formulaEditorManagerService.position$, addFormulaBar$]).subscribe(([position]) => {
 			if (!position) return this._clearScheduledCallback();
 			const editorObject = getEditorObject(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, this._renderManagerService);
-			const formulaEditorDataModel = this._univerInstanceService.getUniverDocInstance(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
+			const formulaEditorDataModel = this._univerInstanceService.getUnit(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 			if (editorObject == null || formulaEditorDataModel == null) return this._clearScheduledCallback();
 			const { width, height } = position;
 			if (width === 0 || height === 0) return this._clearScheduledCallback();
@@ -12295,7 +12490,7 @@ let FormulaEditorController = class FormulaEditorController extends _univerjs_co
 		const position = this._formulaEditorManagerService.getPosition();
 		const skeleton = (_this$_renderManagerS = this._renderManagerService.getRenderById(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(_univerjs_docs.DocSkeletonManagerService).getSkeleton();
 		const editorObject = this._renderManagerService.getRenderById(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
-		const formulaEditorDataModel = this._univerInstanceService.getUniverDocInstance(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
+		const formulaEditorDataModel = this._univerInstanceService.getUnit(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, _univerjs_core.UniverInstanceType.UNIVER_DOC);
 		if (skeleton == null || position == null || editorObject == null || formulaEditorDataModel == null) return;
 		const { marginTop = 0, marginBottom = 0 } = formulaEditorDataModel.getSnapshot().documentStyle;
 		const { scene, mainComponent } = editorObject;
@@ -16079,6 +16274,56 @@ const BORDER_LINE_CHILDREN = [
 		value: "mltr_bctr"
 	}
 ];
+const BORDER_SIZE_CHILDREN = [
+	{
+		label: _univerjs_core.BorderStyleTypes.THIN,
+		value: _univerjs_core.BorderStyleTypes.THIN
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.HAIR,
+		value: _univerjs_core.BorderStyleTypes.HAIR
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.DOTTED,
+		value: _univerjs_core.BorderStyleTypes.DOTTED
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.DASHED,
+		value: _univerjs_core.BorderStyleTypes.DASHED
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.DASH_DOT,
+		value: _univerjs_core.BorderStyleTypes.DASH_DOT
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.DASH_DOT_DOT,
+		value: _univerjs_core.BorderStyleTypes.DASH_DOT_DOT
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.MEDIUM,
+		value: _univerjs_core.BorderStyleTypes.MEDIUM
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.MEDIUM_DASHED,
+		value: _univerjs_core.BorderStyleTypes.MEDIUM_DASHED
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT,
+		value: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT_DOT,
+		value: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT_DOT
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.THICK,
+		value: _univerjs_core.BorderStyleTypes.THICK
+	},
+	{
+		label: _univerjs_core.BorderStyleTypes.DOUBLE,
+		value: _univerjs_core.BorderStyleTypes.DOUBLE
+	}
+];
 
 //#endregion
 //#region src/menu/menu-util.ts
@@ -16839,6 +17084,9 @@ const MenuItemInput = (props) => {
 	function handlePressEnter() {
 		if (inputValue) onChange(inputValue);
 	}
+	function handleKeyDown(event) {
+		event.stopPropagation();
+	}
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "univer-inline-flex univer-items-center univer-gap-1",
 		children: [
@@ -16854,6 +17102,7 @@ const MenuItemInput = (props) => {
 					max,
 					disabled,
 					onPressEnter: handlePressEnter,
+					onKeyDown: handleKeyDown,
 					onChange: handleChange
 				})
 			}),
@@ -18089,7 +18338,7 @@ function ShowRowMenuItemFactory(accessor) {
 	return {
 		id: _univerjs_sheets.SetSelectedRowsVisibleCommand.id,
 		type: _univerjs_ui.MenuItemType.BUTTON,
-		icon: "EyeOutlineIcon",
+		icon: "EyeIcon",
 		title: "sheets-ui.rightClick.showHideRow",
 		hidden$: deriveStateFromActiveSheet$(univerInstanceService, true, ({ worksheet }) => new rxjs.Observable((subscriber) => {
 			function hasHiddenRowsInSelections() {
@@ -18125,7 +18374,7 @@ function ShowColMenuItemFactory(accessor) {
 	return {
 		id: _univerjs_sheets.SetSelectedColsVisibleCommand.id,
 		type: _univerjs_ui.MenuItemType.BUTTON,
-		icon: "EyeOutlineIcon",
+		icon: "EyeIcon",
 		title: "sheets-ui.rightClick.showHideColumn",
 		hidden$: deriveStateFromActiveSheet$(univerInstanceService, true, ({ worksheet }) => new rxjs.Observable((subscriber) => {
 			function hasHiddenColsInSelections() {
@@ -19410,6 +19659,25 @@ const menuSchema = {
 	} } }
 };
 
+//#endregion
+//#region src/embed-tab-anchor.ts
+const EMBED_SHEETS_TAB_CUSTOM_KEY = "UNIVER_EMBED_SHEETS_TAB";
+function getEmbedSheetsTabCustomData(snapshot) {
+	var _snapshot$custom;
+	const value = (_snapshot$custom = snapshot.custom) === null || _snapshot$custom === void 0 ? void 0 : _snapshot$custom[EMBED_SHEETS_TAB_CUSTOM_KEY];
+	if (!isEmbedSheetsTabCustomData(value)) return;
+	return value;
+}
+function isEmbedSheetsTabCustomData(value) {
+	if (!value || typeof value !== "object") return false;
+	const candidate = value;
+	return candidate.version === 1 && typeof candidate.embedId === "string" && typeof candidate.hostAnchorId === "string";
+}
+
+//#endregion
+//#region src/services/sheet-embed-runtime.service.ts
+const ISheetEmbedRuntimeService = (0, _univerjs_core.createIdentifier)("sheet-ui.embed-runtime.service");
+
 //#endregion
 //#region src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
 const useUpdate = () => {
@@ -19559,6 +19827,93 @@ function AutoFillPopupMenu() {
 	});
 }
 
+//#endregion
+//#region src/views/editor-container/focus-editor.ts
+const SHEET_CELL_EDITOR_ELEMENT_ID = `__editor_${_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY}`;
+const SHEET_CELL_EDITOR_SELECTION_CONTAINER_ID = `univer-doc-selection-container-${_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY}`;
+function focusSheetCellEditorElement(ownerDocument = document) {
+	const element = ownerDocument.getElementById(SHEET_CELL_EDITOR_ELEMENT_ID);
+	if (element == null || ownerDocument.activeElement === element) return false;
+	if (!element.hasAttribute("tabindex")) element.tabIndex = -1;
+	element.focus({ preventScroll: true });
+	return ownerDocument.activeElement === element;
+}
+function registerSheetCellEditorRuntimePortal(options) {
+	var _options$ownerDocumen;
+	const ownerDocument = (_options$ownerDocumen = options.ownerDocument) !== null && _options$ownerDocumen !== void 0 ? _options$ownerDocumen : typeof document === "undefined" ? void 0 : document;
+	if (!ownerDocument) return (0, _univerjs_core.toDisposable)(() => {});
+	const collection = new _univerjs_core.DisposableCollection();
+	const view = ownerDocument.defaultView;
+	let disposed = false;
+	let registeredPortalRoot = null;
+	let portalRegistration;
+	const frameHandles = [];
+	let observer;
+	const tryRegister = () => {
+		if (disposed) return;
+		const portalRoot = resolveSheetCellEditorPortalRoot(ownerDocument);
+		if (portalRoot === registeredPortalRoot) return;
+		portalRegistration === null || portalRegistration === void 0 || portalRegistration.dispose();
+		portalRegistration = void 0;
+		registeredPortalRoot = null;
+		if (!portalRoot) return;
+		const rootRegistration = new _univerjs_core.DisposableCollection();
+		registeredPortalRoot = portalRoot;
+		if (options.interactionBoundaryService) rootRegistration.add(options.interactionBoundaryService.registerOwnedElement(options.embedId, portalRoot));
+		if (options.focusCoordinator) {
+			rootRegistration.add(options.focusCoordinator.registerElement({
+				embedId: options.embedId,
+				role: "child-editor",
+				element: portalRoot
+			}));
+			const editorElement = ownerDocument.getElementById(SHEET_CELL_EDITOR_ELEMENT_ID);
+			if (editorElement && editorElement !== portalRoot) rootRegistration.add(options.focusCoordinator.registerElement({
+				embedId: options.embedId,
+				role: "child-editor",
+				element: editorElement
+			}));
+		}
+		portalRegistration = rootRegistration;
+	};
+	const scheduleRetry = (remaining) => {
+		if (remaining <= 0 || !(view === null || view === void 0 ? void 0 : view.requestAnimationFrame)) return;
+		const handle = view.requestAnimationFrame(() => {
+			const index = frameHandles.indexOf(handle);
+			if (index >= 0) frameHandles.splice(index, 1);
+			tryRegister();
+			if (!registeredPortalRoot) scheduleRetry(remaining - 1);
+		});
+		frameHandles.push(handle);
+	};
+	tryRegister();
+	if (!registeredPortalRoot) scheduleRetry(2);
+	if ((view === null || view === void 0 ? void 0 : view.MutationObserver) && ownerDocument.body) {
+		observer = new view.MutationObserver(() => tryRegister());
+		observer.observe(ownerDocument.body, {
+			childList: true,
+			subtree: true
+		});
+	}
+	collection.add((0, _univerjs_core.toDisposable)(() => {
+		disposed = true;
+		frameHandles.forEach((handle) => {
+			var _view$cancelAnimation;
+			return view === null || view === void 0 || (_view$cancelAnimation = view.cancelAnimationFrame) === null || _view$cancelAnimation === void 0 ? void 0 : _view$cancelAnimation.call(view, handle);
+		});
+		frameHandles.length = 0;
+		observer === null || observer === void 0 || observer.disconnect();
+		observer = void 0;
+		portalRegistration === null || portalRegistration === void 0 || portalRegistration.dispose();
+		portalRegistration = void 0;
+		registeredPortalRoot = null;
+	}));
+	return collection;
+}
+function resolveSheetCellEditorPortalRoot(ownerDocument = document) {
+	var _ref;
+	return (_ref = ownerDocument.getElementById(SHEET_CELL_EDITOR_SELECTION_CONTAINER_ID)) !== null && _ref !== void 0 ? _ref : ownerDocument.getElementById(SHEET_CELL_EDITOR_ELEMENT_ID);
+}
+
 //#endregion
 //#region src/views/editor-container/hooks.ts
 /**
@@ -19628,19 +19983,65 @@ function isTransparentColor(color) {
 	const normalizedColor = color.trim().toLowerCase().replace(/\s+/g, "");
 	return normalizedColor === "transparent" || normalizedColor === "rgba(0,0,0,0)";
 }
+function shouldRefocusCellEditorAfterPointerDown(options) {
+	const { root, target, activeElement, isEditorFocusing } = options;
+	if (!root || !(target instanceof HTMLElement) || !(activeElement instanceof HTMLElement)) return true;
+	const owner = root.closest(`[${SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE}]`);
+	const embedId = owner === null || owner === void 0 ? void 0 : owner.getAttribute(SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE);
+	if (!embedId) return true;
+	const targetInOwner = target.closest(`[${SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE}="${embedId}"]`) != null;
+	const activeOwnerElement = activeElement.closest(`[${SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE}="${embedId}"]`);
+	if (targetInOwner && activeOwnerElement && isEmbedRuntimeInteractiveElement(activeElement)) return false;
+	if (!isEditorFocusing) return true;
+	return target.closest(`[${"data-embed-interaction-boundary-owner"}="${embedId}"]`) == null || activeOwnerElement == null;
+}
+function isEmbedRuntimeInteractiveElement(element) {
+	const role = element.getAttribute(SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE);
+	return role === "child-editor" || role === "child-popup" || role === "floating-menu";
+}
+function shouldPreserveEmbedPopupFocus(embedId, ownerDocument) {
+	var _activeElement$getAtt, _activeElement$closes;
+	if (!embedId) return false;
+	const activeElement = ownerDocument.activeElement;
+	if (!(activeElement instanceof HTMLElement)) return false;
+	if (!activeElement.closest(`[${"data-embed-interaction-boundary-owner"}="${embedId}"]`)) return false;
+	const role = (_activeElement$getAtt = activeElement.getAttribute("data-embed-runtime-focus-role")) !== null && _activeElement$getAtt !== void 0 ? _activeElement$getAtt : (_activeElement$closes = activeElement.closest(`[${"data-embed-runtime-focus-role"}]`)) === null || _activeElement$closes === void 0 ? void 0 : _activeElement$closes.getAttribute(SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE);
+	return role === "child-popup" || role === "floating-menu";
+}
+function shouldPreserveEmbedInteractiveFocus(embedId, ownerDocument) {
+	var _activeElement$getAtt2, _activeElement$closes2;
+	if (!embedId) return false;
+	const activeElement = ownerDocument.activeElement;
+	if (!(activeElement instanceof HTMLElement)) return false;
+	if (!activeElement.closest(`[${"data-embed-interaction-boundary-owner"}="${embedId}"]`)) return false;
+	const role = (_activeElement$getAtt2 = activeElement.getAttribute("data-embed-runtime-focus-role")) !== null && _activeElement$getAtt2 !== void 0 ? _activeElement$getAtt2 : (_activeElement$closes2 = activeElement.closest(`[${"data-embed-runtime-focus-role"}]`)) === null || _activeElement$closes2 === void 0 ? void 0 : _activeElement$closes2.getAttribute(SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE);
+	return role == null && activeElement.tagName !== "CANVAS" || role === "child-editor" || role === "child-popup" || role === "floating-menu";
+}
+function isEmbedRuntimeEditorOrPopup(target) {
+	var _target$getAttribute, _target$closest;
+	if (!(target instanceof HTMLElement)) return false;
+	const role = (_target$getAttribute = target.getAttribute("data-embed-runtime-focus-role")) !== null && _target$getAttribute !== void 0 ? _target$getAttribute : (_target$closest = target.closest(`[${"data-embed-runtime-focus-role"}]`)) === null || _target$closest === void 0 ? void 0 : _target$closest.getAttribute(SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE);
+	return role === "child-editor" || role === "child-popup" || role === "floating-menu";
+}
 /**
 * Cell editor container.
 * @returns the rendered cell editor container.
 */
-const EditorContainer = () => {
+function EditorContainer() {
 	const [state, setState] = (0, react.useState)({ ...EDITOR_DEFAULT_POSITION });
 	const cellEditorManagerService = (0, _univerjs_ui.useDependency)(ICellEditorManagerService);
+	const injector = (0, _univerjs_ui.useDependency)(_univerjs_core.Injector);
 	const editorService = (0, _univerjs_ui.useDependency)(_univerjs_docs_ui.IEditorService);
+	const instanceService = (0, _univerjs_ui.useDependency)(_univerjs_core.IUniverInstanceService);
 	const contextService = (0, _univerjs_ui.useDependency)(_univerjs_core.IContextService);
 	const themeService = (0, _univerjs_ui.useDependency)(_univerjs_core.ThemeService);
 	const componentManager = (0, _univerjs_ui.useDependency)(_univerjs_ui.ComponentManager);
 	const editorBridgeService = (0, _univerjs_ui.useDependency)(IEditorBridgeService);
+	const cellEditorResizeService = (0, _univerjs_ui.useDependency)(SheetCellEditorResizeService);
+	const rootRef = (0, react.useRef)(null);
+	const pointerRefocusTimerRef = (0, react.useRef)(void 0);
 	const visible = (0, _univerjs_ui.useObservable)(editorBridgeService.visible$);
+	const [runtimeFocusRevision, setRuntimeFocusRevision] = (0, react.useState)(0);
 	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
 	const disableAutoFocus = (0, _univerjs_ui.useObservable)(() => contextService.subscribeContextValue$(_univerjs_ui.DISABLE_AUTO_FOCUS_KEY), false, void 0, [contextService, _univerjs_ui.DISABLE_AUTO_FOCUS_KEY]);
 	const FormulaEditor = componentManager.get(EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY);
@@ -19673,17 +20074,54 @@ const EditorContainer = () => {
 			sub.unsubscribe();
 		};
 	}, []);
+	(0, react.useEffect)(() => {
+		if (!injector.has(ISheetEmbedFloatingGeometryService)) return;
+		const subscription = injector.get(ISheetEmbedFloatingGeometryService).geometryInvalidated$.subscribe(() => {
+			cellEditorResizeService.resizeCellEditor();
+		});
+		return () => subscription.unsubscribe();
+	}, [cellEditorResizeService, injector]);
+	(0, react.useEffect)(() => {
+		if (!injector.has(ISheetEmbedRuntimeFocusCoordinator)) return;
+		const subscription = injector.get(ISheetEmbedRuntimeFocusCoordinator).runtimeSessionChanged$.subscribe(() => {
+			setRuntimeFocusRevision((revision) => revision + 1);
+		});
+		return () => subscription.unsubscribe();
+	}, [injector]);
 	(0, react.useEffect)(() => {
 		if (!disableAutoFocus) cellEditorManagerService.setFocus(true);
 	}, [disableAutoFocus, state]);
 	(0, react.useEffect)(() => {
+		var _rootRef$current$owne, _rootRef$current, _ownerDocument$defaul;
 		if (!(visible === null || visible === void 0 ? void 0 : visible.visible)) return;
+		cellEditorResizeService.fitTextSize();
+		if (contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR)) return;
+		const ownerDocument = (_rootRef$current$owne = (_rootRef$current = rootRef.current) === null || _rootRef$current === void 0 ? void 0 : _rootRef$current.ownerDocument) !== null && _rootRef$current$owne !== void 0 ? _rootRef$current$owne : document;
+		const ownerWindow = (_ownerDocument$defaul = ownerDocument.defaultView) !== null && _ownerDocument$defaul !== void 0 ? _ownerDocument$defaul : window;
 		let focusRetryFrame = 0;
 		let finalFocusRetryFrame = 0;
+		let delayedFocusTimer;
+		const focusCellEditorElement = () => {
+			var _resolveSheetEmbedRun;
+			const scope = rootRef.current ? (_resolveSheetEmbedRun = resolveSheetEmbedRuntimeDomScope(rootRef.current)) !== null && _resolveSheetEmbedRun !== void 0 ? _resolveSheetEmbedRun : resolveActiveSheetEmbedRuntimeDomScope(ownerDocument) : resolveActiveSheetEmbedRuntimeDomScope(ownerDocument);
+			if (shouldPreserveEmbedInteractiveFocus(scope === null || scope === void 0 ? void 0 : scope.embedId, ownerDocument)) return;
+			focusSheetCellEditorElement(ownerDocument);
+			if (delayedFocusTimer != null) ownerWindow.clearTimeout(delayedFocusTimer);
+			delayedFocusTimer = ownerWindow.setTimeout(() => {
+				delayedFocusTimer = void 0;
+				if (shouldPreserveEmbedInteractiveFocus(scope === null || scope === void 0 ? void 0 : scope.embedId, ownerDocument)) return;
+				focusSheetCellEditorElement(ownerDocument);
+			}, 0);
+		};
 		const focusEditor = () => {
+			var _resolveSheetEmbedRun2;
+			if (contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR)) return;
+			const scope = rootRef.current ? (_resolveSheetEmbedRun2 = resolveSheetEmbedRuntimeDomScope(rootRef.current)) !== null && _resolveSheetEmbedRun2 !== void 0 ? _resolveSheetEmbedRun2 : resolveActiveSheetEmbedRuntimeDomScope(ownerDocument) : resolveActiveSheetEmbedRuntimeDomScope(ownerDocument);
+			if (shouldPreserveEmbedPopupFocus(scope === null || scope === void 0 ? void 0 : scope.embedId, ownerDocument)) return;
 			const editor = editorService.getEditor(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
 			const docSelectionRenderService = editor === null || editor === void 0 ? void 0 : editor.render.with(_univerjs_docs_ui.DocSelectionRenderService);
 			if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
+			focusCellEditorElement();
 		};
 		focusEditor();
 		focusRetryFrame = requestAnimationFrame(() => {
@@ -19693,8 +20131,185 @@ const EditorContainer = () => {
 		return () => {
 			cancelAnimationFrame(focusRetryFrame);
 			cancelAnimationFrame(finalFocusRetryFrame);
+			if (delayedFocusTimer != null) ownerWindow.clearTimeout(delayedFocusTimer);
 		};
-	}, [editorService, visible === null || visible === void 0 ? void 0 : visible.visible]);
+	}, [
+		cellEditorResizeService,
+		editorService,
+		visible === null || visible === void 0 ? void 0 : visible.visible
+	]);
+	(0, react.useEffect)(() => {
+		var _instanceService$getF, _ref;
+		if (!(visible === null || visible === void 0 ? void 0 : visible.visible) || !rootRef.current || !injector.has(ISheetEmbedRuntimeFocusCoordinator)) return;
+		const focusCoordinator = injector.get(ISheetEmbedRuntimeFocusCoordinator);
+		const focusedUnitId = (_instanceService$getF = instanceService.getFocusedUnit()) === null || _instanceService$getF === void 0 ? void 0 : _instanceService$getF.getUnitId();
+		const rootRuntimeScope = resolveSheetEmbedRuntimeDomScope(rootRef.current);
+		const unitRuntimeScope = [
+			editState === null || editState === void 0 ? void 0 : editState.unitId,
+			visible.unitId,
+			focusedUnitId
+		].map((unitId) => focusCoordinator.resolveRuntimeScopeByChildUnitId(unitId)).find((resolvedScope) => resolvedScope != null);
+		if (rootRuntimeScope && unitRuntimeScope && rootRuntimeScope.embedId !== unitRuntimeScope.embedId) return;
+		const activeSessionScope = focusCoordinator.resolveActiveChildSessionRuntimeScope();
+		const explicitRuntimeScope = unitRuntimeScope !== null && unitRuntimeScope !== void 0 ? unitRuntimeScope : rootRuntimeScope;
+		if (activeSessionScope && rootRuntimeScope && !unitRuntimeScope && rootRuntimeScope.embedId !== activeSessionScope.embedId) return;
+		const scope = (_ref = explicitRuntimeScope !== null && explicitRuntimeScope !== void 0 ? explicitRuntimeScope : activeSessionScope) !== null && _ref !== void 0 ? _ref : resolveActiveSheetEmbedRuntimeDomScope(rootRef.current.ownerDocument);
+		if (!scope) return;
+		const collection = new _univerjs_core.DisposableCollection();
+		const interactionBoundaryService = injector.has(ISheetEmbedInteractionBoundaryService) ? injector.get(ISheetEmbedInteractionBoundaryService) : void 0;
+		const editorRoot = rootRef.current;
+		collection.add(focusCoordinator.acquireLease({
+			embedId: scope.embedId,
+			role: "child-editor",
+			owner: "sheet-cell-editor",
+			hostUnitId: scope.hostUnitId,
+			childUnitId: scope.childUnitId,
+			associatedChildUnitIds: [_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY]
+		}));
+		if (interactionBoundaryService) collection.add(interactionBoundaryService.registerOwnedElement(scope.embedId, editorRoot));
+		collection.add(focusCoordinator.registerElement({
+			embedId: scope.embedId,
+			role: "child-editor",
+			element: editorRoot
+		}));
+		collection.add(registerSheetCellEditorRuntimePortal({
+			embedId: scope.embedId,
+			ownerDocument: rootRef.current.ownerDocument,
+			interactionBoundaryService,
+			focusCoordinator
+		}));
+		if (scope.childType === _univerjs_core.UniverInstanceType.UNIVER_SHEET && scope.childUnitId) {
+			const ownerDocument = rootRef.current.ownerDocument;
+			let pointerRetryFrame = 0;
+			const focusEditor = () => {
+				if (contextService.getContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR) || shouldPreserveEmbedPopupFocus(scope.embedId, ownerDocument)) return;
+				const editor = editorService.getEditor(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+				const docSelectionRenderService = editor === null || editor === void 0 ? void 0 : editor.render.with(_univerjs_docs_ui.DocSelectionRenderService);
+				if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
+				focusSheetCellEditorElement(ownerDocument);
+			};
+			const refocusEditorAfterRuntimePointer = (event) => {
+				if (!focusCoordinator.isChildUnitRuntimeEvent(scope.childUnitId, event.target, event) || isEmbedRuntimeEditorOrPopup(event.target)) return;
+				cancelAnimationFrame(pointerRetryFrame);
+				pointerRetryFrame = requestAnimationFrame(focusEditor);
+			};
+			ownerDocument.addEventListener("pointerdown", refocusEditorAfterRuntimePointer, true);
+			ownerDocument.addEventListener("pointerup", refocusEditorAfterRuntimePointer, true);
+			ownerDocument.addEventListener("click", refocusEditorAfterRuntimePointer, true);
+			collection.add((0, _univerjs_core.toDisposable)(() => {
+				cancelAnimationFrame(pointerRetryFrame);
+				ownerDocument.removeEventListener("pointerdown", refocusEditorAfterRuntimePointer, true);
+				ownerDocument.removeEventListener("pointerup", refocusEditorAfterRuntimePointer, true);
+				ownerDocument.removeEventListener("click", refocusEditorAfterRuntimePointer, true);
+			}));
+		}
+		return () => collection.dispose();
+	}, [
+		contextService,
+		editState === null || editState === void 0 ? void 0 : editState.unitId,
+		editorService,
+		injector,
+		instanceService,
+		runtimeFocusRevision,
+		visible === null || visible === void 0 ? void 0 : visible.unitId,
+		visible === null || visible === void 0 ? void 0 : visible.visible
+	]);
+	(0, react.useEffect)(() => {
+		var _rootRef$current$owne2, _rootRef$current2, _ownerDocument$defaul2;
+		if ((visible === null || visible === void 0 ? void 0 : visible.visible) || !injector.has(ISheetEmbedRuntimeFocusCoordinator)) return;
+		const focusCoordinator = injector.get(ISheetEmbedRuntimeFocusCoordinator);
+		const activeSessionScope = focusCoordinator.resolveActiveChildSessionRuntimeScope();
+		const childUnitId = activeSessionScope === null || activeSessionScope === void 0 ? void 0 : activeSessionScope.childUnitId;
+		if (!activeSessionScope || activeSessionScope.childType !== _univerjs_core.UniverInstanceType.UNIVER_SHEET || !childUnitId || !instanceService.getUnit(childUnitId, _univerjs_core.UniverInstanceType.UNIVER_SHEET)) return;
+		const ownerDocument = (_rootRef$current$owne2 = (_rootRef$current2 = rootRef.current) === null || _rootRef$current2 === void 0 ? void 0 : _rootRef$current2.ownerDocument) !== null && _rootRef$current$owne2 !== void 0 ? _rootRef$current$owne2 : document;
+		const interactionBoundaryService = injector.has(ISheetEmbedInteractionBoundaryService) ? injector.get(ISheetEmbedInteractionBoundaryService) : void 0;
+		const portalRegistration = registerSheetCellEditorRuntimePortal({
+			embedId: activeSessionScope.embedId,
+			ownerDocument,
+			interactionBoundaryService,
+			focusCoordinator
+		});
+		const ownerWindow = (_ownerDocument$defaul2 = ownerDocument.defaultView) !== null && _ownerDocument$defaul2 !== void 0 ? _ownerDocument$defaul2 : window;
+		let delayedFocusTimer;
+		const focusCellEditorElement = () => {
+			if (shouldPreserveEmbedInteractiveFocus(activeSessionScope.embedId, ownerDocument)) return;
+			focusSheetCellEditorElement(ownerDocument);
+			if (delayedFocusTimer != null) ownerWindow.clearTimeout(delayedFocusTimer);
+			delayedFocusTimer = ownerWindow.setTimeout(() => {
+				delayedFocusTimer = void 0;
+				if (shouldPreserveEmbedInteractiveFocus(activeSessionScope.embedId, ownerDocument)) return;
+				focusSheetCellEditorElement(ownerDocument);
+			}, 0);
+		};
+		const focusHiddenEditor = () => {
+			if (shouldPreserveEmbedPopupFocus(activeSessionScope.embedId, ownerDocument)) return;
+			const editor = editorService.getEditor(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+			const docSelectionRenderService = editor === null || editor === void 0 ? void 0 : editor.render.with(_univerjs_docs_ui.DocSelectionRenderService);
+			if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
+			focusCellEditorElement();
+		};
+		let retryFrame = 0;
+		let finalRetryFrame = 0;
+		let pointerRetryFrame = 0;
+		focusHiddenEditor();
+		retryFrame = requestAnimationFrame(() => {
+			focusHiddenEditor();
+			finalRetryFrame = requestAnimationFrame(focusHiddenEditor);
+		});
+		const refocusHiddenEditorAfterRuntimePointer = (event) => {
+			if (!focusCoordinator.isChildUnitRuntimeEvent(childUnitId, event.target, event) || isEmbedRuntimeEditorOrPopup(event.target)) return;
+			cancelAnimationFrame(pointerRetryFrame);
+			pointerRetryFrame = requestAnimationFrame(focusHiddenEditor);
+		};
+		ownerDocument.addEventListener("pointerdown", refocusHiddenEditorAfterRuntimePointer, true);
+		ownerDocument.addEventListener("pointerup", refocusHiddenEditorAfterRuntimePointer, true);
+		ownerDocument.addEventListener("click", refocusHiddenEditorAfterRuntimePointer, true);
+		return () => {
+			cancelAnimationFrame(retryFrame);
+			cancelAnimationFrame(finalRetryFrame);
+			cancelAnimationFrame(pointerRetryFrame);
+			if (delayedFocusTimer != null) ownerWindow.clearTimeout(delayedFocusTimer);
+			ownerDocument.removeEventListener("pointerdown", refocusHiddenEditorAfterRuntimePointer, true);
+			ownerDocument.removeEventListener("pointerup", refocusHiddenEditorAfterRuntimePointer, true);
+			ownerDocument.removeEventListener("click", refocusHiddenEditorAfterRuntimePointer, true);
+			portalRegistration.dispose();
+		};
+	}, [
+		editorService,
+		injector,
+		instanceService,
+		runtimeFocusRevision,
+		visible === null || visible === void 0 ? void 0 : visible.visible
+	]);
+	(0, react.useEffect)(() => {
+		return () => {
+			var _rootRef$current3;
+			const ownerWindow = (_rootRef$current3 = rootRef.current) === null || _rootRef$current3 === void 0 ? void 0 : _rootRef$current3.ownerDocument.defaultView;
+			if (ownerWindow && pointerRefocusTimerRef.current != null) ownerWindow.clearTimeout(pointerRefocusTimerRef.current);
+		};
+	}, []);
+	const refocusEditorAfterPointerDown = (0, _univerjs_ui.useEvent)((event) => {
+		var _rootRef$current$owne3, _rootRef$current4, _ownerDocument$defaul3;
+		if (!(visible === null || visible === void 0 ? void 0 : visible.visible)) return;
+		const ownerDocument = (_rootRef$current$owne3 = (_rootRef$current4 = rootRef.current) === null || _rootRef$current4 === void 0 ? void 0 : _rootRef$current4.ownerDocument) !== null && _rootRef$current$owne3 !== void 0 ? _rootRef$current$owne3 : document;
+		const ownerWindow = (_ownerDocument$defaul3 = ownerDocument.defaultView) !== null && _ownerDocument$defaul3 !== void 0 ? _ownerDocument$defaul3 : window;
+		const editor = editorService.getEditor(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+		const docSelectionRenderService = editor === null || editor === void 0 ? void 0 : editor.render.with(_univerjs_docs_ui.DocSelectionRenderService);
+		const pointerTarget = event.target;
+		const activeElementAtPointerDown = ownerDocument.activeElement;
+		if (!shouldRefocusCellEditorAfterPointerDown({
+			root: rootRef.current,
+			target: pointerTarget,
+			activeElement: activeElementAtPointerDown,
+			isEditorFocusing: docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing
+		})) return;
+		if (pointerRefocusTimerRef.current != null) ownerWindow.clearTimeout(pointerRefocusTimerRef.current);
+		pointerRefocusTimerRef.current = ownerWindow.setTimeout(() => {
+			pointerRefocusTimerRef.current = void 0;
+			if (!(docSelectionRenderService === null || docSelectionRenderService === void 0 ? void 0 : docSelectionRenderService.isFocusing)) docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
+			focusSheetCellEditorElement(ownerDocument);
+		}, 0);
+	});
 	(0, _univerjs_ui.useSidebarClick)((0, _univerjs_ui.useEvent)(() => {
 		if (editorBridgeService.isVisible().visible) commandService.executeCommand(SetCellEditVisibleOperation.id, {
 			visible: false,
@@ -19713,7 +20328,10 @@ const EditorContainer = () => {
 		});
 	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		ref: rootRef,
+		"data-u-comp": "editor",
 		className: "univer-absolute univer-z-10 univer-flex",
+		onPointerDownCapture: refocusEditorAfterPointerDown,
 		style: {
 			left: state.left,
 			top: state.top,
@@ -19738,17 +20356,15 @@ const EditorContainer = () => {
 			resetSelectionOnBlur: false,
 			isSingle: false,
 			autoScrollbar: false,
-			onFormulaSelectingChange: (isSelecting, isFocusing) => {
-				if (!isFocusing) return;
+			onFormulaSelectingChange: (isSelecting) => {
 				if (isSelecting) editorBridgeService.enableForceKeepVisible();
 				else editorBridgeService.disableForceKeepVisible();
 			},
-			disableSelectionOnClick: true,
 			disableContextMenu: false,
 			canvasStyle: { backgroundColor: "transparent" }
 		})
 	});
-};
+}
 
 //#endregion
 //#region src/services/utils/defined-name-utils.ts
@@ -19793,6 +20409,7 @@ function DefinedNameOverlay({ search, isInputEvent }) {
 	const definedNamesService = (0, _univerjs_ui.useDependency)(_univerjs_engine_formula.IDefinedNamesService);
 	const univerInstanceService = (0, _univerjs_ui.useDependency)(_univerjs_core.IUniverInstanceService);
 	const sidebarService = (0, _univerjs_ui.useDependency)(_univerjs_ui.ISidebarService);
+	const direction = localeService.getDirection();
 	const unitId = univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getUnitId();
 	const getDefinedNameMap = () => {
 		const definedNameMap = definedNamesService.getDefinedNameMap(unitId);
@@ -19847,7 +20464,9 @@ function DefinedNameOverlay({ search, isInputEvent }) {
 		definedNamesService.focusRange(unitId, id);
 	};
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-		className: "univer-w-[300px]",
+		"data-u-comp": "defined-name-overlay",
+		dir: direction,
+		className: "univer-w-[300px] rtl:univer-text-right",
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 			ref: listContainerRef,
 			className: (0, _univerjs_design.clsx)("univer-max-h-[360px] univer-min-h-0 univer-overflow-y-auto", _univerjs_design.scrollbarClassName, { "univer-min-h-[30px]": filteredDefinedNames.length > 0 }),
@@ -19861,13 +20480,16 @@ function DefinedNameOverlay({ search, isInputEvent }) {
 							focusDefinedName(definedName);
 						},
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-							className: (0, _univerjs_design.clsx)("univer-flex univer-items-center univer-justify-between univer-gap-2 univer-py-1", _univerjs_design.borderBottomClassName),
+							"data-u-comp": "defined-name-overlay-row",
+							className: (0, _univerjs_design.clsx)("univer-flex univer-items-center univer-gap-2 univer-py-1 rtl:univer-flex-row-reverse", _univerjs_design.borderBottomClassName),
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								className: "univer-w-[50%] univer-flex-shrink-0 univer-truncate univer-text-sm univer-text-gray-600 dark:!univer-text-gray-200",
+								"data-u-comp": "defined-name-overlay-name",
+								className: "univer-min-w-0 univer-flex-1 univer-basis-0 univer-truncate univer-text-sm univer-text-gray-600 rtl:univer-text-right dark:!univer-text-gray-200",
 								title: definedName.name,
 								children: definedName.name
 							}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-								className: "univer-w-[50%] univer-flex-shrink-0 univer-truncate univer-text-xs univer-text-gray-400",
+								"data-u-comp": "defined-name-overlay-reference",
+								className: "univer-min-w-0 univer-flex-1 univer-basis-0 univer-truncate univer-text-xs univer-text-gray-400 rtl:univer-text-right",
 								title: definedName.formulaOrRefString,
 								children: definedName.formulaOrRefString
 							})]
@@ -19876,7 +20498,8 @@ function DefinedNameOverlay({ search, isInputEvent }) {
 				})
 			})
 		}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-			className: "univer-cursor-pointer univer-p-2 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-600",
+			"data-u-comp": "defined-name-overlay-footer",
+			className: "univer-cursor-pointer univer-p-2 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 rtl:univer-text-right dark:hover:!univer-bg-gray-600",
 			onClick: openSlider,
 			children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "univer-mb-2 univer-text-sm univer-font-semibold univer-text-gray-600 dark:!univer-text-gray-200",
@@ -20064,7 +20687,7 @@ function DefinedName({ disable }) {
 		className: "univer-relative univer-box-border univer-flex univer-h-full univer-w-24 univer-border-r-gray-200 univer-py-1.5 univer-transition-all",
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("input", {
 			ref: inputRef,
-			className: (0, _univerjs_design.clsx)("univer-box-border univer-size-full univer-appearance-none univer-pl-1.5 univer-pr-5 univer-text-gray-900 focus:univer-outline-none dark:!univer-border-r-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-white", _univerjs_design.borderRightClassName, { "univer-cursor-not-allowed": disable }),
+			className: (0, _univerjs_design.clsx)("univer-box-border univer-size-full univer-appearance-none univer-pl-1.5 univer-pr-5 univer-text-gray-900 focus:univer-outline-none rtl:univer-pl-5 rtl:univer-pr-1.5 dark:!univer-border-r-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-white", _univerjs_design.borderRightClassName, { "univer-cursor-not-allowed": disable }),
 			type: "text",
 			value: inputValue,
 			onChange: handleChangeSelection,
@@ -20083,7 +20706,7 @@ function DefinedName({ disable }) {
 			onOpenChange: setOpen,
 			onOpenAutoFocus: (e) => e.preventDefault(),
 			children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("a", {
-				className: (0, _univerjs_design.clsx)("univer-absolute univer-right-0 univer-top-0 univer-flex univer-h-full univer-cursor-pointer univer-items-center univer-justify-center univer-px-1 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 dark:!univer-text-white dark:hover:!univer-bg-gray-800", { "univer-cursor-not-allowed univer-text-gray-300 hover:univer-bg-transparent dark:!univer-text-gray-700": disable }),
+				className: (0, _univerjs_design.clsx)("univer-absolute univer-right-0 univer-top-0 univer-flex univer-h-full univer-cursor-pointer univer-items-center univer-justify-center univer-px-1 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 rtl:univer-left-0 rtl:univer-right-auto dark:!univer-text-white dark:hover:!univer-bg-gray-800", { "univer-cursor-not-allowed univer-text-gray-300 hover:univer-bg-transparent dark:!univer-text-gray-700": disable }),
 				children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.MoreDownIcon, {})
 			})
 		})]
@@ -20231,9 +20854,9 @@ function FormulaBar(props) {
 	const shouldSkipFocus = (0, react.useRef)(false);
 	const handlePointerDown = () => {
 		try {
+			contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, true);
 			if (editorBridgeService.isVisible().visible === false) {
 				if (editorActivationDisable) {
-					contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, true);
 					editorService.focus(_univerjs_core.DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY);
 					return;
 				}
@@ -20242,12 +20865,12 @@ function FormulaBar(props) {
 					eventType: _univerjs_engine_render.DeviceInputEventType.PointerDown,
 					unitId: editState.unitId
 				})) {
+					contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, false);
 					shouldSkipFocus.current = true;
-					return;
 				}
 			}
-			contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, true);
 		} catch (e) {
+			contextService.setContextValue(_univerjs_core.FOCUSING_FX_BAR_EDITOR, false);
 			shouldSkipFocus.current = true;
 			throw e;
 		}
@@ -20328,7 +20951,7 @@ function FormulaBar(props) {
 					}), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 						className: (0, _univerjs_design.clsx)("univer-flex univer-h-full univer-w-5 univer-cursor-pointer univer-items-center univer-justify-center univer-text-xs univer-text-gray-700 dark:!univer-text-gray-200", { "univer-cursor-not-allowed univer-text-gray-200 dark:!univer-text-gray-700": editDisable }),
 						onClick: handleArrowClick,
-						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DropdownIcon, { className: (0, _univerjs_design.clsx)({ "univer-rotate-180": arrowDirection === 1 }) })
+						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_icons.DownIcon, { className: (0, _univerjs_design.clsx)({ "univer-rotate-180": arrowDirection === 1 }) })
 					})]
 				})]
 			}),
@@ -20460,7 +21083,7 @@ function SheetBarMenu() {
 //#endregion
 //#region src/views/sheet-bar/sheet-bar-tabs/SheetBarItem.tsx
 function SheetBarItem(props) {
-	const { sheetId, label, color, selected, className, onKeyDown, tabIndex } = props;
+	const { sheetId, label, color, selected, className, onKeyDown, onClick, tabIndex } = props;
 	const themeService = (0, _univerjs_ui.useDependency)(_univerjs_core.ThemeService);
 	const getTextColor = (color) => {
 		const darkTextColor = themeService.getColorFromTheme("gray.900");
@@ -20476,6 +21099,7 @@ function SheetBarItem(props) {
 		"aria-selected": currentSelected,
 		tabIndex: tabIndex !== null && tabIndex !== void 0 ? tabIndex : currentSelected ? 0 : -1,
 		onKeyDown,
+		onClick,
 		className: (0, _univerjs_design.clsx)("univer-mx-1 univer-box-border univer-flex univer-flex-grow univer-cursor-pointer univer-select-none univer-flex-row univer-items-center univer-rounded univer-text-xs univer-transition-[colors,box-shadow] focus-visible:univer-ring-2 focus-visible:univer-ring-primary-500", {
 			"dark:!univer-text-white": !color || color && !textColor,
 			"univer-justify-center univer-bg-white univer-font-bold univer-text-primary-700 univer-shadow": currentSelected,
@@ -20518,6 +21142,49 @@ function SheetBarTabsContextMenu(props) {
 	})] });
 }
 
+//#endregion
+//#region src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-drag-sort.ts
+function getMidline(item) {
+	return item.left + item.width / 2;
+}
+function calculateSheetTabDragSort(items, activeIndex, dragOffsetX) {
+	const itemOffsets = items.map(() => 0);
+	const activeItem = items[activeIndex];
+	if (!activeItem) return {
+		targetIndex: activeIndex,
+		itemOffsets
+	};
+	itemOffsets[activeIndex] = dragOffsetX;
+	const activeLeft = activeItem.left + dragOffsetX;
+	const activeRight = activeLeft + activeItem.width;
+	let targetIndex = activeIndex;
+	if (dragOffsetX > 0) {
+		for (let index = activeIndex + 1; index < items.length; index++) if (activeRight > getMidline(items[index])) {
+			itemOffsets[index] = -activeItem.width;
+			targetIndex = index;
+		}
+	} else if (dragOffsetX < 0) {
+		for (let index = activeIndex - 1; index >= 0; index--) if (activeLeft < getMidline(items[index])) {
+			itemOffsets[index] = activeItem.width;
+			targetIndex = index;
+		}
+	}
+	return {
+		targetIndex,
+		itemOffsets
+	};
+}
+function reorderItems(items, fromIndex, toIndex) {
+	if (fromIndex === toIndex || fromIndex < 0 || toIndex < 0 || fromIndex >= items.length || toIndex >= items.length) return [...items];
+	const nextItems = [...items];
+	const [movedItem] = nextItems.splice(fromIndex, 1);
+	nextItems.splice(toIndex, 0, movedItem);
+	return nextItems;
+}
+function getSheetTabTargetOrder(sheetOrder, visibleSheetIds, targetIndex) {
+	return sheetOrder.indexOf(visibleSheetIds[targetIndex]);
+}
+
 //#endregion
 //#region src/views/sheet-bar/sheet-bar-tabs/utils/animate.ts
 /**
@@ -20630,46 +21297,6 @@ var Animate = class {
 	}
 };
 
-//#endregion
-//#region src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-drag-sort.ts
-function getMidline(item) {
-	return item.left + item.width / 2;
-}
-function calculateSheetTabDragSort(items, activeIndex, dragOffsetX) {
-	const itemOffsets = items.map(() => 0);
-	const activeItem = items[activeIndex];
-	if (!activeItem) return {
-		targetIndex: activeIndex,
-		itemOffsets
-	};
-	itemOffsets[activeIndex] = dragOffsetX;
-	const activeLeft = activeItem.left + dragOffsetX;
-	const activeRight = activeLeft + activeItem.width;
-	let targetIndex = activeIndex;
-	if (dragOffsetX > 0) {
-		for (let index = activeIndex + 1; index < items.length; index++) if (activeRight > getMidline(items[index])) {
-			itemOffsets[index] = -activeItem.width;
-			targetIndex = index;
-		}
-	} else if (dragOffsetX < 0) {
-		for (let index = activeIndex - 1; index >= 0; index--) if (activeLeft < getMidline(items[index])) {
-			itemOffsets[index] = activeItem.width;
-			targetIndex = index;
-		}
-	}
-	return {
-		targetIndex,
-		itemOffsets
-	};
-}
-function reorderItems(items, fromIndex, toIndex) {
-	if (fromIndex === toIndex || fromIndex < 0 || toIndex < 0 || fromIndex >= items.length || toIndex >= items.length) return [...items];
-	const nextItems = [...items];
-	const [movedItem] = nextItems.splice(fromIndex, 1);
-	nextItems.splice(toIndex, 0, movedItem);
-	return nextItems;
-}
-
 //#endregion
 //#region src/views/sheet-bar/sheet-bar-tabs/utils/sheet-tab-name-editor.ts
 const MAX_SHEET_NAME_LENGTH = 31;
@@ -20839,7 +21466,7 @@ var SlideTabItem = class SlideTabItem {
 		startSheetTabNameEditor({
 			slideTabItem: this._slideTabItem,
 			canStart: () => this._slideTabBar.getConfig().onNameChangeCheck(),
-			checkName: (name) => this._slideTabBar.getConfig().onNameCheckAlert(name),
+			checkName: (name) => this._slideTabBar.getConfig().onNameCheckAlert(name, this.getId()),
 			setEditMode: (editing) => {
 				this._editMode = editing;
 			},
@@ -20848,8 +21475,12 @@ var SlideTabItem = class SlideTabItem {
 				this._slideTabBar.updateItems();
 			},
 			onCommit: (name, focusEvent) => {
-				this._slideTabBar.getConfig().onChangeName(this.getId(), name);
-				if (callback) callback(focusEvent);
+				try {
+					this._slideTabBar.getConfig().onChangeName(this.getId(), name);
+					if (callback) callback(focusEvent);
+				} finally {
+					this._slideTabBar.addListener();
+				}
 			}
 		});
 	}
@@ -20858,7 +21489,7 @@ var SlideTabItem = class SlideTabItem {
 		const input = this._slideTabItem.querySelector("span");
 		if (!input) return false;
 		const text = (_input$textContent = input.textContent) !== null && _input$textContent !== void 0 ? _input$textContent : "";
-		return this._slideTabBar.getConfig().onNameCheckAlert(text);
+		return this._slideTabBar.getConfig().onNameCheckAlert(text, this.getId());
 	}
 	animate() {
 		return {
@@ -21011,6 +21642,7 @@ var SlideTabBar = class SlideTabBar {
 		_defineProperty(this, "_downAction", void 0);
 		_defineProperty(this, "_wheelAction", void 0);
 		_defineProperty(this, "_scrollIncremental", 0);
+		_defineProperty(this, "_dragStartScrollX", 0);
 		_defineProperty(this, "_compareDirection", 0);
 		_defineProperty(this, "_autoScrollTime", null);
 		_defineProperty(this, "_slideScrollbar", void 0);
@@ -21043,7 +21675,6 @@ var SlideTabBar = class SlideTabBar {
 				var _this$_activeTabItem2, _this$_activeTabItem3;
 				(_this$_activeTabItem2 = this._activeTabItem) === null || _this$_activeTabItem2 === void 0 || _this$_activeTabItem2.removeEventListener("pointermove", this._moveAction);
 				(_this$_activeTabItem3 = this._activeTabItem) === null || _this$_activeTabItem3 === void 0 || _this$_activeTabItem3.removeEventListener("pointerup", this._upAction);
-				this.removeListener();
 				this._config.onChangeTab(downEvent, slideItemId);
 				return;
 			}
@@ -21051,6 +21682,7 @@ var SlideTabBar = class SlideTabBar {
 			this._downActionX = downEvent.pageX;
 			this._moveActionX = 0;
 			this._scrollIncremental = 0;
+			this._dragStartScrollX = this._slideScrollbar.getScrollX();
 			this._activeTabItem = this._slideTabItems[slideItemIndex];
 			if (!this._activeTabItem) {
 				console.error("Not found active slide-tab-item in sheet bar");
@@ -21087,23 +21719,29 @@ var SlideTabBar = class SlideTabBar {
 			}, SlideTabBar.LongPressDelay);
 		};
 		this._upAction = (upEvent) => {
-			var _this$_activeTabItem8, _this$_activeTabItem9, _this$_activeTabItem10, _this$_activeTabItem11;
-			if ((_this$_activeTabItem8 = this._activeTabItem) === null || _this$_activeTabItem8 === void 0 ? void 0 : _this$_activeTabItem8.isEditMode()) return;
+			var _this$_activeTabItem8, _this$_activeTabItem9, _this$_activeTabItem10;
 			if (this._longPressTimer) {
 				clearTimeout(this._longPressTimer);
 				this._longPressTimer = null;
 			}
 			if (!this._activeTabItem) return;
+			if (this._activeTabItem.isEditMode()) {
+				const activeSlideItemElement = this._activeTabItem.getSlideTabItem();
+				const pointerId = upEvent.pointerId;
+				if (pointerId != null && activeSlideItemElement.hasPointerCapture(pointerId)) activeSlideItemElement.releasePointerCapture(pointerId);
+				this._activeTabItem.removeEventListener("pointerup", this._upAction);
+				return;
+			}
 			const isFromScroll = this._autoScrollTime !== null;
 			this._closeAutoScroll();
 			this._activeTabItem.disableFixed();
 			this.updateItems();
-			const activeSlideItemElement = (_this$_activeTabItem9 = this._activeTabItem) === null || _this$_activeTabItem9 === void 0 ? void 0 : _this$_activeTabItem9.getSlideTabItem();
+			const activeSlideItemElement = (_this$_activeTabItem8 = this._activeTabItem) === null || _this$_activeTabItem8 === void 0 ? void 0 : _this$_activeTabItem8.getSlideTabItem();
 			if (!activeSlideItemElement) return;
 			activeSlideItemElement.style.cursor = "";
 			activeSlideItemElement.releasePointerCapture(upEvent.pointerId);
-			(_this$_activeTabItem10 = this._activeTabItem) === null || _this$_activeTabItem10 === void 0 || _this$_activeTabItem10.removeEventListener("pointermove", this._moveAction);
-			(_this$_activeTabItem11 = this._activeTabItem) === null || _this$_activeTabItem11 === void 0 || _this$_activeTabItem11.removeEventListener("pointerup", this._upAction);
+			(_this$_activeTabItem9 = this._activeTabItem) === null || _this$_activeTabItem9 === void 0 || _this$_activeTabItem9.removeEventListener("pointermove", this._moveAction);
+			(_this$_activeTabItem10 = this._activeTabItem) === null || _this$_activeTabItem10 === void 0 || _this$_activeTabItem10.removeEventListener("pointerup", this._upAction);
 			if (this._config.onSlideEnd && this._activeTabItemIndex !== this._compareIndex && isFromScroll) {
 				this.removeListener();
 				this._config.onSlideEnd(upEvent, this._compareIndex || 0);
@@ -21111,6 +21749,7 @@ var SlideTabBar = class SlideTabBar {
 			this._scrollIncremental = 0;
 			this._downActionX = 0;
 			this._moveActionX = 0;
+			this._dragStartScrollX = this._slideScrollbar.getScrollX();
 			this._compareIndex = 0;
 		};
 		this._moveAction = (moveEvent) => {
@@ -21147,9 +21786,9 @@ var SlideTabBar = class SlideTabBar {
 	* @param currentIndex
 	*/
 	update(currentIndex) {
+		this.removeListener();
 		this._config.currentIndex = currentIndex;
 		this._initConfig();
-		this.removeListener();
 		this.addListener();
 		this.scrollToItem(currentIndex);
 	}
@@ -21286,13 +21925,13 @@ var SlideTabBar = class SlideTabBar {
 		return scrollX;
 	}
 	calculateActiveTabItemScrollX() {
-		var _this$_activeTabItem12;
+		var _this$_activeTabItem11;
 		let scrollX = 0;
 		const padding = 4;
 		const containerRect = this._slideTabBar.getBoundingClientRect();
 		const containerLeftPosition = containerRect.left;
 		const containerRightPosition = containerRect.left + containerRect.width;
-		const itemReact = (_this$_activeTabItem12 = this._activeTabItem) === null || _this$_activeTabItem12 === void 0 ? void 0 : _this$_activeTabItem12.getSlideTabItem().getBoundingClientRect();
+		const itemReact = (_this$_activeTabItem11 = this._activeTabItem) === null || _this$_activeTabItem11 === void 0 ? void 0 : _this$_activeTabItem11.getSlideTabItem().getBoundingClientRect();
 		if (!itemReact) return 0;
 		const itemLeft = itemReact.left;
 		const itemWidth = itemReact.width;
@@ -21304,6 +21943,7 @@ var SlideTabBar = class SlideTabBar {
 		this.removeListener();
 		this._downActionX = 0;
 		this._moveActionX = 0;
+		this._dragStartScrollX = this._slideScrollbar.getScrollX();
 		this._compareDirection = 0;
 		this._compareIndex = 0;
 		this._slideTabItems = [];
@@ -21357,17 +21997,18 @@ var SlideTabBar = class SlideTabBar {
 	}
 	_updateDragSortState() {
 		if (!this._activeTabItem) return;
+		const dragSortOffsetX = this._moveActionX + this._slideScrollbar.getScrollX() - this._dragStartScrollX;
 		const dragSortResult = calculateSheetTabDragSort(this._slideTabItems.map((item) => ({
 			id: item.getId(),
 			left: item.getMidLine() - item.getWidth() / 2,
 			width: item.getWidth()
-		})), this._activeTabItemIndex, this._moveActionX);
+		})), this._activeTabItemIndex, dragSortOffsetX);
 		this._compareIndex = dragSortResult.targetIndex;
 		dragSortResult.itemOffsets.forEach((offset, index) => {
 			const item = this._slideTabItems[index];
 			if (!item) return;
 			if (item.equals(this._activeTabItem)) {
-				this._compareDirection = item.translateX(offset);
+				this._compareDirection = item.translateX(this._moveActionX);
 				return;
 			}
 			item.animate().translateX(offset);
@@ -21421,7 +22062,9 @@ function SheetBarTabs() {
 	const [contextMenuAnchorRect, setContextMenuAnchorRect] = (0, react.useState)(null);
 	const slideTabBarRef = (0, react.useRef)(null);
 	const slideTabBarContainerRef = (0, react.useRef)(null);
+	const activeSheetIdRef = (0, react.useRef)(activeSheetId);
 	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
+	const renderManagerService = (0, _univerjs_ui.useDependency)(_univerjs_engine_render.IRenderManagerService);
 	const sheetBarService = (0, _univerjs_ui.useDependency)(ISheetBarService);
 	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const confirmService = (0, _univerjs_ui.useDependency)(_univerjs_core.IConfirmService);
@@ -21430,6 +22073,7 @@ function SheetBarTabs() {
 	const rangeProtectionRuleModel = (0, _univerjs_ui.useDependency)(_univerjs_sheets.RangeProtectionRuleModel);
 	const permissionService = (0, _univerjs_ui.useDependency)(_univerjs_core.IPermissionService);
 	const workbook = useActiveWorkbook();
+	const workbookRef = (0, react.useRef)(workbook);
 	const resetOrder = (0, _univerjs_ui.useObservable)(worksheetProtectionRuleModel.resetOrder$);
 	const config = (0, _univerjs_ui.useConfigValue)(_univerjs_ui.UI_PLUGIN_CONFIG_KEY);
 	const showContextMenu = (_config$contextMenu = config === null || config === void 0 ? void 0 : config.contextMenu) !== null && _config$contextMenu !== void 0 ? _config$contextMenu : true;
@@ -21483,9 +22127,9 @@ function SheetBarTabs() {
 		openSheetNameErrorDialog("sheetNameSpecCharAlert", localeService.t("sheets-ui.sheetConfig.sheetNameSpecCharError"));
 		return true;
 	}, [localeService, openSheetNameErrorDialog]);
-	const nameRepeatCheck = (0, react.useCallback)((name) => {
-		var _workbook$getActiveSh;
-		if (((_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getName()) === name) return false;
+	const nameRepeatCheck = (0, react.useCallback)((name, subUnitId) => {
+		var _workbook$getSheetByS, _workbook$getActiveSh;
+		if ((subUnitId ? (_workbook$getSheetByS = workbook.getSheetBySheetId(subUnitId)) === null || _workbook$getSheetByS === void 0 ? void 0 : _workbook$getSheetByS.getName() : (_workbook$getActiveSh = workbook.getActiveSheet()) === null || _workbook$getActiveSh === void 0 ? void 0 : _workbook$getActiveSh.getName()) === name) return false;
 		if (!workbook.checkSheetName(name)) return false;
 		const id = "sheetNameRepeatAlert";
 		confirmService.open({
@@ -21576,6 +22220,34 @@ function SheetBarTabs() {
 			rightEnd: slideTabBar.isRightEnd()
 		});
 	}, [sheetBarService]);
+	(0, react.useEffect)(() => {
+		activeSheetIdRef.current = activeSheetId;
+	}, [activeSheetId]);
+	(0, react.useEffect)(() => {
+		workbookRef.current = workbook;
+	}, [workbook]);
+	const syncActiveSheetRender = (0, react.useCallback)((subUnitId) => {
+		const render = renderManagerService.getRenderById(workbookRef.current.getUnitId());
+		try {
+			render === null || render === void 0 || render.with(SheetSkeletonManagerService).setCurrent({ sheetId: subUnitId });
+			render === null || render === void 0 || render.scene.makeDirty(true);
+			render === null || render === void 0 || render.scene.render();
+		} catch {}
+	}, [renderManagerService]);
+	const activateSheetTab = (0, react.useCallback)((subUnitId) => {
+		if (!subUnitId || subUnitId === activeSheetIdRef.current) return;
+		commandService.executeCommand(_univerjs_sheets.SetWorksheetActiveOperation.id, {
+			subUnitId,
+			unitId: workbookRef.current.getUnitId()
+		}).then((result) => {
+			if (result !== false) return;
+			const worksheet = workbookRef.current.getSheetBySheetId(subUnitId);
+			if (worksheet) {
+				workbookRef.current.setActiveSheet(worksheet);
+				syncActiveSheetRender(subUnitId);
+			}
+		});
+	}, [commandService, syncActiveSheetRender]);
 	const observeResize = (0, react.useCallback)((slideTabBar) => {
 		var _slideTabBarContainer;
 		const slideTabBarContainer = (_slideTabBarContainer = slideTabBarContainerRef.current) === null || _slideTabBarContainer === void 0 ? void 0 : _slideTabBarContainer.querySelector("[data-u-comp=slide-tab-bar]");
@@ -21684,8 +22356,8 @@ function SheetBarTabs() {
 			slideTabBarContainer: slideTabBarContainerRef.current,
 			currentIndex: 0,
 			onChangeName: (subUnitId, worksheetName) => {
-				var _workbook$getSheetByS;
-				if (((_workbook$getSheetByS = workbook.getSheetBySheetId(subUnitId)) === null || _workbook$getSheetByS === void 0 ? void 0 : _workbook$getSheetByS.getName()) === worksheetName) {
+				var _workbook$getSheetByS2;
+				if (((_workbook$getSheetByS2 = workbook.getSheetBySheetId(subUnitId)) === null || _workbook$getSheetByS2 === void 0 ? void 0 : _workbook$getSheetByS2.getName()) === worksheetName) {
 					updateSheetItems();
 					return;
 				}
@@ -21695,7 +22367,8 @@ function SheetBarTabs() {
 				});
 			},
 			onSlideEnd: async (event, order) => {
-				await commandService.executeCommand(_univerjs_sheets.SetWorksheetOrderCommand.id, { order });
+				const targetOrder = getSheetTabTargetOrder(workbook.getSheetOrders(), workbook.getUnhiddenWorksheets(), order);
+				await commandService.executeCommand(_univerjs_sheets.SetWorksheetOrderCommand.id, { order: targetOrder });
 			},
 			onChangeTab: (_event, subUnitId) => {
 				commandService.executeCommand(_univerjs_sheets.SetWorksheetActiveOperation.id, {
@@ -21706,8 +22379,8 @@ function SheetBarTabs() {
 			onScroll: (state) => {
 				sheetBarService.setScroll(state);
 			},
-			onNameCheckAlert: (name) => {
-				return nameEmptyCheck(name) || sheetNameSpecCharCheck(name) || nameRepeatCheck(name);
+			onNameCheckAlert: (name, subUnitId) => {
+				return nameEmptyCheck(name) || sheetNameSpecCharCheck(name) || nameRepeatCheck(name, subUnitId);
 			},
 			onNameChangeCheck: canRenameActiveSheet
 		});
@@ -21741,6 +22414,9 @@ function SheetBarTabs() {
 		const renameSubscription = sheetBarService.renameId$.subscribe(() => {
 			setTabEditor();
 		});
+		const activeSheetSubscription = workbook.activeSheet$.subscribe(() => {
+			updateSheetItems();
+		});
 		return () => {
 			commandDisposable.dispose();
 			slideTabBar.destroy();
@@ -21748,6 +22424,7 @@ function SheetBarTabs() {
 			scrollSubscription.unsubscribe();
 			scrollXSubscription.unsubscribe();
 			renameSubscription.unsubscribe();
+			activeSheetSubscription.unsubscribe();
 			disconnectResizeObserver === null || disconnectResizeObserver === void 0 || disconnectResizeObserver();
 		};
 	}, [
@@ -21766,6 +22443,19 @@ function SheetBarTabs() {
 		const currentIndex = sheetList.findIndex((item) => item.sheetId === activeSheetId);
 		(_slideTabBarRef$curre5 = slideTabBarRef.current) === null || _slideTabBarRef$curre5 === void 0 || _slideTabBarRef$curre5.update(currentIndex >= 0 ? currentIndex : 0);
 	}, [activeSheetId, sheetList]);
+	(0, react.useEffect)(() => {
+		const handlePointerDownCapture = (event) => {
+			var _tabElement$getAttrib;
+			const container = slideTabBarContainerRef.current;
+			const target = event.target;
+			if (!container || !(target instanceof Element)) return;
+			const tabElement = target.closest("[data-u-comp=slide-tab-item]");
+			if (!tabElement || !container.contains(tabElement)) return;
+			activateSheetTab((_tabElement$getAttrib = tabElement.getAttribute("data-id")) !== null && _tabElement$getAttrib !== void 0 ? _tabElement$getAttrib : void 0);
+		};
+		document.addEventListener("pointerdown", handlePointerDownCapture, true);
+		return () => document.removeEventListener("pointerdown", handlePointerDownCapture, true);
+	}, [activateSheetTab]);
 	(0, react.useEffect)(() => {
 		const subscription = (0, rxjs.merge)(worksheetProtectionRuleModel.ruleChange$, rangeProtectionRuleModel.ruleChange$).subscribe(() => {
 			updateSheetItems();
@@ -21865,7 +22555,8 @@ const SheetBar = () => {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetBarTabs, {}),
 			(!leftScrollState || !rightScrollState) && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "univer-relative univer-flex univer-items-center univer-px-2 after:univer-absolute after:univer-right-0 after:univer-top-1/2 after:univer-h-4 after:univer-w-px after:-univer-translate-y-1/2 after:univer-bg-gray-200 after:univer-content-[\"\"]",
+				"data-u-comp": "sheet-bar-scroll-buttons",
+				className: "univer-relative univer-flex univer-items-center univer-px-2 after:univer-absolute after:univer-right-0 after:univer-top-1/2 after:univer-h-4 after:univer-w-px after:-univer-translate-y-1/2 after:univer-bg-gray-200 after:univer-content-[\"\"] rtl:univer-flex-row-reverse rtl:after:univer-left-0 rtl:after:univer-right-auto",
 				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetBarButton, {
 					disabled: leftScrollState,
 					onClick: handleScrollLeft,
@@ -22112,31 +22803,52 @@ function RenderSheetFooter() {
 	const config = (0, _univerjs_ui.useConfigValue)(SHEETS_UI_PLUGIN_CONFIG_KEY);
 	const menuManagerService = (0, _univerjs_ui.useDependency)(_univerjs_ui.IMenuManagerService);
 	const showFooter = (_config$footer = config === null || config === void 0 ? void 0 : config.footer) !== null && _config$footer !== void 0 ? _config$footer : true;
-	if (!useActiveWorkbook() || !showFooter) return null;
+	const workbook = useActiveWorkbook();
+	const activeWorkbookEmbeddedRender = useActiveWorkbookIsEmbeddedRender(workbook);
+	const focusedUnitType = useFocusedUnitType();
+	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;
 	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) || {};
-	if (!sheetBar && !statisticBar && !menus && !zoomSlider) return null;
+	const showStatisticBar = activeEmbedTab ? false : statisticBar;
+	const showMenus = activeEmbedTab ? false : menus;
+	const showZoomSlider = activeEmbedTab ? false : zoomSlider;
+	if (!sheetBar && !showStatisticBar && !showMenus && !showZoomSlider) return null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
 		className: "univer-box-border univer-grid univer-w-full univer-grid-flow-col univer-grid-cols-[1fr,auto,auto,auto] univer-items-center univer-justify-between univer-bg-white univer-px-5 univer-text-gray-900 dark:!univer-bg-gray-900 dark:!univer-text-gray-200",
 		style: { height: 36 },
 		"data-range-selector": true,
 		children: [
 			sheetBar && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetBar, {}),
-			statisticBar && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusBar, {}),
-			menus && footerMenus.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+			showStatisticBar && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(StatusBar, {}),
+			showMenus && footerMenus.length > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "univer-box-border univer-flex univer-gap-2 univer-px-2",
 				children: footerMenus.map((item) => {
 					var _item$children;
 					return (_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.map((child) => (child === null || child === void 0 ? void 0 : child.item) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_ui.ToolbarItem, { ...child.item }, child.key));
 				})
 			}),
-			zoomSlider && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetZoomSlider, {})
+			showZoomSlider && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SheetZoomSlider, {})
 		]
 	});
 }
 function RenderSheetHeader() {
 	const config = (0, _univerjs_ui.useConfigValue)(SHEETS_UI_PLUGIN_CONFIG_KEY);
-	if (!useHasWorkbook()) return null;
+	const workbook = useActiveWorkbook();
+	const hasWorkbook = !!workbook;
+	const activeWorkbookEmbeddedRender = useActiveWorkbookIsEmbeddedRender(workbook);
+	const focusedUnitType = useFocusedUnitType();
+	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-white dark:!univer-border-gray-700 dark:!univer-bg-gray-900",
+		"data-u-comp": "formula-bar-placeholder"
+	});
 	if ((config === null || config === void 0 ? void 0 : config.formulaBar) !== false) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(FormulaBar, {});
 	return null;
 }
@@ -22144,19 +22856,108 @@ function RenderSheetHeader() {
 * @deprecated We should not write into this component anymore.
 */
 function RenderSheetContent() {
+	var _componentManager$get;
 	const config = (0, _univerjs_ui.useConfigValue)(SHEETS_UI_PLUGIN_CONFIG_KEY);
 	const hasWorkbook = useHasWorkbook();
-	const ShapeTextEditorContainer = (0, _univerjs_ui.useDependency)(_univerjs_ui.ComponentManager).get("ShapeTextEditorContainer");
+	const componentManager = (0, _univerjs_ui.useDependency)(_univerjs_ui.ComponentManager);
+	const workbook = useActiveWorkbook();
+	const activeEmbedTab = useActiveSheetEmbedTabData(workbook);
+	const injector = (0, _univerjs_ui.useDependency)(_univerjs_core.Injector);
+	const activeWorkbookEmbeddedRender = useActiveWorkbookIsEmbeddedRender(workbook);
+	const ShapeTextEditorContainer = (_componentManager$get = componentManager.get("SheetShapeTextEditorContainer")) !== null && _componentManager$get !== void 0 ? _componentManager$get : componentManager.get("ShapeTextEditorContainer");
+	(0, react.useEffect)(() => {
+		var _tryGetSheetEmbedRunt;
+		if (!workbook || activeEmbedTab || activeWorkbookEmbeddedRender) return;
+		const instanceService = injector.get(_univerjs_core.IUniverInstanceService);
+		instanceService.setCurrentUnitForType(workbook.getUnitId());
+		instanceService.focusUnit(workbook.getUnitId());
+		(_tryGetSheetEmbedRunt = tryGetSheetEmbedRuntimeService(injector)) === null || _tryGetSheetEmbedRunt === void 0 || _tryGetSheetEmbedRunt.clearTab();
+	}, [
+		activeEmbedTab,
+		activeWorkbookEmbeddedRender,
+		injector,
+		workbook
+	]);
 	if (!hasWorkbook) return null;
+	if (activeWorkbookEmbeddedRender) return null;
+	if (activeEmbedTab && workbook) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(RenderSheetEmbedTabHost, {
+		workbook,
+		worksheet: activeEmbedTab.worksheet
+	});
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
 		ShapeTextEditorContainer && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(ShapeTextEditorContainer, {}),
 		!(config === null || config === void 0 ? void 0 : config.disableEdit) && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(EditorContainer, {}),
 		/* @__PURE__ */ (0, react_jsx_runtime.jsx)(AutoFillPopupMenu, {})
 	] });
 }
+function RenderSheetEmbedTabHost(props) {
+	const { workbook, worksheet } = props;
+	const injector = (0, _univerjs_ui.useDependency)(_univerjs_core.Injector);
+	const embedData = getEmbedSheetsTabCustomData(worksheet.getConfig());
+	const hostUnitId = workbook.getUnitId();
+	const hostAnchorId = embedData === null || embedData === void 0 ? void 0 : embedData.hostAnchorId;
+	const embedId = embedData === null || embedData === void 0 ? void 0 : embedData.embedId;
+	(0, react.useEffect)(() => {
+		if (!embedId || !hostAnchorId) return;
+		const embedRuntimeService = tryGetSheetEmbedRuntimeService(injector);
+		if (!embedRuntimeService) return;
+		try {
+			const disposable = embedRuntimeService.mountSheetTab({
+				hostUnitId,
+				hostAnchorId,
+				embedId
+			});
+			return () => {
+				disposable === null || disposable === void 0 || disposable.dispose();
+			};
+		} catch (error) {
+			console.warn("[sheets-ui] failed to mount embedded sheet-tab block", error);
+		}
+	}, [
+		embedId,
+		hostAnchorId,
+		hostUnitId,
+		injector
+	]);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		"data-embed-sheets-sheet-tab-host": hostAnchorId,
+		className: "univer-absolute univer-inset-0 univer-z-40 univer-bg-white dark:!univer-bg-gray-900"
+	});
+}
 function useHasWorkbook() {
 	const univerInstanceService = (0, _univerjs_ui.useDependency)(_univerjs_core.IUniverInstanceService);
-	return (0, react.useMemo)(() => univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).length > 0, [univerInstanceService, !!(0, _univerjs_ui.useObservable)(() => univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET), null, false, [])]);
+	const workbook = (0, _univerjs_ui.useObservable)(() => univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET), null, false, []);
+	return (0, react.useMemo)(() => !!workbook, [workbook]);
+}
+function useActiveWorkbookIsEmbeddedRender(workbook) {
+	const univerInstanceService = (0, _univerjs_ui.useDependency)(_univerjs_core.IUniverInstanceService);
+	return (0, react.useMemo)(() => {
+		var _univerInstanceServic;
+		if (!workbook) return false;
+		return ((_univerInstanceServic = univerInstanceService.getUnitCreateOptions(workbook.getUnitId())) === null || _univerInstanceServic === void 0 ? void 0 : _univerInstanceServic.embeddedRender) === true;
+	}, [univerInstanceService, workbook]);
+}
+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)(() => {
+		var _focusedUnit$type;
+		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$type = focusedUnit === null || focusedUnit === void 0 ? void 0 : focusedUnit.type) !== null && _focusedUnit$type !== void 0 ? _focusedUnit$type : null;
+	}, [focusedUnitId, univerInstanceService]);
+}
+function useActiveSheetEmbedTabData(workbook) {
+	const worksheet = useActiveWorksheet(workbook);
+	return worksheet && getEmbedSheetsTabCustomData(worksheet.getConfig()) ? { worksheet } : void 0;
+}
+function tryGetSheetEmbedRuntimeService(injector) {
+	try {
+		return injector.get(ISheetEmbedRuntimeService);
+	} catch {
+		return;
+	}
 }
 
 //#endregion
@@ -22727,10 +23528,8 @@ let SheetUIController = class SheetUIController extends _univerjs_core.Disposabl
 	}
 	_initFocusHandler() {
 		this.disposeWithMe(this._layoutService.registerFocusHandler(_univerjs_core.UniverInstanceType.UNIVER_SHEET, (_unitId) => {
-			const renderManagerService = this._injector.get(_univerjs_engine_render.IRenderManagerService);
-			const instanceService = this._injector.get(_univerjs_core.IUniverInstanceService);
-			const currentEditorRender = (0, _univerjs_engine_render.getCurrentTypeOfRenderer)(_univerjs_core.UniverInstanceType.UNIVER_DOC, instanceService, renderManagerService);
-			const docSelectionRenderService = currentEditorRender === null || currentEditorRender === void 0 ? void 0 : currentEditorRender.with(_univerjs_docs_ui.DocSelectionRenderService);
+			const cellEditorRender = this._injector.get(_univerjs_engine_render.IRenderManagerService).getRenderById(_univerjs_core.DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+			const docSelectionRenderService = cellEditorRender === null || cellEditorRender === void 0 ? void 0 : cellEditorRender.with(_univerjs_docs_ui.DocSelectionRenderService);
 			docSelectionRenderService === null || docSelectionRenderService === void 0 || docSelectionRenderService.focus();
 		}));
 	}
@@ -22771,7 +23570,7 @@ const useHighlightRange = (ranges = []) => {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-ui";
-var version = "1.0.0-alpha.1";
+var version = "1.0.0-alpha.3";
 
 //#endregion
 //#region src/controllers/cell-alert.controller.ts
@@ -22817,6 +23616,7 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 		this._selectionManagerService = _selectionManagerService;
 		_defineProperty(this, "_popupMenuFeatureMap", /* @__PURE__ */ new Map());
 		_defineProperty(this, "_popupMenuOffsetMap", /* @__PURE__ */ new Map());
+		_defineProperty(this, "_popupDisposables", /* @__PURE__ */ new Set());
 		_defineProperty(this, "_isSelectionMoving", false);
 		this._initMoving();
 	}
@@ -22865,6 +23665,8 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 		if (callback) return callback(unitId, subUnitId, drawingId, drawingType);
 	}
 	dispose() {
+		Array.from(this._popupDisposables).forEach((disposable) => disposable.dispose());
+		this._popupDisposables.clear();
 		super.dispose();
 		this._popupMenuFeatureMap.clear();
 		this._popupMenuOffsetMap.clear();
@@ -22995,20 +23797,25 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			bottom: top + height
 		};
 		const { position, position$, disposable } = this._createPositionObserver(bound, currentRender, skeleton, worksheet);
+		const popupInjector = this._resolveEmbeddedPopupInjector(unitId, currentRender);
 		const id = this._globalPopupManagerService.addPopup({
 			...popup,
 			unitId,
 			subUnitId,
+			connectorInjector: popupInjector,
 			anchorRect: position,
 			anchorRect$: position$,
 			canvasElement: currentRender.engine.getCanvasElement()
 		});
+		const disposableCollection = new _univerjs_core.DisposableCollection();
+		disposableCollection.add(disposable);
+		disposableCollection.add((0, _univerjs_core.toDisposable)(() => {
+			this._globalPopupManagerService.removePopup(id);
+			position$.complete();
+		}));
+		const trackedDisposable = this._trackPopupDisposable(disposableCollection);
 		return {
-			dispose: () => {
-				this._globalPopupManagerService.removePopup(id);
-				position$.complete();
-				disposable.dispose();
-			},
+			dispose: () => trackedDisposable.dispose(),
 			canDispose: () => this._globalPopupManagerService.activePopupId !== id
 		};
 	}
@@ -23032,28 +23839,42 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			skeleton,
 			currentRender
 		});
+		const popupInjector = this._resolveEmbeddedPopupInjector(unitId, currentRender);
 		const id = this._globalPopupManagerService.addPopup({
 			...popup,
 			unitId,
 			subUnitId,
+			connectorInjector: popupInjector,
 			anchorRect: position,
 			anchorRect$: position$,
 			hiddenRects$: rects$,
 			canvasElement: currentRender.engine.getCanvasElement()
 		});
+		const disposableCollection = new _univerjs_core.DisposableCollection();
+		disposableCollection.add(disposable);
+		disposableCollection.add(rectsObserverDisposable);
+		disposableCollection.add((0, _univerjs_core.toDisposable)(() => {
+			this._globalPopupManagerService.removePopup(id);
+			position$.complete();
+			workbook = null;
+			worksheet = null;
+		}));
+		const trackedDisposable = this._trackPopupDisposable(disposableCollection);
 		return {
-			dispose: () => {
-				this._globalPopupManagerService.removePopup(id);
-				position$.complete();
-				disposable.dispose();
-				rectsObserverDisposable.dispose();
-				workbook = null;
-				worksheet = null;
-			},
+			dispose: () => trackedDisposable.dispose(),
 			canDispose: () => this._globalPopupManagerService.activePopupId !== id
 		};
 	}
 	attachPopupToAbsolutePosition(bound, popup, _unitId, _subUnitId) {
+		const position$ = new rxjs.BehaviorSubject(bound);
+		const disposable = this._attachAbsolutePopup(bound, position$.asObservable(), popup, _unitId, _subUnitId, () => position$.complete());
+		if (!disposable) position$.complete();
+		return disposable;
+	}
+	attachPopupToDynamicAbsolutePosition(bound, anchorRect$, popup, _unitId, _subUnitId) {
+		return this._attachAbsolutePopup(bound, anchorRect$, popup, _unitId, _subUnitId);
+	}
+	_attachAbsolutePopup(bound, anchorRect$, popup, _unitId, _subUnitId, onDispose) {
 		var _this$_renderManagerS3;
 		const workbook = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET);
 		const worksheet = workbook.getActiveSheet();
@@ -23065,20 +23886,24 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 		const currentRender = this._renderManagerService.getRenderById(unitId);
 		if (!currentRender || !skeleton) return null;
 		if (this._isSelectionMoving && !popup.showOnSelectionMoving) return;
-		const position$ = new rxjs.BehaviorSubject(bound);
+		const popupInjector = this._resolveEmbeddedPopupInjector(unitId, currentRender);
 		const id = this._globalPopupManagerService.addPopup({
 			...popup,
 			unitId,
 			subUnitId,
+			connectorInjector: popupInjector,
 			anchorRect: bound,
-			anchorRect$: position$.asObservable(),
+			anchorRect$,
 			canvasElement: currentRender.engine.getCanvasElement()
 		});
+		const disposableCollection = new _univerjs_core.DisposableCollection();
+		disposableCollection.add((0, _univerjs_core.toDisposable)(() => {
+			this._globalPopupManagerService.removePopup(id);
+			onDispose === null || onDispose === void 0 || onDispose();
+		}));
+		const trackedDisposable = this._trackPopupDisposable(disposableCollection);
 		return {
-			dispose: () => {
-				this._globalPopupManagerService.removePopup(id);
-				position$.complete();
-			},
+			dispose: () => trackedDisposable.dispose(),
 			canDispose: () => this._globalPopupManagerService.activePopupId !== id
 		};
 	}
@@ -23115,10 +23940,12 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			skeleton,
 			currentRender
 		});
+		const popupInjector = this._resolveEmbeddedPopupInjector(unitId, currentRender);
 		const id = this._globalPopupManagerService.addPopup({
 			...popup,
 			unitId,
 			subUnitId,
+			connectorInjector: popupInjector,
 			anchorRect: position,
 			anchorRect$: position$,
 			canvasElement: currentRender.engine.getCanvasElement(),
@@ -23137,13 +23964,14 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			startColumn: col,
 			endColumn: col
 		};
+		const trackedDisposable = this._trackPopupDisposable(disposableCollection);
 		disposableCollection.add(this._refRangeService.watchRange(unitId, subUnitId, watchedRange, (_, after) => {
-			if (!after) disposableCollection.dispose();
+			if (!after) trackedDisposable.dispose();
 			else updateRowCol(after.startRow, after.startColumn);
 		}));
 		return {
 			dispose() {
-				disposableCollection.dispose();
+				trackedDisposable.dispose();
 				worksheet = null;
 				workbook = null;
 			},
@@ -23181,10 +24009,12 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			skeleton,
 			currentRender
 		});
+		const popupInjector = this._resolveEmbeddedPopupInjector(unitId, currentRender);
 		const id = this._globalPopupManagerService.addPopup({
 			...popup,
 			unitId,
 			subUnitId,
+			connectorInjector: popupInjector,
 			anchorRect: position,
 			anchorRect$: position$,
 			canvasElement: currentRender.engine.getCanvasElement(),
@@ -23199,17 +24029,34 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 		}));
 		disposableCollection.add(rectsObserverDisposable);
 		const watchedRange = { ...range };
+		const trackedDisposable = this._trackPopupDisposable(disposableCollection);
 		disposableCollection.add(this._refRangeService.watchRange(unitId, subUnitId, watchedRange, (_, after) => {
-			if (!after) disposableCollection.dispose();
+			if (!after) trackedDisposable.dispose();
 			else updateRange(after);
 		}));
 		return {
 			dispose() {
-				disposableCollection.dispose();
+				trackedDisposable.dispose();
 			},
 			canDispose: () => this._globalPopupManagerService.activePopupId !== id
 		};
 	}
+	_resolveEmbeddedPopupInjector(unitId, currentRender) {
+		var _this$_univerInstance, _currentRender$getInj;
+		return ((_this$_univerInstance = this._univerInstanceService.getUnitCreateOptions(unitId)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.embeddedRender) === true ? (_currentRender$getInj = currentRender.getInjector) === null || _currentRender$getInj === void 0 ? void 0 : _currentRender$getInj.call(currentRender) : void 0;
+	}
+	_trackPopupDisposable(disposable) {
+		let disposed = false;
+		const trackedDisposables = this._popupDisposables;
+		const trackedDisposable = { dispose: () => {
+			if (disposed) return;
+			disposed = true;
+			trackedDisposables.delete(trackedDisposable);
+			disposable.dispose();
+		} };
+		trackedDisposables.add(trackedDisposable);
+		return { dispose: () => trackedDisposable.dispose() };
+	}
 	/**
 	*
 	* @param initialRow
@@ -23225,7 +24072,10 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 		const position$ = new rxjs.BehaviorSubject(position);
 		const updatePosition = () => position$.next(this._calcCellPositionByCell(row, col, currentRender, skeleton, activeViewport));
 		const disposable = new _univerjs_core.DisposableCollection();
-		disposable.add(currentRender.engine.clientRect$.subscribe(() => updatePosition()));
+		disposable.add(currentRender.engine.clientRect$.subscribe({
+			next: () => updatePosition(),
+			error: () => {}
+		}));
 		disposable.add((0, _univerjs_core.fromEventSubject)(currentRender.engine.onTransformChange$).pipe((0, rxjs.throttleTime)(16)).subscribe(() => updatePosition()));
 		disposable.add(this._commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id === _univerjs_sheets.SetWorksheetRowAutoHeightMutation.id) {
@@ -23302,7 +24152,10 @@ let SheetCanvasPopManagerService = class SheetCanvasPopManagerService extends _u
 			rightBottomPos$.next(rightBottomCoord);
 		};
 		const disposable = new _univerjs_core.DisposableCollection();
-		disposable.add(currentRender.engine.clientRect$.subscribe(() => updatePosition()));
+		disposable.add(currentRender.engine.clientRect$.subscribe({
+			next: () => updatePosition(),
+			error: () => {}
+		}));
 		disposable.add(this._commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id === _univerjs_sheets.SetWorksheetRowAutoHeightMutation.id) {
 				if (commandInfo.params.rowsAutoHeightInfo.findIndex((item) => item.row === startRow) > -1) {
@@ -23474,6 +24327,23 @@ let CellPopupManagerService = class CellPopupManagerService extends _univerjs_co
 		}
 		if (!cache.horizontal && !cache.vertical) subUnitMap.realDeleteValue(row, col);
 	}
+	hidePopupsForUnit(unitId, subUnitId) {
+		const unitMap = this._cellPopupMap.get(unitId);
+		if (!unitMap) return;
+		const targets = [];
+		(subUnitId ? [[subUnitId, unitMap.get(subUnitId)]] : [...unitMap.entries()]).forEach(([currentSubUnitId, subUnitMap]) => {
+			subUnitMap === null || subUnitMap === void 0 || subUnitMap.forValue((row, col) => {
+				targets.push({
+					subUnitId: currentSubUnitId,
+					row,
+					col
+				});
+			});
+		});
+		targets.forEach((target) => this.hidePopup(unitId, target.subUnitId, target.row, target.col));
+		if (subUnitId) unitMap.delete(subUnitId);
+		else this._cellPopupMap.delete(unitId);
+	}
 };
 CellPopupManagerService = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(SheetCanvasPopManagerService))], CellPopupManagerService);
 
@@ -24112,56 +24982,6 @@ function BorderLine(props) {
 
 //#endregion
 //#region src/views/border-panel/BorderPanel.tsx
-const BORDER_SIZE_CHILDREN = [
-	{
-		label: _univerjs_core.BorderStyleTypes.THIN,
-		value: _univerjs_core.BorderStyleTypes.THIN
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.HAIR,
-		value: _univerjs_core.BorderStyleTypes.HAIR
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.DOTTED,
-		value: _univerjs_core.BorderStyleTypes.DOTTED
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.DASHED,
-		value: _univerjs_core.BorderStyleTypes.DASHED
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.DASH_DOT,
-		value: _univerjs_core.BorderStyleTypes.DASH_DOT
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.DASH_DOT_DOT,
-		value: _univerjs_core.BorderStyleTypes.DASH_DOT_DOT
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.MEDIUM,
-		value: _univerjs_core.BorderStyleTypes.MEDIUM
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.MEDIUM_DASHED,
-		value: _univerjs_core.BorderStyleTypes.MEDIUM_DASHED
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT,
-		value: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT_DOT,
-		value: _univerjs_core.BorderStyleTypes.MEDIUM_DASH_DOT_DOT
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.THICK,
-		value: _univerjs_core.BorderStyleTypes.THICK
-	},
-	{
-		label: _univerjs_core.BorderStyleTypes.DOUBLE,
-		value: _univerjs_core.BorderStyleTypes.DOUBLE
-	}
-];
 function getBorderColor(borderData) {
 	if (!borderData) return;
 	for (const key in borderData) {
@@ -24182,7 +25002,9 @@ function BorderPanel(props) {
 	var _value$color;
 	const iconManager = (0, _univerjs_ui.useDependency)(_univerjs_ui.IconManager);
 	const borderStyleManagerService = (0, _univerjs_ui.useDependency)(_univerjs_sheets.BorderStyleManagerService);
-	const { isAllValuesSame, value: currentValue } = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetsSelectionsService).getCellStylesProperty("bd");
+	const selectionManagerService = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetsSelectionsService);
+	const { direction } = (0, react.useContext)(_univerjs_design.ConfigContext);
+	const { isAllValuesSame, value: currentValue } = selectionManagerService.getCellStylesProperty("bd");
 	const color = isAllValuesSame ? getBorderColor(currentValue) : void 0;
 	const type = isAllValuesSame ? getBorderStyle(currentValue) : void 0;
 	const { onChange, value } = props;
@@ -24197,6 +25019,7 @@ function BorderPanel(props) {
 		return Icon && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(Icon, { className: "univer-fill-primary-600" });
 	}
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("section", {
+		dir: direction,
 		className: "univer-box-border univer-grid univer-gap-2 univer-p-1.5",
 		children: [
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -26072,7 +26895,7 @@ let ComponentsController = class ComponentsController extends _univerjs_core.Dis
 			DeleteRowDoubleIcon: _univerjs_icons.DeleteRowDoubleIcon,
 			DownBorderDoubleIcon: _univerjs_icons.DownBorderDoubleIcon,
 			DownloadImageIcon: _univerjs_icons.DownloadImageIcon,
-			EyeOutlineIcon: _univerjs_icons.EyeOutlineIcon,
+			EyeIcon: _univerjs_icons.EyeIcon,
 			FontColorDoubleIcon: _univerjs_icons.FontColorDoubleIcon,
 			FontSizeIncreaseIcon: _univerjs_icons.FontSizeIncreaseIcon,
 			FontSizeReduceIcon: _univerjs_icons.FontSizeReduceIcon,
@@ -28644,7 +29467,7 @@ let MobileSheetsScrollRenderController = class MobileSheetsScrollRenderControlle
 		this.disposeWithMe(viewportMain.onScrollByBar$.subscribeEvent((param) => {
 			var _this$_sheetSkeletonM4;
 			const skeleton = (_this$_sheetSkeletonM4 = this._sheetSkeletonManagerService.getCurrentParam()) === null || _this$_sheetSkeletonM4 === void 0 ? void 0 : _this$_sheetSkeletonM4.skeleton;
-			if (skeleton == null || param.isTrigger === false) return;
+			if (skeleton == null || param.isTrigger === false || param.isBarDragging && !param.isBarDragEnd) return;
 			const sheetObject = this._getSheetObject();
 			if (skeleton == null || sheetObject == null) return;
 			const { viewportScrollX = 0, viewportScrollY = 0 } = param;
@@ -29519,7 +30342,7 @@ function getListDropdownValue(value, multiple) {
 //#endregion
 //#region src/views/dropdown/ListDropDown.tsx
 function SelectList(props) {
-	const { value, onChange, multiple, options, title, onEdit, style, location, showEdit: showEditOnDropdown, showSearch: showSearchOnDropdown } = props;
+	const { value, onChange, multiple, options, onEdit, style, location, showEdit: showEditOnDropdown, showSearch: showSearchOnDropdown } = props;
 	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const { row, col, unitId, subUnitId } = location;
 	const searchRef = (0, react.useRef)(null);
@@ -29575,7 +30398,7 @@ function SelectList(props) {
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: "univer-px-3.5 univer-py-1 univer-pt-2 univer-text-xs",
-				children: title
+				children: localeService.t(multiple ? "sheets-ui.data-validation.listMultiple.dropdown" : "sheets-ui.data-validation.list.dropdown")
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
 				className: (0, _univerjs_design.clsx)("univer-flex univer-max-h-52 univer-flex-col univer-gap-1 univer-overflow-y-auto univer-px-2 univer-py-1", _univerjs_design.scrollbarClassName),
@@ -29634,7 +30457,6 @@ function ListDropDown(props) {
 	const { location, hideFn, onChange, onEdit, options, defaultValue, multiple, showSearch, showEdit } = extraProps;
 	const { worksheet } = location;
 	if (!worksheet) return null;
-	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const [localValue, setLocalValue] = (0, react.useState)(defaultValue);
 	const cellWidth = ((_anchorRect$right = anchorRect === null || anchorRect === void 0 ? void 0 : anchorRect.right) !== null && _anchorRect$right !== void 0 ? _anchorRect$right : 0) - ((_anchorRect$left = anchorRect === null || anchorRect === void 0 ? void 0 : anchorRect.left) !== null && _anchorRect$left !== void 0 ? _anchorRect$left : 0);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(SelectList, {
@@ -29642,7 +30464,6 @@ function ListDropDown(props) {
 			minWidth: cellWidth,
 			maxWidth: Math.max(cellWidth, 200)
 		},
-		title: multiple ? localeService.t("sheets-ui.data-validation.listMultiple.dropdown") : localeService.t("sheets-ui.data-validation.list.dropdown"),
 		value: getListDropdownValue(localValue, multiple),
 		multiple,
 		onChange: async (newValue) => {
@@ -29718,6 +30539,28 @@ SheetCellDropdownManagerService = __decorate([
 
 //#endregion
 //#region src/services/print-interceptor.service.ts
+/** Tracks asynchronous resources registered by all interceptors for one print page. */
+var SheetPrintingResourceCollector = class {
+	constructor() {
+		_defineProperty(this, "_pending", /* @__PURE__ */ new Set());
+	}
+	add(resource) {
+		const tracked = Promise.resolve(resource).catch(() => void 0).finally(() => this._pending.delete(tracked));
+		this._pending.add(tracked);
+	}
+	async wait(timeout = 1e4) {
+		const deadline = Date.now() + timeout;
+		while (this._pending.size > 0) {
+			const remaining = deadline - Date.now();
+			if (remaining <= 0) return;
+			let timeoutId;
+			await Promise.race([Promise.allSettled(Array.from(this._pending)), new Promise((resolve) => {
+				timeoutId = setTimeout(resolve, remaining);
+			})]);
+			if (timeoutId !== void 0) clearTimeout(timeoutId);
+		}
+	}
+};
 const PRINTING_RANGE = (0, _univerjs_core.createInterceptorKey)("PRINTING_RANGE");
 const PRINTING_COMPONENT_COLLECT = (0, _univerjs_core.createInterceptorKey)("PRINTING_COMPONENT_COLLECT");
 const PRINTING_DOM_COLLECT = (0, _univerjs_core.createInterceptorKey)("PRINTING_DOM_COLLECT");
@@ -30524,7 +31367,12 @@ let UniverSheetsMobileUIPlugin = class UniverSheetsMobileUIPlugin extends _unive
 	}
 	_initAutoFocus() {
 		const univerInstanceService = this._univerInstanceService;
-		this.disposeWithMe(univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.filter)((v) => !!v)).subscribe((workbook) => univerInstanceService.focusUnit(workbook.getUnitId())));
+		this.disposeWithMe(univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.filter)((v) => !!v)).subscribe((workbook) => {
+			const unitId = workbook.getUnitId();
+			const createOptions = univerInstanceService.getUnitCreateOptions(unitId);
+			if ((createOptions === null || createOptions === void 0 ? void 0 : createOptions.makeCurrent) === false) return;
+			univerInstanceService.focusUnit(unitId);
+		}));
 	}
 };
 _defineProperty(UniverSheetsMobileUIPlugin, "pluginName", "SHEET_UI_PLUGIN");
@@ -30539,15 +31387,20 @@ UniverSheetsMobileUIPlugin = __decorate([
 	__decorateParam(4, _univerjs_core.IUniverInstanceService)
 ], UniverSheetsMobileUIPlugin);
 
+//#endregion
+//#region src/services/sheet-host-chrome-override.service.ts
+const ISheetHostChromeOverrideService = (0, _univerjs_core.createIdentifier)("sheet-ui.host-chrome-override.service");
+
 //#endregion
 //#region src/controllers/render-controllers/contextmenu.render-controller.ts
 let SheetContextMenuRenderController = class SheetContextMenuRenderController extends _univerjs_core.Disposable {
-	constructor(_context, _contextMenuService, _selectionManagerService, _selectionRenderService) {
+	constructor(_context, _contextMenuService, _selectionManagerService, _selectionRenderService, _injector) {
 		super();
 		this._context = _context;
 		this._contextMenuService = _contextMenuService;
 		this._selectionManagerService = _selectionManagerService;
 		this._selectionRenderService = _selectionRenderService;
+		this._injector = _injector;
 		this._init();
 	}
 	_init() {
@@ -30570,6 +31423,7 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 					}
 				};
 				const triggerMenu = (position) => {
+					if (this._shouldSuppressHostContextMenu()) return;
 					this._contextMenuService.triggerContextMenu(event, position);
 				};
 				if (!isPointerInRange()) triggerMenu(_univerjs_ui.ContextMenuPosition.MAIN_AREA);
@@ -30581,20 +31435,37 @@ let SheetContextMenuRenderController = class SheetContextMenuRenderController ex
 		this.disposeWithMe(spreadsheetSubscription);
 		const spreadsheetColumnHeader = this._context.components.get("__SpreadsheetColumnHeader__");
 		const rowHeaderSub = this._context.components.get("__SpreadsheetRowHeader__").onPointerDown$.subscribeEvent((event) => {
-			if (event.button === 2) this._contextMenuService.triggerContextMenu(event, _univerjs_ui.ContextMenuPosition.ROW_HEADER);
+			if (event.button === 2) {
+				if (this._shouldSuppressHostContextMenu()) return;
+				this._contextMenuService.triggerContextMenu(event, _univerjs_ui.ContextMenuPosition.ROW_HEADER);
+			}
 		});
 		this.disposeWithMe(rowHeaderSub);
 		const colHeaderObserver = spreadsheetColumnHeader.onPointerDown$.subscribeEvent((event) => {
-			if (event.button === 2) this._contextMenuService.triggerContextMenu(event, _univerjs_ui.ContextMenuPosition.COL_HEADER);
+			if (event.button === 2) {
+				if (this._shouldSuppressHostContextMenu()) return;
+				this._contextMenuService.triggerContextMenu(event, _univerjs_ui.ContextMenuPosition.COL_HEADER);
+			}
 		});
 		this.disposeWithMe(colHeaderObserver);
 	}
+	_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));
+	}
+	_getSheetHostChromeOverrideService() {
+		return this._injector.has(ISheetHostChromeOverrideService) ? this._injector.get(ISheetHostChromeOverrideService) : void 0;
+	}
 };
 SheetContextMenuRenderController = __decorate([
 	__decorateParam(1, _univerjs_ui.IContextMenuService),
 	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService)),
-	__decorateParam(3, ISheetSelectionRenderService)
+	__decorateParam(3, ISheetSelectionRenderService),
+	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
 ], SheetContextMenuRenderController);
+function shouldSuppressSheetContextMenuForEmbedOverride(hostUnitId, override) {
+	return override != null && override.hostUnitId === hostUnitId && override.entry === "sheets-sheet-tab";
+}
 
 //#endregion
 //#region src/controllers/repeat-last-action.controller.ts
@@ -31118,7 +31989,12 @@ let UniverSheetsUIPlugin = class UniverSheetsUIPlugin extends _univerjs_core.Plu
 	}
 	_initAutoFocus() {
 		const univerInstanceService = this._univerInstanceService;
-		this.disposeWithMe(univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.filter)((v) => !!v)).subscribe((workbook) => univerInstanceService.focusUnit(workbook.getUnitId())));
+		this.disposeWithMe(univerInstanceService.getCurrentTypeOfUnit$(_univerjs_core.UniverInstanceType.UNIVER_SHEET).pipe((0, rxjs_operators.filter)((v) => !!v)).subscribe((workbook) => {
+			const unitId = workbook.getUnitId();
+			const createOptions = univerInstanceService.getUnitCreateOptions(unitId);
+			if ((createOptions === null || createOptions === void 0 ? void 0 : createOptions.makeCurrent) === false) return;
+			univerInstanceService.focusUnit(unitId);
+		}));
 	}
 };
 _defineProperty(UniverSheetsUIPlugin, "pluginName", "SHEET_UI_PLUGIN");
@@ -31138,6 +32014,7 @@ exports.AddRangeProtectionFromContextMenuCommand = AddRangeProtectionFromContext
 exports.AddRangeProtectionFromSheetBarCommand = AddRangeProtectionFromSheetBarCommand;
 exports.AddRangeProtectionFromToolbarCommand = AddRangeProtectionFromToolbarCommand;
 exports.ApplyFormatPainterCommand = ApplyFormatPainterCommand;
+exports.AutoFillPopupMenu = AutoFillPopupMenu;
 Object.defineProperty(exports, 'AutoFillUIController', {
   enumerable: true,
   get: function () {
@@ -31156,7 +32033,10 @@ Object.defineProperty(exports, 'AutoWidthController', {
     return AutoWidthController;
   }
 });
+exports.BORDER_LINE_CHILDREN = BORDER_LINE_CHILDREN;
+exports.BORDER_SIZE_CHILDREN = BORDER_SIZE_CHILDREN;
 exports.BaseSelectionRenderService = BaseSelectionRenderService;
+exports.BorderLine = BorderLine;
 exports.COPY_SPECIAL_MENU_ID = COPY_SPECIAL_MENU_ID;
 exports.COPY_TYPE = COPY_TYPE;
 Object.defineProperty(exports, 'CellAlertManagerService', {
@@ -31211,9 +32091,11 @@ Object.defineProperty(exports, 'EditorBridgeService', {
     return EditorBridgeService;
   }
 });
+exports.EditorContainer = EditorContainer;
 exports.ExpandSelectionCommand = ExpandSelectionCommand;
 exports.FORMULA_CLIPBOARD_MIME_TYPE = FORMULA_CLIPBOARD_MIME_TYPE;
 exports.FormatPainterStatus = FormatPainterStatus;
+exports.FormulaBar = FormulaBar;
 Object.defineProperty(exports, 'FormulaEditorController', {
   enumerable: true,
   get: function () {
@@ -31269,6 +32151,11 @@ exports.IMarkSelectionService = IMarkSelectionService;
 exports.IRepeatLastActionService = IRepeatLastActionService;
 exports.ISheetCellDropdownManagerService = ISheetCellDropdownManagerService;
 exports.ISheetClipboardService = ISheetClipboardService;
+exports.ISheetEmbedFloatingGeometryService = ISheetEmbedFloatingGeometryService;
+exports.ISheetEmbedInteractionBoundaryService = ISheetEmbedInteractionBoundaryService;
+exports.ISheetEmbedRuntimeFocusCoordinator = ISheetEmbedRuntimeFocusCoordinator;
+exports.ISheetEmbedRuntimeService = ISheetEmbedRuntimeService;
+exports.ISheetHostChromeOverrideService = ISheetHostChromeOverrideService;
 exports.ISheetSelectionRenderService = ISheetSelectionRenderService;
 exports.IStatusBarService = IStatusBarService;
 exports.InsertRangeMoveDownConfirmCommand = InsertRangeMoveDownConfirmCommand;
@@ -31296,6 +32183,15 @@ exports.RepeatLastActionPermission = RepeatLastActionPermission;
 exports.ResetRangeTextColorCommand = ResetRangeTextColorCommand;
 exports.ResetScrollCommand = ResetScrollCommand;
 exports.SELECTION_SHAPE_DEPTH = SELECTION_SHAPE_DEPTH;
+exports.SHEETS_UI_PLUGIN_CONFIG_KEY = SHEETS_UI_PLUGIN_CONFIG_KEY;
+exports.SHEET_EMBED_CHILD_TYPE_ATTRIBUTE = SHEET_EMBED_CHILD_TYPE_ATTRIBUTE;
+exports.SHEET_EMBED_CHILD_UNIT_ID_ATTRIBUTE = SHEET_EMBED_CHILD_UNIT_ID_ATTRIBUTE;
+exports.SHEET_EMBED_FLOAT_DOM_ATTRIBUTE = SHEET_EMBED_FLOAT_DOM_ATTRIBUTE;
+exports.SHEET_EMBED_HOST_UNIT_ID_ATTRIBUTE = SHEET_EMBED_HOST_UNIT_ID_ATTRIBUTE;
+exports.SHEET_EMBED_ID_ATTRIBUTE = SHEET_EMBED_ID_ATTRIBUTE;
+exports.SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE = SHEET_EMBED_INTERACTION_BOUNDARY_OWNER_ATTRIBUTE;
+exports.SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE = SHEET_EMBED_RUNTIME_FOCUS_ROLE_ATTRIBUTE;
+exports.SHEET_FOOTER_BAR_HEIGHT = SHEET_FOOTER_BAR_HEIGHT;
 exports.SHEET_UI_PLUGIN_NAME = SHEET_UI_PLUGIN_NAME;
 exports.SHEET_VIEW_KEY = SHEET_VIEW_KEY;
 exports.ScrollCommand = ScrollCommand;
@@ -31336,6 +32232,7 @@ exports.SetSelectionFrozenCommand = SetSelectionFrozenCommand;
 exports.SetWorksheetColAutoWidthCommand = SetWorksheetColAutoWidthCommand;
 exports.SetZoomRatioCommand = SetZoomRatioCommand;
 exports.SetZoomRatioOperation = SetZoomRatioOperation;
+exports.SheetBar = SheetBar;
 Object.defineProperty(exports, 'SheetCanvasPopManagerService', {
   enumerable: true,
   get: function () {
@@ -31391,6 +32288,7 @@ Object.defineProperty(exports, 'SheetPermissionRenderManagerService', {
 });
 exports.SheetPermissionUserManagerService = SheetPermissionUserManagerService;
 exports.SheetPrintInterceptorService = SheetPrintInterceptorService;
+exports.SheetPrintingResourceCollector = SheetPrintingResourceCollector;
 Object.defineProperty(exports, 'SheetRenderController', {
   enumerable: true,
   get: function () {
@@ -31485,6 +32383,8 @@ exports.isEmbeddingFormulaEditor = isEmbeddingFormulaEditor;
 exports.isRangeSelector = isRangeSelector;
 exports.menuClipboardDisabledObservable = menuClipboardDisabledObservable;
 exports.mergeSetRangeValues = mergeSetRangeValues;
+exports.resolveActiveSheetEmbedRuntimeDomScope = resolveActiveSheetEmbedRuntimeDomScope;
+exports.resolveSheetEmbedRuntimeDomScope = resolveSheetEmbedRuntimeDomScope;
 exports.useActiveWorkbook = useActiveWorkbook;
 exports.useActiveWorksheet = useActiveWorksheet;
 exports.useHighlightRange = useHighlightRange;