iwp

Author: fdamhaut

packages/o-spreadsheet-engine/src/plugins/ui_core_views/cell_evaluation/evaluation_plugin.ts

@@ -33,6 +33,7 @@ import { ExcelWorkbookData } from "../../../types/workbook_data";
 import { FormulaCellWithDependencies } from "../../core/cell";
 import { CoreViewPlugin, CoreViewPluginConfig } from "../../core_view_plugin";
 import { Evaluator } from "./evaluator";
+import { RangeSet } from "./range_set";
 
 //#region
 
@@ -172,7 +173,7 @@ export class EvaluationPlugin extends CoreViewPlugin {
   private shouldRebuildDependenciesGraph = true;
 
   private evaluator: Evaluator;
-  private positionsToUpdate: CellPosition[] = [];
+  private positionsToUpdate: RangeSet = new RangeSet();
 
   constructor(config: CoreViewPluginConfig) {
     super(config);
@@ -199,7 +200,7 @@ export class EvaluationPlugin extends CoreViewPlugin {
           return;
         }
         const position = { sheetId: cmd.sheetId, row: cmd.row, col: cmd.col };
-        this.positionsToUpdate.push(position);
+        this.positionsToUpdate.addPosition(position);
 
         if ("content" in cmd) {
           this.evaluator.updateDependencies(position);
@@ -210,14 +211,12 @@ export class EvaluationPlugin extends CoreViewPlugin {
           return;
         }
         for (const zone of cmd.target) {
-          this.positionsToUpdate.push(...cellPositions(cmd.sheetId, zone));
+          this.positionsToUpdate.add({ sheetId: cmd.sheetId, zone });
         }
         break;
       case "EVALUATE_CELLS":
         if (cmd.cellIds) {
-          for (let i = 0; i < cmd.cellIds.length; i++) {
-            this.positionsToUpdate.push(this.getters.getCellPosition(cmd.cellIds[i]));
-          }
+          this.positionsToUpdate.addManyPositions(cmd.cellIds.map(this.getters.getCellPosition));
         } else {
           this.evaluator.evaluateAllCells();
         }
@@ -230,10 +229,10 @@ export class EvaluationPlugin extends CoreViewPlugin {
       this.evaluator.buildDependencyGraph();
       this.evaluator.evaluateAllCells();
       this.shouldRebuildDependenciesGraph = false;
-    } else if (this.positionsToUpdate.length) {
+    } else if (!this.positionsToUpdate.isEmpty()) {
       this.evaluator.evaluateCells(this.positionsToUpdate);
     }
-    this.positionsToUpdate = [];
+    this.positionsToUpdate = new RangeSet();
   }
 
   // ---------------------------------------------------------------------------

packages/o-spreadsheet-engine/src/plugins/ui_core_views/cell_evaluation/evaluator.ts

@@ -28,7 +28,13 @@ import { matrixMap } from "../../../functions/helpers";
 import { PositionMap } from "../../../helpers/cells/position_map";
 import { toXC } from "../../../helpers/coordinates";
 import { lazy } from "../../../helpers/misc";
-import { excludeTopLeft, positionsUnion, positionToZone, union } from "../../../helpers/zones";
+import {
+  cellPositions,
+  excludeTopLeft,
+  positionsUnion,
+  positionToZone,
+  union,
+} from "../../../helpers/zones";
 import { onIterationEndEvaluationRegistry } from "../../../registries/evaluation_registry";
 import { _t } from "../../../translation";
 import { Format } from "../../../types/format";
@@ -162,10 +168,9 @@ export class Evaluator {
     return new PositionSet(this.getters.getSheetIds());
   }
 
-  evaluateCells(positions: CellPosition[]) {
+  evaluateCells(positions: RangeSet) {
     const start = performance.now();
-    const rangesToCompute = new RangeSet();
-    rangesToCompute.addManyPositions(positions);
+    const rangesToCompute = positions;
     const arrayFormulasPositions = this.getArrayFormulasImpactedByChangesOf(positions);
     rangesToCompute.addMany(this.getCellsDependingOn(rangesToCompute));
     rangesToCompute.addMany(arrayFormulasPositions);
@@ -175,19 +180,21 @@ export class Evaluator {
     console.debug("evaluate Cells", performance.now() - start, "ms");
   }
 
-  private getArrayFormulasImpactedByChangesOf(positions: Iterable<CellPosition>): RangeSet {
+  private getArrayFormulasImpactedByChangesOf(ranges: RangeSet): RangeSet {
     const impactedRanges = new RangeSet();
 
-    for (const position of positions) {
-      const content = this.getters.getCell(position)?.content;
-      const arrayFormulaPosition = this.getArrayFormulaSpreadingOn(position);
-      if (arrayFormulaPosition !== undefined) {
-        // take into account new collisions.
-        impactedRanges.addPosition(arrayFormulaPosition);
-      }
-      if (!content) {
-        // The previous content could have blocked some array formulas
-        impactedRanges.addPosition(position);
+    for (const range of ranges) {
+      for (const position of cellPositions(range.sheetId, range.zone)) {
+        const content = this.getters.getCell(position)?.content;
+        const arrayFormulaPosition = this.getArrayFormulaSpreadingOn(position);
+        if (arrayFormulaPosition !== undefined) {
+          // take into account new collisions.
+          impactedRanges.addPosition(arrayFormulaPosition);
+        }
+        if (!content) {
+          // The previous content could have blocked some array formulas
+          impactedRanges.addPosition(position);
+        }
       }
     }
     for (const range of [...impactedRanges]) {

packages/o-spreadsheet-engine/src/plugins/ui_feature/format.ts

@@ -33,16 +33,13 @@ export class FormatPlugin extends UIPlugin {
     const measurePositions: CellPosition[] = [];
     const measuresByPivotId: Record<string, Set<string>> = {};
     for (const zone of recomputeZones(zones)) {
-      for (let col = zone.left; col <= zone.right; col++) {
-        for (let row = zone.top; row <= zone.bottom; row++) {
-          const position = { sheetId, col, row };
-          const pivotCell = this.getters.getPivotCellFromPosition(position);
-          if (this.isSpilledPivotValueFormula(position, pivotCell)) {
-            measurePositions.push(position);
-            const pivotId = this.getters.getPivotIdFromPosition(position) || "";
-            measuresByPivotId[pivotId] ??= new Set();
-            measuresByPivotId[pivotId].add(pivotCell.measure);
-          }
+      for (const position of this.getters.getEvaluatedCellsPositionInZone(sheetId, zone)) {
+        const pivotCell = this.getters.getPivotCellFromPosition(position);
+        if (this.isSpilledPivotValueFormula(position, pivotCell)) {
+          measurePositions.push(position);
+          const pivotId = this.getters.getPivotIdFromPosition(position) || "";
+          measuresByPivotId[pivotId] ??= new Set();
+          measuresByPivotId[pivotId].add(pivotCell.measure);
         }
       }
     }