@univerjs/sheets-find-replace 1.0.0-insiders.20260813-7c9aa50 → 1.0.0

package/lib/es/index.js

@@ -1,8 +1,8 @@
 import { ColorKit, CommandType, DependentOn, Disposable, EDITOR_ACTIVATED, ICommandService, IConfigService, IContextService, IUndoRedoService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, Rectangle, ThemeService, Tools, UniverInstanceType, fromCallback, groupBy, merge, regexp, replaceInDocumentBody, rotate } from "@univerjs/core";
 import { SelectRangeCommand, SetRangeValuesCommand, SetSelectionsOperation, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SheetsSelectionsService, UniverSheetsPlugin } from "@univerjs/sheets";
-import { IRenderManagerService, RENDER_RAW_FORMULA_KEY, Rect, Shape, UniverRenderEnginePlugin } from "@univerjs/engine-render";
-import { FindBy, FindDirection, FindModel, FindReplaceController, FindScope, IFindReplaceService, UniverFindReplacePlugin } from "@univerjs/find-replace";
-import { ScrollToCellCommand, SheetSkeletonManagerService, UniverSheetsUIPlugin, getCoordByCell, getSheetObject } from "@univerjs/sheets-ui";
+import { IRenderManagerService, RENDER_RAW_FORMULA_KEY, Rect, Shape, UniverRenderEnginePlugin, convertTransformToOffsetY } from "@univerjs/engine-render";
+import { CloseFindDialogOperation, FindBy, FindDirection, FindModel, FindScope, IFindReplaceService, UniverFindReplaceMobileUIPlugin, UniverFindReplacePlugin } from "@univerjs/find-replace";
+import { ScrollToCellCommand, SetScrollRelativeCommand, SheetSkeletonManagerService, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, getCoordByCell, getSheetObject, getViewportByCell } from "@univerjs/sheets-ui";
 import { Subject, debounceTime, filter, merge as merge$1, skip, throttleTime } from "rxjs";
 
 //#region src/commands/commands/sheet-replace.command.ts
