@univerjs/sheets-filter 0.10.6 → 0.10.7-nightly.202509080357

package/lib/es/index.js

@@ -1,91 +1,91 @@
-var Ee = Object.defineProperty;
-var Oe = (i, r, e) => r in i ? Ee(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var S = (i, r, e) => Oe(i, typeof r != "symbol" ? r + "" : r, e);
-import { isNumeric as ye, Disposable as B, Rectangle as Y, mergeSets as J, Tools as re, extractPureTextFromCell as Ae, CellValueType as X, ColorKit as ne, UniverInstanceType as P, fromCallback as Te, CommandType as E, IResourceManagerService as Ne, IUniverInstanceService as N, ICommandService as I, IUndoRedoService as G, sequenceExecute as Ie, ErrorService as xe, LocaleService as $e, Inject as T, Optional as be, DisposableCollection as Le, moveMatrixArray as ie, Plugin as Ue, merge as Pe, touchDependencies as De, Injector as Be, IConfigService as ze } from "@univerjs/core";
-import { getSheetCommandTarget as z, SheetsSelectionsService as He, isSingleCellSelection as We, expandToContinuousRange as he, SheetInterceptorService as Ve, RefRangeService as je, ZebraCrossingCacheController as ke, SetWorksheetActiveOperation as qe, CopySheetCommand as Ge, RemoveSheetCommand as Qe, INTERCEPTOR_POINT as Je, RemoveRowMutation as Ze, InsertRowMutation as Ke, SetRangeValuesMutation as Ye, MoveRowsCommand as Xe, MoveRangeCommand as et, EffectRefRangId as se, RemoveRowCommand as tt, RemoveColCommand as rt, InsertColCommand as nt, InsertRowCommand as it } from "@univerjs/sheets";
-import { BehaviorSubject as D, merge as st, filter as ot, switchMap as lt, of as at } from "rxjs";
-import { COLOR_BLACK_RGB as ct } from "@univerjs/engine-render";
-import { DataSyncPrimaryController as ut } from "@univerjs/rpc";
-import { IActiveDirtyManagerService as dt, ISheetRowFilteredService as ht } from "@univerjs/engine-formula";
-const fe = "sheet.mutation.set-filter-range", me = "sheet.mutation.set-filter-criteria", ge = "sheet.mutation.remove-filter", _e = "sheet.mutation.re-calc-filter", Ce = /* @__PURE__ */ new Set([
-  fe,
-  me,
-  ge,
-  _e
+var be = Object.defineProperty;
+var $e = (i, t, e) => t in i ? be(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var C = (i, t, e) => $e(i, typeof t != "symbol" ? t + "" : t, e);
+import { isNumeric as Le, Disposable as U, Rectangle as ee, mergeSets as Z, Tools as ie, extractPureTextFromCell as Ue, CellValueType as te, ColorKit as se, UniverInstanceType as D, fromCallback as Pe, CommandType as O, IResourceManagerService as De, IUniverInstanceService as N, ICommandService as T, IUndoRedoService as Q, sequenceExecute as j, ErrorService as Be, LocaleService as ze, Inject as A, Optional as He, DisposableCollection as me, moveMatrixArray as oe, IConfigService as ge, Plugin as Ve, merge as We, touchDependencies as je, Injector as ke } from "@univerjs/core";
+import { getSheetCommandTarget as H, SheetsSelectionsService as qe, isSingleCellSelection as Ge, expandToContinuousRange as _e, SheetInterceptorService as Qe, RefRangeService as Je, ZebraCrossingCacheController as Ze, SetWorksheetActiveOperation as Ke, CopySheetCommand as Ye, RemoveSheetCommand as Xe, INTERCEPTOR_POINT as et, RemoveRowMutation as tt, InsertRowMutation as rt, SetRangeValuesMutation as nt, MoveRowsCommand as it, MoveRangeCommand as st, EffectRefRangId as le, RemoveRowCommand as ot, RemoveColCommand as lt, InsertColCommand as at, InsertRowCommand as ct, InsertColMutation as Ce, RemoveColMutation as Re, MoveColsMutation as pe } from "@univerjs/sheets";
+import { BehaviorSubject as $, merge as dt, filter as ut, switchMap as ht, of as ft } from "rxjs";
+import { COLOR_BLACK_RGB as mt } from "@univerjs/engine-render";
+import { DataSyncPrimaryController as gt } from "@univerjs/rpc";
+import { IActiveDirtyManagerService as _t, ISheetRowFilteredService as Ct } from "@univerjs/engine-formula";
+const Se = "sheet.mutation.set-filter-range", Fe = "sheet.mutation.set-filter-criteria", we = "sheet.mutation.remove-filter", ve = "sheet.mutation.re-calc-filter", Me = /* @__PURE__ */ new Set([
+  Se,
+  Fe,
+  we,
+  ve
 ]);
 var b = /* @__PURE__ */ ((i) => (i[i.VALUES = 0] = "VALUES", i[i.COLORS = 1] = "COLORS", i[i.CONDITIONS = 2] = "CONDITIONS", i))(b || {}), 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 ft = {
+const Rt = {
   operator: x.GREATER_THAN,
-  fn: (i, r) => U(i) ? i > r : !1
-}, mt = {
+  fn: (i, t) => P(i) ? i > t : !1
+}, pt = {
   operator: x.GREATER_THAN_OR_EQUAL,
-  fn: (i, r) => U(i) ? i >= r : !1
-}, gt = {
+  fn: (i, t) => P(i) ? i >= t : !1
+}, St = {
   operator: x.LESS_THAN,
-  fn: (i, r) => U(i) ? i < r : !1
-}, _t = {
+  fn: (i, t) => P(i) ? i < t : !1
+}, Ft = {
   operator: x.LESS_THAN_OR_EQUAL,
-  fn: (i, r) => U(i) ? i <= r : !1
-}, Ct = {
+  fn: (i, t) => P(i) ? i <= t : !1
+}, wt = {
   operator: x.EQUAL,
-  fn: (i, r) => U(i) ? i === r : !1
-}, Re = {
+  fn: (i, t) => P(i) ? i === t : !1
+}, Ee = {
   operator: x.NOT_EQUALS,
-  fn: (i, r) => {
-    if (typeof r == "string") {
-      if (r === " ")
+  fn: (i, t) => {
+    if (typeof t == "string") {
+      if (t === " ")
         return i != null;
-      const e = Fe(i);
-      return e && St(r) ? !Se(r).test(e) : e !== r;
+      const e = ye(i);
+      return e && Ot(t) ? !Ae(t).test(e) : e !== t;
     }
-    return U(i) ? i !== r : !0;
+    return P(i) ? i !== t : !0;
   }
-}, pe = /* @__PURE__ */ new Map([]), Rt = [ft, mt, gt, _t, Ct, Re];
-Rt.forEach((i) => {
-  pe.set(i.operator, i);
+}, Oe = /* @__PURE__ */ new Map([]), vt = [Rt, pt, St, Ft, wt, Ee];
+vt.forEach((i) => {
+  Oe.set(i.operator, i);
 });
-function pt(i) {
+function Mt(i) {
   return !!i;
 }
-const Ft = {
-  fn: (i, r) => {
-    const e = Fe(i);
-    return e === null ? r === "" : Se(r).test(e);
+const Et = {
+  fn: (i, t) => {
+    const e = ye(i);
+    return e === null ? t === "" : Ae(t).test(e);
   }
 };
-function oe(i) {
-  return i ? pe.get(i) : Ft;
+function ae(i) {
+  return i ? Oe.get(i) : Et;
 }
-function U(i) {
+function P(i) {
   return typeof i == "number";
 }
-function le(i) {
-  return !!(typeof i == "number" || typeof i == "string" && ye(i));
+function ce(i) {
+  return !!(typeof i == "number" || typeof i == "string" && Le(i));
 }
-function Fe(i) {
+function ye(i) {
   return typeof i == "boolean" || i == null ? null : typeof i == "string" ? i : i.toString();
 }
-function St(i) {
+function Ot(i) {
   return typeof i == "number" ? !1 : i.indexOf("*") !== -1 || i.indexOf("?") !== -1;
 }
-function Se(i) {
-  const r = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
-  return new RegExp(`^${r}$`);
+function Ae(i) {
+  const t = i.replace(/[.+^${}()|[\]\\]/g, "\\$&").replaceAll("?", ".").replace(/[*]/g, ".$&");
+  return new RegExp(`^${t}$`);
 }
-const Z = () => /* @__PURE__ */ new Set();
-class j extends B {
-  constructor(e, t, n) {
+const K = () => /* @__PURE__ */ new Set();
+class k extends U {
+  constructor(e, r, n) {
     super();
-    S(this, "_filteredOutRows$", new D(Z()));
+    C(this, "_filteredOutRows$", new $(K()));
     /** An observable value. A set of filtered out rows. */
-    S(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
+    C(this, "filteredOutRows$", this._filteredOutRows$.asObservable());
     // TODO: we may need to update which cols have criteria rather than simple boolean
-    S(this, "_hasCriteria$", new D(!1));
-    S(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    S(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
-    S(this, "_alreadyFilteredOutRows", Z());
-    S(this, "_range");
-    this.unitId = e, this.subUnitId = t, this._worksheet = n;
+    C(this, "_hasCriteria$", new $(!1));
+    C(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    C(this, "_filterColumnByIndex", /* @__PURE__ */ new Map());
+    C(this, "_alreadyFilteredOutRows", K());
+    C(this, "_range");
+    this.unitId = e, this.subUnitId = r, this._worksheet = n;
   }
   get filteredOutRows() {
     return this._filteredOutRows$.getValue();
@@ -101,8 +101,8 @@ class j extends B {
    */
   serialize() {
     const e = {
-      ref: Y.clone(this._range),
-      filterColumns: this._getAllFilterColumns(!0).sort(([t], [n]) => t - n).map(([t, n]) => n.serialize())
+      ref: ee.clone(this._range),
+      filterColumns: this._getAllFilterColumns(!0).sort(([r], [n]) => r - n).map(([r, n]) => n.serialize())
     };
     return this._alreadyFilteredOutRows && (e.cachedFilteredOut = Array.from(this._alreadyFilteredOutRows).sort()), e;
   }
@@ -113,13 +113,13 @@ class j extends B {
    * @param worksheet the Worksheet object
    * @param autoFilter auto filter data
    */
-  static deserialize(e, t, n, s) {
-    const o = new j(e, t, n);
+  static deserialize(e, r, n, s) {
+    const o = new k(e, r, n);
     return o._dump(s), o;
   }
   _dump(e) {
-    var t;
-    this.setRange(e.ref), (t = e.filterColumns) == null || t.forEach((n) => this._setCriteriaWithoutReCalc(n.colId, n)), e.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(e.cachedFilteredOut), this._emit()), this._emitHasCriteria();
+    var r;
+    this.setRange(e.ref), (r = e.filterColumns) == null || r.forEach((n) => this._setCriteriaWithoutReCalc(n.colId, n)), e.cachedFilteredOut && (this._alreadyFilteredOutRows = new Set(e.cachedFilteredOut), this._emit()), this._emitHasCriteria();
   }
   isRowFiltered(e) {
     return this._alreadyFilteredOutRows.has(e);
@@ -135,9 +135,9 @@ class j extends B {
    * @param col
    */
   getFilteredOutRowsExceptCol(e) {
-    return this._getAllFilterColumns(!0).filter(([t]) => t !== e).reduce((t, [, n]) => {
-      const s = n.calc({ getAlreadyFilteredOutRows: () => t });
-      return s ? J(t, s) : t;
+    return this._getAllFilterColumns(!0).filter(([r]) => r !== e).reduce((r, [, n]) => {
+      const s = n.calc({ getAlreadyFilteredOutRows: () => r });
+      return s ? Z(r, s) : r;
     }, /* @__PURE__ */ new Set());
   }
   /**
@@ -145,45 +145,45 @@ class j extends B {
    * if the new range not overlaps the old range.
    */
   setRange(e) {
-    this._range = e, this._getAllFilterColumns(!0).forEach(([t, n]) => {
+    this._range = e, this._getAllFilterColumns(!0).forEach(([r, n]) => {
       n.setRangeAndColumn({
         startRow: e.startRow,
         endRow: e.endRow,
-        startColumn: t,
-        endColumn: t
-      }, t);
+        startColumn: r,
+        endColumn: r
+      }, r);
     });
   }
   /**
    * Set or remove filter criteria on a specific row.
    */
-  setCriteria(e, t, n = !1) {
+  setCriteria(e, r, n = !1) {
     if (!this._range)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
-    if (!t) {
+    if (!r) {
       this._removeCriteria(e), this._rebuildAlreadyFilteredOutRowsWithCache(), n && this._reCalcAllColumns(), this._emit(), this._emitHasCriteria();
       return;
     }
-    this._setCriteriaWithoutReCalc(e, t), n && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
+    this._setCriteriaWithoutReCalc(e, r), n && (this._rebuildAlreadyFilteredOutRowsWithCache(), this._reCalcWithNoCacheColumns(), this._emit(), this._emitHasCriteria());
   }
   getAllFilterColumns() {
     return this._getAllFilterColumns(!0);
   }
   getFilterColumn(e) {
-    var t;
-    return (t = this._filterColumnByIndex.get(e)) != null ? t : null;
+    var r;
+    return (r = this._filterColumnByIndex.get(e)) != null ? r : null;
   }
   reCalc() {
     this._reCalcAllColumns(), this._emit();
   }
   _getAllFilterColumns(e = !1) {
-    const t = Array.from(this._filterColumnByIndex.entries());
-    return e ? t : t.map(([n, s]) => s);
+    const r = Array.from(this._filterColumnByIndex.entries());
+    return e ? r : r.map(([n, s]) => s);
   }
   _reCalcAllColumns() {
-    this._alreadyFilteredOutRows = Z(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
+    this._alreadyFilteredOutRows = K(), this._getAllFilterColumns().forEach((e) => e.__clearCache()), this._reCalcWithNoCacheColumns();
   }
-  _setCriteriaWithoutReCalc(e, t) {
+  _setCriteriaWithoutReCalc(e, r) {
     const n = this._range;
     if (!n)
       throw new Error("[FilterModel] could not set criteria before a range is set!");
@@ -191,17 +191,17 @@ class j 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 wt(
+    this._filterColumnByIndex.has(e) ? l = this._filterColumnByIndex.get(e) : (l = new yt(
       this.unitId,
       this.subUnitId,
       this._worksheet,
-      t,
+      r,
       { getAlreadyFilteredOutRows: () => this._alreadyFilteredOutRows }
-    ), l.setRangeAndColumn(n, e), this._filterColumnByIndex.set(e, l)), l.setCriteria(t);
+    ), l.setRangeAndColumn(n, e), this._filterColumnByIndex.set(e, l)), l.setCriteria(r);
   }
   _removeCriteria(e) {
-    const t = this._filterColumnByIndex.get(e);
-    t && (t.dispose(), this._filterColumnByIndex.delete(e));
+    const r = this._filterColumnByIndex.get(e);
+    r && (r.dispose(), this._filterColumnByIndex.delete(e));
   }
   _emit() {
     this._filteredOutRows$.next(this._alreadyFilteredOutRows);
@@ -210,27 +210,27 @@ class j extends B {
     this._hasCriteria$.next(this._filterColumnByIndex.size > 0);
   }
   _rebuildAlreadyFilteredOutRowsWithCache() {
-    const e = this._getAllFilterColumns().filter((t) => t.hasCache()).reduce((t, n) => J(t, n.filteredOutRows), /* @__PURE__ */ new Set());
+    const e = this._getAllFilterColumns().filter((r) => r.hasCache()).reduce((r, n) => Z(r, 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 = J(this._alreadyFilteredOutRows, n));
+    const e = this._getAllFilterColumns().filter((r) => !r.hasCache());
+    for (const r of e) {
+      const n = r.reCalc();
+      n && (this._alreadyFilteredOutRows = Z(this._alreadyFilteredOutRows, n));
     }
   }
 }
-class wt extends B {
-  constructor(e, t, n, s, o) {
+class yt extends U {
+  constructor(e, r, n, s, o) {
     super();
-    S(this, "_filteredOutRows", null);
+    C(this, "_filteredOutRows", null);
     /** Cache the filter function.  */
-    S(this, "_filterFn", null);
-    S(this, "_range", null);
-    S(this, "_column", 0);
-    S(this, "_filterBy", b.VALUES);
-    this.unitId = e, this.subUnitId = t, this._worksheet = n, this._criteria = s, this._filterColumnContext = o;
+    C(this, "_filterFn", null);
+    C(this, "_range", null);
+    C(this, "_column", 0);
+    C(this, "_filterBy", b.VALUES);
+    this.unitId = e, this.subUnitId = r, this._worksheet = n, this._criteria = s, this._filterColumnContext = o;
   }
   get filteredOutRows() {
     return this._filteredOutRows;
@@ -250,7 +250,7 @@ class wt extends B {
   serialize() {
     if (!this._criteria)
       throw new Error("[FilterColumn]: could not serialize without a filter column!");
-    return re.deepClone({
+    return ie.deepClone({
       ...this._criteria,
       colId: this._column
     });
@@ -259,14 +259,14 @@ class wt extends B {
     return this._filteredOutRows !== null;
   }
   // The first row should be omitted!
-  setRangeAndColumn(e, t) {
-    this._range = e, this._column = t;
+  setRangeAndColumn(e, r) {
+    this._range = e, this._column = r;
   }
   setCriteria(e) {
     this._criteria = e, this._generateFilterFn(), this._filteredOutRows = null;
   }
   getColumnData() {
-    return re.deepClone(this._criteria);
+    return ie.deepClone(this._criteria);
   }
   /**
    * Trigger new calculation on this `FilterModel` instance.
@@ -284,115 +284,115 @@ class wt extends B {
       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 t = this._column, n = { startColumn: t, endColumn: t, startRow: this._range.startRow + 1, endRow: this._range.endRow }, s = /* @__PURE__ */ new Set(), o = e.getAlreadyFilteredOutRows();
+    const r = this._column, n = { startColumn: r, endColumn: r, startRow: this._range.startRow + 1, endRow: this._range.endRow }, s = /* @__PURE__ */ new Set(), o = e.getAlreadyFilteredOutRows();
     for (const l of this._worksheet.iterateByColumn(n, !1, !1)) {
-      const { row: a, rowSpan: c, col: h } = l;
+      const { row: a, rowSpan: c, col: u } = l;
       if (o.has(a) && (!c || c === 1))
         continue;
-      if (!(this._filterBy === b.VALUES ? this._filterFn(Ae(this._worksheet.getCell(a, h))) : this._filterBy === b.COLORS ? this._filterFn(this._worksheet.getComposedCellStyle(a, h)) : this._filterFn(It(this._worksheet, a, h))) && (s.add(a), c))
-        for (let d = 1; d < c; d++)
-          s.add(a + d);
+      if (!(this._filterBy === b.VALUES ? this._filterFn(Ue(this._worksheet.getCell(a, u))) : this._filterBy === b.COLORS ? this._filterFn(this._worksheet.getComposedCellStyle(a, u)) : this._filterFn(Ut(this._worksheet, a, u))) && (s.add(a), c))
+        for (let h = 1; h < c; h++)
+          s.add(a + h);
     }
     return s;
   }
   _generateFilterFn() {
-    this._criteria && (this._filterFn = vt(this._criteria), this._filterBy = this._criteria.filters ? b.VALUES : this._criteria.colorFilters ? b.COLORS : b.CONDITIONS);
+    this._criteria && (this._filterFn = At(this._criteria), this._filterBy = this._criteria.filters ? b.VALUES : this._criteria.colorFilters ? b.COLORS : b.CONDITIONS);
   }
 }
-function vt(i) {
+function At(i) {
   if (i.filters)
-    return Mt(i.filters);
+    return Tt(i.filters);
   if (i.colorFilters)
-    return Et(i.colorFilters);
+    return Nt(i.colorFilters);
   if (i.customFilters)
-    return Ot(i.customFilters);
+    return xt(i.customFilters);
   throw new Error("[FilterModel]: other types of filters are not supported yet.");
 }
-function Mt(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 Tt(i) {
+  const t = !!i.blank, e = new Set(i.filters);
+  return (r) => r === void 0 || r === "" ? t : e.has(typeof r == "string" ? r : `${r}`);
 }
-function Et(i) {
+function Nt(i) {
   if (i.cellFillColors) {
-    const r = new Set(i.cellFillColors);
+    const t = new Set(i.cellFillColors);
     return (e) => {
       var n;
       if (!e || !((n = e.bg) != null && n.rgb))
-        return !!r.has(null);
-      const t = new ne(e.bg.rgb).toRgbString();
-      return r.has(t);
+        return !!t.has(null);
+      const r = new se(e.bg.rgb).toRgbString();
+      return t.has(r);
     };
   }
   if (i.cellTextColors) {
-    const r = new Set(i.cellTextColors);
+    const t = new Set(i.cellTextColors);
     return (e) => {
       var n;
       if (!e || !((n = e.cl) != null && n.rgb))
-        return !!r.has(ct);
-      const t = new ne(e.cl.rgb).toRgbString();
-      return r.has(t);
+        return !!t.has(mt);
+      const r = new se(e.cl.rgb).toRgbString();
+      return t.has(r);
     };
   }
   throw new Error("[FilterModel]: color filters are not supported yet.");
 }
-function Ot(i) {
-  const r = i.customFilters.map((e) => Nt(e));
-  return Tt(r) ? i.and ? yt(r) : At(r) : r[0];
+function xt(i) {
+  const t = i.customFilters.map((e) => Lt(e));
+  return $t(t) ? i.and ? It(t) : bt(t) : t[0];
 }
-function yt(i) {
-  const [r, e] = i;
-  return (t) => r(t) && e(t);
+function It(i) {
+  const [t, e] = i;
+  return (r) => t(r) && e(r);
 }
-function At(i) {
-  const [r, e] = i;
-  return (t) => r(t) || e(t);
+function bt(i) {
+  const [t, e] = i;
+  return (r) => t(r) || e(r);
 }
-function Tt(i) {
+function $t(i) {
   return i.length === 2;
 }
-function Nt(i) {
-  const r = i.val;
-  if (i.operator === x.NOT_EQUALS && !le(r))
-    return (n) => Re.fn(n, r);
-  if (pt(i.operator)) {
-    if (!le(r)) return () => !1;
-    const n = oe(i.operator), s = Number(r);
+function Lt(i) {
+  const t = i.val;
+  if (i.operator === x.NOT_EQUALS && !ce(t))
+    return (n) => Ee.fn(n, t);
+  if (Mt(i.operator)) {
+    if (!ce(t)) return () => !1;
+    const n = ae(i.operator), s = Number(t);
     return (o) => n.fn(o, s);
   }
-  const e = oe(i.operator);
-  return (t) => e.fn(t, r);
+  const e = ae(i.operator);
+  return (r) => e.fn(r, t);
 }
-function It(i, r, e) {
-  const t = i.getCell(r, e);
-  if (!t) return null;
-  const n = i.getCellRaw(r, e);
-  return t && !n ? ae(t) : n ? t.t === X.NUMBER && typeof t.v == "string" ? n.v : ae(n) : null;
+function Ut(i, t, e) {
+  const r = i.getCell(t, e);
+  if (!r) return null;
+  const n = i.getCellRaw(t, e);
+  return r && !n ? de(r) : n ? r.t === te.NUMBER && typeof r.v == "string" ? n.v : de(n) : null;
 }
-function ae(i) {
-  var t, n;
-  const r = (n = (t = i.p) == null ? void 0 : t.body) == null ? void 0 : n.dataStream;
-  if (r) return r.trimEnd();
+function de(i) {
+  var r, n;
+  const t = (n = (r = i.p) == null ? void 0 : r.body) == null ? void 0 : n.dataStream;
+  if (t) return t.trimEnd();
   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" : "";
+  return typeof e == "string" ? i.t === te.BOOLEAN ? e.toUpperCase() : e : typeof e == "number" ? i.t === te.BOOLEAN ? e ? "TRUE" : "FALSE" : e : typeof e == "boolean" ? e ? "TRUE" : "FALSE" : "";
 }
-var xt = Object.getOwnPropertyDescriptor, $t = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? xt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var Pt = Object.getOwnPropertyDescriptor, Dt = (i, t, e, r) => {
+  for (var n = r > 1 ? void 0 : r ? Pt(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, K = (i, r) => (e, t) => r(e, t, i);
-const we = "SHEET_FILTER_PLUGIN";
-let M = class extends B {
-  constructor(r, e, t) {
+}, Y = (i, t) => (e, r) => t(e, r, i);
+const Te = "SHEET_FILTER_PLUGIN";
+let M = class extends U {
+  constructor(t, e, r) {
     super();
-    S(this, "_filterModels", /* @__PURE__ */ new Map());
-    S(this, "_loadedUnitId$", new D(null));
-    S(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
-    S(this, "_errorMsg$", new D(null));
-    S(this, "errorMsg$", this._errorMsg$.asObservable());
-    S(this, "_activeFilterModel$", new D(null));
+    C(this, "_filterModels", /* @__PURE__ */ new Map());
+    C(this, "_loadedUnitId$", new $(null));
+    C(this, "loadedUnitId$", this._loadedUnitId$.asObservable());
+    C(this, "_errorMsg$", new $(null));
+    C(this, "errorMsg$", this._errorMsg$.asObservable());
+    C(this, "_activeFilterModel$", new $(null));
     /** An observable value emitting the current Workbook's active Worksheet's filter model (if there is one). */
-    S(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
-    this._resourcesManagerService = r, this._univerInstanceService = e, this._commandService = t, this._initModel(), this._initActiveFilterModel();
+    C(this, "activeFilterModel$", this._activeFilterModel$.asObservable());
+    this._resourcesManagerService = t, this._univerInstanceService = e, this._commandService = r, this._initModel(), this._initActiveFilterModel();
   }
   /** The current Workbook's active Worksheet's filter model (if there is one). */
   get activeFilterModel() {
@@ -403,34 +403,34 @@ let M = class extends B {
    * @param unitId
    * @param subUnitId
    */
-  ensureFilterModel(r, e) {
-    const t = this.getFilterModel(r, e);
-    if (t)
-      return t;
-    const n = this._univerInstanceService.getUniverSheetInstance(r);
+  ensureFilterModel(t, e) {
+    const r = this.getFilterModel(t, e);
+    if (r)
+      return r;
+    const n = this._univerInstanceService.getUniverSheetInstance(t);
     if (!n)
-      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${r}!`);
+      throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing workbook ${t}!`);
     const s = n.getSheetBySheetId(e);
     if (!s)
       throw new Error(`[SheetsFilterService]: could not create "FilterModel" on a non-existing worksheet ${e}!`);
-    const o = new j(r, e, s);
-    return this._cacheFilterModel(r, e, o), o;
+    const o = new k(t, e, s);
+    return this._cacheFilterModel(t, e, o), o;
   }
-  getFilterModel(r, e) {
-    var t, n;
-    return (n = (t = this._filterModels.get(r)) == null ? void 0 : t.get(e)) != null ? n : null;
+  getFilterModel(t, e) {
+    var r, n;
+    return (n = (r = this._filterModels.get(t)) == null ? void 0 : r.get(e)) != null ? n : null;
   }
-  removeFilterModel(r, e) {
-    const t = this.getFilterModel(r, e);
-    return t ? (t.dispose(), this._filterModels.get(r).delete(e), !0) : !1;
+  removeFilterModel(t, e) {
+    const r = this.getFilterModel(t, e);
+    return r ? (r.dispose(), this._filterModels.get(t).delete(e), !0) : !1;
   }
-  setFilterErrorMsg(r) {
-    this._errorMsg$.next(r);
+  setFilterErrorMsg(t) {
+    this._errorMsg$.next(t);
   }
   _updateActiveFilterModel() {
-    let r;
+    let t;
     try {
-      if (r = this._univerInstanceService.getCurrentUnitForType(P.UNIVER_SHEET), !r) {
+      if (t = this._univerInstanceService.getCurrentUnitForType(D.UNIVER_SHEET), !t) {
         this._activeFilterModel$.next(null);
         return;
       }
@@ -438,154 +438,154 @@ let M = class extends B {
       console.error("[SheetsFilterService]: could not get active workbook!", o);
       return;
     }
-    const e = r.getActiveSheet(!0);
+    const e = t.getActiveSheet(!0);
     if (!e) {
       this._activeFilterModel$.next(null);
       return;
     }
-    const t = e.getUnitId(), n = e.getSheetId(), s = this.getFilterModel(t, n);
+    const r = e.getUnitId(), n = e.getSheetId(), s = this.getFilterModel(r, n);
     this._activeFilterModel$.next(s);
   }
   _initActiveFilterModel() {
     this.disposeWithMe(
-      st(
+      dt(
         // source1: executing filter related mutations
-        Te(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(ot(([r]) => r.type === E.MUTATION && Ce.has(r.id))),
+        Pe(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(ut(([t]) => t.type === O.MUTATION && Me.has(t.id))),
         // source2: activate sheet changes
-        this._univerInstanceService.getCurrentTypeOfUnit$(P.UNIVER_SHEET).pipe(lt((r) => {
+        this._univerInstanceService.getCurrentTypeOfUnit$(D.UNIVER_SHEET).pipe(ht((t) => {
           var e;
-          return (e = r == null ? void 0 : r.activeSheet$) != null ? e : at(null);
+          return (e = t == null ? void 0 : t.activeSheet$) != null ? e : ft(null);
         }))
       ).subscribe(() => this._updateActiveFilterModel())
     );
   }
-  _serializeAutoFiltersForUnit(r) {
-    const e = this._filterModels.get(r);
+  _serializeAutoFiltersForUnit(t) {
+    const e = this._filterModels.get(t);
     if (!e)
       return "{}";
-    const t = {};
+    const r = {};
     return e.forEach((n, s) => {
-      t[s] = n.serialize();
-    }), JSON.stringify(t);
+      r[s] = n.serialize();
+    }), JSON.stringify(r);
   }
-  _deserializeAutoFiltersForUnit(r, e) {
-    const t = this._univerInstanceService.getUniverSheetInstance(r);
+  _deserializeAutoFiltersForUnit(t, e) {
+    const r = this._univerInstanceService.getUniverSheetInstance(t);
     Object.keys(e).forEach((n) => {
-      const s = e[n], o = j.deserialize(r, n, t.getSheetBySheetId(n), s);
-      this._cacheFilterModel(r, n, o);
+      const s = e[n], o = k.deserialize(t, n, r.getSheetBySheetId(n), s);
+      this._cacheFilterModel(t, n, o);
     });
   }
   _initModel() {
     this._resourcesManagerService.registerPluginResource({
-      pluginName: we,
-      businesses: [P.UNIVER_SHEET],
-      toJson: (r) => this._serializeAutoFiltersForUnit(r),
-      parseJson: (r) => JSON.parse(r),
-      onLoad: (r, e) => {
-        this._deserializeAutoFiltersForUnit(r, e), this._loadedUnitId$.next(r), this._updateActiveFilterModel();
+      pluginName: Te,
+      businesses: [D.UNIVER_SHEET],
+      toJson: (t) => this._serializeAutoFiltersForUnit(t),
+      parseJson: (t) => JSON.parse(t),
+      onLoad: (t, e) => {
+        this._deserializeAutoFiltersForUnit(t, e), this._loadedUnitId$.next(t), this._updateActiveFilterModel();
       },
-      onUnLoad: (r) => {
-        const e = this._filterModels.get(r);
-        e && (e.forEach((t) => t.dispose()), this._filterModels.delete(r));
+      onUnLoad: (t) => {
+        const e = this._filterModels.get(t);
+        e && (e.forEach((r) => r.dispose()), this._filterModels.delete(t));
       }
     });
   }
-  _cacheFilterModel(r, e, t) {
-    this._filterModels.has(r) || this._filterModels.set(r, /* @__PURE__ */ new Map()), this._filterModels.get(r).set(e, t);
+  _cacheFilterModel(t, e, r) {
+    this._filterModels.has(t) || this._filterModels.set(t, /* @__PURE__ */ new Map()), this._filterModels.get(t).set(e, r);
   }
 };
-M = $t([
-  K(0, Ne),
-  K(1, N),
-  K(2, I)
+M = Dt([
+  Y(0, De),
+  Y(1, N),
+  Y(2, T)
 ], M);
-const C = {
-  id: fe,
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { subUnitId: e, unitId: t, range: n } = r;
-    return i.get(M).ensureFilterModel(t, e).setRange(n), !0;
+const R = {
+  id: Se,
+  type: O.MUTATION,
+  handler: (i, t) => {
+    const { subUnitId: e, unitId: r, range: n } = t;
+    return i.get(M).ensureFilterModel(r, e).setRange(n), !0;
   }
 }, p = {
-  id: me,
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { subUnitId: e, unitId: t, criteria: n, col: s, reCalc: o = !0 } = r, a = i.get(M).getFilterModel(t, e);
+  id: Fe,
+  type: O.MUTATION,
+  handler: (i, t) => {
+    const { subUnitId: e, unitId: r, criteria: n, col: s, reCalc: o = !0 } = t, a = i.get(M).getFilterModel(r, e);
     return a ? (a.setCriteria(s, n, o), !0) : !1;
   }
-}, O = {
-  id: ge,
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { unitId: e, subUnitId: t } = r;
-    return i.get(M).removeFilterModel(e, t);
-  }
-}, V = {
-  id: _e,
-  type: E.MUTATION,
-  handler: (i, r) => {
-    const { unitId: e, subUnitId: t } = r, s = i.get(M).getFilterModel(e, t);
+}, y = {
+  id: we,
+  type: O.MUTATION,
+  handler: (i, t) => {
+    const { unitId: e, subUnitId: r } = t;
+    return i.get(M).removeFilterModel(e, r);
+  }
+}, B = {
+  id: ve,
+  type: O.MUTATION,
+  handler: (i, t) => {
+    const { unitId: e, subUnitId: r } = t, s = i.get(M).getFilterModel(e, r);
     return s ? (s.reCalc(), !0) : !1;
   }
-}, bt = {
+}, Bt = {
   id: "sheet.command.set-filter-range",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(I), n = i.get(G), s = i.get(N), { unitId: o, subUnitId: l, range: a } = r;
-    if (!z(s, r) || e.getFilterModel(o, l)) return !1;
+  type: O.COMMAND,
+  handler: (i, t) => {
+    const e = i.get(M), r = i.get(T), n = i.get(Q), s = i.get(N), { unitId: o, subUnitId: l, range: a } = t;
+    if (!H(s, t) || e.getFilterModel(o, l)) return !1;
     if (a.endRow === a.startRow) {
-      const m = i.get(xe), g = i.get($e);
-      return m.emit(g.t("sheets-filter.command.not-valid-filter-range")), !1;
+      const g = i.get(Be), _ = i.get(ze);
+      return g.emit(_.t("sheets-filter.command.not-valid-filter-range")), !1;
     }
-    const u = { id: C.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 } }, h = r.syncExecuteCommand(d.id, d.params);
+    return h && n.pushUndoRedo({
       unitID: o,
-      undoMutations: [{ id: O.id, params: { unitId: o, subUnitId: l } }],
-      redoMutations: [u]
-    }), d;
+      undoMutations: [{ id: y.id, params: { unitId: o, subUnitId: l } }],
+      redoMutations: [d]
+    }), h;
   }
-}, Lt = {
+}, zt = {
   id: "sheet.command.remove-sheet-filter",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(N), t = i.get(M), n = i.get(I), s = i.get(G), o = z(e, r);
+  type: O.COMMAND,
+  handler: (i, t) => {
+    const e = i.get(N), r = i.get(M), n = i.get(T), s = i.get(Q), o = H(e, t);
     if (!o) return !1;
-    const { unitId: l, subUnitId: a } = o, c = t.getFilterModel(l, a);
+    const { unitId: l, subUnitId: a } = o, c = r.getFilterModel(l, a);
     if (!c) return !1;
-    const h = c == null ? void 0 : c.serialize(), u = Ut(l, a, h), d = n.syncExecuteCommand(O.id, { unitId: l, subUnitId: a });
-    return d && s.pushUndoRedo({
+    const u = c == null ? void 0 : c.serialize(), d = Ht(l, a, u), h = n.syncExecuteCommand(y.id, { unitId: l, subUnitId: a });
+    return h && s.pushUndoRedo({
       unitID: l,
-      undoMutations: u,
-      redoMutations: [{ id: O.id, params: { unitId: l, subUnitId: a } }]
-    }), d;
+      undoMutations: d,
+      redoMutations: [{ id: y.id, params: { unitId: l, subUnitId: a } }]
+    }), h;
   }
-}, er = {
+}, ar = {
   id: "sheet.command.smart-toggle-filter",
-  type: E.COMMAND,
+  type: O.COMMAND,
   handler: async (i) => {
-    const r = i.get(N), e = i.get(M), t = i.get(I), n = r.getCurrentUnitForType(P.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
+    const t = i.get(N), e = i.get(M), r = i.get(T), n = t.getCurrentUnitForType(D.UNIVER_SHEET), s = n == null ? void 0 : n.getActiveSheet();
     if (!s || !n) return !1;
     const o = n.getUnitId(), l = s.getSheetId();
     if (e.getFilterModel(o, l))
-      return t.executeCommand(Lt.id, { unitId: o, subUnitId: l });
-    const h = i.get(He).getCurrentLastSelection();
-    if (!h) return !1;
-    const u = h.range, d = We(h) ? he(u, { left: !0, right: !0, up: !0, down: !0 }, s) : u;
-    return t.executeCommand(bt.id, {
+      return r.executeCommand(zt.id, { unitId: o, subUnitId: l });
+    const u = i.get(qe).getCurrentLastSelection();
+    if (!u) return !1;
+    const d = u.range, h = Ge(u) ? _e(d, { left: !0, right: !0, up: !0, down: !0 }, s) : d;
+    return r.executeCommand(Bt.id, {
       unitId: o,
       subUnitId: l,
-      range: d
+      range: h
     });
   }
-}, tr = {
+}, cr = {
   id: "sheet.command.set-filter-criteria",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(I), n = i.get(G), { unitId: s, subUnitId: o, col: l, criteria: a } = r, c = e.getFilterModel(s, o);
+  type: O.COMMAND,
+  handler: (i, t) => {
+    const e = i.get(M), r = i.get(T), n = i.get(Q), { unitId: s, subUnitId: o, col: l, criteria: a } = t, 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 = Dt(s, o, l, u), m = {
+    const u = c.getRange();
+    if (!u || l < u.startColumn || l > u.endColumn) return !1;
+    const d = c.getFilterColumn(l), h = Wt(s, o, l, d), g = {
       id: p.id,
       params: {
         unitId: s,
@@ -593,133 +593,133 @@ const C = {
         col: l,
         criteria: a
       }
-    }, g = t.syncExecuteCommand(m.id, m.params);
-    return g && n.pushUndoRedo({
+    }, _ = r.syncExecuteCommand(g.id, g.params);
+    return _ && n.pushUndoRedo({
       unitID: s,
-      undoMutations: [d],
-      redoMutations: [m]
-    }), g;
+      undoMutations: [h],
+      redoMutations: [g]
+    }), _;
   }
-}, rr = {
+}, dr = {
   id: "sheet.command.clear-filter-criteria",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(G), n = i.get(I), s = i.get(N), o = z(s, r);
+  type: O.COMMAND,
+  handler: (i, t) => {
+    const e = i.get(M), r = i.get(Q), n = i.get(T), s = i.get(N), o = H(s, t);
     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 = ve(l, a, h), d = Pt(l, a, h);
-    return Ie(d, n).result ? (t.pushUndoRedo({
+    const u = c.serialize(), d = Ne(l, a, u), h = Vt(l, a, u);
+    return j(h, n).result ? (r.pushUndoRedo({
       unitID: l,
-      undoMutations: u,
-      redoMutations: d
+      undoMutations: d,
+      redoMutations: h
     }), !0) : !1;
   }
-}, nr = {
+}, ur = {
   id: "sheet.command.re-calc-filter",
-  type: E.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(M), t = i.get(I), n = i.get(N), s = z(n, r);
+  type: O.COMMAND,
+  handler: (i, t) => {
+    const e = i.get(M), r = i.get(T), n = i.get(N), s = H(n, t);
     if (!s) return !1;
     const { unitId: o, subUnitId: l } = s;
-    return e.getFilterModel(s.unitId, s.subUnitId) ? t.executeCommand(V.id, { unitId: o, subUnitId: l }) : !1;
+    return e.getFilterModel(s.unitId, s.subUnitId) ? r.executeCommand(B.id, { unitId: o, subUnitId: l }) : !1;
   }
 };
-function Ut(i, r, e) {
-  const t = [], n = {
-    id: C.id,
+function Ht(i, t, e) {
+  const r = [], n = {
+    id: R.id,
     params: {
       unitId: i,
-      subUnitId: r,
+      subUnitId: t,
       range: e.ref
     }
   };
-  return t.push(n), ve(i, r, e).forEach((o) => t.push(o)), t;
+  return r.push(n), Ne(i, t, e).forEach((o) => r.push(o)), r;
 }
-function ve(i, r, e) {
+function Ne(i, t, e) {
   var n;
-  const t = [];
+  const r = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
     const o = {
       id: p.id,
       params: {
         unitId: i,
-        subUnitId: r,
+        subUnitId: t,
         col: s.colId,
         criteria: s
       }
     };
-    t.push(o);
-  }), t;
+    r.push(o);
+  }), r;
 }
-function Pt(i, r, e) {
+function Vt(i, t, e) {
   var n;
-  const t = [];
+  const r = [];
   return (n = e.filterColumns) == null || n.forEach((s) => {
     const o = {
       id: p.id,
       params: {
         unitId: i,
-        subUnitId: r,
+        subUnitId: t,
         col: s.colId,
         criteria: null
       }
     };
-    t.push(o);
-  }), t;
+    r.push(o);
+  }), r;
 }
-function Dt(i, r, e, t) {
-  if (!t)
+function Wt(i, t, e, r) {
+  if (!r)
     return {
       id: p.id,
       params: {
         unitId: i,
-        subUnitId: r,
+        subUnitId: t,
         col: e,
         criteria: null
       }
     };
-  const n = t.serialize();
+  const n = r.serialize();
   return {
     id: p.id,
     params: {
       unitId: i,
-      subUnitId: r,
+      subUnitId: t,
       col: e,
       criteria: n
     }
   };
 }
-const Bt = "sheets-filter.config", ce = {};
-function zt(i, r) {
+const xe = "sheets-filter.config", ue = {};
+function jt(i, t) {
   for (let e = 0; e < i.length; e++) {
-    let t = e;
+    let r = e;
     if (i[e])
       for (let n = e + 1; n < i.length; n++)
-        i[t] && i[n] && r(i[t], i[n]) && (i[t] = null, t = n);
+        i[r] && i[n] && t(i[r], i[n]) && (i[r] = null, r = n);
   }
   return i.filter((e) => e !== null);
 }
 function L(i) {
-  return zt(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);
+  return jt(i, (t, e) => t.id === p.id && e.id === p.id && t.params.unitId === e.params.unitId && t.params.subUnitId === e.params.subUnitId && t.params.col === e.params.col);
 }
-var Ht = Object.getOwnPropertyDescriptor, Wt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Ht(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+var kt = Object.getOwnPropertyDescriptor, qt = (i, t, e, r) => {
+  for (var n = r > 1 ? void 0 : r ? kt(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, $ = (i, r) => (e, t) => r(e, t, i);
-let k = class extends B {
-  constructor(r, e, t, n, s, o, l) {
+}, I = (i, t) => (e, r) => t(e, r, i);
+let z = class extends U {
+  constructor(t, e, r, n, s, o, l) {
     super();
-    S(this, "_disposableCollection", new Le());
-    this._commandService = r, this._sheetInterceptorService = e, this._sheetsFilterService = t, this._univerInstanceService = n, this._refRangeService = s, this._dataSyncPrimaryController = o, this._zebraCrossingCacheController = l, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling(), this._initZebraCrossingCacheListener();
+    C(this, "_disposableCollection", new me());
+    this._commandService = t, this._sheetInterceptorService = e, this._sheetsFilterService = r, this._univerInstanceService = n, this._refRangeService = s, this._dataSyncPrimaryController = o, this._zebraCrossingCacheController = l, this._initCommands(), this._initRowFilteredInterceptor(), this._initInterceptors(), this._commandExecutedListener(), this._initErrorHandling(), this._initZebraCrossingCacheListener();
   }
   _initZebraCrossingCacheListener() {
     this.disposeWithMe(
-      this._sheetsFilterService.activeFilterModel$.subscribe((r) => {
-        r && this.disposeWithMe(
-          r.filteredOutRows$.subscribe(() => {
-            this._zebraCrossingCacheController.updateZebraCrossingCache(r.unitId, r.subUnitId);
+      this._sheetsFilterService.activeFilterModel$.subscribe((t) => {
+        t && this.disposeWithMe(
+          t.filteredOutRows$.subscribe(() => {
+            this._zebraCrossingCacheController.updateZebraCrossingCache(t.unitId, t.subUnitId);
           })
         );
       })
@@ -728,86 +728,89 @@ let k = class extends B {
   _initCommands() {
     [
       p,
-      C,
-      V,
-      O
-    ].forEach((r) => {
+      R,
+      B,
+      y
+    ].forEach((t) => {
       var e;
-      this.disposeWithMe(this._commandService.registerCommand(r)), (e = this._dataSyncPrimaryController) == null || e.registerSyncingMutations(r);
+      this.disposeWithMe(this._commandService.registerCommand(t)), (e = this._dataSyncPrimaryController) == null || e.registerSyncingMutations(t);
     });
   }
   _initInterceptors() {
     this.disposeWithMe(this._sheetInterceptorService.interceptCommand({
-      getMutations: (r) => this._getUpdateFilter(r)
-    })), this.disposeWithMe(this._commandService.onCommandExecuted((r) => {
-      if (r.id === qe.id) {
-        const e = r.params, t = e.subUnitId, n = e.unitId;
-        if (!t || !n)
+      getMutations: (t) => this._getUpdateFilter(t)
+    })), this.disposeWithMe(this._commandService.onCommandExecuted((t) => {
+      if (t.id === Ke.id) {
+        const e = t.params, r = e.subUnitId, n = e.unitId;
+        if (!r || !n)
           return;
-        this._registerRefRange(n, t);
+        this._registerRefRange(n, r);
       }
-      if (r.id === C.id) {
-        const e = r.params, t = e.subUnitId, n = e.unitId;
-        if (!t || !n)
+      if (t.id === R.id) {
+        const e = t.params, r = e.subUnitId, n = e.unitId;
+        if (!r || !n)
           return;
         this._registerRefRange(e.unitId, e.subUnitId);
       }
-    })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((r) => {
-      if (r) {
-        const e = this._univerInstanceService.getUniverSheetInstance(r), t = e == null ? void 0 : e.getActiveSheet();
-        t && this._registerRefRange(r, t.getSheetId());
+    })), this.disposeWithMe(this._sheetsFilterService.loadedUnitId$.subscribe((t) => {
+      if (t) {
+        const e = this._univerInstanceService.getUniverSheetInstance(t), r = e == null ? void 0 : e.getActiveSheet();
+        r && this._registerRefRange(t, r.getSheetId());
       }
     }));
   }
-  _registerRefRange(r, e) {
+  _registerRefRange(t, e) {
     var l;
     this._disposableCollection.dispose();
-    const t = this._univerInstanceService.getUniverSheetInstance(r), n = t == null ? void 0 : t.getSheetBySheetId(e);
-    if (!t || !n) return;
-    const s = (l = this._sheetsFilterService.getFilterModel(r, e)) == null ? void 0 : l.getRange(), o = (a) => {
+    const r = this._univerInstanceService.getUniverSheetInstance(t), n = r == null ? void 0 : r.getSheetBySheetId(e);
+    if (!r || !n) return;
+    const s = (l = this._sheetsFilterService.getFilterModel(t, e)) == null ? void 0 : l.getRange(), o = (a) => {
       switch (a.id) {
-        case it.id: {
-          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
-          return this._handleInsertRowCommand(c, h, u);
+        case ct.id: {
+          const c = a.params, u = c.unitId || t, d = c.subUnitId || e;
+          return this._handleInsertRowCommand(c, u, d);
         }
-        case nt.id: {
-          const c = a.params, h = c.unitId || r, u = c.subUnitId || e;
-          return this._handleInsertColCommand(c, h, u);
+        case at.id: {
+          const c = a.params, u = c.unitId || t, d = c.subUnitId || e;
+          return this.handleInsertColCommand(c.range, u, d);
         }
-        case rt.id: {
+        case lt.id: {
           const c = a.params;
-          return this._handleRemoveColCommand(c, r, e);
+          return this.handleRemoveColCommand(c.range, t, e);
         }
-        case tt.id: {
+        case ot.id: {
           const c = a.params;
-          return this._handleRemoveRowCommand(c, r, e);
+          return this._handleRemoveRowCommand(c, t, e);
         }
-        case se.MoveColsCommandId: {
+        case le.MoveColsCommandId: {
           const c = a.params;
-          return this._handleMoveColsCommand(c, r, e);
+          return this.handleMoveColsCommand({
+            fromRange: c.fromRange,
+            toRange: c.toRange
+          }, t, e);
         }
-        case se.MoveRowsCommandId: {
+        case le.MoveRowsCommandId: {
           const c = a.params;
-          return this._handleMoveRowsCommand(c, r, e);
+          return this._handleMoveRowsCommand(c, t, e);
         }
-        case et.id: {
+        case st.id: {
           const c = a.params;
-          return this._handleMoveRangeCommand(c, r, e);
+          return this._handleMoveRangeCommand(c, t, e);
         }
       }
       return { redos: [], undos: [] };
     };
-    s && this._disposableCollection.add(this._refRangeService.registerRefRange(s, o, r, e));
+    s && this._disposableCollection.add(this._refRangeService.registerRefRange(s, o, t, e));
   }
-  _getUpdateFilter(r) {
-    const { id: e } = r;
+  _getUpdateFilter(t) {
+    const { id: e } = t;
     switch (e) {
-      case Qe.id: {
-        const t = r.params;
-        return this._handleRemoveSheetCommand(t, t.unitId, t.subUnitId);
+      case Xe.id: {
+        const r = t.params;
+        return this._handleRemoveSheetCommand(r, r.unitId, r.subUnitId);
       }
-      case Ge.id: {
-        const t = r.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = t;
+      case Ye.id: {
+        const r = t.params, { targetSubUnitId: n, unitId: s, subUnitId: o } = r;
         return !s || !o || !n ? this._handleNull() : this._handleCopySheetCommand(s, o, n);
       }
     }
@@ -816,115 +819,115 @@ let k = class extends B {
       undos: []
     };
   }
-  _handleInsertColCommand(r, e, t) {
-    var _;
-    const n = this._sheetsFilterService.getFilterModel(e, t), s = (_ = n == null ? void 0 : n.getRange()) != null ? _ : null;
+  handleInsertColCommand(t, e, r) {
+    var f;
+    const n = this._sheetsFilterService.getFilterModel(e, r), s = (f = n == null ? void 0 : n.getRange()) != null ? f : null;
     if (!n || !s)
       return this._handleNull();
-    const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range, h = c - a + 1;
+    const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = t, u = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const u = [], d = [], m = a, g = {
+    const d = [], h = [], g = a, _ = {
       unitId: e,
-      subUnitId: t,
+      subUnitId: r,
       range: {
         ...s,
-        startColumn: a <= o ? o + h : o,
-        endColumn: l + h
+        startColumn: a <= o ? o + u : o,
+        endColumn: l + u
       }
-    }, R = {
+    }, S = {
       unitId: e,
-      subUnitId: t,
+      subUnitId: r,
       range: s
     };
-    u.push({ id: C.id, params: g }), d.push({ id: C.id, params: R });
-    const F = n.getAllFilterColumns().filter((f) => f[0] >= m);
+    d.push({ id: R.id, params: _ }), h.push({ id: R.id, params: S });
+    const F = n.getAllFilterColumns().filter((m) => m[0] >= g);
     if (F.length !== 0) {
-      const { newRange: f, oldRange: v } = this._moveCriteria(e, t, F, h);
-      u.push(...f.redos, ...v.redos), d.push(...f.undos, ...v.undos);
+      const { newRange: m, oldRange: v } = this._moveCriteria(e, r, F, u);
+      d.push(...v.redos, ...m.redos), h.push(...m.undos, ...v.undos);
     }
-    return { redos: L(u), undos: L(d) };
+    return { redos: L(d), undos: L(h) };
   }
-  _handleInsertRowCommand(r, e, t) {
-    var R;
-    const n = this._sheetsFilterService.getFilterModel(e, t), s = (R = n == null ? void 0 : n.getRange()) != null ? R : null;
+  _handleInsertRowCommand(t, e, r) {
+    var S;
+    const n = this._sheetsFilterService.getFilterModel(e, r), s = (S = n == null ? void 0 : n.getRange()) != null ? S : null;
     if (!n || !s)
       return this._handleNull();
-    const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range, h = c - a + 1;
+    const { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = t.range, u = c - a + 1;
     if (c > l)
       return this._handleNull();
-    const u = [], d = [], m = {
+    const d = [], h = [], g = {
       unitId: e,
-      subUnitId: t,
+      subUnitId: r,
       range: {
         ...s,
-        startRow: a <= o ? o + h : o,
-        endRow: l + h
+        startRow: a <= o ? o + u : o,
+        endRow: l + u
       }
-    }, g = {
+    }, _ = {
       unitId: e,
-      subUnitId: t,
+      subUnitId: r,
       range: s
     };
-    return u.push({ id: C.id, params: m }), d.push({ id: C.id, params: g }), {
-      redos: L(u),
-      undos: L(d)
+    return d.push({ id: R.id, params: g }), h.push({ id: R.id, params: _ }), {
+      redos: L(d),
+      undos: L(h)
     };
   }
-  _handleRemoveColCommand(r, e, t) {
+  handleRemoveColCommand(t, e, r) {
     var F;
-    const n = this._sheetsFilterService.getFilterModel(e, t), s = (F = n == null ? void 0 : n.getRange()) != null ? F : null;
+    const n = this._sheetsFilterService.getFilterModel(e, r), s = (F = n == null ? void 0 : n.getRange()) != null ? F : null;
     if (!n || !s)
       return this._handleNull();
-    const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = r.range;
+    const { startColumn: o, endColumn: l } = s, { startColumn: a, endColumn: c } = t;
     if (a > l)
       return this._handleNull();
-    const h = [], u = [], d = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, m = c - a + 1, g = n.getAllFilterColumns();
-    g.forEach((_) => {
-      const [f, v] = _;
-      f <= c && f >= a && (h.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: null } }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
+    const u = [], d = [], h = c < o ? 0 : Math.min(c, l) - Math.max(a, o) + 1, g = c - a + 1, _ = n.getAllFilterColumns();
+    _.forEach((f) => {
+      const [m, v] = f;
+      m <= c && m >= a && (u.push({ id: p.id, params: { unitId: e, subUnitId: r, col: m, criteria: null } }), d.push({ id: p.id, params: { unitId: e, subUnitId: r, col: m, criteria: { ...v.serialize(), colId: m } } }));
     });
-    const R = g.filter((_) => {
-      const [f, v] = _;
-      return f > c;
+    const S = _.filter((f) => {
+      const [m, v] = f;
+      return m > c;
     });
     let w = { undos: [], redos: [] };
-    if (R.length > 0) {
-      const { oldRange: _, newRange: f } = this._moveCriteria(e, t, R, -m);
-      w = f, h.push(..._.redos), u.unshift(..._.undos);
+    if (S.length > 0) {
+      const { oldRange: f, newRange: m } = this._moveCriteria(e, r, S, -g);
+      w = m, u.push(...f.redos), d.unshift(...f.undos);
     }
-    if (d === l - o + 1) {
-      const _ = {
+    if (h === l - o + 1) {
+      const f = {
         unitId: e,
-        subUnitId: t
+        subUnitId: r
       };
-      h.push({ id: O.id, params: _ }), u.unshift({ id: C.id, params: { range: s, unitId: e, subUnitId: t } });
+      u.push({ id: y.id, params: f }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: r } });
     } else {
-      const _ = o <= a ? o : d === 0 ? o - m : a, f = o <= a ? l - d : l - m, v = {
+      const f = o <= a ? o : h === 0 ? o - g : a, m = o <= a ? l - h : l - g, v = {
         unitId: e,
-        subUnitId: t,
-        range: { ...s, startColumn: _, endColumn: f }
+        subUnitId: r,
+        range: { ...s, startColumn: f, endColumn: m }
       };
-      h.push({ id: C.id, params: v }), u.unshift({ id: C.id, params: { range: s, unitId: e, subUnitId: t } }), h.push(...w.redos), u.unshift(...w.undos);
+      u.push({ id: R.id, params: v }), d.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: r } }), u.push(...w.redos), d.unshift(...w.undos);
     }
     return {
-      undos: u,
-      redos: h
+      undos: d,
+      redos: u
     };
   }
-  _handleRemoveRowCommand(r, e, t) {
-    var R;
-    const n = this._sheetsFilterService.getFilterModel(e, t);
+  _handleRemoveRowCommand(t, e, r) {
+    var S;
+    const n = this._sheetsFilterService.getFilterModel(e, r);
     if (!n)
       return this._handleNull();
-    const s = n.getRange(), { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = r.range;
+    const s = n.getRange(), { startRow: o, endRow: l } = s, { startRow: a, endRow: c } = t.range;
     if (a > l)
       return this._handleNull();
     if (c < o)
       return {
-        undos: [{ id: C.id, params: { range: s, unitId: e, subUnitId: t } }],
+        undos: [{ id: R.id, params: { range: s, unitId: e, subUnitId: r } }],
         redos: [{
-          id: C.id,
+          id: R.id,
           params: {
             range: {
               ...s,
@@ -932,213 +935,213 @@ let k = class extends B {
               endRow: l - (c - a + 1)
             },
             unitId: e,
-            subUnitId: t
+            subUnitId: r
           }
         }]
       };
-    const h = [], u = [], d = n.getAllFilterColumns(), m = o <= c && o >= a;
-    u.push({ id: C.id, params: { range: s, unitId: e, subUnitId: t } });
-    const g = Math.min(c, l) - Math.max(a, o) + 1;
-    if (g === l - o + 1 || m) {
+    const u = [], d = [], h = n.getAllFilterColumns(), g = o <= c && o >= a;
+    d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: r } });
+    const _ = Math.min(c, l) - Math.max(a, o) + 1;
+    if (_ === l - o + 1 || g) {
       const w = {
         unitId: e,
-        subUnitId: t
+        subUnitId: r
       };
-      h.push({ id: O.id, params: w }), d.forEach((F) => {
-        const [_, f] = F, v = {
+      u.push({ id: y.id, params: w }), h.forEach((F) => {
+        const [f, m] = F, v = {
           unitId: e,
-          subUnitId: t,
-          col: _,
-          criteria: { ...f.serialize(), colId: _ }
+          subUnitId: r,
+          col: f,
+          criteria: { ...m.serialize(), colId: f }
         };
-        u.push({ id: p.id, params: v });
+        d.push({ id: p.id, params: v });
       });
     } else {
-      const w = (R = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : R.getSheetBySheetId(t);
+      const w = (S = this._univerInstanceService.getUniverSheetInstance(e)) == null ? void 0 : S.getSheetBySheetId(r);
       if (!w)
         return this._handleNull();
       const F = [];
-      for (let y = a; y <= c; y++)
-        w.getRowFiltered(y) && F.push(y);
-      const _ = Math.min(o, a), f = _ + (l - o) - g + F.length, v = {
+      for (let E = a; E <= c; E++)
+        w.getRowFiltered(E) && F.push(E);
+      const f = Math.min(o, a), m = f + (l - o) - _ + F.length, v = {
         unitId: e,
-        subUnitId: t,
+        subUnitId: r,
         range: {
           ...s,
-          startRow: _,
-          endRow: f
+          startRow: f,
+          endRow: m
         }
       };
-      h.push({ id: C.id, params: v });
+      u.push({ id: R.id, params: v });
     }
     return {
-      undos: L(u),
-      redos: L(h)
+      undos: L(d),
+      redos: L(u)
     };
   }
   // eslint-disable-next-line max-lines-per-function
-  _handleMoveColsCommand(r, e, t) {
-    var _;
-    const n = this._sheetsFilterService.getFilterModel(e, t), s = (_ = n == null ? void 0 : n.getRange()) != null ? _ : null;
-    if (!n || !s)
+  handleMoveColsCommand({ fromRange: t, toRange: e }, r, n) {
+    var F;
+    const s = this._sheetsFilterService.getFilterModel(r, n), o = (F = s == null ? void 0 : s.getRange()) != null ? F : null;
+    if (!s || !o)
       return this._handleNull();
-    const { startColumn: o, endColumn: l } = s, { fromRange: a, toRange: c } = r;
-    if (a.endColumn < o && c.startColumn <= o || a.startColumn > l && c.endColumn > l)
+    const { startColumn: l, endColumn: a } = o;
+    if (t.endColumn < l && e.startColumn <= l || t.startColumn > a && e.endColumn > a)
       return this._handleNull();
-    const h = [], u = [], d = {};
-    for (let f = o; f <= l; f++)
+    const c = [], u = [], d = {};
+    for (let f = l; f <= a; f++)
       d[f] = {
         colIndex: f,
-        filter: n.getFilterColumn(f)
+        filter: s.getFilterColumn(f)
       };
-    ie(a.startColumn, a.endColumn - a.startColumn + 1, c.startColumn, d);
-    let m = s.startColumn, g = s.endColumn;
-    o >= a.startColumn && o <= a.endColumn && c.startColumn > a.startColumn && a.endColumn < l && (m = a.endColumn + 1), l >= a.startColumn && l <= a.endColumn && c.startColumn < a.startColumn && a.startColumn > o && (g = a.startColumn - 1);
-    const R = Object.keys(d).map((f) => Number(f)), w = R.find((f) => d[f].colIndex === g), F = R.find((f) => d[f].colIndex === m);
-    if (R.forEach((f) => {
-      var ee, te;
-      const { colIndex: v, filter: y } = d[f], A = f;
-      if (y) {
-        if (A >= F && A <= w) {
-          const Q = {
-            unitId: e,
-            subUnitId: t,
-            col: A,
-            criteria: { ...y.serialize(), colId: A }
-          }, Me = {
-            unitId: e,
-            subUnitId: t,
-            col: A,
-            criteria: n.getFilterColumn(A) ? { ...(ee = n.getFilterColumn(A)) == null ? void 0 : ee.serialize(), colId: A } : null
+    oe(t.startColumn, t.endColumn - t.startColumn + 1, e.startColumn, d);
+    let h = o.startColumn, g = o.endColumn;
+    l >= t.startColumn && l <= t.endColumn && e.startColumn > t.startColumn && t.endColumn < a && (h = t.endColumn + 1), a >= t.startColumn && a <= t.endColumn && e.startColumn < t.startColumn && t.startColumn > l && (g = t.startColumn - 1);
+    const _ = Object.keys(d).map((f) => Number(f)), S = _.find((f) => d[f].colIndex === g), w = _.find((f) => d[f].colIndex === h);
+    if (_.forEach((f) => {
+      var re, ne;
+      const { colIndex: m, filter: v } = d[f], E = f;
+      if (v) {
+        if (E >= w && E <= S) {
+          const J = {
+            unitId: r,
+            subUnitId: n,
+            col: E,
+            criteria: { ...v.serialize(), colId: E }
+          }, Ie = {
+            unitId: r,
+            subUnitId: n,
+            col: E,
+            criteria: s.getFilterColumn(E) ? { ...(re = s.getFilterColumn(E)) == null ? void 0 : re.serialize(), colId: E } : null
           };
-          h.push({ id: p.id, params: Q }), u.push({ id: p.id, params: Me });
+          c.push({ id: p.id, params: J }), u.push({ id: p.id, params: Ie });
         }
-        if (!((te = d[v]) != null && te.filter)) {
-          const Q = {
-            unitId: e,
-            subUnitId: t,
-            col: v,
+        if (!((ne = d[m]) != null && ne.filter)) {
+          const J = {
+            unitId: r,
+            subUnitId: n,
+            col: m,
             criteria: null
           };
-          h.push({ id: p.id, params: Q }), u.push({ id: p.id, params: { unitId: e, subUnitId: t, col: v, criteria: { ...y.serialize(), colId: v } } });
+          c.push({ id: p.id, params: J }), u.push({ id: p.id, params: { unitId: r, subUnitId: n, col: m, criteria: { ...v.serialize(), colId: m } } });
         }
       }
-    }), o !== F || l !== w) {
+    }), l !== w || a !== S) {
       const f = {
-        unitId: e,
-        subUnitId: t,
+        unitId: r,
+        subUnitId: n,
         range: {
-          ...s,
-          startColumn: F,
-          endColumn: w
+          ...o,
+          startColumn: w,
+          endColumn: S
         }
       };
-      h.unshift({ id: C.id, params: f }), u.unshift({ id: C.id, params: { range: s, unitId: e, subUnitId: t } });
+      c.unshift({ id: R.id, params: f }), u.unshift({ id: R.id, params: { range: o, unitId: r, subUnitId: n } });
     }
     return {
       undos: u,
-      redos: h
+      redos: c
     };
   }
-  _handleMoveRowsCommand(r, e, t) {
-    var _;
-    const n = this._sheetsFilterService.getFilterModel(e, t), s = (_ = n == null ? void 0 : n.getRange()) != null ? _ : null;
+  _handleMoveRowsCommand(t, e, r) {
+    var f;
+    const n = this._sheetsFilterService.getFilterModel(e, r), s = (f = n == null ? void 0 : n.getRange()) != null ? f : null;
     if (!n || !s)
       return this._handleNull();
-    const { startRow: o, endRow: l } = s, { fromRange: a, toRange: c } = r;
+    const { startRow: o, endRow: l } = s, { fromRange: a, toRange: c } = t;
     if (a.endRow < o && c.startRow <= o || a.startRow > l && c.endRow > l)
       return this._handleNull();
-    const h = [], u = [], d = {};
-    for (let f = o; f <= l; f++)
-      d[f] = {
-        oldIndex: f
+    const u = [], d = [], h = {};
+    for (let m = o; m <= l; m++)
+      h[m] = {
+        oldIndex: m
       };
-    const m = o;
-    let g = l;
-    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (g = a.startRow - 1), ie(a.startRow, a.endRow - a.startRow + 1, c.startRow, d);
-    const R = Object.keys(d).map((f) => Number(f)), w = R.find((f) => d[f].oldIndex === g), F = R.find((f) => d[f].oldIndex === m);
+    const g = o;
+    let _ = l;
+    l >= a.startRow && l <= a.endRow && c.startRow < a.startRow && a.startRow > o && (_ = a.startRow - 1), oe(a.startRow, a.endRow - a.startRow + 1, c.startRow, h);
+    const S = Object.keys(h).map((m) => Number(m)), w = S.find((m) => h[m].oldIndex === _), F = S.find((m) => h[m].oldIndex === g);
     if (o !== F || l !== w) {
-      const f = {
+      const m = {
         unitId: e,
-        subUnitId: t,
+        subUnitId: r,
         range: {
           ...s,
           startRow: F,
           endRow: w
         }
       };
-      h.push({ id: C.id, params: f }, { id: V.id, params: { unitId: e, subUnitId: t } }), u.push({ id: C.id, params: { range: s, unitId: e, subUnitId: t } }, { id: V.id, params: { unitId: e, subUnitId: t } });
+      u.push({ id: R.id, params: m }, { id: B.id, params: { unitId: e, subUnitId: r } }), d.push({ id: R.id, params: { range: s, unitId: e, subUnitId: r } }, { id: B.id, params: { unitId: e, subUnitId: r } });
     }
     return {
-      redos: h,
-      undos: u
+      redos: u,
+      undos: d
     };
   }
-  _handleMoveRangeCommand(r, e, t) {
-    const { fromRange: n, toRange: s } = r, o = this._sheetsFilterService.getFilterModel(e, t);
+  _handleMoveRangeCommand(t, e, r) {
+    const { fromRange: n, toRange: s } = t, o = this._sheetsFilterService.getFilterModel(e, r);
     if (!o)
       return this._handleNull();
     const l = o.getRange();
     if (!l)
       return this._handleNull();
     const a = [], c = [];
-    if (Y.contains(n, l)) {
-      const h = l.startRow - n.startRow, u = l.startColumn - n.startColumn, d = {
-        startRow: s.startRow + h,
-        startColumn: s.startColumn + u,
-        endRow: s.startRow + h + (l.endRow - l.startRow),
-        endColumn: s.startColumn + u + (l.endColumn - l.startColumn)
-      }, m = {
-        id: O.id,
+    if (ee.contains(n, l)) {
+      const u = l.startRow - n.startRow, d = l.startColumn - n.startColumn, h = {
+        startRow: s.startRow + u,
+        startColumn: s.startColumn + d,
+        endRow: s.startRow + u + (l.endRow - l.startRow),
+        endColumn: s.startColumn + d + (l.endColumn - l.startColumn)
+      }, g = {
+        id: y.id,
         params: {
           unitId: e,
-          subUnitId: t
+          subUnitId: r
         }
-      }, g = { id: C.id, params: { unitId: e, subUnitId: t, range: d } }, R = { id: C.id, params: { unitId: e, subUnitId: t, range: l } };
-      a.push(m, g), c.push(m, R);
+      }, _ = { id: R.id, params: { unitId: e, subUnitId: r, range: h } }, S = { id: R.id, params: { unitId: e, subUnitId: r, range: l } };
+      a.push(g, _), c.push(g, S);
       const w = o.getAllFilterColumns(), F = s.startColumn - n.startColumn;
-      w.forEach((_) => {
-        const [f, v] = _;
-        v && (a.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f + F, criteria: { ...v.serialize(), colId: f + F } } }), c.push({ id: p.id, params: { unitId: e, subUnitId: t, col: f, criteria: { ...v.serialize(), colId: f } } }));
+      w.forEach((f) => {
+        const [m, v] = f;
+        v && (a.push({ id: p.id, params: { unitId: e, subUnitId: r, col: m + F, criteria: { ...v.serialize(), colId: m + F } } }), c.push({ id: p.id, params: { unitId: e, subUnitId: r, col: m, criteria: { ...v.serialize(), colId: m } } }));
       });
-    } else if (Y.intersects(s, l)) {
-      const h = {
+    } else if (ee.intersects(s, l)) {
+      const u = {
         ...l,
         endRow: Math.max(l.endRow, s.endRow)
       };
-      a.push({ id: C.id, params: { unitId: e, subUnitId: t, range: h } }), c.push({ id: C.id, params: { unitId: e, subUnitId: t, range: l } });
+      a.push({ id: R.id, params: { unitId: e, subUnitId: r, range: u } }), c.push({ id: R.id, params: { unitId: e, subUnitId: r, range: l } });
     }
     return {
       redos: a,
       undos: c
     };
   }
-  _handleRemoveSheetCommand(r, e, t) {
-    const n = this._sheetsFilterService.getFilterModel(e, t);
+  _handleRemoveSheetCommand(t, e, r) {
+    const n = this._sheetsFilterService.getFilterModel(e, r);
     if (!n)
       return this._handleNull();
     const s = n.getRange();
     if (!s)
       return this._handleNull();
     const o = [], l = [];
-    return n.getAllFilterColumns().forEach(([c, h]) => {
-      l.push({ id: p.id, params: { unitId: e, subUnitId: t, col: c, criteria: { ...h.serialize(), colId: c } } });
-    }), o.push({ id: O.id, params: { unitId: e, subUnitId: t, range: s } }), l.unshift({ id: C.id, params: { range: s, unitId: e, subUnitId: t } }), {
+    return n.getAllFilterColumns().forEach(([c, u]) => {
+      l.push({ id: p.id, params: { unitId: e, subUnitId: r, col: c, criteria: { ...u.serialize(), colId: c } } });
+    }), o.push({ id: y.id, params: { unitId: e, subUnitId: r, range: s } }), l.unshift({ id: R.id, params: { range: s, unitId: e, subUnitId: r } }), {
       undos: l,
       redos: o
     };
   }
-  _handleCopySheetCommand(r, e, t) {
-    const n = this._sheetsFilterService.getFilterModel(r, e);
+  _handleCopySheetCommand(t, e, r) {
+    const n = this._sheetsFilterService.getFilterModel(t, e);
     if (!n)
       return this._handleNull();
     const s = n.getRange();
     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 } });
-    }), a.push({ id: O.id, params: { unitId: r, subUnitId: t, range: s } }), o.unshift({ id: C.id, params: { range: s, unitId: r, subUnitId: t } }), {
+    return n.getAllFilterColumns().forEach(([d, h]) => {
+      o.push({ id: p.id, params: { unitId: t, subUnitId: r, col: d, criteria: { ...h.serialize(), colId: d } } }), a.push({ id: p.id, params: { unitId: t, subUnitId: r, col: d, criteria: null } });
+    }), a.push({ id: y.id, params: { unitId: t, subUnitId: r, range: s } }), o.unshift({ id: R.id, params: { range: s, unitId: t, subUnitId: r } }), {
       undos: l,
       redos: o,
       preUndos: a,
@@ -1149,54 +1152,54 @@ let k = class extends B {
     return { redos: [], undos: [] };
   }
   _initRowFilteredInterceptor() {
-    this.disposeWithMe(this._sheetInterceptorService.intercept(Je.ROW_FILTERED, {
+    this.disposeWithMe(this._sheetInterceptorService.intercept(et.ROW_FILTERED, {
       // sheet-interceptor.service.ts
-      handler: (r, e) => {
-        var t, n;
-        return r ? !0 : (n = (t = this._sheetsFilterService.getFilterModel(
+      handler: (t, e) => {
+        var r, n;
+        return t ? !0 : (n = (r = this._sheetsFilterService.getFilterModel(
           e.unitId,
           e.subUnitId
-        )) == null ? void 0 : t.isRowFiltered(e.row)) != null ? n : !1;
+        )) == null ? void 0 : r.isRowFiltered(e.row)) != null ? n : !1;
       }
     }));
   }
-  _moveCriteria(r, e, t, n) {
+  _moveCriteria(t, e, r, n) {
     const s = {
-      unitId: r,
+      unitId: t,
       subUnitId: e,
       criteria: null,
       col: -1
     }, o = [], l = [], a = [], c = [];
-    return t.forEach((h) => {
-      const [u, d] = h;
+    return r.forEach((u) => {
+      const [d, h] = u;
       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: { ...h.serialize(), colId: d }
         }
       });
-    }), t.forEach((h) => {
-      const [u, d] = h;
+    }), r.forEach((u) => {
+      const [d, h] = u;
       c.push({
         id: p.id,
         params: {
           ...s,
-          col: u + n,
-          criteria: { ...d.serialize(), colId: u + n }
+          col: d + n,
+          criteria: { ...h.serialize(), colId: d + n }
         }
       }), a.push({
         id: p.id,
         params: {
           ...s,
-          col: u + n,
+          col: d + n,
           criteria: null
         }
       });
@@ -1212,45 +1215,45 @@ let k = class extends B {
     };
   }
   _commandExecutedListener() {
-    this.disposeWithMe(this._commandService.onCommandExecuted((r, e) => {
-      var c, h;
-      const { unitId: t, subUnitId: n } = r.params || {}, s = this._sheetsFilterService.getFilterModel(t, n);
+    this.disposeWithMe(this._commandService.onCommandExecuted((t, e) => {
+      var c, u;
+      const { unitId: r, subUnitId: n } = t.params || {}, s = this._sheetsFilterService.getFilterModel(r, n);
       if (!s) return;
-      const o = Array.from(s.filteredOutRows).sort((u, d) => u - d), l = [];
+      const o = Array.from(s.filteredOutRows).sort((d, h) => d - h), l = [];
       let a = !1;
-      if (r.id === Ze.id) {
-        const { startRow: u, endRow: d } = r.params.range, m = o.filter((g) => g >= u && g <= d);
-        o.forEach((g) => {
-          if (g < u)
-            l.push(g);
-          else if (a = !0, g <= d) {
-            const R = Math.max(u, l.length ? l[l.length - 1] + 1 : u);
-            l.push(R);
+      if (t.id === tt.id) {
+        const { startRow: d, endRow: h } = t.params.range, g = o.filter((_) => _ >= d && _ <= h);
+        o.forEach((_) => {
+          if (_ < d)
+            l.push(_);
+          else if (a = !0, _ <= h) {
+            const S = Math.max(d, l.length ? l[l.length - 1] + 1 : d);
+            l.push(S);
           } else
-            l.push(g - (d - u + 1 - m.length));
+            l.push(_ - (h - d + 1 - g.length));
         });
       }
-      if (r.id === Ke.id) {
-        const { startRow: u, endRow: d } = r.params.range;
-        o.forEach((m) => {
-          m >= u ? (a = !0, l.push(m + (d - u + 1))) : l.push(m);
+      if (t.id === rt.id) {
+        const { startRow: d, endRow: h } = t.params.range;
+        o.forEach((g) => {
+          g >= d ? (a = !0, l.push(g + (h - d + 1))) : l.push(g);
         });
       }
-      if (a && (s.filteredOutRows = new Set(l)), r.id === Ye.id && !(e != null && e.onlyLocal)) {
-        const u = this._getExtendRegion(t, n);
-        if (u) {
-          const d = r.params.cellValue;
-          if (d)
-            for (let m = u.startColumn; m <= u.endColumn; m++) {
-              const g = (c = d == null ? void 0 : d[u.startRow]) == null ? void 0 : c[m];
-              if (g && this._cellHasValue(g)) {
-                const R = (h = this._univerInstanceService.getUnit(t)) == null ? void 0 : h.getSheetBySheetId(n);
-                if (R) {
-                  const w = he(u, { down: !0 }, R), F = this._sheetsFilterService.getFilterModel(t, n), _ = F.getRange();
+      if (a && (s.filteredOutRows = new Set(l)), t.id === nt.id && !(e != null && e.onlyLocal)) {
+        const d = this._getExtendRegion(r, n);
+        if (d) {
+          const h = t.params.cellValue;
+          if (h)
+            for (let g = d.startColumn; g <= d.endColumn; g++) {
+              const _ = (c = h == null ? void 0 : h[d.startRow]) == null ? void 0 : c[g];
+              if (_ && this._cellHasValue(_)) {
+                const S = (u = this._univerInstanceService.getUnit(r)) == null ? void 0 : u.getSheetBySheetId(n);
+                if (S) {
+                  const w = _e(d, { down: !0 }, S), F = this._sheetsFilterService.getFilterModel(r, n), f = F.getRange();
                   F.setRange({
-                    ..._,
+                    ...f,
                     endRow: w.endRow
-                  }), this._registerRefRange(t, n);
+                  }), this._registerRefRange(r, n);
                 }
               }
             }
@@ -1258,15 +1261,15 @@ let k = class extends B {
       }
     }));
   }
-  _getExtendRegion(r, e) {
+  _getExtendRegion(t, e) {
     var a;
-    const t = this._sheetsFilterService.getFilterModel(r, e);
-    if (!t)
+    const r = this._sheetsFilterService.getFilterModel(t, e);
+    if (!r)
       return null;
-    const n = (a = this._univerInstanceService.getUnit(r)) == null ? void 0 : a.getSheetBySheetId(e);
+    const n = (a = this._univerInstanceService.getUnit(t)) == null ? void 0 : a.getSheetBySheetId(e);
     if (!n)
       return null;
-    const s = t.getRange();
+    const s = r.getRange();
     if (!s)
       return null;
     const o = n.getRowCount() - 1, l = n.getRowManager();
@@ -1281,51 +1284,113 @@ let k = class extends B {
     return null;
   }
   _initErrorHandling() {
-    this.disposeWithMe(this._commandService.beforeCommandExecuted((r) => {
-      const e = r.params, t = z(this._univerInstanceService);
-      if (!t) return;
-      const { subUnitId: n, unitId: s } = t, o = this._sheetsFilterService.getFilterModel(s, n);
+    this.disposeWithMe(this._commandService.beforeCommandExecuted((t) => {
+      const e = t.params, r = H(this._univerInstanceService);
+      if (!r) return;
+      const { subUnitId: n, unitId: s } = r, o = this._sheetsFilterService.getFilterModel(s, n);
       if (!o) return;
       const l = o.getRange();
-      if (r.id === Xe.id && e.fromRange.startRow <= l.startRow && e.fromRange.endRow < l.endRow && e.fromRange.endRow >= l.startRow)
+      if (t.id === it.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");
     }));
   }
-  _cellHasValue(r) {
-    const e = Object.values(r);
-    return !(e.length === 0 || e.every((t) => t == null));
+  _cellHasValue(t) {
+    const e = Object.values(t);
+    return !(e.length === 0 || e.every((r) => r == null));
   }
 };
-k = Wt([
-  $(0, I),
-  $(1, T(Ve)),
-  $(2, T(M)),
-  $(3, N),
-  $(4, T(je)),
-  $(5, be(ut)),
-  $(6, T(ke))
-], k);
-var Vt = Object.getOwnPropertyDescriptor, jt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? Vt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+z = qt([
+  I(0, T),
+  I(1, A(Qe)),
+  I(2, A(M)),
+  I(3, N),
+  I(4, A(Je)),
+  I(5, He(gt)),
+  I(6, A(Ze))
+], z);
+var Gt = Object.getOwnPropertyDescriptor, Qt = (i, t, e, r) => {
+  for (var n = r > 1 ? void 0 : r ? Gt(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, H = (i, r) => (e, t) => r(e, t, i);
-let q = 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();
+}, X = (i, t) => (e, r) => t(e, r, i);
+const Jt = [
+  p.id,
+  B.id
+], Zt = [
+  Ce.id,
+  Re.id,
+  pe.id
+];
+let q = class extends U {
+  constructor(t, e, r) {
+    super();
+    C(this, "_d", new me());
+    C(this, "_visible$", new $(!1));
+    C(this, "visible$", this._visible$.asObservable());
+    C(this, "_enabled$", new $(!0));
+    C(this, "enabled$", this._enabled$.asObservable());
+    this._sheetsFilterController = t, this._commandService = e, this._configService = r;
+    const n = this._configService.getConfig(xe);
+    n != null && n.enableSyncSwitch && this._visible$.next(!0);
+  }
+  get visible() {
+    return this._visible$.getValue();
+  }
+  get enabled() {
+    return this._enabled$.getValue();
+  }
+  setEnabled(t) {
+    this._enabled$.next(t), t ? this._d.dispose() : this._initOnlyLocalListener();
+  }
+  _initOnlyLocalListener() {
+    this._d.add(
+      this._commandService.beforeCommandExecuted((t, e) => {
+        Jt.includes(t.id) && (e || (e = {}), e.onlyLocal = !0);
+      })
+    ), this._d.add(
+      this._commandService.onCommandExecuted((t, e) => {
+        if (Zt.includes(t.id) && (e != null && e.fromCollab)) {
+          if (t.id === Ce.id) {
+            const { range: r, unitId: n, subUnitId: s } = t.params, { redos: o } = this._sheetsFilterController.handleInsertColCommand(r, n, s);
+            j(o, this._commandService, e);
+          } else if (t.id === Re.id) {
+            const { range: r, unitId: n, subUnitId: s } = t.params, { redos: o } = this._sheetsFilterController.handleRemoveColCommand(r, n, s);
+            j(o, this._commandService, e);
+          } else if (t.id === pe.id) {
+            const { sourceRange: r, targetRange: n, unitId: s, subUnitId: o } = t.params, { redos: l } = this._sheetsFilterController.handleMoveColsCommand({ fromRange: r, toRange: n }, s, o);
+            j(l, this._commandService, e);
+          }
+        }
+      })
+    );
+  }
+};
+q = Qt([
+  X(0, A(z)),
+  X(1, T),
+  X(2, ge)
+], q);
+var Kt = Object.getOwnPropertyDescriptor, Yt = (i, t, e, r) => {
+  for (var n = r > 1 ? void 0 : r ? Kt(t, e) : t, s = i.length - 1, o; s >= 0; s--)
+    (o = i[s]) && (n = o(n) || n);
+  return n;
+}, V = (i, t) => (e, r) => t(e, r, i);
+let G = class extends U {
+  constructor(i, t, e, r) {
+    super(), this._activeDirtyManagerService = i, this._sheetRowFilteredService = t, this._sheetsFilterService = e, this._univerInstanceService = r, this._initFormulaDirtyRange(), this._registerSheetRowFiltered();
   }
   _initFormulaDirtyRange() {
-    Ce.forEach((i) => {
+    Me.forEach((i) => {
       this._activeDirtyManagerService.register(
         i,
         {
           commandId: i,
-          getDirtyData: (r) => {
-            const e = r.params, { unitId: t, subUnitId: n } = e;
+          getDirtyData: (t) => {
+            const e = t.params, { unitId: r, subUnitId: n } = e;
             return {
-              dirtyRanges: this._getHideRowMutation(t, n),
+              dirtyRanges: this._getHideRowMutation(r, n),
               clearDependencyTreeCache: {
-                [t]: {
+                [r]: {
                   [n]: "1"
                 }
               }
@@ -1335,93 +1400,96 @@ let q = class extends B {
       );
     });
   }
-  _getHideRowMutation(i, r) {
+  _getHideRowMutation(i, t) {
     var l, a;
-    const e = (l = this._sheetsFilterService.getFilterModel(i, r)) == null ? void 0 : l.getRange(), t = (a = this._univerInstanceService.getUnit(i)) == null ? void 0 : a.getSheetBySheetId(r);
-    if (e == null || t == null)
+    const e = (l = this._sheetsFilterService.getFilterModel(i, t)) == null ? void 0 : l.getRange(), r = (a = this._univerInstanceService.getUnit(i)) == null ? void 0 : a.getSheetBySheetId(t);
+    if (e == null || r == null)
       return [];
     const { startRow: n, endRow: s } = e;
     return [{
       unitId: i,
-      sheetId: r,
+      sheetId: t,
       range: {
         startRow: n,
         startColumn: 0,
         endRow: s,
-        endColumn: t.getColumnCount() - 1
+        endColumn: r.getColumnCount() - 1
       }
     }];
   }
   _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;
+    this._sheetRowFilteredService.register((i, t, e) => {
+      var r, n;
+      return (n = (r = this._sheetsFilterService.getFilterModel(i, t)) == null ? void 0 : r.isRowFiltered(e)) != null ? n : !1;
     });
   }
 };
-q = jt([
-  H(0, T(dt)),
-  H(1, T(ht)),
-  H(2, T(M)),
-  H(3, N)
-], q);
-var kt = Object.getOwnPropertyDescriptor, qt = (i, r, e, t) => {
-  for (var n = t > 1 ? void 0 : t ? kt(r, e) : r, s = i.length - 1, o; s >= 0; s--)
+G = Yt([
+  V(0, A(_t)),
+  V(1, A(Ct)),
+  V(2, A(M)),
+  V(3, N)
+], G);
+var Xt = Object.getOwnPropertyDescriptor, er = (i, t, e, r) => {
+  for (var n = r > 1 ? void 0 : r ? Xt(t, e) : t, s = i.length - 1, o; s >= 0; s--)
     (o = i[s]) && (n = o(n) || n);
   return n;
-}, ue = (i, r) => (e, t) => r(e, t, i), W;
-let de = (W = class extends Ue {
-  constructor(i = ce, r, e) {
-    super(), this._config = i, this._injector = r, this._configService = e;
-    const { ...t } = Pe(
+}, he = (i, t) => (e, r) => t(e, r, i), W;
+let fe = (W = class extends Ve {
+  constructor(i = ue, t, e) {
+    super(), this._config = i, this._injector = t, this._configService = e;
+    const { ...r } = We(
       {},
-      ce,
+      ue,
       this._config
     );
-    this._configService.setConfig(Bt, t);
+    this._configService.setConfig(xe, r);
   }
   onStarting() {
     [
-      [q],
+      [G],
       [M],
-      [k]
+      [z],
+      [q]
     ].forEach((i) => this._injector.add(i));
   }
   onReady() {
-    De(this._injector, [
-      [q],
-      [k]
+    je(this._injector, [
+      [G],
+      [z],
+      [q]
     ]);
   }
-}, S(W, "type", P.UNIVER_SHEET), S(W, "pluginName", we), W);
-de = qt([
-  ue(1, T(Be)),
-  ue(2, ze)
-], de);
+}, C(W, "type", D.UNIVER_SHEET), C(W, "pluginName", Te), W);
+fe = er([
+  he(1, A(ke)),
+  he(2, ge)
+], fe);
 export {
-  rr as ClearSheetsFilterCriteriaCommand,
+  dr as ClearSheetsFilterCriteriaCommand,
   x as CustomFilterOperator,
-  Ce as FILTER_MUTATIONS,
+  Me as FILTER_MUTATIONS,
   b as FilterBy,
-  wt as FilterColumn,
-  j as FilterModel,
-  nr as ReCalcSheetsFilterCommand,
-  V as ReCalcSheetsFilterMutation,
-  Lt as RemoveSheetFilterCommand,
-  O as RemoveSheetsFilterMutation,
-  we as SHEET_FILTER_SNAPSHOT_ID,
-  bt as SetSheetFilterRangeCommand,
-  tr as SetSheetsFilterCriteriaCommand,
+  yt as FilterColumn,
+  k as FilterModel,
+  ur as ReCalcSheetsFilterCommand,
+  B as ReCalcSheetsFilterMutation,
+  zt as RemoveSheetFilterCommand,
+  y as RemoveSheetsFilterMutation,
+  Te as SHEET_FILTER_SNAPSHOT_ID,
+  Bt as SetSheetFilterRangeCommand,
+  cr as SetSheetsFilterCriteriaCommand,
   p as SetSheetsFilterCriteriaMutation,
-  C as SetSheetsFilterRangeMutation,
+  R as SetSheetsFilterRangeMutation,
   M as SheetsFilterService,
-  er as SmartToggleSheetsFilterCommand,
-  de as UniverSheetsFilterPlugin,
-  Ct as equals,
-  oe as getCustomFilterFn,
-  ft as greaterThan,
-  mt as greaterThanOrEqualTo,
-  gt as lessThan,
-  _t as lessThanOrEqualTo,
-  Re as notEquals
+  q as SheetsFilterSyncController,
+  ar as SmartToggleSheetsFilterCommand,
+  fe as UniverSheetsFilterPlugin,
+  wt as equals,
+  ae as getCustomFilterFn,
+  Rt as greaterThan,
+  pt as greaterThanOrEqualTo,
+  St as lessThan,
+  Ft as lessThanOrEqualTo,
+  Ee as notEquals
 };