@univerjs/sheets-find-replace 0.24.0 → 0.25.0

package/lib/cjs/facade.js

@@ -4,7 +4,7 @@ let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 let rxjs = require("rxjs");
 let _univerjs_core_facade = require("@univerjs/core/facade");
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.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/cjs/index.js

@@ -43,7 +43,7 @@ function getReplaceAllResult(results, replacements) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -54,7 +54,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -67,14 +67,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -162,7 +162,7 @@ function isSelectionSingleCell(selection, worksheet) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -170,7 +170,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.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);
@@ -527,14 +527,17 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 	_getSheetObject() {
 		return (0, _univerjs_sheets_ui.getSheetObject)(this._univerInstanceService, this._renderManagerService);
 	}
-	_focusMatch(match) {
+	async _focusMatch(match) {
 		var _this$_workbook$getAc;
-		const subUnitId = match.range.subUnitId;
-		if (subUnitId !== ((_this$_workbook$getAc = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc === void 0 ? void 0 : _this$_workbook$getAc.getSheetId())) this._commandService.executeCommand(_univerjs_sheets.SetWorksheetActivateCommand.id, {
-			unitId: this._workbook.getUnitId(),
-			subUnitId
-		}, { fromFindReplace: true });
-		this._commandService.executeCommand(_univerjs_sheets_ui.ScrollToCellCommand.id, { range: match.range.range }, { fromFindReplace: true });
+		const { subUnitId, range } = match.range;
+		if (subUnitId !== ((_this$_workbook$getAc = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc === void 0 ? void 0 : _this$_workbook$getAc.getSheetId())) {
+			const unitId = this._workbook.getUnitId();
+			await this._commandService.executeCommand(_univerjs_sheets.SetWorksheetActivateCommand.id, {
+				unitId,
+				subUnitId
+			}, { fromFindReplace: true });
+		}
+		this._commandService.executeCommand(_univerjs_sheets_ui.ScrollToCellCommand.id, { range }, { fromFindReplace: true });
 	}
 	_tryRestoreLastMatchesPosition(lastMatch, newMatches) {
 		if (!lastMatch) return 0;
@@ -556,13 +559,12 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 		const ignoreSelection = (_params$ignoreSelecti = params === null || params === void 0 ? void 0 : params.ignoreSelection) !== null && _params$ignoreSelecti !== void 0 ? _params$ignoreSelecti : false;
 		const matchToMove = this._findNextMatch(loop, stayIfOnMatch, ignoreSelection);
 		if (matchToMove) {
-			var _this$_workbook$getAc2;
 			const [match, index] = matchToMove;
 			this._matchesPosition = index + 1;
 			if (this._query.findScope === _univerjs_find_replace.FindScope.UNIT) this._activeHighlightIndex = this._matchesByWorksheet.get(match.range.subUnitId).findIndex((m) => m === match);
 			else this._activeHighlightIndex = index;
 			if (!noFocus) this._focusMatch(match);
-			if (((_this$_workbook$getAc2 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc2 === void 0 ? void 0 : _this$_workbook$getAc2.getSheetId()) === match.range.subUnitId) this._updateCurrentHighlightShape(this._activeHighlightIndex);
+			this._updateCurrentHighlightShape(this._activeHighlightIndex);
 			return match;
 		}
 		this._matchesPosition = 0;
@@ -578,13 +580,12 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 		const ignoreSelection = (_params$ignoreSelecti2 = params === null || params === void 0 ? void 0 : params.ignoreSelection) !== null && _params$ignoreSelecti2 !== void 0 ? _params$ignoreSelecti2 : false;
 		const matchToMove = this._findPreviousMatch(loop, stayIfOnMatch, ignoreSelection);
 		if (matchToMove) {
-			var _this$_workbook$getAc3;
 			const [match, index] = matchToMove;
 			this._matchesPosition = index + 1;
 			if (this._query.findScope === _univerjs_find_replace.FindScope.UNIT) this._activeHighlightIndex = this._matchesByWorksheet.get(match.range.subUnitId).findIndex((m) => m === match);
 			else this._activeHighlightIndex = index;
 			if (!noFocus) this._focusMatch(match);
-			if (((_this$_workbook$getAc3 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc3 === void 0 ? void 0 : _this$_workbook$getAc3.getSheetId()) === match.range.subUnitId) this._updateCurrentHighlightShape(this._activeHighlightIndex);
+			this._updateCurrentHighlightShape(this._activeHighlightIndex);
 			return match;
 		}
 		this._matchesPosition = 0;
@@ -592,7 +593,7 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 		return null;
 	}
 	_findPreviousMatch(loop = false, stayIfOnMatch = false, ignoreSelection = false) {
-		var _this$_workbook$getAc4;
+		var _this$_workbook$getAc2;
 		if (this.currentMatch) {
 			const currentMatchIndex = this._matches.findIndex((match) => match === this.currentMatch);
 			if (stayIfOnMatch) return [this.currentMatch, currentMatchIndex];
@@ -608,14 +609,14 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 			return [this._matches[lastIndex], lastIndex];
 		}
 		if (this._query.findScope !== _univerjs_find_replace.FindScope.UNIT) return this._findPreviousMatchByRange(this._matches, lastSelection.range);
-		const currentSheetId = (_this$_workbook$getAc4 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc4 === void 0 ? void 0 : _this$_workbook$getAc4.getSheetId();
+		const currentSheetId = (_this$_workbook$getAc2 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc2 === void 0 ? void 0 : _this$_workbook$getAc2.getSheetId();
 		if (!currentSheetId) return null;
 		const worksheetThatHasMatch = this._findPreviousWorksheetThatHasAMatch(currentSheetId, loop);
 		if (!worksheetThatHasMatch) return null;
 		return this._findPreviousMatchByRange(this._matchesByWorksheet.get(worksheetThatHasMatch), lastSelection.range);
 	}
 	_findNextMatch(loop = false, stayIfOnMatch = false, ignoreSelection = false) {
-		var _this$_workbook$getAc5;
+		var _this$_workbook$getAc3;
 		if (this.currentMatch) {
 			const currentMatchIndex = this._matches.findIndex((match) => match === this.currentMatch);
 			if (stayIfOnMatch) return [this.currentMatch, currentMatchIndex];
@@ -628,7 +629,7 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 		const last = this._workbookSelections.getCurrentLastSelection();
 		if (ignoreSelection || !last) return [this._matches[0], 0];
 		if (this._query.findScope !== _univerjs_find_replace.FindScope.UNIT) return this._findNextMatchByRange(this._matches, last.range, stayIfOnMatch);
-		const currentSheetId = (_this$_workbook$getAc5 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc5 === void 0 ? void 0 : _this$_workbook$getAc5.getSheetId();
+		const currentSheetId = (_this$_workbook$getAc3 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc3 === void 0 ? void 0 : _this$_workbook$getAc3.getSheetId();
 		if (!currentSheetId) return null;
 		const worksheetThatHasMatch = this._findNextWorksheetThatHasAMatch(currentSheetId, loop);
 		if (!worksheetThatHasMatch) return null;
@@ -722,7 +723,7 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 		if (match.isFormula) {
 			if (!shouldReplaceFormula) return null;
 			return {
-				f: currentContent.f.replace(new RegExp(escapeRegExp(findString), replaceFlag), replaceString),
+				f: currentContent.f.replace(new RegExp((0, _univerjs_core.escapeRegExp)(findString), replaceFlag), replaceString),
 				v: null
 			};
 		}
@@ -731,7 +732,7 @@ let SheetFindModel = class SheetFindModel extends _univerjs_find_replace.FindMod
 			(0, _univerjs_core.replaceInDocumentBody)(clonedRichText.body, findString, replaceString, this._query.caseSensitive);
 			return { p: clonedRichText };
 		}
-		return { v: currentContent.v.toString().replace(new RegExp(escapeRegExp(findString), replaceFlag), replaceString) };
+		return { v: currentContent.v.toString().replace(new RegExp((0, _univerjs_core.escapeRegExp)(findString), replaceFlag), replaceString) };
 	}
 };
 SheetFindModel = __decorate([
@@ -742,9 +743,6 @@ SheetFindModel = __decorate([
 	__decorateParam(6, (0, _univerjs_core.Inject)(_univerjs_core.ThemeService)),
 	__decorateParam(7, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService))
 ], SheetFindModel);
-function escapeRegExp(text) {
-	return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-}
 /**
 * This module is responsible for searching and replacing in the sheets.
 * It also adds the search results to the search view by highlighting them.
@@ -870,7 +868,7 @@ function trimLeadingTrailingWhitespace(value) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-find-replace";
-var version = "0.24.0";
+var version = "0.25.0";
 
 //#endregion
 //#region src/config/config.ts

package/lib/es/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.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.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/es/index.js

@@ -1,4 +1,4 @@
-import { ColorKit, CommandType, DependentOn, Disposable, EDITOR_ACTIVATED, ICommandService, IConfigService, IContextService, IUndoRedoService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, Rectangle, ThemeService, Tools, UniverInstanceType, fromCallback, groupBy, merge, replaceInDocumentBody, rotate } from "@univerjs/core";
+import { ColorKit, CommandType, DependentOn, Disposable, EDITOR_ACTIVATED, ICommandService, IConfigService, IContextService, IUndoRedoService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, Rectangle, ThemeService, Tools, UniverInstanceType, escapeRegExp, fromCallback, groupBy, merge, replaceInDocumentBody, rotate } from "@univerjs/core";
 import { SelectRangeCommand, SetRangeValuesCommand, SetSelectionsOperation, SetWorksheetActivateCommand, SetWorksheetActiveOperation, SheetsSelectionsService, UniverSheetsPlugin } from "@univerjs/sheets";
 import { IRenderManagerService, RENDER_RAW_FORMULA_KEY, Rect, Shape } from "@univerjs/engine-render";
 import { FindBy, FindDirection, FindModel, FindReplaceController, FindScope, IFindReplaceService, UniverFindReplacePlugin } from "@univerjs/find-replace";
@@ -42,7 +42,7 @@ function getReplaceAllResult(results, replacements) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.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);
@@ -526,14 +526,17 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 	_getSheetObject() {
 		return getSheetObject(this._univerInstanceService, this._renderManagerService);
 	}
-	_focusMatch(match) {
+	async _focusMatch(match) {
 		var _this$_workbook$getAc;
-		const subUnitId = match.range.subUnitId;
-		if (subUnitId !== ((_this$_workbook$getAc = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc === void 0 ? void 0 : _this$_workbook$getAc.getSheetId())) this._commandService.executeCommand(SetWorksheetActivateCommand.id, {
-			unitId: this._workbook.getUnitId(),
-			subUnitId
-		}, { fromFindReplace: true });
-		this._commandService.executeCommand(ScrollToCellCommand.id, { range: match.range.range }, { fromFindReplace: true });
+		const { subUnitId, range } = match.range;
+		if (subUnitId !== ((_this$_workbook$getAc = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc === void 0 ? void 0 : _this$_workbook$getAc.getSheetId())) {
+			const unitId = this._workbook.getUnitId();
+			await this._commandService.executeCommand(SetWorksheetActivateCommand.id, {
+				unitId,
+				subUnitId
+			}, { fromFindReplace: true });
+		}
+		this._commandService.executeCommand(ScrollToCellCommand.id, { range }, { fromFindReplace: true });
 	}
 	_tryRestoreLastMatchesPosition(lastMatch, newMatches) {
 		if (!lastMatch) return 0;
@@ -555,13 +558,12 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 		const ignoreSelection = (_params$ignoreSelecti = params === null || params === void 0 ? void 0 : params.ignoreSelection) !== null && _params$ignoreSelecti !== void 0 ? _params$ignoreSelecti : false;
 		const matchToMove = this._findNextMatch(loop, stayIfOnMatch, ignoreSelection);
 		if (matchToMove) {
-			var _this$_workbook$getAc2;
 			const [match, index] = matchToMove;
 			this._matchesPosition = index + 1;
 			if (this._query.findScope === FindScope.UNIT) this._activeHighlightIndex = this._matchesByWorksheet.get(match.range.subUnitId).findIndex((m) => m === match);
 			else this._activeHighlightIndex = index;
 			if (!noFocus) this._focusMatch(match);
-			if (((_this$_workbook$getAc2 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc2 === void 0 ? void 0 : _this$_workbook$getAc2.getSheetId()) === match.range.subUnitId) this._updateCurrentHighlightShape(this._activeHighlightIndex);
+			this._updateCurrentHighlightShape(this._activeHighlightIndex);
 			return match;
 		}
 		this._matchesPosition = 0;
@@ -577,13 +579,12 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 		const ignoreSelection = (_params$ignoreSelecti2 = params === null || params === void 0 ? void 0 : params.ignoreSelection) !== null && _params$ignoreSelecti2 !== void 0 ? _params$ignoreSelecti2 : false;
 		const matchToMove = this._findPreviousMatch(loop, stayIfOnMatch, ignoreSelection);
 		if (matchToMove) {
-			var _this$_workbook$getAc3;
 			const [match, index] = matchToMove;
 			this._matchesPosition = index + 1;
 			if (this._query.findScope === FindScope.UNIT) this._activeHighlightIndex = this._matchesByWorksheet.get(match.range.subUnitId).findIndex((m) => m === match);
 			else this._activeHighlightIndex = index;
 			if (!noFocus) this._focusMatch(match);
-			if (((_this$_workbook$getAc3 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc3 === void 0 ? void 0 : _this$_workbook$getAc3.getSheetId()) === match.range.subUnitId) this._updateCurrentHighlightShape(this._activeHighlightIndex);
+			this._updateCurrentHighlightShape(this._activeHighlightIndex);
 			return match;
 		}
 		this._matchesPosition = 0;
@@ -591,7 +592,7 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 		return null;
 	}
 	_findPreviousMatch(loop = false, stayIfOnMatch = false, ignoreSelection = false) {
-		var _this$_workbook$getAc4;
+		var _this$_workbook$getAc2;
 		if (this.currentMatch) {
 			const currentMatchIndex = this._matches.findIndex((match) => match === this.currentMatch);
 			if (stayIfOnMatch) return [this.currentMatch, currentMatchIndex];
@@ -607,14 +608,14 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 			return [this._matches[lastIndex], lastIndex];
 		}
 		if (this._query.findScope !== FindScope.UNIT) return this._findPreviousMatchByRange(this._matches, lastSelection.range);
-		const currentSheetId = (_this$_workbook$getAc4 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc4 === void 0 ? void 0 : _this$_workbook$getAc4.getSheetId();
+		const currentSheetId = (_this$_workbook$getAc2 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc2 === void 0 ? void 0 : _this$_workbook$getAc2.getSheetId();
 		if (!currentSheetId) return null;
 		const worksheetThatHasMatch = this._findPreviousWorksheetThatHasAMatch(currentSheetId, loop);
 		if (!worksheetThatHasMatch) return null;
 		return this._findPreviousMatchByRange(this._matchesByWorksheet.get(worksheetThatHasMatch), lastSelection.range);
 	}
 	_findNextMatch(loop = false, stayIfOnMatch = false, ignoreSelection = false) {
-		var _this$_workbook$getAc5;
+		var _this$_workbook$getAc3;
 		if (this.currentMatch) {
 			const currentMatchIndex = this._matches.findIndex((match) => match === this.currentMatch);
 			if (stayIfOnMatch) return [this.currentMatch, currentMatchIndex];
@@ -627,7 +628,7 @@ let SheetFindModel = class SheetFindModel extends FindModel {
 		const last = this._workbookSelections.getCurrentLastSelection();
 		if (ignoreSelection || !last) return [this._matches[0], 0];
 		if (this._query.findScope !== FindScope.UNIT) return this._findNextMatchByRange(this._matches, last.range, stayIfOnMatch);
-		const currentSheetId = (_this$_workbook$getAc5 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc5 === void 0 ? void 0 : _this$_workbook$getAc5.getSheetId();
+		const currentSheetId = (_this$_workbook$getAc3 = this._workbook.getActiveSheet()) === null || _this$_workbook$getAc3 === void 0 ? void 0 : _this$_workbook$getAc3.getSheetId();
 		if (!currentSheetId) return null;
 		const worksheetThatHasMatch = this._findNextWorksheetThatHasAMatch(currentSheetId, loop);
 		if (!worksheetThatHasMatch) return null;
@@ -741,9 +742,6 @@ SheetFindModel = __decorate([
 	__decorateParam(6, Inject(ThemeService)),
 	__decorateParam(7, Inject(SheetsSelectionsService))
 ], SheetFindModel);
-function escapeRegExp(text) {
-	return text.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
-}
 /**
 * This module is responsible for searching and replacing in the sheets.
 * It also adds the search results to the search view by highlighting them.
@@ -869,7 +867,7 @@ function trimLeadingTrailingWhitespace(value) {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-find-replace";
-var version = "0.24.0";
+var version = "0.25.0";
 
 //#endregion
 //#region src/config/config.ts

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.129.0/helpers/typeof.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.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.129.0/helpers/decorate.js
+//#region \0@oxc-project+runtime@0.133.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);