@univerjs/sheets-filter-ui 0.10.2 → 0.10.3-experimental.20250812-b4b6f1a

package/lib/es/index.js

@@ -1,17 +1,17 @@
 var sr = Object.defineProperty;
-var nr = (t, e, r) => e in t ? sr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
-var p = (t, e, r) => nr(t, typeof e != "symbol" ? e + "" : e, r);
-import { BooleanNumber as ht, createIdentifier as Rt, Inject as T, LocaleService as K, IUniverInstanceService as De, ILogService as or, extractPureTextFromCell as lr, numfmt as dt, Disposable as de, Injector as re, Quantity as At, Tools as Re, ColorKit as mt, ICommandService as j, CommandType as Be, IContextService as We, ThemeService as Pt, RxDisposable as wt, fromCallback as ar, InterceptorEffectEnum as cr, UniverInstanceType as ie, DependentOn as Lt, IConfigService as $t, Plugin as tt, merge as Mt, Optional as ur, registerDependencies as hr, touchDependencies as ft } from "@univerjs/core";
-import { CustomFilterOperator as u, FilterBy as A, SetSheetsFilterCriteriaCommand as Q, SheetsFilterService as q, SmartToggleSheetsFilterCommand as Ee, FILTER_MUTATIONS as dr, SetSheetsFilterRangeMutation as mr, SetSheetsFilterCriteriaMutation as fr, RemoveSheetsFilterMutation as pr, ReCalcSheetsFilterMutation as vr, UniverSheetsFilterPlugin as xt, ReCalcSheetsFilterCommand as rt, ClearSheetsFilterCriteriaCommand as it, RemoveSheetFilterCommand as _r, SetSheetFilterRangeCommand as gr } from "@univerjs/sheets-filter";
-import { SetCellEditVisibleOperation as Sr, SheetSkeletonManagerService as Cr, ISheetSelectionRenderService as Tr, SelectionControl as Er, attachSelectionWithCoord as Nr, getCoordByCell as Fr, SheetsRenderService as Ut, SheetsUIPart as yr, getObservableWithExclusiveRange$ as Or, getCurrentRangeDisable$ as Ir, whenSheetEditorFocused as br, SheetCanvasPopManagerService as Rr } from "@univerjs/sheets-ui";
-import { ILayoutService as Ar, useDependency as te, useObservable as H, useComponentsOfPart as Pr, ComponentContainer as wr, getMenuHiddenObservable as st, MenuItemType as nt, RibbonDataGroup as Lr, KeyCode as $r, MetaKeys as pt, ComponentManager as Mr, IShortcutService as xr, IMenuManagerService as Ur, IMessageService as kr } from "@univerjs/ui";
-import { COLOR_BLACK_RGB as vt, Rect as _t, Shape as Hr, IRenderManagerService as kt } from "@univerjs/engine-render";
-import { RefRangeService as Dr, SheetPermissionCheckController as Br, SheetsSelectionsService as Wr, getSheetCommandTarget as Qr, WorksheetFilterPermission as pe, WorksheetViewPermission as ve, RangeProtectionPermissionViewPoint as _e, expandToContinuousRange as Vr, SheetInterceptorService as jr, SetRangeValuesMutation as Gr, INTERCEPTOR_POINT as Yr } from "@univerjs/sheets";
-import { BehaviorSubject as V, ReplaySubject as Zr, Subject as Kr, merge as qr, combineLatest as Xr, throttleTime as Ht, startWith as Dt, map as ce, shareReplay as zr, of as me, switchMap as ot, filter as Jr, takeUntil as ei, distinctUntilChanged as ti } from "rxjs";
-import { IRPCChannelService as Bt, toModule as ri, fromModule as ii } from "@univerjs/rpc";
-import { clsx as Ae, borderClassName as lt, Select as gt, RadioGroup as si, Radio as St, Input as Wt, Checkbox as ni, Tree as oi, Segmented as li, Button as Ge, MessageType as ai } from "@univerjs/design";
-import { jsx as f, jsxs as I, Fragment as Ct } from "react/jsx-runtime";
-import { forwardRef as Ne, useRef as ci, createElement as Fe, useCallback as U, useMemo as at } from "react";
+var or = (t, e, r) => e in t ? sr(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var v = (t, e, r) => or(t, typeof e != "symbol" ? e + "" : e, r);
+import { BooleanNumber as mt, createIdentifier as Pt, Inject as T, LocaleService as X, IUniverInstanceService as Be, ILogService as lr, extractPureTextFromCell as ar, numfmt as ft, Disposable as de, Injector as ie, Quantity as wt, Tools as Re, ColorKit as pt, ICommandService as j, CommandType as We, IContextService as Ve, ThemeService as Lt, RxDisposable as Mt, fromCallback as cr, VerticalAlign as Ae, InterceptorEffectEnum as ur, UniverInstanceType as ne, DependentOn as $t, IConfigService as xt, Plugin as it, merge as Ut, Optional as hr, registerDependencies as dr, touchDependencies as vt } from "@univerjs/core";
+import { CustomFilterOperator as u, FilterBy as w, SetSheetsFilterCriteriaCommand as V, SheetsFilterService as z, SmartToggleSheetsFilterCommand as Fe, FILTER_MUTATIONS as mr, SetSheetsFilterRangeMutation as fr, SetSheetsFilterCriteriaMutation as pr, RemoveSheetsFilterMutation as vr, ReCalcSheetsFilterMutation as _r, UniverSheetsFilterPlugin as kt, ReCalcSheetsFilterCommand as nt, ClearSheetsFilterCriteriaCommand as st, RemoveSheetFilterCommand as gr, SetSheetFilterRangeCommand as Sr } from "@univerjs/sheets-filter";
+import { SetCellEditVisibleOperation as Cr, SheetSkeletonManagerService as Tr, ISheetSelectionRenderService as Er, SelectionControl as Fr, attachSelectionWithCoord as Nr, getCoordByCell as yr, SheetsRenderService as Ht, SheetsUIPart as Or, getObservableWithExclusiveRange$ as Ir, getCurrentRangeDisable$ as br, whenSheetEditorFocused as Rr, SheetCanvasPopManagerService as Ar } from "@univerjs/sheets-ui";
+import { ILayoutService as Pr, useDependency as re, useObservable as D, useComponentsOfPart as wr, ComponentContainer as Lr, getMenuHiddenObservable as ot, MenuItemType as lt, RibbonDataGroup as Mr, KeyCode as $r, MetaKeys as _t, ComponentManager as xr, IShortcutService as Ur, IMenuManagerService as kr, IMessageService as Hr } from "@univerjs/ui";
+import { COLOR_BLACK_RGB as gt, Rect as St, Shape as Dr, IRenderManagerService as Dt } from "@univerjs/engine-render";
+import { RefRangeService as Br, SheetPermissionCheckController as Wr, SheetsSelectionsService as Vr, getSheetCommandTarget as Qr, WorksheetFilterPermission as pe, WorksheetViewPermission as ve, RangeProtectionPermissionViewPoint as _e, expandToContinuousRange as jr, SheetInterceptorService as Gr, SetRangeValuesMutation as Yr, SetVerticalTextAlignCommand as Zr, INTERCEPTOR_POINT as Kr } from "@univerjs/sheets";
+import { BehaviorSubject as Q, ReplaySubject as qr, Subject as Xr, merge as zr, combineLatest as Jr, throttleTime as Bt, startWith as Wt, map as ce, shareReplay as ei, of as me, switchMap as at, filter as ti, takeUntil as ri, distinctUntilChanged as ii } from "rxjs";
+import { IRPCChannelService as Vt, toModule as ni, fromModule as si } from "@univerjs/rpc";
+import { clsx as Pe, borderClassName as ct, Select as Ct, RadioGroup as oi, Radio as Tt, Input as Qt, Checkbox as li, Tree as ai, Segmented as ci, Button as Ze, MessageType as ui } from "@univerjs/design";
+import { jsx as p, jsxs as I, Fragment as Et } from "react/jsx-runtime";
+import { forwardRef as Ne, useRef as hi, createElement as ye, useCallback as k, useMemo as ut } from "react";
 var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SECOND", t))(y || {}), g = /* @__PURE__ */ ((t) => (t.NONE = "none", t.STARTS_WITH = "startsWith", t.DOES_NOT_START_WITH = "doesNotStartWith", t.ENDS_WITH = "endsWith", t.DOES_NOT_END_WITH = "doesNotEndWith", t.CONTAINS = "contains", t.DOES_NOT_CONTAIN = "doesNotContain", t.EQUALS = "equals", t.NOT_EQUALS = "notEquals", t.EMPTY = "empty", t.NOT_EMPTY = "notEmpty", t.BETWEEN = "between", t.NOT_BETWEEN = "notBetween", t.CUSTOM = "custom", t))(g || {}), m;
 ((t) => {
   t.NONE = {
@@ -66,7 +66,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: g.CONTAINS, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === g.CONTAINS;
     },
     mapToFilterColumn: (i) => {
@@ -92,7 +92,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       customFilters: { customFilters: [{ val: `*${i.val1}*`, operator: u.NOT_EQUALS }] }
     }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === g.DOES_NOT_CONTAIN;
     },
     testMappingFilterColumn: (i) => {
@@ -112,7 +112,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       customFilters: { customFilters: [{ val: `${i.val1}*` }] }
     }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === g.STARTS_WITH;
     },
     testMappingFilterColumn: (i) => {
@@ -132,7 +132,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       customFilters: { customFilters: [{ val: `*${i.val1}` }] }
     }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === g.ENDS_WITH;
     },
     testMappingFilterColumn: (i) => {
@@ -149,7 +149,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     numOfParameters: 1,
     getDefaultFormParams: () => ({ operator1: g.EQUALS, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === g.EQUALS;
     },
     mapToFilterColumn: (i) => {
@@ -172,7 +172,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       customFilters: { customFilters: [{ val: i.val1, operator: u.GREATER_THAN }] }
     }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === u.GREATER_THAN;
     },
     testMappingFilterColumn: (i) => {
@@ -189,7 +189,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.GREATER_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === u.GREATER_THAN_OR_EQUAL;
     },
     mapToFilterColumn: (i) => ({
@@ -209,7 +209,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === u.LESS_THAN;
     },
     mapToFilterColumn: (i) => ({
@@ -229,7 +229,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.LESS_THAN_OR_EQUAL, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === u.LESS_THAN_OR_EQUAL;
     },
     mapToFilterColumn: (i) => ({
@@ -249,7 +249,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.EQUAL, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === u.EQUAL;
     },
     mapToFilterColumn: (i) => ({
@@ -269,7 +269,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     order: y.FIRST,
     getDefaultFormParams: () => ({ operator1: u.NOT_EQUALS, val1: "" }),
     testMappingParams: (i) => {
-      const [o] = x(i);
+      const [o] = U(i);
       return o === u.NOT_EQUALS;
     },
     mapToFilterColumn: (i) => ({
@@ -304,7 +304,7 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
       const { val1: o, val2: l, operator1: c } = i, h = c === u.GREATER_THAN_OR_EQUAL;
       return {
         customFilters: {
-          and: ht.TRUE,
+          and: mt.TRUE,
           customFilters: [
             { val: h ? o : l, operator: u.GREATER_THAN_OR_EQUAL },
             { val: h ? l : o, operator: u.LESS_THAN_OR_EQUAL }
@@ -390,25 +390,25 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     testMappingParams: () => !0,
     mapToFilterColumn: (i) => {
       const { and: o, val1: l, val2: c, operator1: h, operator2: d } = i;
-      function C(b, F) {
+      function C(b, N) {
         for (const R of t.ALL_CONDITIONS)
           if (R.operator === b)
-            return R.mapToFilterColumn({ val1: F, operator1: b });
+            return R.mapToFilterColumn({ val1: N, operator1: b });
       }
-      const v = !h || h === t.NONE.operator, _ = !d || d === t.NONE.operator;
-      if (v && _)
+      const f = !h || h === t.NONE.operator, _ = !d || d === t.NONE.operator;
+      if (f && _)
         return t.NONE.mapToFilterColumn({});
-      if (v)
+      if (f)
         return C(d, c);
       if (_)
         return C(h, l);
-      const S = C(h, l), N = C(d, c), E = {
+      const S = C(h, l), E = C(d, c), F = {
         customFilters: [
           S.customFilters.customFilters[0],
-          N.customFilters.customFilters[0]
+          E.customFilters.customFilters[0]
         ]
       };
-      return o && (E.and = ht.TRUE), { customFilters: E };
+      return o && (F.and = mt.TRUE), { customFilters: F };
     },
     testMappingFilterColumn: (i) => {
       var c;
@@ -463,15 +463,15 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
     throw new Error("[SheetsFilter]: no condition item can be mapped from the filter map params!");
   }
   t.testMappingParams = r;
-  function s(i) {
+  function n(i) {
     const o = t.ALL_CONDITIONS.find((l) => l.operator === i);
     return (o == null ? void 0 : o.numOfParameters) === 0 ? { operator1: o.operator } : o.getDefaultFormParams();
   }
-  t.getInitialFormParams = s;
-  function n(i, o) {
+  t.getInitialFormParams = n;
+  function s(i, o) {
     return i.mapToFilterColumn(o);
   }
-  t.mapToFilterColumn = n;
+  t.mapToFilterColumn = s;
   function a(i) {
     if (!i)
       return [t.NONE, {}];
@@ -484,216 +484,216 @@ var y = /* @__PURE__ */ ((t) => (t[t.FIRST = 0] = "FIRST", t[t.SECOND = 1] = "SE
   }
   t.testMappingFilterColumn = a;
 })(m || (m = {}));
-function x(t) {
-  const { operator1: e, operator2: r, val1: s, val2: n } = t;
+function U(t) {
+  const { operator1: e, operator2: r, val1: n, val2: s } = t;
   if (e && r)
     throw new Error("Both operator1 and operator2 are set!");
   if (!e && !r)
     throw new Error("Neither operator1 and operator2 and both not set!");
-  return e ? [e, s] : [r, n];
+  return e ? [e, n] : [r, s];
 }
-function qe(t) {
+function ze(t) {
   const e = [], r = [];
-  let s = 0, n = 0;
+  let n = 0, s = 0;
   function a(i) {
-    i.leaf && (i.checked ? (e.push(i), s += i.count) : (r.push(i), n += i.count)), i.children && i.children.forEach(a);
+    i.leaf && (i.checked ? (e.push(i), n += i.count) : (r.push(i), s += i.count)), i.children && i.children.forEach(a);
   }
   return t.forEach(a), {
     checkedItems: e,
     uncheckedItems: r,
-    checked: s,
-    unchecked: n
+    checked: n,
+    unchecked: s
   };
 }
-var ui = Object.getOwnPropertyDescriptor, hi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ui(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, Ye = (t, e) => (r, s) => e(r, s, t);
-const ct = "sheets-filter.generate-filter-values.service", Pe = Rt(ct), di = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
-let Xe = class extends de {
+var di = Object.getOwnPropertyDescriptor, mi = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? di(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, Ke = (t, e) => (r, n) => e(r, n, t);
+const ht = "sheets-filter.generate-filter-values.service", we = Pt(ht), fi = ["yyyy-mm-dd", "yyyy-mm-dd;@", "yyyy/mm/dd;@", "yyyy/mm/dd hh:mm", "yyyy-m-d am/pm h:mm", "yyyy-MM-dd", "yyyy/MM/dd", "yyyy/mm/dd", 'yyyy"年"MM"月"dd"日"', "MM-dd", 'M"月"d"日"', "MM-dd A/P hh:mm"];
+let Je = class extends de {
   constructor(t, e, r) {
     super(), this._localeService = t, this._univerInstanceService = e, this._logService = r;
   }
   async getFilterValues(t) {
     var d;
-    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: s, filterColumn: n, filters: a, blankChecked: i, iterateRange: o, alreadyChecked: l } = t, c = this._univerInstanceService.getUnit(e), h = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(r);
-    return !c || !h ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), Qt(
+    const { unitId: e, subUnitId: r, filteredOutRowsByOtherColumns: n, filterColumn: s, filters: a, blankChecked: i, iterateRange: o, alreadyChecked: l } = t, c = this._univerInstanceService.getUnit(e), h = (d = this._univerInstanceService.getUnit(e)) == null ? void 0 : d.getSheetBySheetId(r);
+    return !c || !h ? [] : (this._logService.debug("[SheetsGenerateFilterValuesService]", "getFilterValues for", { unitId: e, subUnitId: r }), jt(
       a,
       this._localeService,
       o,
       h,
-      new Set(s),
-      n,
+      new Set(n),
+      s,
       new Set(l.map(String)),
       i,
       c.getStyles()
     ));
   }
 };
-Xe = hi([
-  Ye(0, T(K)),
-  Ye(1, De),
-  Ye(2, or)
-], Xe);
-function Qt(t, e, r, s, n, a, i, o, l) {
-  var E, b, F, R, w, X, se, ne, D, L;
-  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), d = "yyyy-mm-dd", C = new Set(di), v = "empty", _ = !t && ((a == null ? void 0 : a.filterBy) === A.COLORS || (a == null ? void 0 : a.filterBy) === A.CONDITIONS) && ((E = a.filteredOutRows) == null ? void 0 : E.size);
+Je = mi([
+  Ke(0, T(X)),
+  Ke(1, Be),
+  Ke(2, lr)
+], Je);
+function jt(t, e, r, n, s, a, i, o, l) {
+  var F, b, N, R, L, G, Y, se, x, A;
+  const c = /* @__PURE__ */ new Map(), h = /* @__PURE__ */ new Map(), d = "yyyy-mm-dd", C = new Set(fi), f = "empty", _ = !t && ((a == null ? void 0 : a.filterBy) === w.COLORS || (a == null ? void 0 : a.filterBy) === w.CONDITIONS) && ((F = a.filteredOutRows) == null ? void 0 : F.size);
   let S = 0;
-  for (const $ of s.iterateByColumn(r, !1, !1)) {
-    const { row: tr, rowSpan: ut = 1 } = $;
+  for (const P of n.iterateByColumn(r, !1, !1)) {
+    const { row: je, rowSpan: dt = 1 } = P;
     let oe = 0;
-    for (; oe < ut; ) {
-      const rr = tr + oe;
-      if (n.has(rr)) {
+    for (; oe < dt; ) {
+      const ir = je + oe;
+      if (s.has(ir)) {
         oe++;
         continue;
       }
-      const z = $ != null && $.value ? lr($.value) : "";
-      if (!z) {
-        S += 1, oe += ut;
+      const J = P != null && P.value ? ar(P.value) : "";
+      if (!J) {
+        S += 1, oe += dt;
         continue;
       }
-      const Oe = (b = $.value) != null && b.v && !$.value.p ? (w = (R = l.get((F = $.value) == null ? void 0 : F.s)) == null ? void 0 : R.n) == null ? void 0 : w.pattern : "", ir = Oe && dt.getFormatInfo(Oe).isDate;
-      if (Oe && ir && C.has(Oe)) {
-        const G = (X = s.getCellRaw($.row, $.col)) == null ? void 0 : X.v;
-        if (!G) {
+      const Ie = (b = P.value) != null && b.v && !P.value.p ? (L = (R = l.get((N = P.value) == null ? void 0 : N.s)) == null ? void 0 : R.n) == null ? void 0 : L.pattern : "", nr = Ie && ft.getFormatInfo(Ie).isDate;
+      if (Ie && nr && C.has(Ie)) {
+        const Z = (G = n.getCellRaw(P.row, P.col)) == null ? void 0 : G.v;
+        if (!Z) {
           oe++;
           continue;
         }
-        const le = dt.format(d, G), [O, k, fe] = le.split("-").map(Number);
-        let J = c.get(`${O}`);
-        J || (J = {
+        const le = ft.format(d, Z), [O, H, fe] = le.split("-").map(Number);
+        let ee = c.get(`${O}`);
+        ee || (ee = {
           title: `${O}`,
           key: `${O}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, c.set(`${O}`, J), h.set(`${O}`, [`${O}`]));
-        let B = (se = J.children) == null ? void 0 : se.find((je) => je.key === `${O}-${k}`);
-        B || (B = {
-          title: e.t(`sheets-filter.date.${k}`),
-          key: `${O}-${k}`,
+        }, c.set(`${O}`, ee), h.set(`${O}`, [`${O}`]));
+        let W = (Y = ee.children) == null ? void 0 : Y.find((Ye) => Ye.key === `${O}-${H}`);
+        W || (W = {
+          title: e.t(`sheets-filter.date.${H}`),
+          key: `${O}-${H}`,
           children: [],
           count: 0,
           leaf: !1,
           checked: !1
-        }, (ne = J.children) == null || ne.push(B), h.set(`${O}-${k}`, [`${O}`, `${O}-${k}`]));
-        const Ve = (D = B == null ? void 0 : B.children) == null ? void 0 : D.find((je) => je.key === `${O}-${k}-${fe}`);
-        Ve ? (Ve.originValues.add(z), Ve.count++, B.count++, J.count++) : ((L = B.children) == null || L.push({
+        }, (se = ee.children) == null || se.push(W), h.set(`${O}-${H}`, [`${O}`, `${O}-${H}`]));
+        const Ge = (x = W == null ? void 0 : W.children) == null ? void 0 : x.find((Ye) => Ye.key === `${O}-${H}-${fe}`);
+        Ge ? (Ge.originValues.add(J), Ge.count++, W.count++, ee.count++) : ((A = W.children) == null || A.push({
           title: `${fe}`,
-          key: `${O}-${k}-${fe}`,
+          key: `${O}-${H}-${fe}`,
           count: 1,
-          originValues: /* @__PURE__ */ new Set([z]),
+          originValues: /* @__PURE__ */ new Set([J]),
           leaf: !0,
-          checked: _ ? !1 : i.size ? i.has(z) : !o
-        }), B.count++, J.count++, h.set(`${O}-${k}-${fe}`, [`${O}`, `${O}-${k}`, `${O}-${k}-${fe}`]));
+          checked: _ ? !1 : i.size ? i.has(J) : !o
+        }), W.count++, ee.count++, h.set(`${O}-${H}-${fe}`, [`${O}`, `${O}-${H}`, `${O}-${H}-${fe}`]));
       } else {
-        const G = z;
-        let le = c.get(G);
+        const Z = J;
+        let le = c.get(Z);
         le ? le.count++ : (le = {
-          title: z,
+          title: J,
           leaf: !0,
-          checked: _ ? !1 : i.size ? i.has(z) : !o,
-          key: G,
+          checked: _ ? !1 : i.size ? i.has(J) : !o,
+          key: Z,
           count: 1
-        }, c.set(G, le), h.set(G, [G]));
+        }, c.set(Z, le), h.set(Z, [Z]));
       }
       oe++;
     }
   }
-  const N = _ ? !1 : t ? o : !0;
+  const E = _ ? !1 : t ? o : !0;
   if (S > 0) {
-    const $ = {
+    const P = {
       title: e.t("sheets-filter.panel.empty"),
       count: S,
       leaf: !0,
-      checked: N,
-      key: v
+      checked: E,
+      key: f
     };
-    c.set("empty", $), h.set("empty", [v]);
+    c.set("empty", P), h.set("empty", [f]);
   }
   return {
-    filterTreeItems: mi(Array.from(c.values())),
+    filterTreeItems: pi(Array.from(c.values())),
     filterTreeMapCache: h
   };
 }
-function mi(t) {
-  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : fi(e.title, r.title)).map((e) => (e.children && e.children.sort((r, s) => {
-    const n = Number.parseInt(r.key.split("-")[1], 10), a = Number.parseInt(s.key.split("-")[1], 10);
-    return n - a;
+function pi(t) {
+  return Array.from(t).sort((e, r) => e.children && !r.children ? -1 : !e.children && r.children ? 1 : vi(e.title, r.title)).map((e) => (e.children && e.children.sort((r, n) => {
+    const s = Number.parseInt(r.key.split("-")[1], 10), a = Number.parseInt(n.key.split("-")[1], 10);
+    return s - a;
   }).forEach((r) => {
-    r.children && r.children.sort((s, n) => {
-      const a = Number.parseInt(s.key.split("-")[2], 10), i = Number.parseInt(n.key.split("-")[2], 10);
+    r.children && r.children.sort((n, s) => {
+      const a = Number.parseInt(n.key.split("-")[2], 10), i = Number.parseInt(s.key.split("-")[2], 10);
       return a - i;
     });
   }), e));
 }
-const Tt = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
-function fi(t, e) {
-  const r = Tt(t), s = Tt(e);
-  return r && s ? Number.parseFloat(t) - Number.parseFloat(e) : r && !s ? -1 : !r && s ? 1 : t.localeCompare(e);
+const Ft = (t) => !Number.isNaN(Number(t)) && !Number.isNaN(Number.parseFloat(t));
+function vi(t, e) {
+  const r = Ft(t), n = Ft(e);
+  return r && n ? Number.parseFloat(t) - Number.parseFloat(e) : r && !n ? -1 : !r && n ? 1 : t.localeCompare(e);
 }
-function ze(t, e) {
+function et(t, e) {
   for (const r of t) {
     if (r.key === e)
       return r;
     if (r.children) {
-      const s = ze(r.children, e);
-      if (s)
-        return s;
+      const n = et(r.children, e);
+      if (n)
+        return n;
     }
   }
   return null;
 }
-function Vt(t) {
-  return t.leaf ? t.checked : t.children ? t.children.every((e) => Vt(e)) : !0;
+function Gt(t) {
+  return t.leaf ? t.checked : t.children ? t.children.every((e) => Gt(e)) : !0;
 }
 function ge(t, e) {
   t.leaf && (e !== void 0 ? t.checked = e : t.checked = !t.checked), t.children && t.children.forEach((r) => ge(r, e));
 }
-function jt(t, e) {
+function Yt(t, e) {
   const r = [];
-  return t.forEach((s) => {
-    const n = s.originValues ? e.some(
-      (o) => Array.from(s.originValues).some(
+  return t.forEach((n) => {
+    const s = n.originValues ? e.some(
+      (o) => Array.from(n.originValues).some(
         (l) => l.toLowerCase().includes(o.toLowerCase())
       )
-    ) : !1, a = !n && e.some(
-      (o) => s.title.toLowerCase().includes(o.toLowerCase())
+    ) : !1, a = !s && e.some(
+      (o) => n.title.toLowerCase().includes(o.toLowerCase())
     );
-    if (n || a)
-      r.push({ ...s });
-    else if (s.children) {
-      const o = jt(s.children, e);
+    if (s || a)
+      r.push({ ...n });
+    else if (n.children) {
+      const o = Yt(n.children, e);
       if (o.length > 0) {
         const l = o.reduce((c, h) => c + h.count, 0);
-        r.push({ ...s, count: l, children: o });
+        r.push({ ...n, count: l, children: o });
       }
     }
   }), r;
 }
-var pi = Object.getOwnPropertyDescriptor, Qe = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? pi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, Ce = (t, e) => (r, s) => e(r, s, t);
-Rt("sheets-filter-ui.sheets-filter-panel.service");
-let Z = class extends de {
+var _i = Object.getOwnPropertyDescriptor, Qe = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? _i(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, Te = (t, e) => (r, n) => e(r, n, t);
+Pt("sheets-filter-ui.sheets-filter-panel.service");
+let q = class extends de {
   constructor(e, r) {
     super();
-    p(this, "_filterBy$", new V(A.VALUES));
-    p(this, "filterBy$", this._filterBy$.asObservable());
-    p(this, "_filterByModel$", new Zr(1));
-    p(this, "filterByModel$", this._filterByModel$.asObservable());
-    p(this, "_filterByModel", null);
-    p(this, "_hasCriteria$", new V(!1));
-    p(this, "hasCriteria$", this._hasCriteria$.asObservable());
-    p(this, "_filterModel", null);
-    p(this, "_col$", new V(-1));
-    p(this, "col$", this._col$.asObservable());
-    p(this, "_filterHeaderListener", null);
+    v(this, "_filterBy$", new Q(w.VALUES));
+    v(this, "filterBy$", this._filterBy$.asObservable());
+    v(this, "_filterByModel$", new qr(1));
+    v(this, "filterByModel$", this._filterByModel$.asObservable());
+    v(this, "_filterByModel", null);
+    v(this, "_hasCriteria$", new Q(!1));
+    v(this, "hasCriteria$", this._hasCriteria$.asObservable());
+    v(this, "_filterModel", null);
+    v(this, "_col$", new Q(-1));
+    v(this, "col$", this._col$.asObservable());
+    v(this, "_filterHeaderListener", null);
     this._injector = e, this._refRangeService = r;
   }
   get filterBy() {
@@ -716,18 +716,18 @@ let Z = class extends de {
   }
   setupCol(e, r) {
     this.terminate(), this._filterModel = e, this._col$.next(r);
-    const s = e.getFilterColumn(r);
-    if (s) {
-      const n = s.getColumnData();
-      if (n.customFilters) {
+    const n = e.getFilterColumn(r);
+    if (n) {
+      const s = n.getColumnData();
+      if (s.customFilters) {
         this._hasCriteria$.next(!0), this._setupByConditions(e, r);
         return;
       }
-      if (n.colorFilters) {
+      if (s.colorFilters) {
         this._hasCriteria$.next(!0), this._setupByColors(e, r);
         return;
       }
-      if (n.filters) {
+      if (s.filters) {
         this._hasCriteria$.next(!0), this._setupByValues(e, r);
         return;
       }
@@ -740,13 +740,13 @@ let Z = class extends de {
     if (!this._filterModel || this.col === -1)
       return !1;
     switch (e) {
-      case A.VALUES:
+      case w.VALUES:
         this._setupByValues(this._filterModel, this.col);
         break;
-      case A.COLORS:
+      case w.COLORS:
         this._setupByColors(this._filterModel, this.col);
         break;
-      case A.CONDITIONS:
+      case w.CONDITIONS:
         this._setupByConditions(this._filterModel, this.col);
         break;
     }
@@ -761,13 +761,13 @@ let Z = class extends de {
   }
   _listenToFilterHeaderChange(e, r) {
     this._disposeFilterHeaderChangeListener();
-    const s = e.unitId, n = e.subUnitId, a = e.getRange(), i = {
+    const n = e.unitId, s = e.subUnitId, a = e.getRange(), i = {
       startColumn: r,
       startRow: a.startRow,
       endRow: a.startRow,
       endColumn: r
     };
-    this._filterHeaderListener = this._refRangeService.watchRange(s, n, i, (o, l) => {
+    this._filterHeaderListener = this._refRangeService.watchRange(n, s, i, (o, l) => {
       if (!l)
         this.terminate();
       else {
@@ -778,56 +778,56 @@ let Z = class extends de {
   }
   async _setupByValues(e, r) {
     this._disposePreviousModel();
-    const s = e.getRange();
-    if (s.startRow === s.endRow) return !1;
-    const n = await Le.fromFilterColumn(
+    const n = e.getRange();
+    if (n.startRow === n.endRow) return !1;
+    const s = await Me.fromFilterColumn(
       this._injector,
       e,
       r
     );
-    return this.filterByModel = n, this._filterBy$.next(A.VALUES), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = s, this._filterBy$.next(w.VALUES), this._listenToFilterHeaderChange(e, r), !0;
   }
   async _setupByColors(e, r) {
     this._disposePreviousModel();
-    const s = e.getRange();
-    if (s.startRow === s.endRow) return !1;
-    const n = await $e.fromFilterColumn(
+    const n = e.getRange();
+    if (n.startRow === n.endRow) return !1;
+    const s = await $e.fromFilterColumn(
       this._injector,
       e,
       r
     );
-    return this.filterByModel = n, this._filterBy$.next(A.COLORS), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = s, this._filterBy$.next(w.COLORS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _setupByConditions(e, r) {
     this._disposePreviousModel();
-    const s = e.getRange();
-    if (s.startRow === s.endRow) return !1;
-    const n = we.fromFilterColumn(
+    const n = e.getRange();
+    if (n.startRow === n.endRow) return !1;
+    const s = Le.fromFilterColumn(
       this._injector,
       e,
       r,
       e.getFilterColumn(r)
     );
-    return this.filterByModel = n, this._filterBy$.next(A.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
+    return this.filterByModel = s, this._filterBy$.next(w.CONDITIONS), this._listenToFilterHeaderChange(e, r), !0;
   }
   _disposePreviousModel() {
     var e;
     (e = this._filterByModel) == null || e.dispose(), this.filterByModel = null;
   }
 };
-Z = Qe([
-  Ce(0, T(re)),
-  Ce(1, T(Dr))
-], Z);
-let we = class extends de {
-  constructor(e, r, s, n, a) {
+q = Qe([
+  Te(0, T(ie)),
+  Te(1, T(Br))
+], q);
+let Le = class extends de {
+  constructor(e, r, n, s, a) {
     super();
-    p(this, "canApply$", me(!0));
-    p(this, "_conditionItem$");
-    p(this, "conditionItem$");
-    p(this, "_filterConditionFormParams$");
-    p(this, "filterConditionFormParams$");
-    this._filterModel = e, this.col = r, this._commandService = a, this._conditionItem$ = new V(s), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new V(n), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
+    v(this, "canApply$", me(!0));
+    v(this, "_conditionItem$");
+    v(this, "conditionItem$");
+    v(this, "_filterConditionFormParams$");
+    v(this, "filterConditionFormParams$");
+    this._filterModel = e, this.col = r, this._commandService = a, this._conditionItem$ = new Q(n), this.conditionItem$ = this._conditionItem$.asObservable(), this._filterConditionFormParams$ = new Q(s), this.filterConditionFormParams$ = this._filterConditionFormParams$.asObservable();
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -840,9 +840,9 @@ let we = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static fromFilterColumn(e, r, s, n) {
-    const [a, i] = m.testMappingFilterColumn(n == null ? void 0 : n.getColumnData());
-    return e.createInstance(we, r, s, a, i);
+  static fromFilterColumn(e, r, n, s) {
+    const [a, i] = m.testMappingFilterColumn(s == null ? void 0 : s.getColumnData());
+    return e.createInstance(Le, r, n, a, i);
   }
   get conditionItem() {
     return this._conditionItem$.getValue();
@@ -857,7 +857,7 @@ let we = class extends de {
     this.col += e;
   }
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -870,7 +870,7 @@ let we = class extends de {
   async apply() {
     if (this._disposed) return !1;
     const e = m.mapToFilterColumn(this.conditionItem, this.filterConditionFormParams);
-    return this._commandService.executeCommand(Q.id, {
+    return this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -882,7 +882,7 @@ let we = class extends de {
    * `IFilterConditionFormParams` and load default condition form params.
    */
   onPrimaryConditionChange(e) {
-    const r = m.ALL_CONDITIONS.find((s) => s.operator === e);
+    const r = m.ALL_CONDITIONS.find((n) => n.operator === e);
     if (!r)
       throw new Error(`[ByConditionsModel]: condition item not found for operator: ${e}!`);
     this._conditionItem$.next(r), this._filterConditionFormParams$.next(m.getInitialFormParams(e));
@@ -898,43 +898,43 @@ let we = class extends de {
   onConditionFormChange(e) {
     const r = { ...this.filterConditionFormParams, ...e };
     if (r.and !== !0 && delete r.and, typeof e.and < "u" || typeof e.operator1 < "u" || typeof e.operator2 < "u") {
-      const s = m.testMappingParams(r, this.conditionItem.numOfParameters);
-      this._conditionItem$.next(s);
+      const n = m.testMappingParams(r, this.conditionItem.numOfParameters);
+      this._conditionItem$.next(n);
     }
     this._filterConditionFormParams$.next(r);
   }
 };
-we = Qe([
-  Ce(4, j)
-], we);
-let Le = class extends de {
-  constructor(e, r, s, n, a) {
+Le = Qe([
+  Te(4, j)
+], Le);
+let Me = class extends de {
+  constructor(e, r, n, s, a) {
     super();
-    p(this, "_rawFilterItems$");
-    p(this, "rawFilterItems$");
-    p(this, "filterItems$");
-    p(this, "_filterItems", []);
-    p(this, "_treeMapCache");
-    p(this, "canApply$");
-    p(this, "_manuallyUpdateFilterItems$");
-    p(this, "_searchString$");
-    p(this, "searchString$");
-    this._filterModel = e, this.col = r, this._commandService = a, this._treeMapCache = n, this._searchString$ = new V(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new V(s), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Kr(), this.filterItems$ = qr(
-      Xr([
+    v(this, "_rawFilterItems$");
+    v(this, "rawFilterItems$");
+    v(this, "filterItems$");
+    v(this, "_filterItems", []);
+    v(this, "_treeMapCache");
+    v(this, "canApply$");
+    v(this, "_manuallyUpdateFilterItems$");
+    v(this, "_searchString$");
+    v(this, "searchString$");
+    this._filterModel = e, this.col = r, this._commandService = a, this._treeMapCache = s, this._searchString$ = new Q(""), this.searchString$ = this._searchString$.asObservable(), this._rawFilterItems$ = new Q(n), this.rawFilterItems$ = this._rawFilterItems$.asObservable(), this._manuallyUpdateFilterItems$ = new Xr(), this.filterItems$ = zr(
+      Jr([
         this._searchString$.pipe(
-          Ht(500, void 0, { leading: !0, trailing: !0 }),
-          Dt(void 0)
+          Bt(500, void 0, { leading: !0, trailing: !0 }),
+          Wt(void 0)
         ),
         this._rawFilterItems$
       ]).pipe(
         ce(([i, o]) => {
           if (!i) return o;
           const c = i.toLowerCase().split(/\s+/).filter((h) => !!h);
-          return jt(o, c);
+          return Yt(o, c);
         })
       ),
       this._manuallyUpdateFilterItems$
-    ).pipe(zr(1)), this.canApply$ = this.filterItems$.pipe(ce((i) => qe(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
+    ).pipe(ei(1)), this.canApply$ = this.filterItems$.pipe(ce((i) => ze(i).checked > 0)), this.disposeWithMe(this.filterItems$.subscribe((i) => this._filterItems = i));
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -946,40 +946,40 @@ let Le = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, s) {
-    const n = e.get(De), a = e.get(K), i = e.get(Pe, At.OPTIONAL), { unitId: o, subUnitId: l } = r, c = n.getUniverSheetInstance(o);
+  static async fromFilterColumn(e, r, n) {
+    const s = e.get(Be), a = e.get(X), i = e.get(we, wt.OPTIONAL), { unitId: o, subUnitId: l } = r, c = s.getUniverSheetInstance(o);
     if (!c) throw new Error(`[ByValuesModel]: Workbook not found for filter model with unitId: ${o}!`);
     const h = c == null ? void 0 : c.getSheetBySheetId(l);
     if (!h) throw new Error(`[ByValuesModel]: Worksheet not found for filter model with unitId: ${o} and subUnitId: ${l}!`);
-    const d = r.getRange(), C = s, v = r.getFilterColumn(s), _ = v == null ? void 0 : v.getColumnData().filters, S = new Set(_ == null ? void 0 : _.filters), N = !!(_ && _.blank), E = r.getFilteredOutRowsExceptCol(s), b = { ...d, startRow: d.startRow + 1, startColumn: C, endColumn: C };
-    let F, R;
+    const d = r.getRange(), C = n, f = r.getFilterColumn(n), _ = f == null ? void 0 : f.getColumnData().filters, S = new Set(_ == null ? void 0 : _.filters), E = !!(_ && _.blank), F = r.getFilteredOutRowsExceptCol(n), b = { ...d, startRow: d.startRow + 1, startColumn: C, endColumn: C };
+    let N, R;
     if (i) {
-      const w = await i.getFilterValues({
+      const L = await i.getFilterValues({
         unitId: o,
         subUnitId: l,
-        filteredOutRowsByOtherColumns: Array.from(E),
-        filterColumn: v,
+        filteredOutRowsByOtherColumns: Array.from(F),
+        filterColumn: f,
         filters: !!_,
-        blankChecked: N,
+        blankChecked: E,
         iterateRange: b,
         alreadyChecked: Array.from(S)
       });
-      F = w.filterTreeItems, R = w.filterTreeMapCache;
+      N = L.filterTreeItems, R = L.filterTreeMapCache;
     } else {
-      const w = Qt(
+      const L = jt(
         !!_,
         a,
         b,
         h,
-        E,
-        v,
+        F,
+        f,
         S,
-        N,
+        E,
         c.getStyles()
       );
-      F = w.filterTreeItems, R = w.filterTreeMapCache;
+      N = L.filterTreeItems, R = L.filterTreeMapCache;
     }
-    return e.createInstance(Le, r, s, F, R);
+    return e.createInstance(Me, r, n, N, R);
   }
   get rawFilterItems() {
     return this._rawFilterItems$.getValue();
@@ -1001,23 +1001,23 @@ let Le = class extends de {
   }
   onCheckAllToggled(e) {
     const r = Re.deepClone(this._filterItems);
-    r.forEach((s) => ge(s, e)), this._manuallyUpdateFilterItems(r);
+    r.forEach((n) => ge(n, e)), this._manuallyUpdateFilterItems(r);
   }
   /**
    * Toggle a filter item.
    */
   onFilterCheckToggled(e) {
-    const r = Re.deepClone(this._filterItems), s = ze(r, e.key);
-    if (!s)
+    const r = Re.deepClone(this._filterItems), n = et(r, e.key);
+    if (!n)
       return;
-    const n = Vt(s);
-    ge(s, !n), this._manuallyUpdateFilterItems(r);
+    const s = Gt(n);
+    ge(n, !s), this._manuallyUpdateFilterItems(r);
   }
   onFilterOnly(e) {
     const r = Re.deepClone(this._filterItems);
-    r.forEach((s) => ge(s, !1)), e.forEach((s) => {
-      const n = ze(r, s);
-      n && ge(n, !0);
+    r.forEach((n) => ge(n, !1)), e.forEach((n) => {
+      const s = et(r, n);
+      s && ge(s, !0);
     }), this._manuallyUpdateFilterItems(r);
   }
   _manuallyUpdateFilterItems(e) {
@@ -1026,7 +1026,7 @@ let Le = class extends de {
   // expose method here to let the panel change filter items
   // #region ByValuesModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1039,15 +1039,15 @@ let Le = class extends de {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = qe(this._filterItems), { checked: r, checkedItems: s } = e, n = this.rawFilterItems;
+    const e = ze(this._filterItems), { checked: r, checkedItems: n } = e, s = this.rawFilterItems;
     let a = 0;
-    for (const c of n)
+    for (const c of s)
       a += c.count;
     const i = r === 0, o = e.checked === a, l = { colId: this.col };
     if (i)
       throw new Error("[ByValuesModel]: no checked items!");
     if (o)
-      return this._commandService.executeCommand(Q.id, {
+      return this._commandService.executeCommand(V.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
@@ -1055,12 +1055,12 @@ let Le = class extends de {
       });
     {
       l.filters = {};
-      const c = s.filter((d) => d.key !== "empty");
+      const c = n.filter((d) => d.key !== "empty");
       c.length > 0 && (l.filters = {
         filters: c.flatMap((d) => d.originValues ? Array.from(d.originValues) : [d.title])
-      }), c.length !== s.length && (l.filters.blank = !0);
+      }), c.length !== n.length && (l.filters.blank = !0);
     }
-    return this._commandService.executeCommand(Q.id, {
+    return this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1069,18 +1069,18 @@ let Le = class extends de {
   }
   // #endregion
 };
-Le = Qe([
-  Ce(4, j)
-], Le);
+Me = Qe([
+  Te(4, j)
+], Me);
 let $e = class extends de {
-  constructor(e, r, s, n, a) {
+  constructor(e, r, n, s, a) {
     super();
-    p(this, "canApply$", me(!0));
-    p(this, "_cellFillColors$");
-    p(this, "cellFillColors$");
-    p(this, "_cellTextColors$");
-    p(this, "cellTextColors$");
-    this._filterModel = e, this.col = r, this._commandService = a, this._cellFillColors$ = new V(Array.from(s.values())), this.cellFillColors$ = this._cellFillColors$.asObservable(), this._cellTextColors$ = new V(Array.from(n.values())), this.cellTextColors$ = this._cellTextColors$.asObservable();
+    v(this, "canApply$", me(!0));
+    v(this, "_cellFillColors$");
+    v(this, "cellFillColors$");
+    v(this, "_cellTextColors$");
+    v(this, "cellTextColors$");
+    this._filterModel = e, this.col = r, this._commandService = a, this._cellFillColors$ = new Q(Array.from(n.values())), this.cellFillColors$ = this._cellFillColors$.asObservable(), this._cellTextColors$ = new Q(Array.from(s.values())), this.cellTextColors$ = this._cellTextColors$.asObservable();
   }
   /**
    * Create a model with targeting filter column. If there is not a filter column, the model would be created with
@@ -1092,30 +1092,30 @@ let $e = class extends de {
    *
    * @returns the model to control the panel's state
    */
-  static async fromFilterColumn(e, r, s) {
-    var b, F, R;
-    const n = e.get(De), { unitId: a, subUnitId: i } = r, o = n.getUniverSheetInstance(a);
+  static async fromFilterColumn(e, r, n) {
+    var b, N, R;
+    const s = e.get(Be), { unitId: a, subUnitId: i } = r, o = s.getUniverSheetInstance(a);
     if (!o) throw new Error(`[ByColorsModel]: Workbook not found for filter model with unitId: ${a}!`);
     const l = o == null ? void 0 : o.getSheetBySheetId(i);
     if (!l) throw new Error(`[ByColorsModel]: Worksheet not found for filter model with unitId: ${a} and subUnitId: ${i}!`);
-    const c = r.getRange(), h = s, d = (b = r.getFilterColumn(s)) == null ? void 0 : b.getColumnData().colorFilters, C = r.getFilteredOutRowsExceptCol(s), v = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), S = new Set((F = d == null ? void 0 : d.cellFillColors) != null ? F : []), N = /* @__PURE__ */ new Map(), E = new Set((R = d == null ? void 0 : d.cellTextColors) != null ? R : []);
-    for (const w of l.iterateByColumn(v, !1, !0)) {
-      const { row: X, col: se, value: ne } = w;
-      if (C.has(X))
+    const c = r.getRange(), h = n, d = (b = r.getFilterColumn(n)) == null ? void 0 : b.getColumnData().colorFilters, C = r.getFilteredOutRowsExceptCol(n), f = { ...c, startRow: c.startRow + 1, startColumn: h, endColumn: h }, _ = /* @__PURE__ */ new Map(), S = new Set((N = d == null ? void 0 : d.cellFillColors) != null ? N : []), E = /* @__PURE__ */ new Map(), F = new Set((R = d == null ? void 0 : d.cellTextColors) != null ? R : []);
+    for (const L of l.iterateByColumn(f, !1, !0)) {
+      const { row: G, col: Y, value: se } = L;
+      if (C.has(G))
         continue;
-      const D = l.getComposedCellStyleByCellData(X, se, ne);
-      if (D.bg && D.bg.rgb) {
-        const L = new mt(D.bg.rgb).toRgbString();
-        _.has(L) || _.set(L, { color: L, checked: S.has(L) });
+      const x = l.getComposedCellStyleByCellData(G, Y, se);
+      if (x.bg && x.bg.rgb) {
+        const A = new pt(x.bg.rgb).toRgbString();
+        _.has(A) || _.set(A, { color: A, checked: S.has(A) });
       } else
         _.set("default-fill-color", { color: null, checked: S.has(null) });
-      if (D.cl && D.cl.rgb) {
-        const L = new mt(D.cl.rgb).toRgbString();
-        N.has(L) || N.set(L, { color: L, checked: E.has(L) });
+      if (x.cl && x.cl.rgb) {
+        const A = new pt(x.cl.rgb).toRgbString();
+        E.has(A) || E.set(A, { color: A, checked: F.has(A) });
       } else
-        N.set("default-font-color", { color: vt, checked: E.has(vt) });
+        E.set("default-font-color", { color: gt, checked: F.has(gt) });
     }
-    return e.createInstance($e, r, s, _, N);
+    return e.createInstance($e, r, n, _, E);
   }
   get cellFillColors() {
     return this._cellFillColors$.getValue();
@@ -1132,7 +1132,7 @@ let $e = class extends de {
   // expose method here to let the panel change filter items
   // #region ByColorsModel apply methods
   clear() {
-    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(Q.id, {
+    return this._disposed ? Promise.resolve(!1) : this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
@@ -1140,32 +1140,32 @@ let $e = class extends de {
     });
   }
   onFilterCheckToggled(e, r = !0) {
-    const s = r ? this.cellFillColors : this.cellTextColors, n = [];
+    const n = r ? this.cellFillColors : this.cellTextColors, s = [];
     let a = !1;
-    for (let i = 0; i < s.length; i++) {
-      const o = s[i];
+    for (let i = 0; i < n.length; i++) {
+      const o = n[i];
       if (o.color === e.color) {
-        a = !0, n.push({
+        a = !0, s.push({
           color: o.color,
           checked: !o.checked
         });
         continue;
       }
-      n.push({
+      s.push({
         color: o.color,
         checked: o.checked
       });
     }
-    a && (this._resetColorsCheckedStatus(!r), r ? this._cellFillColors$.next([...n]) : this._cellTextColors$.next([...n]));
+    a && (this._resetColorsCheckedStatus(!r), r ? this._cellFillColors$.next([...s]) : this._cellTextColors$.next([...s]));
   }
   _resetColorsCheckedStatus(e = !0) {
-    const r = e ? this.cellFillColors : this.cellTextColors, s = [];
-    for (let n = 0; n < r.length; n++)
-      s.push({
-        color: r[n].color,
+    const r = e ? this.cellFillColors : this.cellTextColors, n = [];
+    for (let s = 0; s < r.length; s++)
+      n.push({
+        color: r[s].color,
         checked: !1
       });
-    e ? this._cellFillColors$.next([...s]) : this._cellTextColors$.next([...s]);
+    e ? this._cellFillColors$.next([...n]) : this._cellTextColors$.next([...n]);
   }
   /**
    * Apply the filter condition to the target filter column.
@@ -1173,70 +1173,70 @@ let $e = class extends de {
   async apply() {
     if (this._disposed)
       return !1;
-    const e = this.cellFillColors.filter((n) => n.checked).map((n) => n.color), r = this.cellTextColors.filter((n) => n.checked).map((n) => n.color);
+    const e = this.cellFillColors.filter((s) => s.checked).map((s) => s.color), r = this.cellTextColors.filter((s) => s.checked).map((s) => s.color);
     if (e.length === 0 && r.length === 0)
-      return this._commandService.executeCommand(Q.id, {
+      return this._commandService.executeCommand(V.id, {
         unitId: this._filterModel.unitId,
         subUnitId: this._filterModel.subUnitId,
         col: this.col,
         criteria: null
       });
-    const s = { colId: this.col };
-    return e.length > 0 ? s.colorFilters = {
+    const n = { colId: this.col };
+    return e.length > 0 ? n.colorFilters = {
       cellFillColors: e
-    } : r.length > 0 && (s.colorFilters = {
+    } : r.length > 0 && (n.colorFilters = {
       cellTextColors: r
-    }), this._commandService.executeCommand(Q.id, {
+    }), this._commandService.executeCommand(V.id, {
       unitId: this._filterModel.unitId,
       subUnitId: this._filterModel.subUnitId,
       col: this.col,
-      criteria: s
+      criteria: n
     });
   }
   // #endregion
 };
 $e = Qe([
-  Ce(4, j)
+  Te(4, j)
 ], $e);
-const ue = "FILTER_PANEL_OPENED", Me = {
+const ue = "FILTER_PANEL_OPENED", xe = {
   id: "sheet.operation.open-filter-panel",
-  type: Be.OPERATION,
+  type: We.OPERATION,
   handler: (t, e) => {
-    const r = t.get(We), s = t.get(q), n = t.get(Z);
-    t.get(j).syncExecuteCommand(Sr.id, { visible: !1 });
-    const { unitId: i, subUnitId: o, col: l } = e, c = s.getFilterModel(i, o);
-    return c ? (n.setupCol(c, l), r.getContextValue(ue) || r.setContextValue(ue, !0), !0) : !1;
+    const r = t.get(Ve), n = t.get(z), s = t.get(q);
+    t.get(j).syncExecuteCommand(Cr.id, { visible: !1 });
+    const { unitId: i, subUnitId: o, col: l } = e, c = n.getFilterModel(i, o);
+    return c ? (s.setupCol(c, l), r.getContextValue(ue) || r.setContextValue(ue, !0), !0) : !1;
   }
 }, Se = {
   id: "sheet.operation.close-filter-panel",
-  type: Be.OPERATION,
+  type: We.OPERATION,
   handler: (t) => {
-    const e = t.get(We), r = t.get(Z), s = t.get(Ar, At.OPTIONAL);
-    return e.getContextValue(ue) ? (e.setContextValue(ue, !1), s == null || s.focus(), r.terminate()) : !1;
+    const e = t.get(Ve), r = t.get(q), n = t.get(Pr, wt.OPTIONAL);
+    return e.getContextValue(ue) ? (e.setContextValue(ue, !1), n == null || n.focus(), r.terminate()) : !1;
   }
-}, Gt = {
+}, Zt = {
   id: "sheet.operation.apply-filter",
-  type: Be.OPERATION,
+  type: We.OPERATION,
   handler: (t, e) => {
     const { filterBy: r } = e;
-    return t.get(Z).changeFilterBy(r);
-  }
-}, Yt = "sheets-filter-ui.config", xe = {};
-var vi = Object.getOwnPropertyDescriptor, _i = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? vi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, ae = (t, e) => (r, s) => e(r, s, t);
+    return t.get(q).changeFilterBy(r);
+  }
+}, Kt = "sheets-filter-ui.config", Ue = {};
+var gi = Object.getOwnPropertyDescriptor, Si = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? gi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, ae = (t, e) => (r, n) => e(r, n, t);
 let he = class extends de {
-  constructor(t, e, r, s, n, a) {
-    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = s, this._injector = n, this._sheetsSelectionService = a, this._commandExecutedListener();
+  constructor(t, e, r, n, s, a) {
+    super(), this._sheetsFilterService = t, this._localeService = e, this._commandService = r, this._sheetPermissionCheckPermission = n, this._injector = s, this._sheetsSelectionService = a, this._commandExecutedListener();
   }
   _commandExecutedListener() {
     this.disposeWithMe(
       this._commandService.beforeCommandExecuted((t) => {
-        var e, r, s;
-        if (t.id === Ee.id) {
-          const n = this._injector.get(De), a = Qr(n);
+        var e, r, n;
+        if (t.id === Fe.id) {
+          const s = this._injector.get(Be), a = Qr(s);
           if (!a) return;
           const { unitId: i, subUnitId: o, worksheet: l } = a, c = (e = this._sheetsFilterService.getFilterModel(i, o)) == null ? void 0 : e.getRange();
           let h;
@@ -1249,7 +1249,7 @@ let he = class extends de {
             const d = (r = this._sheetsSelectionService.getCurrentLastSelection()) == null ? void 0 : r.range;
             if (d) {
               let C = { ...d };
-              C = d.startColumn === d.endColumn && d.startRow === d.endRow ? Vr(C, { left: !0, right: !0, up: !0, down: !0 }, l) : C, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+              C = d.startColumn === d.endColumn && d.startRow === d.endRow ? jr(C, { left: !0, right: !0, up: !0, down: !0 }, l) : C, h = this._sheetPermissionCheckPermission.permissionCheckWithRanges({
                 rangeTypes: [_e],
                 worksheetTypes: [ve, pe]
               }, [C], i, o);
@@ -1261,9 +1261,9 @@ let he = class extends de {
           }
           h || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr"));
         }
-        if (t.id === Me.id) {
-          const n = t.params, { unitId: a, subUnitId: i } = n, o = (s = this._sheetsFilterService.getFilterModel(a, i)) == null ? void 0 : s.getRange(), l = Re.deepClone(o);
-          l && (l.startColumn = n.col, l.endColumn = n.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
+        if (t.id === xe.id) {
+          const s = t.params, { unitId: a, subUnitId: i } = s, o = (n = this._sheetsFilterService.getFilterModel(a, i)) == null ? void 0 : n.getRange(), l = Re.deepClone(o);
+          l && (l.startColumn = s.col, l.endColumn = s.col, this._sheetPermissionCheckPermission.permissionCheckWithRanges({
             rangeTypes: [_e],
             worksheetTypes: [pe, ve]
           }, [l]) || this._sheetPermissionCheckPermission.blockExecuteWithoutPermission(this._localeService.t("permission.dialog.filterErr")));
@@ -1272,47 +1272,47 @@ let he = class extends de {
     );
   }
 };
-he = _i([
-  ae(0, T(q)),
-  ae(1, T(K)),
+he = Si([
+  ae(0, T(z)),
+  ae(1, T(X)),
   ae(2, j),
-  ae(3, T(Br)),
-  ae(4, T(re)),
-  ae(5, T(Wr))
+  ae(3, T(Wr)),
+  ae(4, T(ie)),
+  ae(5, T(Vr))
 ], he);
-const Y = 16, gi = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
-class Et {
-  static drawNoCriteria(e, r, s, n) {
-    e.save(), _t.drawWith(e, {
+const K = 16, Ci = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z");
+class Nt {
+  static drawNoCriteria(e, r, n, s) {
+    e.save(), St.drawWith(e, {
       radius: 2,
-      width: Y,
-      height: Y,
-      fill: n
-    }), e.lineCap = "square", e.strokeStyle = s, e.scale(r / Y, r / Y), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
+      width: K,
+      height: K,
+      fill: s
+    }), e.lineCap = "square", e.strokeStyle = n, e.scale(r / K, r / K), e.beginPath(), e.lineWidth = 1, e.lineCap = "round", e.moveTo(3, 4), e.lineTo(13, 4), e.moveTo(4.5, 8), e.lineTo(11.5, 8), e.moveTo(6, 12), e.lineTo(10, 12), e.stroke(), e.restore();
   }
-  static drawHasCriteria(e, r, s, n) {
-    e.save(), _t.drawWith(e, {
+  static drawHasCriteria(e, r, n, s) {
+    e.save(), St.drawWith(e, {
       radius: 2,
-      width: Y,
-      height: Y,
-      fill: n
-    }), e.scale(r / Y, r / Y), e.fillStyle = s, e.fill(gi), e.restore();
+      width: K,
+      height: K,
+      fill: s
+    }), e.scale(r / K, r / K), e.fillStyle = n, e.fill(Ci), e.restore();
   }
 }
-var Si = Object.getOwnPropertyDescriptor, Ci = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Si(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, Ze = (t, e) => (r, s) => e(r, s, t);
-const W = 16, Ie = 1;
-let Je = class extends Hr {
-  constructor(e, r, s, n, a) {
+var Ti = Object.getOwnPropertyDescriptor, Ei = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Ti(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, qe = (t, e) => (r, n) => e(r, n, t);
+const B = 16, Ce = 1;
+let tt = class extends Dr {
+  constructor(e, r, n, s, a) {
     super(e, r);
-    p(this, "_cellWidth", 0);
-    p(this, "_cellHeight", 0);
-    p(this, "_filterParams");
-    p(this, "_hovered", !1);
-    this._contextService = s, this._commandService = n, this._themeService = a, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((i) => this.onPointerDown(i)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
+    v(this, "_cellWidth", 0);
+    v(this, "_cellHeight", 0);
+    v(this, "_filterParams");
+    v(this, "_hovered", !1);
+    this._contextService = n, this._commandService = s, this._themeService = a, this.setShapeProps(r), this.onPointerDown$.subscribeEvent((i) => this.onPointerDown(i)), this.onPointerEnter$.subscribeEvent(() => this.onPointerEnter()), this.onPointerLeave$.subscribeEvent(() => this.onPointerLeave());
   }
   setShapeProps(e) {
     typeof e.cellHeight < "u" && (this._cellHeight = e.cellHeight), typeof e.cellWidth < "u" && (this._cellWidth = e.cellWidth), typeof e.filterParams < "u" && (this._filterParams = e.filterParams), this.transformByState({
@@ -1321,21 +1321,21 @@ let Je = class extends Hr {
     });
   }
   _draw(e) {
-    const r = this._cellHeight, s = this._cellWidth, n = W - s, a = W - r;
+    const r = this._cellHeight, n = this._cellWidth, s = B - n, a = B - r;
     e.save();
     const i = new Path2D();
-    i.rect(n, a, s, r), e.clip(i);
+    i.rect(s, a, n, r), e.clip(i);
     const { hasCriteria: o } = this._filterParams, l = this._themeService.getColorFromTheme("primary.600"), c = this._hovered ? this._themeService.getColorFromTheme("gray.50") : "rgba(255, 255, 255, 1.0)";
-    o ? Et.drawHasCriteria(e, W, l, c) : Et.drawNoCriteria(e, W, l, c), e.restore();
+    o ? Nt.drawHasCriteria(e, B, l, c) : Nt.drawNoCriteria(e, B, l, c), e.restore();
   }
   onPointerDown(e) {
     if (e.button === 2)
       return;
-    const { col: r, unitId: s, subUnitId: n } = this._filterParams;
-    this._contextService.getContextValue(ue) || !this._commandService.hasCommand(Me.id) || setTimeout(() => {
-      this._commandService.executeCommand(Me.id, {
-        unitId: s,
-        subUnitId: n,
+    const { col: r, unitId: n, subUnitId: s } = this._filterParams;
+    this._contextService.getContextValue(ue) || !this._commandService.hasCommand(xe.id) || setTimeout(() => {
+      this._commandService.executeCommand(xe.id, {
+        unitId: n,
+        subUnitId: s,
         col: r
       });
     }, 200);
@@ -1347,65 +1347,96 @@ let Je = class extends Hr {
     this._hovered = !1, this.makeDirty(!0);
   }
 };
-Je = Ci([
-  Ze(2, We),
-  Ze(3, j),
-  Ze(4, T(Pt))
-], Je);
-var Ti = Object.getOwnPropertyDescriptor, Ei = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? Ti(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, ee = (t, e) => (r, s) => e(r, s, t);
-const Ni = 1e3, Fi = 5e3;
-let et = class extends wt {
-  constructor(e, r, s, n, a, i, o, l) {
+tt = Ei([
+  qe(2, Ve),
+  qe(3, j),
+  qe(4, T(Lt))
+], tt);
+var Fi = Object.getOwnPropertyDescriptor, Ni = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Fi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, te = (t, e) => (r, n) => e(r, n, t);
+const yi = 1e3, Oi = 5e3;
+function Ii(t, e, r, n) {
+  switch (n) {
+    case Ae.TOP:
+      return t + Ce;
+    case Ae.MIDDLE:
+      return t + Math.max(0, (r - B) / 2);
+    case Ae.BOTTOM:
+    default:
+      return e - B - Ce;
+  }
+}
+let rt = class extends Mt {
+  constructor(e, r, n, s, a, i, o, l) {
     super();
-    p(this, "_filterRangeShape", null);
-    p(this, "_buttonRenderDisposable", null);
-    p(this, "_filterButtonShapes", []);
-    this._context = e, this._injector = r, this._sheetSkeletonManagerService = s, this._sheetsFilterService = n, this._themeService = a, this._sheetInterceptorService = i, this._commandService = o, this._selectionRenderService = l, this._initRenderer();
+    v(this, "_filterRangeShape", null);
+    v(this, "_buttonRenderDisposable", null);
+    v(this, "_filterButtonShapes", []);
+    this._context = e, this._injector = r, this._sheetSkeletonManagerService = n, this._sheetsFilterService = s, this._themeService = a, this._sheetInterceptorService = i, this._commandService = o, this._selectionRenderService = l, this._initRenderer();
   }
   dispose() {
     super.dispose(), this._disposeRendering();
   }
   _initRenderer() {
     this._sheetSkeletonManagerService.currentSkeleton$.pipe(
-      ot((e) => {
+      at((e) => {
         var o, l;
         if (!e) return me(null);
-        const { unit: r, unitId: s } = this._context, n = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", a = (l = this._sheetsFilterService.getFilterModel(s, n)) != null ? l : void 0, i = () => ({
-          unitId: s,
-          worksheetId: n,
+        const { unit: r, unitId: n } = this._context, s = ((o = r.getActiveSheet()) == null ? void 0 : o.getSheetId()) || "", a = (l = this._sheetsFilterService.getFilterModel(n, s)) != null ? l : void 0, i = () => ({
+          unitId: n,
+          worksheetId: s,
           filterModel: a,
           range: a == null ? void 0 : a.getRange(),
           skeleton: e.skeleton
         });
-        return ar(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
-          Jr(
+        return cr(this._commandService.onCommandExecuted.bind(this._commandService)).pipe(
+          ti(
             ([c]) => {
               var h;
-              return c.type === Be.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (dr.has(c.id) || c.id === Gr.id);
+              return c.type === We.MUTATION && ((h = c.params) == null ? void 0 : h.unitId) === r.getUnitId() && (mr.has(c.id) || c.id === Yr.id);
             }
           ),
-          Ht(20, void 0, { leading: !1, trailing: !0 }),
+          Bt(20, void 0, { leading: !1, trailing: !0 }),
           ce(i),
-          Dt(i())
+          Wt(i())
           // must trigger once
         );
       }),
-      ei(this.dispose$)
+      ri(this.dispose$)
     ).subscribe((e) => {
       this._disposeRendering(), !(!e || !e.range) && (this._renderRange(e.range, e.skeleton), this._renderButtons(e));
     });
   }
+  _initCommandExecuted() {
+    this.disposeWithMe(
+      this._commandService.onCommandExecuted((e) => {
+        var l, c;
+        if (e.id !== Zr.id)
+          return;
+        const { unit: r, unitId: n } = this._context, s = ((l = r.getActiveSheet()) == null ? void 0 : l.getSheetId()) || "", a = this._sheetSkeletonManagerService.getCurrentSkeleton(), i = (c = this._sheetsFilterService.getFilterModel(n, s)) != null ? c : void 0;
+        if (!a)
+          return;
+        const o = {
+          unitId: n,
+          worksheetId: s,
+          filterModel: i,
+          range: i == null ? void 0 : i.getRange(),
+          skeleton: a
+        };
+        this._disposeRendering(), !(!o || !o.range) && (this._renderRange(o.range, o.skeleton), this._renderButtons(o));
+      })
+    );
+  }
   _renderRange(e, r) {
-    const { scene: s } = this._context, { rowHeaderWidth: n, columnHeaderHeight: a } = r, i = this._filterRangeShape = new Er(
-      s,
-      Ni,
+    const { scene: n } = this._context, { rowHeaderWidth: s, columnHeaderHeight: a } = r, i = this._filterRangeShape = new Fr(
+      n,
+      yi,
       this._themeService,
       {
-        rowHeaderWidth: n,
+        rowHeaderWidth: s,
         columnHeaderHeight: a,
         enableAutoFill: !1,
         highlightHeader: !1
@@ -1415,39 +1446,41 @@ let et = class extends wt {
       primary: null,
       style: { fill: "rgba(0, 0, 0, 0.0)" }
     }, r);
-    i.updateRangeBySelectionWithCoord(l), i.setEvent(!1), s.makeDirty(!0);
+    i.updateRangeBySelectionWithCoord(l), i.setEvent(!1), n.makeDirty(!0);
   }
   _renderButtons(e) {
-    const { range: r, filterModel: s, unitId: n, skeleton: a, worksheetId: i } = e, { scene: o } = this._context;
-    this._interceptCellContent(n, i, e.range);
-    const { startColumn: l, endColumn: c, startRow: h } = r;
-    for (let d = l; d <= c; d++) {
-      const C = `sheets-filter-button-${d}`, v = Fr(h, d, o, a), { startX: _, startY: S, endX: N, endY: E } = v, b = N - _, F = E - S;
-      if (F <= Ie || b <= Ie)
+    const { range: r, filterModel: n, unitId: s, skeleton: a, worksheetId: i } = e, { unit: o, scene: l } = this._context, c = o.getSheetBySheetId(i);
+    if (!c)
+      return;
+    this._interceptCellContent(s, i, e.range);
+    const { startColumn: h, endColumn: d, startRow: C } = r;
+    for (let f = h; f <= d; f++) {
+      const _ = `sheets-filter-button-${f}`, S = yr(C, f, l, a), E = c.getCellStyle(C, f), F = (E == null ? void 0 : E.vt) || Ae.BOTTOM, { startX: b, startY: N, endX: R, endY: L } = S, G = R - b, Y = L - N;
+      if (Y <= Ce || G <= Ce)
         continue;
-      const R = !!s.getFilterColumn(d), w = N - W - Ie, X = E - W - Ie, se = {
-        left: w,
-        top: X,
-        height: W,
-        width: W,
-        zIndex: Fi,
-        cellHeight: F,
-        cellWidth: b,
-        filterParams: { unitId: n, subUnitId: i, col: d, hasCriteria: R }
-      }, ne = this._injector.createInstance(Je, C, se);
-      this._filterButtonShapes.push(ne);
+      const se = !!n.getFilterColumn(f), x = R - B - Ce, A = Ii(N, L, Y, F), P = {
+        left: x,
+        top: A,
+        height: B,
+        width: B,
+        zIndex: Oi,
+        cellHeight: Y,
+        cellWidth: G,
+        filterParams: { unitId: s, subUnitId: i, col: f, hasCriteria: se }
+      }, je = this._injector.createInstance(tt, _, P);
+      this._filterButtonShapes.push(je);
     }
-    o.addObjects(this._filterButtonShapes), o.makeDirty();
+    l.addObjects(this._filterButtonShapes), l.makeDirty();
   }
-  _interceptCellContent(e, r, s) {
-    const { startRow: n, startColumn: a, endColumn: i } = s;
-    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Yr.CELL_CONTENT, {
-      effect: cr.Style,
+  _interceptCellContent(e, r, n) {
+    const { startRow: s, startColumn: a, endColumn: i } = n;
+    this._buttonRenderDisposable = this._sheetInterceptorService.intercept(Kr.CELL_CONTENT, {
+      effect: ur.Style,
       handler: (o, l, c) => {
-        const { row: h, col: d, unitId: C, subUnitId: v } = l;
-        return C !== e || v !== r || h !== n || d < a || d > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
+        const { row: h, col: d, unitId: C, subUnitId: f } = l;
+        return C !== e || f !== r || h !== s || d < a || d > i || ((!o || o === l.rawData) && (o = { ...l.rawData }), o.fontRenderExtension = {
           ...o == null ? void 0 : o.fontRenderExtension,
-          rightOffset: W
+          rightOffset: B
         }), c(o);
       },
       priority: 10
@@ -1455,161 +1488,161 @@ let et = class extends wt {
   }
   _disposeRendering() {
     var e, r;
-    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((s) => s.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
+    (e = this._filterRangeShape) == null || e.dispose(), this._filterButtonShapes.forEach((n) => n.dispose()), (r = this._buttonRenderDisposable) == null || r.dispose(), this._filterRangeShape = null, this._buttonRenderDisposable = null, this._filterButtonShapes = [];
   }
 };
-et = Ei([
-  ee(1, T(re)),
-  ee(2, T(Cr)),
-  ee(3, T(q)),
-  ee(4, T(Pt)),
-  ee(5, T(jr)),
-  ee(6, j),
-  ee(7, Tr)
-], et);
-var yi = Object.getOwnPropertyDescriptor, Oi = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? yi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, Nt = (t, e) => (r, s) => e(r, s, t);
-let Te = class extends wt {
+rt = Ni([
+  te(1, T(ie)),
+  te(2, T(Tr)),
+  te(3, T(z)),
+  te(4, T(Lt)),
+  te(5, T(Gr)),
+  te(6, j),
+  te(7, Er)
+], rt);
+var bi = Object.getOwnPropertyDescriptor, Ri = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? bi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, yt = (t, e) => (r, n) => e(r, n, t);
+let Ee = class extends Mt {
   constructor(t, e) {
     super(), this._renderManagerService = t, this._sheetsRenderService = e, [
-      mr,
       fr,
       pr,
-      vr
+      vr,
+      _r
     ].forEach((r) => this.disposeWithMe(this._sheetsRenderService.registerSkeletonChangingMutations(r.id))), this.disposeWithMe(this._renderManagerService.registerRenderModule(
-      ie.UNIVER_SHEET,
-      [et]
+      ne.UNIVER_SHEET,
+      [rt]
     ));
   }
 };
-Te = Oi([
-  Nt(0, kt),
-  Nt(1, T(Ut))
-], Te);
-var Ii = Object.defineProperty, bi = Object.getOwnPropertyDescriptor, Ri = (t, e, r) => e in t ? Ii(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Ai = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? bi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, Ft = (t, e) => (r, s) => e(r, s, t), Zt = (t, e, r) => Ri(t, typeof e != "symbol" ? e + "" : e, r);
-const Pi = "SHEET_FILTER_UI_PLUGIN";
-let Ue = class extends tt {
-  constructor(t = xe, e, r) {
+Ee = Ri([
+  yt(0, Dt),
+  yt(1, T(Ht))
+], Ee);
+var Ai = Object.defineProperty, Pi = Object.getOwnPropertyDescriptor, wi = (t, e, r) => e in t ? Ai(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, Li = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? Pi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, Ot = (t, e) => (r, n) => e(r, n, t), qt = (t, e, r) => wi(t, typeof e != "symbol" ? e + "" : e, r);
+const Mi = "SHEET_FILTER_UI_PLUGIN";
+let ke = class extends it {
+  constructor(t = Ue, e, r) {
     super(), this._config = t, this._injector = e, this._configService = r;
-    const { menu: s, ...n } = Mt(
+    const { menu: n, ...s } = Ut(
       {},
-      xe,
+      Ue,
       this._config
     );
-    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Yt, n);
+    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Kt, s);
   }
   onStarting() {
     [
       [he],
-      [Te]
+      [Ee]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._injector.get(he);
   }
   onRendered() {
-    this._injector.get(Te);
+    this._injector.get(Ee);
   }
 };
-Zt(Ue, "type", ie.UNIVER_SHEET);
-Zt(Ue, "pluginName", Pi);
-Ue = Ai([
-  Lt(xt),
-  Ft(1, T(re)),
-  Ft(2, $t)
-], Ue);
-var M = function() {
-  return M = Object.assign || function(t) {
-    for (var e, r = 1, s = arguments.length; r < s; r++) {
+qt(ke, "type", ne.UNIVER_SHEET);
+qt(ke, "pluginName", Mi);
+ke = Li([
+  $t(kt),
+  Ot(1, T(ie)),
+  Ot(2, xt)
+], ke);
+var $ = function() {
+  return $ = Object.assign || function(t) {
+    for (var e, r = 1, n = arguments.length; r < n; r++) {
       e = arguments[r];
-      for (var n in e) Object.prototype.hasOwnProperty.call(e, n) && (t[n] = e[n]);
+      for (var s in e) Object.prototype.hasOwnProperty.call(e, s) && (t[s] = e[s]);
     }
     return t;
-  }, M.apply(this, arguments);
-}, wi = function(t, e) {
+  }, $.apply(this, arguments);
+}, $i = function(t, e) {
   var r = {};
-  for (var s in t) Object.prototype.hasOwnProperty.call(t, s) && e.indexOf(s) < 0 && (r[s] = t[s]);
+  for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (r[n] = t[n]);
   if (t != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var n = 0, s = Object.getOwnPropertySymbols(t); n < s.length; n++)
-      e.indexOf(s[n]) < 0 && Object.prototype.propertyIsEnumerable.call(t, s[n]) && (r[s[n]] = t[s[n]]);
+    for (var s = 0, n = Object.getOwnPropertySymbols(t); s < n.length; s++)
+      e.indexOf(n[s]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[s]) && (r[n[s]] = t[n[s]]);
   return r;
-}, ye = Ne(function(t, e) {
-  var r = t.icon, s = t.id, n = t.className, a = t.extend, i = wi(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(s, " ").concat(n || "").trim(), l = ci("_".concat(Mi()));
-  return Kt(r, "".concat(s), { defIds: r.defIds, idSuffix: l.current }, M({ ref: e, className: o }, i), a);
+}, Oe = Ne(function(t, e) {
+  var r = t.icon, n = t.id, s = t.className, a = t.extend, i = $i(t, ["icon", "id", "className", "extend"]), o = "univerjs-icon univerjs-icon-".concat(n, " ").concat(s || "").trim(), l = hi("_".concat(ki()));
+  return Xt(r, "".concat(n), { defIds: r.defIds, idSuffix: l.current }, $({ ref: e, className: o }, i), a);
 });
-function Kt(t, e, r, s, n) {
-  return Fe(t.tag, M(M({ key: e }, Li(t, r, n)), s), ($i(t, r).children || []).map(function(a, i) {
-    return Kt(a, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, n);
+function Xt(t, e, r, n, s) {
+  return ye(t.tag, $($({ key: e }, xi(t, r, s)), n), (Ui(t, r).children || []).map(function(a, i) {
+    return Xt(a, "".concat(e, "-").concat(t.tag, "-").concat(i), r, void 0, s);
   }));
 }
-function Li(t, e, r) {
-  var s = M({}, t.attrs);
-  r != null && r.colorChannel1 && s.fill === "colorChannel1" && (s.fill = r.colorChannel1), t.tag === "mask" && s.id && (s.id = s.id + e.idSuffix), Object.entries(s).forEach(function(a) {
+function xi(t, e, r) {
+  var n = $({}, t.attrs);
+  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), t.tag === "mask" && n.id && (n.id = n.id + e.idSuffix), Object.entries(n).forEach(function(a) {
     var i = a[0], o = a[1];
-    i === "mask" && typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+    i === "mask" && typeof o == "string" && (n[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   });
-  var n = e.defIds;
-  return !n || n.length === 0 || (t.tag === "use" && s["xlink:href"] && (s["xlink:href"] = s["xlink:href"] + e.idSuffix), Object.entries(s).forEach(function(a) {
+  var s = e.defIds;
+  return !s || s.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(a) {
     var i = a[0], o = a[1];
-    typeof o == "string" && (s[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), s;
+    typeof o == "string" && (n[i] = o.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), n;
 }
-function $i(t, e) {
-  var r, s = e.defIds;
-  return !s || s.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? M(M({}, t), { children: t.children.map(function(n) {
-    return typeof n.attrs.id == "string" && s && s.includes(n.attrs.id) ? M(M({}, n), { attrs: M(M({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
+function Ui(t, e) {
+  var r, n = e.defIds;
+  return !n || n.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? $($({}, t), { children: t.children.map(function(s) {
+    return typeof s.attrs.id == "string" && n && n.includes(s.attrs.id) ? $($({}, s), { attrs: $($({}, s.attrs), { id: s.attrs.id + e.idSuffix }) }) : s;
   }) }) : t;
 }
-function Mi() {
+function ki() {
   return Math.random().toString(36).substring(2, 8);
 }
-ye.displayName = "UniverIcon";
-var xi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 20 20", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M10 1.05957C10.356 1.05957 10.6816 1.26162 10.8408 1.58008L18.8408 17.5801L18.8799 17.668C19.0486 18.1134 18.8551 18.6232 18.4199 18.8408C17.9557 19.0727 17.3913 18.8841 17.1592 18.4199L10 4.10156L2.84082 18.4199C2.60871 18.8841 2.04434 19.0727 1.58008 18.8408C1.11587 18.6087 0.92731 18.0443 1.15918 17.5801L9.15918 1.58008C9.31841 1.26162 9.64395 1.05957 10 1.05957Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M15.3337 11.7261L15.4294 11.731C15.9035 11.779 16.2732 12.1798 16.2732 12.6665C16.2732 13.1532 15.9035 13.554 15.4294 13.602L15.3337 13.6069H4.66675C4.1476 13.6069 3.72632 13.1856 3.72632 12.6665C3.72632 12.1474 4.1476 11.7261 4.66675 11.7261H15.3337Z" } }] }, qt = Ne(function(t, e) {
-  return Fe(ye, Object.assign({}, t, {
+Oe.displayName = "UniverIcon";
+var Hi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 20 20", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M10 1.05957C10.356 1.05957 10.6816 1.26162 10.8408 1.58008L18.8408 17.5801L18.8799 17.668C19.0486 18.1134 18.8551 18.6232 18.4199 18.8408C17.9557 19.0727 17.3913 18.8841 17.1592 18.4199L10 4.10156L2.84082 18.4199C2.60871 18.8841 2.04434 19.0727 1.58008 18.8408C1.11587 18.6087 0.92731 18.0443 1.15918 17.5801L9.15918 1.58008C9.31841 1.26162 9.64395 1.05957 10 1.05957Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M15.3337 11.7261L15.4294 11.731C15.9035 11.779 16.2732 12.1798 16.2732 12.6665C16.2732 13.1532 15.9035 13.554 15.4294 13.602L15.3337 13.6069H4.66675C4.1476 13.6069 3.72632 13.1856 3.72632 12.6665C3.72632 12.1474 4.1476 11.7261 4.66675 11.7261H15.3337Z" } }] }, zt = Ne(function(t, e) {
+  return ye(Oe, Object.assign({}, t, {
     id: "a-icon",
     ref: e,
-    icon: xi
+    icon: Hi
   }));
 });
-qt.displayName = "AIcon";
-var Ui = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 20 20", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M17.0596 10C17.0596 6.10087 13.8992 2.94043 10 2.94043C6.10087 2.94043 2.94043 6.10087 2.94043 10C2.94043 13.8992 6.10087 17.0596 10 17.0596C13.8992 17.0596 17.0596 13.8992 17.0596 10ZM18.9404 10C18.9404 14.9374 14.9374 18.9404 10 18.9404C5.06257 18.9404 1.05957 14.9374 1.05957 10C1.05957 5.06257 5.06257 1.05957 10 1.05957C14.9374 1.05957 18.9404 5.06257 18.9404 10Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.29492 4.13476C4.63911 3.79057 5.1845 3.76906 5.55371 4.07031L5.625 4.13476L16.0244 14.5352L16.0889 14.6064C16.3902 14.9757 16.3686 15.52 16.0244 15.8643C15.6573 16.2313 15.0624 16.2313 14.6953 15.8643L4.29492 5.46484L4.23047 5.39355C3.92922 5.02434 3.95073 4.47895 4.29492 4.13476Z" } }] }, Xt = Ne(function(t, e) {
-  return Fe(ye, Object.assign({}, t, {
+zt.displayName = "AIcon";
+var Di = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 20 20", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M17.0596 10C17.0596 6.10087 13.8992 2.94043 10 2.94043C6.10087 2.94043 2.94043 6.10087 2.94043 10C2.94043 13.8992 6.10087 17.0596 10 17.0596C13.8992 17.0596 17.0596 13.8992 17.0596 10ZM18.9404 10C18.9404 14.9374 14.9374 18.9404 10 18.9404C5.06257 18.9404 1.05957 14.9374 1.05957 10C1.05957 5.06257 5.06257 1.05957 10 1.05957C14.9374 1.05957 18.9404 5.06257 18.9404 10Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M4.29492 4.13476C4.63911 3.79057 5.1845 3.76906 5.55371 4.07031L5.625 4.13476L16.0244 14.5352L16.0889 14.6064C16.3902 14.9757 16.3686 15.52 16.0244 15.8643C15.6573 16.2313 15.0624 16.2313 14.6953 15.8643L4.29492 5.46484L4.23047 5.39355C3.92922 5.02434 3.95073 4.47895 4.29492 4.13476Z" } }] }, Jt = Ne(function(t, e) {
+  return ye(Oe, Object.assign({}, t, {
     id: "ban-icon",
     ref: e,
-    icon: Ui
+    icon: Di
   }));
 });
-Xt.displayName = "BanIcon";
-var ki = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, zt = Ne(function(t, e) {
-  return Fe(ye, Object.assign({}, t, {
+Jt.displayName = "BanIcon";
+var Bi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 17 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M3.32182 2.60967C2.98161 2.60967 2.79671 3.0074 3.01601 3.2675L6.85819 7.8246C6.94943 7.93282 6.99947 8.06981 6.99947 8.21136V12.7338C6.99947 12.898 7.0998 13.0455 7.2525 13.1058L8.73833 13.6928C9.00085 13.7965 9.28531 13.6031 9.28531 13.3208V8.21136C9.28531 8.06981 9.33535 7.93282 9.42659 7.8246L13.2688 3.2675C13.4881 3.0074 13.3032 2.60967 12.963 2.60967H3.32182ZM2.09858 4.04101C1.22139 3.0006 1.96097 1.40967 3.32182 1.40967H12.963C14.3238 1.40967 15.0634 3.0006 14.1862 4.04101L10.4853 8.43054V13.3208C10.4853 14.4498 9.34747 15.2237 8.29742 14.8089L6.81158 14.2219C6.20078 13.9806 5.79947 13.3905 5.79947 12.7338V8.43054L2.09858 4.04101Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, er = Ne(function(t, e) {
+  return ye(Oe, Object.assign({}, t, {
     id: "filter-icon",
     ref: e,
-    icon: ki
+    icon: Bi
   }));
 });
-zt.displayName = "FilterIcon";
-var Hi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM11.7245 6.42417C11.9588 6.18985 11.9588 5.80995 11.7245 5.57564C11.4901 5.34132 11.1102 5.34132 10.8759 5.57564L7.3002 9.15137L5.72446 7.57564C5.49014 7.34132 5.11025 7.34132 4.87593 7.57564C4.64162 7.80995 4.64162 8.18985 4.87593 8.42417L6.87593 10.4242C7.11025 10.6585 7.49014 10.6585 7.72446 10.4242L11.7245 6.42417Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Jt = Ne(function(t, e) {
-  return Fe(ye, Object.assign({}, t, {
+er.displayName = "FilterIcon";
+var Wi = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", fill: "none", viewBox: "0 0 16 16", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM11.7245 6.42417C11.9588 6.18985 11.9588 5.80995 11.7245 5.57564C11.4901 5.34132 11.1102 5.34132 10.8759 5.57564L7.3002 9.15137L5.72446 7.57564C5.49014 7.34132 5.11025 7.34132 4.87593 7.57564C4.64162 7.80995 4.64162 8.18985 4.87593 8.42417L6.87593 10.4242C7.11025 10.6585 7.49014 10.6585 7.72446 10.4242L11.7245 6.42417Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, tr = Ne(function(t, e) {
+  return ye(Oe, Object.assign({}, t, {
     id: "success-icon",
     ref: e,
-    icon: Hi
+    icon: Wi
   }));
 });
-Jt.displayName = "SuccessIcon";
-function Di(t) {
-  const { model: e } = t, r = te(K), s = H(e.cellFillColors$, [], !0), n = H(e.cellTextColors$, [], !0), a = U((o) => {
+tr.displayName = "SuccessIcon";
+function Vi(t) {
+  const { model: e } = t, r = re(X), n = D(e.cellFillColors$, [], !0), s = D(e.cellTextColors$, [], !0), a = k((o) => {
     e.onFilterCheckToggled(o);
-  }, [e]), i = U((o) => {
+  }, [e]), i = k((o) => {
     e.onFilterCheckToggled(o, !1);
   }, [e]);
-  return /* @__PURE__ */ f(
+  return /* @__PURE__ */ p(
     "div",
     {
       "data-u-comp": "sheets-filter-panel-colors-container",
@@ -1618,40 +1651,40 @@ function Di(t) {
         "div",
         {
           "data-u-comp": "sheets-filter-panel",
-          className: Ae("univer-mt-2 univer-box-border univer-flex univer-h-[300px] univer-flex-grow univer-flex-col univer-gap-4 univer-overflow-auto univer-rounded-md univer-px-2 univer-py-2.5", lt),
+          className: Pe("univer-mt-2 univer-box-border univer-flex univer-h-[300px] univer-flex-grow univer-flex-col univer-gap-4 univer-overflow-auto univer-rounded-md univer-px-2 univer-py-2.5", ct),
           children: [
-            s.length > 1 && /* @__PURE__ */ I("div", { children: [
-              /* @__PURE__ */ f(
+            n.length > 1 && /* @__PURE__ */ I("div", { children: [
+              /* @__PURE__ */ p(
                 "div",
                 {
                   className: "univer-mb-2 univer-text-sm univer-text-gray-900 dark:!univer-text-white",
                   children: r.t("sheets-filter.panel.filter-by-cell-fill-color")
                 }
               ),
-              /* @__PURE__ */ f(
+              /* @__PURE__ */ p(
                 "div",
                 {
                   className: "univer-grid univer-grid-cols-8 univer-items-center univer-justify-start univer-gap-2",
-                  children: s.map((o, l) => /* @__PURE__ */ I(
+                  children: n.map((o, l) => /* @__PURE__ */ I(
                     "div",
                     {
                       className: "univer-relative univer-h-6 univer-w-6",
                       onClick: () => a(o),
                       children: [
-                        o.color ? /* @__PURE__ */ f(
+                        o.color ? /* @__PURE__ */ p(
                           "button",
                           {
                             type: "button",
-                            className: Ae("univer-box-border univer-h-6 univer-w-6 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"),
+                            className: Pe("univer-box-border univer-h-6 univer-w-6 univer-cursor-pointer univer-rounded-full univer-border univer-border-solid univer-border-transparent univer-bg-gray-300 univer-transition-shadow hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"),
                             style: { backgroundColor: o.color }
                           }
-                        ) : /* @__PURE__ */ f(
-                          Xt,
+                        ) : /* @__PURE__ */ p(
+                          Jt,
                           {
                             className: "univer-h-6 univer-w-6 univer-cursor-pointer univer-rounded-full hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white"
                           }
                         ),
-                        o.checked && /* @__PURE__ */ f(yt, {})
+                        o.checked && /* @__PURE__ */ p(It, {})
                       ]
                     },
                     `sheets-filter-cell-fill-color-${l}`
@@ -1659,32 +1692,32 @@ function Di(t) {
                 }
               )
             ] }),
-            n.length > 1 && /* @__PURE__ */ I("div", { children: [
-              /* @__PURE__ */ f(
+            s.length > 1 && /* @__PURE__ */ I("div", { children: [
+              /* @__PURE__ */ p(
                 "div",
                 {
                   className: "univer-mb-2 univer-text-sm univer-text-gray-900 dark:!univer-text-white",
                   children: r.t("sheets-filter.panel.filter-by-cell-text-color")
                 }
               ),
-              /* @__PURE__ */ f(
+              /* @__PURE__ */ p(
                 "div",
                 {
                   className: "univer-grid univer-grid-cols-8 univer-items-center univer-justify-start univer-gap-2",
-                  children: n.map((o, l) => /* @__PURE__ */ I(
+                  children: s.map((o, l) => /* @__PURE__ */ I(
                     "div",
                     {
                       className: "univer-relative univer-h-6 univer-w-6",
                       onClick: () => i(o),
                       children: [
-                        /* @__PURE__ */ f(
+                        /* @__PURE__ */ p(
                           "div",
                           {
                             className: "univer-box-border univer-flex univer-h-full univer-w-full univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-border univer-border-solid univer-border-[rgba(13,13,13,0.06)] univer-p-0.5 hover:univer-ring-2 hover:univer-ring-offset-2 hover:univer-ring-offset-white dark:!univer-border-[rgba(255,255,255,0.06)]",
-                            children: /* @__PURE__ */ f(qt, { style: { color: o.color } })
+                            children: /* @__PURE__ */ p(zt, { style: { color: o.color } })
                           }
                         ),
-                        o.checked && /* @__PURE__ */ f(yt, {})
+                        o.checked && /* @__PURE__ */ p(It, {})
                       ]
                     },
                     `sheets-filter-cell-text-color-${l}`
@@ -1692,7 +1725,7 @@ function Di(t) {
                 }
               )
             ] }),
-            s.length <= 1 && n.length <= 1 && /* @__PURE__ */ f(
+            n.length <= 1 && s.length <= 1 && /* @__PURE__ */ p(
               "div",
               {
                 className: "univer-flex univer-h-full univer-w-full univer-items-center univer-justify-center univer-text-sm univer-text-gray-900 dark:!univer-text-gray-200",
@@ -1705,13 +1738,13 @@ function Di(t) {
     }
   );
 }
-function yt() {
-  return /* @__PURE__ */ f(
+function It() {
+  return /* @__PURE__ */ p(
     "div",
     {
       className: "univer-absolute -univer-bottom-0.5 -univer-right-0.5 univer-flex univer-h-3 univer-w-3 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded-full univer-bg-white",
-      children: /* @__PURE__ */ f(
-        Jt,
+      children: /* @__PURE__ */ p(
+        tr,
         {
           className: "univer-h-full univer-w-full univer-font-bold univer-text-[#418F1F]"
         }
@@ -1719,56 +1752,56 @@ function yt() {
     }
   );
 }
-function Bi(t) {
-  var v, _;
-  const { model: e } = t, r = te(K), s = H(e.conditionItem$, void 0), n = H(e.filterConditionFormParams$, void 0), a = n != null && n.and ? "AND" : "OR", i = U((S) => {
+function Qi(t) {
+  var f, _;
+  const { model: e } = t, r = re(X), n = D(e.conditionItem$, void 0), s = D(e.filterConditionFormParams$, void 0), a = s != null && s.and ? "AND" : "OR", i = k((S) => {
     e.onConditionFormChange({ and: S === "AND" });
-  }, [e]), o = Wi(r), l = U((S) => {
+  }, [e]), o = ji(r), l = k((S) => {
     e.onPrimaryConditionChange(S);
-  }, [e]), c = Qi(r), h = U((S) => {
+  }, [e]), c = Gi(r), h = k((S) => {
     e.onConditionFormChange(S);
   }, [e]), d = r.t("sheets-filter.panel.input-values-placeholder");
-  function C(S, N, E) {
+  function C(S, E, F) {
     const b = m.getItemByOperator(S).numOfParameters === 1;
-    return /* @__PURE__ */ I(Ct, { children: [
-      E === "operator2" && /* @__PURE__ */ I(si, { value: a, onChange: i, children: [
-        /* @__PURE__ */ f(St, { value: "AND", children: r.t("sheets-filter.panel.and") }),
-        /* @__PURE__ */ f(St, { value: "OR", children: r.t("sheets-filter.panel.or") })
+    return /* @__PURE__ */ I(Et, { children: [
+      F === "operator2" && /* @__PURE__ */ I(oi, { value: a, onChange: i, children: [
+        /* @__PURE__ */ p(Tt, { value: "AND", children: r.t("sheets-filter.panel.and") }),
+        /* @__PURE__ */ p(Tt, { value: "OR", children: r.t("sheets-filter.panel.or") })
       ] }),
-      /* @__PURE__ */ f(
-        gt,
+      /* @__PURE__ */ p(
+        Ct,
         {
           value: S,
           options: c,
-          onChange: (F) => h({ [E]: F })
+          onChange: (N) => h({ [F]: N })
         }
       ),
-      b && /* @__PURE__ */ f("div", { children: /* @__PURE__ */ f(
-        Wt,
+      b && /* @__PURE__ */ p("div", { children: /* @__PURE__ */ p(
+        Qt,
         {
           className: "univer-mt-2",
-          value: N,
+          value: E,
           placeholder: d,
-          onChange: (F) => h({ [E === "operator1" ? "val1" : "val2"]: F })
+          onChange: (N) => h({ [F === "operator1" ? "val1" : "val2"]: N })
         }
       ) })
     ] });
   }
-  return /* @__PURE__ */ f(
+  return /* @__PURE__ */ p(
     "div",
     {
       "data-u-comp": "sheets-filter-panel-conditions-container",
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
-      children: s && n && /* @__PURE__ */ I(Ct, { children: [
-        /* @__PURE__ */ f(gt, { value: s.operator, options: o, onChange: l }),
-        m.getItemByOperator(s.operator).numOfParameters !== 0 ? /* @__PURE__ */ I(
+      children: n && s && /* @__PURE__ */ I(Et, { children: [
+        /* @__PURE__ */ p(Ct, { value: n.operator, options: o, onChange: l }),
+        m.getItemByOperator(n.operator).numOfParameters !== 0 ? /* @__PURE__ */ I(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-conditions-container-inner",
-            className: Ae("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", lt),
+            className: Pe("univer-mt-2 univer-flex-grow univer-overflow-hidden univer-rounded-md univer-p-2", ct),
             children: [
-              s.numOfParameters >= 1 && C(n.operator1, (v = n.val1) != null ? v : "", "operator1"),
-              s.numOfParameters >= 2 && C(n.operator2, (_ = n.val2) != null ? _ : "", "operator2"),
+              n.numOfParameters >= 1 && C(s.operator1, (f = s.val1) != null ? f : "", "operator1"),
+              n.numOfParameters >= 2 && C(s.operator2, (_ = s.val2) != null ? _ : "", "operator2"),
               /* @__PURE__ */ I(
                 "div",
                 {
@@ -1776,7 +1809,7 @@ function Bi(t) {
                   className: "univer-mt-2 univer-text-xs univer-text-gray-500",
                   children: [
                     r.t("sheets-filter.panel.?"),
-                    /* @__PURE__ */ f("br", {}),
+                    /* @__PURE__ */ p("br", {}),
                     r.t("sheets-filter.panel.*")
                   ]
                 }
@@ -1788,9 +1821,9 @@ function Bi(t) {
     }
   );
 }
-function Wi(t) {
+function ji(t) {
   const e = t.getCurrentLocale();
-  return at(() => [
+  return ut(() => [
     {
       options: [
         { label: t.t(m.NONE.label), value: m.NONE.operator }
@@ -1830,19 +1863,19 @@ function Wi(t) {
     }
   ], [e, t]);
 }
-function Qi(t) {
+function Gi(t) {
   const e = t.getCurrentLocale();
-  return at(() => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
+  return ut(() => m.ALL_CONDITIONS.filter((r) => r.numOfParameters !== 2).map((r) => ({ label: t.t(r.label), value: r.operator })), [e, t]);
 }
-function Vi(t) {
-  const { model: e } = t, r = te(K), s = H(e.searchString$, "", !0), n = H(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = qe(n), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = U(() => {
+function Yi(t) {
+  const { model: e } = t, r = re(X), n = D(e.searchString$, "", !0), s = D(e.filterItems$, void 0, !0), a = r.t("sheets-filter.panel.filter-only"), i = ze(s), o = i.checked > 0 && i.unchecked === 0, l = i.checked > 0 && i.unchecked > 0, c = e.treeMapCache, h = k(() => {
     e.onCheckAllToggled(!o);
-  }, [e, o]), d = U((v) => {
-    e.setSearchString(v);
+  }, [e, o]), d = k((f) => {
+    e.setSearchString(f);
   }, [e]);
-  function C(v) {
+  function C(f) {
     let _ = [];
-    return v.forEach((S) => {
+    return f.forEach((S) => {
       S.checked && _.push(S.key), S.children && (_ = _.concat(C(S.children)));
     }), _;
   }
@@ -1852,11 +1885,11 @@ function Vi(t) {
       "data-u-comp": "sheets-filter-panel-values-container",
       className: "univer-flex univer-h-full univer-min-h-[300px] univer-flex-col",
       children: [
-        /* @__PURE__ */ f(
-          Wt,
+        /* @__PURE__ */ p(
+          Qt,
           {
             autoFocus: !0,
-            value: s,
+            value: n,
             placeholder: r.t("sheets-filter.panel.search-placeholder"),
             onChange: d
           }
@@ -1865,9 +1898,9 @@ function Vi(t) {
           "div",
           {
             "data-u-comp": "sheets-filter-panel",
-            className: Ae("univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden univer-rounded-md univer-px-2 univer-py-2.5", lt),
+            className: Pe("univer-mt-2 univer-box-border univer-flex univer-flex-grow univer-flex-col univer-overflow-hidden univer-rounded-md univer-px-2 univer-py-2.5", ct),
             children: [
-              /* @__PURE__ */ f(
+              /* @__PURE__ */ p(
                 "div",
                 {
                   "data-u-comp": "sheets-filter-panel-values-item",
@@ -1878,16 +1911,16 @@ function Vi(t) {
                       "data-u-comp": "sheets-filter-panel-values-item-inner",
                       className: "univer-box-border univer-flex univer-h-7 univer-items-center univer-rounded-md univer-pb-0 univer-pl-5 univer-pr-0.5 univer-pt-0 univer-text-sm",
                       children: [
-                        /* @__PURE__ */ f(
-                          ni,
+                        /* @__PURE__ */ p(
+                          li,
                           {
                             indeterminate: l,
-                            disabled: n.length === 0,
+                            disabled: s.length === 0,
                             checked: o,
                             onChange: h
                           }
                         ),
-                        /* @__PURE__ */ f(
+                        /* @__PURE__ */ p(
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-text",
@@ -1895,7 +1928,7 @@ function Vi(t) {
                             children: `${r.t("sheets-filter.panel.select-all")}`
                           }
                         ),
-                        /* @__PURE__ */ f(
+                        /* @__PURE__ */ p(
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-count",
@@ -1908,14 +1941,14 @@ function Vi(t) {
                   )
                 }
               ),
-              /* @__PURE__ */ f("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ f(
-                oi,
+              /* @__PURE__ */ p("div", { "data-u-comp": "sheets-filter-panel-values-virtual", className: "univer-flex-grow", children: /* @__PURE__ */ p(
+                ai,
                 {
-                  data: n,
+                  data: s,
                   defaultExpandAll: !1,
-                  valueGroup: C(n),
-                  onChange: (v) => {
-                    e.onFilterCheckToggled(v);
+                  valueGroup: C(s),
+                  onChange: (f) => {
+                    e.onFilterCheckToggled(f);
                   },
                   defaultCache: c,
                   itemHeight: 28,
@@ -1926,30 +1959,30 @@ function Vi(t) {
                           univer-text-gray-900 dark:hover:!univer-bg-gray-900
                           dark:!univer-text-white
                         `,
-                  attachRender: (v) => /* @__PURE__ */ I(
+                  attachRender: (f) => /* @__PURE__ */ I(
                     "div",
                     {
                       className: "univer-ml-1 univer-flex univer-h-5 univer-flex-1 univer-cursor-pointer univer-items-center univer-justify-between univer-text-sm univer-text-primary-500",
                       children: [
-                        /* @__PURE__ */ f(
+                        /* @__PURE__ */ p(
                           "span",
                           {
                             "data-u-comp": "sheets-filter-panel-values-item-count",
                             className: "univer-text-gray-400 dark:!univer-text-gray-500",
-                            children: `(${v.count})`
+                            children: `(${f.count})`
                           }
                         ),
-                        /* @__PURE__ */ f(
+                        /* @__PURE__ */ p(
                           "a",
                           {
                             className: "univer-box-border univer-hidden univer-h-4 univer-whitespace-nowrap univer-px-1.5",
                             onClick: () => {
                               const _ = [];
-                              v.children ? v.children.forEach((S) => {
-                                S.children ? S.children.forEach((N) => {
-                                  _.push(N.key);
+                              f.children ? f.children.forEach((S) => {
+                                S.children ? S.children.forEach((E) => {
+                                  _.push(E.key);
                                 }) : _.push(S.key);
-                              }) : _.push(v.key), e.onFilterOnly(_);
+                              }) : _.push(f.key), e.onFilterOnly(_);
                             },
                             children: a
                           }
@@ -1966,56 +1999,56 @@ function Vi(t) {
     }
   );
 }
-function ji() {
-  var N;
-  const t = te(Z), e = te(K), r = te(j), s = H(t.filterBy$, void 0, !0), n = H(t.filterByModel$, void 0, !1), a = H(() => (n == null ? void 0 : n.canApply$) || me(!1), void 0, !1, [n]), i = Gi(e), o = !H(t.hasCriteria$), l = U((E) => {
-    r.executeCommand(Gt.id, { filterBy: E });
-  }, [r]), c = U(async () => {
-    await (n == null ? void 0 : n.clear()), r.executeCommand(Se.id);
-  }, [n, r]), h = U(() => {
+function Zi() {
+  var E;
+  const t = re(q), e = re(X), r = re(j), n = D(t.filterBy$, void 0, !0), s = D(t.filterByModel$, void 0, !1), a = D(() => (s == null ? void 0 : s.canApply$) || me(!1), void 0, !1, [s]), i = Ki(e), o = !D(t.hasCriteria$), l = k((F) => {
+    r.executeCommand(Zt.id, { filterBy: F });
+  }, [r]), c = k(async () => {
+    await (s == null ? void 0 : s.clear()), r.executeCommand(Se.id);
+  }, [s, r]), h = k(() => {
     r.executeCommand(Se.id);
-  }, [r]), d = U(async () => {
-    await (n == null ? void 0 : n.apply()), r.executeCommand(Se.id);
-  }, [n, r]), v = (N = te(q).activeFilterModel) == null ? void 0 : N.getRange(), _ = t.col, S = Pr(yr.FILTER_PANEL_EMBED_POINT);
+  }, [r]), d = k(async () => {
+    await (s == null ? void 0 : s.apply()), r.executeCommand(Se.id);
+  }, [s, r]), f = (E = re(z).activeFilterModel) == null ? void 0 : E.getRange(), _ = t.col, S = wr(Or.FILTER_PANEL_EMBED_POINT);
   return /* @__PURE__ */ I(
     "div",
     {
       "data-u-comp": "sheets-filter-panel",
       className: "univer-box-border univer-flex univer-max-h-[500px] univer-w-[400px] univer-flex-col univer-rounded-lg univer-bg-white univer-p-4 univer-shadow-lg dark:!univer-border-gray-600 dark:!univer-bg-gray-700",
       children: [
-        /* @__PURE__ */ f(
-          wr,
+        /* @__PURE__ */ p(
+          Lr,
           {
             components: S,
-            sharedProps: { range: v, colIndex: _, onClose: h }
+            sharedProps: { range: f, colIndex: _, onClose: h }
           }
         ),
-        /* @__PURE__ */ f("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ f(
-          li,
+        /* @__PURE__ */ p("div", { className: "univer-mb-1 univer-flex-shrink-0 univer-flex-grow-0", children: /* @__PURE__ */ p(
+          ci,
           {
-            value: s,
+            value: n,
             items: i,
-            onChange: (E) => l(E)
+            onChange: (F) => l(F)
           }
         ) }),
-        n ? /* @__PURE__ */ f(
+        s ? /* @__PURE__ */ p(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-content",
             className: "univer-flex-shrink univer-flex-grow univer-pt-2",
-            children: s === A.VALUES ? /* @__PURE__ */ f(Vi, { model: n }) : s === A.COLORS ? /* @__PURE__ */ f(Di, { model: n }) : /* @__PURE__ */ f(Bi, { model: n })
+            children: n === w.VALUES ? /* @__PURE__ */ p(Yi, { model: s }) : n === w.COLORS ? /* @__PURE__ */ p(Vi, { model: s }) : /* @__PURE__ */ p(Qi, { model: s })
           }
-        ) : /* @__PURE__ */ f("div", { className: "univer-flex-1" }),
+        ) : /* @__PURE__ */ p("div", { className: "univer-flex-1" }),
         /* @__PURE__ */ I(
           "div",
           {
             "data-u-comp": "sheets-filter-panel-footer",
             className: "univer-mt-4 univer-inline-flex univer-flex-shrink-0 univer-flex-grow-0 univer-flex-nowrap univer-justify-between univer-overflow-hidden",
             children: [
-              /* @__PURE__ */ f(Ge, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
+              /* @__PURE__ */ p(Ze, { variant: "link", onClick: c, disabled: o, children: e.t("sheets-filter.panel.clear-filter") }),
               /* @__PURE__ */ I("span", { className: "univer-flex univer-gap-2", children: [
-                /* @__PURE__ */ f(Ge, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
-                /* @__PURE__ */ f(Ge, { disabled: !a, variant: "primary", onClick: d, children: e.t("sheets-filter.panel.confirm") })
+                /* @__PURE__ */ p(Ze, { variant: "default", onClick: h, children: e.t("sheets-filter.panel.cancel") }),
+                /* @__PURE__ */ p(Ze, { disabled: !a, variant: "primary", onClick: d, children: e.t("sheets-filter.panel.confirm") })
               ] })
             ]
           }
@@ -2024,26 +2057,26 @@ function ji() {
     }
   );
 }
-function Gi(t) {
+function Ki(t) {
   const e = t.getCurrentLocale();
-  return at(() => [
-    { label: t.t("sheets-filter.panel.by-values"), value: A.VALUES },
-    { label: t.t("sheets-filter.panel.by-colors"), value: A.COLORS },
-    { label: t.t("sheets-filter.panel.by-conditions"), value: A.CONDITIONS }
+  return ut(() => [
+    { label: t.t("sheets-filter.panel.by-values"), value: w.VALUES },
+    { label: t.t("sheets-filter.panel.by-colors"), value: w.COLORS },
+    { label: t.t("sheets-filter.panel.by-conditions"), value: w.CONDITIONS }
   ], [e, t]);
 }
-function Yi(t) {
-  const e = t.get(q);
+function qi(t) {
+  const e = t.get(z);
   return {
-    id: Ee.id,
-    type: nt.BUTTON_SELECTOR,
+    id: Fe.id,
+    type: lt.BUTTON_SELECTOR,
     icon: "FilterIcon",
     tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    hidden$: st(t, ie.UNIVER_SHEET),
+    hidden$: ot(t, ne.UNIVER_SHEET),
     activated$: e.activeFilterModel$.pipe(ce((r) => !!r)),
-    disabled$: Or(
+    disabled$: Ir(
       t,
-      Ir(
+      br(
         t,
         {
           worksheetTypes: [pe, ve],
@@ -2053,107 +2086,107 @@ function Yi(t) {
     )
   };
 }
-function Zi(t) {
-  const e = t.get(q);
+function Xi(t) {
+  const e = t.get(z);
   return {
-    id: it.id,
-    type: nt.BUTTON,
+    id: st.id,
+    type: lt.BUTTON,
     title: "sheets-filter.toolbar.clear-filter-criteria",
-    hidden$: st(t, ie.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(ot((r) => {
-      var s;
-      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ce((n) => !n))) != null ? s : me(!0);
+    hidden$: ot(t, ne.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(at((r) => {
+      var n;
+      return (n = r == null ? void 0 : r.hasCriteria$.pipe(ce((s) => !s))) != null ? n : me(!0);
     }))
   };
 }
-function Ki(t) {
-  const e = t.get(q);
+function zi(t) {
+  const e = t.get(z);
   return {
-    id: rt.id,
-    type: nt.BUTTON,
+    id: nt.id,
+    type: lt.BUTTON,
     title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    hidden$: st(t, ie.UNIVER_SHEET),
-    disabled$: e.activeFilterModel$.pipe(ot((r) => {
-      var s;
-      return (s = r == null ? void 0 : r.hasCriteria$.pipe(ce((n) => !n))) != null ? s : me(!0);
+    hidden$: ot(t, ne.UNIVER_SHEET),
+    disabled$: e.activeFilterModel$.pipe(at((r) => {
+      var n;
+      return (n = r == null ? void 0 : r.hasCriteria$.pipe(ce((s) => !s))) != null ? n : me(!0);
     }))
   };
 }
-const qi = {
-  [Lr.ORGANIZATION]: {
-    [Ee.id]: {
+const Ji = {
+  [Mr.ORGANIZATION]: {
+    [Fe.id]: {
       order: 2,
-      menuItemFactory: Yi,
-      [it.id]: {
+      menuItemFactory: qi,
+      [st.id]: {
         order: 0,
-        menuItemFactory: Zi
+        menuItemFactory: Xi
       },
-      [rt.id]: {
+      [nt.id]: {
         order: 1,
-        menuItemFactory: Ki
+        menuItemFactory: zi
       }
     }
   }
-}, Xi = {
-  id: Ee.id,
-  binding: $r.L | pt.CTRL_COMMAND | pt.SHIFT,
+}, en = {
+  id: Fe.id,
+  binding: $r.L | _t.CTRL_COMMAND | _t.SHIFT,
   description: "sheets-filter.shortcut.smart-toggle-filter",
-  preconditions: br,
+  preconditions: Rr,
   group: "4_sheet-edit"
 };
-var zi = Object.getOwnPropertyDescriptor, Ji = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? zi(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, P = (t, e) => (r, s) => e(r, s, t);
-const Ot = "FILTER_PANEL_POPUP";
-let ke = class extends Te {
-  constructor(e, r, s, n, a, i, o, l, c, h, d, C, v) {
-    super(v, C);
-    p(this, "_popupDisposable");
-    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = s, this._sheetCanvasPopupService = n, this._sheetsFilterService = a, this._localeService = i, this._shortcutService = o, this._commandService = l, this._menuManagerService = c, this._contextService = h, this._messageService = d, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+var tn = Object.getOwnPropertyDescriptor, rn = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? tn(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, M = (t, e) => (r, n) => e(r, n, t);
+const bt = "FILTER_PANEL_POPUP";
+let He = class extends Ee {
+  constructor(e, r, n, s, a, i, o, l, c, h, d, C, f) {
+    super(f, C);
+    v(this, "_popupDisposable");
+    this._injector = e, this._componentManager = r, this._sheetsFilterPanelService = n, this._sheetCanvasPopupService = s, this._sheetsFilterService = a, this._localeService = i, this._shortcutService = o, this._commandService = l, this._menuManagerService = c, this._contextService = h, this._messageService = d, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
   }
   _initShortcuts() {
     [
-      Xi
+      en
     ].forEach((e) => {
       this.disposeWithMe(this._shortcutService.registerShortcut(e));
     });
   }
   _initCommands() {
     [
-      Ee,
-      _r,
+      Fe,
       gr,
-      Q,
-      it,
-      rt,
-      Gt,
-      Me,
+      Sr,
+      V,
+      st,
+      nt,
+      Zt,
+      xe,
       Se
     ].forEach((e) => {
       this.disposeWithMe(this._commandService.registerCommand(e));
     });
   }
   _initMenuItems() {
-    this._menuManagerService.mergeMenu(qi);
+    this._menuManagerService.mergeMenu(Ji);
   }
   _initUI() {
     [
-      [Ot, ji],
-      ["FilterIcon", zt]
+      [bt, Zi],
+      ["FilterIcon", er]
     ].forEach(([e, r]) => {
       this.disposeWithMe(
         this._componentManager.register(e, r)
       );
-    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ue).pipe(ti()).subscribe((e) => {
+    }), this.disposeWithMe(this._contextService.subscribeContextValue$(ue).pipe(ii()).subscribe((e) => {
       e ? this._openFilterPopup() : this._closeFilterPopup();
     })), this.disposeWithMe(this._sheetsFilterService.errorMsg$.subscribe((e) => {
       e && this._messageService.show({
-        type: ai.Error,
+        type: ui.Error,
         content: this._localeService.t(e)
       });
     }));
@@ -2162,9 +2195,9 @@ let ke = class extends Te {
     const e = this._sheetsFilterPanelService.filterModel;
     if (!e)
       throw new Error("[SheetsFilterUIController]: no filter model when opening filter popup!");
-    const r = e.getRange(), s = this._sheetsFilterPanelService.col, { startRow: n } = r;
-    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(n, s, {
-      componentKey: Ot,
+    const r = e.getRange(), n = this._sheetsFilterPanelService.col, { startRow: s } = r;
+    this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(s, n, {
+      componentKey: bt,
       direction: "horizontal",
       onClickOutside: () => this._commandService.syncExecuteCommand(Se.id),
       offset: [5, 0]
@@ -2175,97 +2208,97 @@ let ke = class extends Te {
     (e = this._popupDisposable) == null || e.dispose(), this._popupDisposable = null;
   }
 };
-ke = Ji([
-  P(0, T(re)),
-  P(1, T(Mr)),
-  P(2, T(Z)),
-  P(3, T(Rr)),
-  P(4, T(q)),
-  P(5, T(K)),
-  P(6, xr),
-  P(7, j),
-  P(8, Ur),
-  P(9, We),
-  P(10, kr),
-  P(11, T(Ut)),
-  P(12, kt)
-], ke);
-var es = Object.defineProperty, ts = Object.getOwnPropertyDescriptor, rs = (t, e, r) => e in t ? es(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, is = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ts(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, Ke = (t, e) => (r, s) => e(r, s, t), er = (t, e, r) => rs(t, typeof e != "symbol" ? e + "" : e, r);
-const ss = "SHEET_FILTER_UI_PLUGIN";
-let He = class extends tt {
-  constructor(t = xe, e, r, s) {
-    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = s;
-    const { menu: n, ...a } = Mt(
+He = rn([
+  M(0, T(ie)),
+  M(1, T(xr)),
+  M(2, T(q)),
+  M(3, T(Ar)),
+  M(4, T(z)),
+  M(5, T(X)),
+  M(6, Ur),
+  M(7, j),
+  M(8, kr),
+  M(9, Ve),
+  M(10, Hr),
+  M(11, T(Ht)),
+  M(12, Dt)
+], He);
+var nn = Object.defineProperty, sn = Object.getOwnPropertyDescriptor, on = (t, e, r) => e in t ? nn(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, ln = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? sn(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, Xe = (t, e) => (r, n) => e(r, n, t), rr = (t, e, r) => on(t, typeof e != "symbol" ? e + "" : e, r);
+const an = "SHEET_FILTER_UI_PLUGIN";
+let De = class extends it {
+  constructor(t = Ue, e, r, n) {
+    super(), this._config = t, this._injector = e, this._configService = r, this._rpcChannelService = n;
+    const { menu: s, ...a } = Ut(
       {},
-      xe,
+      Ue,
       this._config
     );
-    n && this._configService.setConfig("menu", n, { merge: !0 }), this._configService.setConfig(Yt, a);
+    s && this._configService.setConfig("menu", s, { merge: !0 }), this._configService.setConfig(Kt, a);
   }
   onStarting() {
-    hr(this._injector, [
-      [Z],
+    dr(this._injector, [
+      [q],
       [he],
-      [ke]
-    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([Pe, {
-      useFactory: () => ri(
-        this._rpcChannelService.requestChannel(ct)
+      [He]
+    ]), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([we, {
+      useFactory: () => ni(
+        this._rpcChannelService.requestChannel(ht)
       )
     }]);
   }
   onReady() {
-    ft(this._injector, [
+    vt(this._injector, [
       [he]
     ]);
   }
   onRendered() {
-    ft(this._injector, [
-      [ke]
+    vt(this._injector, [
+      [He]
     ]);
   }
 };
-er(He, "type", ie.UNIVER_SHEET);
-er(He, "pluginName", ss);
-He = is([
-  Lt(xt),
-  Ke(1, T(re)),
-  Ke(2, $t),
-  Ke(3, ur(Bt))
-], He);
-var ns = Object.getOwnPropertyDescriptor, os = (t, e, r, s) => {
-  for (var n = s > 1 ? void 0 : s ? ns(e, r) : e, a = t.length - 1, i; a >= 0; a--)
-    (i = t[a]) && (n = i(n) || n);
-  return n;
-}, It = (t, e) => (r, s) => e(r, s, t), be;
-let bt = (be = class extends tt {
+rr(De, "type", ne.UNIVER_SHEET);
+rr(De, "pluginName", an);
+De = ln([
+  $t(kt),
+  Xe(1, T(ie)),
+  Xe(2, xt),
+  Xe(3, hr(Vt))
+], De);
+var cn = Object.getOwnPropertyDescriptor, un = (t, e, r, n) => {
+  for (var s = n > 1 ? void 0 : n ? cn(e, r) : e, a = t.length - 1, i; a >= 0; a--)
+    (i = t[a]) && (s = i(s) || s);
+  return s;
+}, Rt = (t, e) => (r, n) => e(r, n, t), be;
+let At = (be = class extends it {
   constructor(t, e, r) {
     super(), this._config = t, this._injector = e, this._rpcChannelService = r;
   }
   onStarting() {
     [
-      [Pe, { useClass: Xe }]
+      [we, { useClass: Je }]
     ].forEach((t) => this._injector.add(t));
   }
   onReady() {
     this._rpcChannelService.registerChannel(
-      ct,
-      ii(this._injector.get(Pe))
+      ht,
+      si(this._injector.get(we))
     );
   }
-}, p(be, "type", ie.UNIVER_SHEET), p(be, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), be);
-bt = os([
-  It(1, T(re)),
-  It(2, Bt)
-], bt);
+}, v(be, "type", ne.UNIVER_SHEET), v(be, "pluginName", "SHEET_FILTER_UI_WORKER_PLUGIN"), be);
+At = un([
+  Rt(1, T(ie)),
+  Rt(2, Vt)
+], At);
 export {
-  Gt as ChangeFilterByOperation,
+  Zt as ChangeFilterByOperation,
   Se as CloseFilterPanelOperation,
-  Me as OpenFilterPanelOperation,
-  Ue as UniverSheetsFilterMobileUIPlugin,
-  He as UniverSheetsFilterUIPlugin,
-  bt as UniverSheetsFilterUIWorkerPlugin
+  xe as OpenFilterPanelOperation,
+  ke as UniverSheetsFilterMobileUIPlugin,
+  De as UniverSheetsFilterUIPlugin,
+  At as UniverSheetsFilterUIWorkerPlugin
 };