@@ -42,7 +42,7 @@ function getReplaceAllResult(results, replacements) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -53,7 +53,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -66,14 +66,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -161,7 +161,7 @@ function isSelectionSingleCell(selection, worksheet) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -169,7 +169,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -180,10 +180,9 @@ function __decorate(decorators, target, key, desc) {
 //#endregion
 //#region src/controllers/sheet-find-replace.controller.ts
 let SheetsFindReplaceController = class SheetsFindReplaceController extends Disposable {
-	constructor(_injector, _findReplaceController, _contextService, _findReplaceService, _commandService) {
+	constructor(_injector, _contextService, _findReplaceService, _commandService) {
 		super();
 		this._injector = _injector;
-		this._findReplaceController = _findReplaceController;
 		this._contextService = _contextService;
 		this._findReplaceService = _findReplaceService;
 		this._commandService = _commandService;
@@ -193,14 +192,16 @@ let SheetsFindReplaceController = class SheetsFindReplaceController extends Disp
 	}
 	dispose() {
 		super.dispose();
-		this._findReplaceController.closePanel();
+		this._findReplaceService.terminate();
 		this._provider.dispose();
 	}
 	_init() {
 		const provider = this._injector.createInstance(SheetsFindReplaceProvider);
 		this._provider = provider;
 		this.disposeWithMe(this._findReplaceService.registerFindReplaceProvider(provider));
-		this.disposeWithMe(this._contextService.subscribeContextValue$(EDITOR_ACTIVATED).pipe(filter((v) => !!v)).subscribe(() => this._findReplaceController.closePanel()));
+		this.disposeWithMe(this._contextService.subscribeContextValue$(EDITOR_ACTIVATED).pipe(filter((v) => !!v)).subscribe(() => {
+			this._commandService.executeCommand(CloseFindDialogOperation.id).catch(() => void 0);
+		}));
 	}
 	_initCommands() {
 		[SheetReplaceCommand].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
@@ -208,10 +209,9 @@ let SheetsFindReplaceController = class SheetsFindReplaceController extends Disp
 };
 SheetsFindReplaceController = __decorate([
 	__decorateParam(0, Inject(Injector)),
-	__decorateParam(1, Inject(FindReplaceController)),
-	__decorateParam(2, IContextService),
-	__decorateParam(3, IFindReplaceService),
-	__decorateParam(4, ICommandService)
+	__decorateParam(1, IContextService),
+	__decorateParam(2, IFindReplaceService),
+	__decorateParam(3, ICommandService)
 ], SheetsFindReplaceController);
 const SHEETS_FIND_REPLACE_PROVIDER_NAME = "sheets-find-replace-provider";
 const FIND_REPLACE_Z_INDEX = 1e4;
@@ -271,9 +271,7 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 				this.findInWorkbook(query);
 				break;
 			case FindScope.SUBUNIT:
-			default:
-				this.findInActiveWorksheet(query);
-				break;
+			default: this.findInActiveWorksheet(query);
 		}
 	}
 	focusSelection() {
@@ -474,7 +472,8 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 		if (currentRender == null) return;
 		const { scene } = currentRender;
 		const matches = this._matches;
-		const color = new ColorKit(this._themeService.getColorFromTheme("yellow.400")).toRgb();
+		const searchBackgroundColor = this._themeService.getColorFromTheme("yellow.400");
+		const color = new ColorKit(searchBackgroundColor).toRgb();
 		const worksheet = this._workbook.getActiveSheet();
 		if (!worksheet) return;
 		const activeSheetId = worksheet.getSheetId();
@@ -649,7 +648,7 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 			const matchRange = match.range.range;
 			if (!(findByRow ? isBehindPositionWithRowPriority(range, matchRange) : isBehindPositionWithColumnPriority(range, matchRange))) return false;
 			const isSame = isSamePosition(range, matchRange);
-			return stayIfOnMatch ? isSame : !isSame;
+			return stayIfOnMatch || !isSame;
 		});
 		if (index === -1) index = matches.length - 1;
 		const match = matches[index];
