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(ui): align docs and sheets paste controls (#7765)

Univer8059d7b659e4
diff --git a/packages/docs-thread-comment-ui/src/menu/schema.ts b/packages/docs-thread-comment-ui/src/menu/schema.ts
index 79c12cc0fa..6fd2060932 100644
--- a/packages/docs-thread-comment-ui/src/menu/schema.ts
+++ b/packages/docs-thread-comment-ui/src/menu/schema.ts
@@ -22,7 +22,11 @@ import {
StartAddCommentOperation,
ToggleCommentPanelOperation,
} from '../commands/operations/show-comment-panel.operation';
-import { AddDocCommentMenuItemFactory, AddDocDrawingCommentMenuItemFactory, ToolbarDocCommentMenuItemFactory } from './menu';
+import {
+ AddDocCommentMenuItemFactory,
+ AddDocDrawingCommentMenuItemFactory,
+ ToolbarDocCommentMenuItemFactory,
+} from './menu';
export const menuSchema: MenuSchemaType = {
[RibbonInsertGroup.OTHERS]: {
@@ -49,14 +53,6 @@ export const menuSchema: MenuSchemaType = {
menuItemFactory: AddDocDrawingCommentMenuItemFactory,
},
},
- [ContextMenuPosition.MAIN_AREA]: {
- [ContextMenuGroup.DATA]: {
- [StartAddCommentOperation.id]: {
- order: 1,
- menuItemFactory: AddDocCommentMenuItemFactory,
- },
- },
- },
[ContextMenuPosition.DRAWING]: {
[ContextMenuGroup.DATA]: {
[AddDocDrawingCommentOperation.id]: {
diff --git a/packages/docs-ui/src/locale/ar-SA.ts b/packages/docs-ui/src/locale/ar-SA.ts
index 418f2c6533..09df849cdc 100644
--- a/packages/docs-ui/src/locale/ar-SA.ts
+++ b/packages/docs-ui/src/locale/ar-SA.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'لصق خاص',
title: 'خيارات اللصق',
source: 'الاحتفاظ بتنسيق المصدر',
destination: 'مطابقة تنسيق الوجهة',
diff --git a/packages/docs-ui/src/locale/ca-ES.ts b/packages/docs-ui/src/locale/ca-ES.ts
index e47a342401..07e0c0e8d3 100644
--- a/packages/docs-ui/src/locale/ca-ES.ts
+++ b/packages/docs-ui/src/locale/ca-ES.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Enganxament especial',
title: 'Opcions d’enganxament',
source: 'Mantén el format d’origen',
destination: 'Adapta al format de destinació',
diff --git a/packages/docs-ui/src/locale/de-DE.ts b/packages/docs-ui/src/locale/de-DE.ts
index d5af6ea341..c9f91cbc95 100644
--- a/packages/docs-ui/src/locale/de-DE.ts
+++ b/packages/docs-ui/src/locale/de-DE.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Inhalte einfügen',
title: 'Einfügeoptionen',
source: 'Ursprüngliche Formatierung beibehalten',
destination: 'Zielformatierung übernehmen',
diff --git a/packages/docs-ui/src/locale/en-US.ts b/packages/docs-ui/src/locale/en-US.ts
index cd327b565f..10e3712fbf 100644
--- a/packages/docs-ui/src/locale/en-US.ts
+++ b/packages/docs-ui/src/locale/en-US.ts
@@ -17,6 +17,7 @@
const locale = {
'docs-ui': {
pasteOptions: {
+ special: 'Paste special',
title: 'Paste options',
source: 'Keep source formatting',
destination: 'Match destination formatting',
diff --git a/packages/docs-ui/src/locale/es-ES.ts b/packages/docs-ui/src/locale/es-ES.ts
index 918994ab8a..4ebac692fb 100644
--- a/packages/docs-ui/src/locale/es-ES.ts
+++ b/packages/docs-ui/src/locale/es-ES.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Pegado especial',
title: 'Opciones de pegado',
source: 'Mantener formato de origen',
destination: 'Adaptar al formato de destino',
diff --git a/packages/docs-ui/src/locale/fa-IR.ts b/packages/docs-ui/src/locale/fa-IR.ts
index 8118ff449e..bdfb6586d0 100644
--- a/packages/docs-ui/src/locale/fa-IR.ts
+++ b/packages/docs-ui/src/locale/fa-IR.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'چسباندن ویژه',
title: 'گزینه‌های چسباندن',
source: 'حفظ قالب‌بندی مبدأ',
destination: 'تطبیق با قالب‌بندی مقصد',
diff --git a/packages/docs-ui/src/locale/fr-FR.ts b/packages/docs-ui/src/locale/fr-FR.ts
index 966ff85a8b..b7853cd320 100644
--- a/packages/docs-ui/src/locale/fr-FR.ts
+++ b/packages/docs-ui/src/locale/fr-FR.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Collage spécial',
title: 'Options de collage',
source: 'Conserver la mise en forme source',
destination: 'Adapter à la mise en forme de destination',
diff --git a/packages/docs-ui/src/locale/id-ID.ts b/packages/docs-ui/src/locale/id-ID.ts
index 93a741e166..b02be8317a 100644
--- a/packages/docs-ui/src/locale/id-ID.ts
+++ b/packages/docs-ui/src/locale/id-ID.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Tempel khusus',
title: 'Opsi tempel',
source: 'Pertahankan format sumber',
destination: 'Sesuaikan format tujuan',
diff --git a/packages/docs-ui/src/locale/it-IT.ts b/packages/docs-ui/src/locale/it-IT.ts
index 0b6dce5e67..59bbd42d44 100644
--- a/packages/docs-ui/src/locale/it-IT.ts
+++ b/packages/docs-ui/src/locale/it-IT.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Incolla speciale',
title: 'Opzioni di incolla',
source: 'Mantieni formattazione originale',
destination: 'Adatta alla formattazione di destinazione',
diff --git a/packages/docs-ui/src/locale/ja-JP.ts b/packages/docs-ui/src/locale/ja-JP.ts
index ba6b97105d..85bc924828 100644
--- a/packages/docs-ui/src/locale/ja-JP.ts
+++ b/packages/docs-ui/src/locale/ja-JP.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: '形式を選択して貼り付け',
title: '貼り付けのオプション',
source: '元の書式を保持',
destination: '貼り付け先の書式に合わせる',
diff --git a/packages/docs-ui/src/locale/ko-KR.ts b/packages/docs-ui/src/locale/ko-KR.ts
index 8e80d89a2c..9d65e80f14 100644
--- a/packages/docs-ui/src/locale/ko-KR.ts
+++ b/packages/docs-ui/src/locale/ko-KR.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: '선택하여 붙여넣기',
title: '붙여넣기 옵션',
source: '원본 서식 유지',
destination: '대상 서식에 맞추기',
diff --git a/packages/docs-ui/src/locale/pl-PL.ts b/packages/docs-ui/src/locale/pl-PL.ts
index 0badd9e2cf..03d1d5b680 100644
--- a/packages/docs-ui/src/locale/pl-PL.ts
+++ b/packages/docs-ui/src/locale/pl-PL.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Wklej specjalnie',
title: 'Opcje wklejania',
source: 'Zachowaj formatowanie źródłowe',
destination: 'Dopasuj formatowanie docelowe',
diff --git a/packages/docs-ui/src/locale/pt-BR.ts b/packages/docs-ui/src/locale/pt-BR.ts
index 856d5f3145..8fc6dcb43e 100644
--- a/packages/docs-ui/src/locale/pt-BR.ts
+++ b/packages/docs-ui/src/locale/pt-BR.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Colar especial',
title: 'Opções de colagem',
source: 'Manter formatação original',
destination: 'Usar formatação de destino',
diff --git a/packages/docs-ui/src/locale/ru-RU.ts b/packages/docs-ui/src/locale/ru-RU.ts
index 537558a7d5..63a8f6e39c 100644
--- a/packages/docs-ui/src/locale/ru-RU.ts
+++ b/packages/docs-ui/src/locale/ru-RU.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Специальная вставка',
title: 'Параметры вставки',
source: 'Сохранить исходное форматирование',
destination: 'Использовать форматирование назначения',
diff --git a/packages/docs-ui/src/locale/sk-SK.ts b/packages/docs-ui/src/locale/sk-SK.ts
index 1145a2eb39..dec0f56a7d 100644
--- a/packages/docs-ui/src/locale/sk-SK.ts
+++ b/packages/docs-ui/src/locale/sk-SK.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Prilepiť špeciálne',
title: 'Možnosti prilepenia',
source: 'Zachovať zdrojové formátovanie',
destination: 'Prispôsobiť cieľovému formátovaniu',
diff --git a/packages/docs-ui/src/locale/vi-VN.ts b/packages/docs-ui/src/locale/vi-VN.ts
index 84fd2c35cd..4f54ee5bb9 100644
--- a/packages/docs-ui/src/locale/vi-VN.ts
+++ b/packages/docs-ui/src/locale/vi-VN.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: 'Dán đặc biệt',
title: 'Tùy chọn dán',
source: 'Giữ định dạng nguồn',
destination: 'Khớp định dạng đích',
diff --git a/packages/docs-ui/src/locale/zh-CN.ts b/packages/docs-ui/src/locale/zh-CN.ts
index f7a7b882fe..73180e8c7d 100644
--- a/packages/docs-ui/src/locale/zh-CN.ts
+++ b/packages/docs-ui/src/locale/zh-CN.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: '选择性粘贴',
title: '粘贴选项',
source: '保留源格式',
destination: '匹配目标格式',
diff --git a/packages/docs-ui/src/locale/zh-HK.ts b/packages/docs-ui/src/locale/zh-HK.ts
index b95b439825..2c4d59567c 100644
--- a/packages/docs-ui/src/locale/zh-HK.ts
+++ b/packages/docs-ui/src/locale/zh-HK.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: '選擇性貼上',
title: '貼上選項',
source: '保留來源格式',
destination: '符合目標格式',
diff --git a/packages/docs-ui/src/locale/zh-TW.ts b/packages/docs-ui/src/locale/zh-TW.ts
index ae9474a569..629aab36b7 100644
--- a/packages/docs-ui/src/locale/zh-TW.ts
+++ b/packages/docs-ui/src/locale/zh-TW.ts
@@ -19,6 +19,7 @@ import type enUS from './en-US';
const locale: typeof enUS = {
'docs-ui': {
pasteOptions: {
+ special: '選擇性貼上',
title: '貼上選項',
source: '保留來源格式',
destination: '符合目的地格式',
diff --git a/packages/docs-ui/src/menu/__tests__/context-menu.spec.ts b/packages/docs-ui/src/menu/__tests__/context-menu.spec.ts
index c3cc618f84..71d42a8680 100644
--- a/packages/docs-ui/src/menu/__tests__/context-menu.spec.ts
+++ b/packages/docs-ui/src/menu/__tests__/context-menu.spec.ts
@@ -14,83 +14,125 @@
* limitations under the License.
*/
-import { Injector, IPermissionService, IUniverInstanceService, PermissionService } from '@univerjs/core';
-import { DocSelectionManagerService, setDocumentPermissionValue } from '@univerjs/docs';
+import {
+ IPermissionService,
+ IUniverInstanceService,
+ LocaleService,
+ LocaleType,
+ Univer,
+ UniverInstanceType,
+} from '@univerjs/core';
+import { DocSelectionManagerService, setDocumentPermissionValue, UniverDocsPlugin } from '@univerjs/docs';
+import { NORMAL_TEXT_SELECTION_PLUGIN_STYLE } from '@univerjs/engine-render';
import { UnitAction } from '@univerjs/protocol';
-import { ContextMenuGroup } from '@univerjs/ui';
-import { firstValueFrom, of } from 'rxjs';
-import { describe, expect, it } from 'vitest';
+import { ContextMenuGroup, ContextMenuPosition, MenuItemType, RibbonStartGroup } from '@univerjs/ui';
+import { firstValueFrom } from 'rxjs';
+import { afterEach, describe, expect, it } from 'vitest';
import { DocPasteCommand, DocPasteSpecialCommand } from '../../commands/commands/clipboard.command';
import { DocSelectAllCommand, DocSelectWordCommand } from '../../commands/commands/doc-select-all.command';
import { DOC_CARET_MENU_ID } from '../../consts/mobile-context';
+import enUS from '../../locale/en-US';
import {
CopyMenuFactory,
ParagraphSettingMenuFactory,
PasteMenuFactory,
+ PasteRibbonMenuFactory,
PasteSpecialMenuFactory,
SelectAllMenuFactory,
SelectWordMenuFactory,
} from '../context-menu';
import { mobileMenuSchema } from '../mobile-schema';
+import { menuSchema } from '../schema';
describe('settings context menu factories', () => {
- it('registers a mobile caret menu with both paste and format choices', () => {
+ const instances: Univer[] = [];
+ afterEach(() => instances.splice(0).forEach((univer) => univer.dispose()));
+
+ function createMenuTestBed() {
+ const univer = new Univer({ locale: LocaleType.EN_US, locales: { [LocaleType.EN_US]: enUS } });
+ instances.push(univer);
+ univer.registerPlugin(UniverDocsPlugin);
+ univer.createUnit(UniverInstanceType.UNIVER_DOC, {
+ id: 'doc-1',
+ body: { dataStream: 'Selected text\r\n' },
+ });
+ const accessor = univer.__getInjector();
+ accessor.get(LocaleService).setDirection('ltr');
+ accessor.get(IUniverInstanceService).setCurrentUnitForType('doc-1');
+ return accessor;
+ }
+
+ it('keeps ordinary paste in the mobile quick tiles and paste special in a separate menu row', () => {
const caretMenu = Object.entries(mobileMenuSchema).find(([position]) => position === DOC_CARET_MENU_ID)?.[1];
expect(caretMenu).toEqual({
[ContextMenuGroup.QUICK]: {
quickLayout: 'tile',
[DocPasteCommand.id]: { order: 0, menuItemFactory: PasteMenuFactory },
- [DocPasteSpecialCommand.id]: { order: 0.5, menuItemFactory: PasteSpecialMenuFactory },
[DocSelectWordCommand.id]: { order: 1, menuItemFactory: SelectWordMenuFactory },
[DocSelectAllCommand.id]: { order: 2, menuItemFactory: SelectAllMenuFactory },
},
+ [ContextMenuGroup.FORMAT]: {
+ order: 1,
+ [DocPasteSpecialCommand.id]: { order: 0, menuItemFactory: PasteSpecialMenuFactory },
+ },
});
});
- it('disables copy without Unit Copy while keeping copy available in read-only mode', async () => {
- const permissionService = new PermissionService();
- const accessor = new Injector([
- [DocSelectionManagerService, {
- useValue: {
- textSelection$: of({}),
- getDocRanges: () => [{ collapsed: false }],
- },
- }],
- [IUniverInstanceService, {
- useValue: {
- getCurrentTypeOfUnit$: () => of({ getUnitId: () => 'doc-1' }),
- },
- }],
- [IPermissionService, { useValue: permissionService }],
- ]);
+ it('places paste special outside desktop quick tiles and uses a standard ribbon selector', () => {
+ const desktopMenu = Object.entries(menuSchema).find(([position]) => position === ContextMenuPosition.MAIN_AREA)?.[1];
+ const ribbonMenu = Object.entries(menuSchema).find(([position]) => position === RibbonStartGroup.HISTORY)?.[1];
+ expect(desktopMenu[ContextMenuGroup.QUICK][DocPasteCommand.id].menuItemFactory).toBe(PasteMenuFactory);
+ expect(desktopMenu[ContextMenuGroup.QUICK][DocPasteSpecialCommand.id]).toBeUndefined();
+ expect(desktopMenu[ContextMenuGroup.FORMAT][DocPasteSpecialCommand.id].menuItemFactory).toBe(PasteSpecialMenuFactory);
+ expect(ribbonMenu[DocPasteSpecialCommand.id].menuItemFactory).toBe(PasteRibbonMenuFactory);
+ });
+
+ it('disables copy without Unit Copy while keeping copy available in read-only mode', () => {
+ const accessor = createMenuTestBed();
+ const permissionService = accessor.get(IPermissionService);
setDocumentPermissionValue(permissionService, 'doc-1', 'doc-1', UnitAction.Copy, false);
const copyDisabled$ = CopyMenuFactory(accessor).disabled$;
if (!copyDisabled$) {
throw new Error('Copy menu must expose disabled state.');
}
- expect(await firstValueFrom(copyDisabled$)).toBe(true);
-
- setDocumentPermissionValue(permissionService, 'doc-1', 'doc-1', UnitAction.Copy, true);
- setDocumentPermissionValue(permissionService, 'doc-1', 'doc-1', UnitAction.Edit, false);
- expect(await firstValueFrom(copyDisabled$)).toBe(false);
+ const disabled: boolean[] = [];
+ const subscription = copyDisabled$.subscribe((value) => disabled.push(value));
+ try {
+ accessor.get(DocSelectionManagerService).__replaceTextRangesWithNoRefresh({
+ textRanges: [{ startOffset: 0, endOffset: 8, collapsed: false, isActive: true }],
+ rectRanges: [],
+ segmentId: '',
+ segmentPage: -1,
+ isEditing: false,
+ style: NORMAL_TEXT_SELECTION_PLUGIN_STYLE,
+ }, { unitId: 'doc-1', subUnitId: 'doc-1' });
+ expect(disabled.pop()).toBe(true);
- accessor.dispose();
+ setDocumentPermissionValue(permissionService, 'doc-1', 'doc-1', UnitAction.Copy, true);
+ setDocumentPermissionValue(permissionService, 'doc-1', 'doc-1', UnitAction.Edit, false);
+ expect(disabled.pop()).toBe(false);
+ } finally {
+ subscription.unsubscribe();
+ }
});
it('disables mutating context-menu actions in read-only mode', async () => {
- const permissionService = new PermissionService();
- const accessor = new Injector([
- [IUniverInstanceService, {
- useValue: {
- getCurrentTypeOfUnit$: () => of({ getUnitId: () => 'doc-1' }),
- },
- }],
- [IPermissionService, { useValue: permissionService }],
- ]);
+ const accessor = createMenuTestBed();
+ const permissionService = accessor.get(IPermissionService);
setDocumentPermissionValue(permissionService, 'doc-1', 'doc-1', UnitAction.Edit, false);
+ expect(PasteMenuFactory(accessor).type).toBe(MenuItemType.BUTTON);
+ expect(PasteRibbonMenuFactory(accessor).type).toBe(MenuItemType.SELECTOR);
+ const pasteSpecial = PasteSpecialMenuFactory(accessor);
+ expect(pasteSpecial.type).toBe(MenuItemType.SELECTOR);
+ expect(pasteSpecial.selections).toEqual([
+ { value: 'source', label: 'docs-ui.pasteOptions.source' },
+ { value: 'destination', label: 'docs-ui.pasteOptions.destination' },
+ { value: 'text', label: 'docs-ui.pasteOptions.text' },
+ ]);
+ expect(await firstValueFrom(pasteSpecial.disabled$!)).toBe(true);
const pasteDisabled$ = PasteMenuFactory(accessor).disabled$;
const paragraphSettingDisabled$ = ParagraphSettingMenuFactory(accessor).disabled$;
if (!pasteDisabled$ || !paragraphSettingDisabled$) {
@@ -98,7 +140,5 @@ describe('settings context menu factories', () => {
}
expect(await firstValueFrom(pasteDisabled$)).toBe(true);
expect(await firstValueFrom(paragraphSettingDisabled$)).toBe(true);
-
- accessor.dispose();
});
});
diff --git a/packages/docs-ui/src/menu/context-menu.ts b/packages/docs-ui/src/menu/context-menu.ts
index 3639b96e7c..1d69a4fbf7 100644
--- a/packages/docs-ui/src/menu/context-menu.ts
+++ b/packages/docs-ui/src/menu/context-menu.ts
@@ -19,11 +19,18 @@ import type { IRectRangeWithStyle } from '@univerjs/engine-render';
import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import type { Subscriber } from 'rxjs';
import type { LocaleKey } from '../locale/types';
-import { DOC_RANGE_TYPE, DocumentFlavor, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import {
+ DOC_RANGE_TYPE,
+ DocumentFlavor,
+ FOCUSING_SHAPE_TEXT_EDITOR,
+ IContextService,
+ IUniverInstanceService,
+ UniverInstanceType,
+} from '@univerjs/core';
import { DocSelectionManagerService } from '@univerjs/docs';
import { UnitAction } from '@univerjs/protocol';
import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
-import { combineLatest, map, Observable } from 'rxjs';
+import { combineLatest, map, Observable, startWith } from 'rxjs';
import {
DocCopyCommand,
DocCutCommand,
@@ -394,10 +401,21 @@ export function PasteSpecialMenuFactory(accessor: IAccessor): IMenuSelectorItem<
id: DocPasteSpecialCommand.id,
type: MenuItemType.SELECTOR,
icon: 'DocPasteOptionsIcon',
- title: 'docs-ui.pasteOptions.title',
- tooltip: 'docs-ui.pasteOptions.title',
+ title: 'docs-ui.pasteOptions.special',
+ tooltip: 'docs-ui.pasteOptions.special',
selections: DOC_PASTE_OPTIONS.map((option) => ({ ...option })),
disabled$: disableMenuWithoutDocumentUnitPermission(accessor, UnitAction.Edit),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
}
+
+export function PasteRibbonMenuFactory(accessor: IAccessor): IMenuSelectorItem<LocaleKey> {
+ return {
+ ...PasteSpecialMenuFactory(accessor),
+ title: 'docs-ui.rightClick.paste',
+ hidden$: combineLatest([
+ getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
+ accessor.get(IContextService).subscribeContextValue$(FOCUSING_SHAPE_TEXT_EDITOR).pipe(startWith(false)),
+ ]).pipe(map(([hidden, editing]) => hidden || editing)),
+ };
+}
diff --git a/packages/docs-ui/src/menu/mobile-schema.ts b/packages/docs-ui/src/menu/mobile-schema.ts
index af7a234107..2b05ebb40b 100644
--- a/packages/docs-ui/src/menu/mobile-schema.ts
+++ b/packages/docs-ui/src/menu/mobile-schema.ts
@@ -35,10 +35,6 @@ export const mobileMenuSchema: MenuSchemaType = {
order: 0,
menuItemFactory: PasteMenuFactory,
},
- [DocPasteSpecialCommand.id]: {
- order: 0.5,
- menuItemFactory: PasteSpecialMenuFactory,
- },
[DocSelectWordCommand.id]: {
order: 1,
menuItemFactory: SelectWordMenuFactory,
@@ -48,6 +44,13 @@ export const mobileMenuSchema: MenuSchemaType = {
menuItemFactory: SelectAllMenuFactory,
},
},
+ [ContextMenuGroup.FORMAT]: {
+ order: 1,
+ [DocPasteSpecialCommand.id]: {
+ order: 0,
+ menuItemFactory: PasteSpecialMenuFactory,
+ },
+ },
},
};
diff --git a/packages/docs-ui/src/menu/schema.ts b/packages/docs-ui/src/menu/schema.ts
index ea3ad108f7..eb28180782 100644
--- a/packages/docs-ui/src/menu/schema.ts
+++ b/packages/docs-ui/src/menu/schema.ts
@@ -95,6 +95,7 @@ import {
InsertRowBeforeMenuItemFactory,
ParagraphSettingMenuFactory,
PasteMenuFactory,
+ PasteRibbonMenuFactory,
PasteSpecialMenuFactory,
SectionSettingMenuFactory,
TABLE_DELETE_MENU_ID,
@@ -226,12 +227,14 @@ export const floatToolbarMenuSchema: MenuSchemaType = {
export const menuSchema: MenuSchemaType = {
...floatToolbarMenuSchema,
- [RibbonStartGroup.OTHERS]: {
+ [RibbonStartGroup.HISTORY]: {
[DocPasteSpecialCommand.id]: {
- order: -1,
- gridLayout: { row: 1, column: 2, rowSpan: 2, showLabel: true },
- menuItemFactory: PasteSpecialMenuFactory,
+ order: 4,
+ gridLayout: { row: 1, column: 3, rowSpan: 2, showLabel: true },
+ menuItemFactory: PasteRibbonMenuFactory,
},
+ },
+ [RibbonStartGroup.OTHERS]: {
[OpenDocPermissionPanelOperation.id]: {
order: 0,
gridLayout: { row: 1, column: 1, rowSpan: 2, showLabel: true },
@@ -415,12 +418,12 @@ export const menuSchema: MenuSchemaType = {
order: 2,
menuItemFactory: PasteMenuFactory,
},
+ } as MenuSchemaType),
+ [ContextMenuGroup.FORMAT]: {
[DocPasteSpecialCommand.id]: {
- order: 3,
+ order: -1,
menuItemFactory: PasteSpecialMenuFactory,
},
- } as MenuSchemaType),
- [ContextMenuGroup.FORMAT]: {
[DeleteLeftCommand.id]: {
order: 0,
menuItemFactory: DeleteMenuFactory,
diff --git a/packages/sheets-ui/src/menu/menu.ts b/packages/sheets-ui/src/menu/menu.ts
index e0186c28f4..303dc52f50 100644
--- a/packages/sheets-ui/src/menu/menu.ts
+++ b/packages/sheets-ui/src/menu/menu.ts
@@ -1058,6 +1058,19 @@ export function PasteSpacialMenuItemFactory(accessor: IAccessor): IMenuSelectorI
};
}
+export const PASTE_RIBBON_MENU_ID = 'sheet.menu.paste';
+export function PasteRibbonMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<LocaleKey> {
+ return {
+ ...PasteSpacialMenuItemFactory(accessor),
+ id: PASTE_RIBBON_MENU_ID,
+ title: 'sheets-ui.rightClick.paste',
+ hidden$: combineLatest([
+ getObservableWithExclusiveRange$(accessor, getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)),
+ accessor.get(IContextService).subscribeContextValue$(FOCUSING_SHAPE_TEXT_EDITOR).pipe(startWith(false)),
+ ]).pipe(map(([hidden, editing]) => hidden || editing)),
+ };
+}
+
export function PasteValueMenuItemFactory(accessor: IAccessor): IMenuButtonItem<LocaleKey, string> {
return {
id: SheetPasteValueCommand.id,
diff --git a/packages/sheets-ui/src/menu/schema.ts b/packages/sheets-ui/src/menu/schema.ts
index 592983a021..0158e3a354 100644
--- a/packages/sheets-ui/src/menu/schema.ts
+++ b/packages/sheets-ui/src/menu/schema.ts
@@ -173,11 +173,13 @@ import {
HideRowMenuItemFactory,
HorizontalAlignMenuItemFactory,
ItalicMenuItemFactory,
+ PASTE_RIBBON_MENU_ID,
PASTE_SPECIAL_MENU_ID,
PasteBesidesBorderMenuItemFactory,
PasteColWidthMenuItemFactory,
PasteFormatMenuItemFactory,
PasteMenuItemFactory,
+ PasteRibbonMenuItemFactory,
PasteSpacialMenuItemFactory,
PasteValueMenuItemFactory,
ResetBackgroundColorMenuItemFactory,
@@ -227,6 +229,33 @@ import { ZOOM_RATIO_MENU_ID, ZoomRatioMenuItemFactory } from './zoom.menu';
export const menuSchema: MenuSchemaType = {
[RibbonPosition.START]: {
+ [RibbonStartGroup.HISTORY]: {
+ [PASTE_RIBBON_MENU_ID]: {
+ order: 4,
+ gridLayout: { row: 1, column: 3, rowSpan: 2, showLabel: true },
+ menuItemFactory: PasteRibbonMenuItemFactory,
+ [SheetPasteCommand.name]: {
+ order: 0,
+ menuItemFactory: (accessor) => ({ ...PasteMenuItemFactory(accessor), icon: undefined }),
+ },
+ [SheetPasteValueCommand.id]: {
+ order: 1,
+ menuItemFactory: PasteValueMenuItemFactory,
+ },
+ [SheetPasteFormatCommand.id]: {
+ order: 2,
+ menuItemFactory: PasteFormatMenuItemFactory,
+ },
+ [SheetPasteColWidthCommand.id]: {
+ order: 3,
+ menuItemFactory: PasteColWidthMenuItemFactory,
+ },
+ [SheetPasteBesidesBorderCommand.id]: {
+ order: 4,
+ menuItemFactory: PasteBesidesBorderMenuItemFactory,
+ },
+ },
+ },
[RibbonStartGroup.FORMAT]: {
[SetRangeFontFamilyCommand.id]: {
order: 1,