@univerjs/sheets-ui 0.8.0-nightly.202506101607 → 0.8.0-nightly.202506111607

package/lib/index.js

@@ -5771,7 +5771,7 @@ function z1() {
           children: /* @__PURE__ */ q(
             "div",
             {
-              className: He("univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1 dark:hover:!univer-bg-gray-800 hover:univer-bg-gray-100", wi, {
+              className: He("univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-800", wi, {
                 "univer-bg-gray-100 dark:!univer-bg-gray-800": l,
                 "univer-bg-white dark:!univer-bg-gray-900": !l
               }),
@@ -6015,7 +6015,7 @@ function Z1() {
         children: a.map((h, g) => /* @__PURE__ */ w(
           "li",
           {
-            className: "univer-cursor-pointer univer-px-2 univer-transition-colors univer-duration-200 dark:hover:!univer-bg-gray-600 hover:univer-bg-gray-100",
+            className: "univer-cursor-pointer univer-px-2 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-600",
             onClick: () => {
               u(h);
             },
@@ -6051,7 +6051,7 @@ function Z1() {
     /* @__PURE__ */ q(
       "div",
       {
-        className: "univer-cursor-pointer univer-p-2 univer-transition-colors univer-duration-200 dark:hover:!univer-bg-gray-600 hover:univer-bg-gray-100",
+        className: "univer-cursor-pointer univer-p-2 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-600",
         onClick: d,
         children: [
           /* @__PURE__ */ w(
@@ -6088,7 +6088,7 @@ function G1({ disable: r }) {
         /* @__PURE__ */ w(
           "input",
           {
-            className: He("univer-box-border univer-h-full univer-w-full univer-appearance-none univer-px-1.5 univer-text-gray-900 dark:!univer-border-r-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-white focus:univer-outline-none", Td, {
+            className: He("univer-box-border univer-h-full univer-w-full univer-appearance-none univer-px-1.5 univer-text-gray-900 focus:univer-outline-none dark:!univer-border-r-gray-700 dark:!univer-bg-gray-900 dark:!univer-text-white", Td, {
               "univer-cursor-not-allowed": r
             }),
             type: "text",
@@ -6104,8 +6104,8 @@ function G1({ disable: r }) {
             children: /* @__PURE__ */ w(
               "a",
               {
-                className: He("univer-absolute univer-right-0 univer-top-0 univer-flex univer-h-full univer-cursor-pointer univer-items-center univer-justify-center univer-px-1 univer-transition-colors univer-duration-200 dark:!univer-text-white dark:hover:!univer-bg-gray-800 hover:univer-bg-gray-100", {
-                  "univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-700 hover:univer-bg-transparent": r
+                className: He("univer-absolute univer-right-0 univer-top-0 univer-flex univer-h-full univer-cursor-pointer univer-items-center univer-justify-center univer-px-1 univer-transition-colors univer-duration-200 hover:univer-bg-gray-100 dark:!univer-text-white dark:hover:!univer-bg-gray-800", {
+                  "univer-cursor-not-allowed univer-text-gray-300 hover:univer-bg-transparent dark:!univer-text-gray-700": r
                 }),
                 children: /* @__PURE__ */ w(li, {})
               }
@@ -6264,7 +6264,7 @@ function q1(r) {
                   "span",
                   {
                     className: He("univer-flex univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-base dark:!univer-text-white", {
-                      "univer-cursor-pointer univer-text-green-600 dark:!univer-text-green-400 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100": n
+                      "univer-cursor-pointer univer-text-green-600 hover:univer-bg-gray-100 dark:!univer-text-green-400 dark:hover:!univer-bg-gray-700": n
                     }),
                     onClick: W,
                     children: /* @__PURE__ */ w(fm, {})
@@ -6274,7 +6274,7 @@ function q1(r) {
                   "span",
                   {
                     className: He("univer-flex univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-base dark:!univer-text-white", {
-                      "univer-cursor-pointer univer-text-red-600 dark:!univer-text-red-400 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100": n
+                      "univer-cursor-pointer univer-text-red-600 hover:univer-bg-gray-100 dark:!univer-text-red-400 dark:hover:!univer-bg-gray-700": n
                     }),
                     onClick: j,
                     children: /* @__PURE__ */ w(_i, {})
@@ -6283,7 +6283,7 @@ function q1(r) {
                 /* @__PURE__ */ w(
                   "span",
                   {
-                    className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-base dark:!univer-text-white dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100",
+                    className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-base hover:univer-bg-gray-100 dark:!univer-text-white dark:hover:!univer-bg-gray-700",
                     onClick: B,
                     children: /* @__PURE__ */ w(Cm, {})
                   }
@@ -6518,8 +6518,8 @@ function Q1(r) {
                   dark:!univer-bg-gray-900
                 ` : `
                   univer-font-medium univer-text-gray-900
-                  dark:hover:!univer-bg-gray-700
                   hover:univer-bg-gray-100
+                  dark:hover:!univer-bg-gray-700
                 `),
       style: {
         backgroundColor: !s && n ? n : "",
@@ -14055,6 +14055,9 @@ const ir = {
     if (m && !e.defaultMerge && !await o.confirm({
       id: "merge.confirm.add-worksheet-merge",
       title: {
+        title: "merge.confirm.warning"
+      },
+      children: {
         title: "merge.confirm.title"
       },
       cancelText: s.t("merge.confirm.cancel"),
@@ -14167,8 +14170,8 @@ const ir = {
       return m ? d(g) > d(m) : !1;
     }) ? await e.confirm({
       id: qo.id,
-      title: { title: n.t("merge.confirm.waring") },
-      children: { title: n.t("merge.confirm.dismantleMergeCellWaring") },
+      title: { title: n.t("merge.confirm.warning") },
+      children: { title: n.t("merge.confirm.dismantleMergeCellWarning") },
       cancelText: n.t("button.cancel"),
       confirmText: n.t("button.confirm")
     }) ? t.executeCommand(Iu.id) : !0 : t.executeCommand(Iu.id);
@@ -14199,8 +14202,8 @@ const ir = {
       return m ? d(g) > d(m) : !1;
     }) ? await e.confirm({
       id: di.id,
-      title: { title: n.t("merge.confirm.waring") },
-      children: { title: n.t("merge.confirm.dismantleMergeCellWaring") },
+      title: { title: n.t("merge.confirm.warning") },
+      children: { title: n.t("merge.confirm.dismantleMergeCellWarning") },
       cancelText: n.t("button.cancel"),
       confirmText: n.t("button.confirm")
     }) ? t.executeCommand(yu.id) : !0 : t.executeCommand(yu.id);
@@ -14233,8 +14236,8 @@ const ir = {
       return m ? d(g) > d(m) : !1;
     }) ? await e.confirm({
       id: ui.id,
-      title: { title: n.t("merge.confirm.waring") },
-      children: { title: n.t("merge.confirm.dismantleMergeCellWaring") },
+      title: { title: n.t("merge.confirm.warning") },
+      children: { title: n.t("merge.confirm.dismantleMergeCellWarning") },
       cancelText: n.t("button.cancel"),
       confirmText: n.t("button.confirm")
     }) ? t.executeCommand(_c.id) : !0 : t.executeCommand(_c.id);
@@ -14259,8 +14262,8 @@ const ir = {
       return m ? d(g) > d(m) : !1;
     }) ? await e.confirm({
       id: Ko.id,
-      title: { title: n.t("merge.confirm.waring") },
-      children: { title: n.t("merge.confirm.dismantleMergeCellWaring") },
+      title: { title: n.t("merge.confirm.warning") },
+      children: { title: n.t("merge.confirm.dismantleMergeCellWarning") },
       cancelText: n.t("button.cancel"),
       confirmText: n.t("button.confirm")
     }) ? t.executeCommand(bc.id) : !0 : t.executeCommand(bc.id);
@@ -14972,7 +14975,7 @@ function gf(r) {
         children: hf.map((a) => /* @__PURE__ */ w(
           "a",
           {
-            className: He("univer-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-justify-self-center univer-rounded dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100", {
+            className: He("univer-flex univer-size-6 univer-cursor-pointer univer-items-center univer-justify-center univer-justify-self-center univer-rounded hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700", {
               "univer-bg-gray-200 dark:!univer-bg-gray-600": t.getBorderInfo().type === a.value
             }),
             onClick: (c) => {
@@ -14993,7 +14996,7 @@ function gf(r) {
           children: /* @__PURE__ */ q(
             "button",
             {
-              className: "univer-flex univer-cursor-pointer univer-items-center univer-gap-2 univer-rounded univer-border-none univer-bg-transparent univer-p-1 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100",
+              className: "univer-flex univer-cursor-pointer univer-items-center univer-gap-2 univer-rounded univer-border-none univer-bg-transparent univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700",
               type: "button",
               children: [
                 /* @__PURE__ */ w(
@@ -15015,7 +15018,7 @@ function gf(r) {
           overlay: /* @__PURE__ */ w("section", { className: "univer-rounded-lg univer-p-1.5", children: /* @__PURE__ */ w("ul", { className: "univer-m-0 univer-grid univer-list-none univer-gap-1 univer-p-0", children: Y_.map((a) => /* @__PURE__ */ w(
             "li",
             {
-              className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-px-1 univer-py-2 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100",
+              className: "univer-flex univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-px-1 univer-py-2 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700",
               onClick: () => o(a.value, "style"),
               children: /* @__PURE__ */ w(
                 ph,
@@ -15030,7 +15033,7 @@ function gf(r) {
           children: /* @__PURE__ */ q(
             "button",
             {
-              className: "univer-flex univer-cursor-pointer univer-items-center univer-gap-2 univer-rounded univer-border-none univer-bg-transparent univer-p-1 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-100",
+              className: "univer-flex univer-cursor-pointer univer-items-center univer-gap-2 univer-rounded univer-border-none univer-bg-transparent univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700",
               type: "button",
               children: [
                 /* @__PURE__ */ w(
@@ -15692,7 +15695,7 @@ const J_ = (r) => {
           S,
           {
             ref: ne,
-            className: He("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent dark:!univer-bg-gray-700 dark:!univer-text-white hover:univer-border-primary-600", wi),
+            className: He("univer-box-border univer-h-8 univer-w-full univer-cursor-pointer univer-items-center univer-rounded-lg univer-bg-white univer-pt-2 univer-transition-colors hover:univer-border-primary-600 dark:!univer-bg-gray-700 dark:!univer-text-white [&>div:first-child]:univer-px-2.5 [&>div]:univer-h-5 [&>div]:univer-ring-transparent", wi),
             initValue: E,
             unitId: I,
             subUnitId: R,
@@ -15872,7 +15875,7 @@ const J_ = (r) => {
               /* @__PURE__ */ q(
                 "div",
                 {
-                  className: He("univer-group univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center univer-justify-between univer-rounded-md univer-p-2 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-50", {
+                  className: He("univer-group univer-relative univer-flex univer-cursor-default univer-select-none univer-items-center univer-justify-between univer-rounded-md univer-p-2 hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-700", {
                     "univer-hidden": P.id === h
                   }),
                   onClick: () => {
@@ -15901,7 +15904,7 @@ const J_ = (r) => {
                     /* @__PURE__ */ w(Yn, { title: n.t("definedName.updateButton"), placement: "top", children: /* @__PURE__ */ w(
                       "a",
                       {
-                        className: "univer-absolute univer-right-[60px] univer-top-1/2 univer-hidden -univer-translate-y-1/2 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-xs univer-text-primary-600 dark:hover:!univer-bg-gray-600 group-hover:univer-flex hover:univer-bg-gray-100",
+                        className: "univer-absolute univer-right-[60px] univer-top-1/2 univer-hidden -univer-translate-y-1/2 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-xs univer-text-primary-600 hover:univer-bg-gray-100 group-hover:univer-flex dark:hover:!univer-bg-gray-600",
                         onClick: (H) => {
                           H.stopPropagation(), E(P.id);
                         },
@@ -15911,7 +15914,7 @@ const J_ = (r) => {
                     /* @__PURE__ */ w(Yn, { title: n.t("definedName.deleteButton"), placement: "top", children: /* @__PURE__ */ w(
                       "a",
                       {
-                        className: "univer-absolute univer-text-xs univer-text-error univer-right-5 univer-top-1/2 univer-hidden -univer-translate-y-1/2 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-red-600 dark:hover:!univer-bg-gray-600 group-hover:univer-flex hover:univer-bg-gray-100",
+                        className: "univer-text-error univer-absolute univer-right-5 univer-top-1/2 univer-hidden -univer-translate-y-1/2 univer-cursor-pointer univer-items-center univer-justify-center univer-rounded univer-p-1 univer-text-xs univer-text-red-600 hover:univer-bg-gray-100 group-hover:univer-flex dark:hover:!univer-bg-gray-600",
                         onClick: (H) => {
                           H.stopPropagation(), p(P.id);
                         },
@@ -18157,7 +18160,7 @@ const Rh = 2, Qb = [
           children: /* @__PURE__ */ q(
             "div",
             {
-              className: He("univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1 dark:hover:!univer-bg-gray-800 hover:univer-bg-gray-100", wi, {
+              className: He("univer-flex univer-items-center univer-gap-2 univer-rounded univer-p-1 hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-800", wi, {
                 "univer-bg-gray-100 dark:!univer-bg-gray-800": l,
                 "univer-bg-white dark:!univer-bg-gray-900": !l
               }),
@@ -20917,7 +20920,7 @@ const sp = (r, e, t, n, i) => {
   if (!v || !p)
     return null;
   const C = v.getUnitId(), _ = p.getSheetId();
-  return /* @__PURE__ */ q("div", { className: "univer-mt-auto univer-flex univer-flex-row-reverse univer-py-5 univer-gap-2", children: [
+  return /* @__PURE__ */ q("div", { className: "univer-mt-auto univer-flex univer-flex-row-reverse univer-gap-2 univer-py-5", children: [
     /* @__PURE__ */ w(
       Xt,
       {
@@ -21350,7 +21353,7 @@ function JR() {
               V.description && /* @__PURE__ */ w(Yn, { title: V.description, children: /* @__PURE__ */ w(
                 "div",
                 {
-                  className: "univer-text-3 univer-max-w-64 univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-400 univer-mt-2]",
+                  className: "univer-text-3 univer-mt-2] univer-max-w-64 univer-overflow-hidden univer-text-ellipsis univer-whitespace-nowrap univer-text-gray-400",
                   children: V.description
                 }
               ) })
@@ -22588,7 +22591,7 @@ const yI = (r) => {
               return /* @__PURE__ */ q(
                 "div",
                 {
-                  className: "univer-mt-1 univer-flex univer-cursor-pointer univer-flex-row univer-items-center univer-justify-between univer-rounded-md univer-px-1.5 univer-py-1 dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-50",
+                  className: "univer-mt-1 univer-flex univer-cursor-pointer univer-flex-row univer-items-center univer-justify-between univer-rounded-md univer-px-1.5 univer-py-1 hover:univer-bg-gray-50 dark:hover:!univer-bg-gray-700",
                   onClick: y,
                   children: [
                     /* @__PURE__ */ w(
@@ -22632,7 +22635,7 @@ const yI = (r) => {
               children: /* @__PURE__ */ w(
                 "a",
                 {
-                  className: "univer-block univer-cursor-pointer univer-rounded univer-px-1.5 univer-py-1 univer-text-xs dark:hover:!univer-bg-gray-700 hover:univer-bg-gray-200",
+                  className: "univer-block univer-cursor-pointer univer-rounded univer-px-1.5 univer-py-1 univer-text-xs hover:univer-bg-gray-200 dark:hover:!univer-bg-gray-700",
                   onClick: s,
                   children: u.t("dataValidation.list.edit")
                 }

package/lib/locale/en-US.js

@@ -107,8 +107,8 @@ const e = {
       title: "Continue merging would only keep the upper-left cell value, discard other values. Are you sure to continue?",
       cancel: "Cancel merging",
       confirm: "Continue merging",
-      waring: "Waring",
-      dismantleMergeCellWaring: "This will cause some merged cells to be split. Do you want to continue?"
+      warning: "Warning",
+      dismantleMergeCellWarning: "This will cause some merged cells to be split. Do you want to continue?"
     }
   },
   filter: {

package/lib/locale/fa-IR.js

@@ -107,8 +107,8 @@ const e = {
       title: "ادامه ادغام فقط مقدار سلول بالا-چپ را نگه می‌دارد و مقادیر دیگر حذف خواهند شد. آیا مطمئن هستید که می‌خواهید ادامه دهید؟",
       cancel: "لغو ادغام",
       confirm: "ادامه ادغام",
-      waring: "هشدار",
-      dismantleMergeCellWaring: "این باعث شکستن برخی از سلول‌های ادغام‌شده می‌شود. آیا می‌خواهید ادامه دهید؟"
+      warning: "هشدار",
+      dismantleMergeCellWarning: "این باعث شکستن برخی از سلول‌های ادغام‌شده می‌شود. آیا می‌خواهید ادامه دهید؟"
     }
   },
   filter: {

package/lib/locale/fr-FR.js

@@ -107,8 +107,8 @@ const e = {
       title: "Continuer la fusion ne conserverait que la valeur de la cellule en haut à gauche, les autres valeurs seront supprimées. Voulez-vous continuer ?",
       cancel: "Annuler la fusion",
       confirm: "Continuer la fusion",
-      waring: "Avertissement",
-      dismantleMergeCellWaring: "Cela entraînera la division de certaines cellules fusionnées. Voulez-vous continuer ?"
+      warning: "Avertissement",
+      dismantleMergeCellWarning: "Cela entraînera la division de certaines cellules fusionnées. Voulez-vous continuer ?"
     }
   },
   filter: {

package/lib/locale/ru-RU.js

@@ -107,8 +107,8 @@ const e = {
       title: "Продолжение объединения сохранит только значение в верхней левой ячейке, остальные значения будут удалены. Вы уверены, что хотите продолжить?",
       cancel: "Отменить объединение",
       confirm: "Продолжить объединение",
-      waring: "Предупреждение",
-      dismantleMergeCellWaring: "Это приведет к разделению некоторых объединенных ячеек. Продолжить?"
+      warning: "Предупреждение",
+      dismantleMergeCellWarning: "Это приведет к разделению некоторых объединенных ячеек. Продолжить?"
     }
   },
   filter: {

package/lib/locale/vi-VN.js

@@ -107,8 +107,8 @@ const n = {
       title: "Hợp nhất ô chỉ giữ giá trị của ô trên cùng bên trái, bạn có muốn tiếp tục không?",
       cancel: "Hủy hợp nhất",
       confirm: "Tiếp tục hợp nhất",
-      waring: "Cảnh báo",
-      dismantleMergeCellWaring: "Thao tác này sẽ làm rời một số ô đã hợp nhất, bạn có muốn tiếp tục không?"
+      warning: "Cảnh báo",
+      dismantleMergeCellWarning: "Thao tác này sẽ làm rời một số ô đã hợp nhất, bạn có muốn tiếp tục không?"
     }
   },
   filter: {

package/lib/locale/zh-CN.js

@@ -108,8 +108,8 @@ const e = {
       title: "合并单元格仅保存左上角单元格的值，是否继续？",
       cancel: "取消合并",
       confirm: "继续合并",
-      waring: "警告",
-      dismantleMergeCellWaring: "此操作会导致一些合并单元格被拆散，是否继续?"
+      warning: "警告",
+      dismantleMergeCellWarning: "此操作会导致一些合并单元格被拆散，是否继续?"
     }
   },
   filter: {

package/lib/locale/zh-TW.js

@@ -108,8 +108,8 @@ const e = {
       title: "合併儲存格僅儲存左上角儲存格的值，是否繼續？ ",
       cancel: "取消合併",
       confirm: "繼續合併",
-      waring: "警告",
-      dismantleMergeCellWaring: "此操作會導致一些合併單元格被拆散，是否繼續?"
+      warning: "警告",
+      dismantleMergeCellWarning: "此操作會導致一些合併單元格被拆散，是否繼續?"
     }
   },
   filter: {

package/lib/types/locale/en-US.d.ts

@@ -122,8 +122,8 @@ declare const locale: {
             title: string;
             cancel: string;
             confirm: string;
-            waring: string;
-            dismantleMergeCellWaring: string;
+            warning: string;
+            dismantleMergeCellWarning: string;
         };
     };
     filter: {