@univerjs/sheets-sort-ui 0.7.0 → 0.8.0-beta.0

package/lib/index.js

@@ -1,15 +1,15 @@
-var Be = Object.defineProperty;
-var Ve = (e, t, n) => t in e ? Be(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
+var Fe = Object.defineProperty;
+var Ve = (e, t, n) => t in e ? Fe(e, t, { enumerable: !0, configurable: !0, writable: !0, value: n }) : e[t] = n;
 var K = (e, t, n) => Ve(e, typeof t != "symbol" ? t + "" : t, n);
-import { LocaleService as P, IUniverInstanceService as _e, ILogService as ze, Inject as w, ICommandService as xe, Disposable as Ze, UniverInstanceType as Y, Tools as Ge, LocaleType as J, CommandType as R, throttle as We, Injector as Me, RxDisposable as Ye, DependentOn as qe, IConfigService as Xe, Plugin as Ke, merge as Je } from "@univerjs/core";
-import { SheetsSortService as Ie, SortType as U, SortRangeCommand as Qe, UniverSheetsSortPlugin as et } from "@univerjs/sheets-sort";
+import { LocaleService as P, IUniverInstanceService as _e, ILogService as Ze, Inject as w, ICommandService as xe, Disposable as ze, UniverInstanceType as Y, Tools as Ge, LocaleType as J, CommandType as R, throttle as We, Injector as Ie, RxDisposable as Ye, DependentOn as qe, IConfigService as Xe, Plugin as Ke, merge as Je } from "@univerjs/core";
+import { SheetsSortService as Me, SortType as U, SortRangeCommand as Qe, UniverSheetsSortPlugin as et } from "@univerjs/sheets-sort";
 import { serializeRange as tt } from "@univerjs/engine-formula";
 import { getCurrentRangeDisable$ as N, getCurrentExclusiveRangeInterest$ as rt, SheetsRenderService as nt, SheetsUIPart as it } from "@univerjs/sheets-ui";
-import { useDependency as E, IConfirmService as st, useObservable as ot, MenuItemType as S, getMenuHiddenObservable as Re, ContextMenuPosition as at, ContextMenuGroup as ct, RibbonStartGroup as lt, IMenuManagerService as ut, IDialogService as dt, ILayoutService as ht, IUIPartsService as gt, ComponentManager as mt, connectInjector as vt } from "@univerjs/ui";
+import { useDependency as E, IConfirmService as st, useObservable as ot, MenuItemType as S, getMenuHiddenObservable as Re, ContextMenuPosition as ct, ContextMenuGroup as at, RibbonDataGroup as lt, IMenuManagerService as ut, IDialogService as dt, ILayoutService as ht, IUIPartsService as gt, ComponentManager as mt, connectInjector as vt } from "@univerjs/ui";
 import { BehaviorSubject as Ct, takeUntil as ft } from "rxjs";
-import { jsxs as m, jsx as a } from "react/jsx-runtime";
+import { jsxs as m, jsx as c } from "react/jsx-runtime";
 import { SheetsSelectionsService as St, getPrimaryForRange as pt, SetSelectionsOperation as yt, expandToContinuousRange as fe, getSheetCommandTarget as _t, RangeProtectionPermissionEditPoint as k, WorksheetSortPermission as L, WorksheetEditPermission as D, WorkbookEditablePermission as H } from "@univerjs/sheets";
-import { RadioGroup as we, Radio as z, Checkbox as xt, DraggableList as Mt, Button as Z, Dropdown as It, ButtonGroup as Rt } from "@univerjs/design";
+import { RadioGroup as we, Radio as Z, Checkbox as xt, DraggableList as It, Button as z, Dropdown as Mt, ButtonGroup as Rt } from "@univerjs/design";
 import { forwardRef as y, useRef as Ee, createElement as _, useState as j, useCallback as O, useEffect as Te } from "react";
 const wt = "sheets-sort-ui.config", Se = {};
 var f = function() {
@@ -28,8 +28,8 @@ var f = function() {
       t.indexOf(r[i]) < 0 && Object.prototype.propertyIsEnumerable.call(e, r[i]) && (n[r[i]] = e[r[i]]);
   return n;
 }, x = y(function(e, t) {
-  var n = e.icon, r = e.id, i = e.className, s = e.extend, o = Et(e, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(r, " ").concat(i || "").trim(), l = Ee("_".concat(Ot()));
-  return be(n, "".concat(r), { defIds: n.defIds, idSuffix: l.current }, f({ ref: t, className: c }, o), s);
+  var n = e.icon, r = e.id, i = e.className, s = e.extend, o = Et(e, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(i || "").trim(), l = Ee("_".concat(Ot()));
+  return be(n, "".concat(r), { defIds: n.defIds, idSuffix: l.current }, f({ ref: t, className: a }, o), s);
 });
 function be(e, t, n, r, i) {
   return _(e.tag, f(f({ key: t }, Tt(e, n, i)), r), (bt(e, n).children || []).map(function(s, o) {
@@ -39,13 +39,13 @@ function be(e, t, n, r, i) {
 function Tt(e, t, n) {
   var r = f({}, e.attrs);
   n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1), e.tag === "mask" && r.id && (r.id = r.id + t.idSuffix), Object.entries(r).forEach(function(s) {
-    var o = s[0], c = s[1];
-    o === "mask" && typeof c == "string" && (r[o] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+    var o = s[0], a = s[1];
+    o === "mask" && typeof a == "string" && (r[o] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   });
   var i = t.defIds;
   return !i || i.length === 0 || (e.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + t.idSuffix), Object.entries(r).forEach(function(s) {
-    var o = s[0], c = s[1];
-    typeof c == "string" && (r[o] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
+    var o = s[0], a = s[1];
+    typeof a == "string" && (r[o] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(t.idSuffix, ")")));
   })), r;
 }
 function bt(e, t) {
@@ -138,10 +138,10 @@ var jt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 16 16", width: "1em"
   }));
 });
 Ue.displayName = "SequenceSingle";
-const Ft = (e) => {
+const Bt = (e) => {
   const [t, n] = j("0"), r = E(P);
   return /* @__PURE__ */ m("div", { className: "univer-text-sm", children: [
-    /* @__PURE__ */ a("div", { className: "extend-confirm-desc", children: r.t("sheets-sort.dialog.sort-reminder-desc") }),
+    /* @__PURE__ */ c("div", { className: "extend-confirm-desc", children: r.t("sheets-sort.dialog.sort-reminder-desc") }),
     /* @__PURE__ */ m(
       we,
       {
@@ -152,15 +152,15 @@ const Ft = (e) => {
           n(i), e.onChange(i);
         },
         children: [
-          /* @__PURE__ */ a(z, { value: "0", children: r.t("sheets-sort.dialog.sort-reminder-no") }),
-          /* @__PURE__ */ a(z, { value: "1", children: r.t("sheets-sort.dialog.sort-reminder-ext") })
+          /* @__PURE__ */ c(Z, { value: "0", children: r.t("sheets-sort.dialog.sort-reminder-no") }),
+          /* @__PURE__ */ c(Z, { value: "1", children: r.t("sheets-sort.dialog.sort-reminder-ext") })
         ]
       }
     )
   ] });
 };
-var Bt = Object.getOwnPropertyDescriptor, Vt = (e, t, n, r) => {
-  for (var i = r > 1 ? void 0 : r ? Bt(t, n) : t, s = e.length - 1, o; s >= 0; s--)
+var Ft = Object.getOwnPropertyDescriptor, Vt = (e, t, n, r) => {
+  for (var i = r > 1 ? void 0 : r ? Ft(t, n) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
 }, b = (e, t) => (n, r) => t(n, r, e);
@@ -170,12 +170,12 @@ const V = {
   SINGLE_ERROR: "sheets-sort.error.single",
   FORMULA_ARRAY: "sheets-sort.error.formula-array"
 };
-let g = class extends Ze {
-  constructor(t, n, r, i, s, o, c) {
+let g = class extends ze {
+  constructor(t, n, r, i, s, o, a) {
     super();
     K(this, "_customSortState$", new Ct(null));
     K(this, "customSortState$", this._customSortState$.asObservable());
-    this._univerInstanceService = t, this._confirmService = n, this._logService = r, this._selectionManagerService = i, this._sheetsSortService = s, this._localeService = o, this._commandService = c;
+    this._univerInstanceService = t, this._confirmService = n, this._logService = r, this._selectionManagerService = i, this._sheetsSortService = s, this._localeService = o, this._commandService = a;
   }
   async triggerSortDirectly(t, n, r) {
     const i = r || await this._detectSortLocation(n);
@@ -205,13 +205,13 @@ let g = class extends Ze {
     const { unitId: r, subUnitId: i, range: s } = n, o = (d = this._univerInstanceService.getUnit(r)) == null ? void 0 : d.getSheetBySheetId(i);
     if (!o)
       return [];
-    const c = zt(this._localeService);
-    return Array.from({ length: s.endColumn - s.startColumn + 1 }, (M, C) => {
+    const a = Zt(this._localeService);
+    return Array.from({ length: s.endColumn - s.startColumn + 1 }, (I, C) => {
       var v;
       const T = (v = o.getCell(s.startRow, C + s.startColumn)) == null ? void 0 : v.v;
       return {
         index: C + s.startColumn,
-        label: t ? `${T != null ? T : c(C + s.startColumn)}` : c(C + s.startColumn)
+        label: t ? `${T != null ? T : a(C + s.startColumn)}` : a(C + s.startColumn)
       };
     });
   }
@@ -234,7 +234,7 @@ let g = class extends Ze {
         title: this._localeService.t("info.tooltip")
       },
       children: {
-        title: /* @__PURE__ */ a("div", { children: this._localeService.t(t) })
+        title: /* @__PURE__ */ c("div", { children: this._localeService.t(t) })
       }
     });
   }
@@ -246,8 +246,8 @@ let g = class extends Ze {
         title: this._localeService.t("sheets-sort.dialog.sort-reminder")
       },
       children: {
-        title: /* @__PURE__ */ a(
-          Ft,
+        title: /* @__PURE__ */ c(
+          Bt,
           {
             onChange: (r) => {
               t = r === "1";
@@ -271,19 +271,19 @@ let g = class extends Ze {
     const n = this._univerInstanceService.getCurrentUnitForType(Y.UNIVER_SHEET), r = n.getActiveSheet(), i = n.getUnitId(), s = r.getSheetId(), o = this._selectionManagerService.getCurrentLastSelection();
     if (!o)
       return null;
-    let c;
+    let a;
     if (t === !0)
-      c = fe(o.range, { up: !0, down: !0, left: !0, right: !0 }, r), this.setSelection(i, s, c);
+      a = fe(o.range, { up: !0, down: !0, left: !0, right: !0 }, r), this.setSelection(i, s, a);
     else if (t === !1)
-      c = o.range;
+      a = o.range;
     else {
       const l = await this.showExtendConfirm();
       if (l === "cancel")
         return null;
-      l === "keep" ? c = o.range : (c = fe(o.range, { up: !0, down: !0, left: !0, right: !0 }, r), this.setSelection(i, s, c));
+      l === "keep" ? a = o.range : (a = fe(o.range, { up: !0, down: !0, left: !0, right: !0 }, r), this.setSelection(i, s, a));
     }
     return {
-      range: c,
+      range: a,
       unitId: i,
       subUnitId: s,
       colIndex: o.primary.actualColumn
@@ -293,13 +293,13 @@ let g = class extends Ze {
 g = Vt([
   b(0, _e),
   b(1, st),
-  b(2, ze),
+  b(2, Ze),
   b(3, w(St)),
-  b(4, w(Ie)),
+  b(4, w(Me)),
   b(5, w(P)),
   b(6, xe)
 ], g);
-function zt(e) {
+function Zt(e) {
   return (t) => {
     const n = Ge.chatAtABC(t);
     switch (e.getCurrentLocale()) {
@@ -332,11 +332,11 @@ const re = {
   id: "sheet.command.sort-range-custom",
   type: R.COMMAND,
   handler: async (e) => await e.get(g).triggerSortCustomize()
-}, ae = {
+}, ce = {
   id: "sheet.command.sort-range-asc-ctx",
   type: R.COMMAND,
   handler: async (e) => await e.get(g).triggerSortDirectly(!0, !1)
-}, ce = {
+}, ae = {
   id: "sheet.command.sort-range-asc-ext-ctx",
   type: R.COMMAND,
   handler: async (e) => await e.get(g).triggerSortDirectly(!0, !0)
@@ -353,17 +353,17 @@ const re = {
   type: R.COMMAND,
   handler: async (e) => await e.get(g).triggerSortCustomize()
 };
-function Zt() {
+function zt() {
   const e = E(g), t = ot(e.customSortState$);
-  return !t || !t.location ? null : /* @__PURE__ */ a(Gt, { state: t });
+  return !t || !t.location ? null : /* @__PURE__ */ c(Gt, { state: t });
 }
 function Gt({ state: e }) {
-  const t = E(Ie), n = E(P), r = E(g), [i, s] = j(!1), [o, c] = j(0), l = Ee(null), { range: d, unitId: M, subUnitId: C } = e.location, T = r.getTitles(i), [v, A] = j([
+  const t = E(Me), n = E(P), r = E(g), [i, s] = j(!1), [o, a] = j(0), l = Ee(null), { range: d, unitId: I, subUnitId: C } = e.location, T = r.getTitles(i), [v, A] = j([
     { type: U.ASC, colIndex: d.startColumn }
   ]), q = O((u, p) => {
     const $ = [...v];
     p === null ? $.splice(u, 1) : $[u] = p, A($);
-  }, [v]), B = O(
+  }, [v]), F = O(
     We(() => {
       const u = [...v], p = Yt(d, v);
       p !== null && (u.push({ type: U.ASC, colIndex: p }), A(u));
@@ -374,26 +374,26 @@ function Gt({ state: e }) {
   }, [t, r, d]), X = O(() => {
     r.closeCustomSortPanel();
   }, [r]), je = O((u) => {
-    s(u), u ? r.setSelection(M, C, { ...d, startRow: d.startRow + 1 }) : r.setSelection(M, C, d);
-  }, [r, d, C, M]);
+    s(u), u ? r.setSelection(I, C, { ...d, startRow: d.startRow + 1 }) : r.setSelection(I, C, d);
+  }, [r, d, C, I]);
   Te(() => {
     l.current && v.length > 5 && (l.current.scrollTop = l.current.scrollHeight);
   }, [v]);
-  const Fe = v.length < T.length, Ce = v.map((u) => ({ ...u, id: `${u.colIndex}` }));
+  const Be = v.length < T.length, Ce = v.map((u) => ({ ...u, id: `${u.colIndex}` }));
   return /* @__PURE__ */ m("div", { children: [
     /* @__PURE__ */ m("div", { onMouseDown: (u) => {
       u.stopPropagation();
     }, children: [
       /* @__PURE__ */ m("div", { className: "univer-flex univer-items-center univer-justify-between", children: [
-        /* @__PURE__ */ a(xt, { checked: i, onChange: (u) => je(!!u), children: n.t("sheets-sort.dialog.first-row-check") }),
-        Fe ? /* @__PURE__ */ m(
+        /* @__PURE__ */ c(xt, { checked: i, onChange: (u) => je(!!u), children: n.t("sheets-sort.dialog.first-row-check") }),
+        Be ? /* @__PURE__ */ m(
           "div",
           {
             className: "univer-flex univer-cursor-pointer univer-select-none univer-items-center univer-text-base",
-            onClick: B,
+            onClick: F,
             children: [
-              /* @__PURE__ */ a(Q, {}),
-              /* @__PURE__ */ a("span", { className: "univer-ml-1.5", children: n.t("sheets-sort.dialog.add-condition") })
+              /* @__PURE__ */ c(Q, {}),
+              /* @__PURE__ */ c("span", { className: "univer-ml-1.5", children: n.t("sheets-sort.dialog.add-condition") })
             ]
           }
         ) : /* @__PURE__ */ m(
@@ -401,29 +401,29 @@ function Gt({ state: e }) {
           {
             className: "univer-flex univer-cursor-pointer univer-select-none univer-items-center univer-text-base univer-text-primary-500 disabled:univer-cursor-not-allowed disabled:univer-divide-opacity-30 disabled:univer-text-gray-800",
             children: [
-              /* @__PURE__ */ a(Q, {}),
-              /* @__PURE__ */ a("span", { className: "univer-ml-1.5 univer-text-xs", children: n.t("sheets-sort.dialog.add-condition") })
+              /* @__PURE__ */ c(Q, {}),
+              /* @__PURE__ */ c("span", { className: "univer-ml-1.5 univer-text-xs", children: n.t("sheets-sort.dialog.add-condition") })
             ]
           }
         )
       ] }),
-      /* @__PURE__ */ a(
+      /* @__PURE__ */ c(
         "div",
         {
           className: "univer-max-h-[310px] univer-overflow-y-auto univer-overflow-x-hidden",
           onScroll: (u) => {
             const p = u.currentTarget.scrollTop;
-            c(p);
+            a(p);
           },
           ref: l,
-          children: /* @__PURE__ */ a(
-            Mt,
+          children: /* @__PURE__ */ c(
+            It,
             {
               list: Ce,
               onListChange: A,
               idKey: "id",
               draggableHandle: "[data-u-comp=sort-panel-item-handler]",
-              itemRender: (u) => /* @__PURE__ */ a(
+              itemRender: (u) => /* @__PURE__ */ c(
                 Wt,
                 {
                   titles: T,
@@ -441,16 +441,16 @@ function Gt({ state: e }) {
       )
     ] }),
     /* @__PURE__ */ m("div", { className: "univer-mt-5 univer-flex univer-justify-end", children: [
-      /* @__PURE__ */ a(
-        Z,
+      /* @__PURE__ */ c(
+        z,
         {
           className: "univer-ml-3",
           onClick: () => X(),
           children: n.t("sheets-sort.dialog.cancel")
         }
       ),
-      /* @__PURE__ */ a(
-        Z,
+      /* @__PURE__ */ c(
+        z,
         {
           className: "univer-ml-3",
           variant: "primary",
@@ -462,76 +462,76 @@ function Gt({ state: e }) {
   ] });
 }
 function Wt(e) {
-  var B;
-  const { list: t, item: n, titles: r, onChange: i, scrollPosition: s } = e, o = E(P), c = r.filter((h) => !t.some((X) => X.colIndex === h.index) || h.index === n.colIndex), l = t.findIndex((h) => h.colIndex === n.colIndex), d = O((h) => {
+  var F;
+  const { list: t, item: n, titles: r, onChange: i, scrollPosition: s } = e, o = E(P), a = r.filter((h) => !t.some((X) => X.colIndex === h.index) || h.index === n.colIndex), l = t.findIndex((h) => h.colIndex === n.colIndex), d = O((h) => {
     i({ ...n, colIndex: h.index }, l), C(!1);
-  }, [l, n, i]), [M, C] = j(!1), T = (h) => {
+  }, [l, n, i]), [I, C] = j(!1), T = (h) => {
     C(h);
   };
   Te(() => {
     C(!1);
   }, [s]);
-  const v = t.length > 1, A = (B = r.find((h) => h.index === n.colIndex)) == null ? void 0 : B.label, q = o.getCurrentLocale() === J.ZH_CN ? "univer-flex univer-px-5" : "univer-flex univer-px-2.5";
+  const v = t.length > 1, A = (F = r.find((h) => h.index === n.colIndex)) == null ? void 0 : F.label, q = o.getCurrentLocale() === J.ZH_CN ? "univer-flex univer-px-5" : "univer-flex univer-px-2.5";
   return /* @__PURE__ */ m("div", { className: "univer-flex univer-items-center", children: [
     /* @__PURE__ */ m("div", { className: "univer-flex univer-items-center", children: [
-      /* @__PURE__ */ a(
+      /* @__PURE__ */ c(
         "div",
         {
           "data-u-comp": "sort-panel-item-handler",
           className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-text-base univer-text-gray-700",
-          children: /* @__PURE__ */ a(Ue, {})
+          children: /* @__PURE__ */ c(Ue, {})
         }
       ),
-      /* @__PURE__ */ a("div", { children: /* @__PURE__ */ a(
-        It,
+      /* @__PURE__ */ c("div", { children: /* @__PURE__ */ c(
+        Mt,
         {
           align: "start",
-          overlay: /* @__PURE__ */ a(
+          overlay: /* @__PURE__ */ c(
             "ul",
             {
               className: "univer-my-0 univer-box-border univer-grid univer-max-h-[310px] univer-items-center univer-gap-1 univer-overflow-y-auto univer-overflow-x-hidden univer-rounded-lg univer-border univer-bg-white univer-p-1 univer-text-base univer-shadow-lg",
-              children: c.map((h) => /* @__PURE__ */ m(
+              children: a.map((h) => /* @__PURE__ */ m(
                 "li",
                 {
                   onClick: () => d(h),
-                  className: "univer-relative univer-box-border univer-flex univer-h-7 univer-cursor-pointer univer-list-none univer-items-center univer-justify-between univer-rounded univer-px-2 univer-text-sm univer-transition-all hover:univer-bg-gray-100",
+                  className: "univer-relative univer-box-border univer-flex univer-h-7 univer-cursor-pointer univer-list-none univer-items-center univer-justify-between univer-rounded univer-px-2 univer-text-sm univer-transition-all dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100",
                   children: [
-                    /* @__PURE__ */ a(
+                    /* @__PURE__ */ c(
                       "span",
                       {
                         className: "univer-max-w-[220px] univer-truncate",
                         children: h.label
                       }
                     ),
-                    /* @__PURE__ */ a("span", { children: h.index === n.colIndex && /* @__PURE__ */ a(Oe, {}) })
+                    /* @__PURE__ */ c("span", { children: h.index === n.colIndex && /* @__PURE__ */ c(Oe, {}) })
                   ]
                 },
                 h.index
               ))
             }
           ),
-          open: M,
+          open: I,
           onOpenChange: T,
           children: /* @__PURE__ */ m(
             "div",
             {
-              className: "univer-ml-2 univer-flex univer-w-[236px] univer-items-center univer-justify-between univer-overflow-hidden univer-rounded-md univer-border univer-border-gray-200 univer-px-2.5 univer-py-1.5 univer-text-sm univer-text-gray-900 dark:univer-text-white",
+              className: "univer-ml-2 univer-flex univer-w-[236px] univer-items-center univer-justify-between univer-overflow-hidden univer-rounded-md univer-border univer-border-gray-200 univer-px-2.5 univer-py-1.5 univer-text-sm univer-text-gray-900 dark:!univer-text-white",
               children: [
-                /* @__PURE__ */ a(
+                /* @__PURE__ */ c(
                   "span",
                   {
                     className: "univer-max-w-[220px] univer-truncate",
                     children: A
                   }
                 ),
-                /* @__PURE__ */ a(He, {})
+                /* @__PURE__ */ c(He, {})
               ]
             }
           )
         }
       ) })
     ] }),
-    /* @__PURE__ */ a("div", { children: /* @__PURE__ */ m(
+    /* @__PURE__ */ c("div", { children: /* @__PURE__ */ m(
       we,
       {
         className: q,
@@ -540,12 +540,12 @@ function Wt(e) {
           i({ ...n, type: h }, l);
         },
         children: [
-          /* @__PURE__ */ a(z, { value: U.ASC, children: o.t("sheets-sort.general.sort-asc") }),
-          /* @__PURE__ */ a(z, { value: U.DESC, children: o.t("sheets-sort.general.sort-desc") })
+          /* @__PURE__ */ c(Z, { value: U.ASC, children: o.t("sheets-sort.general.sort-asc") }),
+          /* @__PURE__ */ c(Z, { value: U.DESC, children: o.t("sheets-sort.general.sort-desc") })
         ]
       }
     ) }),
-    /* @__PURE__ */ a("div", { className: "univer-absolute univer-right-0 univer-cursor-pointer univer-text-sm univer-s-[14px]", children: v && /* @__PURE__ */ a(ke, { onClick: () => i(null, l) }) })
+    /* @__PURE__ */ c("div", { className: "univer-absolute univer-right-0 univer-cursor-pointer univer-text-sm univer-s-[14px]", children: v && /* @__PURE__ */ c(ke, { onClick: () => i(null, l) }) })
   ] });
 }
 function Yt(e, t) {
@@ -556,32 +556,38 @@ function Yt(e, t) {
   return null;
 }
 function qt(e) {
-  const { range: t, colIndex: n, onClose: r } = e, i = E(g), s = E(_e), o = E(P), c = O((l) => {
-    const { unitId: d, subUnitId: M } = _t(s) || {};
-    if (t && d && M) {
+  const { range: t, colIndex: n, onClose: r } = e, i = E(g), s = E(_e), o = E(P), a = O((l) => {
+    const { unitId: d, subUnitId: I } = _t(s) || {};
+    if (t && d && I) {
       const C = { ...t, startRow: t.startRow + 1 };
-      i.triggerSortDirectly(l, !1, { unitId: d, subUnitId: M, range: C, colIndex: n });
+      i.triggerSortDirectly(l, !1, { unitId: d, subUnitId: I, range: C, colIndex: n });
     } else
-      throw new Error(`Cannot find the target to sort. unitId: ${d}, subUnitId: ${M}, range: ${t}, colIndex: ${n}`);
+      throw new Error(`Cannot find the target to sort. unitId: ${d}, subUnitId: ${I}, range: ${t}, colIndex: ${n}`);
     r();
   }, [t, n, i, s, r]);
-  return /* @__PURE__ */ m(Rt, { className: "univer-mb-3 univer-w-full", children: [
-    /* @__PURE__ */ m(Z, { className: "univer-w-1/2", onClick: () => c(!0), children: [
-      /* @__PURE__ */ a(ee, { className: "univer-mr-1" }),
-      o.t("sheets-sort.general.sort-asc")
-    ] }),
-    /* @__PURE__ */ m(Z, { className: "univer-w-1/2", onClick: () => c(!1), children: [
-      /* @__PURE__ */ a(te, { className: "univer-mr-1" }),
-      o.t("sheets-sort.general.sort-desc")
-    ] })
-  ] });
+  return /* @__PURE__ */ m(
+    Rt,
+    {
+      className: "univer-mb-3 univer-grid univer-w-full univer-grid-flow-col univer-grid-cols-2 univer-gap-2",
+      children: [
+        /* @__PURE__ */ m(z, { onClick: () => a(!0), children: [
+          /* @__PURE__ */ c(ee, {}),
+          o.t("sheets-sort.general.sort-asc")
+        ] }),
+        /* @__PURE__ */ m(z, { onClick: () => a(!1), children: [
+          /* @__PURE__ */ c(te, {}),
+          o.t("sheets-sort.general.sort-desc")
+        ] })
+      ]
+    }
+  );
 }
-const Pe = "sheet.menu.sheets-sort", Ae = "sheet.menu.sheets-sort-ctx", F = "AscendingSingle", he = "ExpandAscendingSingle", ge = "DescendingSingle", me = "ExpandDescendingSingle", ve = "CustomSortSingle";
+const Pe = "sheet.menu.sheets-sort", Ae = "sheet.menu.sheets-sort-ctx", B = "AscendingSingle", he = "ExpandAscendingSingle", ge = "DescendingSingle", me = "ExpandDescendingSingle", ve = "CustomSortSingle";
 function Xt(e) {
   return {
     id: Pe,
     type: S.SUBITEMS,
-    icon: F,
+    icon: B,
     tooltip: "sheets-sort.general.sort",
     hidden$: Re(e, Y.UNIVER_SHEET),
     disabled$: N(e, { workbookTypes: [H], worksheetTypes: [L, D], rangeTypes: [k] })
@@ -590,7 +596,7 @@ function Xt(e) {
 function Kt(e) {
   return {
     id: re.id,
-    icon: F,
+    icon: B,
     title: "sheets-sort.general.sort-asc-cur",
     type: S.BUTTON,
     hidden$: rt(e)
@@ -633,7 +639,7 @@ function rr(e) {
     id: Ae,
     title: "sheets-sort.general.sort",
     type: S.SUBITEMS,
-    icon: F,
+    icon: B,
     hidden$: Re(e, Y.UNIVER_SHEET),
     disabled$: N(e, {
       workbookTypes: [H],
@@ -644,16 +650,16 @@ function rr(e) {
 }
 function nr(e) {
   return {
-    id: ae.id,
+    id: ce.id,
     title: "sheets-sort.general.sort-asc-cur",
     type: S.BUTTON,
-    icon: F,
+    icon: B,
     disabled$: N(e, { workbookTypes: [H], worksheetTypes: [L, D], rangeTypes: [k] })
   };
 }
 function ir(e) {
   return {
-    id: ce.id,
+    id: ae.id,
     title: "sheets-sort.general.sort-asc-ext",
     type: S.BUTTON,
     icon: he,
@@ -678,7 +684,7 @@ function or(e) {
     disabled$: N(e, { workbookTypes: [H], worksheetTypes: [L, D], rangeTypes: [k] })
   };
 }
-function ar(e) {
+function cr(e) {
   return {
     id: de.id,
     title: "sheets-sort.general.sort-custom",
@@ -687,10 +693,10 @@ function ar(e) {
     disabled$: N(e, { workbookTypes: [H], worksheetTypes: [L, D], rangeTypes: [k] })
   };
 }
-const cr = {
-  [lt.FORMULAS_INSERT]: {
+const ar = {
+  [lt.ORGANIZATION]: {
     [Pe]: {
-      order: 2,
+      order: 3,
       menuItemFactory: Xt,
       [re.id]: {
         order: 0,
@@ -714,16 +720,16 @@ const cr = {
       }
     }
   },
-  [at.MAIN_AREA]: {
-    [ct.DATA]: {
+  [ct.MAIN_AREA]: {
+    [at.DATA]: {
       [Ae]: {
         order: 0,
         menuItemFactory: rr,
-        [ae.id]: {
+        [ce.id]: {
           order: 0,
           menuItemFactory: nr
         },
-        [ce.id]: {
+        [ae.id]: {
           order: 1,
           menuItemFactory: ir
         },
@@ -737,7 +743,7 @@ const cr = {
         },
         [de.id]: {
           order: 4,
-          menuItemFactory: ar
+          menuItemFactory: cr
         }
       }
     }
@@ -747,14 +753,14 @@ var lr = Object.getOwnPropertyDescriptor, ur = (e, t, n, r) => {
   for (var i = r > 1 ? void 0 : r ? lr(t, n) : t, s = e.length - 1, o; s >= 0; s--)
     (o = e[s]) && (i = o(i) || i);
   return i;
-}, I = (e, t) => (n, r) => t(n, r, e);
+}, M = (e, t) => (n, r) => t(n, r, e);
 const pe = "custom-sort-dialog", dr = 560;
 let G = class extends Ye {
-  constructor(e, t, n, r, i, s, o, c, l, d) {
-    super(), this._commandService = e, this._menuManagerService = t, this._dialogService = n, this._layoutService = r, this._uiPartsService = i, this._sheetRenderService = s, this._localeService = o, this._sheetsSortUIService = c, this._injector = l, this._componentManager = d, this._initCommands(), this._initMenu(), this._initUI();
+  constructor(e, t, n, r, i, s, o, a, l, d) {
+    super(), this._commandService = e, this._menuManagerService = t, this._dialogService = n, this._layoutService = r, this._uiPartsService = i, this._sheetRenderService = s, this._localeService = o, this._sheetsSortUIService = a, this._injector = l, this._componentManager = d, this._initCommands(), this._initMenu(), this._initUI();
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(cr);
+    this._menuManagerService.mergeMenu(ar);
   }
   _initCommands() {
     [
@@ -763,15 +769,28 @@ let G = class extends Ye {
       ie,
       se,
       oe,
-      ae,
       ce,
+      ae,
       le,
       ue,
       de
     ].forEach((e) => this.disposeWithMe(this._commandService.registerCommand(e))), this.disposeWithMe(this._sheetRenderService.registerSkeletonChangingMutations(Qe.id));
   }
   _initUI() {
-    this.disposeWithMe(this._componentManager.register("CustomSortPanel", Zt)), this.disposeWithMe(this._uiPartsService.registerComponent(it.FILTER_PANEL_EMBED_POINT, () => vt(qt, this._injector))), this.disposeWithMe(this._componentManager.register(F, ee)), this.disposeWithMe(this._componentManager.register(he, Le)), this.disposeWithMe(this._componentManager.register(ge, te)), this.disposeWithMe(this._componentManager.register(me, De)), this.disposeWithMe(this._componentManager.register(ve, Ne)), this._sheetsSortUIService.customSortState$.pipe(ft(this.dispose$)).subscribe((e) => {
+    this.disposeWithMe(
+      this._uiPartsService.registerComponent(it.FILTER_PANEL_EMBED_POINT, () => vt(qt, this._injector))
+    ), [
+      ["CustomSortPanel", zt],
+      [B, ee],
+      [he, Le],
+      [ge, te],
+      [me, De],
+      [ve, Ne]
+    ].forEach(([e, t]) => {
+      this.disposeWithMe(
+        this._componentManager.register(e, t)
+      );
+    }), this._sheetsSortUIService.customSortState$.pipe(ft(this.dispose$)).subscribe((e) => {
       e && e.show && e.location ? this._openCustomSortPanel(e.location) : e && !(e != null && e.show) && this._closePanel();
     });
   }
@@ -794,16 +813,16 @@ let G = class extends Ye {
   }
 };
 G = ur([
-  I(0, xe),
-  I(1, ut),
-  I(2, dt),
-  I(3, ht),
-  I(4, gt),
-  I(5, w(nt)),
-  I(6, w(P)),
-  I(7, w(g)),
-  I(8, w(Me)),
-  I(9, w(mt))
+  M(0, xe),
+  M(1, ut),
+  M(2, dt),
+  M(3, ht),
+  M(4, gt),
+  M(5, w(nt)),
+  M(6, w(P)),
+  M(7, w(g)),
+  M(8, w(Ie)),
+  M(9, w(mt))
 ], G);
 function hr() {
   return { x: 0, y: 0 };
@@ -838,14 +857,14 @@ $e(W, "type", Y.UNIVER_SHEET);
 $e(W, "pluginName", fr);
 W = Cr([
   qe(et),
-  ye(1, w(Me)),
+  ye(1, w(Ie)),
   ye(2, Xe)
 ], W);
 export {
   re as SortRangeAscCommand,
   ne as SortRangeAscExtCommand,
-  ce as SortRangeAscExtInCtxMenuCommand,
-  ae as SortRangeAscInCtxMenuCommand,
+  ae as SortRangeAscExtInCtxMenuCommand,
+  ce as SortRangeAscInCtxMenuCommand,
   oe as SortRangeCustomCommand,
   de as SortRangeCustomInCtxMenuCommand,
   ie as SortRangeDescCommand,