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-hyper-link-ui): menu disable status error (#4872)

ZhangWei580989d30956
diff --git a/packages/sheets-ui/src/controllers/menu/menu-util.ts b/packages/sheets-ui/src/controllers/menu/menu-util.ts
index 3cfabf81fc..61b6643af7 100644
--- a/packages/sheets-ui/src/controllers/menu/menu-util.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu-util.ts
@@ -16,6 +16,7 @@
import type { IAccessor, IPermissionTypes, IRange, Nullable, Workbook, WorkbookPermissionPointConstructor, Worksheet } from '@univerjs/core';
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';
@@ -105,15 +106,21 @@ export function getCurrentRangeDisable$(accessor: IAccessor, permissionTypes: IP
const editorBridgeService = accessor.has(IEditorBridgeService) ? accessor.get(IEditorBridgeService) : null;
const contextService = accessor.get(IContextService);
const formulaEditorFocus$ = new BehaviorSubject<boolean>(false);
- const editorVisible$ = editorBridgeService?.visible$ ?? of(null);
+ const _editorVisible$ = editorBridgeService?.visible$;
+ const editorVisible$ = new BehaviorSubject<IEditorBridgeServiceVisibleParam | null>(null);
const subscription = contextService.subscribeContextValue$(FOCUSING_FX_BAR_EDITOR).subscribe((visible) => {
formulaEditorFocus$.next(visible);
});
+ const editorVisibleSubscription = _editorVisible$?.subscribe((visible) => {
+ editorVisible$.next(visible);
+ });
+
const observable = combineLatest([userManagerService.currentUser$, workbook$, editorVisible$, formulaEditorFocus$]).pipe(
finalize(() => {
subscription.unsubscribe();
+ editorVisibleSubscription?.unsubscribe();
formulaEditorFocus$.complete();
}),
switchMap(([_, workbook, visible, formulaEditorFocus]) => {