@@ -875,7 +874,7 @@ function trimLeadingTrailingWhitespace(value) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-find-replace";
-var version = "1.0.0-insiders.20260813-7c9aa50";
+var version = "1.0.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -898,6 +897,103 @@ const SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY = "sheets-find-replace.config";
 const configSymbol = Symbol(SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
+//#endregion
+//#region src/controllers/mobile/sheet-find-replace-mobile.controller.ts
+const MOBILE_FIND_REPLACE_BAR_SELECTOR = "[data-u-comp=\"mobile-find-replace-bar\"]";
+const MOBILE_FIND_MATCH_SAFE_PADDING = 8;
+function getMobileFindMatchScrollOffset(cellBottom, barTop, safePadding) {
+	return Math.max(0, cellBottom - barTop + safePadding);
+}
+let SheetsFindReplaceMobileController = class SheetsFindReplaceMobileController extends Disposable {
+	constructor(_commandService, _univerInstanceService, _renderManagerService) {
+		super();
+		this._commandService = _commandService;
+		this._univerInstanceService = _univerInstanceService;
+		this._renderManagerService = _renderManagerService;
+		_defineProperty(this, "_pendingFrameId", null);
+		this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
+			var _command$params;
+			if (command.id !== ScrollToCellCommand.id || (options === null || options === void 0 ? void 0 : options.fromFindReplace) !== true) return;
+			const range = (_command$params = command.params) === null || _command$params === void 0 ? void 0 : _command$params.range;
+			if (!range) return;
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+			const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
+			if (!workbook || !worksheet) return;
+			this._scheduleReveal(workbook.getUnitId(), worksheet.getSheetId(), range.endRow, range.endColumn);
+		}));
+	}
+	dispose() {
+		if (this._pendingFrameId !== null) {
+			cancelAnimationFrame(this._pendingFrameId);
+			this._pendingFrameId = null;
+		}
+		super.dispose();
+	}
+	_scheduleReveal(unitId, subUnitId, row, column) {
+		if (this._pendingFrameId !== null) cancelAnimationFrame(this._pendingFrameId);
+		this._pendingFrameId = requestAnimationFrame(() => {
+			this._pendingFrameId = null;
+			this._revealMatch(unitId, subUnitId, row, column);
+		});
+	}
+	_revealMatch(unitId, subUnitId, row, column) {
+		const bar = document.querySelector(MOBILE_FIND_REPLACE_BAR_SELECTOR);
+		if (!bar) return;
+		const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
+		if (!workbook || !worksheet || workbook.getUnitId() !== unitId || worksheet.getSheetId() !== subUnitId) return;
+		const render = this._renderManagerService.getRenderUnitById(workbook.getUnitId());
+		const sheetObject = getSheetObject(workbook, this._renderManagerService);
+		const skeleton = render === null || render === void 0 ? void 0 : render.with(SheetSkeletonManagerService).getSkeleton(worksheet.getSheetId());
+		if (!sheetObject || !skeleton) return;
+		const { scene, engine } = sheetObject;
+		const viewport = getViewportByCell(row, column, scene, worksheet);
+		if (!viewport) return;
+		const { endY } = getCoordByCell(row, column, scene, skeleton);
+		const { scaleY } = scene.getAncestorScale();
+		const scrollXY = scene.getViewportScrollXY(viewport);
+		const offsetY = getMobileFindMatchScrollOffset(engine.getCanvasElement().getBoundingClientRect().top + convertTransformToOffsetY(endY, scaleY, scrollXY), bar.getBoundingClientRect().top, MOBILE_FIND_MATCH_SAFE_PADDING);
+		if (offsetY === 0) return;
+		this._commandService.executeCommand(SetScrollRelativeCommand.id, { offsetY }).catch(() => void 0);
+	}
+};
+SheetsFindReplaceMobileController = __decorate([
+	__decorateParam(0, ICommandService),
+	__decorateParam(1, IUniverInstanceService),
+	__decorateParam(2, IRenderManagerService)
+], SheetsFindReplaceMobileController);
+
+//#endregion
+//#region src/mobile-plugin.ts
+let UniverSheetsFindReplaceMobileUIPlugin = class UniverSheetsFindReplaceMobileUIPlugin extends Plugin {
+	constructor(_config = defaultPluginConfig, _injector, _configService) {
+		super();
+		this._config = _config;
+		this._injector = _injector;
+		this._configService = _configService;
+		const { ...rest } = merge({}, defaultPluginConfig, this._config);
+		this._configService.setConfig(SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY, rest);
+	}
+	onStarting() {
+		[[SheetsFindReplaceController], [SheetsFindReplaceMobileController]].forEach((dependency) => this._injector.add(dependency));
+	}
+	onRendered() {
+		this._injector.get(SheetsFindReplaceMobileController);
+	}
+	onSteady() {
+		this._injector.get(SheetsFindReplaceController);
+	}
+};
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "pluginName", "SHEET_FIND_REPLACE_PLUGIN");
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "packageName", name);
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "version", version);
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsFindReplaceMobileUIPlugin = __decorate([
+	DependentOn(UniverRenderEnginePlugin, UniverSheetsPlugin, UniverFindReplaceMobileUIPlugin, UniverSheetsMobileUIPlugin),
+	__decorateParam(1, Inject(Injector)),
+	__decorateParam(2, IConfigService)
+], UniverSheetsFindReplaceMobileUIPlugin);
+
 //#endregion
 //#region src/plugin.ts
 let UniverSheetsFindReplacePlugin = class UniverSheetsFindReplacePlugin extends Plugin {
@@ -927,4 +1023,4 @@ UniverSheetsFindReplacePlugin = __decorate([
 ], UniverSheetsFindReplacePlugin);
 
 //#endregion
-export { SheetReplaceCommand, SheetsFindReplaceController, UniverSheetsFindReplacePlugin };
+export { SheetReplaceCommand, SheetsFindReplaceController, UniverSheetsFindReplaceMobileUIPlugin, UniverSheetsFindReplacePlugin };

package/lib/facade.js

@@ -4,7 +4,7 @@ import { FRange } from "@univerjs/sheets/facade";
 import { filter, firstValueFrom } from "rxjs";
 import { FUniver } from "@univerjs/core/facade";
 
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -15,7 +15,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -28,14 +28,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -46,7 +46,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -54,7 +54,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);

