From 82459112721a5076e8f99d03afccd09bed517cca Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Mon, 9 Mar 2026 16:07:48 +0530
Subject: [PATCH 01/13] change color for data validation

---
 packages/react/src/components/DataVerification/ColorPicker.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/src/components/DataVerification/ColorPicker.tsx b/packages/react/src/components/DataVerification/ColorPicker.tsx
index e69311d9..c7fe66bd 100644
--- a/packages/react/src/components/DataVerification/ColorPicker.tsx
+++ b/packages/react/src/components/DataVerification/ColorPicker.tsx
@@ -10,7 +10,7 @@ import {
 
 export const TEXT_COLORS = [
   { name: "Light Gray", value: "228, 232, 237" },
-  { name: "White", value: "249, 249, 249" },
+  { name: "White", value: "219, 233, 236" },
   { name: "Pink", value: "244, 217, 227" },
   { name: "Peach", value: "247, 229, 207" },
   { name: "Blue", value: "217, 234, 244" },

From f7e1218f3a9341b5a92900c77fdacaaf72feeaa5 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Tue, 10 Mar 2026 18:45:07 +0530
Subject: [PATCH 02/13] minor changes

---
 packages/core/package.json  | 2 +-
 packages/react/package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 285934a2..a4eff59d 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.10",
+  "version": "1.3.10-input",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/react/package.json b/packages/react/package.json
index 76d9cf0a..2dfff41e 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.10",
+  "version": "1.3.10-input",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.10",
+    "@fileverse-dev/fortune-core": "1.3.10-input",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",

From 0c4301ed47abde55d65e8a4cafaa2029640e6eff Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Thu, 12 Mar 2026 15:14:23 +0530
Subject: [PATCH 03/13] add cmd + shift + arrow

---
 packages/core/package.json                    |   2 +-
 packages/core/src/events/keyboard.ts          |  33 ++-
 packages/core/src/events/mouse.ts             |   1 +
 packages/core/src/locale/en.ts                |   3 +
 packages/core/src/locale/es.ts                |   3 +
 packages/core/src/locale/hi.ts                |   3 +
 packages/core/src/locale/zh.ts                |   3 +
 packages/core/src/locale/zh_tw.ts             |   3 +
 packages/core/src/modules/ConditionFormat.ts  |  38 ++++
 packages/core/src/types.ts                    |   3 +
 packages/react/package.json                   |   4 +-
 .../ConditionFormat/ConditionRules.tsx        |  20 +-
 .../src/components/ConditionFormat/index.tsx  |   1 +
 .../src/components/SheetOverlay/InputBox.tsx  | 197 ++++++++++++------
 14 files changed, 235 insertions(+), 79 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index a4eff59d..7245dac4 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.10-input",
+  "version": "1.3.10-input-1",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/core/src/events/keyboard.ts b/packages/core/src/events/keyboard.ts
index 254355cd..2c82fe10 100644
--- a/packages/core/src/events/keyboard.ts
+++ b/packages/core/src/events/keyboard.ts
@@ -155,19 +155,19 @@ function handleControlPlusArrowKey(
   e: KeyboardEvent,
   shiftPressed: boolean
 ) {
-  if (ctx.luckysheetCellUpdate.length > 0) return;
+  //if (ctx.luckysheetCellUpdate.length > 0) return;
 
   const idx = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.isNil(idx)) return;
 
   const file = ctx.luckysheetfile[idx];
-  if (!file || !file.row || !file.column) return;
+  //if (!file || !file.row || !file.column) return;
   const maxRow = file.row;
   const maxCol = file.column;
   let last;
   if (ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0)
     last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
-  if (!last) return;
+  //if (!last) return;
 
   const currR = last.row_focus;
   const currC = last.column_focus;
@@ -872,7 +872,29 @@ export async function handleGlobalKeyDown(
       kstr === "ArrowLeft" ||
       kstr === "ArrowRight"
     ) {
-      handleArrowKey(ctx, e);
+      const isEditing = ctx.luckysheetCellUpdate.length > 0;
+      const inputText = cellInput?.innerText ?? "";
+      const isFormulaEdit = isEditing && inputText.trim().startsWith("=");
+      const enteredByTyping = cache.enteredEditByTyping === true;
+
+      // Only when we entered edit by typing (not double-click): arrow keys
+      // commit and move to next cell in that direction.
+      if (isEditing && !isFormulaEdit && enteredByTyping) {
+        updateCell(
+          ctx,
+          ctx.luckysheetCellUpdate[0],
+          ctx.luckysheetCellUpdate[1],
+          cellInput,
+          undefined,
+          canvas
+        );
+        cache.enteredEditByTyping = false;
+        handleArrowKey(ctx, e);
+        e.preventDefault();
+      } else {
+        // Double-click edit mode or formula: preserve existing behavior
+        handleArrowKey(ctx, e);
+      }
     } else if (
       !(
         (kcode >= 112 && kcode <= 123) ||
@@ -907,6 +929,8 @@ export async function handleGlobalKeyDown(
 
         ctx.luckysheetCellUpdate = [row_index, col_index];
         cache.overwriteCell = true;
+        cache.overwriteCellFirstChar = e.key;
+        cache.enteredEditByTyping = true;
 
         // if (kstr === "Backspace") {
         //   $("#luckysheet-rich-text-editor").html("<br/>");
@@ -917,6 +941,7 @@ export async function handleGlobalKeyDown(
         //   $("#luckysheet-rich-text-editor"),
         //   kcode
         // );
+        e.preventDefault();
       }
     }
   }
diff --git a/packages/core/src/events/mouse.ts b/packages/core/src/events/mouse.ts
index faa5be66..6dbf7eff 100644
--- a/packages/core/src/events/mouse.ts
+++ b/packages/core/src/events/mouse.ts
@@ -1437,6 +1437,7 @@ export function handleCellAreaDoubleClick(
     col_index = column_focus;
   }
 
+  globalCache.enteredEditByTyping = false;
   luckysheetUpdateCell(ctx, row_index, col_index);
   // }
 }
diff --git a/packages/core/src/locale/en.ts b/packages/core/src/locale/en.ts
index 25cb4c1c..cdb86e3a 100644
--- a/packages/core/src/locale/en.ts
+++ b/packages/core/src/locale/en.ts
@@ -11674,6 +11674,8 @@ export default {
     conditionformat_textContains: "Conditional format - Text Contains",
     conditionformat_textContains_title:
       "Format cells containing the following text",
+    conditionformat_empty: "Conditional format - Empty",
+    conditionformat_empty_title: "Format cells that are empty",
     conditionformat_occurrenceDate: "Conditional format - Occurrence Date",
     conditionformat_occurrenceDate_title:
       "Format cells containing the following dates",
@@ -11780,6 +11782,7 @@ export default {
     between2: "",
     contain: "Contain",
     textContains: "Text contains",
+    empty: "Empty",
     duplicateValue: "Duplicate value",
     uniqueValue: "Unique value",
     top: "Top",
diff --git a/packages/core/src/locale/es.ts b/packages/core/src/locale/es.ts
index 3f04055a..06ed075b 100644
--- a/packages/core/src/locale/es.ts
+++ b/packages/core/src/locale/es.ts
@@ -11657,6 +11657,8 @@ export default {
     conditionformat_textContains: "Conditionformat-TextContains",
     conditionformat_textContains_title:
       "Dar formato a las celdas que contienen el siguiente texto",
+    conditionformat_empty: "Conditional format - Empty",
+    conditionformat_empty_title: "Dar formato a las celdas vacías",
     conditionformat_occurrenceDate: "Conditionformat-OccurrenceDate",
     conditionformat_occurrenceDate_title:
       "Dar formato a celdas que contienen las siguientes fechas",
@@ -11768,6 +11770,7 @@ export default {
     between2: "",
     contain: "Contiene",
     textContains: "Texto contiene",
+    empty: "Vacío",
     duplicateValue: "Valor duplicado",
     uniqueValue: "Valor Unico",
     top: "Mejor",
diff --git a/packages/core/src/locale/hi.ts b/packages/core/src/locale/hi.ts
index 5891d7e0..a6140922 100644
--- a/packages/core/src/locale/hi.ts
+++ b/packages/core/src/locale/hi.ts
@@ -11696,6 +11696,8 @@ export default {
     conditionformat_textContains: "Conditionformat-TextContains",
     conditionformat_textContains_title:
       "निम्नलिखित पाठ वाली कोशिकाओं को प्रारूपित करें",
+    conditionformat_empty: "Conditional format - Empty",
+    conditionformat_empty_title: "खाली कोशिकाओं को प्रारूपित करें",
     conditionformat_occurrenceDate: "Conditionformat-OccurrenceDate",
     conditionformat_occurrenceDate_title:
       "निम्नलिखित तिथियों वाली कोशिकाओं को प्रारूपित करें",
@@ -11806,6 +11808,7 @@ export default {
     between2: "",
     contain: "शामिल",
     textContains: "पाठ शामिल है",
+    empty: "खाली",
     duplicateValue: "डुप्लिकेट मान",
     uniqueValue: "अद्वितीय मान",
     top: "शीर्ष",
diff --git a/packages/core/src/locale/zh.ts b/packages/core/src/locale/zh.ts
index 7c5b1b40..3b7fe7f7 100644
--- a/packages/core/src/locale/zh.ts
+++ b/packages/core/src/locale/zh.ts
@@ -11723,6 +11723,8 @@ export default {
     conditionformat_equal_title: "为等于以下值的单元格设置格式",
     conditionformat_textContains: "条件格式——文本包含",
     conditionformat_textContains_title: "为包含以下文本的单元格设置格式",
+    conditionformat_empty: "条件格式——空值",
+    conditionformat_empty_title: "为空单元格设置格式",
     conditionformat_occurrenceDate: "条件格式——发生日期",
     conditionformat_occurrenceDate_title: "为包含以下日期的单元格设置格式",
     conditionformat_duplicateValue: "条件格式——重复值",
@@ -11825,6 +11827,7 @@ export default {
     between2: "之间",
     contain: "包含",
     textContains: "文本包含",
+    empty: "空值",
     duplicateValue: "重复值",
     uniqueValue: "唯一值",
     top: "前",
diff --git a/packages/core/src/locale/zh_tw.ts b/packages/core/src/locale/zh_tw.ts
index 2197eb8d..a23bd33b 100644
--- a/packages/core/src/locale/zh_tw.ts
+++ b/packages/core/src/locale/zh_tw.ts
@@ -11680,6 +11680,8 @@ export default {
     conditionformat_equal_title: "為等於以下值的儲存格設定格式",
     conditionformat_textContains: "條件格式——文字包含",
     conditionformat_textContains_title: "為包含以下文字的儲存格設定格式",
+    conditionformat_empty: "條件格式——空值",
+    conditionformat_empty_title: "為空儲存格設定格式",
     conditionformat_occurrenceDate: "條件格式——發生日期",
     conditionformat_occurrenceDate_title: "為包含以下日期的儲存格設定格式",
     conditionformat_duplicateValue: "條件格式——重複值",
@@ -11782,6 +11784,7 @@ export default {
     between2: "之間",
     contain: "包含",
     textContains: "文字包含",
+    empty: "空值",
     duplicateValue: "重複值",
     uniqueValue: "唯一值",
     top: "前",
diff --git a/packages/core/src/modules/ConditionFormat.ts b/packages/core/src/modules/ConditionFormat.ts
index d45fba03..d9ace972 100644
--- a/packages/core/src/modules/ConditionFormat.ts
+++ b/packages/core/src/modules/ConditionFormat.ts
@@ -976,6 +976,44 @@ export function compute(ctx: Context, ruleArr: any, d: CellMatrix) {
                 }
               }
             }
+          } else if (conditionName === "empty") {
+            // Format cells that are empty (no value or blank)
+            for (
+              let r = cellrange[s].row[0];
+              r <= cellrange[s].row[1];
+              r += 1
+            ) {
+              for (
+                let c = cellrange[s].column[0];
+                c <= cellrange[s].column[1];
+                c += 1
+              ) {
+                const cell = _.isNil(d[r]) || _.isNil(d[r][c]) ? null : d[r][c];
+                const isEmpty =
+                  _.isNil(cell) ||
+                  _.isNil(cell.v) ||
+                  isRealNull(cell.v);
+                if (isEmpty) {
+                  if (`${r}_${c}` in computeMap) {
+                    computeMap[`${r}_${c}`].textColor = textColor;
+                    computeMap[`${r}_${c}`].cellColor = cellColor;
+                    computeMap[`${r}_${c}`].bold = bold;
+                    computeMap[`${r}_${c}`].italic = italic;
+                    computeMap[`${r}_${c}`].underline = underline;
+                    computeMap[`${r}_${c}`].strikethrough = strikethrough;
+                  } else {
+                    computeMap[`${r}_${c}`] = {
+                      textColor,
+                      cellColor,
+                      bold,
+                      italic,
+                      underline,
+                      strikethrough,
+                    };
+                  }
+                }
+              }
+            }
           } else if (conditionName === "between") {
             // UPDATED BETWEEN COMPARISON WITH STRING SUPPORT
             // 循环应用范围计算
diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
index 06e3354b..7136829b 100644
--- a/packages/core/src/types.ts
+++ b/packages/core/src/types.ts
@@ -305,6 +305,9 @@ export type GlobalCache = {
   verticalScrollLock?: boolean;
   horizontalScrollLock?: boolean;
   overwriteCell?: boolean;
+  overwriteCellFirstChar?: string;
+  /** True when current cell was opened for edit by typing (not double-click). Used so arrow keys commit+move only in that case. */
+  enteredEditByTyping?: boolean;
   ignoreWriteCell?: boolean;
   doNotFocus?: boolean;
   doNotUpdateCell?: boolean;
diff --git a/packages/react/package.json b/packages/react/package.json
index 2dfff41e..e70e15f3 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.10-input",
+  "version": "1.3.10-input-1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.10-input",
+    "@fileverse-dev/fortune-core": "1.3.10-input-1",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",
diff --git a/packages/react/src/components/ConditionFormat/ConditionRules.tsx b/packages/react/src/components/ConditionFormat/ConditionRules.tsx
index dde571c7..be9c689b 100644
--- a/packages/react/src/components/ConditionFormat/ConditionRules.tsx
+++ b/packages/react/src/components/ConditionFormat/ConditionRules.tsx
@@ -317,6 +317,7 @@ const ConditionRules: React.FC<{ context?: any }> = ({ context }) => {
     { text: "between", value: "[]", label: "Between" },
     { text: "equal", value: "=", label: "Equal" },
     { text: "textContains", value: "()", label: "Text Contains" },
+    { text: "empty", value: "", label: "Empty" },
     {
       text: "occurrenceDate",
       value: conditionformat.yesterday,
@@ -443,8 +444,9 @@ const ConditionRules: React.FC<{ context?: any }> = ({ context }) => {
                         (conditionformat as any)[
                           allConditionFormats[key].conditionName
                         ]
-                      }{" "}
-                      {allConditionFormats[key].conditionValue?.[0]}
+                      }
+                      {allConditionFormats[key].conditionName !== "empty" &&
+                        ` ${allConditionFormats[key].conditionValue?.[0] ?? ""}`}
                     </h3>
                     <p
                       className="fortune-condition-rules__para condition-list-range"
@@ -565,6 +567,12 @@ const ConditionRules: React.FC<{ context?: any }> = ({ context }) => {
             <Select
               value={type}
               onValueChange={(value) => {
+                if (value === "empty" || type === "empty") {
+                  setContext((ctx) => {
+                    ctx.conditionRules.rulesValue = "";
+                  });
+                  setEditConditionFormatValue(null);
+                }
                 setType(value);
               }}
             >
@@ -1017,7 +1025,9 @@ const ConditionRules: React.FC<{ context?: any }> = ({ context }) => {
             </Button>
             {editConditionFormatKey !== null ? (
               <Button
-                disabled={context.conditionRules.rulesValue === ""}
+                disabled={
+                  context.conditionRules.rulesValue === "" && type !== "empty"
+                }
                 variant="default"
                 style={{
                   minWidth: "80px",
@@ -1031,7 +1041,9 @@ const ConditionRules: React.FC<{ context?: any }> = ({ context }) => {
               </Button>
             ) : (
               <Button
-                disabled={context.conditionRules.rulesValue === ""}
+                disabled={
+                  context.conditionRules.rulesValue === "" && type !== "empty"
+                }
                 variant="default"
                 style={{
                   minWidth: "80px",
diff --git a/packages/react/src/components/ConditionFormat/index.tsx b/packages/react/src/components/ConditionFormat/index.tsx
index c383457b..97fc2cd5 100644
--- a/packages/react/src/components/ConditionFormat/index.tsx
+++ b/packages/react/src/components/ConditionFormat/index.tsx
@@ -129,6 +129,7 @@ const ConditionalFormat: React.FC<{
                   { text: "between", value: "[]" },
                   { text: "equal", value: "=" },
                   { text: "textContains", value: "()" },
+                  { text: "empty", value: "" },
                   {
                     text: "occurrenceDate",
                     value: conditionformat.yesterday,
diff --git a/packages/react/src/components/SheetOverlay/InputBox.tsx b/packages/react/src/components/SheetOverlay/InputBox.tsx
index 71dd29f8..b3f7329e 100644
--- a/packages/react/src/components/SheetOverlay/InputBox.tsx
+++ b/packages/react/src/components/SheetOverlay/InputBox.tsx
@@ -44,10 +44,6 @@ import {
   getCursorPosition,
   isLetterNumberPattern,
   removeLastSpan,
-  incrementColumn,
-  decrementColumn,
-  incrementRow,
-  decrementRow,
   countCommasBeforeCursor,
 } from "./helper";
 import { LucideIcon } from "./LucideIcon";
@@ -163,6 +159,8 @@ const InputBox: React.FC = () => {
       const flowdata = getFlowdata(context);
       const cell = flowdata?.[row_index]?.[col_index];
       let value = "";
+      const wasOverwrite = refs.globalCache.overwriteCell;
+      const overwriteFirstChar = refs.globalCache.overwriteCellFirstChar;
       if (cell && !refs.globalCache.overwriteCell) {
         if (isInlineStringCell(cell)) {
           value = getInlineStringHTML(row_index, col_index, flowdata);
@@ -179,12 +177,25 @@ const InputBox: React.FC = () => {
         }
       }
       refs.globalCache.overwriteCell = false;
-      if (!refs.globalCache.ignoreWriteCell && inputRef.current && value) {
+      delete refs.globalCache.overwriteCellFirstChar;
+      if (wasOverwrite && inputRef.current) {
+        // Typing without double-click: overwrite cell (Google Sheets/Excel behavior).
+        // Show only the first character that was typed; user continues in empty field.
+        inputRef.current.innerText = overwriteFirstChar ?? "";
+        if (overwriteFirstChar) {
+          moveToEnd(inputRef.current);
+        }
+      } else if (
+        !refs.globalCache.ignoreWriteCell &&
+        inputRef.current &&
+        value
+      ) {
         inputRef.current!.innerHTML = escapeHTMLTag(escapeScriptTag(value));
       } else if (
         !refs.globalCache.ignoreWriteCell &&
         inputRef.current &&
-        !value
+        !value &&
+        !wasOverwrite
       ) {
         // @ts-ignore
         const valueD = getCellValue(row_index, col_index, flowdata, "f");
@@ -377,6 +388,83 @@ const InputBox: React.FC = () => {
     event.preventDefault();
   };
 
+  useEffect(() => {
+    const selection = context.luckysheet_select_save?.[0];
+    const editor = inputRef.current;
+    if (
+      !selection ||
+      !editor ||
+      !isInputBoxActive ||
+      context.rangeDialog?.show
+    ) {
+      return;
+    }
+
+    const rowSel = selection.row as [number, number] | undefined;
+    const colSel = selection.column as [number, number] | undefined;
+    if (!rowSel || !colSel || rowSel.length < 2 || colSel.length < 2) return;
+
+    const rowStart = Math.min(rowSel[0], rowSel[1]);
+    const rowEnd = Math.max(rowSel[0], rowSel[1]);
+    const colStart = Math.min(colSel[0], colSel[1]);
+    const colEnd = Math.max(colSel[0], colSel[1]);
+
+    const startRef = `${indexToColumnChar(colStart)}${rowStart + 1}`;
+    const endRef = `${indexToColumnChar(colEnd)}${rowEnd + 1}`;
+    const refText = startRef === endRef ? startRef : `${startRef}:${endRef}`;
+
+    const editorText = editor.innerText || "";
+    if (!editorText.startsWith("=")) return;
+
+    const spans = editor.querySelectorAll("span");
+    const lastSpan = spans[spans.length - 1] as HTMLSpanElement | undefined;
+    const lastSpanText = lastSpan?.innerText || "";
+
+    const isA1RangePattern = /^[a-zA-Z]+\d+:[a-zA-Z]+\d+$/.test(lastSpanText);
+    const notFunctionInit = !editorText.includes("(");
+    const refNotAllowed =
+      lastSpanText.includes(")") ||
+      (notFunctionInit &&
+        /^[a-zA-Z]+$/.test(lastSpanText) &&
+        !_.includes(["="], lastSpanText));
+
+    const shouldHandleRef =
+      lastSpan?.classList.contains("fortune-formula-functionrange-cell") ||
+      isLetterNumberPattern(lastSpanText) ||
+      isA1RangePattern ||
+      ((lastSpanText === "(" ||
+        lastSpanText === "," ||
+        lastSpanText.includes(":") ||
+        lastSpanText === "=") &&
+        !lastSpanText.includes('"') &&
+        !refNotAllowed &&
+        !/^[a-zA-Z]+$/.test(lastSpanText));
+
+    if (!shouldHandleRef) return;
+
+    const refSpanHtml = `<span class="fortune-formula-functionrange-cell" rangeindex="0" dir="auto" style="color:#c1232b;">${refText}</span>`;
+
+    if (lastSpan?.classList.contains("fortune-formula-functionrange-cell")) {
+      if (lastSpan.textContent !== refText) lastSpan.textContent = refText;
+      setTimeout(() => moveCursorToEnd(editor), 1);
+      return;
+    }
+
+    if (isLetterNumberPattern(lastSpanText) || isA1RangePattern) {
+      const htmlR = removeLastSpan(editor.innerHTML);
+      editor.innerHTML = `${htmlR}${refSpanHtml}`;
+      setTimeout(() => moveCursorToEnd(editor), 1);
+      return;
+    }
+
+    editor.innerHTML = `${editor.innerHTML}${refSpanHtml}`;
+    setTimeout(() => moveCursorToEnd(editor), 1);
+  }, [
+    context.luckysheet_select_save,
+    context.rangeDialog?.show,
+    isInputBoxActive,
+  ]);
+
   const onKeyDown = useCallback(
     (e: React.KeyboardEvent<HTMLDivElement>) => {
       lastKeyDownEventRef.current = new KeyboardEvent(e.type, e.nativeEvent);
@@ -410,7 +498,6 @@ const InputBox: React.FC = () => {
         setCommaCount(currentCommaCount);
       }
 
-      /* Arrow navigation for cell reference starts here */
       let allowListNavigation = true;
 
       if (e.key === "Delete" || e.key === "Backspace") {
@@ -425,80 +512,55 @@ const InputBox: React.FC = () => {
         }
       }
 
-      let refCell = placeRef.current;
+      const isArrowKey =
+        e.key === "ArrowUp" ||
+        e.key === "ArrowDown" ||
+        e.key === "ArrowLeft" ||
+        e.key === "ArrowRight";
 
-      if (e.key === "ArrowUp") {
-        refCell = decrementRow(placeRef.current);
-      } else if (e.key === "ArrowDown") {
-        refCell = incrementRow(placeRef.current);
-      } else if (e.key === "ArrowLeft") {
-        refCell = decrementColumn(placeRef.current);
-      } else if (e.key === "ArrowRight") {
-        refCell = incrementColumn(placeRef.current);
-      }
-
-      // current hack to for arrow navigation, try to find a better way like using rangeDrag
       if (
-        (e.key === "ArrowUp" ||
-          e.key === "ArrowDown" ||
-          e.key === "ArrowLeft" ||
-          e.key === "ArrowRight") &&
+        isArrowKey &&
         !(
           getCursorPosition(inputRef?.current!) !==
             inputRef?.current!.innerText.length && e.key === "ArrowRight"
         )
       ) {
-        const parser = new DOMParser();
-        const doc = parser.parseFromString(
-          `<div>${inputRef?.current?.innerHTML}</div>`,
-          "text/html"
+        const editorText = inputRef.current?.innerText || "";
+        const lastSpanText = getLastInputSpanText() || "";
+        const isA1RangePattern = /^[a-zA-Z]+\d+:[a-zA-Z]+\d+$/.test(
+          lastSpanText
         );
-        const spans = doc.querySelectorAll("span");
-        const lastSpan = spans[spans.length - 1];
-
-        const notFunctionInit = !document
-          .getElementById("luckysheet-rich-text-editor")
-          ?.innerText.includes("(");
-
-        // handling for inputbox active arrow navigation for cell reference input for functions like SUM(A1:A10)
-        const arrowRefNotAllowed =
-          lastSpan?.innerText.includes(")") ||
+        const notFunctionInit = !editorText.includes("(");
+        const refNotAllowed =
+          lastSpanText.includes(")") ||
           (notFunctionInit &&
-            /^[a-zA-Z]+$/.test(lastSpan?.innerText) &&
-            !_.includes(["="], lastSpan?.innerText));
-
-        if (
-          (lastSpan?.innerText === "(" ||
-            lastSpan?.innerText === "," ||
-            lastSpan?.innerText.includes(":") ||
-            lastSpan?.innerText !== ")") &&
-          !lastSpan?.innerText.includes('"') &&
-          !isLetterNumberPattern(lastSpan?.innerText) &&
-          !arrowRefNotAllowed &&
-          !/^[a-zA-Z]+$/.test(lastSpan?.innerText)
-        ) {
+            /^[a-zA-Z]+$/.test(lastSpanText) &&
+            !_.includes(["="], lastSpanText));
+
+        const shouldTreatAsRefNavigation =
+          editorText.startsWith("=") &&
+          (Boolean(
+            inputRef.current?.querySelector(
+              ".fortune-formula-functionrange-cell"
+            )
+          ) ||
+            isLetterNumberPattern(lastSpanText) ||
+            isA1RangePattern ||
+            ((lastSpanText === "(" ||
+              lastSpanText === "," ||
+              lastSpanText.includes(":") ||
+              lastSpanText === "=") &&
+              !lastSpanText.includes('"') &&
+              !refNotAllowed &&
+              !/^[a-zA-Z]+$/.test(lastSpanText)));
+
+        if (shouldTreatAsRefNavigation) {
           allowListNavigation = false;
-          inputRef.current!.innerHTML = `${
-            inputRef.current!.innerHTML
-          }<span class="fortune-formula-functionrange-cell" rangeindex="0" dir="auto" style="color:#c1232b;">${refCell}</span>`;
-
-          setTimeout(() => {
-            moveCursorToEnd(inputRef.current!);
-          }, 1);
-        }
-
-        if (isLetterNumberPattern(lastSpan?.innerText)) {
-          allowListNavigation = false;
-          const htmlR = removeLastSpan(inputRef?.current!.innerHTML);
-          inputRef.current!.innerHTML = `${htmlR}<span class="fortune-formula-functionrange-cell" rangeindex="0" dir="auto" style="color:#c1232b;">${refCell}</span>`;
-
-          moveCursorToEnd(inputRef.current!);
           setTimeout(() => {
-            moveCursorToEnd(inputRef.current!);
+            if (inputRef.current) moveCursorToEnd(inputRef.current);
           }, 1);
         }
       }
-      /* Arrow navigation for cell reference ends here */
 
       if (e.key === "Escape" && context.luckysheetCellUpdate.length > 0) {
         setContext((draftCtx) => {
@@ -602,7 +664,6 @@ const InputBox: React.FC = () => {
       context.luckysheetCellUpdate.length,
       selectActiveFormula,
       setContext,
-      firstSelection,
     ]
   );
 

From ab79b2a5e824e1b3fadbecb7a0f92895f1e692c2 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Thu, 12 Mar 2026 15:14:53 +0530
Subject: [PATCH 04/13] minor changes

---
 packages/core/src/events/keyboard.ts                        | 6 +++---
 packages/core/src/modules/ConditionFormat.ts                | 4 +---
 .../react/src/components/ConditionFormat/ConditionRules.tsx | 4 +++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/core/src/events/keyboard.ts b/packages/core/src/events/keyboard.ts
index 2c82fe10..158af13d 100644
--- a/packages/core/src/events/keyboard.ts
+++ b/packages/core/src/events/keyboard.ts
@@ -155,19 +155,19 @@ function handleControlPlusArrowKey(
   e: KeyboardEvent,
   shiftPressed: boolean
 ) {
-  //if (ctx.luckysheetCellUpdate.length > 0) return;
+  // if (ctx.luckysheetCellUpdate.length > 0) return;
 
   const idx = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.isNil(idx)) return;
 
   const file = ctx.luckysheetfile[idx];
-  //if (!file || !file.row || !file.column) return;
+  // if (!file || !file.row || !file.column) return;
   const maxRow = file.row;
   const maxCol = file.column;
   let last;
   if (ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0)
     last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
-  //if (!last) return;
+  // if (!last) return;
 
   const currR = last.row_focus;
   const currC = last.column_focus;
diff --git a/packages/core/src/modules/ConditionFormat.ts b/packages/core/src/modules/ConditionFormat.ts
index d9ace972..c51f502b 100644
--- a/packages/core/src/modules/ConditionFormat.ts
+++ b/packages/core/src/modules/ConditionFormat.ts
@@ -990,9 +990,7 @@ export function compute(ctx: Context, ruleArr: any, d: CellMatrix) {
               ) {
                 const cell = _.isNil(d[r]) || _.isNil(d[r][c]) ? null : d[r][c];
                 const isEmpty =
-                  _.isNil(cell) ||
-                  _.isNil(cell.v) ||
-                  isRealNull(cell.v);
+                  _.isNil(cell) || _.isNil(cell.v) || isRealNull(cell.v);
                 if (isEmpty) {
                   if (`${r}_${c}` in computeMap) {
                     computeMap[`${r}_${c}`].textColor = textColor;
diff --git a/packages/react/src/components/ConditionFormat/ConditionRules.tsx b/packages/react/src/components/ConditionFormat/ConditionRules.tsx
index be9c689b..46f26b63 100644
--- a/packages/react/src/components/ConditionFormat/ConditionRules.tsx
+++ b/packages/react/src/components/ConditionFormat/ConditionRules.tsx
@@ -446,7 +446,9 @@ const ConditionRules: React.FC<{ context?: any }> = ({ context }) => {
                         ]
                       }
                       {allConditionFormats[key].conditionName !== "empty" &&
-                        ` ${allConditionFormats[key].conditionValue?.[0] ?? ""}`}
+                        ` ${
+                          allConditionFormats[key].conditionValue?.[0] ?? ""
+                        }`}
                     </h3>
                     <p
                       className="fortune-condition-rules__para condition-list-range"

From 2008ef9426dbb12f5fceb7fd9a01e4f078553357 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Fri, 13 Mar 2026 17:16:25 +0530
Subject: [PATCH 05/13] minor changew

---
 packages/core/package.json           |   2 +-
 packages/core/src/events/keyboard.ts | 124 +++++++++++++++++----------
 packages/react/package.json          |   4 +-
 3 files changed, 84 insertions(+), 46 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 7245dac4..240e1060 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.10-input-1",
+  "version": "1.3.10-input-2",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/core/src/events/keyboard.ts b/packages/core/src/events/keyboard.ts
index 158af13d..29ac8e25 100644
--- a/packages/core/src/events/keyboard.ts
+++ b/packages/core/src/events/keyboard.ts
@@ -164,30 +164,41 @@ function handleControlPlusArrowKey(
   // if (!file || !file.row || !file.column) return;
   const maxRow = file.row;
   const maxCol = file.column;
-  let last;
-  if (ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0)
-    last = ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1];
-  // if (!last) return;
+  if (_.isNil(maxRow) || _.isNil(maxCol)) return;
+
+  const last =
+    ctx.luckysheet_select_save && ctx.luckysheet_select_save.length > 0
+      ? ctx.luckysheet_select_save[ctx.luckysheet_select_save.length - 1]
+      : undefined;
+  if (!last) return;
 
   const currR = last.row_focus;
   const currC = last.column_focus;
   if (_.isNil(currR) || _.isNil(currC)) return;
 
-  const startR = last.row[0];
-  const endR = last.row[1];
-  const startC = last.column[0];
-  const endC = last.column[1];
+  const startR = last.row?.[0];
+  const endR = last.row?.[1];
+  const startC = last.column?.[0];
+  const endC = last.column?.[1];
+  if (
+    _.isNil(startR) ||
+    _.isNil(endR) ||
+    _.isNil(startC) ||
+    _.isNil(endC)
+  ) {
+    return;
+  }
 
   const horizontalOffset = currC - endC !== 0 ? currC - endC : currC - startC;
   const verticalOffset = currR - endR !== 0 ? currR - endR : currR - startR;
 
   const sheetData = file.data;
   if (!sheetData) return;
-  let selectedLimit;
 
   switch (e.key) {
     case "ArrowUp":
-      selectedLimit = moveToEdge(
+      {
+        const selectedLimit = moveToEdge(
         sheetData,
         e.key,
         currC,
@@ -200,15 +211,22 @@ function handleControlPlusArrowKey(
         maxRow,
         maxCol
       );
-      if (shiftPressed) {
-        moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
-        moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-      } else {
-        moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
+          moveHighlightRange(
+            ctx,
+            "down",
+            selectedLimit - currR,
+            "rangeOfSelect"
+          );
+        } else {
+          moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        }
       }
       break;
     case "ArrowDown":
-      selectedLimit = moveToEdge(
+      {
+        const selectedLimit = moveToEdge(
         sheetData,
         e.key,
         currC,
@@ -221,15 +239,22 @@ function handleControlPlusArrowKey(
         maxRow,
         maxCol
       );
-      if (shiftPressed) {
-        moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
-        moveHighlightRange(ctx, "down", selectedLimit - currR, "rangeOfSelect");
-      } else {
-        moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
+          moveHighlightRange(
+            ctx,
+            "down",
+            selectedLimit - currR,
+            "rangeOfSelect"
+          );
+        } else {
+          moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+        }
       }
       break;
     case "ArrowLeft":
-      selectedLimit = moveToEdge(
+      {
+        const selectedLimit = moveToEdge(
         sheetData,
         e.key,
         currR,
@@ -242,20 +267,27 @@ function handleControlPlusArrowKey(
         maxRow,
         maxCol
       );
-      if (shiftPressed) {
-        moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
-        moveHighlightRange(
-          ctx,
-          "right",
-          selectedLimit - currC,
-          "rangeOfSelect"
-        );
-      } else {
-        moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
+          moveHighlightRange(
+            ctx,
+            "right",
+            selectedLimit - currC,
+            "rangeOfSelect"
+          );
+        } else {
+          moveHighlightCell(
+            ctx,
+            "right",
+            selectedLimit - currC,
+            "rangeOfSelect"
+          );
+        }
       }
       break;
     case "ArrowRight":
-      selectedLimit = moveToEdge(
+      {
+        const selectedLimit = moveToEdge(
         sheetData,
         e.key,
         currR,
@@ -268,16 +300,22 @@ function handleControlPlusArrowKey(
         maxRow,
         maxCol
       );
-      if (shiftPressed) {
-        moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
-        moveHighlightRange(
-          ctx,
-          "right",
-          selectedLimit - currC,
-          "rangeOfSelect"
-        );
-      } else {
-        moveHighlightCell(ctx, "right", selectedLimit - currC, "rangeOfSelect");
+        if (shiftPressed) {
+          moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
+          moveHighlightRange(
+            ctx,
+            "right",
+            selectedLimit - currC,
+            "rangeOfSelect"
+          );
+        } else {
+          moveHighlightCell(
+            ctx,
+            "right",
+            selectedLimit - currC,
+            "rangeOfSelect"
+          );
+        }
       }
       break;
     default:
diff --git a/packages/react/package.json b/packages/react/package.json
index e70e15f3..af784f96 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.10-input-1",
+  "version": "1.3.10-input-2",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.10-input-1",
+    "@fileverse-dev/fortune-core": "1.3.10-input-2",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",

From 721b6b631a34104131723d561994edb2e2077815 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Fri, 13 Mar 2026 17:16:55 +0530
Subject: [PATCH 06/13] minor changes

---
 packages/core/src/events/keyboard.ts | 117 ++++++++++++++-------------
 1 file changed, 61 insertions(+), 56 deletions(-)

diff --git a/packages/core/src/events/keyboard.ts b/packages/core/src/events/keyboard.ts
index 29ac8e25..b6f8562b 100644
--- a/packages/core/src/events/keyboard.ts
+++ b/packages/core/src/events/keyboard.ts
@@ -180,12 +180,7 @@ function handleControlPlusArrowKey(
   const endR = last.row?.[1];
   const startC = last.column?.[0];
   const endC = last.column?.[1];
-  if (
-    _.isNil(startR) ||
-    _.isNil(endR) ||
-    _.isNil(startC) ||
-    _.isNil(endC)
-  ) {
+  if (_.isNil(startR) || _.isNil(endR) || _.isNil(startC) || _.isNil(endC)) {
     return;
   }
 
@@ -199,18 +194,18 @@ function handleControlPlusArrowKey(
     case "ArrowUp":
       {
         const selectedLimit = moveToEdge(
-        sheetData,
-        e.key,
-        currC,
-        -1,
-        0,
-        startR,
-        endR,
-        startC,
-        endC,
-        maxRow,
-        maxCol
-      );
+          sheetData,
+          e.key,
+          currC,
+          -1,
+          0,
+          startR,
+          endR,
+          startC,
+          endC,
+          maxRow,
+          maxCol
+        );
         if (shiftPressed) {
           moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
           moveHighlightRange(
@@ -220,25 +215,30 @@ function handleControlPlusArrowKey(
             "rangeOfSelect"
           );
         } else {
-          moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+          moveHighlightCell(
+            ctx,
+            "down",
+            selectedLimit - currR,
+            "rangeOfSelect"
+          );
         }
       }
       break;
     case "ArrowDown":
       {
         const selectedLimit = moveToEdge(
-        sheetData,
-        e.key,
-        currC,
-        1,
-        0,
-        startR,
-        endR,
-        startC,
-        endC,
-        maxRow,
-        maxCol
-      );
+          sheetData,
+          e.key,
+          currC,
+          1,
+          0,
+          startR,
+          endR,
+          startC,
+          endC,
+          maxRow,
+          maxCol
+        );
         if (shiftPressed) {
           moveHighlightRange(ctx, "down", verticalOffset, "rangeOfSelect");
           moveHighlightRange(
@@ -248,25 +248,30 @@ function handleControlPlusArrowKey(
             "rangeOfSelect"
           );
         } else {
-          moveHighlightCell(ctx, "down", selectedLimit - currR, "rangeOfSelect");
+          moveHighlightCell(
+            ctx,
+            "down",
+            selectedLimit - currR,
+            "rangeOfSelect"
+          );
         }
       }
       break;
     case "ArrowLeft":
       {
         const selectedLimit = moveToEdge(
-        sheetData,
-        e.key,
-        currR,
-        0,
-        -1,
-        startR,
-        endR,
-        startC,
-        endC,
-        maxRow,
-        maxCol
-      );
+          sheetData,
+          e.key,
+          currR,
+          0,
+          -1,
+          startR,
+          endR,
+          startC,
+          endC,
+          maxRow,
+          maxCol
+        );
         if (shiftPressed) {
           moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
           moveHighlightRange(
@@ -288,18 +293,18 @@ function handleControlPlusArrowKey(
     case "ArrowRight":
       {
         const selectedLimit = moveToEdge(
-        sheetData,
-        e.key,
-        currR,
-        0,
-        1,
-        startR,
-        endR,
-        startC,
-        endC,
-        maxRow,
-        maxCol
-      );
+          sheetData,
+          e.key,
+          currR,
+          0,
+          1,
+          startR,
+          endR,
+          startC,
+          endC,
+          maxRow,
+          maxCol
+        );
         if (shiftPressed) {
           moveHighlightRange(ctx, "right", horizontalOffset, "rangeOfSelect");
           moveHighlightRange(

From 8e91e9512a5f8b3a88725708b485e34b21bc2ea6 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Tue, 17 Mar 2026 14:46:11 +0530
Subject: [PATCH 07/13] minor changes

---
 packages/core/package.json                              | 2 +-
 packages/react/package.json                             | 4 ++--
 packages/react/src/components/SheetOverlay/InputBox.tsx | 1 +
 packages/react/src/components/SheetOverlay/index.css    | 6 ++++++
 packages/react/src/components/SheetOverlay/index.tsx    | 8 +++++++-
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 240e1060..b75ba037 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.10-input-2",
+  "version": "1.3.10-input-3",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/react/package.json b/packages/react/package.json
index af784f96..d55740aa 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.10-input-2",
+  "version": "1.3.10-input-3",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.10-input-2",
+    "@fileverse-dev/fortune-core": "1.3.10-input-3",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",
diff --git a/packages/react/src/components/SheetOverlay/InputBox.tsx b/packages/react/src/components/SheetOverlay/InputBox.tsx
index b3f7329e..d2d2c309 100644
--- a/packages/react/src/components/SheetOverlay/InputBox.tsx
+++ b/packages/react/src/components/SheetOverlay/InputBox.tsx
@@ -132,6 +132,7 @@ const InputBox: React.FC = () => {
     context.luckysheetCellUpdate,
     context?.luckysheetCellUpdate?.length,
     firstSelectionActiveCell,
+    inputRef.current?.innerText,
   ]);
 
   useLayoutEffect(() => {
diff --git a/packages/react/src/components/SheetOverlay/index.css b/packages/react/src/components/SheetOverlay/index.css
index 4a483a63..c136d30d 100644
--- a/packages/react/src/components/SheetOverlay/index.css
+++ b/packages/react/src/components/SheetOverlay/index.css
@@ -830,6 +830,12 @@
   cursor: se-resize;
 }
 
+/* FLV: show blue dashed border for active selection while in edit mode */
+.luckysheet-cell-selected-edit-mode .luckysheet-cs-inner-border {
+  border: 2px dashed #12a5ff;
+  border-radius: 1px;
+}
+
 .fortune-formula-functionrange-highlight .luckysheet-highlight {
   position: absolute;
   z-index: 19;
diff --git a/packages/react/src/components/SheetOverlay/index.tsx b/packages/react/src/components/SheetOverlay/index.tsx
index 371ad769..d6559746 100644
--- a/packages/react/src/components/SheetOverlay/index.tsx
+++ b/packages/react/src/components/SheetOverlay/index.tsx
@@ -593,7 +593,13 @@ const SheetOverlay: React.FC = () => {
                 <div
                   key={index}
                   id="luckysheet-cell-selected"
-                  className="luckysheet-cell-selected"
+                  className={
+                    "luckysheet-cell-selected" 
+                    +
+                    ((context.luckysheetCellUpdate?.length ?? 0) > 0
+                      ? " luckysheet-cell-selected-edit-mode"
+                      : "")
+                  }
                   style={_.assign(
                     {
                       left: selection.left_move,

From c66cb7b5f46a14326eeb06fba48c7db981918299 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Thu, 19 Mar 2026 10:48:58 +0530
Subject: [PATCH 08/13] minor changes

---
 packages/react/src/components/SheetOverlay/index.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/react/src/components/SheetOverlay/index.tsx b/packages/react/src/components/SheetOverlay/index.tsx
index d6559746..301a6626 100644
--- a/packages/react/src/components/SheetOverlay/index.tsx
+++ b/packages/react/src/components/SheetOverlay/index.tsx
@@ -593,13 +593,11 @@ const SheetOverlay: React.FC = () => {
                 <div
                   key={index}
                   id="luckysheet-cell-selected"
-                  className={
-                    "luckysheet-cell-selected" 
-                    +
-                    ((context.luckysheetCellUpdate?.length ?? 0) > 0
+                  className={`luckysheet-cell-selected${
+                    (context.luckysheetCellUpdate?.length ?? 0) > 0
                       ? " luckysheet-cell-selected-edit-mode"
-                      : "")
-                  }
+                      : ""
+                  }`}
                   style={_.assign(
                     {
                       left: selection.left_move,

From 96e12b41f649711b92feb3481a13d076447b11ef Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Thu, 19 Mar 2026 21:16:43 +0530
Subject: [PATCH 09/13] minor chagea

---
 packages/core/src/events/keyboard.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/core/src/events/keyboard.ts b/packages/core/src/events/keyboard.ts
index b6f8562b..d25e55ff 100644
--- a/packages/core/src/events/keyboard.ts
+++ b/packages/core/src/events/keyboard.ts
@@ -155,13 +155,11 @@ function handleControlPlusArrowKey(
   e: KeyboardEvent,
   shiftPressed: boolean
 ) {
-  // if (ctx.luckysheetCellUpdate.length > 0) return;
 
   const idx = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.isNil(idx)) return;
 
   const file = ctx.luckysheetfile[idx];
-  // if (!file || !file.row || !file.column) return;
   const maxRow = file.row;
   const maxCol = file.column;
   if (_.isNil(maxRow) || _.isNil(maxCol)) return;

From 20886654aa63c315d07056dbff82d07c2b10b1c8 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Thu, 19 Mar 2026 21:17:33 +0530
Subject: [PATCH 10/13] minor changes

---
 packages/core/src/events/keyboard.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/core/src/events/keyboard.ts b/packages/core/src/events/keyboard.ts
index d25e55ff..31e52ec8 100644
--- a/packages/core/src/events/keyboard.ts
+++ b/packages/core/src/events/keyboard.ts
@@ -155,7 +155,6 @@ function handleControlPlusArrowKey(
   e: KeyboardEvent,
   shiftPressed: boolean
 ) {
-
   const idx = getSheetIndex(ctx, ctx.currentSheetId);
   if (_.isNil(idx)) return;
 

From d17a4a2b5c1b877a4e19fee31f41a6f022a4ffcc Mon Sep 17 00:00:00 2001
From: Maitra Khatri <54719132+maitrakhatri@users.noreply.github.com>
Date: Thu, 19 Mar 2026 21:47:32 +0530
Subject: [PATCH 11/13] fix: date format, m value generation (#241)

* fix: date format, m value generation

* fix: identify different date formats
---
 packages/core/src/events/paste.ts             | 91 ++++++++++---------
 packages/core/src/modules/format.ts           | 19 ++--
 packages/core/src/modules/validation.ts       |  9 +-
 .../react/src/components/Toolbar/index.tsx    | 18 +++-
 .../react/src/components/Workbook/index.tsx   | 15 +++
 5 files changed, 94 insertions(+), 58 deletions(-)

diff --git a/packages/core/src/events/paste.ts b/packages/core/src/events/paste.ts
index 060b4d76..6fe4d451 100644
--- a/packages/core/src/events/paste.ts
+++ b/packages/core/src/events/paste.ts
@@ -7,11 +7,11 @@ import {
   // execFunctionGroup,
 } from "../modules/formula";
 import { getdatabyselection } from "../modules/cell";
-import { update, datenum_local } from "../modules/format";
+import { update, genarate } from "../modules/format";
 import { normalizeSelection, selectionCache } from "../modules/selection";
 import { Cell, CellMatrix } from "../types";
 import { getSheetIndex, isAllowEdit } from "../utils";
-import { hasPartMC, isRealNum, detectDateFormat } from "../modules/validation";
+import { hasPartMC, isRealNum } from "../modules/validation";
 import { getBorderInfoCompute } from "../modules/border";
 import { expandRowsAndColumns, storeSheetParamALL } from "../modules/sheet";
 import { jfrefreshgrid } from "../modules/refresh";
@@ -699,41 +699,48 @@ function pasteHandler(ctx: Context, data: any, borderInfo?: any) {
         }
 
         if (originCell) {
-          // If destination cell already has a date format, try to parse pasted string into a date serial
-          if (originCell.ct && originCell.ct.t === "d" && !isUrl) {
-            const df = detectDateFormat(originalValueStr);
-            if (df) {
-              const dateObj = new Date(
-                df.year,
-                df.month - 1,
-                df.day,
-                df.hours,
-                df.minutes,
-                df.seconds
-              );
-              originCell.v = datenum_local(dateObj);
-            } else {
-              // Not a date: preserve original text so user can apply formats later
-              originCell.v = originalValueStr;
-            }
-          } else {
-            // Default: keep pasted value (numbers already parsed above)
-            originCell.v = isUrl ? originalValueStr : value;
-          }
-
-          if (originCell.ct != null && originCell.ct.fa != null) {
-            // If value is not a numeric serial for date formats, avoid calling update
-            if (originCell.ct.t === "d" && typeof originCell.v !== "number") {
-              originCell.m = String(originCell.v);
+          if (!isUrl) {
+            const generated = genarate(originalValueStr);
+            if (generated) {
+              const [genM, genCt, genV] = generated;
+              if (genCt?.t === "d") {
+                // Pasted value is a date — always update ct so toolbar shows "Date"
+                originCell.v = genV;
+                originCell.m = genM ?? originalValueStr;
+                originCell.ct = genCt;
+              } else {
+                // Not a date: preserve destination format, just update value
+                originCell.v = value;
+                if (originCell.ct != null && originCell.ct.fa != null) {
+                  if (
+                    originCell.ct.t === "d" &&
+                    typeof originCell.v !== "number"
+                  ) {
+                    originCell.m = String(originCell.v);
+                  } else {
+                    originCell.m = update(originCell.ct.fa, originCell.v);
+                  }
+                } else {
+                  originCell.m =
+                    typeof originCell.v === "boolean"
+                      ? String(originCell.v)
+                      : originCell.v;
+                }
+              }
             } else {
-              originCell.m = update(originCell.ct.fa, originCell.v);
+              originCell.v = value;
+              if (originCell.ct != null && originCell.ct.fa != null) {
+                originCell.m = update(originCell.ct.fa, originCell.v);
+              } else {
+                originCell.m =
+                  typeof originCell.v === "boolean"
+                    ? String(originCell.v)
+                    : originCell.v;
+              }
             }
           } else {
-            // Convert boolean to string if needed, since m only accepts string | number
-            originCell.m =
-              typeof originCell.v === "boolean"
-                ? String(originCell.v)
-                : originCell.v;
+            originCell.v = originalValueStr;
+            originCell.m = originalValueStr;
           }
 
           if (originCell.f != null && originCell.f.length > 0) {
@@ -774,18 +781,16 @@ function pasteHandler(ctx: Context, data: any, borderInfo?: any) {
               t: "s",
             };
           } else {
-            // Preserve original pasted text when creating new cells (automatic format)
-            cell.v = originalValueStr;
-            cell.m = originalValueStr;
-            cell.ct = { fa: "General", t: "g" };
             // check if hex value to handle hex address
             if (/^0x?[a-fA-F0-9]+$/.test(value)) {
-              cell.m = value;
-              cell.ct = {
-                fa: "@",
-                t: "s",
-              };
               cell.v = value;
+              cell.m = value;
+              cell.ct = { fa: "@", t: "s" };
+            } else {
+              const [m, ct, v] = genarate(originalValueStr) ?? [];
+              cell.v = v ?? originalValueStr;
+              cell.m = m != null ? String(m) : originalValueStr;
+              cell.ct = ct ?? { fa: "General", t: "g" };
             }
           }
 
diff --git a/packages/core/src/modules/format.ts b/packages/core/src/modules/format.ts
index f16269ff..793dfbc6 100644
--- a/packages/core/src/modules/format.ts
+++ b/packages/core/src/modules/format.ts
@@ -228,20 +228,24 @@ export function genarate(value: string | number | boolean) {
       ct.t = "d";
 
       const map: Record<string, string> = {
-        "yyyy-MM-dd": "dd/MM/yyyy",
-        "yyyy-MM-dd HH:mm": "dd/MM/yyyy",
-        "yyyy-MM-ddTHH:mm": "dd/MM/yyyy",
-        "yyyy/MM/dd": "dd/MM/yyyy",
-        "yyyy/MM/dd HH:mm": "dd/MM/yyyy",
+        "yyyy-MM-dd": "yyyy-MM-dd",
+        "yyyy-MM-dd HH:mm": "yyyy-MM-dd HH:mm",
+        "yyyy-MM-ddTHH:mm": "yyyy-MM-dd HH:mm",
+        "yyyy/MM/dd": "yyyy/MM/dd",
+        "yyyy/MM/dd HH:mm": "yyyy/MM/dd HH:mm",
         "yyyy.MM.dd": "yyyy.MM.dd",
         "MM/dd/yyyy h:mm AM/PM": "MM/dd/yyyy h:mm AM/PM",
         "MM/dd/yyyy": "MM/dd/yyyy",
         "M/d/yyyy": "M/d/yyyy",
         "MM/dd/yy": "MM/dd/yy",
         "dd/MM/yyyy": "dd/MM/yyyy",
-        "dd-MM-yyyy": "dd/MM/yyyy",
+        "dd-MM-yyyy": "dd-MM-yyyy",
         "dd.MM.yyyy": "dd.MM.yyyy",
-        named: "dd/MM/yyyy",
+        "named-mdy-full": "mmmm d, yyyy",
+        "named-mdy-abbr": "mmm d, yyyy",
+        "named-dmy-full": "d mmmm yyyy",
+        "named-dmy-abbr": "d mmm yyyy",
+        "named-abbr-dashes": "mmm-d-yyyy",
       };
 
       ct.fa = map[df.formatType] || "dd/MM/yyyy";
@@ -265,6 +269,7 @@ export function update(fmt: string, v: any) {
 }
 
 export function is_date(fmt: string, v?: any) {
+  console.log(SSF.is_date(fmt, v), "is_date");
   return SSF.is_date(fmt, v);
 }
 
diff --git a/packages/core/src/modules/validation.ts b/packages/core/src/modules/validation.ts
index eb5269c1..f8796607 100644
--- a/packages/core/src/modules/validation.ts
+++ b/packages/core/src/modules/validation.ts
@@ -109,6 +109,7 @@ const MONTH_NAME_MAP: Record<string, number> = {
 const MONTH_NAMES_RE =
   "january|february|march|april|may|june|july|august|september|october|november|december|jan|feb|mar|apr|jun|jul|aug|sep|oct|nov|dec";
 const MONTH_ABBR_RE = "jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec";
+const MONTH_ABBR_SET = new Set(MONTH_ABBR_RE.split("|"));
 
 function isValidDateParts(year: number, month: number, day: number): boolean {
   if (year < 1900) return false;
@@ -355,6 +356,7 @@ export function detectDateFormat(str: string): DateFormatInfo | null {
     const d = +m[2];
     const y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
+      const isAbbr = MONTH_ABBR_SET.has(m[1].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -362,7 +364,7 @@ export function detectDateFormat(str: string): DateFormatInfo | null {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named",
+        formatType: isAbbr ? "named-mdy-abbr" : "named-mdy-full",
       };
     }
   }
@@ -376,6 +378,7 @@ export function detectDateFormat(str: string): DateFormatInfo | null {
     const mo = MONTH_NAME_MAP[m[2].toLowerCase()];
     const y = +m[3];
     if (mo && isValidDateParts(y, mo, d)) {
+      const isAbbr = MONTH_ABBR_SET.has(m[2].toLowerCase());
       return {
         year: y,
         month: mo,
@@ -383,7 +386,7 @@ export function detectDateFormat(str: string): DateFormatInfo | null {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named",
+        formatType: isAbbr ? "named-dmy-abbr" : "named-dmy-full",
       };
     }
   }
@@ -402,7 +405,7 @@ export function detectDateFormat(str: string): DateFormatInfo | null {
         hours: 0,
         minutes: 0,
         seconds: 0,
-        formatType: "named",
+        formatType: "named-abbr-dashes",
       };
     }
   }
diff --git a/packages/react/src/components/Toolbar/index.tsx b/packages/react/src/components/Toolbar/index.tsx
index b2ddd9dd..33569ba4 100644
--- a/packages/react/src/components/Toolbar/index.tsx
+++ b/packages/react/src/components/Toolbar/index.tsx
@@ -38,6 +38,7 @@ import {
   Cell,
   api,
   getSheetIndex,
+  is_date,
 } from "@fileverse-dev/fortune-core";
 import _ from "lodash";
 import {
@@ -757,14 +758,21 @@ const Toolbar: React.FC<{
           const curr = normalizedCellAttr(cell, "ct");
           const format = _.find(defaultFormat, (v) => v.value === curr?.fa);
           if (curr?.fa != null) {
-            if (format != null) {
-              currentFmt = format.text;
+            const hasTime = /[hH]:/.test(curr.fa);
+
+            if (curr.t === "d") {
+              currentFmt = hasTime ? "Date time" : "Date";
             } else if (
-              curr?.fa?.includes("#,##0") ||
-              curr?.fa === "0" ||
-              curr?.fa === "0.00"
+              curr.t === "n" ||
+              curr.fa.includes("#,##0") ||
+              curr.fa === "0" ||
+              curr.fa === "0.00"
             ) {
               currentFmt = "Number";
+            } else if (is_date(curr.fa)) {
+              currentFmt = hasTime ? "Date time" : "Date";
+            } else if (format != null) {
+              currentFmt = format.text;
             } else {
               currentFmt = defaultFormat[defaultFormat.length - 1].text;
             }
diff --git a/packages/react/src/components/Workbook/index.tsx b/packages/react/src/components/Workbook/index.tsx
index fcd85cf1..5a50cf6b 100644
--- a/packages/react/src/components/Workbook/index.tsx
+++ b/packages/react/src/components/Workbook/index.tsx
@@ -25,6 +25,7 @@ import {
   getFlowdata,
   api,
   handlePasteByClick,
+  update, // formatting helper
 } from "@fileverse-dev/fortune-core";
 import React, {
   useMemo,
@@ -171,6 +172,20 @@ const Workbook = React.forwardRef<WorkbookInstance, Settings & AdditionalProps>(
           celldata?.forEach((d) => {
             // TODO setCellValue(draftCtx, d.r, d.c, expandedData, d.v);
             expandedData[d.r][d.c] = d.v;
+            // if a date cell doesn't already have a formatted string, generate one
+            const cell = d.v as any;
+            if (
+              cell &&
+              cell.ct &&
+              cell.ct.t === "d" &&
+              (cell.m === undefined || cell.m === null)
+            ) {
+              try {
+                cell.m = update(cell.ct.fa || "General", cell.v);
+              } catch (e) {
+                // fallback silently
+              }
+            }
           });
           draftCtx.luckysheetfile = produce(draftCtx.luckysheetfile, (d) => {
             d[index!].data = expandedData;

From e49d1488ada2f6835f20c117d3998ad6a60a0720 Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Thu, 19 Mar 2026 22:03:56 +0530
Subject: [PATCH 12/13] minor changes

---
 packages/core/package.json  | 2 +-
 packages/react/package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 46d79d81..8e75ae7e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.11",
+  "version": "1.3.11-mixed",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/react/package.json b/packages/react/package.json
index fec1b087..ace2c0f3 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.11",
+  "version": "1.3.11-mixed",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.11",
+    "@fileverse-dev/fortune-core": "1.3.11-mixed",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",

From d9b888fdf85f67c0c7576ab45f66662ca0a829fc Mon Sep 17 00:00:00 2001
From: Mritunjay Goutam <mritunjaygoutam2204@gmail.com>
Date: Fri, 20 Mar 2026 16:56:54 +0530
Subject: [PATCH 13/13] merge with fileverse-mod branch

---
 packages/core/package.json  | 2 +-
 packages/react/package.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 616dfb7e..8fadd697 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-core",
-  "version": "1.3.12",
+  "version": "1.3.12-mixed",
   "main": "lib/index.js",
   "module": "es/index.js",
   "typings": "lib/index.d.ts",
diff --git a/packages/react/package.json b/packages/react/package.json
index a0a00316..8f73e011 100644
--- a/packages/react/package.json
+++ b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.3.12",
+  "version": "1.3.12-mixed",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.3.12",
+    "@fileverse-dev/fortune-core": "1.3.12-mixed",
     "@fileverse/ui": "5.0.0",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",