@univerjs/sheets-filter 0.2.4 → 0.2.6

package/lib/es/index.js

@@ -1,89 +1,95 @@
-var ue = Object.defineProperty;
-var de = (n, t, e) => t in n ? ue(n, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : n[t] = e;
-var C = (n, t, e) => de(n, typeof t != "symbol" ? t + "" : t, e);
-import { isNumeric as he, Disposable as b, Rectangle as k, mergeSets as z, Tools as q, extractPureTextFromCell as fe, CellValueType as j, CommandType as $, UniverInstanceType as V, fromCallback as me, OnLifecycle as ee, LifecycleStages as te, IResourceManagerService as _e, IUniverInstanceService as re, ICommandService as ne, DisposableCollection as ge, moveMatrixArray as G, Plugin as Re } from "@univerjs/core";
-import { Inject as P, Injector as Ce } from "@wendellhu/redi";
-import { BehaviorSubject as N, merge as pe, filter as we, switchMap as Fe, of as Se } from "rxjs";
-import { SheetInterceptorService as ve, RefRangeService as Me, SetWorksheetActivateCommand as Ee, RemoveSheetCommand as Oe, INTERCEPTOR_POINT as ye, RemoveRowMutation as Ae, InsertRowMutation as Te, SetRangeValuesMutation as xe, expandToContinuousRange as Ne, getSheetCommandTarget as $e, MoveRowsCommand as Ie, MoveRangeCommand as Pe, EffectRefRangId as J, RemoveRowCommand as Be, RemoveColCommand as Le, InsertColCommand as be, InsertRowCommand as Ue } from "@univerjs/sheets";
-var O = /* @__PURE__ */ ((n) => (n.EQUAL = "equal", n.GREATER_THAN = "greaterThan", n.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", n.LESS_THAN = "lessThan", n.LESS_THAN_OR_EQUAL = "lessThanOrEqual", n.NOT_EQUALS = "notEqual", n))(O || {});
-const ze = {
-  operator: O.GREATER_THAN,
-  fn: (n, t) => T(n) ? n > t : !1
-}, He = {
-  operator: O.GREATER_THAN_OR_EQUAL,
-  fn: (n, t) => T(n) ? n >= t : !1
-}, We = {
-  operator: O.LESS_THAN,
-  fn: (n, t) => T(n) ? n < t : !1
-}, je = {
-  operator: O.LESS_THAN_OR_EQUAL,
-  fn: (n, t) => T(n) ? n <= t : !1
-}, Ve = {
-  operator: O.EQUAL,
-  fn: (n, t) => T(n) ? n === t : !1
-}, se = {
-  operator: O.NOT_EQUALS,
-  fn: (n, t) => {
-    if (typeof t == "string") {
-      if (t === " ")
-        return n != null;
-      const e = oe(n);
-      return e && Ge(t) ? !le(t).test(e) : e !== t;
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { isNumeric, Disposable, Rectangle, mergeSets, Tools, extractPureTextFromCell, CellValueType, CommandType, UniverInstanceType, fromCallback, OnLifecycle, LifecycleStages, IResourceManagerService, IUniverInstanceService, ICommandService, Inject, DisposableCollection, moveMatrixArray, Plugin, Injector } from "@univerjs/core";
+import { BehaviorSubject, merge, filter, switchMap, of } from "rxjs";
+import { SheetInterceptorService, RefRangeService, SetWorksheetActivateCommand, RemoveSheetCommand, INTERCEPTOR_POINT, RemoveRowMutation, InsertRowMutation, SetRangeValuesMutation, expandToContinuousRange, getSheetCommandTarget, MoveRowsCommand, MoveRangeCommand, EffectRefRangId, RemoveRowCommand, RemoveColCommand, InsertColCommand, InsertRowCommand } from "@univerjs/sheets";
+var CustomFilterOperator = /* @__PURE__ */ ((CustomFilterOperator2) => (CustomFilterOperator2.EQUAL = "equal", CustomFilterOperator2.GREATER_THAN = "greaterThan", CustomFilterOperator2.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", CustomFilterOperator2.LESS_THAN = "lessThan", CustomFilterOperator2.LESS_THAN_OR_EQUAL = "lessThanOrEqual", CustomFilterOperator2.NOT_EQUALS = "notEqual", CustomFilterOperator2))(CustomFilterOperator || {});
+const greaterThan = {
+  operator: CustomFilterOperator.GREATER_THAN,
+  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value > compare : !1, "fn")
+}, greaterThanOrEqualTo = {
+  operator: CustomFilterOperator.GREATER_THAN_OR_EQUAL,
+  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value >= compare : !1, "fn")
+}, lessThan = {
+  operator: CustomFilterOperator.LESS_THAN,
+  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value < compare : !1, "fn")
+}, lessThanOrEqualTo = {
+  operator: CustomFilterOperator.LESS_THAN_OR_EQUAL,
+  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value <= compare : !1, "fn")
+}, equals = {
+  operator: CustomFilterOperator.EQUAL,
+  fn: /* @__PURE__ */ __name((value, compare) => ensureNumber(value) ? value === compare : !1, "fn")
+}, notEquals = {
+  operator: CustomFilterOperator.NOT_EQUALS,
+  fn: /* @__PURE__ */ __name((value, compare) => {
+    if (typeof compare == "string") {
+      if (compare === " ")
+        return value != null;
+      const ensuredString = ensureString(value);
+      return ensuredString && isWildCardString(compare) ? !createREGEXFromWildChar(compare).test(ensuredString) : ensuredString !== compare;
     }
-    return T(n) ? n !== t : !0;
-  }
-}, ie = /* @__PURE__ */ new Map([]), De = [ze, He, We, je, Ve, se];
-De.forEach((n) => {
-  ie.set(n.operator, n);
+    return ensureNumber(value) ? value !== compare : !0;
+  }, "fn")
+}, CustomFilterFnRegistry = /* @__PURE__ */ new Map([]), ALL_CUSTOM_FILTER_FUNCTIONS = [greaterThan, greaterThanOrEqualTo, lessThan, lessThanOrEqualTo, equals, notEquals];
+ALL_CUSTOM_FILTER_FUNCTIONS.forEach((fn) => {
+  CustomFilterFnRegistry.set(fn.operator, fn);
 });
-function Qe(n) {
-  return !!n;
+function isNumericFilterFn(operator) {
+  return !!operator;
 }
-const qe = {
-  fn: (n, t) => {
-    const e = oe(n);
-    return e === null ? t === "" : le(t).test(e);
-  }
+__name(isNumericFilterFn, "isNumericFilterFn");
+const textMatch = {
+  fn: /* @__PURE__ */ __name((value, compare) => {
+    const ensured = ensureString(value);
+    return ensured === null ? compare === "" : createREGEXFromWildChar(compare).test(ensured);
+  }, "fn")
 };
-function X(n) {
-  return n ? ie.get(n) : qe;
+function getCustomFilterFn(operator) {
+  return operator ? CustomFilterFnRegistry.get(operator) : textMatch;
 }
-function T(n) {
-  return typeof n == "number";
+__name(getCustomFilterFn, "getCustomFilterFn");
+function ensureNumber(value) {
+  return typeof value == "number";
 }
-function Y(n) {
-  return !!(typeof n == "number" || typeof n == "string" && he(n));
+__name(ensureNumber, "ensureNumber");
+function ensureNumeric(value) {
+  return !!(typeof value == "number" || typeof value == "string" && isNumeric(value));
 }
-function oe(n) {
-  return typeof n == "boolean" || n == null ? null : typeof n == "string" ? n : n.toString();
+__name(ensureNumeric, "ensureNumeric");
+function ensureString(value) {
+  return typeof value == "boolean" || value == null ? null : typeof value == "string" ? value : value.toString();
 }
-function Ge(n) {
-  return typeof n == "number" ? !1 : n.indexOf("*") !== -1 || n.indexOf("?") !== -1;
+__name(ensureString, "ensureString");
+function isWildCardString(str) {
+  return typeof str == "number" ? !1 : str.indexOf("*") !== -1 || str.indexOf("?") !== -1;
 }
-function le(n) {
-  const t = n.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
-  return new RegExp(`^${t}$`);
+__name(isWildCardString, "isWildCardString");
+function createREGEXFromWildChar(wildChar) {
+  const regexpStr = wildChar.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
+  return new RegExp(`^${regexpStr}$`);
 }
-const H = () => /* @__PURE__ */ new Set();
-class L extends b {
-  constructor(e, r, s) {
+__name(createREGEXFromWildChar, "createREGEXFromWildChar");
+const EMPTY = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Set(), "EMPTY"), _FilterModel = class _FilterModel extends Disposable {
+  constructor(unitId, subUnitId, _worksheet) {
     super();
-    C(this, "_filteredOutRows$", new N(H()));
+    __publicField(this, "_filteredOutRows$", new BehaviorSubject(EMPTY()));
     /** An observable value. A set of filtered out rows. */
-    C(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
+    __publicField(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
-    C(this, "_hasCriteria$", new N(!1));
-    C(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    C(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    C(this, "_alreadyFilteredOutRows", H());
-    C(this, "_range");
-    this.unitId = e, this.subUnitId = r, this._worksheet = s;
+    __publicField(this, "_hasCriteria$", new BehaviorSubject(!1));
+    __publicField(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    __publicField(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
+    __publicField(this, "_alreadyFilteredOutRows", EMPTY());
+    __publicField(this, "_range");
+    this.unitId = unitId, this.subUnitId = subUnitId, this._worksheet = _worksheet;
   }
   get filteredOutRows() {
     return this._filteredOutRows$.getValue();
   }
-  set filteredOutRows(e) {
-    this._alreadyFilteredOutRows = e, this._filteredOutRows$.next(e);
+  set filteredOutRows(rows) {
+    this._alreadyFilteredOutRows = rows, this._filteredOutRows$.next(rows);
   }
   dispose() {
     super.dispose(), this._filteredOutRows$.complete(), this._hasCriteria$.complete();
@@ -92,11 +98,11 @@ class L extends b {
    * Serialize this filter model to the JSON format representation.
    */
   serialize() {
-    const e = {
-      ref: k.clone(this._range),
-      filterColumns: this._getAllFilterColumns(!0).sort(([r], [s]) => r - s).map(([r, s]) => s.serialize())
+    const result = {
+      ref: Rectangle.clone(this._range),
+      filterColumns: this._getAllFilterColumns(!0).sort(([offset1], [offset2]) => offset1 - offset2).map(([_, filterColumn]) => filterColumn.serialize())
     };
-    return this._alreadyFilteredOutRows && (e.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), e;
+    return this._alreadyFilteredOutRows && (result.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), result;
   }
   /**
    * Deserialize auto filter info to construct a `FilterModel` object.
@@ -105,16 +111,16 @@ class L extends b {
    * @param worksheet the Worksheet object
    * @param autoFilter auto filter data
    */
-  static deserialize(e, r, s, i) {
-    const o = new L(e, r, s);
-    return o._dump(i), o;
+  static deserialize(unitId, subUnitId, worksheet, autoFilter) {
+    const filterModel = new _FilterModel(unitId, subUnitId, worksheet);
+    return filterModel._dump(autoFilter), filterModel;
   }
-  _dump(e) {
-    var r;
-    this.setRange(e.ref), (r = e.filterColumns) == null || r.forEach((s) => this._setCriteriaWithoutReCalc(s.colId, s)), e.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(e.cachedFilteredOut), this._emit()), this._emitHasCriteria();
+  _dump(autoFilter) {
+    var _a4;
+    this.setRange(autoFilter.ref), (_a4 = autoFilter.filterColumns) == null || _a4.forEach((filterColumn) => this._setCriteriaWithoutReCalc(filterColumn.colId, filterColumn)), autoFilter.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(autoFilter.cachedFilteredOut), this._emit()), this._emitHasCriteria();
   }
-  isRowFiltered(e) {
-    return this._alreadyFilteredOutRows.has(e);
+  isRowFiltered(row) {
+    return this._alreadyFilteredOutRows.has(row);
   }
   getRange() {
     if (!this._range)
@@ -126,74 +132,74 @@ class L extends b {
    * another word it would not change `filteredOutRows` on `FilterModel` nor `FilterColumn`.
    * @param col
    */
-  getFilteredOutRowsExceptCol(e) {
-    return this._getAllFilterColumns(!0).filter(([r]) => r !== e).reduce((r, [, s]) => {
-      const i = s.calc({ getAlreadyFilteredOutRows: () => r });
-      return i ? z(r, i) : r;
+  getFilteredOutRowsExceptCol(col) {
+    return this._getAllFilterColumns(!0).filter(([colOffset]) => colOffset !== col).reduce((acc, [, filterColumn]) => {
+      const newResult = filterColumn.calc({ getAlreadyFilteredOutRows: /* @__PURE__ */ __name(() => acc, "getAlreadyFilteredOutRows") });
+      return newResult ? mergeSets(acc, newResult) : acc;
     }, /* @__PURE__ */ new Set());
   }
   /**
    * Set range of the filter model, this would remove some `IFilterColumn`
    * if the new range not overlaps the old range.
    */
-  setRange(e) {
-    this._range = e, this._getAllFilterColumns(!0).forEach(([r, s]) => {
-      s.setRangeAndColumn({
-        startRow: e.startRow,
-        endRow: e.endRow,
-        startColumn: r,
-        endColumn: r
-      }, r);
+  setRange(range) {
+    this._range = range, this._getAllFilterColumns(!0).forEach(([col, filterColumn]) => {
+      filterColumn.setRangeAndColumn({
+        startRow: range.startRow,
+        endRow: range.endRow,
+        startColumn: col,
+        endColumn: col
+      }, col);
     });
   }
   /**
    * Set or remove filter criteria on a specific row.
    */
-  setCriteria(e, r, s = !1) {
+  setCriteria(col, criteria, reCalc = !1) {
     if (!this._range)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    if (!r) {
-      this._removeCriteria(e), this._rebuildAlreadyFilteredOutRowsWithCache(), s && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
+    if (!criteria) {
+      this._removeCriteria(col), this._rebuildAlreadyFilteredOutRowsWithCache(), reCalc && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
       return;
     }
-    this._setCriteriaWithoutReCalc(e, r), s && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
+    this._setCriteriaWithoutReCalc(col, criteria), reCalc && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
   }
   getAllFilterColumns() {
     return this._getAllFilterColumns(!0);
   }
-  getFilterColumn(e) {
-    var r;
-    return (r = this._filterColumnByIndex.get(e)) != null ? r : null;
+  getFilterColumn(index) {
+    var _a4;
+    return (_a4 = this._filterColumnByIndex.get(index)) != null ? _a4 : null;
   }
   reCalc() {
     this._reCalcAllColumns(), this._emit();
   }
-  _getAllFilterColumns(e = !1) {
-    const r = Array.from(this._filterColumnByIndex.entries());
-    return e ? r : r.map(([s, i]) => i);
+  _getAllFilterColumns(withCol = !1) {
+    const columns = Array.from(this._filterColumnByIndex.entries());
+    return withCol ? columns : columns.map(([_, filterColumn]) => filterColumn);
   }
   _reCalcAllColumns() {
-    this._alreadyFilteredOutRows = H(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
+    this._alreadyFilteredOutRows = EMPTY(), this._getAllFilterColumns().forEach((filterColumn) => filterColumn.__clearCache()), this._reCalcWithNoCacheColumns();
   }
-  _setCriteriaWithoutReCalc(e, r) {
-    const s = this._range;
-    if (!s)
+  _setCriteriaWithoutReCalc(col, criteria) {
+    const range = this._range;
+    if (!range)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    const { startColumn: i, endColumn: o } = s;
-    if (e > o || e < i)
-      throw new Error(`[FilterModel] could not set criteria on column ${e} which is out of range!`);
-    let l;
-    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new Je(
+    const { startColumn, endColumn } = range;
+    if (col > endColumn || col < startColumn)
+      throw new Error(`[FilterModel] could not set criteria on column ${col} which is out of range!`);
+    let filterColumn;
+    this._filterColumnByIndex.has(col) ? filterColumn = this._filterColumnByIndex.get(col) : (filterColumn = new FilterColumn(
       this.unitId,
       this.subUnitId,
       this._worksheet,
-      r,
-      { getAlreadyFilteredOutRows: () => this._alreadyFilteredOutRows }
-    ), l.setRangeAndColumn(s, e), this._filterColumnByIndex.set(e, l)), l.setCriteria(r);
+      criteria,
+      { getAlreadyFilteredOutRows: /* @__PURE__ */ __name(() => this._alreadyFilteredOutRows, "getAlreadyFilteredOutRows") }
+    ), filterColumn.setRangeAndColumn(range, col), this._filterColumnByIndex.set(col, filterColumn)), filterColumn.setCriteria(criteria);
   }
-  _removeCriteria(e) {
-    const r = this._filterColumnByIndex.get(e);
-    r && (r.dispose(), this._filterColumnByIndex.delete(e));
+  _removeCriteria(col) {
+    const filterColumn = this._filterColumnByIndex.get(col);
+    filterColumn && (filterColumn.dispose(), this._filterColumnByIndex.delete(col));
   }
   _emit() {
     this._filteredOutRows$.next(this._alreadyFilteredOutRows);
@@ -202,27 +208,29 @@ class L extends b {
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const e = this._getAllFilterColumns().filter((r) => r.hasCache()).reduce((r, s) => z(r, s.filteredOutRows), /* @__PURE__ */ new Set());
-    this._alreadyFilteredOutRows = e;
+    const newFilteredOutRows = this._getAllFilterColumns().filter((filterColumn) => filterColumn.hasCache()).reduce((acc, filterColumn) => mergeSets(acc, filterColumn.filteredOutRows), /* @__PURE__ */ new Set());
+    this._alreadyFilteredOutRows = newFilteredOutRows;
   }
   _reCalcWithNoCacheColumns() {
-    const e = this._getAllFilterColumns().filter((r) => !r.hasCache());
-    for (const r of e) {
-      const s = r.reCalc();
-      s && (this._alreadyFilteredOutRows = z(this._alreadyFilteredOutRows, s));
+    const noCacheFilteredOutRows = this._getAllFilterColumns().filter((filterColumn) => !filterColumn.hasCache());
+    for (const filterColumn of noCacheFilteredOutRows) {
+      const filteredRows = filterColumn.reCalc();
+      filteredRows && (this._alreadyFilteredOutRows = mergeSets(this._alreadyFilteredOutRows, filteredRows));
     }
   }
-}
-class Je extends b {
-  constructor(e, r, s, i, o) {
+};
+__name(_FilterModel, "FilterModel");
+let FilterModel = _FilterModel;
+const _FilterColumn = class _FilterColumn extends Disposable {
+  constructor(unitId, subUnitId, _worksheet, _criteria, _filterColumnContext) {
     super();
-    C(this, "_filteredOutRows", null);
+    __publicField(this, "_filteredOutRows", null);
     /** Cache the filter function.  */
-    C(this, "_filterFn", null);
-    C(this, "_range", null);
-    C(this, "_column", 0);
-    C(this, "_filterByValues", !1);
-    this.unitId = e, this.subUnitId = r, this._worksheet = s, this._criteria = i, this._filterColumnContext = o;
+    __publicField(this, "_filterFn", null);
+    __publicField(this, "_range", null);
+    __publicField(this, "_column", 0);
+    __publicField(this, "_filterByValues", !1);
+    this.unitId = unitId, this.subUnitId = subUnitId, this._worksheet = _worksheet, this._criteria = _criteria, this._filterColumnContext = _filterColumnContext;
   }
   get filteredOutRows() {
     return this._filteredOutRows;
@@ -239,7 +247,7 @@ class Je extends b {
   serialize() {
     if (!this._criteria)
       throw new Error("[FilterColumn]: could not serialize without a filter column!");
-    return q.deepClone({
+    return Tools.deepClone({
       ...this._criteria,
       colId: this._column
     });
@@ -248,14 +256,14 @@ class Je extends b {
     return this._filteredOutRows !== null;
   }
   // The first row should be omitted!
-  setRangeAndColumn(e, r) {
-    this._range = e, this._column = r;
+  setRangeAndColumn(range, column) {
+    this._range = range, this._column = column;
   }
-  setCriteria(e) {
-    this._criteria = e, this._generateFilterFn(), this._filteredOutRows = null;
+  setCriteria(criteria) {
+    this._criteria = criteria, this._generateFilterFn(), this._filteredOutRows = null;
   }
   getColumnData() {
-    return q.deepClone(this._criteria);
+    return Tools.deepClone(this._criteria);
   }
   /**
    * Trigger new calculation on this `FilterModel` instance.
@@ -266,132 +274,144 @@ class Je extends b {
   reCalc() {
     return this._filteredOutRows = this.calc(this._filterColumnContext), this._filteredOutRows;
   }
-  calc(e) {
+  calc(context) {
     if (!this._filterFn)
       throw new Error("[FilterColumn] cannot calculate without a filter fn!");
     if (!this._range)
       throw new Error("[FilterColumn] cannot calculate without a range!");
     if (typeof this._column != "number")
       throw new TypeError("[FilterColumn] cannot calculate without a column offset!");
-    const r = this._column, s = { startColumn: r, endColumn: r, startRow: this._range.startRow + 1, endRow: this._range.endRow }, i = /* @__PURE__ */ new Set(), o = e.getAlreadyFilteredOutRows();
-    for (const l of this._worksheet.iterateByColumn(s, !1, !1)) {
-      const { row: c, rowSpan: u, col: a } = l;
-      if (o.has(c) && (!u || u === 1))
+    const column = this._column, iterateRange = { startColumn: column, endColumn: column, startRow: this._range.startRow + 1, endRow: this._range.endRow }, filteredOutRows = /* @__PURE__ */ new Set(), filteredOutByOthers = context.getAlreadyFilteredOutRows();
+    for (const range of this._worksheet.iterateByColumn(iterateRange, !1, !1)) {
+      const { row, rowSpan, col } = range;
+      if (filteredOutByOthers.has(row) && (!rowSpan || rowSpan === 1))
         continue;
-      const d = this._filterByValues ? fe(this._worksheet.getCell(c, a)) : rt(this._worksheet, c, a);
-      if (!this._filterFn(d) && (i.add(c), u))
-        for (let f = 1; f < u; f++)
-          i.add(c + f);
+      const value = this._filterByValues ? extractPureTextFromCell(this._worksheet.getCell(row, col)) : getFilterValueForConditionalFiltering(this._worksheet, row, col);
+      if (!this._filterFn(value) && (filteredOutRows.add(row), rowSpan))
+        for (let i = 1; i < rowSpan; i++)
+          filteredOutRows.add(row + i);
     }
-    return i;
+    return filteredOutRows;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = Xe(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = generateFilterFn(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
-}
-function Xe(n) {
-  if (n.filters)
-    return Ye(n.filters);
-  if (n.customFilters)
-    return Ke(n.customFilters);
+};
+__name(_FilterColumn, "FilterColumn");
+let FilterColumn = _FilterColumn;
+function generateFilterFn(column) {
+  if (column.filters)
+    return filterByValuesFnFactory(column.filters);
+  if (column.customFilters)
+    return customFilterFnFactory(column.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function Ye(n) {
-  const t = !!n.blank, e = new Set(n.filters);
-  return (r) => r === void 0 || r === "" ? t : e.has(typeof r == "string" ? r : `${r}`);
+__name(generateFilterFn, "generateFilterFn");
+function filterByValuesFnFactory(values) {
+  const includeBlank = !!values.blank, valuesSet = new Set(values.filters);
+  return (value) => value === void 0 || value === "" ? includeBlank : valuesSet.has(typeof value == "string" ? value : `${value}`);
 }
-function Ke(n) {
-  const t = n.customFilters.map((e) => tt(e));
-  return et(t) ? n.and ? Ze(t) : ke(t) : t[0];
+__name(filterByValuesFnFactory, "filterByValuesFnFactory");
+function customFilterFnFactory(customFilters) {
+  const customFilterFns = customFilters.customFilters.map((filter2) => generateCustomFilterFn(filter2));
+  return isCompoundCustomFilter(customFilterFns) ? customFilters.and ? AND(customFilterFns) : OR(customFilterFns) : customFilterFns[0];
 }
-function Ze(n) {
-  const [t, e] = n;
-  return (r) => t(r) && e(r);
+__name(customFilterFnFactory, "customFilterFnFactory");
+function AND(filterFns) {
+  const [fn1, fn2] = filterFns;
+  return (value) => fn1(value) && fn2(value);
 }
-function ke(n) {
-  const [t, e] = n;
-  return (r) => t(r) || e(r);
+__name(AND, "AND");
+function OR(filterFns) {
+  const [fn1, fn2] = filterFns;
+  return (value) => fn1(value) || fn2(value);
 }
-function et(n) {
-  return n.length === 2;
+__name(OR, "OR");
+function isCompoundCustomFilter(filter2) {
+  return filter2.length === 2;
 }
-function tt(n) {
-  const t = n.val;
-  if (n.operator === O.NOT_EQUALS && !Y(t))
-    return (s) => se.fn(s, t);
-  if (Qe(n.operator)) {
-    if (!Y(t)) return () => !1;
-    const s = X(n.operator), i = Number(t);
-    return (o) => s.fn(o, i);
-  }
-  const e = X(n.operator);
-  return (r) => e.fn(r, t);
+__name(isCompoundCustomFilter, "isCompoundCustomFilter");
+function generateCustomFilterFn(filter2) {
+  const compare = filter2.val;
+  if (filter2.operator === CustomFilterOperator.NOT_EQUALS && !ensureNumeric(compare))
+    return (value) => notEquals.fn(value, compare);
+  if (isNumericFilterFn(filter2.operator)) {
+    if (!ensureNumeric(compare)) return () => !1;
+    const customFilterFn2 = getCustomFilterFn(filter2.operator), ensuredNumber = Number(compare);
+    return (value) => customFilterFn2.fn(value, ensuredNumber);
+  }
+  const customFilterFn = getCustomFilterFn(filter2.operator);
+  return (value) => customFilterFn.fn(value, compare);
 }
-function rt(n, t, e) {
-  const r = n.getCell(t, e);
-  if (!r) return null;
-  const s = n.getCellRaw(t, e);
-  return r && !s ? K(r) : s ? r.t === j.NUMBER && typeof r.v == "string" ? s.v : K(s) : null;
+__name(generateCustomFilterFn, "generateCustomFilterFn");
+function getFilterValueForConditionalFiltering(worksheet, row, col) {
+  const interceptedCell = worksheet.getCell(row, col);
+  if (!interceptedCell) return null;
+  const rawCell = worksheet.getCellRaw(row, col);
+  return interceptedCell && !rawCell ? extractFilterValueFromCell(interceptedCell) : rawCell ? interceptedCell.t === CellValueType.NUMBER && typeof interceptedCell.v == "string" ? rawCell.v : extractFilterValueFromCell(rawCell) : null;
 }
-function K(n) {
-  var r, s;
-  const t = (s = (r = n.p) == null ? void 0 : r.body) == null ? void 0 : s.dataStream;
-  if (t) return t.trimEnd();
-  const e = n.v;
-  return typeof e == "string" ? n.t === j.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? n.t === j.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
+__name(getFilterValueForConditionalFiltering, "getFilterValueForConditionalFiltering");
+function extractFilterValueFromCell(cell) {
+  var _a4, _b;
+  const richTextValue = (_b = (_a4 = cell.p) == null ? void 0 : _a4.body) == null ? void 0 : _b.dataStream;
+  if (richTextValue) return richTextValue.trimEnd();
+  const rawValue = cell.v;
+  return typeof rawValue == "string" ? cell.t === CellValueType.BOOLEAN ? rawValue.toUpperCase() : rawValue : typeof rawValue == "number" ? cell.t === CellValueType.BOOLEAN ? rawValue ? "TRUE" : "FALSE" : rawValue : typeof rawValue == "boolean" ? rawValue ? "TRUE" : "FALSE" : "";
 }
-const w = {
+__name(extractFilterValueFromCell, "extractFilterValueFromCell");
+const SetSheetsFilterRangeMutation = {
   id: "sheet.mutation.set-filter-range",
-  type: $.MUTATION,
-  handler: (n, t) => {
-    const { subUnitId: e, unitId: r, range: s } = t;
-    return n.get(v).ensureFilterModel(r, e).setRange(s), !0;
-  }
-}, F = {
+  type: CommandType.MUTATION,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const { subUnitId, unitId, range } = params;
+    return accessor.get(SheetsFilterService).ensureFilterModel(unitId, subUnitId).setRange(range), !0;
+  }, "handler")
+}, SetSheetsFilterCriteriaMutation = {
   id: "sheet.mutation.set-filter-criteria",
-  type: $.MUTATION,
-  handler: (n, t) => {
-    const { subUnitId: e, unitId: r, criteria: s, col: i, reCalc: o = !0 } = t, c = n.get(v).getFilterModel(r, e);
-    return c ? (c.setCriteria(i, s, o), !0) : !1;
-  }
-}, A = {
+  type: CommandType.MUTATION,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const { subUnitId, unitId, criteria, col, reCalc = !0 } = params, filterModel = accessor.get(SheetsFilterService).getFilterModel(unitId, subUnitId);
+    return filterModel ? (filterModel.setCriteria(col, criteria, reCalc), !0) : !1;
+  }, "handler")
+}, RemoveSheetsFilterMutation = {
   id: "sheet.mutation.remove-filter",
-  type: $.MUTATION,
-  handler: (n, t) => {
-    const { unitId: e, subUnitId: r } = t;
-    return n.get(v).removeFilterModel(e, r);
-  }
-}, ae = {
+  type: CommandType.MUTATION,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const { unitId, subUnitId } = params;
+    return accessor.get(SheetsFilterService).removeFilterModel(unitId, subUnitId);
+  }, "handler")
+}, ReCalcSheetsFilterMutation = {
   id: "sheet.mutation.re-calc-filter",
-  type: $.MUTATION,
-  handler: (n, t) => {
-    const { unitId: e, subUnitId: r } = t, i = n.get(v).getFilterModel(e, r);
-    return i ? (i.reCalc(), !0) : !1;
-  }
+  type: CommandType.MUTATION,
+  handler: /* @__PURE__ */ __name((accessor, params) => {
+    const { unitId, subUnitId } = params, filterModel = accessor.get(SheetsFilterService).getFilterModel(unitId, subUnitId);
+    return filterModel ? (filterModel.reCalc(), !0) : !1;
+  }, "handler")
 };
-var nt = Object.defineProperty, st = Object.getOwnPropertyDescriptor, it = (n, t, e, r) => {
-  for (var s = r > 1 ? void 0 : r ? st(t, e) : t, i = n.length - 1, o; i >= 0; i--)
-    (o = n[i]) && (s = (r ? o(t, e, s) : o(s)) || s);
-  return r && s && nt(t, e, s), s;
-}, W = (n, t) => (e, r) => t(e, r, n);
-const ot = /* @__PURE__ */ new Set([
-  w.id,
-  F.id,
-  A.id,
-  ae.id
-]), ce = "SHEET_FILTER_PLUGIN";
-let v = class extends b {
-  constructor(t, e, r) {
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$2(target, key, result), result;
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2");
+const FILTER_MUTATIONS = /* @__PURE__ */ new Set([
+  SetSheetsFilterRangeMutation.id,
+  SetSheetsFilterCriteriaMutation.id,
+  RemoveSheetsFilterMutation.id,
+  ReCalcSheetsFilterMutation.id
+]), SHEET_FILTER_SNAPSHOT_ID = "SHEET_FILTER_PLUGIN";
+var _a;
+let SheetsFilterService = (_a = class extends Disposable {
+  constructor(_resourcesManagerService, _univerInstanceService, _commandService) {
     super();
-    C(this, "_filterModels", /* @__PURE__ */ new Map());
-    C(this, "_loadedUnitId$", new N(null));
-    C(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
-    C(this, "_errorMsg$", new N(null));
-    C(this, "errorMsg$", this._errorMsg$.asObservable());
-    C(this, "_activeFilterModel$", new N(null));
+    __publicField(this, "_filterModels", /* @__PURE__ */ new Map());
+    __publicField(this, "_loadedUnitId$", new BehaviorSubject(null));
+    __publicField(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
+    __publicField(this, "_errorMsg$", new BehaviorSubject(null));
+    __publicField(this, "errorMsg$", this._errorMsg$.asObservable());
+    __publicField(this, "_activeFilterModel$", new BehaviorSubject(null));
     /** An observable value emitting the current Workbook's active Worksheet's filter model (if there is one). */
-    C(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
-    this._resourcesManagerService = t, this._univerInstanceService = e, this._commandService = r, this._initModel(), this._initActiveFilterModel();
+    __publicField(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
+    this._resourcesManagerService = _resourcesManagerService, this._univerInstanceService = _univerInstanceService, this._commandService = _commandService, this._initModel(), this._initActiveFilterModel();
   }
   /** The current Workbook's active Worksheet's filter model (if there is one). */
   get activeFilterModel() {
@@ -402,202 +422,204 @@ let v = class extends b {
    * @param unitId
    * @param subUnitId
    */
-  ensureFilterModel(t, e) {
-    const r = this.getFilterModel(t, e);
-    if (r)
-      return r;
-    const s = this._univerInstanceService.getUniverSheetInstance(t);
-    if (!s)
-      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${t}!`);
-    const i = s.getSheetBySheetId(e);
-    if (!i)
-      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${e}!`);
-    const o = new L(t, e, i);
-    return this._cacheFilterModel(t, e, o), o;
-  }
-  getFilterModel(t, e) {
-    var r, s;
-    return (s = (r = this._filterModels.get(t)) == null ? void 0 : r.get(e)) != null ? s : null;
-  }
-  removeFilterModel(t, e) {
-    const r = this.getFilterModel(t, e);
-    return r ? (r.dispose(), this._filterModels.get(t).delete(e), !0) : !1;
-  }
-  setFilterErrorMsg(t) {
-    this._errorMsg$.next(t);
+  ensureFilterModel(unitId, subUnitId) {
+    const already = this.getFilterModel(unitId, subUnitId);
+    if (already)
+      return already;
+    const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+    if (!workbook)
+      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${unitId}!`);
+    const worksheet = workbook.getSheetBySheetId(subUnitId);
+    if (!worksheet)
+      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${subUnitId}!`);
+    const filterModel = new FilterModel(unitId, subUnitId, worksheet);
+    return this._cacheFilterModel(unitId, subUnitId, filterModel), filterModel;
+  }
+  getFilterModel(unitId, subUnitId) {
+    var _a4, _b;
+    return (_b = (_a4 = this._filterModels.get(unitId)) == null ? void 0 : _a4.get(subUnitId)) != null ? _b : null;
+  }
+  removeFilterModel(unitId, subUnitId) {
+    const already = this.getFilterModel(unitId, subUnitId);
+    return already ? (already.dispose(), this._filterModels.get(unitId).delete(subUnitId), !0) : !1;
+  }
+  setFilterErrorMsg(content) {
+    this._errorMsg$.next(content);
   }
   _updateActiveFilterModel() {
-    let t;
+    let workbook;
     try {
-      if (t = this._univerInstanceService.getCurrentUnitForType(V.UNIVER_SHEET), !t) {
+      if (workbook = this._univerInstanceService.getCurrentUnitForType(UniverInstanceType.UNIVER_SHEET), !workbook) {
         this._activeFilterModel$.next(null);
         return;
       }
     } catch {
       return;
     }
-    const e = t.getActiveSheet(!0);
-    if (!e) {
+    const activeSheet = workbook.getActiveSheet(!0);
+    if (!activeSheet) {
       this._activeFilterModel$.next(null);
       return;
     }
-    const r = e.getUnitId(), s = e.getSheetId(), i = this.getFilterModel(r, s);
-    this._activeFilterModel$.next(i);
+    const unitId = activeSheet.getUnitId(), subUnitId = activeSheet.getSheetId(), filterModel = this.getFilterModel(unitId, subUnitId);
+    this._activeFilterModel$.next(filterModel);
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      pe(
+      merge(
         // source1: executing filter related mutations
-        me(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(we(([t]) => t.type === $.MUTATION && ot.has(t.id))),
+        fromCallback(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(filter(([command]) => command.type === CommandType.MUTATION && FILTER_MUTATIONS.has(command.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(V.UNIVER_SHEET).pipe(Fe((t) => {
-          var e;
-          return (e = t == null ? void 0 : t.activeSheet$) != null ? e : Se(null);
+        this._univerInstanceService.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(switchMap((workbook) => {
+          var _a4;
+          return (_a4 = workbook == null ? void 0 : workbook.activeSheet$) != null ? _a4 : of(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
   }
-  _serializeAutoFiltersForUnit(t) {
-    const e = this._filterModels.get(t);
-    if (!e)
+  _serializeAutoFiltersForUnit(unitId) {
+    const allFilterModels = this._filterModels.get(unitId);
+    if (!allFilterModels)
       return "{}";
-    const r = {};
-    return e.forEach((s, i) => {
-      r[i] = s.serialize();
-    }), JSON.stringify(r);
-  }
-  _deserializeAutoFiltersForUnit(t, e) {
-    const r = this._univerInstanceService.getUniverSheetInstance(t);
-    Object.keys(e).forEach((s) => {
-      const i = e[s], o = L.deserialize(t, s, r.getSheetBySheetId(s), i);
-      this._cacheFilterModel(t, s, o);
+    const json = {};
+    return allFilterModels.forEach((model, worksheetId) => {
+      json[worksheetId] = model.serialize();
+    }), JSON.stringify(json);
+  }
+  _deserializeAutoFiltersForUnit(unitId, json) {
+    const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+    Object.keys(json).forEach((worksheetId) => {
+      const autoFilter = json[worksheetId], filterModel = FilterModel.deserialize(unitId, worksheetId, workbook.getSheetBySheetId(worksheetId), autoFilter);
+      this._cacheFilterModel(unitId, worksheetId, filterModel);
     });
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
-      pluginName: ce,
+      pluginName: SHEET_FILTER_SNAPSHOT_ID,
       businesses: [2],
-      toJson: (t) => this._serializeAutoFiltersForUnit(t),
-      parseJson: (t) => JSON.parse(t),
-      onLoad: (t, e) => {
-        this._deserializeAutoFiltersForUnit(t, e), this._loadedUnitId$.next(t), this._updateActiveFilterModel();
-      },
-      onUnLoad: (t) => {
-        const e = this._filterModels.get(t);
-        e && (e.forEach((r) => r.dispose()), this._filterModels.delete(t));
-      }
+      toJson: /* @__PURE__ */ __name((id) => this._serializeAutoFiltersForUnit(id), "toJson"),
+      parseJson: /* @__PURE__ */ __name((json) => JSON.parse(json), "parseJson"),
+      onLoad: /* @__PURE__ */ __name((unitId, value) => {
+        this._deserializeAutoFiltersForUnit(unitId, value), this._loadedUnitId$.next(unitId), this._updateActiveFilterModel();
+      }, "onLoad"),
+      onUnLoad: /* @__PURE__ */ __name((unitId) => {
+        const allFilterModels = this._filterModels.get(unitId);
+        allFilterModels && (allFilterModels.forEach((model) => model.dispose()), this._filterModels.delete(unitId));
+      }, "onUnLoad")
     });
   }
-  _cacheFilterModel(t, e, r) {
-    this._filterModels.has(t) || this._filterModels.set(t, /* @__PURE__ */ new Map()), this._filterModels.get(t).set(e, r);
-  }
-};
-v = it([
-  ee(te.Ready, v),
-  W(0, _e),
-  W(1, re),
-  W(2, ne)
-], v);
-function lt(n, t) {
-  for (let e = 0; e < n.length; e++) {
-    let r = e;
-    if (n[e])
-      for (let s = e + 1; s < n.length; s++)
-        n[r] && n[s] && t(n[r], n[s]) && (n[r] = null, r = s);
-  }
-  return n.filter((e) => e !== null);
+  _cacheFilterModel(unitId, subUnitId, filterModel) {
+    this._filterModels.has(unitId) || this._filterModels.set(unitId, /* @__PURE__ */ new Map()), this._filterModels.get(unitId).set(subUnitId, filterModel);
+  }
+}, __name(_a, "SheetsFilterService"), _a);
+SheetsFilterService = __decorateClass$2([
+  OnLifecycle(LifecycleStages.Ready, SheetsFilterService),
+  __decorateParam$2(0, IResourceManagerService),
+  __decorateParam$2(1, IUniverInstanceService),
+  __decorateParam$2(2, ICommandService)
+], SheetsFilterService);
+function objectsShaker(target, isEqual) {
+  for (let i = 0; i < target.length; i++) {
+    let cur = i;
+    if (target[i])
+      for (let j = i + 1; j < target.length; j++)
+        target[cur] && target[j] && isEqual(target[cur], target[j]) && (target[cur] = null, cur = j);
+  }
+  return target.filter((o) => o !== null);
 }
-function E(n) {
-  return lt(n, (t, e) => t.id === F.id && e.id === F.id && t.params.unitId === e.params.unitId && t.params.subUnitId === e.params.subUnitId && t.params.col === e.params.col);
+__name(objectsShaker, "objectsShaker");
+function mergeSetFilterCriteria(mutations) {
+  return objectsShaker(mutations, (o1, o2) => o1.id === SetSheetsFilterCriteriaMutation.id && o2.id === SetSheetsFilterCriteriaMutation.id && o1.params.unitId === o2.params.unitId && o1.params.subUnitId === o2.params.subUnitId && o1.params.col === o2.params.col);
 }
-var at = Object.defineProperty, ct = Object.getOwnPropertyDescriptor, ut = (n, t, e, r) => {
-  for (var s = r > 1 ? void 0 : r ? ct(t, e) : t, i = n.length - 1, o; i >= 0; i--)
-    (o = n[i]) && (s = (r ? o(t, e, s) : o(s)) || s);
-  return r && s && at(t, e, s), s;
-}, x = (n, t) => (e, r) => t(e, r, n);
-let B = class extends b {
-  constructor(n, t, e, r, s) {
-    super(), this._commandService = n, this._sheetInterceptorService = t, this._sheetsFilterService = e, this._univerInstanceService = r, this._refRangeService = s, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
+__name(mergeSetFilterCriteria, "mergeSetFilterCriteria");
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a2;
+let SheetsFilterController = (_a2 = class extends Disposable {
+  constructor(_commandService, _sheetInterceptorService, _sheetsFilterService, _univerInstanceService, _refRangeService) {
+    super(), this._commandService = _commandService, this._sheetInterceptorService = _sheetInterceptorService, this._sheetsFilterService = _sheetsFilterService, this._univerInstanceService = _univerInstanceService, this._refRangeService = _refRangeService, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
   }
   _initCommands() {
     [
-      F,
-      w,
-      ae,
-      A
-    ].forEach((n) => this.disposeWithMe(this._commandService.registerCommand(n)));
+      SetSheetsFilterCriteriaMutation,
+      SetSheetsFilterRangeMutation,
+      ReCalcSheetsFilterMutation,
+      RemoveSheetsFilterMutation
+    ].forEach((command) => this.disposeWithMe(this._commandService.registerCommand(command)));
   }
   // eslint-disable-next-line max-lines-per-function
   _initInterceptors() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
-      getMutations: (e) => this._getUpdateFilter(e)
+      getMutations: /* @__PURE__ */ __name((command) => this._getUpdateFilter(command), "getMutations")
     }));
-    const n = new ge(), t = (e, r) => {
-      var c;
-      const s = this._univerInstanceService.getUniverSheetInstance(e);
-      if (!s || !(s == null ? void 0 : s.getSheetBySheetId(r))) return;
-      n.dispose();
-      const o = (c = this._sheetsFilterService.getFilterModel(e, r)) == null ? void 0 : c.getRange(), l = (u) => {
-        switch (u.id) {
-          case Ue.id: {
-            const a = u.params, d = a.unitId || e, f = a.subUnitId || r;
-            return this._handleInsertRowCommand(a, d, f);
+    const disposableCollection = new DisposableCollection(), registerRefRange = /* @__PURE__ */ __name((unitId, subUnitId) => {
+      var _a4;
+      const workbook = this._univerInstanceService.getUniverSheetInstance(unitId);
+      if (!workbook || !(workbook == null ? void 0 : workbook.getSheetBySheetId(subUnitId))) return;
+      disposableCollection.dispose();
+      const range = (_a4 = this._sheetsFilterService.getFilterModel(unitId, subUnitId)) == null ? void 0 : _a4.getRange(), handler = /* @__PURE__ */ __name((config) => {
+        switch (config.id) {
+          case InsertRowCommand.id: {
+            const params = config.params, _unitId = params.unitId || unitId, _subUnitId = params.subUnitId || subUnitId;
+            return this._handleInsertRowCommand(params, _unitId, _subUnitId);
           }
-          case be.id: {
-            const a = u.params, d = a.unitId || e, f = a.subUnitId || r;
-            return this._handleInsertColCommand(a, d, f);
+          case InsertColCommand.id: {
+            const params = config.params, _unitId = params.unitId || unitId, _subUnitId = params.subUnitId || subUnitId;
+            return this._handleInsertColCommand(params, _unitId, _subUnitId);
           }
-          case Le.id: {
-            const a = u.params;
-            return this._handleRemoveColCommand(a, e, r);
+          case RemoveColCommand.id: {
+            const params = config.params;
+            return this._handleRemoveColCommand(params, unitId, subUnitId);
           }
-          case Be.id: {
-            const a = u.params;
-            return this._handleRemoveRowCommand(a, e, r);
+          case RemoveRowCommand.id: {
+            const params = config.params;
+            return this._handleRemoveRowCommand(params, unitId, subUnitId);
           }
-          case J.MoveColsCommandId: {
-            const a = u.params;
-            return this._handleMoveColsCommand(a, e, r);
+          case EffectRefRangId.MoveColsCommandId: {
+            const params = config.params;
+            return this._handleMoveColsCommand(params, unitId, subUnitId);
           }
-          case J.MoveRowsCommandId: {
-            const a = u.params;
-            return this._handleMoveRowsCommand(a, e, r);
+          case EffectRefRangId.MoveRowsCommandId: {
+            const params = config.params;
+            return this._handleMoveRowsCommand(params, unitId, subUnitId);
           }
-          case Pe.id: {
-            const a = u.params;
-            return this._handleMoveRangeCommand(a, e, r);
+          case MoveRangeCommand.id: {
+            const params = config.params;
+            return this._handleMoveRangeCommand(params, unitId, subUnitId);
           }
         }
         return { redos: [], undos: [] };
-      };
-      o && n.add(this._refRangeService.registerRefRange(o, l, e, r));
-    };
-    this.disposeWithMe(this._commandService.onCommandExecuted((e) => {
-      if (e.id === Ee.id) {
-        const r = e.params, s = r.subUnitId, i = r.unitId;
-        if (!s || !i)
+      }, "handler");
+      range && disposableCollection.add(this._refRangeService.registerRefRange(range, handler, unitId, subUnitId));
+    }, "registerRefRange");
+    this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
+      if (commandInfo.id === SetWorksheetActivateCommand.id) {
+        const params = commandInfo.params, sheetId = params.subUnitId, unitId = params.unitId;
+        if (!sheetId || !unitId)
           return;
-        t(i, s);
+        registerRefRange(unitId, sheetId);
       }
-      if (e.id === w.id) {
-        const r = e.params, s = r.subUnitId, i = r.unitId;
-        if (!s || !i)
+      if (commandInfo.id === SetSheetsFilterRangeMutation.id) {
+        const params = commandInfo.params, sheetId = params.subUnitId, unitId = params.unitId;
+        if (!sheetId || !unitId)
           return;
-        t(r.unitId, r.subUnitId);
+        registerRefRange(params.unitId, params.subUnitId);
       }
-    })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((e) => {
-      if (e) {
-        const r = this._univerInstanceService.getUniverSheetInstance(e), s = r == null ? void 0 : r.getActiveSheet();
-        s && t(e, s.getSheetId());
+    })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((unitId) => {
+      if (unitId) {
+        const workbook = this._univerInstanceService.getUniverSheetInstance(unitId), sheet = workbook == null ? void 0 : workbook.getActiveSheet();
+        sheet && registerRefRange(unitId, sheet.getSheetId());
       }
     }));
   }
-  _getUpdateFilter(n) {
-    const { id: t } = n;
-    switch (t) {
-      case Oe.id: {
-        const e = n.params;
-        return this._handleRemoveSheetCommand(e, e.unitId, e.subUnitId);
+  _getUpdateFilter(command) {
+    const { id } = command;
+    switch (id) {
+      case RemoveSheetCommand.id: {
+        const params = command.params;
+        return this._handleRemoveSheetCommand(params, params.unitId, params.subUnitId);
       }
     }
     return {
@@ -605,403 +627,403 @@ let B = class extends b {
       undos: []
     };
   }
-  _handleInsertColCommand(n, t, e) {
-    var _;
-    const r = this._sheetsFilterService.getFilterModel(t, e), s = (_ = r == null ? void 0 : r.getRange()) != null ? _ : null;
-    if (!r || !s)
+  _handleInsertColCommand(config, unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
+    if (!filterModel || !filterRange)
       return this._handleNull();
-    const { startColumn: i, endColumn: o } = s, { startColumn: l, endColumn: c } = n.range, u = c - l + 1;
-    if (c > o)
+    const { startColumn, endColumn } = filterRange, { startColumn: insertStartColumn, endColumn: insertEndColumn } = config.range, count = insertEndColumn - insertStartColumn + 1;
+    if (insertEndColumn > endColumn)
       return this._handleNull();
-    const a = [], d = [], f = l, g = {
-      unitId: t,
-      subUnitId: e,
+    const redos = [], undos = [], anchor = insertStartColumn, setFilterRangeMutationParams = {
+      unitId,
+      subUnitId,
       range: {
-        ...s,
-        startColumn: l <= i ? i + u : i,
-        endColumn: o + u
+        ...filterRange,
+        startColumn: insertStartColumn <= startColumn ? startColumn + count : startColumn,
+        endColumn: endColumn + count
       }
-    }, R = {
-      unitId: t,
-      subUnitId: e,
-      range: s
+    }, undoSetFilterRangeMutationParams = {
+      unitId,
+      subUnitId,
+      range: filterRange
     };
-    a.push({ id: w.id, params: g }), d.push({ id: w.id, params: R });
-    const m = r.getAllFilterColumns().filter((h) => h[0] >= f);
-    if (m.length !== 0) {
-      const { undos: h, redos: S } = this.moveCriteria(t, e, m, u);
-      a.push(...S), d.push(...h);
+    redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: undoSetFilterRangeMutationParams });
+    const effected = filterModel.getAllFilterColumns().filter((column) => column[0] >= anchor);
+    if (effected.length !== 0) {
+      const { undos: moveUndos, redos: moveRedos } = this.moveCriteria(unitId, subUnitId, effected, count);
+      redos.push(...moveRedos), undos.push(...moveUndos);
     }
-    return { redos: E(a), undos: E(d) };
+    return { redos: mergeSetFilterCriteria(redos), undos: mergeSetFilterCriteria(undos) };
   }
-  _handleInsertRowCommand(n, t, e) {
-    var R;
-    const r = this._sheetsFilterService.getFilterModel(t, e), s = (R = r == null ? void 0 : r.getRange()) != null ? R : null;
-    if (!r || !s)
+  _handleInsertRowCommand(config, unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
+    if (!filterModel || !filterRange)
       return this._handleNull();
-    const { startRow: i, endRow: o } = s, { startRow: l, endRow: c } = n.range, u = c - l + 1;
-    if (c > o)
+    const { startRow, endRow } = filterRange, { startRow: insertStartRow, endRow: insertEndRow } = config.range, rowCount = insertEndRow - insertStartRow + 1;
+    if (insertEndRow > endRow)
       return this._handleNull();
-    const a = [], d = [], f = {
-      unitId: t,
-      subUnitId: e,
+    const redos = [], undos = [], setFilterRangeParams = {
+      unitId,
+      subUnitId,
       range: {
-        ...s,
-        startRow: l <= i ? i + u : i,
-        endRow: o + u
+        ...filterRange,
+        startRow: insertStartRow <= startRow ? startRow + rowCount : startRow,
+        endRow: endRow + rowCount
       }
-    }, g = {
-      unitId: t,
-      subUnitId: e,
-      range: s
+    }, undoSetFilterRangeMutationParams = {
+      unitId,
+      subUnitId,
+      range: filterRange
     };
-    return a.push({ id: w.id, params: f }), d.push({ id: w.id, params: g }), {
-      redos: E(a),
-      undos: E(d)
+    return redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeParams }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: undoSetFilterRangeMutationParams }), {
+      redos: mergeSetFilterCriteria(redos),
+      undos: mergeSetFilterCriteria(undos)
     };
   }
-  _handleRemoveColCommand(n, t, e) {
-    var p;
-    const r = this._sheetsFilterService.getFilterModel(t, e), s = (p = r == null ? void 0 : r.getRange()) != null ? p : null;
-    if (!r || !s)
+  _handleRemoveColCommand(config, unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
+    if (!filterModel || !filterRange)
       return this._handleNull();
-    const { startColumn: i, endColumn: o } = s, { startColumn: l, endColumn: c } = n.range;
-    if (l > o)
+    const { startColumn, endColumn } = filterRange, { startColumn: removeStartColumn, endColumn: removeEndColumn } = config.range;
+    if (removeStartColumn > endColumn)
       return this._handleNull();
-    const u = [], a = [], d = c < i ? 0 : Math.min(c, o) - Math.max(l, i) + 1, f = c - l + 1, g = r.getAllFilterColumns();
-    g.forEach((m) => {
-      const [_, h] = m;
-      _ <= c && _ >= l && (u.push({ id: F.id, params: { unitId: t, subUnitId: e, col: _, criteria: null } }), a.push({ id: F.id, params: { unitId: t, subUnitId: e, col: _, criteria: { ...h.serialize(), colId: _ } } }));
+    const redos = [], undos = [], rangeRemoveCount = removeEndColumn < startColumn ? 0 : Math.min(removeEndColumn, endColumn) - Math.max(removeStartColumn, startColumn) + 1, removeCount = removeEndColumn - removeStartColumn + 1, filterColumn = filterModel.getAllFilterColumns();
+    filterColumn.forEach((column) => {
+      const [col, filter2] = column;
+      col <= removeEndColumn && col >= removeStartColumn && (redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: null } }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: { ...filter2.serialize(), colId: col } } }));
     });
-    const R = g.filter((m) => {
-      const [_, h] = m;
-      return _ > c;
+    const shifted = filterColumn.filter((column) => {
+      const [col, _] = column;
+      return col > removeEndColumn;
     });
-    if (R.length > 0) {
-      const { undos: m, redos: _ } = this.moveCriteria(t, e, R, -f);
-      u.push(..._), a.push(...m);
+    if (shifted.length > 0) {
+      const { undos: moveUndos, redos: moveRedos } = this.moveCriteria(unitId, subUnitId, shifted, -removeCount);
+      redos.push(...moveRedos), undos.push(...moveUndos);
     }
-    if (d === o - i + 1) {
-      const m = {
-        unitId: t,
-        subUnitId: e
+    if (rangeRemoveCount === endColumn - startColumn + 1) {
+      const removeFilterRangeMutationParams = {
+        unitId,
+        subUnitId
       };
-      u.push({ id: A.id, params: m });
-    } else if (i <= l) {
-      const m = o - d, _ = {
-        unitId: t,
-        subUnitId: e,
+      redos.push({ id: RemoveSheetsFilterMutation.id, params: removeFilterRangeMutationParams });
+    } else if (startColumn <= removeStartColumn) {
+      const finalEndColumn = endColumn - rangeRemoveCount, setFilterRangeMutationParams = {
+        unitId,
+        subUnitId,
         range: {
-          ...s,
-          endColumn: m
+          ...filterRange,
+          endColumn: finalEndColumn
         }
       };
-      u.push({ id: w.id, params: _ });
+      redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams });
     } else {
-      const m = {
-        unitId: t,
-        subUnitId: e,
+      const setFilterRangeMutationParams = {
+        unitId,
+        subUnitId,
         range: {
-          ...s,
-          startColumn: l,
-          endColumn: o - (c - l + 1)
+          ...filterRange,
+          startColumn: removeStartColumn,
+          endColumn: endColumn - (removeEndColumn - removeStartColumn + 1)
         }
       };
-      u.push({ id: w.id, params: m });
+      redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams });
     }
-    return a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } }), {
-      undos: E(a),
-      redos: E(u)
+    return undos.push({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } }), {
+      undos: mergeSetFilterCriteria(undos),
+      redos: mergeSetFilterCriteria(redos)
     };
   }
-  _handleRemoveRowCommand(n, t, e) {
-    var R;
-    const r = this._sheetsFilterService.getFilterModel(t, e);
-    if (!r)
+  _handleRemoveRowCommand(config, unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
+    if (!filterModel)
       return this._handleNull();
-    const s = r.getRange(), { startRow: i, endRow: o } = s, { startRow: l, endRow: c } = n.range;
-    if (l > o)
+    const filterRange = filterModel.getRange(), { startRow, endRow } = filterRange, { startRow: removeStartRow, endRow: removeEndRow } = config.range;
+    if (removeStartRow > endRow)
       return this._handleNull();
-    const u = [], a = [], d = r.getAllFilterColumns(), f = i <= c && i >= l;
-    a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } });
-    const g = Math.min(c, o) - Math.max(l, i) + 1;
-    if (g === o - i + 1 || f) {
-      const p = {
-        unitId: t,
-        subUnitId: e
+    const redos = [], undos = [], filterColumn = filterModel.getAllFilterColumns(), filterHeaderIsRemoved = startRow <= removeEndRow && startRow >= removeStartRow;
+    undos.push({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } });
+    const count = Math.min(removeEndRow, endRow) - Math.max(removeStartRow, startRow) + 1;
+    if (count === endRow - startRow + 1 || filterHeaderIsRemoved) {
+      const removeFilterRangeMutationParams = {
+        unitId,
+        subUnitId
       };
-      u.push({ id: A.id, params: p }), d.forEach((m) => {
-        const [_, h] = m, S = {
-          unitId: t,
-          subUnitId: e,
-          col: _,
-          criteria: { ...h.serialize(), colId: _ }
+      redos.push({ id: RemoveSheetsFilterMutation.id, params: removeFilterRangeMutationParams }), filterColumn.forEach((column) => {
+        const [offset, filter2] = column, setCriteriaMutationParams = {
+          unitId,
+          subUnitId,
+          col: offset,
+          criteria: { ...filter2.serialize(), colId: offset }
         };
-        a.push({ id: F.id, params: S });
+        undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: setCriteriaMutationParams });
       });
     } else {
-      const p = (R = this._univerInstanceService.getUniverSheetInstance(t)) == null ? void 0 : R.getSheetBySheetId(e);
-      if (!p)
+      const worksheet = (_a4 = this._univerInstanceService.getUniverSheetInstance(unitId)) == null ? void 0 : _a4.getSheetBySheetId(subUnitId);
+      if (!worksheet)
         return this._handleNull();
-      const m = [];
-      for (let M = l; M <= c; M++)
-        p.getRowFiltered(M) && m.push(M);
-      const _ = Math.min(i, l), h = _ + (o - i) - g + m.length, S = {
-        unitId: t,
-        subUnitId: e,
+      const hiddenRows = [];
+      for (let r = removeStartRow; r <= removeEndRow; r++)
+        worksheet.getRowFiltered(r) && hiddenRows.push(r);
+      const afterStartRow = Math.min(startRow, removeStartRow), afterEndRow = afterStartRow + (endRow - startRow) - count + hiddenRows.length, setFilterRangeMutationParams = {
+        unitId,
+        subUnitId,
         range: {
-          ...s,
-          startRow: _,
-          endRow: h
+          ...filterRange,
+          startRow: afterStartRow,
+          endRow: afterEndRow
         }
       };
-      u.push({ id: w.id, params: S });
+      redos.push({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams });
     }
     return {
-      undos: E(a),
-      redos: E(u)
+      undos: mergeSetFilterCriteria(undos),
+      redos: mergeSetFilterCriteria(redos)
     };
   }
   // eslint-disable-next-line max-lines-per-function
-  _handleMoveColsCommand(n, t, e) {
-    var _;
-    const r = this._sheetsFilterService.getFilterModel(t, e), s = (_ = r == null ? void 0 : r.getRange()) != null ? _ : null;
-    if (!r || !s)
+  _handleMoveColsCommand(config, unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
+    if (!filterModel || !filterRange)
       return this._handleNull();
-    const { startColumn: i, endColumn: o } = s, { fromRange: l, toRange: c } = n;
-    if (l.endColumn < i && c.startColumn <= i || l.startColumn > o && c.endColumn > o)
+    const { startColumn, endColumn } = filterRange, { fromRange, toRange } = config;
+    if (fromRange.endColumn < startColumn && toRange.startColumn <= startColumn || fromRange.startColumn > endColumn && toRange.endColumn > endColumn)
       return this._handleNull();
-    const u = [], a = [], d = {};
-    for (let h = i; h <= o; h++)
-      d[h] = {
-        colIndex: h,
-        filter: r.getFilterColumn(h)
+    const redos = [], undos = [], filterCol = {};
+    for (let col = startColumn; col <= endColumn; col++)
+      filterCol[col] = {
+        colIndex: col,
+        filter: filterModel.getFilterColumn(col)
       };
-    G(l.startColumn, l.endColumn - l.startColumn + 1, c.startColumn, d);
-    let f = s.startColumn, g = s.endColumn;
-    i >= l.startColumn && i <= l.endColumn && c.startColumn > l.startColumn && l.endColumn < o && (f = l.endColumn + 1), o >= l.startColumn && o <= l.endColumn && c.startColumn < l.startColumn && l.startColumn > i && (g = l.startColumn - 1);
-    const R = Object.keys(d).map((h) => Number(h)), p = R.find((h) => d[h].colIndex === g), m = R.find((h) => d[h].colIndex === f);
-    if (R.forEach((h) => {
-      var D, Q;
-      const { colIndex: S, filter: M } = d[h], y = h;
-      if (M) {
-        if (y >= m && y <= p) {
-          const U = {
-            unitId: t,
-            subUnitId: e,
-            col: y,
-            criteria: { ...M.serialize(), colId: y }
+    moveMatrixArray(fromRange.startColumn, fromRange.endColumn - fromRange.startColumn + 1, toRange.startColumn, filterCol);
+    let startBorder = filterRange.startColumn, endBorder = filterRange.endColumn;
+    startColumn >= fromRange.startColumn && startColumn <= fromRange.endColumn && toRange.startColumn > fromRange.startColumn && fromRange.endColumn < endColumn && (startBorder = fromRange.endColumn + 1), endColumn >= fromRange.startColumn && endColumn <= fromRange.endColumn && toRange.startColumn < fromRange.startColumn && fromRange.startColumn > startColumn && (endBorder = fromRange.startColumn - 1);
+    const numberCols = Object.keys(filterCol).map((col) => Number(col)), newEnd = numberCols.find((col) => filterCol[col].colIndex === endBorder), newStart = numberCols.find((col) => filterCol[col].colIndex === startBorder);
+    if (numberCols.forEach((col) => {
+      var _a5, _b;
+      const { colIndex: oldColIndex, filter: filter2 } = filterCol[col], newColIndex = col;
+      if (filter2) {
+        if (newColIndex >= newStart && newColIndex <= newEnd) {
+          const setCriteriaMutationParams = {
+            unitId,
+            subUnitId,
+            col: newColIndex,
+            criteria: { ...filter2.serialize(), colId: newColIndex }
           };
-          u.push({ id: F.id, params: U }), a.push({ id: A.id, params: { unitId: t, subUnitId: e, col: y, criteria: { ...(D = r.getFilterColumn(y)) == null ? void 0 : D.serialize(), colId: y } } });
+          redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: setCriteriaMutationParams }), undos.push({ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId, col: newColIndex, criteria: { ...(_a5 = filterModel.getFilterColumn(newColIndex)) == null ? void 0 : _a5.serialize(), colId: newColIndex } } });
         }
-        if (!((Q = d[S]) != null && Q.filter)) {
-          const U = {
-            unitId: t,
-            subUnitId: e,
-            col: S,
+        if (!((_b = filterCol[oldColIndex]) != null && _b.filter)) {
+          const setCriteriaMutationParams = {
+            unitId,
+            subUnitId,
+            col: oldColIndex,
             criteria: null
           };
-          u.push({ id: F.id, params: U }), a.push({ id: F.id, params: { unitId: t, subUnitId: e, col: S, criteria: { ...M.serialize(), colId: S } } });
+          redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: setCriteriaMutationParams }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col: oldColIndex, criteria: { ...filter2.serialize(), colId: oldColIndex } } });
         }
       }
-    }), i !== m || o !== p) {
-      const h = {
-        unitId: t,
-        subUnitId: e,
+    }), startColumn !== newStart || endColumn !== newEnd) {
+      const setFilterRangeMutationParams = {
+        unitId,
+        subUnitId,
         range: {
-          ...s,
-          startColumn: m,
-          endColumn: p
+          ...filterRange,
+          startColumn: newStart,
+          endColumn: newEnd
         }
       };
-      u.unshift({ id: w.id, params: h }), a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } });
+      redos.unshift({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } });
     }
     return {
-      undos: a,
-      redos: u
+      undos,
+      redos
     };
   }
-  _handleMoveRowsCommand(n, t, e) {
-    var _;
-    const r = this._sheetsFilterService.getFilterModel(t, e), s = (_ = r == null ? void 0 : r.getRange()) != null ? _ : null;
-    if (!r || !s)
+  _handleMoveRowsCommand(config, unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = (_a4 = filterModel == null ? void 0 : filterModel.getRange()) != null ? _a4 : null;
+    if (!filterModel || !filterRange)
       return this._handleNull();
-    const { startRow: i, endRow: o } = s, { fromRange: l, toRange: c } = n;
-    if (l.endRow < i && c.startRow <= i || l.startRow > o && c.endRow > o)
+    const { startRow, endRow } = filterRange, { fromRange, toRange } = config;
+    if (fromRange.endRow < startRow && toRange.startRow <= startRow || fromRange.startRow > endRow && toRange.endRow > endRow)
       return this._handleNull();
-    const u = [], a = [], d = {};
-    for (let h = i; h <= o; h++)
-      d[h] = {
-        oldIndex: h
+    const redos = [], undos = [], filterRow = {};
+    for (let row = startRow; row <= endRow; row++)
+      filterRow[row] = {
+        oldIndex: row
       };
-    const f = i;
-    let g = o;
-    o >= l.startRow && o <= l.endRow && c.startRow < l.startRow && l.startRow > i && (g = l.startRow - 1), G(l.startRow, l.endRow - l.startRow + 1, c.startRow, d);
-    const R = Object.keys(d).map((h) => Number(h)), p = R.find((h) => d[h].oldIndex === g), m = R.find((h) => d[h].oldIndex === f);
-    if (i !== m || o !== p) {
-      const h = {
-        unitId: t,
-        subUnitId: e,
+    const startBorder = startRow;
+    let endBorder = endRow;
+    endRow >= fromRange.startRow && endRow <= fromRange.endRow && toRange.startRow < fromRange.startRow && fromRange.startRow > startRow && (endBorder = fromRange.startRow - 1), moveMatrixArray(fromRange.startRow, fromRange.endRow - fromRange.startRow + 1, toRange.startRow, filterRow);
+    const numberRows = Object.keys(filterRow).map((row) => Number(row)), newEnd = numberRows.find((row) => filterRow[row].oldIndex === endBorder), newStart = numberRows.find((row) => filterRow[row].oldIndex === startBorder);
+    if (startRow !== newStart || endRow !== newEnd) {
+      const setFilterRangeMutationParams = {
+        unitId,
+        subUnitId,
         range: {
-          ...s,
-          startRow: m,
-          endRow: p
+          ...filterRange,
+          startRow: newStart,
+          endRow: newEnd
         }
       };
-      u.unshift({ id: w.id, params: h }), a.push({ id: w.id, params: { range: s, unitId: t, subUnitId: e } });
+      redos.unshift({ id: SetSheetsFilterRangeMutation.id, params: setFilterRangeMutationParams }), undos.push({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } });
     }
     return {
-      redos: u,
-      undos: a
+      redos,
+      undos
     };
   }
-  _handleMoveRangeCommand(n, t, e) {
-    const { fromRange: r, toRange: s } = n, i = this._sheetsFilterService.getFilterModel(t, e);
-    if (!i)
+  _handleMoveRangeCommand(config, unitId, subUnitId) {
+    const { fromRange, toRange } = config, filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
+    if (!filterModel)
       return this._handleNull();
-    const o = i.getRange();
-    if (!o)
+    const filterRange = filterModel.getRange();
+    if (!filterRange)
       return this._handleNull();
-    const l = [], c = [];
-    if (k.contains(r, o)) {
-      const u = o.startRow - r.startRow, a = o.startColumn - r.startColumn, d = {
-        startRow: s.startRow + u,
-        startColumn: s.startColumn + a,
-        endRow: s.startRow + u + (o.endRow - o.startRow),
-        endColumn: s.startColumn + a + (o.endColumn - o.startColumn)
-      }, f = {
-        id: A.id,
+    const redos = [], undos = [];
+    if (Rectangle.contains(fromRange, filterRange)) {
+      const rowOffset = filterRange.startRow - fromRange.startRow, colOffset = filterRange.startColumn - fromRange.startColumn, newFilterRange = {
+        startRow: toRange.startRow + rowOffset,
+        startColumn: toRange.startColumn + colOffset,
+        endRow: toRange.startRow + rowOffset + (filterRange.endRow - filterRange.startRow),
+        endColumn: toRange.startColumn + colOffset + (filterRange.endColumn - filterRange.startColumn)
+      }, removeFilter = {
+        id: RemoveSheetsFilterMutation.id,
         params: {
-          unitId: t,
-          subUnitId: e
+          unitId,
+          subUnitId
         }
-      }, g = { id: w.id, params: { unitId: t, subUnitId: e, range: d } }, R = { id: w.id, params: { unitId: t, subUnitId: e, range: o } };
-      l.push(f, g), c.push(f, R);
-      const p = i.getAllFilterColumns(), m = s.startColumn - r.startColumn;
-      p.forEach((_) => {
-        const [h, S] = _;
-        S && (l.push({ id: F.id, params: { unitId: t, subUnitId: e, col: h + m, criteria: { ...S.serialize(), colId: h + m } } }), c.push({ id: F.id, params: { unitId: t, subUnitId: e, col: h, criteria: { ...S.serialize(), colId: h } } }));
+      }, setNewFilterRange = { id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: newFilterRange } }, setOldFilterRange = { id: SetSheetsFilterRangeMutation.id, params: { unitId, subUnitId, range: filterRange } };
+      redos.push(removeFilter, setNewFilterRange), undos.push(removeFilter, setOldFilterRange);
+      const filterColumn = filterModel.getAllFilterColumns(), moveColDelta = toRange.startColumn - fromRange.startColumn;
+      filterColumn.forEach((column) => {
+        const [col, criteria] = column;
+        criteria && (redos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col: col + moveColDelta, criteria: { ...criteria.serialize(), colId: col + moveColDelta } } }), undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: { ...criteria.serialize(), colId: col } } }));
       });
     }
     return {
-      redos: l,
-      undos: c
+      redos,
+      undos
     };
   }
-  _handleRemoveSheetCommand(n, t, e) {
-    const r = this._sheetsFilterService.getFilterModel(t, e);
-    if (!r)
+  _handleRemoveSheetCommand(config, unitId, subUnitId) {
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
+    if (!filterModel)
       return this._handleNull();
-    const s = r.getRange();
-    if (!s)
+    const filterRange = filterModel.getRange();
+    if (!filterRange)
       return this._handleNull();
-    const i = [], o = [];
-    return r.getAllFilterColumns().forEach((c) => {
-      const [u, a] = c;
-      o.push({ id: F.id, params: { unitId: t, subUnitId: e, col: c, criteria: { ...a.serialize(), colId: c } } });
-    }), i.push({ id: A.id, params: { unitId: t, subUnitId: e, range: s } }), o.unshift({ id: w.id, params: { range: s, unitId: t, subUnitId: e } }), {
-      undos: o,
-      redos: i
+    const redos = [], undos = [];
+    return filterModel.getAllFilterColumns().forEach((col) => {
+      const [_, filter2] = col;
+      undos.push({ id: SetSheetsFilterCriteriaMutation.id, params: { unitId, subUnitId, col, criteria: { ...filter2.serialize(), colId: col } } });
+    }), redos.push({ id: RemoveSheetsFilterMutation.id, params: { unitId, subUnitId, range: filterRange } }), undos.unshift({ id: SetSheetsFilterRangeMutation.id, params: { range: filterRange, unitId, subUnitId } }), {
+      undos,
+      redos
     };
   }
   _handleNull() {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(ye.ROW_FILTERED, {
-      handler: (n, t) => {
-        var e, r;
-        return n ? !0 : (r = (e = this._sheetsFilterService.getFilterModel(
-          t.unitId,
-          t.subUnitId
-        )) == null ? void 0 : e.isRowFiltered(t.row)) != null ? r : !1;
-      }
+    this.disposeWithMe(this._sheetInterceptorService.intercept(INTERCEPTOR_POINT.ROW_FILTERED, {
+      handler: /* @__PURE__ */ __name((filtered, rowLocation) => {
+        var _a4, _b;
+        return filtered ? !0 : (_b = (_a4 = this._sheetsFilterService.getFilterModel(
+          rowLocation.unitId,
+          rowLocation.subUnitId
+        )) == null ? void 0 : _a4.isRowFiltered(rowLocation.row)) != null ? _b : !1;
+      }, "handler")
     }));
   }
-  moveCriteria(n, t, e, r) {
-    const s = {
-      unitId: n,
-      subUnitId: t,
+  moveCriteria(unitId, subUnitId, target, step) {
+    const defaultSetCriteriaMutationParams = {
+      unitId,
+      subUnitId,
       criteria: null,
       col: -1
-    }, i = [], o = [];
-    return e.forEach((l) => {
-      const [c, u] = l;
-      o.push({
-        id: F.id,
+    }, undos = [], redos = [];
+    return target.forEach((column) => {
+      const [offset, filter2] = column;
+      redos.push({
+        id: SetSheetsFilterCriteriaMutation.id,
         params: {
-          ...s,
-          col: c
+          ...defaultSetCriteriaMutationParams,
+          col: offset
         }
-      }), i.push({
-        id: F.id,
+      }), undos.push({
+        id: SetSheetsFilterCriteriaMutation.id,
         params: {
-          ...s,
-          col: c,
-          criteria: { ...u.serialize(), colId: c }
+          ...defaultSetCriteriaMutationParams,
+          col: offset,
+          criteria: { ...filter2.serialize(), colId: offset }
         }
       });
-    }), e.forEach((l) => {
-      const [c, u] = l;
-      o.push({
-        id: F.id,
+    }), target.forEach((column) => {
+      const [offset, filter2] = column;
+      redos.push({
+        id: SetSheetsFilterCriteriaMutation.id,
         params: {
-          ...s,
-          col: c + r,
-          criteria: { ...u.serialize(), colId: c + r }
+          ...defaultSetCriteriaMutationParams,
+          col: offset + step,
+          criteria: { ...filter2.serialize(), colId: offset + step }
         }
-      }), i.push({
-        id: F.id,
+      }), undos.push({
+        id: SetSheetsFilterCriteriaMutation.id,
         params: {
-          ...s,
-          col: c + r,
+          ...defaultSetCriteriaMutationParams,
+          col: offset + step,
           criteria: null
         }
       });
     }), {
-      redos: o,
-      undos: i
+      redos,
+      undos
     };
   }
   _commandExecutedListener() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((n, t) => {
-      var c, u;
-      const { unitId: e, subUnitId: r } = n.params || {}, s = this._sheetsFilterService.getFilterModel(e, r);
-      if (!s) return;
-      const i = Array.from(s.filteredOutRows).sort((a, d) => a - d), o = [];
-      let l = !1;
-      if (n.id === Ae.id) {
-        const { startRow: a, endRow: d } = n.params.range, f = i.filter((g) => g >= a && g <= d);
-        i.forEach((g) => {
-          if (g < a)
-            o.push(g);
-          else if (l = !0, g <= d) {
-            const R = Math.max(a, o.length ? o[o.length - 1] + 1 : a);
-            o.push(R);
+    this.disposeWithMe(this._commandService.onCommandExecuted((command, options) => {
+      var _a4, _b;
+      const { unitId, subUnitId } = command.params || {}, filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
+      if (!filterModel) return;
+      const filteredOutRows = Array.from(filterModel.filteredOutRows).sort((a, b) => a - b), newFilteredOutRows = [];
+      let changed = !1;
+      if (command.id === RemoveRowMutation.id) {
+        const { startRow, endRow } = command.params.range, filterOutInRemove = filteredOutRows.filter((row) => row >= startRow && row <= endRow);
+        filteredOutRows.forEach((row) => {
+          if (row < startRow)
+            newFilteredOutRows.push(row);
+          else if (changed = !0, row <= endRow) {
+            const newIndex = Math.max(startRow, newFilteredOutRows.length ? newFilteredOutRows[newFilteredOutRows.length - 1] + 1 : startRow);
+            newFilteredOutRows.push(newIndex);
           } else
-            o.push(g - (d - a + 1 - f.length));
+            newFilteredOutRows.push(row - (endRow - startRow + 1 - filterOutInRemove.length));
         });
       }
-      if (n.id === Te.id) {
-        const { startRow: a, endRow: d } = n.params.range;
-        i.forEach((f) => {
-          f >= a ? (l = !0, o.push(f + (d - a + 1))) : o.push(f);
+      if (command.id === InsertRowMutation.id) {
+        const { startRow, endRow } = command.params.range;
+        filteredOutRows.forEach((row) => {
+          row >= startRow ? (changed = !0, newFilteredOutRows.push(row + (endRow - startRow + 1))) : newFilteredOutRows.push(row);
         });
       }
-      if (l && (s.filteredOutRows = new Set(o)), n.id === xe.id && !(t != null && t.fromCollab) && !(t != null && t.onlyLocal)) {
-        const a = this._getExtendRegion(e, r);
-        if (a) {
-          const d = n.params.cellValue;
-          if (d)
-            for (let f = a.startColumn; f <= a.endColumn; f++) {
-              const g = (c = d == null ? void 0 : d[a.startRow]) == null ? void 0 : c[f];
-              if (g && Object.keys(g).length !== 0) {
-                const R = (u = this._univerInstanceService.getUnit(e)) == null ? void 0 : u.getSheetBySheetId(r);
-                if (R) {
-                  const p = Ne(a, { down: !0 }, R), m = this._sheetsFilterService.getFilterModel(e, r), _ = m.getRange();
-                  m.setRange({
-                    ..._,
-                    endRow: p.endRow
+      if (changed && (filterModel.filteredOutRows = new Set(newFilteredOutRows)), command.id === SetRangeValuesMutation.id && !(options != null && options.fromCollab) && !(options != null && options.onlyLocal)) {
+        const extendRegion = this._getExtendRegion(unitId, subUnitId);
+        if (extendRegion) {
+          const cellValue = command.params.cellValue;
+          if (cellValue)
+            for (let col = extendRegion.startColumn; col <= extendRegion.endColumn; col++) {
+              const cell = (_a4 = cellValue == null ? void 0 : cellValue[extendRegion.startRow]) == null ? void 0 : _a4[col];
+              if (cell && Object.keys(cell).length !== 0) {
+                const worksheet = (_b = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _b.getSheetBySheetId(subUnitId);
+                if (worksheet) {
+                  const extendedRange = expandToContinuousRange(extendRegion, { down: !0 }, worksheet), filterModel2 = this._sheetsFilterService.getFilterModel(unitId, subUnitId), filterRange = filterModel2.getRange();
+                  filterModel2.setRange({
+                    ...filterRange,
+                    endRow: extendedRange.endRow
                   });
                 }
               }
@@ -1010,84 +1032,84 @@ let B = class extends b {
       }
     }));
   }
-  _getExtendRegion(n, t) {
-    var l;
-    const e = this._sheetsFilterService.getFilterModel(n, t);
-    if (!e)
+  _getExtendRegion(unitId, subUnitId) {
+    var _a4;
+    const filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
+    if (!filterModel)
       return null;
-    const r = (l = this._univerInstanceService.getUnit(n)) == null ? void 0 : l.getSheetBySheetId(t);
-    if (!r)
+    const worksheet = (_a4 = this._univerInstanceService.getUnit(unitId)) == null ? void 0 : _a4.getSheetBySheetId(subUnitId);
+    if (!worksheet)
       return null;
-    const s = e.getRange();
-    if (!s)
+    const filterRange = filterModel.getRange();
+    if (!filterRange)
       return null;
-    const i = r.getRowCount() - 1, o = r.getRowManager();
-    for (let c = s.endRow + 1; c <= i; c++)
-      if (o.getRowRawVisible(c))
+    const maxRowIndex = worksheet.getRowCount() - 1, rowManager = worksheet.getRowManager();
+    for (let row = filterRange.endRow + 1; row <= maxRowIndex; row++)
+      if (rowManager.getRowRawVisible(row))
         return {
-          startRow: c,
-          endRow: c,
-          startColumn: s.startColumn,
-          endColumn: s.endColumn
+          startRow: row,
+          endRow: row,
+          startColumn: filterRange.startColumn,
+          endColumn: filterRange.endColumn
         };
     return null;
   }
   _initErrorHandling() {
-    this.disposeWithMe(this._commandService.beforeCommandExecuted((n) => {
-      const t = n.params, e = $e(this._univerInstanceService);
-      if (!e) return;
-      const { subUnitId: r, unitId: s } = e, i = this._sheetsFilterService.getFilterModel(s, r);
-      if (!i) return;
-      const o = i.getRange();
-      if (n.id === Ie.id && t.fromRange.startRow <= o.startRow && t.fromRange.endRow < o.endRow)
+    this.disposeWithMe(this._commandService.beforeCommandExecuted((command) => {
+      const params = command.params, target = getSheetCommandTarget(this._univerInstanceService);
+      if (!target) return;
+      const { subUnitId, unitId } = target, filterModel = this._sheetsFilterService.getFilterModel(unitId, subUnitId);
+      if (!filterModel) return;
+      const filterRange = filterModel.getRange();
+      if (command.id === MoveRowsCommand.id && params.fromRange.startRow <= filterRange.startRow && params.fromRange.endRow < filterRange.endRow)
         throw this._sheetsFilterService.setFilterErrorMsg("sheets-filter.msg.filter-header-forbidden"), new Error("[SheetsFilterController]: Cannot move header row of filter");
     }));
   }
-};
-B = ut([
-  ee(te.Ready, B),
-  x(0, ne),
-  x(1, P(ve)),
-  x(2, P(v)),
-  x(3, re),
-  x(4, P(Me))
-], B);
-var dt = Object.defineProperty, ht = Object.getOwnPropertyDescriptor, ft = (n, t, e, r) => {
-  for (var s = r > 1 ? void 0 : r ? ht(t, e) : t, i = n.length - 1, o; i >= 0; i--)
-    (o = n[i]) && (s = (r ? o(t, e, s) : o(s)) || s);
-  return r && s && dt(t, e, s), s;
-}, mt = (n, t) => (e, r) => t(e, r, n), I;
-let Z = (I = class extends Re {
-  constructor(n, t) {
-    super(), this._injector = t;
-  }
-  onStarting(n) {
+}, __name(_a2, "SheetsFilterController"), _a2);
+SheetsFilterController = __decorateClass$1([
+  OnLifecycle(LifecycleStages.Ready, SheetsFilterController),
+  __decorateParam$1(0, ICommandService),
+  __decorateParam$1(1, Inject(SheetInterceptorService)),
+  __decorateParam$1(2, Inject(SheetsFilterService)),
+  __decorateParam$1(3, IUniverInstanceService),
+  __decorateParam$1(4, Inject(RefRangeService))
+], SheetsFilterController);
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam"), _a3;
+let UniverSheetsFilterPlugin = (_a3 = class extends Plugin {
+  constructor(_config, _injector) {
+    super(), this._injector = _injector;
+  }
+  onStarting() {
     [
-      [v],
-      [B]
-    ].forEach((t) => n.add(t));
-  }
-}, C(I, "type", V.UNIVER_SHEET), C(I, "pluginName", ce), I);
-Z = ft([
-  mt(1, P(Ce))
-], Z);
+      [SheetsFilterService],
+      [SheetsFilterController]
+    ].forEach((d) => this._injector.add(d));
+  }
+}, __name(_a3, "UniverSheetsFilterPlugin"), __publicField(_a3, "type", UniverInstanceType.UNIVER_SHEET), __publicField(_a3, "pluginName", SHEET_FILTER_SNAPSHOT_ID), _a3);
+UniverSheetsFilterPlugin = __decorateClass([
+  __decorateParam(1, Inject(Injector))
+], UniverSheetsFilterPlugin);
 export {
-  O as CustomFilterOperator,
-  ot as FILTER_MUTATIONS,
-  Je as FilterColumn,
-  L as FilterModel,
-  ae as ReCalcSheetsFilterMutation,
-  A as RemoveSheetsFilterMutation,
-  ce as SHEET_FILTER_SNAPSHOT_ID,
-  F as SetSheetsFilterCriteriaMutation,
-  w as SetSheetsFilterRangeMutation,
-  v as SheetsFilterService,
-  Z as UniverSheetsFilterPlugin,
-  Ve as equals,
-  X as getCustomFilterFn,
-  ze as greaterThan,
-  He as greaterThanOrEqualTo,
-  We as lessThan,
-  je as lessThanOrEqualTo,
-  se as notEquals
+  CustomFilterOperator,
+  FILTER_MUTATIONS,
+  FilterColumn,
+  FilterModel,
+  ReCalcSheetsFilterMutation,
+  RemoveSheetsFilterMutation,
+  SHEET_FILTER_SNAPSHOT_ID,
+  SetSheetsFilterCriteriaMutation,
+  SetSheetsFilterRangeMutation,
+  SheetsFilterService,
+  UniverSheetsFilterPlugin,
+  equals,
+  getCustomFilterFn,
+  greaterThan,
+  greaterThanOrEqualTo,
+  lessThan,
+  lessThanOrEqualTo,
+  notEquals
 };