package/lib/index.js

@@ -1,8 +1,8 @@
 import { ColorKit, CommandType, DependentOn, Disposable, EDITOR_ACTIVATED, ICommandService, IConfigService, IContextService, IUndoRedoService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, Rectangle, ThemeService, Tools, UniverInstanceType, fromCallback, groupBy, merge, regexp, replaceInDocumentBody, rotate } from "@univerjs/core";
 import { SelectRangeCommand, SetRangeValuesCommand, SetSelectionsOperation, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SheetsSelectionsService, UniverSheetsPlugin } from "@univerjs/sheets";
-import { IRenderManagerService, RENDER_RAW_FORMULA_KEY, Rect, Shape, UniverRenderEnginePlugin } from "@univerjs/engine-render";
-import { FindBy, FindDirection, FindModel, FindReplaceController, FindScope, IFindReplaceService, UniverFindReplacePlugin } from "@univerjs/find-replace";
-import { ScrollToCellCommand, SheetSkeletonManagerService, UniverSheetsUIPlugin, getCoordByCell, getSheetObject } from "@univerjs/sheets-ui";
+import { IRenderManagerService, RENDER_RAW_FORMULA_KEY, Rect, Shape, UniverRenderEnginePlugin, convertTransformToOffsetY } from "@univerjs/engine-render";
+import { CloseFindDialogOperation, FindBy, FindDirection, FindModel, FindScope, IFindReplaceService, UniverFindReplaceMobileUIPlugin, UniverFindReplacePlugin } from "@univerjs/find-replace";
+import { ScrollToCellCommand, SetScrollRelativeCommand, SheetSkeletonManagerService, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, getCoordByCell, getSheetObject, getViewportByCell } from "@univerjs/sheets-ui";
 import { Subject, debounceTime, filter, merge as merge$1, skip, throttleTime } from "rxjs";
 
 //#region src/commands/commands/sheet-replace.command.ts
