Mixed feed - TEC-2394, TEC-2395, TEC-2375 (#391)

* change width of inputbox if column length changes

* remove auto sceintifix conversoin for decimal response

* change height of inputbox if row height changes

* overflow ignore formate of next cell

* minor changes

Author: mritunjayz

package-lock.json

@@ -2,7 +2,7 @@
   "name": "@fileverse-dev/dsheet",
   "private": false,
   "description": "DSheet",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
   "exports": {
@@ -105,4 +105,4 @@
     "typescript": "^5.2.2",
     "vite": "^5.0.0"
   }
-}
+}

package.json

@@ -148,10 +148,10 @@ export const useEditorData = (
                   if (cell) {
                     const comment =
                       (commentData as any)?.[
-                        `${sheetKey}_${rowIndex}_${colIndex}`
+                      `${sheetKey}_${rowIndex}_${colIndex}`
                       ] ??
                       (commentData as any)?.[
-                        `${fileIndex}_${rowIndex}_${colIndex}`
+                      `${fileIndex}_${rowIndex}_${colIndex}`
                       ];
                     if (comment) {
                       cell.ps = allowComments

src/editor/hooks/use-editor-data.tsx

@@ -43,7 +43,11 @@ function getBorderFix() {
 }
 
 function hasCellDisplayContent(cell: any) {
-  return !_.isEmpty(cell?.v) || _.isEmpty(cell?.m) || isInlineStringCell(cell);
+  return (
+    cell?.v != null ||
+    (typeof cell?.m === 'string' && cell.m.length > 0) ||
+    isInlineStringCell(cell)
+  );
 }
 
 function setLineDash(

src/sheet-engine/core/canvas.ts

@@ -1,6 +1,10 @@
 import _ from 'lodash';
 import { Freezen } from '..';
-import { Context, getFlowdata } from '../context';
+import {
+  Context,
+  getFlowdata,
+  updateContextWithSheetData,
+} from '../context';
 import {
   cancelActiveImgItem,
   cancelPaintModel,
@@ -2500,6 +2504,8 @@ export function mouseRender(
       scrollX.scrollLeft -
       window.scrollX;
     if (x < rect.width + ctx.scrollLeft - 100) {
+      // Match mouseup commit (`x + 3`); stored on globalCache to avoid Immer churn.
+      globalCache.colResizeLiveRightPx = x + 3;
       const changeSizeLine = container.querySelector(
         '.fortune-change-size-line',
       );
@@ -2522,6 +2528,8 @@ export function mouseRender(
       scrollY.scrollTop -
       window.scrollY;
     if (y < rect.height + ctx.scrollTop - 20) {
+      // Match mouseup commit (`y + 3`); stored on globalCache to avoid Immer churn.
+      globalCache.rowResizeLiveBottomPx = y + 3;
       const changeSizeLine = container.querySelector(
         '.fortune-change-size-line',
       );
@@ -4200,6 +4208,7 @@ export function handleOverlayMouseUp(
 
   // 改变行高
   if (ctx.luckysheet_rows_change_size) {
+    delete globalCache.rowResizeLiveBottomPx;
     ctx.luckysheet_rows_change_size = false;
 
     // $("#fortune-change-size-line").hide();
@@ -4286,6 +4295,11 @@ export function handleOverlayMouseUp(
     if (idx == null) return;
     ctx.luckysheetfile[idx].config = ctx.config;
 
+    const flowdataAfterRowResize = getFlowdata(ctx);
+    if (flowdataAfterRowResize) {
+      updateContextWithSheetData(ctx, flowdataAfterRowResize);
+    }
+
     // server.saveParam("cg", ctx.currentSheetId, cfg.rowlen, {
     //   k: "rowlen",
     // });
@@ -4301,6 +4315,7 @@ export function handleOverlayMouseUp(
 
   // 改变列宽
   if (ctx.luckysheet_cols_change_size) {
+    delete globalCache.colResizeLiveRightPx;
     ctx.luckysheet_cols_change_size = false;
 
     const { scrollLeft } = ctx;
@@ -4390,6 +4405,11 @@ export function handleOverlayMouseUp(
     if (idx == null) return;
     ctx.luckysheetfile[idx].config = ctx.config;
 
+    const flowdataAfterColResize = getFlowdata(ctx);
+    if (flowdataAfterColResize) {
+      updateContextWithSheetData(ctx, flowdataAfterColResize);
+    }
+
     // server.saveParam("cg", ctx.currentSheetId, cfg.columnlen, {
     //   k: "columnlen",
     // });
@@ -5423,7 +5443,7 @@ export function handleColSizeHandleMouseDown(
   cancelActiveImgItem(ctx, globalCache);
   // }
 
-  ctx.luckysheetCellUpdate = [];
+  // Keep in-cell edit open while resizing (do not clear luckysheetCellUpdate).
 
   // let mouse = mouseposition(event.pageX, event.pageY);
   const { scrollLeft } = ctx;
@@ -5439,8 +5459,10 @@ export function handleColSizeHandleMouseDown(
   const col = col_location[1];
   const col_index = col_location[2];
 
+  delete globalCache.colResizeLiveRightPx;
   ctx.luckysheet_cols_change_size = true;
   ctx.luckysheet_scroll_status = true;
+  globalCache.colResizeLiveRightPx = col;
   const changeSizeLine = workbookContainer.querySelector(
     '.fortune-change-size-line',
   );
@@ -5556,7 +5578,7 @@ export function handleRowSizeHandleMouseDown(
     israngeseleciton(ctx)
   )
     return;
-  ctx.luckysheetCellUpdate = [];
+  // Keep in-cell edit open while resizing (do not clear luckysheetCellUpdate).
 
   // let mouse = mouseposition(event.pageX, event.pageY);
   const { scrollLeft } = ctx;
@@ -5572,8 +5594,10 @@ export function handleRowSizeHandleMouseDown(
   const row = row_location[1];
   const row_index = row_location[2];
 
+  delete globalCache.rowResizeLiveBottomPx;
   ctx.luckysheet_rows_change_size = true;
   ctx.luckysheet_scroll_status = true;
+  globalCache.rowResizeLiveBottomPx = row;
   const changeSizeLine = workbookContainer.querySelector(
     '.fortune-change-size-line',
   );

src/sheet-engine/core/events/mouse.ts

@@ -616,12 +616,12 @@ export function setCellValue(
       if (cell.v === Infinity || cell.v === -Infinity) {
         cell.m = cell.v.toString();
       } else {
-        if (shouldUseScientificForComputedNumber(cell.v as number)) {
-          cell.m = formatScientificForComputedNumber(cell.v as number);
-        } else if (cell.v.toString().toLowerCase().indexOf('e') > -1) {
+        const v_p = Math.round((cell.v as number) * 1000000000) / 1000000000;
+        if (shouldUseScientificForComputedNumber(v_p)) {
+          cell.m = formatScientificForComputedNumber(v_p);
+        } else if ((cell.v as number).toString().toLowerCase().indexOf('e') > -1) {
           cell.m = formatMForNumericCellAvoidingGsRules(cell.v as number);
         } else {
-          const v_p = Math.round(cell.v * 1000000000) / 1000000000;
           if (_.isNil(cell.ct)) {
             const mask = genarate(v_p);
             if (mask != null) {
@@ -631,8 +631,6 @@ export function setCellValue(
             const mask = update(cell.ct.fa!, v_p);
             cell.m = mask.toString();
           }
-
-          // cell.m = mask[0].toString();
         }
       }
 

src/sheet-engine/core/modules/cell.ts

@@ -411,6 +411,10 @@ export type GlobalCache = {
     scrollTop?: number;
     scrollLeft?: number;
   };
+  /** Live column right edge (px) while dragging column resize; not in Immer context. */
+  colResizeLiveRightPx?: number;
+  /** Live row bottom edge (px) while dragging row resize; not in Immer context. */
+  rowResizeLiveBottomPx?: number;
 };
 
 export type SingleRange = { row: number[]; column: number[] };