Merge pull request #662 from Corbe30/revert-655-feature/hyperformula

Revert "Feature: Hyperformula"

Author: sanchit3008

.github/workflows/release.yml

@@ -21,15 +21,20 @@ jobs:
       - run: yarn build
       - run: cd packages/core && npm pack
       - run: cd packages/react && npm pack
+      - run: cd packages/formula-parser && npm pack
       - uses: actions/upload-artifact@v4
         with:
           name: packages
           path: |
             packages/core/fortune-sheet-core-*.tgz
             packages/react/fortune-sheet-react-*.tgz
+            packages/formula-parser/fortune-sheet-formula-parser-*.tgz
       - run: cd packages/core && npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
       - run: cd packages/react && npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - run: cd packages/formula-parser && npm publish || true
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

README.md

@@ -50,7 +50,7 @@ Before stable release of 1.0, input data structure and APIs may change during de
   ```
 - Multiple instance on the same page is supported.
 - Dropped `jQuery` dependency, uses native `React` / `Vue` + `immer` to manage the dom and state.
-- Formulas are now being parsed by [handsontable/hyperformula](https://github.com/handsontable/hyperformula)
+- Changed to a forked [handsontable/formula-parser](https://github.com/handsontable/formula-parser) to handle formula calculations.
 - Optimized the dom structure.
 - Replaced icons from `iconfont` with SVGs, as `iconfont` icons are inconvenient to update for other maintainers.
 - No visible elements is created outside container.

package.json

@@ -14,6 +14,7 @@
     "build-storybook": "storybook build",
     "tsc": "tsc --noEmit",
     "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx,.json ./packages",
+    "postinstall": "lerna run build --scope=@fortune-sheet/formula-parser",
     "publish": "npm publish packages/core --registry 'https://registry.npmjs.org' && npm publish packages/react --registry 'https://registry.npmjs.org'",
     "test": "jest",
     "coverage": "jest --coverage"

packages/core/package.json

@@ -10,7 +10,7 @@
   "repository": "https://github.com/ruilisi/fortune-sheet",
   "license": "MIT",
   "dependencies": {
-    "hyperformula": "^2.7.1",
+    "@fortune-sheet/formula-parser": "^0.2.13",
     "dayjs": "^1.11.0",
     "immer": "^9.0.12",
     "lodash": "^4.17.21",

packages/core/src/events/paste.ts

@@ -31,20 +31,8 @@ function postPasteCut(
   const execF_rc: any = {};
   ctx.formulaCache.execFunctionExist = [];
   // clearTimeout(refreshCanvasTimeOut);
-
-  let prevSheetId = null;
-  let data = null;
   for (let r = source.range.row[0]; r <= source.range.row[1]; r += 1) {
     for (let c = source.range.column[0]; c <= source.range.column[1]; c += 1) {
-      if (source.sheetId !== prevSheetId) {
-        prevSheetId = source.sheetId;
-        data = getFlowdata(ctx, prevSheetId);
-      }
-      ctx.formulaCache.updateVirtualCellRaw(
-        ctx,
-        { r, c, id: source.sheetId },
-        data?.[r][c]?.v
-      );
       setFormulaCellInfo(ctx, { r, c, id: source.sheetId });
       if (`${r}_${c}_${source.sheetId}` in execF_rc) {
         continue;
@@ -57,15 +45,6 @@ function postPasteCut(
 
   for (let r = target.range.row[0]; r <= target.range.row[1]; r += 1) {
     for (let c = target.range.column[0]; c <= target.range.column[1]; c += 1) {
-      if (source.sheetId !== prevSheetId) {
-        prevSheetId = source.sheetId;
-        data = getFlowdata(ctx, prevSheetId);
-      }
-      ctx.formulaCache.updateVirtualCellRaw(
-        ctx,
-        { r, c, id: source.sheetId },
-        data?.[r][c]?.v
-      );
       setFormulaCellInfo(ctx, { r, c, id: source.sheetId });
       if (`${r}_${c}_${target.sheetId}` in execF_rc) {
         continue;

packages/core/src/modules/cell.ts

@@ -902,11 +902,6 @@ export function updateCell(
           });
         }
       } else {
-        ctx.formulaCache.updateVirtualCellRaw(
-          ctx,
-          { r, c, id: ctx.currentSheetId },
-          value
-        );
         delFunctionGroup(ctx, r, c);
         execFunctionGroup(ctx, r, c, value);
         isRunExecFunction = false;
@@ -993,11 +988,6 @@ export function updateCell(
         }
       }
     } else {
-      ctx.formulaCache.updateVirtualCellRaw(
-        ctx,
-        { r, c, id: ctx.currentSheetId },
-        value
-      );
       delFunctionGroup(ctx, r, c);
       execFunctionGroup(ctx, r, c, value);
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -1096,12 +1086,6 @@ export function updateCell(
     });
   }
 
-  ctx.formulaCache.updateVirtualCellRaw(
-    ctx,
-    { r, c, id: ctx.currentSheetId },
-    flowdata?.[r][c]?.v
-  );
-
   setFormulaCellInfo(ctx, { r, c, id: ctx.currentSheetId });
   ctx.formulaCache.execFunctionGlobalData = null;
 }