@univerjs/sheets-ui 0.4.0 → 0.4.1

package/lib/es/index.js

@@ -11,7 +11,7 @@ import { KeyCode, IConfirmService, ISidebarService, IDialogService, ComponentMan
 import { DocSkeletonManagerService, SetTextSelectionsOperation, DocSelectionManagerService, RichTextEditingMutation } from "@univerjs/docs";
 import React, { forwardRef, useRef, createElement, useState, useEffect, useMemo, useCallback, useLayoutEffect } from "react";
 import { Dropdown, ColorPicker, Menu, MenuItem, InputNumber, Input, RadioGroup, Radio, Select, Button, Tooltip, Confirm, Slider, MessageType, Avatar, FormLayout, Switch } from "@univerjs/design";
-import { IDefinedNamesService, IFunctionService, LexerTreeBuilder, operatorToken, isReferenceStrings, isReferenceStringWithEffectiveColumn, serializeRangeWithSheet, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_MATH, FUNCTION_NAMES_TEXT, sequenceNodeType, matchToken, deserializeRangeWithSheet, NullValueObject, serializeRange } from "@univerjs/engine-formula";
+import { IDefinedNamesService, IFunctionService, LexerTreeBuilder, operatorToken, isReferenceStrings, isReferenceStringWithEffectiveColumn, serializeRangeWithSheet, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_MATH, FUNCTION_NAMES_TEXT, sequenceNodeType, matchToken, deserializeRangeWithSheet, NullValueObject, serializeRange, SetFormulaCalculationNotificationMutation } from "@univerjs/engine-formula";
 import { filter as filter$1 } from "rxjs/operators";
 import { ITelemetryService } from "@univerjs/telemetry";
 var SheetsUIPart = /* @__PURE__ */ ((SheetsUIPart2) => (SheetsUIPart2.FILTER_PANEL_EMBED_POINT = "filter-panel-embed-point", SheetsUIPart2.SHEETS_FOOTER = "sheets-footer", SheetsUIPart2))(SheetsUIPart || {});
@@ -20879,14 +20879,18 @@ let EditorBridgeRenderController = (_a50 = class extends RxDisposable {
    * @param d DisposableCollection
    */
   _initialKeyboardListener(d) {
-    var _a61;
-    const docSelectionRenderService = (_a61 = this._renderManagerService.getCurrentTypeOfRenderer(UniverInstanceType.UNIVER_DOC)) == null ? void 0 : _a61.with(DocSelectionRenderService);
-    docSelectionRenderService && d.add(docSelectionRenderService.onInputBefore$.subscribe((config) => {
-      var _a62;
-      if (!this._isCurrentSheetFocused())
-        return;
-      const isFocusFormulaEditor = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR), isFocusSheets = this._contextService.getContextValue(FOCUSING_SHEET), unitId = (_a62 = this._instanceSrv.getCurrentUniverDocInstance()) == null ? void 0 : _a62.getUnitId();
-      this._editorBridgeService.isVisible().visible || unitId && isFocusSheets && !isFocusFormulaEditor && this._editorService.isSheetEditor(unitId) && this._showEditorByKeyboard(config);
+    let disposable = null;
+    const addEvent = /* @__PURE__ */ __name((render22) => {
+      const docSelectionRenderService = render22.with(DocSelectionRenderService);
+      docSelectionRenderService && (disposable = toDisposable(docSelectionRenderService.onInputBefore$.subscribe((config) => {
+        if (!this._isCurrentSheetFocused())
+          return;
+        const isFocusFormulaEditor = this._contextService.getContextValue(FOCUSING_FX_BAR_EDITOR), isFocusSheets = this._contextService.getContextValue(FOCUSING_SHEET), unitId = render22.unitId;
+        this._editorBridgeService.isVisible().visible || unitId && isFocusSheets && !isFocusFormulaEditor && this._editorService.isSheetEditor(unitId) && this._showEditorByKeyboard(config);
+      })), d.add(disposable));
+    }, "addEvent"), render2 = this._renderManagerService.getRenderById(DOCS_NORMAL_EDITOR_UNIT_ID_KEY);
+    render2 ? addEvent(render2) : this.disposeWithMe(this._renderManagerService.created$.pipe(filter((render22) => render22.unitId === DOCS_NORMAL_EDITOR_UNIT_ID_KEY)).subscribe((render22) => {
+      disposable == null || disposable.dispose(), addEvent(render22);
     }));
   }
   _commandExecutedListener(d) {
@@ -21590,7 +21594,7 @@ let SheetRenderController = (_a54 = class extends RxDisposable {
   }
   _markUnitDirty(unitId, command) {
     const { mainComponent: spreadsheet, scene } = this._context;
-    if (spreadsheet && spreadsheet.makeDirty(), scene.makeDirty(), !command.params) return;
+    if (command.id === SetFormulaCalculationNotificationMutation.id && command.params.stageInfo != null || (spreadsheet && spreadsheet.makeDirty(), scene.makeDirty(), !command.params)) return;
     const cmdParams = command.params, viewports = this._spreadsheetViewports(scene);
     if (command.id === SetRangeValuesMutation.id && cmdParams.cellValue) {
       const dirtyRange = this._cellValueToRange(cmdParams.cellValue), dirtyBounds = this._rangeToBounds([dirtyRange]);