@@ -42,7 +42,7 @@ function getReplaceAllResult(results, replacements) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -53,7 +53,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -66,14 +66,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -161,7 +161,7 @@ function isSelectionSingleCell(selection, worksheet) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -169,7 +169,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.149.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -180,10 +180,9 @@ function __decorate(decorators, target, key, desc) {
 //#endregion
 //#region src/controllers/sheet-find-replace.controller.ts
 let SheetsFindReplaceController = class SheetsFindReplaceController extends Disposable {
-	constructor(_injector, _findReplaceController, _contextService, _findReplaceService, _commandService) {
+	constructor(_injector, _contextService, _findReplaceService, _commandService) {
 		super();
 		this._injector = _injector;
-		this._findReplaceController = _findReplaceController;
 		this._contextService = _contextService;
 		this._findReplaceService = _findReplaceService;
 		this._commandService = _commandService;
@@ -193,14 +192,16 @@ let SheetsFindReplaceController = class SheetsFindReplaceController extends Disp
 	}
 	dispose() {
 		super.dispose();
-		this._findReplaceController.closePanel();
+		this._findReplaceService.terminate();
 		this._provider.dispose();
 	}
 	_init() {
 		const provider = this._injector.createInstance(SheetsFindReplaceProvider);
 		this._provider = provider;
 		this.disposeWithMe(this._findReplaceService.registerFindReplaceProvider(provider));
-		this.disposeWithMe(this._contextService.subscribeContextValue$(EDITOR_ACTIVATED).pipe(filter((v) => !!v)).subscribe(() => this._findReplaceController.closePanel()));
+		this.disposeWithMe(this._contextService.subscribeContextValue$(EDITOR_ACTIVATED).pipe(filter((v) => !!v)).subscribe(() => {
+			this._commandService.executeCommand(CloseFindDialogOperation.id).catch(() => void 0);
+		}));
 	}
 	_initCommands() {
 		[SheetReplaceCommand].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
@@ -208,10 +209,9 @@ let SheetsFindReplaceController = class SheetsFindReplaceController extends Disp
 };
 SheetsFindReplaceController = __decorate([
 	__decorateParam(0, Inject(Injector)),
-	__decorateParam(1, Inject(FindReplaceController)),
-	__decorateParam(2, IContextService),
-	__decorateParam(3, IFindReplaceService),
-	__decorateParam(4, ICommandService)
+	__decorateParam(1, IContextService),
+	__decorateParam(2, IFindReplaceService),
+	__decorateParam(3, ICommandService)
 ], SheetsFindReplaceController);
 const SHEETS_FIND_REPLACE_PROVIDER_NAME = "sheets-find-replace-provider";
 const FIND_REPLACE_Z_INDEX = 1e4;
@@ -271,9 +271,7 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 				this.findInWorkbook(query);
 				break;
 			case FindScope.SUBUNIT:
-			default:
-				this.findInActiveWorksheet(query);
-				break;
+			default: this.findInActiveWorksheet(query);
 		}
 	}
 	focusSelection() {
@@ -474,7 +472,8 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 		if (currentRender == null) return;
 		const { scene } = currentRender;
 		const matches = this._matches;
-		const color = new ColorKit(this._themeService.getColorFromTheme("yellow.400")).toRgb();
+		const searchBackgroundColor = this._themeService.getColorFromTheme("yellow.400");
+		const color = new ColorKit(searchBackgroundColor).toRgb();
 		const worksheet = this._workbook.getActiveSheet();
 		if (!worksheet) return;
 		const activeSheetId = worksheet.getSheetId();
@@ -649,7 +648,7 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 			const matchRange = match.range.range;
 			if (!(findByRow ? isBehindPositionWithRowPriority(range, matchRange) : isBehindPositionWithColumnPriority(range, matchRange))) return false;
 			const isSame = isSamePosition(range, matchRange);
-			return stayIfOnMatch ? isSame : !isSame;
+			return stayIfOnMatch || !isSame;
 		});
 		if (index === -1) index = matches.length - 1;
 		const match = matches[index];
