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.

feat: refined Ribbon design (#5194)

白熱733c3ff29d99
diff --git a/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png b/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png
index 067d380974..18246e6b03 100644
Binary files a/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png and b/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-current-worksheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-current-worksheet-ci-chromium-linux.png
index 22cdc3f390..6cc852d87f 100644
Binary files a/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-current-worksheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-current-worksheet-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-other-worksheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-other-worksheet-ci-chromium-linux.png
index 18d58660f3..58232a98ad 100644
Binary files a/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-other-worksheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-filter-row-other-worksheet-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-hide-row-current-worksheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-hide-row-current-worksheet-ci-chromium-linux.png
index 9a0bde2c35..621567705c 100644
Binary files a/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-hide-row-current-worksheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-formula-related.spec.ts-snapshots/formula-hide-row-current-worksheet-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png
index 30cceb1094..7701bd6e19 100644
Binary files a/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-gridlines.spec.ts-snapshots/sheets-no-gridlines-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/mergedCellsRenderingScrolling-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/mergedCellsRenderingScrolling-ci-chromium-linux.png
index 3a6ccc7511..229a0483f6 100644
Binary files a/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/mergedCellsRenderingScrolling-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/mergedCellsRenderingScrolling-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/renderingAfterScrollByAPI-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/renderingAfterScrollByAPI-ci-chromium-linux.png
index 264263698f..3c02c03cd1 100644
Binary files a/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/renderingAfterScrollByAPI-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-scroll.spec.ts-snapshots/renderingAfterScrollByAPI-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-switching-render-unit.spec.ts-snapshots/switching-render-unit-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-switching-render-unit.spec.ts-snapshots/switching-render-unit-ci-chromium-linux.png
index a5f6791490..a1ce64a557 100644
Binary files a/e2e/visual-comparison/sheets/sheets-switching-render-unit.spec.ts-snapshots/switching-render-unit-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-switching-render-unit.spec.ts-snapshots/switching-render-unit-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png
index b4db561d1d..2114ff10bd 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/dark-mode-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-ci-chromium-linux.png
index 0a35162d3e..53970b784e 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png
index 8aef79e987..5a5e8c93ed 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png
index 603fe0b550..b4ffab4fd3 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/defaultstyle-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png
index 400130ef1b..07a11192b9 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/demo-sheet-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png
index bd02e6fa2e..6c0c429b65 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/facade-sheet-hooks-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.png
index 3a6ccc7511..229a0483f6 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/mergedCellsRendering-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png
index 429a7db7d0..87d94ee824 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-force-string-cell-ci-chromium-linux.png differ
diff --git a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png
index 21692c332a..cc409e7b09 100644
Binary files a/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png and b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/set-text-format-number-cell-ci-chromium-linux.png differ
diff --git a/examples/src/sheets/custom-menu/controllers/custom-menu.controller.ts b/examples/src/sheets/custom-menu/controllers/custom-menu.controller.ts
index 6bf4a08838..74b53a12e0 100644
--- a/examples/src/sheets/custom-menu/controllers/custom-menu.controller.ts
+++ b/examples/src/sheets/custom-menu/controllers/custom-menu.controller.ts
@@ -16,7 +16,7 @@
import { Disposable, ICommandService, Inject, Injector } from '@univerjs/core';
import { AiSingle, BarChartSingle, CommentSingle } from '@univerjs/icons';
-import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IMenuManagerService, MenuItemType, RibbonStartGroup } from '@univerjs/ui';
+import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IMenuManagerService, MenuItemType, RibbonOthersGroup } from '@univerjs/ui';
import { DropdownListFirstItemOperation, DropdownListSecondItemOperation } from '../commands/operations/dropdown-list.operation';
import { SingleButtonOperation } from '../commands/operations/single-button.operation';
import { CUSTOM_MENU_DROPDOWN_LIST_OPERATION_ID, CustomMenuItemDropdownListFirstItemFactory, CustomMenuItemDropdownListMainButtonFactory, CustomMenuItemDropdownListSecondItemFactory } from './menu/dropdown-list.menu';
@@ -74,7 +74,7 @@ export class CustomMenuController extends Disposable {
},
}));
this._menuManagerService.mergeMenu({
- [RibbonStartGroup.OTHERS]: {
+ [RibbonOthersGroup.OTHERS]: {
[SingleButtonOperation.id]: {
order: 9999,
menuItemFactory: CustomMenuItemSingleButtonFactory,
diff --git a/examples/src/sheets/custom-plugin/import-csv-button.ts b/examples/src/sheets/custom-plugin/import-csv-button.ts
index 45297c3514..80c5c8f068 100644
--- a/examples/src/sheets/custom-plugin/import-csv-button.ts
+++ b/examples/src/sheets/custom-plugin/import-csv-button.ts
@@ -41,7 +41,7 @@ import {
ComponentManager,
IMenuManagerService,
MenuItemType,
- RibbonStartGroup,
+ RibbonOthersGroup,
} from '@univerjs/ui';
/**
@@ -210,7 +210,7 @@ class ImportCSVButtonPlugin extends Plugin {
});
this.menuManagerService.mergeMenu({
- [RibbonStartGroup.OTHERS]: {
+ [RibbonOthersGroup.OTHERS]: {
[buttonId]: {
order: 10,
menuItemFactory,
diff --git a/package.json b/package.json
index 06b1dbbea7..d810e695cb 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"@types/fs-extra": "^11.0.4",
"@types/node": "^22.15.17",
"@types/react": "^19.1.4",
- "@types/react-dom": "^19.1.4",
+ "@types/react-dom": "^19.1.5",
"@univerjs-infra/shared": "workspace:*",
"@univerjs/design": "workspace:*",
"@vitejs/plugin-react": "^4.4.1",
@@ -89,7 +89,7 @@
},
"resolutions": {
"@types/react": "^19.1.3",
- "@types/react-dom": "^19.1.4",
+ "@types/react-dom": "^19.1.5",
"react": "^19.1.0",
"react-dom": "^19.1.0"
},
diff --git a/packages-experimental/debugger/src/controllers/menu.ts b/packages-experimental/debugger/src/controllers/menu.ts
index cf93c7e795..8fc9a3d352 100644
--- a/packages-experimental/debugger/src/controllers/menu.ts
+++ b/packages-experimental/debugger/src/controllers/menu.ts
@@ -99,11 +99,11 @@ export function ThemeMenuItemFactory(): IMenuSelectorItem {
type: MenuItemType.SELECTOR,
selections: [
{
- label: 'green',
+ label: '🟢',
value: greenTheme as any,
},
{
- label: 'default',
+ label: '🔵',
value: defaultTheme as any,
},
],
diff --git a/packages-experimental/debugger/src/controllers/multi-units/multi-units.menu.ts b/packages-experimental/debugger/src/controllers/multi-units/multi-units.menu.ts
index 255220cbea..89b04f8dcf 100644
--- a/packages-experimental/debugger/src/controllers/multi-units/multi-units.menu.ts
+++ b/packages-experimental/debugger/src/controllers/multi-units/multi-units.menu.ts
@@ -17,7 +17,7 @@
import type { IAccessor, IOperation, Workbook } from '@univerjs/core';
import type { IMenuSelectorItem, IValueOption, MenuSchemaType } from '@univerjs/ui';
import { CommandType, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
-import { MenuItemType, RibbonStartGroup } from '@univerjs/ui';
+import { MenuItemType, RibbonOthersGroup } from '@univerjs/ui';
import { merge, Observable, shareReplay } from 'rxjs';
export const SwitchUnitOperation: IOperation<{ value: string }> = {
@@ -53,7 +53,7 @@ function SwitchUnitMenuFactory(accessor: IAccessor): IMenuSelectorItem {
}
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.OTHERS]: {
+ [RibbonOthersGroup.OTHERS]: {
[SwitchUnitOperation.id]: {
order: 999,
menuItemFactory: SwitchUnitMenuFactory,
diff --git a/packages/action-recorder/src/controllers/action-recorder.menu.ts b/packages/action-recorder/src/controllers/action-recorder.menu.ts
index 3efacf0605..e1a7bc802d 100644
--- a/packages/action-recorder/src/controllers/action-recorder.menu.ts
+++ b/packages/action-recorder/src/controllers/action-recorder.menu.ts
@@ -69,7 +69,7 @@ export function ReplayLocalRecordOnActiveMenuItemFactory(): IMenuButtonItem {
export const menuSchema: MenuSchemaType = {
[RibbonStartGroup.OTHERS]: {
[RECORD_MENU_ITEM_ID]: {
- order: 10,
+ order: 2,
menuItemFactory: RecordMenuItemFactory,
[OpenRecordPanelOperation.id]: {
order: 1,
diff --git a/packages/design/src/helper/class-utilities.ts b/packages/design/src/helper/class-utilities.ts
index 089dd91039..1b78b104ad 100644
--- a/packages/design/src/helper/class-utilities.ts
+++ b/packages/design/src/helper/class-utilities.ts
@@ -26,3 +26,4 @@ export const borderTopClassName = clsx(borderBasicClassName, 'univer-border-t un
export const borderBottomClassName = clsx(borderBasicClassName, 'univer-border-b univer-border-0');
export const borderRightClassName = clsx(borderBasicClassName, 'univer-border-r univer-border-0');
export const divideYClassName = 'univer-divide-gray-200 dark:univer-divide-gray-600 univer-divide-y univer-divide-x-0 univer-divide-solid';
+export const divideXClassName = 'univer-divide-gray-200 dark:univer-divide-gray-600 univer-divide-x univer-divide-y-0 univer-divide-solid';
diff --git a/packages/design/src/index.ts b/packages/design/src/index.ts
index dc147bc43b..e22cf5f23b 100644
--- a/packages/design/src/index.ts
+++ b/packages/design/src/index.ts
@@ -69,6 +69,7 @@ export {
borderLeftClassName,
borderRightClassName,
borderTopClassName,
+ divideXClassName,
divideYClassName,
scrollbarClassName,
} from './helper/class-utilities';
diff --git a/packages/docs-drawing-ui/src/controllers/menu.schema.ts b/packages/docs-drawing-ui/src/controllers/menu.schema.ts
index 34194d5104..e0bd4d559e 100644
--- a/packages/docs-drawing-ui/src/controllers/menu.schema.ts
+++ b/packages/docs-drawing-ui/src/controllers/menu.schema.ts
@@ -15,7 +15,7 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonInsertGroup } from '@univerjs/ui';
import {
DOCS_IMAGE_MENU_ID,
IMAGE_MENU_UPLOAD_FLOAT_ID,
@@ -24,7 +24,7 @@ import {
} from '../views/menu/image.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.LAYOUT]: {
+ [RibbonInsertGroup.MEDIA]: {
[DOCS_IMAGE_MENU_ID]: {
order: 0,
menuItemFactory: ImageMenuFactory,
diff --git a/packages/docs-hyper-link-ui/src/controllers/menu.schema.ts b/packages/docs-hyper-link-ui/src/controllers/menu.schema.ts
index 22eba71c27..3091de80ab 100644
--- a/packages/docs-hyper-link-ui/src/controllers/menu.schema.ts
+++ b/packages/docs-hyper-link-ui/src/controllers/menu.schema.ts
@@ -15,14 +15,14 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonInsertGroup } from '@univerjs/ui';
import { ShowDocHyperLinkEditPopupOperation } from '../commands/operations/popup.operation';
import { AddHyperLinkMenuItemFactory } from './menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.OTHERS]: {
+ [RibbonInsertGroup.MEDIA]: {
[ShowDocHyperLinkEditPopupOperation.id]: {
- order: 0,
+ order: 1,
menuItemFactory: AddHyperLinkMenuItemFactory,
},
},
diff --git a/packages/docs-thread-comment-ui/src/controllers/menu.schema.ts b/packages/docs-thread-comment-ui/src/controllers/menu.schema.ts
index b8ebeb011b..5493514180 100644
--- a/packages/docs-thread-comment-ui/src/controllers/menu.schema.ts
+++ b/packages/docs-thread-comment-ui/src/controllers/menu.schema.ts
@@ -15,7 +15,7 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonInsertGroup } from '@univerjs/ui';
import {
StartAddCommentOperation,
ToggleCommentPanelOperation,
@@ -23,9 +23,9 @@ import {
import { AddDocCommentMenuItemFactory, ToolbarDocCommentMenuItemFactory } from './menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.OTHERS]: {
+ [RibbonInsertGroup.MEDIA]: {
[ToggleCommentPanelOperation.id]: {
- order: 1,
+ order: 3,
menuItemFactory: ToolbarDocCommentMenuItemFactory,
},
},
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index a8a76a16c3..daac3e27a4 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -91,7 +91,7 @@
"@univerjs-infra/shared": "workspace:*",
"@univerjs/docs-drawing": "workspace:*",
"jest-canvas-mock": "^2.5.2",
- "jsdom": "^24.1.1",
+ "jsdom": "^26.1.0",
"postcss": "^8.5.3",
"react": "18.3.1",
"rxjs": "^7.8.2",
diff --git a/packages/docs-ui/src/controllers/menu.schema.ts b/packages/docs-ui/src/controllers/menu.schema.ts
index 2c24d06635..04f32baacb 100644
--- a/packages/docs-ui/src/controllers/menu.schema.ts
+++ b/packages/docs-ui/src/controllers/menu.schema.ts
@@ -15,7 +15,7 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonInsertGroup, RibbonStartGroup } from '@univerjs/ui';
import { DocCopyCommand, DocCopyCurrentParagraphCommand, DocCutCommand, DocCutCurrentParagraphCommand, DocPasteCommand } from '../commands/commands/clipboard.command';
import { DeleteCurrentParagraphCommand, DeleteLeftCommand } from '../commands/commands/doc-delete.command';
import { OpenHeaderFooterPanelCommand } from '../commands/commands/doc-header-footer.command';
@@ -131,14 +131,6 @@ export const menuSchema: MenuSchemaType = {
},
},
[RibbonStartGroup.LAYOUT]: {
- [TABLE_MENU_ID]: {
- order: 1,
- menuItemFactory: TableMenuFactory,
- [DocCreateTableOperation.id]: {
- order: 0,
- menuItemFactory: InsertTableMenuFactory,
- },
- },
[AlignLeftCommand.id]: {
order: 2,
menuItemFactory: AlignLeftMenuItemFactory,
@@ -184,6 +176,16 @@ export const menuSchema: MenuSchemaType = {
menuItemFactory: PageSettingMenuItemFactory,
},
},
+ [RibbonInsertGroup.MEDIA]: {
+ [TABLE_MENU_ID]: {
+ order: 2,
+ menuItemFactory: TableMenuFactory,
+ [DocCreateTableOperation.id]: {
+ order: 0,
+ menuItemFactory: InsertTableMenuFactory,
+ },
+ },
+ },
[ContextMenuPosition.MAIN_AREA]: {
[ContextMenuGroup.FORMAT]: {
[DocCopyCommand.name]: {
diff --git a/packages/docs-ui/src/views/doc-footer/DocFooter.tsx b/packages/docs-ui/src/views/doc-footer/DocFooter.tsx
index f72aa73aa8..5b3579535e 100644
--- a/packages/docs-ui/src/views/doc-footer/DocFooter.tsx
+++ b/packages/docs-ui/src/views/doc-footer/DocFooter.tsx
@@ -30,7 +30,11 @@ export function DocFooter() {
return workbook
? null
: isShow && (
- <div className="univer-box-border univer-flex univer-items-center univer-justify-between univer-px-5">
+ <div
+ className={`
+ univer-box-border univer-flex univer-items-center univer-justify-between univer-px-5 univer-py-1.5
+ `}
+ >
<div />
<CountBar />
</div>
diff --git a/packages/find-replace/src/controllers/menu.schema.ts b/packages/find-replace/src/controllers/menu.schema.ts
index b1b968aba1..e9a7152248 100644
--- a/packages/find-replace/src/controllers/menu.schema.ts
+++ b/packages/find-replace/src/controllers/menu.schema.ts
@@ -15,12 +15,12 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonDataGroup } from '@univerjs/ui';
import { OpenFindDialogOperation } from '../commands/operations/find-replace.operation';
import { FindReplaceMenuItemFactory } from './find-replace.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.OTHERS]: {
+ [RibbonDataGroup.ORGANIZATION]: {
[OpenFindDialogOperation.id]: {
order: 2,
menuItemFactory: FindReplaceMenuItemFactory,
diff --git a/packages/sheets-conditional-formatting-ui/src/controllers/menu.schema.ts b/packages/sheets-conditional-formatting-ui/src/controllers/menu.schema.ts
index f35665f276..ac95d8f073 100644
--- a/packages/sheets-conditional-formatting-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-conditional-formatting-ui/src/controllers/menu.schema.ts
@@ -15,14 +15,14 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonDataGroup } from '@univerjs/ui';
import { OpenConditionalFormattingOperator } from '../commands/operations/open-conditional-formatting-panel';
import { FactoryManageConditionalFormattingRule } from '../menu/manage-rule';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
+ [RibbonDataGroup.RULES]: {
[OpenConditionalFormattingOperator.id]: {
- order: 0,
+ order: 1,
menuItemFactory: FactoryManageConditionalFormattingRule,
},
},
diff --git a/packages/sheets-data-validation-ui/src/controllers/menu.schema.ts b/packages/sheets-data-validation-ui/src/controllers/menu.schema.ts
index caed46bbaf..f6bc0033aa 100644
--- a/packages/sheets-data-validation-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-data-validation-ui/src/controllers/menu.schema.ts
@@ -15,7 +15,7 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonDataGroup } from '@univerjs/ui';
import { AddSheetDataValidationAndOpenCommand } from '../commands/commands/data-validation-ui.command';
import { OpenValidationPanelOperation } from '../commands/operations/data-validation.operation';
import {
@@ -26,9 +26,9 @@ import {
} from './dv.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
+ [RibbonDataGroup.RULES]: {
[DATA_VALIDATION_MENU_ID]: {
- order: 9,
+ order: 0,
menuItemFactory: dataValidationMenuFactory,
[OpenValidationPanelOperation.id]: {
order: 0,
diff --git a/packages/sheets-drawing-ui/src/controllers/menu.schema.ts b/packages/sheets-drawing-ui/src/controllers/menu.schema.ts
index cc9d3562f6..0cb5885bff 100644
--- a/packages/sheets-drawing-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-drawing-ui/src/controllers/menu.schema.ts
@@ -15,14 +15,14 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonInsertGroup } from '@univerjs/ui';
import { InsertCellImageCommand, InsertFloatImageCommand } from '../commands/commands/insert-image.command';
import { ImageMenuFactory, SHEETS_IMAGE_MENU_ID, UploadCellImageMenuFactory, UploadFloatImageMenuFactory } from '../views/menu/image.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
+ [RibbonInsertGroup.MEDIA]: {
[SHEETS_IMAGE_MENU_ID]: {
- order: 3,
+ order: 0,
menuItemFactory: ImageMenuFactory,
[InsertFloatImageCommand.id]: {
order: 0,
diff --git a/packages/sheets-filter-ui/src/controllers/menu.schema.ts b/packages/sheets-filter-ui/src/controllers/menu.schema.ts
index 7ac22a26d7..ae75291aa0 100644
--- a/packages/sheets-filter-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-filter-ui/src/controllers/menu.schema.ts
@@ -20,7 +20,7 @@ import {
ReCalcSheetsFilterCommand,
SmartToggleSheetsFilterCommand,
} from '@univerjs/sheets-filter';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonDataGroup } from '@univerjs/ui';
import {
ClearFilterCriteriaMenuItemFactory,
ReCalcFilterMenuItemFactory,
@@ -28,9 +28,9 @@ import {
} from './sheets-filter.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
+ [RibbonDataGroup.ORGANIZATION]: {
[SmartToggleSheetsFilterCommand.id]: {
- order: 10,
+ order: 2,
menuItemFactory: SmartToggleFilterMenuItemFactory,
[ClearSheetsFilterCriteriaCommand.id]: {
order: 0,
diff --git a/packages/sheets-formula-ui/src/controllers/menu.schema.ts b/packages/sheets-formula-ui/src/controllers/menu.schema.ts
index b15e2b3d69..e8894348fc 100644
--- a/packages/sheets-formula-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-formula-ui/src/controllers/menu.schema.ts
@@ -16,22 +16,45 @@
import type { MenuSchemaType } from '@univerjs/ui';
import { PASTE_SPECIAL_MENU_ID } from '@univerjs/sheets-ui';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonFormulasGroup } from '@univerjs/ui';
import { SheetOnlyPasteFormulaCommand } from '../commands/commands/formula-clipboard.command';
import { InsertFunctionOperation } from '../commands/operations/insert-function.operation';
-import { MoreFunctionsOperation } from '../commands/operations/more-functions.operation';
-import { InsertFunctionMenuItemFactory, MoreFunctionsMenuItemFactory, PasteFormulaMenuItemFactory } from './menu';
+import {
+ InsertAVERAGEFunctionMenuItemFactory,
+ InsertCOUNTFunctionMenuItemFactory,
+ InsertMAXFunctionMenuItemFactory,
+ InsertMINFunctionMenuItemFactory,
+ InsertSUMFunctionMenuItemFactory,
+ MoreFunctionsMenuItemFactory,
+ PasteFormulaMenuItemFactory,
+} from './menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
- [InsertFunctionOperation.id]: {
- order: 1,
- menuItemFactory: InsertFunctionMenuItemFactory,
- [MoreFunctionsOperation.id]: {
- order: 1,
- menuItemFactory: MoreFunctionsMenuItemFactory,
- },
+ [RibbonFormulasGroup.BASIC]: {
+ [`${InsertFunctionOperation.id}.sum`]: {
+ order: 0,
+ menuItemFactory: InsertSUMFunctionMenuItemFactory,
},
+ [`${InsertFunctionOperation.id}.count`]: {
+ order: 0,
+ menuItemFactory: InsertCOUNTFunctionMenuItemFactory,
+ },
+ [`${InsertFunctionOperation.id}.average`]: {
+ order: 0,
+ menuItemFactory: InsertAVERAGEFunctionMenuItemFactory,
+ },
+ [`${InsertFunctionOperation.id}.max`]: {
+ order: 0,
+ menuItemFactory: InsertMAXFunctionMenuItemFactory,
+ },
+ [`${InsertFunctionOperation.id}.min`]: {
+ order: 0,
+ menuItemFactory: InsertMINFunctionMenuItemFactory,
+ },
+ },
+ [RibbonFormulasGroup.OTHERS]: {
+ order: 0,
+ menuItemFactory: MoreFunctionsMenuItemFactory,
},
[PASTE_SPECIAL_MENU_ID]: {
[SheetOnlyPasteFormulaCommand.id]: {
diff --git a/packages/sheets-formula-ui/src/controllers/menu.ts b/packages/sheets-formula-ui/src/controllers/menu.ts
index 980cb2807c..8a5551701c 100644
--- a/packages/sheets-formula-ui/src/controllers/menu.ts
+++ b/packages/sheets-formula-ui/src/controllers/menu.ts
@@ -20,12 +20,12 @@ import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
import { getMenuHiddenObservable, IClipboardInterfaceService, MenuItemType } from '@univerjs/ui';
-
import { combineLatestWith, map, Observable, of, switchMap } from 'rxjs';
import { SheetOnlyPasteFormulaCommand } from '../commands/commands/formula-clipboard.command';
import { InsertFunctionOperation } from '../commands/operations/insert-function.operation';
import { MoreFunctionsOperation } from '../commands/operations/more-functions.operation';
+/** @deprecated */
export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
return {
id: InsertFunctionOperation.id,
@@ -79,11 +79,113 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
};
}
+// SUM
+export function InsertSUMFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: InsertFunctionOperation.id,
+ title: 'SUM',
+ icon: 'SumSingle',
+ type: MenuItemType.BUTTON,
+ params: {
+ value: 'SUM',
+ },
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
+ };
+}
+
+// COUNT
+export function InsertCOUNTFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: InsertFunctionOperation.id,
+ title: 'COUNT',
+ icon: 'CntSingle',
+ type: MenuItemType.BUTTON,
+ params: {
+ value: 'COUNT',
+ },
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
+ };
+}
+
+// AVERAGE
+export function InsertAVERAGEFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: InsertFunctionOperation.id,
+ title: 'AVERAGE',
+ icon: 'AvgSingle',
+ type: MenuItemType.BUTTON,
+ params: {
+ value: 'AVERAGE',
+ },
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
+ };
+}
+
+// MAX
+export function InsertMAXFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: InsertFunctionOperation.id,
+ title: 'MAX',
+ icon: 'MaxSingle',
+ type: MenuItemType.BUTTON,
+ params: {
+ value: 'MAX',
+ },
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
+ };
+}
+
+// MIN
+export function InsertMINFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
+ return {
+ id: InsertFunctionOperation.id,
+ title: 'MIN',
+ icon: 'MinSingle',
+ type: MenuItemType.BUTTON,
+ params: {
+ value: 'MIN',
+ },
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
+ };
+}
+
+// More Functions
export function MoreFunctionsMenuItemFactory(accessor: IAccessor): IMenuItem {
return {
id: MoreFunctionsOperation.id,
title: 'formula.insert.more',
type: MenuItemType.BUTTON,
+ hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -110,7 +212,11 @@ export function PasteFormulaMenuItemFactory(accessor: IAccessor): IMenuItem {
type: MenuItemType.BUTTON,
title: 'formula.operation.pasteFormula',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
- combineLatestWith(getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission] })),
+ combineLatestWith(getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ })),
map(([d1, d2]) => d1 || d2)
),
};
diff --git a/packages/sheets-hyper-link-ui/src/controllers/menu.schema.ts b/packages/sheets-hyper-link-ui/src/controllers/menu.schema.ts
index 4720bfaa4e..8d41079187 100644
--- a/packages/sheets-hyper-link-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-hyper-link-ui/src/controllers/menu.schema.ts
@@ -15,18 +15,18 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonInsertGroup } from '@univerjs/ui';
import { InsertHyperLinkToolbarOperation } from '../commands/operations/popup.operations';
import { genZenEditorMenuId, insertLinkMenuFactory, insertLinkMenuToolbarFactory, zenEditorInsertLinkMenuFactory, zenEditorInsertLinkMenuToolbarFactory } from './menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.OTHERS]: {
+ [RibbonInsertGroup.MEDIA]: {
[InsertHyperLinkToolbarOperation.id]: {
- order: 2,
+ order: 1,
menuItemFactory: insertLinkMenuToolbarFactory,
},
[genZenEditorMenuId(InsertHyperLinkToolbarOperation.id)]: {
- order: 2,
+ order: 1,
menuItemFactory: zenEditorInsertLinkMenuToolbarFactory,
},
},
diff --git a/packages/sheets-numfmt-ui/src/controllers/menu.schema.ts b/packages/sheets-numfmt-ui/src/controllers/menu.schema.ts
index 189cb0fd98..ac95bea3bd 100644
--- a/packages/sheets-numfmt-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/menu.schema.ts
@@ -16,30 +16,30 @@
import type { MenuSchemaType } from '@univerjs/ui';
import { AddDecimalCommand, SetCurrencyCommand, SetPercentCommand, SubtractDecimalCommand } from '@univerjs/sheets-numfmt';
-import { RibbonStartGroup } from '@univerjs/ui';
+import { RibbonDataGroup } from '@univerjs/ui';
import { OpenNumfmtPanelOperator } from '../commands/operations/open.numfmt.panel.operation';
import { AddDecimalMenuItem, CurrencyMenuItem, FactoryOtherMenuItem, PercentMenuItem, SubtractDecimalMenuItem } from './menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
+ [RibbonDataGroup.FORMULAS]: {
[SetCurrencyCommand.id]: {
- order: 4,
+ order: 0,
menuItemFactory: CurrencyMenuItem,
},
[AddDecimalCommand.id]: {
- order: 5,
+ order: 1,
menuItemFactory: AddDecimalMenuItem,
},
[SubtractDecimalCommand.id]: {
- order: 6,
+ order: 2,
menuItemFactory: SubtractDecimalMenuItem,
},
[SetPercentCommand.id]: {
- order: 7,
+ order: 3,
menuItemFactory: PercentMenuItem,
},
[OpenNumfmtPanelOperator.id]: {
- order: 8,
+ order: 4,
menuItemFactory: FactoryOtherMenuItem,
},
},
diff --git a/packages/sheets-sort-ui/src/controllers/menu.schema.ts b/packages/sheets-sort-ui/src/controllers/menu.schema.ts
index 63e4ec2ab7..d30a221d3c 100644
--- a/packages/sheets-sort-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-sort-ui/src/controllers/menu.schema.ts
@@ -15,7 +15,7 @@
*/
import type { MenuSchemaType } from '@univerjs/ui';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonDataGroup } from '@univerjs/ui';
import {
SortRangeAscCommand,
SortRangeAscExtCommand,
@@ -46,9 +46,9 @@ import {
} from './sheets-sort.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_INSERT]: {
+ [RibbonDataGroup.ORGANIZATION]: {
[SHEETS_SORT_MENU_ID]: {
- order: 2,
+ order: 3,
menuItemFactory: sortRangeMenuFactory,
[SortRangeAscCommand.id]: {
order: 0,
diff --git a/packages/sheets-table-ui/src/controllers/menu.schema.ts b/packages/sheets-table-ui/src/controllers/menu.schema.ts
index 6295c48088..86763fd3ad 100644
--- a/packages/sheets-table-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-table-ui/src/controllers/menu.schema.ts
@@ -16,12 +16,12 @@
import type { MenuSchemaType } from '@univerjs/ui';
import { SheetTableInsertColCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveRowCommand } from '@univerjs/sheets-table';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonDataGroup } from '@univerjs/ui';
import { OpenTableSelectorOperation } from '../commands/operations/open-table-selector.operation';
import { SHEET_TABLE_CONTEXT_INSERT_MENU_ID, SHEET_TABLE_CONTEXT_REMOVE_MENU_ID, SheetTableInsertColMenuFactory, SheetTableInsertContextMenuFactory, SheetTableInsertRowMenuFactory, SheetTableRemoveColMenuFactory, SheetTableRemoveContextMenuFactory, SheetTableRemoveRowMenuFactory, sheetTableToolbarInsertMenuFactory } from '../views/menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMULAS_VIEW]: {
+ [RibbonDataGroup.ORGANIZATION]: {
[OpenTableSelectorOperation.id]: {
order: 0,
menuItemFactory: sheetTableToolbarInsertMenuFactory,
diff --git a/packages/sheets-thread-comment-ui/src/controllers/menu.schema.ts b/packages/sheets-thread-comment-ui/src/controllers/menu.schema.ts
index bf8aae0ec0..567755892b 100644
--- a/packages/sheets-thread-comment-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-thread-comment-ui/src/controllers/menu.schema.ts
@@ -16,14 +16,14 @@
import type { MenuSchemaType } from '@univerjs/ui';
import { ToggleSheetCommentPanelOperation } from '@univerjs/thread-comment-ui';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonInsertGroup } from '@univerjs/ui';
import { ShowAddSheetCommentModalOperation } from '../commands/operations/comment.operation';
import { threadCommentMenuFactory, threadPanelMenuFactory } from './menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.OTHERS]: {
+ [RibbonInsertGroup.MEDIA]: {
[ToggleSheetCommentPanelOperation.id]: {
- order: 1,
+ order: 2,
menuItemFactory: threadPanelMenuFactory,
},
},
diff --git a/packages/sheets-ui/src/controllers/menu.schema.ts b/packages/sheets-ui/src/controllers/menu.schema.ts
index 46bdeadc41..9225618687 100644
--- a/packages/sheets-ui/src/controllers/menu.schema.ts
+++ b/packages/sheets-ui/src/controllers/menu.schema.ts
@@ -49,7 +49,7 @@ import {
SetWorksheetRowIsAutoHeightCommand,
ToggleGridlinesCommand,
} from '@univerjs/sheets';
-import { ContextMenuGroup, ContextMenuPosition, RibbonStartGroup } from '@univerjs/ui';
+import { ContextMenuGroup, ContextMenuPosition, RibbonPosition, RibbonStartGroup } from '@univerjs/ui';
import {
SheetCopyCommand,
// SheetCutCommand,
@@ -176,98 +176,108 @@ import {
} from './menu/sheet.menu';
export const menuSchema: MenuSchemaType = {
- [RibbonStartGroup.FORMAT]: {
- [SetOnceFormatPainterCommand.id]: {
- order: 0,
- menuItemFactory: FormatPainterMenuItemFactory,
- },
- [SetRangeBoldCommand.id]: {
- order: 1,
- menuItemFactory: BoldMenuItemFactory,
- },
- [SetRangeItalicCommand.id]: {
- order: 2,
- menuItemFactory: ItalicMenuItemFactory,
- },
- [SetRangeUnderlineCommand.id]: {
- order: 3,
- menuItemFactory: UnderlineMenuItemFactory,
- },
- [SetRangeStrickThroughCommand.id]: {
- order: 4,
- menuItemFactory: StrikeThroughMenuItemFactory,
- },
- [SetRangeFontFamilyCommand.id]: {
- order: 5,
- menuItemFactory: FontFamilySelectorMenuItemFactory,
- },
- [SetRangeFontSizeCommand.id]: {
- order: 6,
- menuItemFactory: FontSizeSelectorMenuItemFactory,
- },
- [SetRangeTextColorCommand.id]: {
- order: 7,
- menuItemFactory: TextColorSelectorMenuItemFactory,
- [ResetTextColorCommand.id]: {
- order: 0,
- menuItemFactory: ResetTextColorMenuItemFactory,
+ [RibbonPosition.START]: {
+ [RibbonStartGroup.HISTORY]: {
+ [SetOnceFormatPainterCommand.id]: {
+ order: 2,
+ menuItemFactory: FormatPainterMenuItemFactory,
},
- },
- [SetBackgroundColorCommand.id]: {
- order: 9,
- menuItemFactory: BackgroundColorSelectorMenuItemFactory,
- [ResetBackgroundColorCommand.id]: {
- order: 0,
- menuItemFactory: ResetBackgroundColorMenuItemFactory,
+ [ClearSelectionAllCommand.id]: {
+ order: 3,
+ menuItemFactory: ClearSelectionAllMenuItemFactory,
},
},
- [SetBorderBasicCommand.id]: {
- order: 10,
- menuItemFactory: CellBorderSelectorMenuItemFactory,
- },
- },
- [RibbonStartGroup.LAYOUT]: {
- [AddWorksheetMergeCommand.id]: {
- order: 0,
- menuItemFactory: CellMergeMenuItemFactory,
- [AddWorksheetMergeAllCommand.id]: {
- order: 0,
- menuItemFactory: CellMergeAllMenuItemFactory,
- },
- [AddWorksheetMergeVerticalCommand.id]: {
+ [RibbonStartGroup.FORMAT]: {
+ [SetRangeFontFamilyCommand.id]: {
order: 1,
- menuItemFactory: CellMergeVerticalMenuItemFactory,
+ menuItemFactory: FontFamilySelectorMenuItemFactory,
},
- [AddWorksheetMergeHorizontalCommand.id]: {
+ [SetRangeFontSizeCommand.id]: {
order: 2,
- menuItemFactory: CellMergeHorizontalMenuItemFactory,
+ menuItemFactory: FontSizeSelectorMenuItemFactory,
},
- [RemoveWorksheetMergeCommand.id]: {
- order: 3,
- menuItemFactory: CellMergeCancelMenuItemFactory,
+ // TODO: fontsize +
+ // TODO: fontsize -
+ [SetRangeBoldCommand.id]: {
+ order: 5,
+ menuItemFactory: BoldMenuItemFactory,
+ },
+ [SetRangeItalicCommand.id]: {
+ order: 6,
+ menuItemFactory: ItalicMenuItemFactory,
+ },
+ [SetRangeUnderlineCommand.id]: {
+ order: 7,
+ menuItemFactory: UnderlineMenuItemFactory,
+ },
+ [SetRangeStrickThroughCommand.id]: {
+ order: 8,
+ menuItemFactory: StrikeThroughMenuItemFactory,
+ },
+ [SetRangeTextColorCommand.id]: {
+ order: 9,
+ menuItemFactory: TextColorSelectorMenuItemFactory,
+ [ResetTextColorCommand.id]: {
+ order: 0,
+ menuItemFactory: ResetTextColorMenuItemFactory,
+ },
+ },
+ [SetBackgroundColorCommand.id]: {
+ order: 10,
+ menuItemFactory: BackgroundColorSelectorMenuItemFactory,
+ [ResetBackgroundColorCommand.id]: {
+ order: 0,
+ menuItemFactory: ResetBackgroundColorMenuItemFactory,
+ },
+ },
+ [SetBorderBasicCommand.id]: {
+ order: 11,
+ menuItemFactory: CellBorderSelectorMenuItemFactory,
},
},
- [SetHorizontalTextAlignCommand.id]: {
- order: 1,
- menuItemFactory: HorizontalAlignMenuItemFactory,
- },
- [SetVerticalTextAlignCommand.id]: {
- order: 1,
- menuItemFactory: VerticalAlignMenuItemFactory,
- },
- [SetTextWrapCommand.id]: {
- order: 2,
- menuItemFactory: WrapTextMenuItemFactory,
- },
- [SetTextRotationCommand.id]: {
- order: 3,
- menuItemFactory: TextRotateMenuItemFactory,
+ [RibbonStartGroup.LAYOUT]: {
+ [SetHorizontalTextAlignCommand.id]: {
+ order: 0,
+ menuItemFactory: HorizontalAlignMenuItemFactory,
+ },
+ [SetVerticalTextAlignCommand.id]: {
+ order: 3,
+ menuItemFactory: VerticalAlignMenuItemFactory,
+ },
+ [SetTextWrapCommand.id]: {
+ order: 6,
+ menuItemFactory: WrapTextMenuItemFactory,
+ },
+ [SetTextRotationCommand.id]: {
+ order: 7,
+ menuItemFactory: TextRotateMenuItemFactory,
+ },
+ [AddWorksheetMergeCommand.id]: {
+ order: 8,
+ menuItemFactory: CellMergeMenuItemFactory,
+ [AddWorksheetMergeAllCommand.id]: {
+ order: 0,
+ menuItemFactory: CellMergeAllMenuItemFactory,
+ },
+ [AddWorksheetMergeVerticalCommand.id]: {
+ order: 1,
+ menuItemFactory: CellMergeVerticalMenuItemFactory,
+ },
+ [AddWorksheetMergeHorizontalCommand.id]: {
+ order: 2,
+ menuItemFactory: CellMergeHorizontalMenuItemFactory,
+ },
+ [RemoveWorksheetMergeCommand.id]: {
+ order: 3,
+ menuItemFactory: CellMergeCancelMenuItemFactory,
+ },
+ },
},
- },
- [RibbonStartGroup.OTHERS]: {
- [AddRangeProtectionFromToolbarCommand.id]: {
- order: 0,
- menuItemFactory: sheetPermissionToolbarMenuFactory,
+ [RibbonStartGroup.OTHERS]: {
+ [AddRangeProtectionFromToolbarCommand.id]: {
+ order: 0,
+ menuItemFactory: sheetPermissionToolbarMenuFactory,
+ },
},
},
[ContextMenuPosition.MAIN_AREA]: {
diff --git a/packages/sheets-ui/src/controllers/menu/clear.menu.ts b/packages/sheets-ui/src/controllers/menu/clear.menu.ts
index 80054cfe3e..5bfea07958 100644
--- a/packages/sheets-ui/src/controllers/menu/clear.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/clear.menu.ts
@@ -14,12 +14,20 @@
* limitations under the License.
*/
-import { ClearSelectionAllCommand, ClearSelectionContentCommand, ClearSelectionFormatCommand, RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
-import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
-import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
-
import type { IAccessor } from '@univerjs/core';
+import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { UniverInstanceType } from '@univerjs/core';
+import {
+ ClearSelectionAllCommand,
+ ClearSelectionContentCommand,
+ ClearSelectionFormatCommand,
+ RangeProtectionPermissionEditPoint,
+ WorkbookEditablePermission,
+ WorksheetEditPermission,
+ WorksheetSetCellStylePermission,
+ WorksheetSetCellValuePermission,
+} from '@univerjs/sheets';
+import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { getCurrentRangeDisable$, getObservableWithExclusiveRange$ } from './menu-util';
export const CLEAR_SELECTION_MENU_ID = 'sheet.menu.clear-selection';
@@ -37,8 +45,13 @@ export function ClearSelectionContentMenuItemFactory(accessor: IAccessor): IMenu
return {
id: ClearSelectionContentCommand.id,
type: MenuItemType.BUTTON,
+ icon: 'ClearFormat',
title: 'rightClick.clearContent',
- disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })),
+ disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ })),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -46,8 +59,13 @@ export function ClearSelectionFormatMenuItemFactory(accessor: IAccessor): IMenuB
return {
id: ClearSelectionFormatCommand.id,
type: MenuItemType.BUTTON,
+ icon: 'ClearFormat',
title: 'rightClick.clearFormat',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -55,8 +73,13 @@ export function ClearSelectionAllMenuItemFactory(accessor: IAccessor): IMenuButt
return {
id: ClearSelectionAllCommand.id,
type: MenuItemType.BUTTON,
+ icon: 'ClearFormat',
title: 'rightClick.clearAll',
- disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })),
+ disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ })),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.ts
index 1d28c1bb23..704e639148 100644
--- a/packages/sheets-ui/src/controllers/menu/menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu.ts
@@ -319,7 +319,11 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
subscriber.next(!!(isUnderline && isUnderline.s));
return disposable.dispose;
})),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }, true),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -336,7 +340,11 @@ export function StrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButtonIt
icon: 'StrikethroughSingle',
title: 'Set strike through',
tooltip: 'toolbar.strikethrough',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }, true),
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
const id = c.id;
@@ -401,7 +409,11 @@ export function FontFamilySelectorMenuItemFactory(accessor: IAccessor): IMenuSel
value: item.value,
})),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }, true),
value$: deriveStateFromActiveSheet$(univerInstanceService, defaultValue, ({ worksheet }) => new Observable((subscriber) => {
const updateSheet = () => {
let ff = defaultValue;
@@ -442,7 +454,11 @@ export function FontSizeSelectorMenuItemFactory(accessor: IAccessor): IMenuSelec
const contextService = accessor.get(IContextService);
const defaultValue = DEFAULT_STYLES.fs;
- const disabled$ = getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true);
+ const disabled$ = getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }, true);
return {
id: SetRangeFontSizeCommand.id,
@@ -507,7 +523,11 @@ export function ResetTextColorMenuItemFactory(accessor: IAccessor): IMenuButtonI
type: MenuItemType.BUTTON,
title: 'toolbar.resetColor',
icon: 'NoColor',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }, true),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -543,7 +563,11 @@ export function TextColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSele
return disposable.dispose;
}),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }, true),
};
}
@@ -553,7 +577,11 @@ export function ResetBackgroundColorMenuItemFactory(accessor: IAccessor): IMenuB
type: MenuItemType.BUTTON,
title: 'toolbar.resetColor',
icon: 'NoColor',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -588,7 +616,11 @@ export function BackgroundColorSelectorMenuItemFactory(accessor: IAccessor): IMe
return disposable.dispose;
}),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -651,7 +683,11 @@ export function HorizontalAlignMenuItemFactory(accessor: IAccessor): IMenuSelect
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -714,7 +750,11 @@ export function VerticalAlignMenuItemFactory(accessor: IAccessor): IMenuSelector
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -777,7 +817,11 @@ export function WrapTextMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -863,7 +907,11 @@ export function TextRotateMenuItemFactory(accessor: IAccessor): IMenuSelectorIte
return disposable.dispose;
})),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -882,7 +930,11 @@ export function CopyMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
type: MenuItemType.BUTTON,
title: 'rightClick.copy',
icon: 'Copy',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookCopyPermission], worksheetTypes: [WorksheetCopyPermission], rangeTypes: [RangeProtectionPermissionViewPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookCopyPermission],
+ worksheetTypes: [WorksheetCopyPermission],
+ rangeTypes: [RangeProtectionPermissionViewPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -893,7 +945,11 @@ export function CutMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
commandId: CutCommand.id,
type: MenuItemType.BUTTON,
title: 'contextMenu.cut',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetCopyPermission, WorksheetEditPermission],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -906,7 +962,11 @@ export function PasteMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
title: 'rightClick.paste',
icon: 'PasteSpecial',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
- combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission], workbookTypes: [WorkbookEditablePermission] })),
+ combineLatestWith(getCurrentRangeDisable$(accessor, {
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission],
+ workbookTypes: [WorkbookEditablePermission],
+ })),
map(([d1, d2]) => d1 || d2)
),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
@@ -930,7 +990,11 @@ export function PasteValueMenuItemFactory(accessor: IAccessor): IMenuButtonItem<
type: MenuItemType.BUTTON,
title: 'rightClick.pasteValue',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
- combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission], workbookTypes: [WorkbookEditablePermission] })),
+ combineLatestWith(getCurrentRangeDisable$(accessor, {
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellValuePermission, WorksheetEditPermission],
+ workbookTypes: [WorkbookEditablePermission],
+ })),
map(([d1, d2]) => d1 || d2)
),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
@@ -943,7 +1007,11 @@ export function PasteFormatMenuItemFactory(accessor: IAccessor): IMenuButtonItem
type: MenuItemType.BUTTON,
title: 'rightClick.pasteFormat',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
- combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], workbookTypes: [WorkbookEditablePermission] })),
+ combineLatestWith(getCurrentRangeDisable$(accessor, {
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission],
+ workbookTypes: [WorkbookEditablePermission],
+ })),
map(([d1, d2]) => d1 || d2)
),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
@@ -956,7 +1024,11 @@ export function PasteColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonIt
type: MenuItemType.BUTTON,
title: 'rightClick.pasteColWidth',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
- combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetSetColumnStylePermission, WorksheetEditPermission], workbookTypes: [WorkbookEditablePermission] })),
+ combineLatestWith(getCurrentRangeDisable$(accessor, {
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [WorksheetSetColumnStylePermission, WorksheetEditPermission],
+ workbookTypes: [WorkbookEditablePermission],
+ })),
map(([d1, d2]) => d1 || d2)
),
};
@@ -968,7 +1040,17 @@ export function PasteBesidesBorderMenuItemFactory(accessor: IAccessor): IMenuBut
type: MenuItemType.BUTTON,
title: 'rightClick.pasteBesidesBorder',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
- combineLatestWith(getCurrentRangeDisable$(accessor, { rangeTypes: [RangeProtectionPermissionEditPoint], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission, WorksheetSetRowStylePermission, WorksheetSetColumnStylePermission], workbookTypes: [WorkbookEditablePermission] })),
+ combineLatestWith(getCurrentRangeDisable$(accessor, {
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ worksheetTypes: [
+ WorksheetEditPermission,
+ WorksheetSetCellStylePermission,
+ WorksheetSetCellValuePermission,
+ WorksheetSetRowStylePermission,
+ WorksheetSetColumnStylePermission,
+ ],
+ workbookTypes: [WorkbookEditablePermission],
+ })),
map(([d1, d2]) => d1 || d2)
),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
@@ -981,7 +1063,11 @@ export function FitContentMenuItemFactory(accessor: IAccessor): IMenuButtonItem
type: MenuItemType.BUTTON,
icon: 'AutoHeight',
title: 'rightClick.fitContent',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -992,7 +1078,11 @@ export function ColAutoWidthMenuItemFactory(accessor: IAccessor): IMenuButtonIte
type: MenuItemType.BUTTON,
icon: 'AutoWidth',
title: 'rightClick.fitContent',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -1071,7 +1161,11 @@ export function HideRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
type: MenuItemType.BUTTON,
icon: 'Hide',
title: 'rightClick.hideSelectedRow',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetRowStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -1082,7 +1176,11 @@ export function HideColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
type: MenuItemType.BUTTON,
icon: 'Hide',
title: 'rightClick.hideSelectedColumn',
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -1120,7 +1218,11 @@ export function ShowRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
subscriber.next(!hasHiddenRowsInSelections());
return () => disposable.dispose();
})),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -1156,7 +1258,11 @@ export function ShowColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
subscriber.next(!hasHiddenColsInSelections());
return () => disposable.dispose();
})),
- disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetColumnStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ disabled$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetSetColumnStylePermission, WorksheetEditPermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -1197,7 +1303,11 @@ export function SetRowHeightMenuItemFactory(accessor: IAccessor): IMenuButtonIte
update();
return disposable.dispose;
})),
- hidden$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetRowStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
@@ -1242,7 +1352,11 @@ export function SetColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonItem
update();
return disposable.dispose;
})),
- hidden$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
+ hidden$: getCurrentRangeDisable$(accessor, {
+ workbookTypes: [WorkbookEditablePermission],
+ worksheetTypes: [WorksheetEditPermission, WorksheetSetColumnStylePermission],
+ rangeTypes: [RangeProtectionPermissionEditPoint],
+ }),
};
}
diff --git a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
index bee7e3c2ec..88254c66fd 100644
--- a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
@@ -76,7 +76,7 @@ export const SheetBar = () => {
return (
<div className="univer-relative univer-flex univer-h-full univer-min-w-0 univer-flex-1">
- <div className="univer-flex univer-items-center univer-pl-2">
+ <div className="univer-flex univer-items-center">
{/* Add sheet button */}
<SheetBarButton
className="univer-mr-2"
diff --git a/packages/thread-comment-ui/src/commands/operations/comment.operations.ts b/packages/thread-comment-ui/src/commands/operations/comment.operations.ts
index 3cb3479c11..8adf481fd6 100644
--- a/packages/thread-comment-ui/src/commands/operations/comment.operations.ts
+++ b/packages/thread-comment-ui/src/commands/operations/comment.operations.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
+import type { IAccessor, ICommand } from '@univerjs/core';
import { CommandType } from '@univerjs/core';
import { ISidebarService } from '@univerjs/ui';
-import type { IAccessor, ICommand } from '@univerjs/core';
import { ThreadCommentPanelService } from '../../services/thread-comment-panel.service';
import { THREAD_COMMENT_PANEL } from '../../types/const';
diff --git a/packages/ui/src/components/slider/Slider.tsx b/packages/ui/src/components/slider/Slider.tsx
index 56d64c1a35..d478532bac 100644
--- a/packages/ui/src/components/slider/Slider.tsx
+++ b/packages/ui/src/components/slider/Slider.tsx
@@ -232,17 +232,13 @@ export function Slider(props: ISliderProps) {
open={zoomListVisible}
onOpenChange={setZoomListVisible}
>
- <a
- className={`
- univer-flex univer-h-7 univer-w-[55px] univer-cursor-pointer univer-items-center
- univer-justify-center univer-rounded univer-text-sm univer-text-gray-800 univer-transition-all
- dark:univer-text-white dark:hover:univer-bg-gray-700
- hover:univer-bg-gray-100
- `}
+ <Button
+ size="small"
+ variant="text"
>
{value}
%
- </a>
+ </Button>
</DropdownMenu>
</div>
);
diff --git a/packages/ui/src/controllers/menus/menu.schema.ts b/packages/ui/src/controllers/menus/menu.schema.ts
index 1ef18b82d3..f8100017b5 100644
--- a/packages/ui/src/controllers/menus/menu.schema.ts
+++ b/packages/ui/src/controllers/menus/menu.schema.ts
@@ -34,7 +34,7 @@ export const menuSchema: MenuSchemaType = {
},
[RibbonStartGroup.OTHERS]: {
[ToggleShortcutPanelOperation.id]: {
- order: 99,
+ order: 1,
menuItemFactory: ShortcutPanelMenuItemFactory,
},
},
diff --git a/packages/ui/src/controllers/shortcut-display/menu.ts b/packages/ui/src/controllers/shortcut-display/menu.ts
index 7220a211b5..c8ee78f671 100644
--- a/packages/ui/src/controllers/shortcut-display/menu.ts
+++ b/packages/ui/src/controllers/shortcut-display/menu.ts
@@ -16,9 +16,7 @@
import type { IAccessor } from '@univerjs/core';
import type { IMenuButtonItem } from '../../services/menu/menu';
-import { UniverInstanceType } from '@univerjs/core';
import { ToggleShortcutPanelOperation } from '../../commands/operations/toggle-shortcut-panel.operation';
-import { getMenuHiddenObservable } from '../../common/menu-hidden-observable';
import { MenuItemType } from '../../services/menu/menu';
export function ShortcutPanelMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
@@ -28,7 +26,6 @@ export function ShortcutPanelMenuItemFactory(accessor: IAccessor): IMenuButtonIt
tooltip: 'toggle-shortcut-panel',
icon: 'KeyboardSingle',
type: MenuItemType.BUTTON,
- hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
- // disabled$: getCurrentSheetDisabled$(accessor),
+ // hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index aa2be3deb9..fc941e1b3c 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -131,7 +131,7 @@ export { type IDialogPartMethodOptions } from './views/components/dialog-part/in
export { FloatDom } from './views/components/dom/FloatDom';
export { GlobalZone } from './views/components/global-zone/GlobalZone';
export { CanvasPopup, SingleCanvasPopup } from './views/components/popup/CanvasPopup';
-export { ToolbarButton } from './views/components/ribbon/Button/ToolbarButton';
+export { ToolbarButton } from './views/components/ribbon/ToolbarButton';
export { useToolbarItemStatus } from './views/components/ribbon/hook';
export { Ribbon } from './views/components/ribbon/Ribbon';
export { ToolbarItem } from './views/components/ribbon/ToolbarItem';
diff --git a/packages/ui/src/locale/en-US.ts b/packages/ui/src/locale/en-US.ts
index 787c8b0fc4..e0aa92f9ab 100644
--- a/packages/ui/src/locale/en-US.ts
+++ b/packages/ui/src/locale/en-US.ts
@@ -33,11 +33,17 @@ const locale: typeof zhCN = {
},
ribbon: {
start: 'Start',
+ startDesc: 'Initiate the worksheet and set basic parameters.',
insert: 'Insert',
+ insertDesc: 'Insert rows, columns, charts and various other elements.',
formulas: 'Formulas',
+ formulasDesc: 'Use functions and formulas for data calculations.',
data: 'Data',
+ dataDesc: 'Manage data, including import, sorting and filtering.',
view: 'View',
+ viewDesc: 'Switch view modes and adjust the display effect.',
others: 'Others',
+ othersDesc: 'Other functions and settings.',
more: 'More',
},
fontFamily: {
diff --git a/packages/ui/src/locale/fa-IR.ts b/packages/ui/src/locale/fa-IR.ts
index 251ef08158..faebe1d8a4 100644
--- a/packages/ui/src/locale/fa-IR.ts
+++ b/packages/ui/src/locale/fa-IR.ts
@@ -33,11 +33,17 @@ const locale: typeof zhCN = {
},
ribbon: {
start: 'شروع',
+ startDesc: 'ایجاد کاربرگ و تنظیم پارامترهای اولیه.',
insert: 'درج',
+ insertDesc: 'درج ردیف‌ها، ستون‌ها، نمودارها و عناصر مختلف دیگر.',
formulas: 'فرمول‌ها',
+ formulasDesc: 'استفاده از توابع و فرمول‌ها برای محاسبات داده‌ها.',
data: 'داده‌ها',
+ dataDesc: 'ادغام و تجزیه داده‌ها.',
view: 'نمایش',
+ viewDesc: 'تغییر حالت نمایش و تنظیم اثرات نمایشی.',
others: 'دیگر',
+ othersDesc: 'سایر عملکردها و تنظیمات.',
more: 'بیشتر',
},
fontFamily: {
diff --git a/packages/ui/src/locale/fr-FR.ts b/packages/ui/src/locale/fr-FR.ts
index 64587b9518..498503c3f2 100644
--- a/packages/ui/src/locale/fr-FR.ts
+++ b/packages/ui/src/locale/fr-FR.ts
@@ -33,11 +33,17 @@ const locale: typeof enUS = {
},
ribbon: {
start: 'Démarrer',
+ startDesc: 'Initialiser la feuille de calcul et définir les paramètres de base.',
insert: 'Insérer',
+ insertDesc: 'Insérer des lignes, des colonnes, des graphiques et divers autres éléments.',
formulas: 'Formules',
+ formulasDesc: 'Utiliser des fonctions et des formules pour les calculs de données.',
data: 'Données',
+ dataDesc: 'Gérer les données, y compris l\'importation, le tri et le filtrage.',
view: 'Vue',
+ viewDesc: 'Changer les modes d\'affichage et ajuster l\'effet d\'affichage.',
others: 'Autres',
+ othersDesc: 'Autres fonctions et paramètres.',
more: 'Plus',
},
fontFamily: {
diff --git a/packages/ui/src/locale/ru-RU.ts b/packages/ui/src/locale/ru-RU.ts
index 89b9a2f52b..ac2572daef 100644
--- a/packages/ui/src/locale/ru-RU.ts
+++ b/packages/ui/src/locale/ru-RU.ts
@@ -33,11 +33,17 @@ const locale: typeof zhCN = {
},
ribbon: {
start: 'Начало',
+ startDesc: 'Инициализация рабочей таблицы и установка основных параметров.',
insert: 'Вставка',
+ insertDesc: 'Вставка строк, столбцов, графиков и различных других элементов.',
formulas: 'Формулы',
+ formulasDesc: 'Использование функций и формул для вычислений данных.',
data: 'Данные',
+ dataDesc: 'Управление данными, включая импорт, сортировку и фильтрацию.',
view: 'Вид',
+ viewDesc: 'Смена режимов отображения и настройка эффекта отображения.',
others: 'Другие',
+ othersDesc: 'Другие функции и настройки.',
more: 'Больше',
},
fontFamily: {
diff --git a/packages/ui/src/locale/vi-VN.ts b/packages/ui/src/locale/vi-VN.ts
index 4a2c3f9e34..e8a8b0465f 100644
--- a/packages/ui/src/locale/vi-VN.ts
+++ b/packages/ui/src/locale/vi-VN.ts
@@ -33,11 +33,17 @@ const locale: typeof zhCN = {
},
ribbon: {
start: 'Bắt đầu',
+ startDesc: 'Khởi tạo bảng tính và thiết lập các tham số cơ bản.',
insert: 'Chèn',
+ insertDesc: 'Chèn hàng, cột, biểu đồ và các phần tử khác.',
formulas: 'Công thức',
+ formulasDesc: 'Sử dụng hàm và công thức để tính toán dữ liệu.',
data: 'Dữ liệu',
+ dataDesc: 'Sắp xếp, lọc và phân tích dữ liệu.',
view: 'Xem',
+ viewDesc: 'Chuyển đổi chế độ xem và điều chỉnh hiệu ứng hiển thị.',
others: 'Khác',
+ othersDesc: 'Các chức năng và cài đặt khác.',
more: 'Thêm',
},
fontFamily: {
diff --git a/packages/ui/src/locale/zh-CN.ts b/packages/ui/src/locale/zh-CN.ts
index 1818c2624a..fe4bc34bee 100644
--- a/packages/ui/src/locale/zh-CN.ts
+++ b/packages/ui/src/locale/zh-CN.ts
@@ -31,11 +31,17 @@ const locale = {
},
ribbon: {
start: '开始',
+ startDesc: '初始化工作表并设置基本参数。',
insert: '插入',
+ insertDesc: '插入行、列、图表和各种其他元素。',
formulas: '公式',
+ formulasDesc: '使用函数和公式进行数据计算。',
data: '数据',
+ dataDesc: '管理数据,包括导入、排序和筛选。',
view: '视图',
+ viewDesc: '切换视图模式并调整显示效果。',
others: '其他',
+ othersDesc: '其他功能和设置。',
more: '更多',
},
fontFamily: {
diff --git a/packages/ui/src/locale/zh-TW.ts b/packages/ui/src/locale/zh-TW.ts
index 582e36ba89..70a032c693 100644
--- a/packages/ui/src/locale/zh-TW.ts
+++ b/packages/ui/src/locale/zh-TW.ts
@@ -33,11 +33,17 @@ const locale: typeof zhCN = {
},
ribbon: {
start: '開始',
+ startDesc: '初始化工作表並設定基本參數。',
insert: '插入',
+ insertDesc: '插入行、列、圖表和各種其他元素。',
formulas: '公式',
+ formulasDesc: '使用函數和公式進行數據計算。',
data: '資料',
+ dataDesc: '管理資料,包括匯入、排序和篩選。',
view: '視圖',
+ viewDesc: '切換視圖模式並調整顯示效果。',
others: '其他',
+ othersDesc: '其他功能和設定。',
more: '更多',
},
fontFamily: {
diff --git a/packages/ui/src/services/menu/menu-manager.service.ts b/packages/ui/src/services/menu/menu-manager.service.ts
index e6be3b6982..ac4f9b44a7 100644
--- a/packages/ui/src/services/menu/menu-manager.service.ts
+++ b/packages/ui/src/services/menu/menu-manager.service.ts
@@ -34,7 +34,7 @@ export interface IMenuSchema {
}
export interface IMenuManagerService {
- readonly menuChanged$: Observable<void>;
+ readonly menuChanged$: Observable<number>;
mergeMenu(source: MenuSchemaType, target?: MenuSchemaType): void;
@@ -54,7 +54,7 @@ export type MenuSchemaType = {
};
export class MenuManagerService extends Disposable implements IMenuManagerService {
- readonly menuChanged$ = new Subject<void>();
+ readonly menuChanged$ = new Subject<number>();
private _menu: MenuSchemaType = {
[MenuManagerPosition.RIBBON]: {
@@ -69,39 +69,54 @@ export class MenuManagerService extends Disposable implements IMenuManagerServic
[RibbonStartGroup.LAYOUT]: {
order: 2,
},
- [RibbonStartGroup.FORMULAS_INSERT]: {
- order: 3,
- },
- [RibbonStartGroup.FORMULAS_VIEW]: {
- order: 4,
- },
- [RibbonStartGroup.FILE]: {
- order: 5,
- },
[RibbonStartGroup.OTHERS]: {
- order: 6,
+ order: 3,
},
},
[RibbonPosition.INSERT]: {
order: 1,
- [RibbonInsertGroup.OTHERS]: {
+ [RibbonInsertGroup.EDIT]: {
order: 0,
},
+ [RibbonInsertGroup.MEDIA]: {
+ order: 1,
+ },
+ [RibbonInsertGroup.OTHERS]: {
+ order: 2,
+ },
},
[RibbonPosition.FORMULAS]: {
order: 2,
- [RibbonFormulasGroup.OTHERS]: {
+ [RibbonFormulasGroup.BASIC]: {
order: 0,
},
+ [RibbonFormulasGroup.OTHERS]: {
+ order: 1,
+ },
},
[RibbonPosition.DATA]: {
order: 3,
- [RibbonDataGroup.OTHERS]: {
+ [RibbonDataGroup.FORMULAS]: {
order: 0,
},
+ [RibbonDataGroup.RULES]: {
+ order: 1,
+ },
+ [RibbonDataGroup.ORGANIZATION]: {
+ order: 2,
+ },
+ [RibbonDataGroup.OTHERS]: {
+ order: 3,
+ },
},
[RibbonPosition.VIEW]: {
order: 4,
+ [RibbonViewGroup.DISPLAY]: {
+ order: 0,
+ },
+ [RibbonViewGroup.VISIBILITY]: {
+ order: 0,
+ },
[RibbonViewGroup.OTHERS]: {
order: 0,
},
@@ -228,7 +243,7 @@ export class MenuManagerService extends Disposable implements IMenuManagerServic
const _key = key as keyof MenuSchemaType;
_target[_key] = merge({}, _target[_key], source[_key]);
- this.menuChanged$.next();
+ this.menuChanged$.next(Date.now());
} else if (typeof value === 'object') {
this.mergeMenu(source, value);
}
@@ -237,7 +252,7 @@ export class MenuManagerService extends Disposable implements IMenuManagerServic
appendRootMenu(source: MenuSchemaType): void {
this._menu = merge({}, this._menu, source);
- this.menuChanged$.next();
+ this.menuChanged$.next(Date.now());
}
private _buildMenuSchema(data: MenuSchemaType): IMenuSchema[] {
diff --git a/packages/ui/src/services/menu/menu.ts b/packages/ui/src/services/menu/menu.ts
index ea04e43325..3e9631ab9d 100644
--- a/packages/ui/src/services/menu/menu.ts
+++ b/packages/ui/src/services/menu/menu.ts
@@ -61,6 +61,7 @@ interface IMenuItemBase<V> {
hidden$?: Observable<boolean>;
disabled$?: Observable<boolean>;
+ params?: any;
/** On observable value that should emit the value of the corresponding selection component. */
value$?: Observable<V>;
}
diff --git a/packages/ui/src/services/menu/types.ts b/packages/ui/src/services/menu/types.ts
index f510587a09..0e2f2cf3b7 100644
--- a/packages/ui/src/services/menu/types.ts
+++ b/packages/ui/src/services/menu/types.ts
@@ -20,37 +20,42 @@ export enum MenuManagerPosition {
}
export enum RibbonPosition {
- START = 'ribbon.start',
- INSERT = 'ribbon.insert',
- FORMULAS = 'ribbon.formulas',
- DATA = 'ribbon.data',
- VIEW = 'ribbon.view',
- OTHERS = 'ribbon.others',
+ START = 'ribbon.start', // RibbonStartGroup
+ INSERT = 'ribbon.insert', // RibbonInsertGroup
+ FORMULAS = 'ribbon.formulas', // RibbonFormulasGroup
+ DATA = 'ribbon.data', // RibbonDataGroup
+ VIEW = 'ribbon.view', // RibbonViewGroup
+ OTHERS = 'ribbon.others', // RibbonOthersGroup
}
export enum RibbonStartGroup {
HISTORY = 'ribbon.start.history',
FORMAT = 'ribbon.start.format',
LAYOUT = 'ribbon.start.layout',
- FORMULAS_INSERT = 'ribbon.start.insert',
- FORMULAS_VIEW = 'ribbon.start.view',
- FILE = 'ribbon.start.file',
OTHERS = 'ribbon.start.others',
}
export enum RibbonInsertGroup {
+ EDIT = 'ribbon.insert.edit',
+ MEDIA = 'ribbon.insert.media',
OTHERS = 'ribbon.insert.others',
}
export enum RibbonFormulasGroup {
+ BASIC = 'ribbon.formulas.basic',
OTHERS = 'ribbon.formulas.others',
}
export enum RibbonDataGroup {
+ FORMULAS = 'ribbon.data.formulas',
+ RULES = 'ribbon.data.rules',
+ ORGANIZATION = 'ribbon.data.organization',
OTHERS = 'ribbon.data.others',
}
export enum RibbonViewGroup {
+ DISPLAY = 'ribbon.view.display',
+ VISIBILITY = 'ribbon.view.Visibility',
OTHERS = 'ribbon.view.others',
}
diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index 9749390a42..8fb67e52cf 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -15,31 +15,44 @@
*/
import type { ComponentType } from 'react';
+import type { Observable } from 'rxjs';
import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
import { LocaleService } from '@univerjs/core';
-import { borderBottomClassName, clsx } from '@univerjs/design';
-import { MoreFunctionSingle } from '@univerjs/icons';
+import { borderBottomClassName, borderClassName, clsx, divideXClassName, Dropdown } from '@univerjs/design';
+import { DatabaseSingle, EyeSingle, FunctionSingle, HomeSingle, InsertSingle, MoreDownSingle, MoreFunctionSingle } from '@univerjs/icons';
import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { combineLatest } from 'rxjs';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
import { MenuManagerPosition, RibbonPosition } from '../../../services/menu/types';
-import { useDependency } from '../../../utils/di';
+import { useDependency, useObservable } from '../../../utils/di';
import { ComponentContainer } from '../ComponentContainer';
-import { ToolbarButton } from '../ribbon/Button/ToolbarButton';
+import { ToolbarButton } from './ToolbarButton';
import { ToolbarItem } from './ToolbarItem';
-import { DropdownWrapper, TooltipWrapper } from './TooltipButtonWrapper';
interface IRibbonProps {
headerMenuComponents?: Set<ComponentType>;
headerMenu?: boolean;
}
+const iconMap = {
+ [RibbonPosition.START]: HomeSingle,
+ [RibbonPosition.INSERT]: InsertSingle,
+ [RibbonPosition.FORMULAS]: FunctionSingle,
+ [RibbonPosition.DATA]: DatabaseSingle,
+ [RibbonPosition.VIEW]: EyeSingle,
+ [RibbonPosition.OTHERS]: MoreFunctionSingle,
+};
+
export function Ribbon(props: IRibbonProps) {
const { headerMenuComponents, headerMenu = true } = props;
const menuManagerService = useDependency(IMenuManagerService);
const localeService = useDependency(LocaleService);
- const fakeToolbarRef = useRef<HTMLDivElement>(null);
+ const menuChanged = useObservable(menuManagerService.menuChanged$);
+
+ const containerRef = useRef<HTMLDivElement>(null!);
+ const fakeToolbarRef = useRef<HTMLDivElement>(null!);
const toolbarItemRefs = useRef<Record<string, {
el: HTMLSpanElement;
key: string;
@@ -49,42 +62,97 @@ export function Ribbon(props: IRibbonProps) {
const [ribbon, setRibbon] = useState<IMenuSchema[]>([]);
const [activatedTab, setActivatedTab] = useState<string>(RibbonPosition.START);
- const [changingActiveTab, setChangingActiveTab] = useState(false);
+ const [groupSelectorVisible, setGroupSelectorVisible] = useState(false);
const [collapsedIds, setCollapsedIds] = useState<string[]>([]);
-
- const separatorClassName = `[&>*:last-child:after]:univer-absolute [&>*:last-child:after]:-univer-right-2
- [&>*:last-child:after]:univer-top-1/2 [&>*:last-child:after]:univer-h-5 [&>*:last-child:after]:univer-translate-x-[3px]
- [&>*:last-child:after]:univer-w-px [&>*:last-child:after]:-univer-translate-y-1/2
- [&>*:last-child:after]:univer-bg-gray-200 [&>*:last-child:after]:univer-content-['']
- [&>*:last-child]:univer-relative dark:[&>*:last-child:after]:univer-bg-gray-600`;
+ // const [changingActiveTab, setChangingActiveTab] = useState(false);
const handleSelectTab = useCallback((group: IMenuSchema) => {
toolbarItemRefs.current = {};
- setChangingActiveTab(true);
- const timer = setTimeout(() => {
- setChangingActiveTab(false);
- }, 300);
+ // setChangingActiveTab(true);
+ // const timer = setTimeout(() => {
+ // setChangingActiveTab(false);
+ // }, 300);
setActivatedTab(group.key);
+ setGroupSelectorVisible(false);
return () => {
- clearTimeout(timer);
+ // clearTimeout(timer);
};
}, []);
// subscribe to menu changes
useEffect(() => {
- function getRibbon(): void {
- const ribbon = menuManagerService.getMenuByPositionKey(MenuManagerPosition.RIBBON);
- setRibbon(ribbon);
+ const ribbon = menuManagerService.getMenuByPositionKey(MenuManagerPosition.RIBBON);
+
+ const hiddenObservaleMap: Observable<boolean>[] = [];
+ const hiddenKeyMap: string[] = [];
+ for (const group of ribbon) {
+ if (group.children) {
+ for (const item of group.children) {
+ if (item.children) {
+ for (const child of item.children) {
+ if (child.item?.hidden$) {
+ hiddenObservaleMap.push(child.item.hidden$);
+ hiddenKeyMap.push(`${group.key}/${item.key}/${child.key}`);
+ }
+ }
+ }
+ }
+ }
}
- getRibbon();
- const subscription = menuManagerService.menuChanged$.subscribe(getRibbon);
+ const subscription = combineLatest(hiddenObservaleMap)
+ // .pipe(debounceTime(300))
+ .subscribe((hiddenMap) => {
+ const newRibbon: IMenuSchema[] = [];
+
+ const hiddenPathMap = hiddenMap.map((hidden, index) => {
+ if (hidden) {
+ return hiddenKeyMap[index];
+ }
+ return null;
+ }).filter((item) => !!item) as string[];
+
+ for (const group of ribbon) {
+ const newGroup: IMenuSchema = { ...group, children: [] };
+
+ if (group.children?.length) {
+ for (const item of group.children) {
+ const newItem: IMenuSchema = { ...item, children: [] };
+ let shouldAddItem = true;
+
+ if (item.children?.length) {
+ for (const child of item.children) {
+ const path = `${group.key}/${item.key}/${child.key}`;
+
+ if (!hiddenPathMap.includes(path)) {
+ newItem.children?.push(child);
+ }
+ }
+
+ if (newItem.children?.every((child) => child.children?.length === 0)) {
+ shouldAddItem = false;
+ }
+ }
+
+ if (shouldAddItem) {
+ newGroup.children?.push(newItem);
+ }
+ }
+ }
+
+ if (newGroup.children?.length && newGroup.children.every((item) => item.children?.length)) {
+ newRibbon.push(newGroup);
+ }
+ }
+
+ setRibbon(newRibbon);
+ });
return () => {
subscription.unsubscribe();
};
- }, [menuManagerService]);
+ }, [menuChanged]);
const activeGroup = useMemo(() => {
const allGroups = ribbon.find((group) => group.key === activatedTab)?.children ?? [];
@@ -115,211 +183,230 @@ export function Ribbon(props: IRibbonProps) {
visibleGroups,
hiddenGroups,
};
- }, [ribbon, activatedTab, collapsedIds]);
+ }, [collapsedIds, ribbon, activatedTab]);
- // resize observer
useEffect(() => {
const observer = new ResizeObserver((entries) => {
- const toolbar = entries[0].target;
- const toolbarWidth = toolbar.clientWidth;
- const toolbarItems = Object.values(toolbarItemRefs.current);
- const sortedToolbarItems = toolbarItems.sort((a, b) => {
- if (a.groupOrder === b.groupOrder) {
- return a.order - b.order;
+ for (const entry of entries) {
+ const { width: avaliableWidth } = entry.contentRect;
+ const toolbarItems = Object.values(toolbarItemRefs.current);
+ const sortedToolbarItems = toolbarItems.sort((a, b) => {
+ if (a.groupOrder === b.groupOrder) {
+ return a.order - b.order;
+ }
+ return a.groupOrder - b.groupOrder;
+ });
+
+ const newCollapsedIds: string[] = [];
+ let totalWidth = 32;
+ const allGroups = ribbon.find((group) => group.key === activatedTab)?.children ?? [];
+
+ const gapWidth = (allGroups.length - 1) * 8;
+ totalWidth += gapWidth;
+
+ for (const { el, key } of sortedToolbarItems) {
+ if (!el) continue;
+
+ totalWidth += el?.getBoundingClientRect().width + 8;
+
+ if (totalWidth > avaliableWidth - gapWidth) {
+ newCollapsedIds.push(key);
+ }
}
- return a.groupOrder - b.groupOrder;
- });
-
- const newCollapsedIds: string[] = [];
- let totalWidth = 0;
- const allGroups = ribbon.find((group) => group.key === activatedTab)?.children ?? [];
-
- const gapWidth = (allGroups.length - 1) * 8;
- totalWidth += gapWidth;
-
- for (const { el, key } of sortedToolbarItems) {
- if (!el) continue;
-
- totalWidth += el?.getBoundingClientRect().width + 8;
-
- if (totalWidth > toolbarWidth - 32 - gapWidth) {
- newCollapsedIds.push(key);
- }
- }
-
- if (JSON.stringify(newCollapsedIds) !== JSON.stringify(collapsedIds)) {
setCollapsedIds(newCollapsedIds);
}
});
- if (fakeToolbarRef.current) {
- observer.observe(fakeToolbarRef.current);
- }
+ observer.observe(containerRef.current);
return () => {
observer.disconnect();
};
- }, [ribbon, activatedTab, collapsedIds]);
-
- const fakeToolbarContent = useMemo(() => (
- activeGroup.allGroups.map((groupItem) => (
- <Fragment key={groupItem.key}>
- <div className={clsx('univer-flex univer-flex-nowrap univer-gap-2 univer-px-2', separatorClassName)}>
- {groupItem.children?.map((child) => (
- child.item && (
- <ToolbarItem
- key={child.key}
- {...child.item}
- ref={(ref) => {
- if (ref?.el) {
- toolbarItemRefs.current[child.key] = {
- el: ref.el,
- key: child.key,
- groupOrder: groupItem.order,
- order: child.order,
- };
- }
- }}
- />
- )
- ))}
- </div>
- </Fragment>
- ))
- ), [activeGroup.allGroups]);
+ }, [ribbon, activatedTab]);
return (
<>
- {/* header */}
- {headerMenu && (
- <header className="univer-relative univer-select-none">
+ {headerMenu && (headerMenuComponents && headerMenuComponents.size > 0) && (
+ <header className={clsx('univer-relative univer-h-11 univer-select-none', borderBottomClassName)}>
<div
- className={clsx(`
- univer-flex univer-h-0 univer-items-center univer-justify-center univer-gap-2
- univer-overflow-hidden univer-transition-all univer-animate-in
- `, {
- 'univer-h-8 univer-slide-in-from-top-full': ribbon.length > 1 || (headerMenuComponents && headerMenuComponents.size > 0),
- })}
+ className={`
+ univer-absolute univer-right-2 univer-top-0 univer-flex univer-h-full univer-items-center
+ univer-gap-2
+ [&>*]:univer-inline-flex [&>*]:univer-h-6 [&>*]:univer-items-center [&>*]:univer-rounded
+ [&>*]:univer-px-1 [&>*]:univer-transition-colors
+ hover:[&>*]:univer-bg-gray-100
+ `}
>
- {ribbon.length > 1 && ribbon.map((group) => (
- <a
- key={group.key}
- className={clsx(`
- univer-box-border univer-cursor-pointer univer-rounded univer-px-2 univer-py-0.5
- univer-text-sm univer-text-gray-700 univer-transition-colors
- dark:univer-text-white dark:hover:univer-bg-gray-700
- hover:univer-bg-gray-100
- `, {
- 'univer-bg-primary-500 univer-text-white hover:!univer-bg-primary-500': group.key === activatedTab,
- })}
- onClick={() => handleSelectTab(group)}
- >
- {localeService.t(group.key)}
- </a>
- ))}
+ <ComponentContainer components={headerMenuComponents} />
</div>
-
- {(headerMenuComponents && headerMenuComponents.size > 0) && (
- <div
- className={`
- univer-absolute univer-right-2 univer-top-0 univer-flex univer-h-full univer-items-center
- univer-gap-2
- [&>*]:univer-inline-flex [&>*]:univer-h-6 [&>*]:univer-items-center [&>*]:univer-rounded
- [&>*]:univer-px-1 [&>*]:univer-transition-colors
- hover:[&>*]:univer-bg-gray-100
- `}
- >
- <ComponentContainer components={headerMenuComponents} />
- </div>
- )}
</header>
)}
- <section
- role="toolbar"
+ <div
className={clsx(`
- univer-relative univer-box-border univer-flex univer-h-8 univer-select-none univer-items-center
- univer-bg-white univer-text-base univer-text-gray-800 univer-transition-opacity
- dark:univer-bg-gray-900
- `, borderBottomClassName)}
+ univer-box-border univer-grid univer-h-10 univer-grid-flow-col univer-items-center univer-px-3
+ `, 'univer-grid-cols-[auto,1fr]', borderBottomClassName)}
>
- <div
- className={clsx(`
- univer-mx-auto univer-box-border univer-flex univer-h-full univer-flex-1 univer-items-center
- univer-justify-center univer-gap-1 univer-overflow-hidden univer-bg-gray-50 univer-px-4
- dark:univer-bg-gray-900
- `, {
- 'univer-duration-300 univer-animate-in univer-fade-in': changingActiveTab,
- })}
- >
+ {/* <search className="univer-mr-1 univer-w-20">
+ <Input />
+ </search> */}
+
+ {ribbon.length > 1 && (
+ <Dropdown
+ className="univer-max-w-96 !univer-rounded-xl univer-animate-in univer-fade-in"
+ align="start"
+ open={groupSelectorVisible}
+ overlay={(
+ <div className="univer-grid univer-gap-1 univer-px-2 univer-py-1">
+ {ribbon.map((group) => {
+ const Icon = iconMap[group.key as RibbonPosition];
+
+ return (
+ <a
+ key={group.key}
+ className={`
+ univer-box-border univer-flex univer-cursor-pointer univer-items-center
+ univer-gap-2.5 univer-rounded-lg univer-px-2 univer-py-1.5
+ dark:hover:univer-bg-gray-700
+ hover:univer-bg-gray-100
+ `}
+ onClick={() => handleSelectTab(group)}
+ >
+ <span
+ className={clsx(`
+ univer-box-border univer-flex univer-size-9 univer-flex-shrink-0
+ univer-items-center univer-justify-center univer-rounded-lg
+ `, borderClassName)}
+ >
+ <Icon
+ className={`
+ univer-text-gray-500
+ dark:univer-text-gray-300
+ `}
+ />
+ </span>
+ <span className="univer-flex univer-flex-col">
+ <strong
+ className={`
+ univer-text-sm univer-font-semibold univer-text-gray-800
+ dark:univer-text-gray-200
+ `}
+ >
+ {localeService.t(group.key)}
+ </strong>
+ <span className="univer-text-xs univer-text-gray-400">
+ {localeService.t(`${group.key}Desc`)}
+ </span>
+ </span>
+ </a>
+ );
+ })}
+ </div>
+ )}
+ onOpenChange={setGroupSelectorVisible}
+ >
+ <a
+ className={`
+ univer-mr-2 univer-flex univer-h-7 univer-cursor-pointer univer-items-center
+ univer-gap-1.5 univer-whitespace-nowrap !univer-rounded-full univer-bg-gray-700
+ univer-pl-3 univer-pr-2 univer-text-sm univer-text-white
+ dark:univer-bg-gray-200 dark:univer-text-gray-800
+ `}
+ >
+ {localeService.t(activatedTab)}
+ <MoreDownSingle
+ className={`
+ univer-text-gray-200
+ dark:univer-text-gray-500
+ `}
+ />
+ </a>
+ </Dropdown>
+ )}
+
+ <div ref={containerRef} className={clsx('univer-flex univer-overflow-hidden', divideXClassName)}>
{activeGroup.visibleGroups.map((groupItem) => (groupItem.children?.length || groupItem.item) && (
<Fragment key={groupItem.key}>
- <div className={clsx('univer-flex univer-flex-nowrap univer-gap-2 univer-px-2', separatorClassName)}>
- {groupItem.children
- ? groupItem.children?.map((child) => (
- child.item && <ToolbarItem key={child.key} {...child.item} />
- ))
- : (
- groupItem.item && <ToolbarItem key={groupItem.key} {...groupItem.item} />
- )}
+ <div className="univer-grid univer-grid-flow-col univer-gap-2 univer-px-2">
+ {groupItem.children && groupItem.children?.map((child) => (
+ child.item && <ToolbarItem key={child.key} {...child.item} />
+ ))}
</div>
</Fragment>
))}
- {/* overflow menu items */}
{collapsedIds.length > 0 && (
- <div className="univer-px-2">
- <TooltipWrapper title={localeService.t('ribbon.more')} placement="bottom">
- <DropdownWrapper
- align="end"
- overlay={(
- <div
- className={`
- univer-box-border univer-grid
- univer-max-w-[var(--radix-popper-available-width)] univer-gap-2 univer-p-2
- `}
- >
- {activeGroup.hiddenGroups.map((groupItem) => (
- <div
- key={groupItem.key}
- className="univer-flex univer-items-center univer-gap-2"
- >
- <div className="univer-flex univer-flex-wrap univer-gap-2">
- {groupItem.children
- ? groupItem.children?.map((child) => (
- child.item && <ToolbarItem key={child.key} {...child.item} />
- ))
- : (
- groupItem.item && <ToolbarItem key={groupItem.key} {...groupItem.item} />
- )}
- </div>
+ <div className="univer-pl-2">
+ <Dropdown
+ overlay={(
+ <div
+ className={`
+ univer-box-border univer-grid
+ univer-max-w-[var(--radix-popper-available-width)] univer-gap-2 univer-p-2
+ `}
+ >
+ {activeGroup.hiddenGroups.map((groupItem) => (
+ <div
+ key={groupItem.key}
+ className="univer-flex univer-items-center univer-gap-2"
+ >
+ <div className="univer-flex univer-flex-wrap univer-gap-2">
+ {groupItem.children
+ ? groupItem.children?.map((child) => (
+ child.item && <ToolbarItem key={child.key} {...child.item} />
+ ))
+ : (
+ groupItem.item && <ToolbarItem key={groupItem.key} {...groupItem.item} />
+ )}
</div>
- ))}
- </div>
- )}
- >
- <ToolbarButton>
- <MoreFunctionSingle />
- </ToolbarButton>
- </DropdownWrapper>
- </TooltipWrapper>
+ </div>
+ ))}
+ </div>
+ )}
+ >
+ <ToolbarButton>
+ <MoreFunctionSingle />
+ </ToolbarButton>
+ </Dropdown>
</div>
)}
</div>
- </section>
+ </div>
- {/* fake toolbar for calculating overflow width */}
+ {/* fake toolbar */}
<div
- aria-hidden
ref={fakeToolbarRef}
- className={`
- univer-invisible univer-absolute univer-left-0 univer-right-0 univer-top-[-99999px] univer-mx-auto
- univer-box-border univer-flex univer-h-full univer-flex-1 univer-items-center univer-justify-center
- univer-gap-1 univer-overflow-hidden univer-px-4
- `}
+ aria-hidden
+ className={clsx(`
+ univer-invisible univer-absolute -univer-left-[99999] -univer-top-[99999] univer-box-border
+ univer-flex univer-h-10 univer-min-w-min univer-items-center univer-px-3 univer-opacity-0
+ `, borderBottomClassName)}
>
- {fakeToolbarContent}
+ {activeGroup.allGroups.map((groupItem) => (groupItem.children?.length || groupItem.item) && (
+ <Fragment key={groupItem.key}>
+ <div className="univer-grid univer-grid-flow-col univer-gap-2 univer-px-2">
+ {groupItem.children && groupItem.children?.map((child) => (
+ child.item && (
+ <ToolbarItem
+ key={child.key}
+ {...child.item}
+ ref={(ref) => {
+ if (ref?.el) {
+ toolbarItemRefs.current[child.key] = {
+ el: ref.el,
+ key: child.key,
+ groupOrder: groupItem.order,
+ order: child.order,
+ };
+ }
+ }}
+ />
+ )
+ ))}
+ </div>
+ </Fragment>
+ ))}
</div>
</>
);
diff --git a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx b/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
similarity index 88%
rename from packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
rename to packages/ui/src/views/components/ribbon/ToolbarButton.tsx
index b215ff2386..45270d2a13 100644
--- a/packages/ui/src/views/components/ribbon/Button/ToolbarButton.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarButton.tsx
@@ -87,14 +87,14 @@ export function ToolbarButton(props: IBaseToolbarButtonProps) {
<button
type="button"
className={clsx(`
- univer-flex univer-h-6 univer-min-w-6 univer-cursor-pointer univer-items-center univer-justify-center
- univer-rounded univer-border-none univer-bg-transparent univer-p-0 univer-text-base univer-text-gray-900
- univer-outline-none univer-transition-colors univer-animate-in univer-fade-in
+ univer-box-border univer-flex univer-h-6 univer-min-w-6 univer-cursor-pointer univer-items-center
+ univer-justify-center univer-rounded univer-border-none univer-bg-transparent univer-p-0
+ univer-text-gray-900 univer-outline-none univer-transition-colors univer-animate-in univer-fade-in
dark:univer-text-white dark:hover:univer-bg-gray-700 dark:disabled:univer-text-gray-600
disabled:univer-cursor-not-allowed disabled:univer-text-gray-300 disabled:hover:univer-bg-transparent
hover:univer-bg-gray-100
`, {
- 'univer-p-4': noIcon,
+ 'univer-px-2': noIcon,
'!univer-bg-gray-200 dark:!univer-bg-gray-500': active,
})}
style={style}
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 333ceee055..36c4687a55 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -26,8 +26,8 @@ import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { ILayoutService } from '../../../services/layout/layout.service';
import { MenuItemType } from '../../../services/menu/menu';
import { useDependency, useObservable } from '../../../utils/di';
-import { ToolbarButton } from './Button/ToolbarButton';
import { useToolbarItemStatus } from './hook';
+import { ToolbarButton } from './ToolbarButton';
import { DropdownMenuWrapper, TooltipWrapper } from './TooltipButtonWrapper';
export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenuItem>>((props, ref) => {
@@ -43,7 +43,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
commandService.executeCommand(commandId, params);
};
- const { tooltip, shortcut, icon, title, label, id, commandId, type, slot } = props;
+ const { tooltip, shortcut, icon, title, label, id, commandId, type, slot, params } = props;
const tooltipTitle = localeService.t(tooltip ?? '') + (shortcut ? ` (${shortcut})` : '');
@@ -104,6 +104,8 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
if (menuType === MenuItemType.BUTTON_SELECTOR) {
return (
<div
+ data-u-command={id}
+ data-disabled={disabled}
className={clsx(`
univer-group univer-relative univer-flex univer-h-6 univer-cursor-pointer univer-items-center
univer-rounded univer-pr-5 univer-text-sm univer-transition-colors univer-animate-in
@@ -114,7 +116,6 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
'univer-text-gray-900 dark:univer-text-white': !disabled,
'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:univer-text-gray-600': disabled,
})}
- data-disabled={disabled}
>
<div
className={clsx(`
@@ -175,6 +176,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
onOptionSelect={handleSelect}
>
<div
+ data-u-command={id}
className={clsx(`
univer-relative univer-flex univer-h-6 univer-cursor-pointer univer-items-center univer-gap-2
univer-whitespace-nowrap univer-rounded univer-px-1 univer-transition-colors univer-animate-in
@@ -213,10 +215,12 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
return (
<ToolbarButton
+ data-u-command={id}
+ className="univer-text-sm"
noIcon={!icon}
active={activated}
disabled={disabled}
- onClick={() => executeCommand(props.commandId ?? props.id)}
+ onClick={() => executeCommand(props.commandId ?? props.id, value ?? params)}
onDoubleClick={() => props.subId && executeCommand(props.subId)}
>
{isCustomComponent
diff --git a/packages/uniscript/src/controllers/menu.schema.ts b/packages/uniscript/src/controllers/menu.schema.ts
index 175aea5b5a..e7e791fff6 100644
--- a/packages/uniscript/src/controllers/menu.schema.ts
+++ b/packages/uniscript/src/controllers/menu.schema.ts
@@ -22,7 +22,7 @@ import { UniscriptMenuItemFactory } from './menu';
export const menuSchema: MenuSchemaType = {
[RibbonStartGroup.OTHERS]: {
[ToggleScriptPanelOperation.id]: {
- order: 5,
+ order: 2,
menuItemFactory: UniscriptMenuItemFactory,
},
},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index be6bd6f18b..c8f04276b3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,7 @@ settings:
overrides:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
@@ -16,7 +16,7 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: 4.13.0
'@commitlint/cli':
specifier: ^19.8.1
version: 19.8.1(@types/[email protected])([email protected])
@@ -48,8 +48,8 @@ importers:
specifier: ^19.1.3
version: 19.1.3
'@types/react-dom':
- specifier: ^19.1.4
- version: 19.1.4(@types/[email protected])
+ specifier: ^19.1.5
+ version: 19.1.5(@types/[email protected])
'@univerjs-infra/shared':
specifier: workspace:*
version: link:common/shared
@@ -121,7 +121,7 @@ importers:
version: 5.8.3
vitest:
specifier: ^3.1.3
common/shared:
dependencies:
@@ -136,7 +136,7 @@ importers:
'@vitest/coverage-istanbul':
specifier: ^3.1.3
autoprefixer:
specifier: ^10.4.21
version: 10.4.21([email protected])
@@ -178,7 +178,7 @@ importers:
version: 6.2.2
vitest:
specifier: ^3.1.3
devDependencies:
'@types/fs-extra':
specifier: ^11.0.4
@@ -666,7 +666,7 @@ importers:
vitest:
specifier: ^3.1.3
optionalDependencies:
vue:
specifier: '>=3.0.0'
@@ -716,7 +716,7 @@ importers:
vitest:
specifier: ^3.1.3
packages-experimental/uni-formula:
dependencies:
@@ -735,7 +735,7 @@ importers:
vitest:
specifier: ^3.1.3
packages-experimental/uni-formula-ui:
dependencies:
@@ -799,7 +799,7 @@ importers:
vitest:
specifier: ^3.1.3
packages-experimental/uni-sheets-ui:
dependencies:
@@ -857,7 +857,7 @@ importers:
vitest:
specifier: ^3.1.3
packages-experimental/uni-slides-ui:
dependencies:
@@ -906,7 +906,7 @@ importers:
vitest:
specifier: ^3.1.3
packages-experimental/uniui:
dependencies:
@@ -967,7 +967,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/action-recorder:
dependencies:
@@ -1013,7 +1013,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/core:
dependencies:
@@ -1083,7 +1083,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/data-validation:
dependencies:
@@ -1111,28 +1111,28 @@ importers:
vitest:
specifier: ^3.1.3
packages/design:
dependencies:
'@radix-ui/react-dialog':
specifier: ^1.1.13
'@radix-ui/react-dropdown-menu':
specifier: ^2.1.14
'@radix-ui/react-popover':
specifier: ^1.1.13
'@radix-ui/react-separator':
specifier: ^1.1.6
'@radix-ui/react-slot':
specifier: ^1.2.2
version: 1.2.2(@types/[email protected])([email protected])
'@radix-ui/react-tooltip':
specifier: ^1.2.6
'@rc-component/trigger':
specifier: ^2.2.6
@@ -1178,7 +1178,7 @@ importers:
devDependencies:
'@testing-library/react':
specifier: ^16.3.0
'@types/react-grid-layout':
specifier: ^1.3.5
version: 1.3.5
@@ -1214,7 +1214,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs:
dependencies:
@@ -1239,7 +1239,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-drawing:
dependencies:
@@ -1261,7 +1261,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-drawing-ui:
dependencies:
@@ -1319,7 +1319,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-hyper-link:
dependencies:
@@ -1338,7 +1338,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-hyper-link-ui:
dependencies:
@@ -1390,7 +1390,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-mention-ui:
dependencies:
@@ -1433,7 +1433,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-quick-insert-ui:
dependencies:
@@ -1494,7 +1494,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-thread-comment-ui:
dependencies:
@@ -1546,7 +1546,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/docs-ui:
dependencies:
@@ -1582,8 +1582,8 @@ importers:
specifier: ^2.5.2
version: 2.5.2
jsdom:
- specifier: ^24.1.1
- version: 24.1.3
+ specifier: ^26.1.0
+ version: 26.1.0
postcss:
specifier: ^8.5.3
version: 8.5.3
@@ -1604,7 +1604,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/drawing:
dependencies:
@@ -1629,7 +1629,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/drawing-ui:
dependencies:
@@ -1675,7 +1675,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/engine-formula:
dependencies:
@@ -1712,7 +1712,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/engine-numfmt:
devDependencies:
@@ -1727,7 +1727,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/engine-render:
dependencies:
@@ -1767,7 +1767,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/find-replace:
dependencies:
@@ -1810,7 +1810,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/network:
dependencies:
@@ -1832,7 +1832,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/rpc:
dependencies:
@@ -1854,7 +1854,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/rpc-node:
dependencies:
@@ -1879,7 +1879,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets:
dependencies:
@@ -1919,7 +1919,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-conditional-formatting:
dependencies:
@@ -1953,7 +1953,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-conditional-formatting-ui:
dependencies:
@@ -2011,7 +2011,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-crosshair-highlight:
dependencies:
@@ -2060,7 +2060,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-data-validation:
dependencies:
@@ -2097,7 +2097,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-data-validation-ui:
dependencies:
@@ -2164,7 +2164,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-drawing:
dependencies:
@@ -2189,7 +2189,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-drawing-ui:
dependencies:
@@ -2253,7 +2253,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-filter:
dependencies:
@@ -2284,7 +2284,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-filter-ui:
dependencies:
@@ -2342,7 +2342,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-find-replace:
dependencies:
@@ -2376,7 +2376,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-formula:
dependencies:
@@ -2410,7 +2410,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-formula-ui:
dependencies:
@@ -2471,7 +2471,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-graphics:
dependencies:
@@ -2496,7 +2496,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-hyper-link:
dependencies:
@@ -2527,7 +2527,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-hyper-link-ui:
dependencies:
@@ -2594,7 +2594,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-note:
dependencies:
@@ -2619,7 +2619,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-note-ui:
dependencies:
@@ -2658,8 +2658,8 @@ importers:
specifier: ^19.1.3
version: 19.1.3
'@types/react-dom':
- specifier: ^19.1.4
- version: 19.1.4(@types/[email protected])
+ specifier: ^19.1.5
+ version: 19.1.5(@types/[email protected])
postcss:
specifier: ^8.5.3
version: 8.5.3
@@ -2674,7 +2674,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-numfmt:
dependencies:
@@ -2705,7 +2705,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-numfmt-ui:
dependencies:
@@ -2763,7 +2763,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-sort:
dependencies:
@@ -2788,7 +2788,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-sort-ui:
dependencies:
@@ -2843,7 +2843,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-table:
dependencies:
@@ -2868,7 +2868,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-table-ui:
dependencies:
@@ -2929,7 +2929,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-thread-comment:
dependencies:
@@ -2960,7 +2960,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-thread-comment-ui:
dependencies:
@@ -3018,7 +3018,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-ui:
dependencies:
@@ -3085,7 +3085,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/sheets-zen-editor:
dependencies:
@@ -3140,7 +3140,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/slides:
dependencies:
@@ -3162,7 +3162,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/slides-ui:
dependencies:
@@ -3217,7 +3217,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/telemetry:
dependencies:
@@ -3236,7 +3236,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/themes:
devDependencies:
@@ -3267,7 +3267,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/thread-comment-ui:
dependencies:
@@ -3313,7 +3313,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/ui:
dependencies:
@@ -3338,7 +3338,7 @@ importers:
devDependencies:
'@testing-library/react':
specifier: ^16.3.0
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
@@ -3371,7 +3371,7 @@ importers:
vitest:
specifier: ^3.1.3
optionalDependencies:
vue:
specifier: '>=3.0.0'
@@ -3421,7 +3421,7 @@ importers:
vitest:
specifier: ^3.1.3
packages/watermark:
dependencies:
@@ -3446,7 +3446,7 @@ importers:
vitest:
specifier: ^3.1.3
tests/formula-integration:
dependencies:
@@ -3495,7 +3495,7 @@ importers:
version: 5.8.3
vitest:
specifier: ^3.1.3
packages:
@@ -4617,7 +4617,7 @@ packages:
resolution: {integrity: sha512-2JMfHJf/eVnwq+2dewT3C0acmCWD3XiVA1Da+jTDqo342UlU13WvXtqHhG+yJw5JeQmu4ue2eMy6gcEArLBlcw==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4630,7 +4630,7 @@ packages:
resolution: {integrity: sha512-PbhRFK4lIEw9ADonj48tiYWzkllz81TM7KVYyyMMw2cwHO7D5h4XKEblL8NlaRisTK3QTe6tBEhDccFUryxHBQ==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4661,7 +4661,7 @@ packages:
resolution: {integrity: sha512-ARFmqUyhIVS3+riWzwGTe7JLjqwqgnODBUZdqpWar/z1WFs9z76fuOs/2BOWCR+YboRn4/WN9aoaGVwqNRr8VA==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4683,7 +4683,7 @@ packages:
resolution: {integrity: sha512-way197PiTvNp+WBP7svMJasHl+vibhWGQDb6Mgf5mhEWJkgb85z7Lfl9TUdkqpWsf8GRNmoopx9ZxCyDzmgRMQ==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4696,7 +4696,7 @@ packages:
resolution: {integrity: sha512-lzuyNjoWOoaMFE/VC5FnAAYM16JmQA8ZmucOXtlhm2kKR5TSU95YLAueQ4JYuRmUJmBvSqXaVFGIfuukybwZJQ==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4718,7 +4718,7 @@ packages:
resolution: {integrity: sha512-r9zpYNUQY+2jWHWZGyddQLL9YHkM/XvSFHVcWs7bdVuxMAnCwTAuy6Pf47Z4nw7dYcUou1vg/VgjjrrH03VeBw==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4740,7 +4740,7 @@ packages:
resolution: {integrity: sha512-0zSiBAIFq9GSKoSH5PdEaQeRB3RnEGxC+H2P0egtnKoKKLNBH8VBHyVO6/jskhjAezhOIplyRUj7U2lds9A+Yg==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4753,7 +4753,7 @@ packages:
resolution: {integrity: sha512-84uqQV3omKDR076izYgcha6gdpN8m3z6w/AeJ83MSBJYVG/AbOHdLjAgsPZkeC/kt+k64moXFCnio8BbqXszlw==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4766,7 +4766,7 @@ packages:
resolution: {integrity: sha512-7iqXaOWIjDBfIG7aq8CUEeCSsQMLFdn7VEE8TaFz704DtEzpPHR7w/uuzRflvKgltqSAImgcmxQ7fFX3X7wasg==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4779,7 +4779,7 @@ packages:
resolution: {integrity: sha512-hQsTUIn7p7fxCPvao/q6wpbxmCwgLrlz+nOrJgC+RwfZqWY/WN+UMqkXzrtKbPrF82P43eCTl3ekeKuyAQbFeg==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4792,7 +4792,7 @@ packages:
resolution: {integrity: sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4805,7 +4805,7 @@ packages:
resolution: {integrity: sha512-uHa+l/lKfxuDD2zjN/0peM/RhhSmRjr5YWdk/37EnSv1nJ88uvG85DPexSm8HdFQROd2VdERJ6ynXbkCFi+APw==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4818,7 +4818,7 @@ packages:
resolution: {integrity: sha512-ZzrIFnMYHHCNqSNCsuN6l7wlewBEq0O0BCSBkabJMFXVO51LRUTq71gLP1UxFvmrXElqmPjA5VX7IqC9VpazAQ==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4831,7 +4831,7 @@ packages:
resolution: {integrity: sha512-Izof3lPpbCfTM7WDta+LRkz31jem890VjEvpVRoWQNKpDUMMVffuyq854XPGP1KYGWWmjmYvHvPFeocWhFCy1w==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4853,7 +4853,7 @@ packages:
resolution: {integrity: sha512-zYb+9dc9tkoN2JjBDIIPLQtk3gGyz8FMKoqYTb8EMVQ5a5hBcdHPECrsZVI4NpPAUOixhkoqg7Hj5ry5USowfA==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -4929,7 +4929,7 @@ packages:
resolution: {integrity: sha512-ORCmRUbNiZIv6uV5mhFrhsIKw4UX/N3syZtyqvry61tbGm4JlgQuSn0hk5TwCARsCjkcnuRkSdCE3xfb+ADHew==}
peerDependencies:
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -5420,7 +5420,7 @@ packages:
peerDependencies:
'@testing-library/dom': ^10.0.0
'@types/react': ^19.1.3
- '@types/react-dom': ^19.1.4
+ '@types/react-dom': ^19.1.5
react: ^19.1.0
react-dom: ^19.1.0
peerDependenciesMeta:
@@ -5552,8 +5552,8 @@ packages:
resolution: {integrity: sha512-+N+2H39P8X+Hy1I5mC6awlTX54k3FhiUmvt7HWzGJZvF+syUAAxP/stwppS8JE84YHqFgRMv6fCy31202CMFxQ==}
- '@types/[email protected]':
- resolution: {integrity: sha512-WxYAszDYgsMV31OVyoG4jbAgJI1Gw0Xq9V19zwhy6+hUUJlJIdZ3r/cbdmTqFv++SktQkZ/X+46yGFxp5XJBEg==}
+ '@types/[email protected]':
+ resolution: {integrity: sha512-CMCjrWucUBZvohgZxkjd6S9h0nZxXjzus6yDfUb+xLxYM7VvjKNH1tQrE9GWLql1XoOP4/Ds3bwFqShHUYraGg==}
peerDependencies:
'@types/react': ^19.1.3
@@ -8512,11 +8512,11 @@ packages:
resolution: {integrity: sha512-Hicd6JK5Njt2QB6XYFS7ok9e37O8AYk3jTcppG4YVQnYjOemymvTcmc7OWsmq/Qqj5TdRFO5/x/tIPmBeRtGHg==}
engines: {node: '>=12.0.0'}
- resolution: {integrity: sha512-MyL55p3Ut3cXbeBEG7Hcv0mVM8pp8PBNWxRqchZnSfAiES1v1mRnMeFfaHWIPULpwsYfvO+ZmMZz5tGCnjzDUQ==}
+ resolution: {integrity: sha512-Cvc9WUhxSMEo4McES3P7oK3QaXldCfNWp7pl2NNeiIFlCoLr3kfq9kb1fxftiwk1FLV7CvpvDfonxtzUDeSOPg==}
engines: {node: '>=18'}
peerDependencies:
- canvas: ^2.11.2
+ canvas: ^3.0.0
peerDependenciesMeta:
canvas:
optional: true
@@ -9750,9 +9750,6 @@ packages:
resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
- resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==}
-
resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
@@ -9771,9 +9768,6 @@ packages:
resolution: {integrity: sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==}
- resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
-
resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
@@ -10106,9 +10100,6 @@ packages:
resolution: {integrity: sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==}
engines: {node: '>=0.10.5'}
- resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
-
resolution: {integrity: sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==}
@@ -10169,9 +10160,6 @@ packages:
resolution: {integrity: sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==}
engines: {node: '>= 18'}
- resolution: {integrity: sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==}
-
resolution: {integrity: sha512-guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==}
@@ -10685,6 +10673,13 @@ packages:
resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
engines: {node: '>=14.0.0'}
+ resolution: {integrity: sha512-Je6p7pkk+KMzMv2XXKmAE3McmolOQFdxkKw0R8EYNr7sELW46JqnNeTX8ybPiQgvg1ymCoF8LXs5fzFaZvJPTA==}
+
+ resolution: {integrity: sha512-WMi/OQ2axVTf/ykqCQgXiIct+mSQDFdH2fkwhPwgEwvJ1kSzZRiinb0zF2Xb8u4+OqPChmyI6MEu4EezNJz+FQ==}
+ hasBin: true
+
resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
engines: {node: '>=0.6.0'}
@@ -10701,9 +10696,9 @@ packages:
resolution: {integrity: sha512-khrZo4buq4qVmsGzS5yQjKe/WsFvV8fGfOjDQN0q4iy9FjRfPWRgTFrU8u1R2iu/SfWLhY9WnCi4Jhdrcbtg+g==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
- resolution: {integrity: sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==}
- engines: {node: '>=6'}
+ resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
+ engines: {node: '>=16'}
resolution: {integrity: sha512-hdF5ZgjTqgAntKkklYw0R03MG2x/bSzTtkxmIRw/sTNV8YXsCJ1tfLAX23lhxhHJlEf3CRCOCGGWw3vI3GaSPw==}
@@ -10888,10 +10883,6 @@ packages:
resolution: {integrity: sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==}
- resolution: {integrity: sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==}
- engines: {node: '>= 4.0.0'}
-
resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
engines: {node: '>= 10.0.0'}
@@ -10930,9 +10921,6 @@ packages:
resolution: {integrity: sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
-
resolution: {integrity: sha512-oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==}
engines: {node: '>= 0.4'}
@@ -11337,7 +11325,7 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.8
'@jridgewell/trace-mapping': 0.3.25
dependencies:
'@antfu/install-pkg': 1.1.0
'@clack/prompts': 0.10.1
@@ -11346,7 +11334,7 @@ snapshots:
'@stylistic/eslint-plugin': 4.2.0([email protected]([email protected]))([email protected])
'@typescript-eslint/parser': 8.32.0([email protected]([email protected]))([email protected])
ansis: 3.17.0
cac: 6.7.14
eslint: 9.26.0([email protected])
@@ -12538,26 +12526,26 @@ snapshots:
'@radix-ui/[email protected]': {}
dependencies:
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-slot': 1.2.2(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
@@ -12571,18 +12559,18 @@ snapshots:
optionalDependencies:
'@types/react': 19.1.3
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-focus-guards': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-slot': 1.2.2(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
aria-hidden: 1.2.4
@@ -12591,7 +12579,7 @@ snapshots:
react-remove-scroll: 2.6.3(@types/[email protected])([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
@@ -12599,33 +12587,33 @@ snapshots:
optionalDependencies:
'@types/react': 19.1.3
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-use-escape-keydown': 1.1.1(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
@@ -12633,16 +12621,16 @@ snapshots:
optionalDependencies:
'@types/react': 19.1.3
dependencies:
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
@@ -12651,22 +12639,22 @@ snapshots:
optionalDependencies:
'@types/react': 19.1.3
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-focus-guards': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
- '@radix-ui/react-roving-focus': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-roving-focus': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-slot': 1.2.2(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])
aria-hidden: 1.2.4
@@ -12675,21 +12663,21 @@ snapshots:
react-remove-scroll: 2.6.3(@types/[email protected])([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-focus-guards': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-slot': 1.2.2(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
aria-hidden: 1.2.4
@@ -12698,15 +12686,15 @@ snapshots:
react-remove-scroll: 2.6.3(@types/[email protected])([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@floating-ui/react-dom': 2.1.2([email protected]([email protected]))([email protected])
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-use-rect': 1.1.1(@types/[email protected])([email protected])
@@ -12716,19 +12704,19 @@ snapshots:
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-use-layout-effect': 1.1.1(@types/[email protected])([email protected])
@@ -12736,42 +12724,42 @@ snapshots:
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/react-slot': 1.2.2(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-direction': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-use-callback-ref': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
@@ -12780,25 +12768,25 @@ snapshots:
optionalDependencies:
'@types/react': 19.1.3
dependencies:
'@radix-ui/primitive': 1.1.2
'@radix-ui/react-compose-refs': 1.1.2(@types/[email protected])([email protected])
'@radix-ui/react-context': 1.1.2(@types/[email protected])([email protected])
- '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-dismissable-layer': 1.1.9(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
'@radix-ui/react-id': 1.1.1(@types/[email protected])([email protected])
'@radix-ui/react-slot': 1.2.2(@types/[email protected])([email protected])
'@radix-ui/react-use-controllable-state': 1.2.2(@types/[email protected])([email protected])
- '@radix-ui/react-visually-hidden': 1.2.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
+ '@radix-ui/react-visually-hidden': 1.2.2(@types/[email protected](@types/[email protected]))(@types/[email protected])([email protected]([email protected]))([email protected])
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
dependencies:
@@ -12848,14 +12836,14 @@ snapshots:
optionalDependencies:
'@types/react': 19.1.3
dependencies:
react: 19.1.0
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
'@radix-ui/[email protected]': {}
@@ -13410,7 +13398,7 @@ snapshots:
lodash: 4.17.21
redent: 3.0.0
dependencies:
'@babel/runtime': 7.27.1
'@testing-library/dom': 10.4.0
@@ -13418,7 +13406,7 @@ snapshots:
react-dom: 19.1.0([email protected])
optionalDependencies:
'@types/react': 19.1.3
- '@types/react-dom': 19.1.4(@types/[email protected])
+ '@types/react-dom': 19.1.5(@types/[email protected])
'@testing-library/[email protected](@testing-library/[email protected])':
dependencies:
@@ -13548,7 +13536,7 @@ snapshots:
'@types/[email protected]': {}
dependencies:
'@types/react': 19.1.3
@@ -13742,7 +13730,7 @@ snapshots:
vue: 3.5.13([email protected])
dependencies:
'@istanbuljs/schema': 0.1.3
debug: 4.4.0
@@ -13754,17 +13742,17 @@ snapshots:
magicast: 0.3.5
test-exclude: 7.0.1
tinyrainbow: 2.0.0
transitivePeerDependencies:
- supports-color
dependencies:
'@typescript-eslint/utils': 8.32.0([email protected]([email protected]))([email protected])
eslint: 9.26.0([email protected])
optionalDependencies:
typescript: 5.8.3
'@vitest/[email protected]':
dependencies:
@@ -16855,22 +16843,21 @@ snapshots:
dependencies:
cssstyle: 4.3.1
data-urls: 5.0.0
decimal.js: 10.5.0
- form-data: 4.0.2
html-encoding-sniffer: 4.0.0
http-proxy-agent: 7.0.2
https-proxy-agent: 7.0.6
is-potential-custom-element-name: 1.0.1
nwsapi: 2.2.20
parse5: 7.3.0
- rrweb-cssom: 0.7.1
+ rrweb-cssom: 0.8.0
saxes: 6.0.0
symbol-tree: 3.2.4
- tough-cookie: 4.1.4
+ tough-cookie: 5.1.2
w3c-xmlserializer: 5.0.0
webidl-conversions: 7.0.0
whatwg-encoding: 3.1.1
@@ -18344,10 +18331,6 @@ snapshots:
- dependencies:
- punycode: 2.3.1
-
@@ -18362,8 +18345,6 @@ snapshots:
-
@@ -18786,8 +18767,6 @@ snapshots:
-
@@ -18869,8 +18848,6 @@ snapshots:
transitivePeerDependencies:
- supports-color
-
@@ -19449,6 +19426,12 @@ snapshots:
+
+ dependencies:
+ tldts-core: 6.1.86
+
dependencies:
os-tmpdir: 1.0.2
@@ -19463,12 +19446,9 @@ snapshots:
dependencies:
eslint-visitor-keys: 3.4.3
dependencies:
- psl: 1.15.0
- punycode: 2.3.1
- universalify: 0.2.0
- url-parse: 1.5.10
+ tldts: 6.1.86
dependencies:
@@ -19651,8 +19631,6 @@ snapshots:
-
@@ -19716,11 +19694,6 @@ snapshots:
- dependencies:
- querystringify: 2.2.0
- requires-port: 1.0.0
-
dependencies:
punycode: 1.4.1
@@ -19839,7 +19812,7 @@ snapshots:
tsx: 4.19.4
yaml: 2.7.1
dependencies:
'@vitest/expect': 3.1.3
@@ -19866,7 +19839,7 @@ snapshots:
'@types/debug': 4.1.12
'@types/node': 22.15.17
happy-dom: 17.4.7
- jsdom: 24.1.3
+ jsdom: 26.1.0
transitivePeerDependencies:
- jiti
- less