@univerjs/sheets-formula 0.24.0 → 0.25.0

package/lib/cjs/facade.js

@@ -3,7 +3,6 @@ let _univerjs_core_facade = require("@univerjs/core/facade");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let _univerjs_sheets_formula = require("@univerjs/sheets-formula");
 let _univerjs_engine_formula_facade = require("@univerjs/engine-formula/facade");
-let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 
 //#region src/facade/f-univer.ts
@@ -98,65 +97,15 @@ var FFormulaSheetsMixin = class extends _univerjs_engine_formula_facade.FFormula
 		return functionsDisposable;
 	}
 	calculationResultApplied(callback) {
-		let setFormulaCalculationResult = false;
-		let applyFormulaCalculationResult = false;
-		let result = null;
-		return this._commandService.onCommandExecuted((command, options) => {
-			if (command.id !== _univerjs_engine_formula.SetFormulaCalculationResultMutation.id && command.id !== _univerjs_sheets.SetRangeValuesMutation.id) return;
-			if (command.id === _univerjs_engine_formula.SetFormulaCalculationResultMutation.id) {
-				setFormulaCalculationResult = true;
-				result = command.params;
-				applyFormulaCalculationResult = applyFormulaCalculationResult || !this._hasFormulaResultToApply(result);
-			}
-			if (command.id === _univerjs_sheets.SetRangeValuesMutation.id && (options === null || options === void 0 ? void 0 : options.applyFormulaCalculationResult)) applyFormulaCalculationResult = true;
-			if (!setFormulaCalculationResult || !applyFormulaCalculationResult) return;
+		const subscription = this._injector.get(_univerjs_sheets_formula.FormulaCalculationSessionService).resultApplied$.subscribe((result) => {
 			requestIdleCallback(() => {
 				callback(result);
 			});
 		});
+		return { dispose: () => subscription.unsubscribe() };
 	}
-	_hasFormulaResultToApply(result) {
-		const { unitData } = result;
-		return Object.values(unitData !== null && unitData !== void 0 ? unitData : {}).some((sheetData) => sheetData != null && Object.values(sheetData).some((cellData) => cellData != null));
-	}
-	onCalculationResultApplied() {
-		return new Promise((resolve, reject) => {
-			let started = false;
-			let finished = false;
-			const mainTimer = setTimeout(() => {
-				cleanup();
-				reject(/* @__PURE__ */ new Error("Calculation end timeout"));
-			}, 6e4);
-			const startWatchdog = setTimeout(() => {
-				if (!started) {
-					cleanup();
-					resolve();
-				}
-			}, 500);
-			const processingDisposable = this.calculationProcessing((stageInfo) => {
-				const { stage, totalArrayFormulasToCalculate, totalFormulasToCalculate } = stageInfo;
-				if (stage === _univerjs_engine_formula.FormulaExecuteStageType.START_CALCULATION && totalArrayFormulasToCalculate + totalFormulasToCalculate === 0) {
-					cleanup();
-					resolve();
-					return;
-				}
-				if (started) return;
-				started = true;
-				clearTimeout(startWatchdog);
-			});
-			const endDisposable = this.calculationResultApplied(() => {
-				if (finished) return;
-				finished = true;
-				cleanup();
-				resolve();
-			});
-			function cleanup() {
-				clearTimeout(mainTimer);
-				clearTimeout(startWatchdog);
-				processingDisposable.dispose();
-				endDisposable.dispose();
-			}
-		});
+	onCalculationResultApplied(timeout) {
+		return this._injector.get(_univerjs_sheets_formula.FormulaCalculationSessionService).waitForLatestApplied(timeout);
 	}
 };
 _univerjs_engine_formula_facade.FFormula.extend(FFormulaSheetsMixin);