@underverse-ui/underverse 1.0.202 → 1.0.203

package/dist/index.js

@@ -801,6 +801,8 @@ var en_default = {
       alignCenter: "Align Center",
       alignRight: "Align Right",
       justify: "Justify",
+      decreaseIndent: "Decrease Indent",
+      increaseIndent: "Increase Indent",
       bulletList: "Bullet List",
       orderedList: "Numbered List",
       taskList: "Task List",
@@ -1250,6 +1252,8 @@ var vi_default = {
       alignCenter: "C\u0103n gi\u1EEFa",
       alignRight: "C\u0103n ph\u1EA3i",
       justify: "C\u0103n \u0111\u1EC1u",
+      decreaseIndent: "Gi\u1EA3m l\u1EC1",
+      increaseIndent: "T\u0103ng l\u1EC1",
       bulletList: "Danh s\xE1ch d\u1EA5u ch\u1EA5m",
       orderedList: "Danh s\xE1ch s\u1ED1",
       taskList: "Danh s\xE1ch c\xF4ng vi\u1EC7c",
@@ -1699,6 +1703,8 @@ var ko_default = {
       alignCenter: "\uAC00\uC6B4\uB370 \uC815\uB82C",
       alignRight: "\uC624\uB978\uCABD \uC815\uB82C",
       justify: "\uC591\uCABD \uB9DE\uCDA4",
+      decreaseIndent: "\uB0B4\uC5B4\uC4F0\uAE30",
+      increaseIndent: "\uB4E4\uC5EC\uC4F0\uAE30",
       bulletList: "\uAE00\uBA38\uB9AC \uAE30\uD638 \uBAA9\uB85D",
       orderedList: "\uBC88\uD638 \uB9E4\uAE30\uAE30 \uBAA9\uB85D",
       taskList: "\uD560 \uC77C \uBAA9\uB85D",
@@ -2148,6 +2154,8 @@ var ja_default = {
       alignCenter: "\u4E2D\u592E\u63C3\u3048",
       alignRight: "\u53F3\u63C3\u3048",
       justify: "\u4E21\u7AEF\u63C3\u3048",
+      decreaseIndent: "\u30A4\u30F3\u30C7\u30F3\u30C8\u3092\u6E1B\u3089\u3059",
+      increaseIndent: "\u30A4\u30F3\u30C7\u30F3\u30C8\u3092\u5897\u3084\u3059",
       bulletList: "\u7B87\u6761\u66F8\u304D",
       orderedList: "\u756A\u53F7\u4ED8\u304D\u30EA\u30B9\u30C8",
       taskList: "\u30BF\u30B9\u30AF\u30EA\u30B9\u30C8",
@@ -31497,6 +31505,199 @@ var LetterSpacing = Extension9.create({
 });
 var letter_spacing_default = LetterSpacing;
 
+// src/components/UEditor/indent.ts
+import { Extension as Extension10 } from "@tiptap/core";
+import { isInTable } from "@tiptap/pm/tables";
+var DEFAULT_MAX_LEVEL = 6;
+var DEFAULT_MIN_LEVEL = 0;
+var DEFAULT_STEP_REM = 2;
+var INLINE_TAB_SPACES = "\xA0".repeat(4);
+var LIST_ITEM_TYPES = /* @__PURE__ */ new Set(["listItem", "taskItem"]);
+var TABLE_CELL_TYPES = /* @__PURE__ */ new Set(["tableCell", "tableHeader"]);
+function clampIndentLevel(value, minLevel, maxLevel) {
+  const numericValue = typeof value === "number" ? value : Number.parseInt(String(value ?? ""), 10);
+  if (!Number.isFinite(numericValue)) return minLevel;
+  return Math.min(maxLevel, Math.max(minLevel, Math.round(numericValue)));
+}
+function parseIndentLevel(element, options) {
+  const dataIndent = element.getAttribute("data-indent");
+  if (dataIndent !== null) {
+    return clampIndentLevel(dataIndent, options.minLevel, options.maxLevel);
+  }
+  const marginLeft = element.style.marginLeft.trim();
+  const match = marginLeft.match(/^(-?\d+(?:\.\d+)?)(rem|em|px)$/i);
+  if (!match) return options.minLevel;
+  const value = Number.parseFloat(match[1] ?? "0");
+  const unit = match[2]?.toLowerCase();
+  const remValue = unit === "px" ? value / 16 : value;
+  return clampIndentLevel(remValue / options.stepRem, options.minLevel, options.maxLevel);
+}
+function getNodePos($pos, depth) {
+  return depth > 0 ? $pos.before(depth) : 0;
+}
+function getIndentTargetAt($pos, indentTypes) {
+  for (let depth = $pos.depth; depth > 0; depth -= 1) {
+    const nodeName = $pos.node(depth).type.name;
+    if (LIST_ITEM_TYPES.has(nodeName) || TABLE_CELL_TYPES.has(nodeName)) return null;
+  }
+  if (indentTypes.has("blockquote")) {
+    for (let depth = $pos.depth; depth > 0; depth -= 1) {
+      const node = $pos.node(depth);
+      if (node.type.name === "blockquote") {
+        return { node, pos: getNodePos($pos, depth) };
+      }
+    }
+  }
+  for (let depth = $pos.depth; depth > 0; depth -= 1) {
+    const node = $pos.node(depth);
+    if (indentTypes.has(node.type.name)) {
+      return { node, pos: getNodePos($pos, depth) };
+    }
+  }
+  return null;
+}
+function getIndentTargets(state, types) {
+  if (isInTable(state)) return [];
+  const indentTypes = new Set(types);
+  const targets = /* @__PURE__ */ new Map();
+  const addTarget = (target) => {
+    if (target) targets.set(target.pos, target);
+  };
+  addTarget(getIndentTargetAt(state.selection.$from, indentTypes));
+  addTarget(getIndentTargetAt(state.selection.$to, indentTypes));
+  if (!state.selection.empty) {
+    state.doc.nodesBetween(state.selection.from, state.selection.to, (node, pos) => {
+      if (!indentTypes.has(node.type.name)) return true;
+      const resolvedPos = state.doc.resolve(Math.min(pos + 1, state.doc.content.size));
+      addTarget(getIndentTargetAt(resolvedPos, indentTypes));
+      return node.type.name !== "blockquote";
+    });
+  }
+  return Array.from(targets.values()).sort((a, b) => a.pos - b.pos);
+}
+function updateBlockIndent({
+  state,
+  dispatch,
+  options,
+  delta
+}) {
+  const targets = getIndentTargets(state, options.types);
+  let transaction = state.tr;
+  let changed = false;
+  for (const target of targets) {
+    const currentLevel = clampIndentLevel(target.node.attrs.indent, options.minLevel, options.maxLevel);
+    const nextLevel = clampIndentLevel(currentLevel + delta, options.minLevel, options.maxLevel);
+    if (nextLevel === currentLevel) continue;
+    transaction = transaction.setNodeMarkup(target.pos, void 0, {
+      ...target.node.attrs,
+      indent: nextLevel
+    });
+    changed = true;
+  }
+  if (changed && dispatch) dispatch(transaction.scrollIntoView());
+  return changed;
+}
+function insertTabAtCursor(state, dispatch) {
+  if (!state.selection.empty) return false;
+  if (dispatch) {
+    dispatch(state.tr.insertText(INLINE_TAB_SPACES, state.selection.from).scrollIntoView());
+  }
+  return true;
+}
+function removeTabBeforeCursor(state, dispatch) {
+  if (!state.selection.empty || state.selection.$from.parentOffset <= 0) return false;
+  const cursorPos = state.selection.from;
+  const tabStartPos = cursorPos - INLINE_TAB_SPACES.length;
+  if (tabStartPos < 0 || state.doc.textBetween(tabStartPos, cursorPos) !== INLINE_TAB_SPACES) return false;
+  if (dispatch) {
+    dispatch(state.tr.delete(tabStartPos, cursorPos).scrollIntoView());
+  }
+  return true;
+}
+var Indent = Extension10.create({
+  name: "indent",
+  addOptions() {
+    return {
+      maxLevel: DEFAULT_MAX_LEVEL,
+      minLevel: DEFAULT_MIN_LEVEL,
+      stepRem: DEFAULT_STEP_REM,
+      types: ["paragraph", "blockquote"]
+    };
+  },
+  addGlobalAttributes() {
+    return [
+      {
+        types: this.options.types,
+        attributes: {
+          indent: {
+            default: this.options.minLevel,
+            parseHTML: (element) => parseIndentLevel(element, this.options),
+            renderHTML: (attributes) => {
+              const level = clampIndentLevel(attributes.indent, this.options.minLevel, this.options.maxLevel);
+              if (level <= this.options.minLevel) return {};
+              return {
+                "data-indent": String(level),
+                style: `margin-left: ${level * this.options.stepRem}rem`
+              };
+            }
+          }
+        }
+      }
+    ];
+  },
+  addCommands() {
+    return {
+      increaseIndent: () => ({ editor, commands, state, dispatch }) => {
+        if (editor.isActive("taskItem")) return commands.sinkListItem("taskItem");
+        if (editor.isActive("listItem")) return commands.sinkListItem("listItem");
+        return updateBlockIndent({
+          state,
+          dispatch,
+          options: this.options,
+          delta: 1
+        });
+      },
+      decreaseIndent: () => ({ editor, commands, state, dispatch }) => {
+        if (editor.isActive("taskItem")) return commands.liftListItem("taskItem");
+        if (editor.isActive("listItem")) return commands.liftListItem("listItem");
+        return updateBlockIndent({
+          state,
+          dispatch,
+          options: this.options,
+          delta: -1
+        });
+      }
+    };
+  },
+  addKeyboardShortcuts() {
+    const handleBlockIndent = (delta) => {
+      const { state } = this.editor;
+      const hasBlockTarget = getIndentTargets(state, this.options.types).length > 0;
+      if (!hasBlockTarget) {
+        return delta > 0 ? this.editor.commands.increaseIndent() : this.editor.commands.decreaseIndent();
+      }
+      if (state.selection.empty && state.selection.$from.parentOffset > 0) {
+        if (delta > 0) {
+          return insertTabAtCursor(state, (transaction) => this.editor.view.dispatch(transaction));
+        }
+        removeTabBeforeCursor(state, (transaction) => this.editor.view.dispatch(transaction));
+        return true;
+      }
+      if (delta > 0) {
+        this.editor.commands.increaseIndent();
+      } else {
+        this.editor.commands.decreaseIndent();
+      }
+      return true;
+    };
+    return {
+      Tab: () => handleBlockIndent(1),
+      "Shift-Tab": () => handleBlockIndent(-1)
+    };
+  }
+});
+var indent_default = Indent;
+
 // src/components/UEditor/table-align.ts
 import { Table as Table3 } from "@tiptap/extension-table";
 import { Plugin as Plugin5 } from "@tiptap/pm/state";
@@ -32517,6 +32718,7 @@ function buildUEditorExtensions({
     font_size_default,
     line_height_default,
     letter_spacing_default,
+    indent_default,
     Color,
     Highlight.configure({
       multicolor: true
@@ -32597,6 +32799,8 @@ import {
   Heading1 as Heading1Icon,
   Heading2 as Heading2Icon,
   Heading3 as Heading3Icon,
+  IndentDecrease,
+  IndentIncrease,
   Link as LinkIcon,
   List as ListIcon,
   ListOrdered as ListOrderedIcon,
@@ -33649,6 +33853,77 @@ function getTableAnchorPos(editor) {
   const firstCell = tables[0]?.querySelector("th,td");
   return firstCell instanceof HTMLTableCellElement ? editor.view.posAtDOM(firstCell, 0) + 1 : null;
 }
+var EDITOR_UI_ACTIVE_MARKS = [
+  "blockquote",
+  "bold",
+  "bulletList",
+  "code",
+  "codeBlock",
+  "formCheckbox",
+  "highlight",
+  "image",
+  "italic",
+  "link",
+  "orderedList",
+  "paragraph",
+  "strike",
+  "subscript",
+  "superscript",
+  "taskList",
+  "underline"
+];
+function getEditorUiRenderState(editor) {
+  const textStyle = editor.getAttributes("textStyle");
+  const highlight = editor.getAttributes("highlight");
+  const image = editor.getAttributes("image");
+  const link = editor.getAttributes("link");
+  const tableCell = editor.getAttributes("tableCell");
+  const tableHeader = editor.getAttributes("tableHeader");
+  const hasTableContext = getTableAnchorPos(editor) !== null;
+  const can = editor.can();
+  return {
+    active: EDITOR_UI_ACTIVE_MARKS.map((name) => editor.isActive(name)),
+    alignment: ["left", "center", "right", "justify"].map((textAlign) => editor.isActive({ textAlign })),
+    heading: [1, 2, 3].map((level) => editor.isActive("heading", { level })),
+    textStyle: {
+      color: textStyle.color ?? null,
+      fontFamily: textStyle.fontFamily ?? null,
+      fontSize: textStyle.fontSize ?? null,
+      letterSpacing: textStyle.letterSpacing ?? null,
+      lineHeight: textStyle.lineHeight ?? null
+    },
+    highlightColor: highlight.color ?? null,
+    image: {
+      imageLayout: image.imageLayout ?? null,
+      imageWidthPreset: image.imageWidthPreset ?? null
+    },
+    linkHref: link.href ?? null,
+    tableCell: {
+      backgroundColor: tableCell.backgroundColor ?? tableHeader.backgroundColor ?? null,
+      borderColor: tableCell.borderColor ?? tableHeader.borderColor ?? null,
+      borderStyle: tableCell.borderStyle ?? tableHeader.borderStyle ?? null,
+      borderWidth: tableCell.borderWidth ?? tableHeader.borderWidth ?? null,
+      formula: tableCell.formula ?? tableHeader.formula ?? null,
+      numberFormat: tableCell.numberFormat ?? tableHeader.numberFormat ?? null,
+      textDirection: tableCell.textDirection ?? tableHeader.textDirection ?? null,
+      verticalAlign: tableCell.verticalAlign ?? tableHeader.verticalAlign ?? null
+    },
+    can: {
+      addColumnAfter: hasTableContext && can.addColumnAfter(),
+      addColumnBefore: hasTableContext && can.addColumnBefore(),
+      addRowAfter: hasTableContext && can.addRowAfter(),
+      addRowBefore: hasTableContext && can.addRowBefore(),
+      decreaseIndent: can.decreaseIndent(),
+      increaseIndent: can.increaseIndent(),
+      mergeCells: hasTableContext && can.mergeCells(),
+      redo: can.redo(),
+      splitCell: hasTableContext && can.splitCell(),
+      undo: can.undo()
+    },
+    hasTableContext,
+    isEmpty: editor.isEmpty
+  };
+}
 function fileToDataUrl2(file) {
   return new Promise((resolve, reject) => {
     const reader = new FileReader();
@@ -33702,7 +33977,7 @@ var TableInsertGrid = ({
   const maxCols = 8;
   return /* @__PURE__ */ jsxs75("div", { className: "mb-2 rounded-xl border border-border/60 bg-muted/20 p-2", children: [
     /* @__PURE__ */ jsx93("div", { className: "mb-2 text-sm font-medium text-foreground", children: formatTableInsertLabel(previewTemplate, selection.rows, selection.cols) }),
-    /* @__PURE__ */ jsx93("div", { className: "grid grid-cols-8 gap-1", onMouseLeave: () => setSelection((prev) => prev), children: Array.from({ length: maxRows }).map(
+    /* @__PURE__ */ jsx93("div", { className: "grid grid-cols-8 gap-1", children: Array.from({ length: maxRows }).map(
       (_, rowIndex) => Array.from({ length: maxCols }).map((__, colIndex) => {
         const rows = rowIndex + 1;
         const cols = colIndex + 1;
@@ -33750,9 +34025,9 @@ var EditorToolbar = ({
   letterSpacings
 }) => {
   const t = useSmartTranslations("UEditor");
-  useEditorState({
+  const editorUiState = useEditorState({
     editor,
-    selector: ({ transactionNumber }) => transactionNumber
+    selector: ({ editor: currentEditor }) => getEditorUiRenderState(currentEditor)
   });
   const { textColors, highlightColors } = useEditorColors();
   const [showImageInput, setShowImageInput] = useState50(false);
@@ -33834,6 +34109,24 @@ var EditorToolbar = ({
           children: /* @__PURE__ */ jsx93(FigmaListIcon, { className: "h-4 w-4" })
         }
       ),
+      /* @__PURE__ */ jsx93(
+        ToolbarButton,
+        {
+          onClick: () => editor.chain().focus().decreaseIndent().run(),
+          disabled: !editorUiState.can.decreaseIndent,
+          title: t("toolbar.decreaseIndent"),
+          children: /* @__PURE__ */ jsx93(IndentDecrease, { className: "h-4 w-4" })
+        }
+      ),
+      /* @__PURE__ */ jsx93(
+        ToolbarButton,
+        {
+          onClick: () => editor.chain().focus().increaseIndent().run(),
+          disabled: !editorUiState.can.increaseIndent,
+          title: t("toolbar.increaseIndent"),
+          children: /* @__PURE__ */ jsx93(IndentIncrease, { className: "h-4 w-4" })
+        }
+      ),
       /* @__PURE__ */ jsxs75(
         DropdownMenu,
         {
@@ -34334,6 +34627,24 @@ var EditorToolbar = ({
             ]
           }
         ),
+        /* @__PURE__ */ jsx93(
+          ToolbarButton,
+          {
+            onClick: () => editor.chain().focus().decreaseIndent().run(),
+            disabled: !editorUiState.can.decreaseIndent,
+            title: t("toolbar.decreaseIndent"),
+            children: /* @__PURE__ */ jsx93(IndentDecrease, { className: "h-4 w-4" })
+          }
+        ),
+        /* @__PURE__ */ jsx93(
+          ToolbarButton,
+          {
+            onClick: () => editor.chain().focus().increaseIndent().run(),
+            disabled: !editorUiState.can.increaseIndent,
+            title: t("toolbar.increaseIndent"),
+            children: /* @__PURE__ */ jsx93(IndentIncrease, { className: "h-4 w-4" })
+          }
+        ),
         /* @__PURE__ */ jsxs75(
           DropdownMenu,
           {
@@ -35842,7 +36153,7 @@ var BubbleMenuContent = ({
   const t = useSmartTranslations("UEditor");
   useEditorState2({
     editor,
-    selector: ({ transactionNumber }) => transactionNumber
+    selector: ({ editor: currentEditor }) => getEditorUiRenderState(currentEditor)
   });
   const { textColors, highlightColors } = useEditorColors();
   const [showLinkInput, setShowLinkInput] = useState51(initialShowLinkInput);
@@ -35878,9 +36189,9 @@ var BubbleMenuContent = ({
   const [activeBorderPosition, setActiveBorderPosition] = useState51("all");
   const currentCellVerticalAlign = normalizeStyleValue(editor.getAttributes("tableCell").verticalAlign || editor.getAttributes("tableHeader").verticalAlign) || "";
   const currentCellTextDirection = normalizeStyleValue(editor.getAttributes("tableCell").textDirection || editor.getAttributes("tableHeader").textDirection) || "horizontal";
-  const isInTable2 = isSelectionInTable(editor.state);
-  const canMergeCells = isInTable2 && editor.can().mergeCells();
-  const canSplitCell = isInTable2 && editor.can().splitCell();
+  const isInTable3 = isSelectionInTable(editor.state);
+  const canMergeCells = isInTable3 && editor.can().mergeCells();
+  const canSplitCell = isInTable3 && editor.can().splitCell();
   const currentFontSize = normalizeStyleValue(textStyleAttrs.fontSize);
   const currentLineHeight = normalizeStyleValue(textStyleAttrs.lineHeight);
   const quickFontSizes = useMemo25(
@@ -36226,7 +36537,7 @@ var BubbleMenuContent = ({
       )
     ] });
   }
-  if (showFormulaPanel && isInTable2) {
+  if (showFormulaPanel && isInTable3) {
     return /* @__PURE__ */ jsxs76("div", { className: "w-72 p-2", children: [
       /* @__PURE__ */ jsxs76("div", { className: "mb-2 flex items-center justify-between gap-2", children: [
         /* @__PURE__ */ jsx94("span", { className: "px-1 text-[11px] font-semibold uppercase tracking-wide text-muted-foreground", children: t("tableMenu.formula") || "Formula" }),
@@ -36790,20 +37101,24 @@ var CustomBubbleMenu = ({
         setIsVisible(false);
       }
     };
-    editor.on("selectionUpdate", updatePosition);
-    editor.on("focus", updatePosition);
+    let animationFrameId = null;
+    const schedulePositionUpdate = () => {
+      if (animationFrameId !== null) return;
+      animationFrameId = requestAnimationFrame(() => {
+        animationFrameId = null;
+        updatePosition();
+      });
+    };
+    editor.on("transaction", schedulePositionUpdate);
+    editor.on("focus", schedulePositionUpdate);
     editor.on("blur", handleBlur);
-    editor.on("transaction", updatePosition);
-    editor.on("update", updatePosition);
-    const animationFrameId = requestAnimationFrame(updatePosition);
+    schedulePositionUpdate();
     return () => {
-      cancelAnimationFrame(animationFrameId);
+      if (animationFrameId !== null) cancelAnimationFrame(animationFrameId);
       clearShowTimeout();
-      editor.off("selectionUpdate", updatePosition);
-      editor.off("focus", updatePosition);
+      editor.off("transaction", schedulePositionUpdate);
+      editor.off("focus", schedulePositionUpdate);
       editor.off("blur", handleBlur);
-      editor.off("transaction", updatePosition);
-      editor.off("update", updatePosition);
     };
   }, [editor]);
   useEffect38(() => {
@@ -36893,15 +37208,23 @@ var CustomFloatingMenu = ({ editor }) => {
       setIsVisible(true);
     };
     const handleBlur = () => setIsVisible(false);
-    editor.on("selectionUpdate", updatePosition);
-    editor.on("focus", updatePosition);
+    let animationFrameId = null;
+    const schedulePositionUpdate = () => {
+      if (animationFrameId !== null) return;
+      animationFrameId = requestAnimationFrame(() => {
+        animationFrameId = null;
+        updatePosition();
+      });
+    };
+    editor.on("transaction", schedulePositionUpdate);
+    editor.on("focus", schedulePositionUpdate);
     editor.on("blur", handleBlur);
-    editor.on("update", updatePosition);
+    schedulePositionUpdate();
     return () => {
-      editor.off("selectionUpdate", updatePosition);
-      editor.off("focus", updatePosition);
+      if (animationFrameId !== null) cancelAnimationFrame(animationFrameId);
+      editor.off("transaction", schedulePositionUpdate);
+      editor.off("focus", schedulePositionUpdate);
       editor.off("blur", handleBlur);
-      editor.off("update", updatePosition);
     };
   }, [editor]);
   if (!isVisible) return null;
@@ -36925,12 +37248,20 @@ var CustomFloatingMenu = ({ editor }) => {
 };
 
 // src/components/UEditor/CharacterCount.tsx
+import { useEditorState as useEditorState3 } from "@tiptap/react";
 import { jsxs as jsxs77 } from "react/jsx-runtime";
 var CharacterCountDisplay = ({ editor, maxCharacters }) => {
   const t = useSmartTranslations("UEditor");
-  const storage = editor.storage;
-  const characterCount = storage.characterCount?.characters?.() ?? 0;
-  const wordCount = storage.characterCount?.words?.() ?? 0;
+  const { characterCount, wordCount } = useEditorState3({
+    editor,
+    selector: ({ editor: currentEditor }) => {
+      const storage = currentEditor.storage;
+      return {
+        characterCount: storage.characterCount?.characters?.() ?? 0,
+        wordCount: storage.characterCount?.words?.() ?? 0
+      };
+    }
+  });
   const percentage = maxCharacters ? Math.round(characterCount / maxCharacters * 100) : 0;
   return /* @__PURE__ */ jsxs77("div", { className: "flex items-center gap-3 px-3 py-2 text-xs text-muted-foreground border-t border-border/30 bg-muted/20", children: [
     /* @__PURE__ */ jsxs77("span", { children: [
@@ -40818,7 +41149,7 @@ function cellAround2($pos) {
   for (let d = $pos.depth - 1; d > 0; d--) if ($pos.node(d).type.spec.tableRole == "row") return $pos.node(0).resolve($pos.before(d + 1));
   return null;
 }
-function isInTable(state) {
+function isInTable2(state) {
   const $head = state.selection.$head;
   for (let d = $head.depth; d > 0; d--) if ($head.node(d).type.spec.tableRole == "row") return true;
   return false;
@@ -41334,7 +41665,7 @@ function selectedRect4(state) {
 }
 function deprecated_toggleHeader(type) {
   return function(state, dispatch) {
-    if (!isInTable(state)) return false;
+    if (!isInTable2(state)) return false;
     if (dispatch) {
       const types = tableNodeTypes2(state.schema);
       const rect = selectedRect4(state), tr = state.tr;
@@ -41374,7 +41705,7 @@ function toggleHeader(type, options) {
   options = options || { useDeprecatedLogic: false };
   if (options.useDeprecatedLogic) return deprecated_toggleHeader(type);
   return function(state, dispatch) {
-    if (!isInTable(state)) return false;
+    if (!isInTable2(state)) return false;
     if (dispatch) {
       const types = tableNodeTypes2(state.schema);
       const rect = selectedRect4(state), tr = state.tr;
@@ -44290,7 +44621,7 @@ function useFormulaCoordinateOverlay(editor, containerRef, labels) {
 
 // src/components/UEditor/menu-bar.tsx
 import React89, { useMemo as useMemo26, useRef as useRef39, useState as useState52 } from "react";
-import { useEditorState as useEditorState3 } from "@tiptap/react";
+import { useEditorState as useEditorState4 } from "@tiptap/react";
 import {
   AlignCenter as AlignCenter4,
   AlignJustify as AlignJustify2,
@@ -44910,9 +45241,9 @@ var MenuBar = ({
   onPreview
 }) => {
   const t = useSmartTranslations("UEditor");
-  useEditorState3({
+  useEditorState4({
     editor,
-    selector: ({ transactionNumber }) => transactionNumber
+    selector: ({ editor: currentEditor }) => getEditorUiRenderState(currentEditor)
   });
   const fileInputRef = useRef39(null);
   const [showImageInput, setShowImageInput] = useState52(false);
@@ -45208,18 +45539,31 @@ var MenuBar = ({
 
 // src/components/UEditor/table-formula-bar.tsx
 import { useEffect as useEffect41, useRef as useRef40, useState as useState53 } from "react";
-import { useEditorState as useEditorState4 } from "@tiptap/react";
+import { useEditorState as useEditorState5 } from "@tiptap/react";
 import { AlertCircle as AlertCircle5, Check as Check14, Hash as Hash2, Sigma as Sigma3, Trash2 as Trash26 } from "lucide-react";
 import { jsx as jsx102, jsxs as jsxs83 } from "react/jsx-runtime";
 function TableFormulaBar({ editor }) {
   const t = useSmartTranslations("UEditor");
   const inputRef = useRef40(null);
   const [draftState, setDraftState] = useState53(null);
-  useEditorState4({
+  const selectedFormulaState = useEditorState5({
     editor,
-    selector: ({ transactionNumber }) => transactionNumber
+    selector: ({ editor: currentEditor }) => {
+      const cell = getSelectedTableFormulaCell(currentEditor);
+      if (!cell) return null;
+      return {
+        cellPos: cell.cellPos,
+        column: cell.column,
+        computedValue: cell.computedValue,
+        formula: cell.formula,
+        formulaState: cell.formulaState,
+        label: cell.label,
+        row: cell.row,
+        tablePos: cell.tablePos
+      };
+    }
   });
-  const selectedCell = getSelectedTableFormulaCell(editor);
+  const selectedCell = selectedFormulaState ? getSelectedTableFormulaCell(editor) : null;
   useEffect41(() => {
     const focusFormulaInput = () => {
       inputRef.current?.focus();
@@ -45400,6 +45744,7 @@ var UEditor = React91.forwardRef(({
   const inFlightPrepareRef = useRef41(null);
   const lastAppliedContentRef = useRef41(content ?? "");
   const scheduledFormulaRecalculateRef = useRef41(false);
+  const pendingFormulaTextRecalculateRef = useRef41(false);
   const editorInstanceRef = useRef41(null);
   const formulaRangePickRef = useRef41(null);
   const formulaRangeSurfaceRef = useRef41(null);
@@ -45538,19 +45883,32 @@ var UEditor = React91.forwardRef(({
     },
     onUpdate: ({ editor: editor2, transaction }) => {
       if (!transaction.getMeta(UEDITOR_TABLE_FORMULA_RECALCULATE_META)) {
-        scheduleFormulaRecalculate(editor2);
+        if (isEditingTableFormulaText(editor2)) {
+          pendingFormulaTextRecalculateRef.current = true;
+        } else {
+          pendingFormulaTextRecalculateRef.current = false;
+          scheduleFormulaRecalculate(editor2);
+        }
+      }
+      if (onChange || onHtmlChange) {
+        const html = editor2.getHTML();
+        onChange?.(html);
+        onHtmlChange?.(html);
+      }
+      if (onJsonChange) {
+        onJsonChange(editor2.getJSON());
       }
-      const html = editor2.getHTML();
-      onChange?.(html);
-      onHtmlChange?.(html);
-      onJsonChange?.(editor2.getJSON());
     },
     onSelectionUpdate: ({ editor: editor2 }) => {
-      scheduleFormulaRecalculate(editor2);
+      if (pendingFormulaTextRecalculateRef.current && !isEditingTableFormulaText(editor2)) {
+        pendingFormulaTextRecalculateRef.current = false;
+        scheduleFormulaRecalculate(editor2);
+      }
     },
     onBlur: ({ editor: editor2, event }) => {
       const nextTarget = event.relatedTarget;
       if (nextTarget instanceof Element && nextTarget.closest("[data-ueditor-formula-bar]")) return;
+      pendingFormulaTextRecalculateRef.current = false;
       scheduleFormulaRecalculate(editor2, { force: true });
     }
   });