@univerjs/sheets-filter 0.6.6 → 0.6.7-experimental.20250328-3aaa828

package/lib/es/index.js

@@ -1,30 +1,31 @@
 var ve = Object.defineProperty;
 var Me = (i, r, e) => r in i ? ve(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
 var w = (i, r, e) => Me(i, typeof r != "symbol" ? r + "" : r, e);
-import { isNumeric as Ee, Disposable as B, Rectangle as K, mergeSets as Q, Tools as te, extractPureTextFromCell as ye, CellValueType as X, UniverInstanceType as D, fromCallback as Oe, CommandType as E, IResourceManagerService as Ae, IUniverInstanceService as T, ICommandService as N, Inject as $, DisposableCollection as Te, moveMatrixArray as re, Plugin as Ne, merge as xe, touchDependencies as Ie, Injector as $e, IConfigService as Ue, IUndoRedoService as k, sequenceExecute as Pe, ErrorService as De, LocaleService as Le } from "@univerjs/core";
-import { SheetInterceptorService as Be, RefRangeService as be, SetWorksheetActiveOperation as He, CopySheetCommand as ze, RemoveSheetCommand as We, INTERCEPTOR_POINT as Ve, RemoveRowMutation as je, InsertRowMutation as ke, SetRangeValuesMutation as qe, expandToContinuousRange as ue, getSheetCommandTarget as b, MoveRowsCommand as Qe, MoveRangeCommand as Ge, EffectRefRangId as ne, RemoveRowCommand as Je, RemoveColCommand as Ye, InsertColCommand as Ke, InsertRowCommand as Xe, SheetsSelectionsService as Ze, isSingleCellSelection as et } from "@univerjs/sheets";
-import { BehaviorSubject as L, merge as tt, filter as rt, switchMap as nt, of as it } from "rxjs";
-import { IActiveDirtyManagerService as st } from "@univerjs/engine-formula";
-const ot = "sheets-filter.config", ie = {}, de = "sheet.mutation.set-filter-range", he = "sheet.mutation.set-filter-criteria", me = "sheet.mutation.remove-filter", fe = "sheet.mutation.re-calc-filter", ge = /* @__PURE__ */ new Set([
-  de,
+import { isNumeric as Ee, Disposable as B, Rectangle as K, mergeSets as G, Tools as te, extractPureTextFromCell as ye, CellValueType as X, UniverInstanceType as D, fromCallback as Oe, CommandType as E, IResourceManagerService as Ae, IUniverInstanceService as T, ICommandService as N, Inject as I, Optional as Te, DisposableCollection as Ne, moveMatrixArray as re, Plugin as xe, merge as Ie, touchDependencies as $e, Injector as Pe, IConfigService as Ue, IUndoRedoService as q, sequenceExecute as De, ErrorService as Le, LocaleService as Be } from "@univerjs/core";
+import { DataSyncPrimaryController as be } from "@univerjs/rpc";
+import { SheetInterceptorService as He, RefRangeService as ze, SetWorksheetActiveOperation as We, CopySheetCommand as Ve, RemoveSheetCommand as je, INTERCEPTOR_POINT as ke, RemoveRowMutation as qe, InsertRowMutation as Qe, SetRangeValuesMutation as Ge, expandToContinuousRange as de, getSheetCommandTarget as b, MoveRowsCommand as Je, MoveRangeCommand as Ye, EffectRefRangId as ne, RemoveRowCommand as Ke, RemoveColCommand as Xe, InsertColCommand as Ze, InsertRowCommand as et, SheetsSelectionsService as tt, isSingleCellSelection as rt } from "@univerjs/sheets";
+import { BehaviorSubject as L, merge as nt, filter as it, switchMap as st, of as ot } from "rxjs";
+import { IActiveDirtyManagerService as lt, ISheetRowFilteredService as at } from "@univerjs/engine-formula";
+const ct = "sheets-filter.config", ie = {}, ue = "sheet.mutation.set-filter-range", he = "sheet.mutation.set-filter-criteria", me = "sheet.mutation.remove-filter", fe = "sheet.mutation.re-calc-filter", ge = /* @__PURE__ */ new Set([
+  ue,
   he,
   me,
   fe
 ]);
 var x = /* @__PURE__ */ ((i) => (i.EQUAL = "equal", i.GREATER_THAN = "greaterThan", i.GREATER_THAN_OR_EQUAL = "greaterThanOrEqual", i.LESS_THAN = "lessThan", i.LESS_THAN_OR_EQUAL = "lessThanOrEqual", i.NOT_EQUALS = "notEqual", i))(x || {});
-const lt = {
+const dt = {
   operator: x.GREATER_THAN,
   fn: (i, r) => U(i) ? i > r : !1
-}, at = {
+}, ut = {
   operator: x.GREATER_THAN_OR_EQUAL,
   fn: (i, r) => U(i) ? i >= r : !1
-}, ct = {
+}, ht = {
   operator: x.LESS_THAN,
   fn: (i, r) => U(i) ? i < r : !1
-}, ut = {
+}, mt = {
   operator: x.LESS_THAN_OR_EQUAL,
   fn: (i, r) => U(i) ? i <= r : !1
-}, dt = {
+}, ft = {
   operator: x.EQUAL,
   fn: (i, r) => U(i) ? i === r : !1
 }, _e = {
@@ -34,25 +35,25 @@ const lt = {
       if (r === " ")
         return i != null;
       const e = Ce(i);
-      return e && gt(r) ? !pe(r).test(e) : e !== r;
+      return e && Ct(r) ? !pe(r).test(e) : e !== r;
     }
     return U(i) ? i !== r : !0;
   }
-}, Re = /* @__PURE__ */ new Map([]), ht = [lt, at, ct, ut, dt, _e];
-ht.forEach((i) => {
+}, Re = /* @__PURE__ */ new Map([]), gt = [dt, ut, ht, mt, ft, _e];
+gt.forEach((i) => {
   Re.set(i.operator, i);
 });
-function mt(i) {
+function _t(i) {
   return !!i;
 }
-const ft = {
+const Rt = {
   fn: (i, r) => {
     const e = Ce(i);
     return e === null ? r === "" : pe(r).test(e);
   }
 };
 function se(i) {
-  return i ? Re.get(i) : ft;
+  return i ? Re.get(i) : Rt;
 }
 function U(i) {
   return typeof i == "number";
@@ -63,25 +64,25 @@ function oe(i) {
 function Ce(i) {
   return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-function gt(i) {
+function Ct(i) {
   return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
 function pe(i) {
   const r = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
   return new RegExp(`^${r}$`);
 }
-const G = () => /* @__PURE__ */ new Set();
-class W extends B {
+const J = () => /* @__PURE__ */ new Set();
+class V extends B {
   constructor(e, t, n) {
     super();
-    w(this, "_filteredOutRows$", new L(G()));
+    w(this, "_filteredOutRows$", new L(J()));
     /** An observable value. A set of filtered out rows. */
     w(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
     w(this, "_hasCriteria$", new L(!1));
     w(this, "hasCriteria$", this._hasCriteria$.asObservable());
     w(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    w(this, "_alreadyFilteredOutRows", G());
+    w(this, "_alreadyFilteredOutRows", J());
     w(this, "_range");
     this.unitId = e, this.subUnitId = t, this._worksheet = n;
   }
@@ -112,7 +113,7 @@ class W extends B {
    * @param autoFilter auto filter data
    */
   static deserialize(e, t, n, s) {
-    const o = new W(e, t, n);
+    const o = new V(e, t, n);
     return o._dump(s), o;
   }
   _dump(e) {
@@ -135,7 +136,7 @@ class W extends B {
   getFilteredOutRowsExceptCol(e) {
     return this._getAllFilterColumns(!0).filter(([t]) => t !== e).reduce((t, [, n]) => {
       const s = n.calc({ getAlreadyFilteredOutRows: () => t });
-      return s ? Q(t, s) : t;
+      return s ? G(t, s) : t;
     }, /* @__PURE__ */ new Set());
   }
   /**
@@ -179,7 +180,7 @@ class W extends B {
     return e ? t : t.map(([n, s]) => s);
   }
   _reCalcAllColumns() {
-    this._alreadyFilteredOutRows = G(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
+    this._alreadyFilteredOutRows = J(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
   }
   _setCriteriaWithoutReCalc(e, t) {
     const n = this._range;
@@ -189,7 +190,7 @@ class W extends B {
     if (e > o || e < s)
       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 _t(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new pt(
       this.unitId,
       this.subUnitId,
       this._worksheet,
@@ -208,18 +209,18 @@ class W extends B {
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => Q(t, n.filteredOutRows), /* @__PURE__ */ new Set());
+    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => G(t, n.filteredOutRows), /* @__PURE__ */ new Set());
     this._alreadyFilteredOutRows = e;
   }
   _reCalcWithNoCacheColumns() {
     const e = this._getAllFilterColumns().filter((t) => !t.hasCache());
     for (const t of e) {
       const n = t.reCalc();
-      n && (this._alreadyFilteredOutRows = Q(this._alreadyFilteredOutRows, n));
+      n && (this._alreadyFilteredOutRows = G(this._alreadyFilteredOutRows, n));
     }
   }
 }
-class _t extends B {
+class pt extends B {
   constructor(e, t, n, s, o) {
     super();
     w(this, "_filteredOutRows", null);
@@ -284,48 +285,48 @@ class _t extends B {
       const { row: a, rowSpan: c, col: h } = l;
       if (o.has(a) && (!c || c === 1))
         continue;
-      const u = this._filterByValues ? ye(this._worksheet.getCell(a, h)) : Mt(this._worksheet, a, h);
-      if (!this._filterFn(u) && (s.add(a), c))
-        for (let d = 1; d < c; d++)
-          s.add(a + d);
+      const d = this._filterByValues ? ye(this._worksheet.getCell(a, h)) : Ot(this._worksheet, a, h);
+      if (!this._filterFn(d) && (s.add(a), c))
+        for (let u = 1; u < c; u++)
+          s.add(a + u);
     }
     return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = Rt(this._criteria), this._filterByValues = !!this._criteria.filters);
+    this._criteria && (this._filterFn = Ft(this._criteria), this._filterByValues = !!this._criteria.filters);
   }
 }
-function Rt(i) {
+function Ft(i) {
   if (i.filters)
-    return Ct(i.filters);
+    return wt(i.filters);
   if (i.customFilters)
-    return pt(i.customFilters);
+    return St(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function Ct(i) {
+function wt(i) {
   const r = !!i.blank, e = new Set(i.filters);
   return (t) => t === void 0 || t === "" ? r : e.has(typeof t == "string" ? t : `${t}`);
 }
-function pt(i) {
-  const r = i.customFilters.map((e) => vt(e));
-  return St(r) ? i.and ? Ft(r) : wt(r) : r[0];
+function St(i) {
+  const r = i.customFilters.map((e) => yt(e));
+  return Et(r) ? i.and ? vt(r) : Mt(r) : r[0];
 }
-function Ft(i) {
+function vt(i) {
   const [r, e] = i;
   return (t) => r(t) && e(t);
 }
-function wt(i) {
+function Mt(i) {
   const [r, e] = i;
   return (t) => r(t) || e(t);
 }
-function St(i) {
+function Et(i) {
   return i.length === 2;
 }
-function vt(i) {
+function yt(i) {
   const r = i.val;
   if (i.operator === x.NOT_EQUALS && !oe(r))
     return (n) => _e.fn(n, r);
-  if (mt(i.operator)) {
+  if (_t(i.operator)) {
     if (!oe(r)) return () => !1;
     const n = se(i.operator), s = Number(r);
     return (o) => n.fn(o, s);
@@ -333,7 +334,7 @@ function vt(i) {
   const e = se(i.operator);
   return (t) => e.fn(t, r);
 }
-function Mt(i, r, e) {
+function Ot(i, r, e) {
   const t = i.getCell(r, e);
   if (!t) return null;
   const n = i.getCellRaw(r, e);
@@ -346,11 +347,11 @@ function le(i) {
   const e = i.v;
   return typeof e == "string" ? i.t === X.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === X.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-var Et = Object.getOwnPropertyDescriptor, yt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Et(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var At = Object.getOwnPropertyDescriptor, Tt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? At(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, J = (i, r) => (e, t) => r(e, t, i);
+}, Y = (i, r) => (e, t) => r(e, t, i);
 const Fe = "SHEET_FILTER_PLUGIN";
 let M = class extends B {
   constructor(r, e, t) {
@@ -384,7 +385,7 @@ let M = class extends B {
     const s = n.getSheetBySheetId(e);
     if (!s)
       throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${e}!`);
-    const o = new W(r, e, s);
+    const o = new V(r, e, s);
     return this._cacheFilterModel(r, e, o), o;
   }
   getFilterModel(r, e) {
@@ -419,13 +420,13 @@ let M = class extends B {
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      tt(
+      nt(
         // source1: executing filter related mutations
-        Oe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(rt(([r]) => r.type === E.MUTATION && ge.has(r.id))),
+        Oe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(it(([r]) => r.type === E.MUTATION && ge.has(r.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(nt((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(st((r) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : it(null);
+          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : ot(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
@@ -442,7 +443,7 @@ let M = class extends B {
   _deserializeAutoFiltersForUnit(r, e) {
     const t = this._univerInstanceService.getUniverSheetInstance(r);
     Object.keys(e).forEach((n) => {
-      const s = e[n], o = W.deserialize(r, n, t.getSheetBySheetId(n), s);
+      const s = e[n], o = V.deserialize(r, n, t.getSheetBySheetId(n), s);
       this._cacheFilterModel(r, n, o);
     });
   }
@@ -465,13 +466,13 @@ let M = class extends B {
     this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
   }
 };
-M = yt([
-  J(0, Ae),
-  J(1, T),
-  J(2, N)
+M = Tt([
+  Y(0, Ae),
+  Y(1, T),
+  Y(2, N)
 ], M);
 const R = {
-  id: de,
+  id: ue,
   type: E.MUTATION,
   handler: (i, r) => {
     const { subUnitId: e, unitId: t, range: n } = r;
@@ -491,7 +492,7 @@ const R = {
     const { unitId: e, subUnitId: t } = r;
     return i.get(M).removeFilterModel(e, t);
   }
-}, z = {
+}, W = {
   id: fe,
   type: E.MUTATION,
   handler: (i, r) => {
@@ -499,7 +500,7 @@ const R = {
     return s ? (s.reCalc(), !0) : !1;
   }
 };
-function Ot(i, r) {
+function Nt(i, r) {
   for (let e = 0; e < i.length; e++) {
     let t = e;
     if (i[e])
@@ -508,33 +509,36 @@ function Ot(i, r) {
   }
   return i.filter((e) => e !== null);
 }
-function I(i) {
-  return Ot(i, (r, e) => r.id === p.id && e.id === p.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
+function $(i) {
+  return Nt(i, (r, e) => r.id === p.id && e.id === p.id && r.params.unitId === e.params.unitId && r.params.subUnitId === e.params.subUnitId && r.params.col === e.params.col);
 }
-var At = Object.getOwnPropertyDescriptor, Tt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? At(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var xt = Object.getOwnPropertyDescriptor, It = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? xt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
 }, P = (i, r) => (e, t) => r(e, t, i);
-let V = class extends B {
-  constructor(r, e, t, n, s) {
+let j = class extends B {
+  constructor(r, e, t, n, s, o) {
     super();
-    w(this, "_disposableCollection", new Te());
-    this._commandService = r, this._sheetInterceptorService = e, this._sheetsFilterService = t, this._univerInstanceService = n, this._refRangeService = s, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
+    w(this, "_disposableCollection", new Ne());
+    this._commandService = r, this._sheetInterceptorService = e, this._sheetsFilterService = t, this._univerInstanceService = n, this._refRangeService = s, this._dataSyncPrimaryController = o, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling();
   }
   _initCommands() {
     [
       p,
       R,
-      z,
+      W,
       y
-    ].forEach((r) => this.disposeWithMe(this._commandService.registerCommand(r)));
+    ].forEach((r) => {
+      var e;
+      this.disposeWithMe(this._commandService.registerCommand(r)), (e = this._dataSyncPrimaryController) == null || e.registerSyncingMutations(r);
+    });
   }
   _initInterceptors() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
       getMutations: (r) => this._getUpdateFilter(r)
     })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
-      if (r.id === He.id) {
+      if (r.id === We.id) {
         const e = r.params, t = e.subUnitId, n = e.unitId;
         if (!t || !n)
           return;
@@ -560,19 +564,19 @@ let V = class extends B {
     if (!t || !n) return;
     const s = (l = this._sheetsFilterService.getFilterModel(r, e)) == null ? void 0 : l.getRange(), o = (a) => {
       switch (a.id) {
-        case Xe.id: {
-          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
-          return this._handleInsertRowCommand(c, h, u);
+        case et.id: {
+          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
+          return this._handleInsertRowCommand(c, h, d);
         }
-        case Ke.id: {
-          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
-          return this._handleInsertColCommand(c, h, u);
+        case Ze.id: {
+          const c = a.params, h = c.unitId || r, d = c.subUnitId || e;
+          return this._handleInsertColCommand(c, h, d);
         }
-        case Ye.id: {
+        case Xe.id: {
           const c = a.params;
           return this._handleRemoveColCommand(c, r, e);
         }
-        case Je.id: {
+        case Ke.id: {
           const c = a.params;
           return this._handleRemoveRowCommand(c, r, e);
         }
@@ -584,7 +588,7 @@ let V = class extends B {
           const c = a.params;
           return this._handleMoveRowsCommand(c, r, e);
         }
-        case Ge.id: {
+        case Ye.id: {
           const c = a.params;
           return this._handleMoveRangeCommand(c, r, e);
         }
@@ -596,11 +600,11 @@ let V = class extends B {
   _getUpdateFilter(r) {
     const { id: e } = r;
     switch (e) {
-      case We.id: {
+      case je.id: {
         const t = r.params;
         return this._handleRemoveSheetCommand(t, t.unitId, t.subUnitId);
       }
-      case ze.id: {
+      case Ve.id: {
         const t = r.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = t;
         return !s || !o || !n ? this._handleNull() : this._handleCopySheetCommand(s, o, n);
       }
@@ -618,7 +622,7 @@ let V = class extends B {
     const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range, h = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const u = [], d = [], f = a, g = {
+    const d = [], u = [], f = a, g = {
       unitId: e,
       subUnitId: t,
       range: {
@@ -631,13 +635,13 @@ let V = class extends B {
       subUnitId: t,
       range: s
     };
-    u.push({ id: R.id, params: g }), d.push({ id: R.id, params: C });
+    d.push({ id: R.id, params: g }), u.push({ id: R.id, params: C });
     const F = n.getAllFilterColumns().filter((m) => m[0] >= f);
     if (F.length !== 0) {
       const { newRange: m, oldRange: v } = this._moveCriteria(e, t, F, h);
-      u.push(...m.redos, ...v.redos), d.push(...m.undos, ...v.undos);
+      d.push(...m.redos, ...v.redos), u.push(...m.undos, ...v.undos);
     }
-    return { redos: I(u), undos: I(d) };
+    return { redos: $(d), undos: $(u) };
   }
   _handleInsertRowCommand(r, e, t) {
     var C;
@@ -647,7 +651,7 @@ let V = class extends B {
     const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range, h = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const u = [], d = [], f = {
+    const d = [], u = [], f = {
       unitId: e,
       subUnitId: t,
       range: {
@@ -660,9 +664,9 @@ let V = class extends B {
       subUnitId: t,
       range: s
     };
-    return u.push({ id: R.id, params: f }), d.push({ id: R.id, params: g }), {
-      redos: I(u),
-      undos: I(d)
+    return d.push({ id: R.id, params: f }), u.push({ id: R.id, params: g }), {
+      redos: $(d),
+      undos: $(u)
     };
   }
   _handleRemoveColCommand(r, e, t) {
@@ -673,10 +677,10 @@ let V = class extends B {
     const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range;
     if (a > l)
       return this._handleNull();
-    const h = [], u = [], d = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, f = c - a + 1, g = n.getAllFilterColumns();
+    const h = [], d = [], u = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, f = c - a + 1, g = n.getAllFilterColumns();
     g.forEach((_) => {
       const [m, v] = _;
-      m <= c && m >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: null } }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
+      m <= c && m >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: null } }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: m, criteria: { ...v.serialize(), colId: m } } }));
     });
     const C = g.filter((_) => {
       const [m, v] = _;
@@ -685,24 +689,24 @@ let V = class extends B {
     let S = { undos: [], redos: [] };
     if (C.length > 0) {
       const { oldRange: _, newRange: m } = this._moveCriteria(e, t, C, -f);
-      S = m, h.push(..._.redos), u.unshift(..._.undos);
+      S = m, h.push(..._.redos), d.unshift(..._.undos);
     }
-    if (d === l - o + 1) {
+    if (u === l - o + 1) {
       const _ = {
         unitId: e,
         subUnitId: t
       };
-      h.push({ id: y.id, params: _ }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+      h.push({ id: y.id, params: _ }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     } else {
-      const _ = o <= a ? o : d === 0 ? o - f : a, m = o <= a ? l - d : l - f, v = {
+      const _ = o <= a ? o : u === 0 ? o - f : a, m = o <= a ? l - u : l - f, v = {
         unitId: e,
         subUnitId: t,
         range: { ...s, startColumn: _, endColumn: m }
       };
-      h.push({ id: R.id, params: v }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...S.redos), u.unshift(...S.undos);
+      h.push({ id: R.id, params: v }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...S.redos), d.unshift(...S.undos);
     }
     return {
-      undos: u,
+      undos: d,
       redos: h
     };
   }
@@ -730,22 +734,22 @@ let V = class extends B {
           }
         }]
       };
-    const h = [], u = [], d = n.getAllFilterColumns(), f = o <= c && o >= a;
-    u.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+    const h = [], d = [], u = n.getAllFilterColumns(), f = o <= c && o >= a;
+    d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     const g = Math.min(c, l) - Math.max(a, o) + 1;
     if (g === l - o + 1 || f) {
       const S = {
         unitId: e,
         subUnitId: t
       };
-      h.push({ id: y.id, params: S }), d.forEach((F) => {
+      h.push({ id: y.id, params: S }), u.forEach((F) => {
         const [_, m] = F, v = {
           unitId: e,
           subUnitId: t,
           col: _,
           criteria: { ...m.serialize(), colId: _ }
         };
-        u.push({ id: p.id, params: v });
+        d.push({ id: p.id, params: v });
       });
     } else {
       const S = (C = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : C.getSheetBySheetId(t);
@@ -766,8 +770,8 @@ let V = class extends B {
       h.push({ id: R.id, params: v });
     }
     return {
-      undos: I(u),
-      redos: I(h)
+      undos: $(d),
+      redos: $(h)
     };
   }
   // eslint-disable-next-line max-lines-per-function
@@ -779,22 +783,22 @@ let V = class extends B {
     const { startColumn: o, endColumn: l } = s, { fromRange: a, toRange: c } = r;
     if (a.endColumn < o && c.startColumn <= o || a.startColumn > l && c.endColumn > l)
       return this._handleNull();
-    const h = [], u = [], d = {};
+    const h = [], d = [], u = {};
     for (let m = o; m <= l; m++)
-      d[m] = {
+      u[m] = {
         colIndex: m,
         filter: n.getFilterColumn(m)
       };
-    re(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, d);
+    re(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, u);
     let f = s.startColumn, g = s.endColumn;
     o >= a.startColumn && o <= a.endColumn && c.startColumn > a.startColumn && a.endColumn < l && (f = a.endColumn + 1), l >= a.startColumn && l <= a.endColumn && c.startColumn < a.startColumn && a.startColumn > o && (g = a.startColumn - 1);
-    const C = Object.keys(d).map((m) => Number(m)), S = C.find((m) => d[m].colIndex === g), F = C.find((m) => d[m].colIndex === f);
+    const C = Object.keys(u).map((m) => Number(m)), S = C.find((m) => u[m].colIndex === g), F = C.find((m) => u[m].colIndex === f);
     if (C.forEach((m) => {
       var Z, ee;
-      const { colIndex: v, filter: O } = d[m], A = m;
+      const { colIndex: v, filter: O } = u[m], A = m;
       if (O) {
         if (A >= F && A <= S) {
-          const q = {
+          const Q = {
             unitId: e,
             subUnitId: t,
             col: A,
@@ -805,16 +809,16 @@ let V = class extends B {
             col: A,
             criteria: n.getFilterColumn(A) ? { ...(Z = n.getFilterColumn(A)) == null ? void 0 : Z.serialize(), colId: A } : null
           };
-          h.push({ id: p.id, params: q }), u.push({ id: p.id, params: Se });
+          h.push({ id: p.id, params: Q }), d.push({ id: p.id, params: Se });
         }
-        if (!((ee = d[v]) != null && ee.filter)) {
-          const q = {
+        if (!((ee = u[v]) != null && ee.filter)) {
+          const Q = {
             unitId: e,
             subUnitId: t,
             col: v,
             criteria: null
           };
-          h.push({ id: p.id, params: q }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...O.serialize(), colId: v } } });
+          h.push({ id: p.id, params: Q }), d.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...O.serialize(), colId: v } } });
         }
       }
     }), o !== F || l !== S) {
@@ -827,10 +831,10 @@ let V = class extends B {
           endColumn: S
         }
       };
-      h.unshift({ id: R.id, params: m }), u.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
+      h.unshift({ id: R.id, params: m }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: t } });
     }
     return {
-      undos: u,
+      undos: d,
       redos: h
     };
   }
@@ -842,15 +846,15 @@ let V = class extends B {
     const { startRow: o, endRow: l } = s, { fromRange: a, toRange: c } = r;
     if (a.endRow < o && c.startRow <= o || a.startRow > l && c.endRow > l)
       return this._handleNull();
-    const h = [], u = [], d = {};
+    const h = [], d = [], u = {};
     for (let m = o; m <= l; m++)
-      d[m] = {
+      u[m] = {
         oldIndex: m
       };
     const f = o;
     let g = l;
-    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), re(a.startRow, a.endRow - a.startRow + 1, c.startRow, d);
-    const C = Object.keys(d).map((m) => Number(m)), S = C.find((m) => d[m].oldIndex === g), F = C.find((m) => d[m].oldIndex === f);
+    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), re(a.startRow, a.endRow - a.startRow + 1, c.startRow, u);
+    const C = Object.keys(u).map((m) => Number(m)), S = C.find((m) => u[m].oldIndex === g), F = C.find((m) => u[m].oldIndex === f);
     if (o !== F || l !== S) {
       const m = {
         unitId: e,
@@ -861,11 +865,11 @@ let V = class extends B {
           endRow: S
         }
       };
-      h.push({ id: R.id, params: m }, { id: z.id, params: { unitId: e, subUnitId: t } }), u.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: z.id, params: { unitId: e, subUnitId: t } });
+      h.push({ id: R.id, params: m }, { id: W.id, params: { unitId: e, subUnitId: t } }), d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: t } }, { id: W.id, params: { unitId: e, subUnitId: t } });
     }
     return {
       redos: h,
-      undos: u
+      undos: d
     };
   }
   _handleMoveRangeCommand(r, e, t) {
@@ -877,18 +881,18 @@ let V = class extends B {
       return this._handleNull();
     const a = [], c = [];
     if (K.contains(n, l)) {
-      const h = l.startRow - n.startRow, u = l.startColumn - n.startColumn, d = {
+      const h = l.startRow - n.startRow, d = l.startColumn - n.startColumn, u = {
         startRow: s.startRow + h,
-        startColumn: s.startColumn + u,
+        startColumn: s.startColumn + d,
         endRow: s.startRow + h + (l.endRow - l.startRow),
-        endColumn: s.startColumn + u + (l.endColumn - l.startColumn)
+        endColumn: s.startColumn + d + (l.endColumn - l.startColumn)
       }, f = {
         id: y.id,
         params: {
           unitId: e,
           subUnitId: t
         }
-      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: d } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
+      }, g = { id: R.id, params: { unitId: e, subUnitId: t, range: u } }, C = { id: R.id, params: { unitId: e, subUnitId: t, range: l } };
       a.push(f, g), c.push(f, C);
       const S = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
       S.forEach((_) => {
@@ -930,8 +934,8 @@ let V = class extends B {
     if (!s)
       return this._handleNull();
     const o = [], l = [], a = [], c = [];
-    return n.getAllFilterColumns().forEach(([u, d]) => {
-      o.push({ id: p.id, params: { unitId: r, subUnitId: t, col: u, criteria: { ...d.serialize(), colId: u } } }), a.push({ id: p.id, params: { unitId: r, subUnitId: t, col: u, criteria: null } });
+    return n.getAllFilterColumns().forEach(([d, u]) => {
+      o.push({ id: p.id, params: { unitId: r, subUnitId: t, col: d, criteria: { ...u.serialize(), colId: d } } }), a.push({ id: p.id, params: { unitId: r, subUnitId: t, col: d, criteria: null } });
     }), a.push({ id: y.id, params: { unitId: r, subUnitId: t, range: s } }), o.unshift({ id: R.id, params: { range: s, unitId: r, subUnitId: t } }), {
       undos: l,
       redos: o,
@@ -943,7 +947,7 @@ let V = class extends B {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(Ve.ROW_FILTERED, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(ke.ROW_FILTERED, {
       // sheet-interceptor.service.ts
       handler: (r, e) => {
         var t, n;
@@ -962,35 +966,35 @@ let V = class extends B {
       col: -1
     }, o = [], l = [], a = [], c = [];
     return t.forEach((h) => {
-      const [u, d] = h;
+      const [d, u] = h;
       l.push({
         id: p.id,
         params: {
           ...s,
-          col: u
+          col: d
         }
       }), o.push({
         id: p.id,
         params: {
           ...s,
-          col: u,
-          criteria: { ...d.serialize(), colId: u }
+          col: d,
+          criteria: { ...u.serialize(), colId: d }
         }
       });
     }), t.forEach((h) => {
-      const [u, d] = h;
+      const [d, u] = h;
       c.push({
         id: p.id,
         params: {
           ...s,
-          col: u + n,
-          criteria: { ...d.serialize(), colId: u + n }
+          col: d + n,
+          criteria: { ...u.serialize(), colId: d + n }
         }
       }), a.push({
         id: p.id,
         params: {
           ...s,
-          col: u + n,
+          col: d + n,
           criteria: null
         }
       });
@@ -1010,37 +1014,37 @@ let V = class extends B {
       var c, h;
       const { unitId: t, subUnitId: n } = r.params || {}, s = this._sheetsFilterService.getFilterModel(t, n);
       if (!s) return;
-      const o = Array.from(s.filteredOutRows).sort((u, d) => u - d), l = [];
+      const o = Array.from(s.filteredOutRows).sort((d, u) => d - u), l = [];
       let a = !1;
-      if (r.id === je.id) {
-        const { startRow: u, endRow: d } = r.params.range, f = o.filter((g) => g >= u && g <= d);
+      if (r.id === qe.id) {
+        const { startRow: d, endRow: u } = r.params.range, f = o.filter((g) => g >= d && g <= u);
         o.forEach((g) => {
-          if (g < u)
+          if (g < d)
             l.push(g);
-          else if (a = !0, g <= d) {
-            const C = Math.max(u, l.length ? l[l.length - 1] + 1 : u);
+          else if (a = !0, g <= u) {
+            const C = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
             l.push(C);
           } else
-            l.push(g - (d - u + 1 - f.length));
+            l.push(g - (u - d + 1 - f.length));
         });
       }
-      if (r.id === ke.id) {
-        const { startRow: u, endRow: d } = r.params.range;
+      if (r.id === Qe.id) {
+        const { startRow: d, endRow: u } = r.params.range;
         o.forEach((f) => {
-          f >= u ? (a = !0, l.push(f + (d - u + 1))) : l.push(f);
+          f >= d ? (a = !0, l.push(f + (u - d + 1))) : l.push(f);
         });
       }
-      if (a && (s.filteredOutRows = new Set(l)), r.id === qe.id && !(e != null && e.onlyLocal)) {
-        const u = this._getExtendRegion(t, n);
-        if (u) {
-          const d = r.params.cellValue;
-          if (d)
-            for (let f = u.startColumn; f <= u.endColumn; f++) {
-              const g = (c = d == null ? void 0 : d[u.startRow]) == null ? void 0 : c[f];
+      if (a && (s.filteredOutRows = new Set(l)), r.id === Ge.id && !(e != null && e.onlyLocal)) {
+        const d = this._getExtendRegion(t, n);
+        if (d) {
+          const u = r.params.cellValue;
+          if (u)
+            for (let f = d.startColumn; f <= d.endColumn; f++) {
+              const g = (c = u == null ? void 0 : u[d.startRow]) == null ? void 0 : c[f];
               if (g && this._cellHasValue(g)) {
                 const C = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
                 if (C) {
-                  const S = ue(u, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
+                  const S = de(d, { down: !0 }, C), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
                   F.setRange({
                     ..._,
                     endRow: S.endRow
@@ -1081,7 +1085,7 @@ let V = class extends B {
       const { subUnitId: n, unitId: s } = t, o = this._sheetsFilterService.getFilterModel(s, n);
       if (!o) return;
       const l = o.getRange();
-      if (r.id === Qe.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
+      if (r.id === Je.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
         throw this._sheetsFilterService.setFilterErrorMsg("sheets-filter.msg.filter-header-forbidden"), new Error("[SheetsFilterController]: Cannot move header row of filter");
     }));
   }
@@ -1090,21 +1094,22 @@ let V = class extends B {
     return !(e.length === 0 || e.every((t) => t == null));
   }
 };
-V = Tt([
+j = It([
   P(0, N),
-  P(1, $(Be)),
-  P(2, $(M)),
+  P(1, I(He)),
+  P(2, I(M)),
   P(3, T),
-  P(4, $(be))
-], V);
-var Nt = Object.getOwnPropertyDescriptor, xt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Nt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+  P(4, I(ze)),
+  P(5, Te(be))
+], j);
+var $t = Object.getOwnPropertyDescriptor, Pt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? $t(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, Y = (i, r) => (e, t) => r(e, t, i);
-let j = class extends B {
-  constructor(i, r, e) {
-    super(), this._activeDirtyManagerService = i, this._sheetsFilterService = r, this._univerInstanceService = e, this._initFormulaDirtyRange();
+}, H = (i, r) => (e, t) => r(e, t, i);
+let k = class extends B {
+  constructor(i, r, e, t) {
+    super(), this._activeDirtyManagerService = i, this._sheetRowFilteredService = r, this._sheetsFilterService = e, this._univerInstanceService = t, this._initFormulaDirtyRange(), this._registerSheetRowFiltered();
   }
   _initFormulaDirtyRange() {
     ge.forEach((i) => {
@@ -1144,78 +1149,85 @@ let j = class extends B {
       }
     }];
   }
+  _registerSheetRowFiltered() {
+    this._sheetRowFilteredService.register((i, r, e) => {
+      var t, n;
+      return (n = (t = this._sheetsFilterService.getFilterModel(i, r)) == null ? void 0 : t.isRowFiltered(e)) != null ? n : !1;
+    });
+  }
 };
-j = xt([
-  Y(0, $(st)),
-  Y(1, $(M)),
-  Y(2, T)
-], j);
-var It = Object.getOwnPropertyDescriptor, $t = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? It(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+k = Pt([
+  H(0, I(lt)),
+  H(1, I(at)),
+  H(2, I(M)),
+  H(3, T)
+], k);
+var Ut = Object.getOwnPropertyDescriptor, Dt = (i, r, e, t) => {
+  for (var n = t > 1 ? void 0 : t ? Ut(r, e) : r, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, ae = (i, r) => (e, t) => r(e, t, i), H;
-let ce = (H = class extends Ne {
+}, ae = (i, r) => (e, t) => r(e, t, i), z;
+let ce = (z = class extends xe {
   constructor(i = ie, r, e) {
     super(), this._config = i, this._injector = r, this._configService = e;
-    const { ...t } = xe(
+    const { ...t } = Ie(
       {},
       ie,
       this._config
     );
-    this._configService.setConfig(ot, t);
+    this._configService.setConfig(ct, t);
   }
   onStarting() {
     [
-      [j],
+      [k],
       [M],
-      [V]
+      [j]
     ].forEach((i) => this._injector.add(i));
   }
   onReady() {
-    Ie(this._injector, [
-      [j],
-      [V]
+    $e(this._injector, [
+      [k],
+      [j]
     ]);
   }
-}, w(H, "type", D.UNIVER_SHEET), w(H, "pluginName", Fe), H);
-ce = $t([
-  ae(1, $($e)),
+}, w(z, "type", D.UNIVER_SHEET), w(z, "pluginName", Fe), z);
+ce = Dt([
+  ae(1, I(Pe)),
   ae(2, Ue)
 ], ce);
-const Ut = {
+const Lt = {
   id: "sheet.command.set-filter-range",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(k), s = i.get(T), { unitId: o, subUnitId: l, range: a } = r;
+    const e = i.get(M), t = i.get(N), n = i.get(q), s = i.get(T), { unitId: o, subUnitId: l, range: a } = r;
     if (!b(s, r) || e.getFilterModel(o, l)) return !1;
     if (a.endRow === a.startRow) {
-      const f = i.get(De), g = i.get(Le);
+      const f = i.get(Le), g = i.get(Be);
       return f.emit(g.t("sheets-filter.command.not-valid-filter-range")), !1;
     }
-    const u = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, d = t.syncExecuteCommand(u.id, u.params);
-    return d && n.pushUndoRedo({
+    const d = { id: R.id, params: { unitId: o, subUnitId: l, range: a } }, u = t.syncExecuteCommand(d.id, d.params);
+    return u && n.pushUndoRedo({
       unitID: o,
       undoMutations: [{ id: y.id, params: { unitId: o, subUnitId: l } }],
-      redoMutations: [u]
-    }), d;
+      redoMutations: [d]
+    }), u;
   }
-}, Pt = {
+}, Bt = {
   id: "sheet.command.remove-sheet-filter",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(k), o = b(e, r);
+    const e = i.get(T), t = i.get(M), n = i.get(N), s = i.get(q), o = b(e, r);
     if (!o) return !1;
     const { unitId: l, subUnitId: a } = o, c = t.getFilterModel(l, a);
     if (!c) return !1;
-    const h = c == null ? void 0 : c.serialize(), u = Dt(l, a, h), d = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
-    return d && s.pushUndoRedo({
+    const h = c == null ? void 0 : c.serialize(), d = bt(l, a, h), u = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
+    return u && s.pushUndoRedo({
       unitID: l,
-      undoMutations: u,
+      undoMutations: d,
       redoMutations: [{ id: y.id, params: { unitId: l, subUnitId: a } }]
-    }), d;
+    }), u;
   }
-}, jt = {
+}, Gt = {
   id: "sheet.command.smart-toggle-filter",
   type: E.COMMAND,
   handler: async (i) => {
@@ -1223,25 +1235,25 @@ const Ut = {
     if (!s || !n) return !1;
     const o = n.getUnitId(), l = s.getSheetId();
     if (e.getFilterModel(o, l))
-      return t.executeCommand(Pt.id, { unitId: o, subUnitId: l });
-    const h = i.get(Ze).getCurrentLastSelection();
+      return t.executeCommand(Bt.id, { unitId: o, subUnitId: l });
+    const h = i.get(tt).getCurrentLastSelection();
     if (!h) return !1;
-    const u = h.range, d = et(h) ? ue(u, { left: !0, right: !0, up: !0, down: !0 }, s) : u;
-    return t.executeCommand(Ut.id, {
+    const d = h.range, u = rt(h) ? de(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
+    return t.executeCommand(Lt.id, {
       unitId: o,
       subUnitId: l,
-      range: d
+      range: u
     });
   }
-}, kt = {
+}, Jt = {
   id: "sheet.command.set-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(N), n = i.get(k), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
+    const e = i.get(M), t = i.get(N), n = i.get(q), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
     if (!c) return !1;
     const h = c.getRange();
     if (!h || l < h.startColumn || l > h.endColumn) return !1;
-    const u = c.getFilterColumn(l), d = Bt(s, o, l, u), f = {
+    const d = c.getFilterColumn(l), u = zt(s, o, l, d), f = {
       id: p.id,
       params: {
         unitId: s,
@@ -1252,36 +1264,36 @@ const Ut = {
     }, g = t.syncExecuteCommand(f.id, f.params);
     return g && n.pushUndoRedo({
       unitID: s,
-      undoMutations: [d],
+      undoMutations: [u],
       redoMutations: [f]
     }), g;
   }
-}, qt = {
+}, Yt = {
   id: "sheet.command.clear-filter-criteria",
   type: E.COMMAND,
   handler: (i, r) => {
-    const e = i.get(M), t = i.get(k), n = i.get(N), s = i.get(T), o = b(s, r);
+    const e = i.get(M), t = i.get(q), n = i.get(N), s = i.get(T), o = b(s, r);
     if (!o) return !1;
     const { unitId: l, subUnitId: a } = o, c = e.getFilterModel(o.unitId, o.subUnitId);
     if (!c) return !1;
-    const h = c.serialize(), u = we(l, a, h), d = Lt(l, a, h);
-    return Pe(d, n).result ? (t.pushUndoRedo({
+    const h = c.serialize(), d = we(l, a, h), u = Ht(l, a, h);
+    return De(u, n).result ? (t.pushUndoRedo({
       unitID: l,
-      undoMutations: u,
-      redoMutations: d
+      undoMutations: d,
+      redoMutations: u
     }), !0) : !1;
   }
-}, Qt = {
+}, Kt = {
   id: "sheet.command.re-calc-filter",
   type: E.COMMAND,
   handler: (i, r) => {
     const e = i.get(M), t = i.get(N), n = i.get(T), s = b(n, r);
     if (!s) return !1;
     const { unitId: o, subUnitId: l } = s;
-    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(z.id, { unitId: o, subUnitId: l }) : !1;
+    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(W.id, { unitId: o, subUnitId: l }) : !1;
   }
 };
-function Dt(i, r, e) {
+function bt(i, r, e) {
   const t = [], n = {
     id: R.id,
     params: {
@@ -1308,7 +1320,7 @@ function we(i, r, e) {
     t.push(o);
   }), t;
 }
-function Lt(i, r, e) {
+function Ht(i, r, e) {
   var n;
   const t = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
@@ -1324,7 +1336,7 @@ function Lt(i, r, e) {
     t.push(o);
   }), t;
 }
-function Bt(i, r, e, t) {
+function zt(i, r, e, t) {
   if (!t)
     return {
       id: p.id,
@@ -1347,28 +1359,28 @@ function Bt(i, r, e, t) {
   };
 }
 export {
-  qt as ClearSheetsFilterCriteriaCommand,
+  Yt as ClearSheetsFilterCriteriaCommand,
   x as CustomFilterOperator,
   ge as FILTER_MUTATIONS,
-  _t as FilterColumn,
-  W as FilterModel,
-  Qt as ReCalcSheetsFilterCommand,
-  z as ReCalcSheetsFilterMutation,
-  Pt as RemoveSheetFilterCommand,
+  pt as FilterColumn,
+  V as FilterModel,
+  Kt as ReCalcSheetsFilterCommand,
+  W as ReCalcSheetsFilterMutation,
+  Bt as RemoveSheetFilterCommand,
   y as RemoveSheetsFilterMutation,
   Fe as SHEET_FILTER_SNAPSHOT_ID,
-  Ut as SetSheetFilterRangeCommand,
-  kt as SetSheetsFilterCriteriaCommand,
+  Lt as SetSheetFilterRangeCommand,
+  Jt as SetSheetsFilterCriteriaCommand,
   p as SetSheetsFilterCriteriaMutation,
   R as SetSheetsFilterRangeMutation,
   M as SheetsFilterService,
-  jt as SmartToggleSheetsFilterCommand,
+  Gt as SmartToggleSheetsFilterCommand,
   ce as UniverSheetsFilterPlugin,
-  dt as equals,
+  ft as equals,
   se as getCustomFilterFn,
-  lt as greaterThan,
-  at as greaterThanOrEqualTo,
-  ct as lessThan,
-  ut as lessThanOrEqualTo,
+  dt as greaterThan,
+  ut as greaterThanOrEqualTo,
+  ht as lessThan,
+  mt as lessThanOrEqualTo,
   _e as notEquals
 };