@@ -875,7 +874,7 @@ function trimLeadingTrailingWhitespace(value) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-find-replace";
-var version = "1.0.0-insiders.20260813-7c9aa50";
+var version = "1.0.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -898,6 +897,103 @@ const SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY = "sheets-find-replace.config";
 const configSymbol = Symbol(SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
+//#endregion
+//#region src/controllers/mobile/sheet-find-replace-mobile.controller.ts
+const MOBILE_FIND_REPLACE_BAR_SELECTOR = "[data-u-comp=\"mobile-find-replace-bar\"]";
+const MOBILE_FIND_MATCH_SAFE_PADDING = 8;
+function getMobileFindMatchScrollOffset(cellBottom, barTop, safePadding) {
+	return Math.max(0, cellBottom - barTop + safePadding);
+}
+let SheetsFindReplaceMobileController = class SheetsFindReplaceMobileController extends Disposable {
+	constructor(_commandService, _univerInstanceService, _renderManagerService) {
+		super();
+		this._commandService = _commandService;
+		this._univerInstanceService = _univerInstanceService;
+		this._renderManagerService = _renderManagerService;
+		_defineProperty(this, "_pendingFrameId", null);
+		this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
+			var _command$params;
+			if (command.id !== ScrollToCellCommand.id || (options === null || options === void 0 ? void 0 : options.fromFindReplace) !== true) return;
+			const range = (_command$params = command.params) === null || _command$params === void 0 ? void 0 : _command$params.range;
+			if (!range) return;
+			const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+			const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
+			if (!workbook || !worksheet) return;
+			this._scheduleReveal(workbook.getUnitId(), worksheet.getSheetId(), range.endRow, range.endColumn);
+		}));
+	}
+	dispose() {
+		if (this._pendingFrameId !== null) {
+			cancelAnimationFrame(this._pendingFrameId);
+			this._pendingFrameId = null;
+		}
+		super.dispose();
+	}
+	_scheduleReveal(unitId, subUnitId, row, column) {
+		if (this._pendingFrameId !== null) cancelAnimationFrame(this._pendingFrameId);
+		this._pendingFrameId = requestAnimationFrame(() => {
+			this._pendingFrameId = null;
+			this._revealMatch(unitId, subUnitId, row, column);
+		});
+	}
+	_revealMatch(unitId, subUnitId, row, column) {
+		const bar = document.querySelector(MOBILE_FIND_REPLACE_BAR_SELECTOR);
+		if (!bar) return;
+		const workbook = this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET);
+		const worksheet = workbook === null || workbook === void 0 ? void 0 : workbook.getActiveSheet();
+		if (!workbook || !worksheet || workbook.getUnitId() !== unitId || worksheet.getSheetId() !== subUnitId) return;
+		const render = this._renderManagerService.getRenderUnitById(workbook.getUnitId());
+		const sheetObject = getSheetObject(workbook, this._renderManagerService);
+		const skeleton = render === null || render === void 0 ? void 0 : render.with(SheetSkeletonManagerService).getSkeleton(worksheet.getSheetId());
+		if (!sheetObject || !skeleton) return;
+		const { scene, engine } = sheetObject;
+		const viewport = getViewportByCell(row, column, scene, worksheet);
+		if (!viewport) return;
+		const { endY } = getCoordByCell(row, column, scene, skeleton);
+		const { scaleY } = scene.getAncestorScale();
+		const scrollXY = scene.getViewportScrollXY(viewport);
+		const offsetY = getMobileFindMatchScrollOffset(engine.getCanvasElement().getBoundingClientRect().top + convertTransformToOffsetY(endY, scaleY, scrollXY), bar.getBoundingClientRect().top, MOBILE_FIND_MATCH_SAFE_PADDING);
+		if (offsetY === 0) return;
+		this._commandService.executeCommand(SetScrollRelativeCommand.id, { offsetY }).catch(() => void 0);
+	}
+};
+SheetsFindReplaceMobileController = __decorate([
+	__decorateParam(0, ICommandService),
+	__decorateParam(1, IUniverInstanceService),
+	__decorateParam(2, IRenderManagerService)
+], SheetsFindReplaceMobileController);
+
+//#endregion
+//#region src/mobile-plugin.ts
+let UniverSheetsFindReplaceMobileUIPlugin = class UniverSheetsFindReplaceMobileUIPlugin extends Plugin {
+	constructor(_config = defaultPluginConfig, _injector, _configService) {
+		super();
+		this._config = _config;
+		this._injector = _injector;
+		this._configService = _configService;
+		const { ...rest } = merge({}, defaultPluginConfig, this._config);
+		this._configService.setConfig(SHEETS_FIND_REPLACE_PLUGIN_CONFIG_KEY, rest);
+	}
+	onStarting() {
+		[[SheetsFindReplaceController], [SheetsFindReplaceMobileController]].forEach((dependency) => this._injector.add(dependency));
+	}
+	onRendered() {
+		this._injector.get(SheetsFindReplaceMobileController);
+	}
+	onSteady() {
+		this._injector.get(SheetsFindReplaceController);
+	}
+};
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "pluginName", "SHEET_FIND_REPLACE_PLUGIN");
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "packageName", name);
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "version", version);
+_defineProperty(UniverSheetsFindReplaceMobileUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsFindReplaceMobileUIPlugin = __decorate([
+	DependentOn(UniverRenderEnginePlugin, UniverSheetsPlugin, UniverFindReplaceMobileUIPlugin, UniverSheetsMobileUIPlugin),
+	__decorateParam(1, Inject(Injector)),
+	__decorateParam(2, IConfigService)
+], UniverSheetsFindReplaceMobileUIPlugin);
+
 //#endregion
 //#region src/plugin.ts
 let UniverSheetsFindReplacePlugin = class UniverSheetsFindReplacePlugin extends Plugin {
@@ -927,4 +1023,4 @@ UniverSheetsFindReplacePlugin = __decorate([
 ], UniverSheetsFindReplacePlugin);
 
 //#endregion
-export { SheetReplaceCommand, SheetsFindReplaceController, UniverSheetsFindReplacePlugin };
+export { SheetReplaceCommand, SheetsFindReplaceController, UniverSheetsFindReplaceMobileUIPlugin, UniverSheetsFindReplacePlugin };

package/lib/types/controllers/mobile/sheet-find-replace-mobile.controller.d.ts

@@ -0,0 +1,28 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { IRenderManagerService } from '@univerjs/engine-render';
+export declare function getMobileFindMatchScrollOffset(cellBottom: number, barTop: number, safePadding: number): number;
+export declare class SheetsFindReplaceMobileController extends Disposable {
+    private readonly _commandService;
+    private readonly _univerInstanceService;
+    private readonly _renderManagerService;
+    private _pendingFrameId;
+    constructor(_commandService: ICommandService, _univerInstanceService: IUniverInstanceService, _renderManagerService: IRenderManagerService);
+    dispose(): void;
+    private _scheduleReveal;
+    private _revealMatch;
+}

package/lib/types/controllers/sheet-find-replace.controller.d.ts

@@ -17,17 +17,16 @@ import type { ICellData, IDisposable, IRange, Nullable, Workbook, Worksheet } fr
 import type { IFindComplete, IFindMatch, IFindMoveParams, IFindQuery, IReplaceAllResult } from '@univerjs/find-replace';
 import { Disposable, ICommandService, IContextService, Injector, IUniverInstanceService, ThemeService } from '@univerjs/core';
 import { IRenderManagerService } from '@univerjs/engine-render';
-import { FindModel, FindReplaceController, IFindReplaceService } from '@univerjs/find-replace';
+import { FindModel, IFindReplaceService } from '@univerjs/find-replace';
 import { SheetsSelectionsService } from '@univerjs/sheets';
 import { SheetSkeletonManagerService } from '@univerjs/sheets-ui';
 export declare class SheetsFindReplaceController extends Disposable implements IDisposable {
     private readonly _injector;
-    private readonly _findReplaceController;
     private readonly _contextService;
     private readonly _findReplaceService;
     private readonly _commandService;
     private _provider;
-    constructor(_injector: Injector, _findReplaceController: FindReplaceController, _contextService: IContextService, _findReplaceService: IFindReplaceService, _commandService: ICommandService);
+    constructor(_injector: Injector, _contextService: IContextService, _findReplaceService: IFindReplaceService, _commandService: ICommandService);
     dispose(): void;
     private _init;
     private _initCommands;

package/lib/types/index.d.ts

@@ -16,4 +16,5 @@
 export { SheetReplaceCommand } from './commands/commands/sheet-replace.command';
 export type { IUniverSheetsFindReplaceConfig } from './config/config';
 export { SheetsFindReplaceController } from './controllers/sheet-find-replace.controller';
+export { UniverSheetsFindReplaceMobileUIPlugin } from './mobile-plugin';
 export { UniverSheetsFindReplacePlugin } from './plugin';

package/lib/types/mobile-plugin.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { IUniverSheetsFindReplaceConfig } from './config/config';
+import { IConfigService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
+export declare class UniverSheetsFindReplaceMobileUIPlugin extends Plugin {
+    private readonly _config;
+    protected readonly _injector: Injector;
+    private readonly _configService;
+    static pluginName: string;
+    static packageName: string;
+    static version: string;
+    static type: UniverInstanceType;
+    constructor(_config: Partial<IUniverSheetsFindReplaceConfig> | undefined, _injector: Injector, _configService: IConfigService);
+    onStarting(): void;
+    onRendered(): void;
+    onSteady(): void;
+}