pixel-react 1.4.2 → 1.4.4

package/src/components/Excel/ExcelFile/ExcelFileComponents/engine/engine.ts

@@ -1,4 +1,3 @@
-import FormulaParser, { FormulaError, Value } from 'fast-formula-parser';
 import * as Matrix from '../matrix';
 import { Point } from '../point';
 import { CellBase, CreateFormulaParser } from '../types';
@@ -20,10 +19,9 @@ export class Model<Cell extends CellBase> {
   ) {
     this.createFormulaParser = createFormulaParser;
     this.data = data;
-    this.referenceGraph = referenceGraph || createReferenceGraph(data);
+    this.referenceGraph = referenceGraph || createReferenceGraph();
     this.evaluatedData =
-      evaluatedData ||
-      createEvaluatedData(data, this.referenceGraph, this.createFormulaParser);
+      evaluatedData || createEvaluatedData(data, this.referenceGraph);
   }
 }
 
@@ -34,17 +32,15 @@ export function updateCellValue<Cell extends CellBase>(
 ): Model<Cell> {
   const nextData = Matrix.set(point, cell, model.data);
   const nextReferenceGraph = Formula.isFormulaValue(cell.value)
-    ? updateReferenceGraph(model.referenceGraph, point, cell, nextData)
+    ? updateReferenceGraph(model.referenceGraph)
     : model.referenceGraph;
 
-  const formulaParser = model.createFormulaParser(nextData);
   const nextEvaluatedData = evaluateCell(
     model.evaluatedData,
     nextData,
     nextReferenceGraph,
     point,
-    cell,
-    formulaParser
+    cell
   );
   return new Model(
     model.createFormulaParser,
@@ -54,19 +50,8 @@ export function updateCellValue<Cell extends CellBase>(
   );
 }
 
-function updateReferenceGraph(
-  referenceGraph: PointGraph,
-  point: Point,
-  cell: CellBase<string>,
-  data: Matrix.Matrix<CellBase>
-): PointGraph {
-  const references = Formula.getReferences(
-    Formula.extractFormula(cell.value),
-    point,
-    data
-  );
-  const nextReferenceGraph = referenceGraph.set(point, references);
-  return nextReferenceGraph;
+function updateReferenceGraph(referenceGraph: PointGraph): PointGraph {
+  return referenceGraph;
 }
 
 function evaluateCell<Cell extends CellBase>(
@@ -74,14 +59,13 @@ function evaluateCell<Cell extends CellBase>(
   data: Matrix.Matrix<Cell>,
   referenceGraph: PointGraph,
   point: Point,
-  cell: Cell,
-  formulaParser: FormulaParser
+  cell: Cell
 ): Matrix.Matrix<Cell> {
   if (referenceGraph.hasCircularDependency(point)) {
     let visited = PointSet.from([point]);
     let nextEvaluatedData = Matrix.set(
       point,
-      { ...cell, value: FormulaError.REF },
+      { ...cell, value: 'TODO' }, // TODO For Formula Evaluation
       prevEvaluatedData
     );
     for (const referrer of referenceGraph.getBackwardsRecursive(point)) {
@@ -95,7 +79,7 @@ function evaluateCell<Cell extends CellBase>(
       }
       nextEvaluatedData = Matrix.set(
         referrer,
-        { ...referrerCell, value: FormulaError.REF },
+        { ...referrerCell, value: 'TODO' }, // TODO For Formula Evaluation
         nextEvaluatedData
       );
     }
@@ -105,7 +89,7 @@ function evaluateCell<Cell extends CellBase>(
   let nextEvaluatedData = prevEvaluatedData;
 
   const evaluatedValue = Formula.isFormulaValue(cell.value)
-    ? getFormulaComputedValue(cell.value, point, formulaParser)
+    ? getFormulaComputedValue()
     : cell.value;
 
   const evaluatedCell = { ...cell, value: evaluatedValue };
@@ -119,7 +103,7 @@ function evaluateCell<Cell extends CellBase>(
       continue;
     }
     const evaluatedValue = Formula.isFormulaValue(referrerCell.value)
-      ? getFormulaComputedValue(referrerCell.value, point, formulaParser)
+      ? getFormulaComputedValue()
       : referrerCell.value;
     const evaluatedCell = { ...referrerCell, value: evaluatedValue };
     nextEvaluatedData = Matrix.set(referrer, evaluatedCell, nextEvaluatedData);
@@ -128,35 +112,17 @@ function evaluateCell<Cell extends CellBase>(
   return nextEvaluatedData;
 }
 
-/**
- *
- * @param data - the spreadsheet data
- * @returns the spreadsheet reference graph
- */
-export function createReferenceGraph(
-  data: Matrix.Matrix<CellBase>
-): PointGraph {
+export function createReferenceGraph(): PointGraph {
   const entries: Array<[Point, PointSet]> = [];
-  for (const [point, cell] of Matrix.entries(data)) {
-    if (cell && Formula.isFormulaValue(cell.value)) {
-      const references = Formula.getReferences(
-        Formula.extractFormula(cell.value),
-        point,
-        data
-      );
-      entries.push([point, references]);
-    }
-  }
+
   return PointGraph.from(entries);
 }
 
 export function createEvaluatedData<Cell extends CellBase>(
   data: Matrix.Matrix<Cell>,
-  referenceGraph: PointGraph,
-  createFormulaParser: CreateFormulaParser
+  referenceGraph: PointGraph
 ): Matrix.Matrix<Cell> {
   let evaluatedData = data;
-  let formulaParser = createFormulaParser(evaluatedData);
 
   // Iterate over the points in the reference graph, starting from the leaves
   for (const point of referenceGraph.traverseBFSBackwards()) {
@@ -168,17 +134,12 @@ export function createEvaluatedData<Cell extends CellBase>(
 
     // If the cell is a formula cell, evaluate it
     if (Formula.isFormulaValue(cell.value)) {
-      const evaluatedValue = getFormulaComputedValue(
-        cell.value,
-        point,
-        formulaParser
-      );
+      const evaluatedValue = getFormulaComputedValue();
       evaluatedData = Matrix.set(
         point,
         { ...cell, value: evaluatedValue },
         evaluatedData
       );
-      formulaParser = createFormulaParser(evaluatedData);
     }
   }
 
@@ -186,15 +147,7 @@ export function createEvaluatedData<Cell extends CellBase>(
 }
 
 /** Get the computed value of a formula cell */
-export function getFormulaComputedValue(
-  value: string,
-  point: Point,
-  formulaParser: FormulaParser
-): Value {
-  const formula = Formula.extractFormula(value);
-  try {
-    return Formula.evaluate(formula, point, formulaParser);
-  } catch (e) {
-    return FormulaError.REF;
-  }
+//TODO Function need to be Evaluate
+export function getFormulaComputedValue() {
+  return 'TODO'; // TODO For Formula Evaluation
 }

package/src/components/Excel/ExcelFile/ExcelFileComponents/engine/formula.ts

@@ -1,15 +1,5 @@
-import FormulaParser, {
-  CellRef,
-  DepParser,
-  FormulaError,
-  FormulaParserConfig,
-  Value,
-} from 'fast-formula-parser';
-import { PointRange } from '../point-range';
-import { Point } from '../point';
 import * as Matrix from '../matrix';
 import { CellBase } from '../types';
-import { PointSet } from './point-set';
 
 export const FORMULA_VALUE_PREFIX = '=';
 
@@ -29,109 +19,14 @@ export function extractFormula(value: string): string {
 
 export function createFormulaParser(
   data: Matrix.Matrix<CellBase>,
-  config?: Omit<FormulaParserConfig, 'onCell' | 'onRange'>
-): FormulaParser {
-  return new FormulaParser({
-    ...config,
-    onCell: (ref) => {
-      const point: Point = {
-        row: ref.row - 1,
-        column: ref.col - 1,
-      };
-      const cell = Matrix.get(point, data);
-      if (!isNaN(cell?.value as number)) return Number(cell?.value);
-      return cell?.value;
-    },
-    onRange: (ref) => {
-      const size = Matrix.getSize(data);
-      const start: Point = {
-        row: ref.from.row - 1,
-        column: ref.from.col - 1,
-      };
-      const end: Point = {
-        row: Math.min(ref.to.row - 1, size.rows - 1),
-        column: Math.min(ref.to.col - 1, size.columns - 1),
-      };
-      const dataSlice = Matrix.slice(start, end, data);
-      return Matrix.toArray(dataSlice, (cell) => {
-        if (!isNaN(cell?.value as number)) return Number(cell?.value);
-        return cell?.value;
-      });
-    },
-  });
+) {
+  return data
 }
 
-const depParser = new DepParser();
-
-/**
- * For given formula returns the cell references
- * @param formula - formula to get references for
- */
-export function getReferences(
-  formula: string,
-  point: Point,
-  data: Matrix.Matrix<CellBase>
-): PointSet {
-  const { rows, columns } = Matrix.getSize(data);
+export function evaluate() {
   try {
-    const dependencies = depParser.parse(formula, convertPointToCellRef(point));
-
-    const references = PointSet.from(
-      dependencies.flatMap((reference) => {
-        const isRange = 'from' in reference;
-        if (isRange) {
-          const { from, to } = reference;
-
-          const normalizedFrom: Point = {
-            row: from.row - 1,
-            column: from.col - 1,
-          };
-
-          const normalizedTo: Point = {
-            row: Math.min(to.row - 1, rows - 1),
-            column: Math.min(to.col - 1, columns - 1),
-          };
-
-          const range = new PointRange(normalizedFrom, normalizedTo);
-
-          return Array.from(range);
-        }
-        return { row: reference.row - 1, column: reference.col - 1 };
-      })
-    );
-
-    return references;
+    return "";
   } catch (error) {
-    if (error instanceof FormulaError) {
-      return PointSet.from([]);
-    } else {
-      throw error;
-    }
-  }
-}
-
-export function evaluate(
-  formula: string,
-  point: Point,
-  formulaParser: FormulaParser
-): Value {
-  try {
-    const position = convertPointToCellRef(point);
-    const returned = formulaParser.parse(formula, position);
-    return returned instanceof FormulaError ? returned.toString() : returned;
-  } catch (error) {
-    if (error instanceof FormulaError) {
-      return error.toString();
-    }
     throw error;
   }
-}
-
-function convertPointToCellRef(point: Point): CellRef {
-  return {
-    row: point.row + 1,
-    col: point.column + 1,
-    // TODO: fill once we support multiple sheets
-    sheet: 'Sheet1',
-  };
-}
+}

package/src/components/Excel/ExcelFile/ExcelFileComponents/engine/point-graph.ts

@@ -58,7 +58,6 @@ export class PointGraph {
     return result;
   }
 
-  /** Determine whether the graph has a circular dependency, starting from given start point */
   hasCircularDependency(startPoint: Point): boolean {
     let visited = PointSet.from([]);
     const stack: Point[] = [startPoint];
@@ -96,7 +95,6 @@ export class PointGraph {
       visitedHashes.add(key);
       yield [point, values];
 
-      // Make sure to include values that are not included in the forwards map keys
       for (const value of values) {
         const hash = pointHash.toString(value);
         if (!visitedHashes.has(hash) && !this.forwards.has(hash)) {

package/src/components/Excel/ExcelFile/ExcelFileComponents/reducer.ts

@@ -30,6 +30,7 @@ import {
   isActiveReadOnly,
   view,
 } from './reducerFunctions';
+import { checkEmpty } from '../../../../utils/checkEmpty/checkEmpty';
 
 export const INITIAL_STATE: Types.StoreState = {
   active: null,
@@ -44,6 +45,8 @@ export const INITIAL_STATE: Types.StoreState = {
   selected: new EmptySelection(),
   copied: null,
   lastCommit: null,
+  selectedColumn: null,
+  selectedRow: null,
 };
 
 export default function reducer(
@@ -51,6 +54,104 @@ export default function reducer(
   action: Actions.Action
 ): Types.StoreState {
   switch (action.type) {
+    case Actions.ADD_ROW_TOP: {
+      let { selectedRow, selectedColumn, model } = state;
+      if (checkEmpty(selectedRow)) {
+        return state;
+      }
+      selectedRow = selectedRow as number;
+      let updatedData = [...model.data];
+      const newRow = Array(updatedData[0]?.length || 0).fill({
+        value: undefined,
+      });
+      updatedData.splice(selectedRow, 0, newRow);
+      const updatedModel = new Model(model.createFormulaParser, updatedData);
+
+      return {
+        ...state,
+        model: updatedModel,
+        selectedRow: selectedRow,
+        selectedColumn: selectedColumn,
+      };
+    }
+
+    case Actions.ADD_COLUMN_LEFT: {
+      let { selectedRow, selectedColumn, model } = state;
+      if (checkEmpty(selectedColumn)) {
+        return state;
+      }
+      selectedColumn = selectedColumn as number;
+      let updatedData = [...model.data];
+      updatedData = updatedData.map((row) => {
+        const newCell = { value: undefined };
+        return [
+          ...row.slice(0, selectedColumn),
+          newCell,
+          ...row.slice(selectedColumn),
+        ];
+      });
+
+      const updatedModel = new Model(model.createFormulaParser, updatedData);
+
+      return {
+        ...state,
+        model: updatedModel,
+        selectedRow: selectedRow,
+        selectedColumn: selectedColumn - 1,
+      };
+    }
+
+    case Actions.DELETE_ROW: {
+      let { selectedRow, selectedColumn, model } = state;
+      if (checkEmpty(selectedRow)) {
+        return state;
+      }
+      selectedRow = selectedRow as number;
+      let updatedData = [...model.data];
+
+      updatedData.splice(selectedRow, 1);
+
+      const updatedModel = new Model(model.createFormulaParser, updatedData);
+
+      let newSelectedRow = selectedRow > 0 ? selectedRow - 1 : 0;
+      let newSelectedColumn = !checkEmpty(selectedColumn) ? selectedColumn : 0;
+
+      return {
+        ...state,
+        model: updatedModel,
+        selectedRow: newSelectedRow,
+        selectedColumn: newSelectedColumn,
+      };
+    }
+
+    case Actions.DELETE_COLUMN: {
+      let { selectedRow, selectedColumn, model } = state;
+
+      if (checkEmpty(selectedColumn)) {
+        return state;
+      }
+      selectedColumn = selectedColumn as number;
+
+      let updatedData = [...model.data];
+
+      updatedData = updatedData.map((row) => {
+        row.splice(selectedColumn, 1);
+        return row;
+      });
+
+      const updatedModel = new Model(model.createFormulaParser, updatedData);
+
+      let newSelectedRow = !checkEmpty(selectedRow) ? selectedRow : 0;
+      let newSelectedColumn = selectedColumn > 0 ? selectedColumn - 1 : 0;
+
+      return {
+        ...state,
+        model: updatedModel,
+        selectedRow: newSelectedRow,
+        selectedColumn: newSelectedColumn,
+      };
+    }
+
     case Actions.BOLD: {
       const selectedRange = state.selected.toRange(state.model.data);
       const updatedData = applyBoldToCells(
@@ -215,13 +316,14 @@ export default function reducer(
             : new EntireRowsSelection(row, row),
         active: extend && active ? active : { ...Point.ORIGIN, row },
         mode: 'view',
+        selectedColumn: null,
+        selectedRow: row,
       };
     }
 
     case Actions.SELECT_ENTIRE_COLUMN: {
       const { column, extend } = action.payload;
       const { active } = state;
-
       return {
         ...state,
         selected:
@@ -230,6 +332,8 @@ export default function reducer(
             : new EntireColumnsSelection(column, column),
         active: extend && active ? active : { ...Point.ORIGIN, column },
         mode: 'view',
+        selectedColumn: column,
+        selectedRow: null,
       };
     }