Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(sheets-ui): range disable status error after switch menus (#5195)

ZhangWei89570fe33d4b
diff --git a/packages/sheets-ui/src/controllers/menu/menu-util.ts b/packages/sheets-ui/src/controllers/menu/menu-util.ts
index 61b6643af7..088a6c6801 100644
--- a/packages/sheets-ui/src/controllers/menu/menu-util.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu-util.ts
@@ -19,8 +19,8 @@ import type { Observable } from 'rxjs';
import type { IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';
import { FOCUSING_COMMON_DRAWINGS, FOCUSING_FX_BAR_EDITOR, IContextService, IPermissionService, IUniverInstanceService, Rectangle, Tools, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { IExclusiveRangeService, RangeProtectionPermissionEditPoint, RangeProtectionRuleModel, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';
-import { BehaviorSubject, combineLatest, merge, of } from 'rxjs';
-import { debounceTime, finalize, map, startWith, switchMap } from 'rxjs/operators';
+import { combineLatest, merge, of } from 'rxjs';
+import { debounceTime, map, shareReplay, startWith, switchMap } from 'rxjs/operators';
import { IEditorBridgeService } from '../../services/editor-bridge.service';
interface IActive {
@@ -105,24 +105,19 @@ export function getCurrentRangeDisable$(accessor: IAccessor, permissionTypes: IP
const userManagerService = accessor.get(UserManagerService);
const editorBridgeService = accessor.has(IEditorBridgeService) ? accessor.get(IEditorBridgeService) : null;
const contextService = accessor.get(IContextService);
- const formulaEditorFocus$ = new BehaviorSubject<boolean>(false);
- const _editorVisible$ = editorBridgeService?.visible$;
+ const _editorVisible$ = editorBridgeService?.visible$ ?? of<Nullable<IEditorBridgeServiceVisibleParam>>(null);
- const editorVisible$ = new BehaviorSubject<IEditorBridgeServiceVisibleParam | null>(null);
- const subscription = contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR).subscribe((visible) => {
- formulaEditorFocus$.next(visible);
- });
+ const editorVisible$ = _editorVisible$.pipe(
+ startWith(null),
+ shareReplay(1)
+ );
- const editorVisibleSubscription = _editorVisible$?.subscribe((visible) => {
- editorVisible$.next(visible);
- });
+ const formulaEditorFocus$ = contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR).pipe(
+ startWith(false),
+ shareReplay(1)
+ );
const observable = combineLatest([userManagerService.currentUser$, workbook$, editorVisible$, formulaEditorFocus$]).pipe(
- finalize(() => {
- subscription.unsubscribe();
- editorVisibleSubscription?.unsubscribe();
- formulaEditorFocus$.complete();
- }),
switchMap(([_, workbook, visible, formulaEditorFocus]) => {
if (
!workbook ||