diff --git a/common/shared/package.json b/common/shared/package.json index 3d7260c159..44cb5321e8 100644 --- a/common/shared/package.json +++ b/common/shared/package.json @@ -25,7 +25,7 @@ }, "dependencies": { "@typescript-eslint/parser": "^8.30.1", - "@vitejs/plugin-react": "^4.3.4", + "@vitejs/plugin-react": "^4.4.0", "@vitejs/plugin-vue": "^5.2.3", "@vitest/coverage-istanbul": "^3.1.1", "autoprefixer": "^10.4.21", @@ -37,9 +37,10 @@ "sort-keys": "^5.1.0", "tailwind-scrollbar": "^3.1.0", "tailwindcss": "^3.4.17", - "vite": "^6.3.0", + "tailwindcss-rem-to-px": "^0.1.1", + "vite": "^6.3.2", "vite-plugin-dts": "^4.5.3", - "vite-plugin-external": "^6.1.0", + "vite-plugin-external": "^6.2.1", "vitest": "^3.1.1" }, "devDependencies": { diff --git a/common/shared/tailwind/tailwind.config.ts b/common/shared/tailwind/tailwind.config.ts index 9173c0ace1..6ce375b55c 100644 --- a/common/shared/tailwind/tailwind.config.ts +++ b/common/shared/tailwind/tailwind.config.ts @@ -16,6 +16,7 @@ import type { Config } from 'tailwindcss'; import scrollbar from 'tailwind-scrollbar'; +import remToPx from 'tailwindcss-rem-to-px'; const config: Omit = { prefix: 'univer-', @@ -159,10 +160,18 @@ const config: Omit = { 900: '#751A3D', }, }, + boxShadow: { + sm: '0px 1px 2px 0px rgba(30, 40, 77, 0.08)', + md: '0px 1px 6px -2px rgba(30, 40, 77, 0.08), 0px 2px 6px -1px rgba(30, 40, 77, 0.10)', + lg: '0px 4px 6px 0px rgba(30, 40, 77, 0.05), 0px 10px 15px -3px rgba(30, 40, 77, 0.10)', + xl: '0px 10px 10px 0px rgba(30, 40, 77, 0.04), 0px 20px 24px -5px rgba(30, 40, 77, 0.10)', + '2xl': '0px 24px 50px -12px rgba(30, 40, 77, 0.24)', + }, }, }, plugins: [ scrollbar, + remToPx, ], }; 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 c9404ce136..b75c3f2057 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 fd52d05fd7..9bb39fdd9a 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 1d0892d0f6..a4085d5ec2 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 81bc8b65e1..ed0941fbd4 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-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 e8480434df..f9f987a6bc 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/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 780f2be236..f9f987a6bc 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/examples/src/sheets/main.ts b/examples/src/sheets/main.ts index ff24b0982f..421aabed51 100644 --- a/examples/src/sheets/main.ts +++ b/examples/src/sheets/main.ts @@ -138,7 +138,11 @@ function createNewInstance() { // If we are running in e2e platform, we should immediately register the debugger plugin. if (IS_E2E) { - univer.registerPlugin(UniverDebuggerPlugin); + univer.registerPlugin(UniverDebuggerPlugin, { + performanceMonitor: { + enabled: false, + }, + }); } const injector = univer.__getInjector(); diff --git a/package.json b/package.json index 1862440741..4eea134931 100644 --- a/package.json +++ b/package.json @@ -49,19 +49,19 @@ "@antfu/eslint-config": "4.12.0", "@commitlint/cli": "^19.8.0", "@commitlint/config-conventional": "^19.8.0", - "@eslint-react/eslint-plugin": "^1.47.3", - "@playwright/test": "^1.51.1", + "@eslint-react/eslint-plugin": "^1.48.4", + "@playwright/test": "^1.52.0", "@release-it-plugins/workspaces": "^4.2.0", "@release-it/conventional-changelog": "^9.0.4", "@storybook/react": "8.6.12", "@types/fs-extra": "^11.0.4", - "@types/node": "^22.14.0", - "@types/react": "^19.1.0", + "@types/node": "^22.14.1", + "@types/react": "^19.1.2", "@types/react-dom": "^19.1.2", "@univerjs-infra/shared": "workspace:*", "@univerjs/design": "workspace:*", - "@vitejs/plugin-react": "^4.3.4", - "eslint": "9.24.0", + "@vitejs/plugin-react": "^4.4.0", + "eslint": "9.25.0", "eslint-plugin-format": "^1.0.1", "eslint-plugin-header": "^3.1.1", "eslint-plugin-jsdoc": "^50.6.9", @@ -73,7 +73,7 @@ "fs-extra": "^11.3.0", "husky": "^9.1.7", "lint-staged": "^15.5.1", - "posthog-node": "^4.11.5", + "posthog-node": "^4.12.0", "react": "19.1.0", "react-dom": "19.1.0", "release-it": "^17.11.0", diff --git a/packages-experimental/action-recorder/package.json b/packages-experimental/action-recorder/package.json index 2588cad367..b912f7f0d4 100644 --- a/packages-experimental/action-recorder/package.json +++ b/packages-experimental/action-recorder/package.json @@ -81,7 +81,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.json index 6ffac45649..b8bc4eec67 100644 --- a/packages-experimental/debugger/package.json +++ b/packages-experimental/debugger/package.json @@ -85,7 +85,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1", "vue": "^3.5.13" } diff --git a/packages-experimental/debugger/src/commands/operations/confirm.operation.ts b/packages-experimental/debugger/src/commands/operations/confirm.operation.ts index d18f3ecfd4..73b56a261f 100644 --- a/packages-experimental/debugger/src/commands/operations/confirm.operation.ts +++ b/packages-experimental/debugger/src/commands/operations/confirm.operation.ts @@ -14,9 +14,9 @@ * limitations under the License. */ +import type { IAccessor, ICommand } from '@univerjs/core'; import { CommandType } from '@univerjs/core'; import { IConfirmService } from '@univerjs/ui'; -import type { IAccessor, ICommand } from '@univerjs/core'; export interface IUIComponentCommandParams { value: string; diff --git a/packages-experimental/debugger/src/commands/operations/dialog.operation.ts b/packages-experimental/debugger/src/commands/operations/dialog.operation.ts index ed68dad8bd..33c9d2ba9c 100644 --- a/packages-experimental/debugger/src/commands/operations/dialog.operation.ts +++ b/packages-experimental/debugger/src/commands/operations/dialog.operation.ts @@ -14,9 +14,9 @@ * limitations under the License. */ +import type { IAccessor, ICommand } from '@univerjs/core'; import { CommandType } from '@univerjs/core'; import { IDialogService } from '@univerjs/ui'; -import type { IAccessor, ICommand } from '@univerjs/core'; export interface IUIComponentCommandParams { value: string; @@ -39,7 +39,12 @@ export const DialogOperation: ICommand = { preservePositionOnDestroy: true, width: 350, onClose() { - dialogService.close('draggable'); + // dialogService.close('draggable'); + }, + onOpenChange(open: boolean) { + if (!open) { + dialogService.close('draggable'); + } }, }); } else { @@ -50,7 +55,12 @@ export const DialogOperation: ICommand = { title: { title: 'Dialog Title' }, draggable: false, onClose() { - dialogService.close('dialog1'); + // dialogService.close('dialog1'); + }, + onOpenChange(open: boolean) { + if (!open) { + dialogService.close('dialog1'); + } }, }); } diff --git a/packages-experimental/debugger/src/controllers/config.schema.ts b/packages-experimental/debugger/src/controllers/config.schema.ts index 75d2dc9527..8041c73507 100644 --- a/packages-experimental/debugger/src/controllers/config.schema.ts +++ b/packages-experimental/debugger/src/controllers/config.schema.ts @@ -22,6 +22,9 @@ export const configSymbol = Symbol(DEBUGGER_PLUGIN_CONFIG_KEY); export interface IUniverDebuggerConfig { menu?: MenuConfig; + performanceMonitor?: { + enabled: boolean; + }; } export const defaultPluginConfig: IUniverDebuggerConfig = {}; diff --git a/packages-experimental/debugger/src/plugin.ts b/packages-experimental/debugger/src/plugin.ts index b11c2f8732..5b569dda62 100644 --- a/packages-experimental/debugger/src/plugin.ts +++ b/packages-experimental/debugger/src/plugin.ts @@ -14,6 +14,7 @@ * limitations under the License. */ +import type { Dependency } from '@univerjs/core'; import type { IUniverDebuggerConfig } from './controllers/config.schema'; import { IConfigService, Inject, Injector, merge, Plugin, registerDependencies, touchDependencies } from '@univerjs/core'; import { DEBUGGER_PLUGIN_CONFIG_KEY, defaultPluginConfig } from './controllers/config.schema'; @@ -49,14 +50,17 @@ export class UniverDebuggerPlugin extends Plugin { } override onStarting(): void { - registerDependencies(this._injector, [ - [PerformanceMonitorController], + const dependencies: Dependency[] = [ [DarkModeController], [DebuggerController], [MultiUnitsController], [E2EController], [UniverWatermarkMenuController], - ]); + ]; + if (this._config.performanceMonitor?.enabled !== false) { + dependencies.push([PerformanceMonitorController]); + } + registerDependencies(this._injector, dependencies); touchDependencies(this._injector, [ [E2EController], diff --git a/packages-experimental/sheets-source-binding/package.json b/packages-experimental/sheets-source-binding/package.json index 6e95db435f..ff4c3a42aa 100644 --- a/packages-experimental/sheets-source-binding/package.json +++ b/packages-experimental/sheets-source-binding/package.json @@ -77,7 +77,7 @@ "@univerjs-infra/shared": "workspace:*", "rxjs": "^7.8.1", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/uni-docs-ui/package.json b/packages-experimental/uni-docs-ui/package.json index 4623fe8d9d..9e1b4c39b3 100644 --- a/packages-experimental/uni-docs-ui/package.json +++ b/packages-experimental/uni-docs-ui/package.json @@ -73,7 +73,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.json index 17042e975a..c4dbfbd2da 100644 --- a/packages-experimental/uni-formula-ui/package.json +++ b/packages-experimental/uni-formula-ui/package.json @@ -86,7 +86,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/uni-formula/package.json b/packages-experimental/uni-formula/package.json index 3dcd2c9ba3..dda9284568 100644 --- a/packages-experimental/uni-formula/package.json +++ b/packages-experimental/uni-formula/package.json @@ -61,7 +61,7 @@ "devDependencies": { "@univerjs-infra/shared": "workspace:*", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.json index f6423b86a0..d8d340be27 100644 --- a/packages-experimental/uni-sheets-ui/package.json +++ b/packages-experimental/uni-sheets-ui/package.json @@ -78,7 +78,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.json index 7e881f1319..53d12bb7ec 100644 --- a/packages-experimental/uni-slides-ui/package.json +++ b/packages-experimental/uni-slides-ui/package.json @@ -75,7 +75,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.json index dfd82f2cf0..49a16604d5 100644 --- a/packages-experimental/uniui/package.json +++ b/packages-experimental/uniui/package.json @@ -80,7 +80,7 @@ "rxjs": "^7.8.1", "tailwindcss": "^3.4.17", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages/core/package.json b/packages/core/package.json index 819db22305..f2fef5e26c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -94,7 +94,7 @@ "@univerjs-infra/shared": "workspace:*", "rxjs": "^7.8.1", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json index cc5b74d41a..1d1371e184 100644 --- a/packages/data-validation/package.json +++ b/packages/data-validation/package.json @@ -70,7 +70,7 @@ "@univerjs/sheets": "workspace:*", "rxjs": "^7.8.1", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages/design/package.json b/packages/design/package.json index 9084a567f1..ec705137ce 100644 --- a/packages/design/package.json +++ b/packages/design/package.json @@ -68,23 +68,22 @@ "react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" }, "dependencies": { - "@radix-ui/react-dropdown-menu": "^2.1.7", - "@radix-ui/react-popover": "^1.1.7", - "@radix-ui/react-separator": "^1.1.3", + "@radix-ui/react-dialog": "^1.1.10", + "@radix-ui/react-dropdown-menu": "^2.1.10", + "@radix-ui/react-popover": "^1.1.10", + "@radix-ui/react-separator": "^1.1.4", "@radix-ui/react-slot": "^1.2.0", - "@radix-ui/react-tooltip": "^1.2.0", + "@radix-ui/react-tooltip": "^1.2.3", "@rc-component/trigger": "^2.2.6", "@univerjs/icons": "^0.3.2", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "dayjs": "^1.11.13", - "rc-dialog": "^9.6.0", "rc-dropdown": "^4.2.1", "rc-menu": "^9.16.0", "rc-picker": "^4.9.0", "rc-select": "^14.16.4", "rc-virtual-list": "^3.16.1", - "react-draggable": "^4.4.6", "react-grid-layout": "^1.5.1", "react-transition-group": "^4.4.5", "tailwind-merge": "^3.2.0" @@ -102,7 +101,7 @@ "tailwindcss": "^3.4.17", "tailwindcss-animate": "^1.0.7", "typescript": "^5.8.3", - "vite": "^6.3.0", + "vite": "^6.3.2", "vitest": "^3.1.1" } } diff --git a/packages/design/src/components/button/Button.tsx b/packages/design/src/components/button/Button.tsx index c98333fdf1..44f6598711 100644 --- a/packages/design/src/components/button/Button.tsx +++ b/packages/design/src/components/button/Button.tsx @@ -89,3 +89,5 @@ export const Button = forwardRef( ); } ); + +Button.displayName = 'Button'; diff --git a/packages/design/src/components/confirm/Confirm.tsx b/packages/design/src/components/confirm/Confirm.tsx index f562398f09..7161136df9 100644 --- a/packages/design/src/components/confirm/Confirm.tsx +++ b/packages/design/src/components/confirm/Confirm.tsx @@ -20,7 +20,6 @@ import React, { useContext } from 'react'; import { Button } from '../button/Button'; import { ConfigContext } from '../config-provider/ConfigProvider'; import { Dialog } from '../dialog/Dialog'; -import styles from './index.module.less'; export interface IConfirmProps { children: React.ReactNode; @@ -67,7 +66,7 @@ function Footer(props: { locale: ILocale['design']; cancelText?: string; confirm const { locale, cancelText, confirmText, onClose, onConfirm } = props; return ( -