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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(docs): table context menu disable status (#3921)
Ran Luo05339d206ceb
diff --git a/packages/docs-ui/src/controllers/menu/context-menu.ts b/packages/docs-ui/src/controllers/menu/context-menu.tsindex da4f915435..ceb0d15e7b 100644--- a/packages/docs-ui/src/controllers/menu/context-menu.ts+++ b/packages/docs-ui/src/controllers/menu/context-menu.ts@@ -17,6 +17,7 @@import type { IAccessor } from '@univerjs/core';import type { IRectRangeWithStyle } from '@univerjs/engine-render';import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';+import type { Subscriber } from 'rxjs';import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { DocSelectionManagerService } from '@univerjs/docs';import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';@@ -52,40 +53,43 @@ function inSameTable(rectRanges: Readonly<IRectRangeWithStyle[]>) {return tableIds.every((tableId) => tableId === tableIds[0]);}-const getDisableWhenSelectionNotInTableObservable = (accessor: IAccessor) => {- const docSelectionManagerService = accessor.get(DocSelectionManagerService);- const univerInstanceService = accessor.get(IUniverInstanceService);+function notInTableSubscriber(subscriber: Subscriber<boolean>, docSelectionManagerService: DocSelectionManagerService, univerInstanceService: IUniverInstanceService) {+ const rectRanges = docSelectionManagerService.getRectRanges();+ const activeRange = docSelectionManagerService.getActiveTextRange();- return new Observable<boolean>((subscriber) => {- const observable = docSelectionManagerService.textSelection$.subscribe(() => {- const rectRanges = docSelectionManagerService.getRectRanges();- const activeRange = docSelectionManagerService.getActiveTextRange();+ if (rectRanges && rectRanges.length && inSameTable(rectRanges) && activeRange == null) {+ subscriber.next(false);+ return;+ }- if (rectRanges && rectRanges.length && inSameTable(rectRanges)) {+ if (activeRange && (rectRanges == null || rectRanges.length === 0)) {+ const { segmentId, startOffset, endOffset } = activeRange;+ const docDataModel = univerInstanceService.getCurrentUniverDocInstance();+ const tables = docDataModel?.getSelfOrHeaderFooterModel(segmentId).getBody()?.tables;++ if (tables && tables.length) {+ if (tables.some((table) => {+ const { startIndex, endIndex } = table;+ return (startOffset > startIndex && startOffset < endIndex) || (endOffset > startIndex && endOffset < endIndex);+ })) {subscriber.next(false);return;}+ }+ }+ subscriber.next(true);+}- if (activeRange && (rectRanges == null || rectRanges.length === 0)) {- const { segmentId, startOffset, endOffset } = activeRange;- const docDataModel = univerInstanceService.getCurrentUniverDocInstance();- const tables = docDataModel?.getSelfOrHeaderFooterModel(segmentId).getBody()?.tables;-- if (tables && tables.length) {- if (tables.some((table) => {- const { startIndex, endIndex } = table;- return (startOffset > startIndex && startOffset < endIndex) || (endOffset > startIndex && endOffset < endIndex);- })) {- subscriber.next(false);- return;- }- }- }+const getDisableWhenSelectionNotInTableObservable = (accessor: IAccessor) => {+ const docSelectionManagerService = accessor.get(DocSelectionManagerService);+ const univerInstanceService = accessor.get(IUniverInstanceService);- subscriber.next(true);+ return new Observable<boolean>((subscriber) => {+ const observable = docSelectionManagerService.textSelection$.subscribe(() => {+ notInTableSubscriber(subscriber, docSelectionManagerService, univerInstanceService);});- subscriber.next(true);+ notInTableSubscriber(subscriber, docSelectionManagerService, univerInstanceService);return () => observable.unsubscribe();});diff --git a/packages/docs-ui/src/controllers/menu/menu.ts b/packages/docs-ui/src/controllers/menu/menu.tsindex 647ee9a74f..39848b9604 100644--- a/packages/docs-ui/src/controllers/menu/menu.ts+++ b/packages/docs-ui/src/controllers/menu/menu.ts@@ -592,8 +592,8 @@ export function TableMenuFactory(accessor: IAccessor): IMenuItem {tooltip: 'toolbar.table.main',disabled$: getTableDisabledObservable(accessor),// Do not show header footer menu and insert table at zen mode.- hidden$: combineLatest(getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC), getInsertTableHiddenObservable(accessor), getHeaderFooterMenuHiddenObservable(accessor), (one, two, three) => {- return one || two || three;+ hidden$: combineLatest(getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC), getInsertTableHiddenObservable(accessor), (one, two) => {+ return one || two;}),};}