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.

refactor(sheets-conditional-formatting): migrate styles from LESS to Tailwind CSS (#5133)

白熱ee12da274ea3
diff --git a/common/shared/package.json b/common/shared/package.json
index 73ccf8e57a..71cd67cfc7 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -24,7 +24,7 @@
"univer-cli": "bin/index.ts"
},
"dependencies": {
- "@typescript-eslint/parser": "^8.31.0",
+ "@typescript-eslint/parser": "^8.31.1",
"@vitejs/plugin-react": "^4.4.1",
"@vitejs/plugin-vue": "^5.2.3",
"@vitest/coverage-istanbul": "^3.1.2",
@@ -38,7 +38,7 @@
"tailwind-scrollbar": "^3.1.0",
"tailwindcss": "^3.4.17",
"tailwindcss-rem-to-px": "^0.1.1",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vite-plugin-dts": "^4.5.3",
"vite-plugin-external": "^6.2.1",
"vitest": "^3.1.2"
@@ -46,7 +46,7 @@
"devDependencies": {
"@types/fs-extra": "^11.0.4",
"@univerjs/icons": "^0.3.24",
- "@univerjs/icons-svg": "^0.3.22",
+ "@univerjs/icons-svg": "^0.3.24",
"@univerjs/protocol": "0.1.45"
}
}
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 15b33a296e..6468716fb0 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 96ee659d06..d6a0e89299 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-fullpage-ci-chromium-linux.png b/e2e/visual-comparison/sheets/sheets-visual-comparison.spec.ts-snapshots/default-sheet-fullpage-ci-chromium-linux.png
index a3751bded9..03e06c1b49 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/package.json b/examples/package.json
index 53fce71212..00468bd243 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -27,7 +27,6 @@
"@univerjs/docs-drawing-ui": "workspace:*",
"@univerjs/docs-hyper-link-ui": "workspace:*",
"@univerjs/docs-mention-ui": "workspace:*",
-
"@univerjs/docs-quick-insert-ui": "workspace:*",
"@univerjs/docs-thread-comment-ui": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
@@ -36,7 +35,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/find-replace": "workspace:*",
- "@univerjs/icons": "0.3.23",
+ "@univerjs/icons": "0.3.24",
"@univerjs/mockdata": "workspace:*",
"@univerjs/network": "workspace:*",
"@univerjs/rpc": "workspace:*",
diff --git a/package.json b/package.json
index 9f02100619..8020fb5431 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
"@types/fs-extra": "^11.0.4",
"@types/node": "^22.15.3",
"@types/react": "^19.1.2",
- "@types/react-dom": "^19.1.2",
+ "@types/react-dom": "^19.1.3",
"@univerjs-infra/shared": "workspace:*",
"@univerjs/design": "workspace:*",
"@vitejs/plugin-react": "^4.4.1",
@@ -72,7 +72,7 @@
"fs-extra": "^11.3.0",
"husky": "^9.1.7",
"lint-staged": "^15.5.1",
- "posthog-node": "^4.14.0",
+ "posthog-node": "^4.15.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 c73998499f..ad0f3f7d81 100644
--- a/packages-experimental/action-recorder/package.json
+++ b/packages-experimental/action-recorder/package.json
@@ -80,7 +80,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.json
index c5938a6004..2354700032 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2",
"vue": "^3.5.13"
}
diff --git a/packages-experimental/sheets-source-binding/package.json b/packages-experimental/sheets-source-binding/package.json
index 3cd7662a51..e57b53f0b7 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/uni-docs-ui/package.json b/packages-experimental/uni-docs-ui/package.json
index aad01ef756..72076fff79 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.json
index 9cb7898a0e..d4e701a1d1 100644
--- a/packages-experimental/uni-formula-ui/package.json
+++ b/packages-experimental/uni-formula-ui/package.json
@@ -85,7 +85,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/uni-formula/package.json b/packages-experimental/uni-formula/package.json
index 8e0f6a31fe..fe81c9a4ca 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.json
index cfa3191b23..4aafdb03c8 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.json
index 42a142b69a..5c802c88ff 100644
--- a/packages-experimental/uni-slides-ui/package.json
+++ b/packages-experimental/uni-slides-ui/package.json
@@ -74,7 +74,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.json
index 716b8c27c0..53c43f3bee 100644
--- a/packages-experimental/uniui/package.json
+++ b/packages-experimental/uniui/package.json
@@ -79,7 +79,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/core/package.json b/packages/core/package.json
index ad41c97272..854258aace 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json
index 38e9c81281..02646986d1 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.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/design/package.json b/packages/design/package.json
index 387ca71a4f..2d51a935de 100644
--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -102,7 +102,7 @@
"tailwindcss": "^3.4.17",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.json
index e981acf037..cb51d60a30 100644
--- a/packages/docs-drawing-ui/package.json
+++ b/packages/docs-drawing-ui/package.json
@@ -85,7 +85,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-drawing/package.json b/packages/docs-drawing/package.json
index 90e630ea6b..3fc0694e2e 100644
--- a/packages/docs-drawing/package.json
+++ b/packages/docs-drawing/package.json
@@ -62,7 +62,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json
index 75f1bd7c2a..30ae6a11bb 100644
--- a/packages/docs-hyper-link-ui/package.json
+++ b/packages/docs-hyper-link-ui/package.json
@@ -82,7 +82,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-hyper-link/package.json b/packages/docs-hyper-link/package.json
index d4940f3ebb..a318add5c6 100644
--- a/packages/docs-hyper-link/package.json
+++ b/packages/docs-hyper-link/package.json
@@ -61,7 +61,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-mention-ui/package.json b/packages/docs-mention-ui/package.json
index fad07b452a..a2171a29d2 100644
--- a/packages/docs-mention-ui/package.json
+++ b/packages/docs-mention-ui/package.json
@@ -75,7 +75,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-quick-insert-ui/package.json b/packages/docs-quick-insert-ui/package.json
index befa63fea0..ec0a9038f1 100644
--- a/packages/docs-quick-insert-ui/package.json
+++ b/packages/docs-quick-insert-ui/package.json
@@ -85,7 +85,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json
index e8834ecfa5..92b41b95a3 100644
--- a/packages/docs-thread-comment-ui/package.json
+++ b/packages/docs-thread-comment-ui/package.json
@@ -76,7 +76,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index 99eb52f590..a064f9fb38 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -97,7 +97,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/docs-ui/src/views/count-bar/CountBar.tsx b/packages/docs-ui/src/views/count-bar/CountBar.tsx
index 838df4f97b..41bdacfd64 100644
--- a/packages/docs-ui/src/views/count-bar/CountBar.tsx
+++ b/packages/docs-ui/src/views/count-bar/CountBar.tsx
@@ -24,7 +24,7 @@ interface ICountBarProps {
export function CountBar(_props: ICountBarProps) {
return (
- <section className="univer-flex univer-flex-shrink-0 univer-flex-grow-0 univer-basis-[260px] univer-justify-end">
+ <section className="univer-flex univer-flex-shrink-0 univer-justify-end">
<ZoomSlider />
</section>
);
diff --git a/packages/docs/package.json b/packages/docs/package.json
index 09a6315798..e598188212 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -68,7 +68,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index 58c1530cc0..37d76122a5 100644
--- a/packages/drawing-ui/package.json
+++ b/packages/drawing-ui/package.json
@@ -81,7 +81,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/drawing/package.json b/packages/drawing/package.json
index 274cc68bca..0955cf3867 100644
--- a/packages/drawing/package.json
+++ b/packages/drawing/package.json
@@ -66,7 +66,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/engine-formula/package.json b/packages/engine-formula/package.json
index 3cfaa1c1ef..580f5cfd66 100644
--- a/packages/engine-formula/package.json
+++ b/packages/engine-formula/package.json
@@ -83,7 +83,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/engine-numfmt/package.json b/packages/engine-numfmt/package.json
index 123c4050dc..03b114481b 100644
--- a/packages/engine-numfmt/package.json
+++ b/packages/engine-numfmt/package.json
@@ -60,7 +60,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/engine-render/package.json b/packages/engine-render/package.json
index 548f1a464b..debf0cbfbb 100644
--- a/packages/engine-render/package.json
+++ b/packages/engine-render/package.json
@@ -73,7 +73,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
},
"browser": {
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index b64cda7b04..52ed0f493c 100644
--- a/packages/find-replace/package.json
+++ b/packages/find-replace/package.json
@@ -81,7 +81,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/network/package.json b/packages/network/package.json
index bc9386654c..3d48ad3c0c 100644
--- a/packages/network/package.json
+++ b/packages/network/package.json
@@ -77,7 +77,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/rpc-node/package.json b/packages/rpc-node/package.json
index df967308a1..ff4fb848e0 100644
--- a/packages/rpc-node/package.json
+++ b/packages/rpc-node/package.json
@@ -66,7 +66,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/rpc/package.json b/packages/rpc/package.json
index 74f1073cc7..49b7013e29 100644
--- a/packages/rpc/package.json
+++ b/packages/rpc/package.json
@@ -66,7 +66,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index f8a8603f0c..9a609ed282 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -85,13 +85,12 @@
"devDependencies": {
"@types/react-grid-layout": "^1.3.5",
"@univerjs-infra/shared": "workspace:*",
- "less": "^4.3.0",
"postcss": "^8.5.3",
"react": "18.3.1",
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.module.less b/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.module.less
deleted file mode 100644
index 8172758083..0000000000
--- a/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.module.less
+++ /dev/null
@@ -1,18 +0,0 @@
-.cf-style-edit {
- display: flex;
- justify-content: space-between;
- margin: 10px 0px;
- .button-item {
- cursor: pointer;
- border-radius: var(--border-radius-base);
- display: flex;
- align-items: center;
- padding: 0px 3px;
- &:hover {
- background-color: rgb(var(--grey-100));
- }
- }
- .isActive {
- background-color: rgb(var(--grey-100));
- }
-}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx
index 5edde0611a..4bb494ef53 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/conditional-style-editor/index.tsx
@@ -21,7 +21,6 @@ import { removeUndefinedAttr } from '@univerjs/sheets-conditional-formatting';
import { ComponentManager, useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
import { ColorPicker } from '../color-picker';
-import styles from './index.module.less';
interface IConditionalStyleEditorProps {
className?: string;
@@ -101,13 +100,16 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
}
onChange(removeUndefinedAttr(resultStyle));
}, [isBold, isItalic, isUnderline, isStrikethrough, fontColor, bgColor]);
+
+ const buttonItemClassName = 'univer-flex univer-cursor-pointer univer-items-center univer-rounded univer-px-1';
+
return (
- <div
- className={clsx(styles.cfStyleEdit, className)}
- >
+ <div className={clsx('univer-my-2.5 univer-flex univer-justify-between', className)}>
{BoldSingleIcon && (
<div
- className={clsx({ [styles.isActive]: getBooleanFromNumber(isBold || BooleanNumber.FALSE) }, styles.buttonItem)}
+ className={clsx(buttonItemClassName, {
+ 'univer-bg-gray-100': getBooleanFromNumber(isBold || BooleanNumber.FALSE),
+ })}
onClick={() => isBoldSet(getAnotherBooleanNumber(isBold))}
>
<BoldSingleIcon />
@@ -115,7 +117,9 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
)}
{ItalicSingleIcon && (
<div
- className={clsx({ [styles.isActive]: getBooleanFromNumber(isItalic || BooleanNumber.FALSE) }, styles.buttonItem)}
+ className={clsx(buttonItemClassName, {
+ 'univer-bg-gray-100': getBooleanFromNumber(isItalic || BooleanNumber.FALSE),
+ })}
onClick={() => isItalicSet(getAnotherBooleanNumber(isItalic))}
>
<ItalicSingleIcon />
@@ -123,7 +127,9 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
)}
{UnderlineSingleIcon && (
<div
- className={clsx({ [styles.isActive]: getBooleanFromNumber(isUnderline || BooleanNumber.FALSE) }, styles.buttonItem)}
+ className={clsx(buttonItemClassName, {
+ 'univer-bg-gray-100': getBooleanFromNumber(isUnderline || BooleanNumber.FALSE),
+ })}
onClick={() => isUnderlineSet(getAnotherBooleanNumber(isUnderline))}
>
<UnderlineSingleIcon />
@@ -131,7 +137,9 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
)}
{StrikethroughSingle && (
<div
- className={clsx({ [styles.isActive]: getBooleanFromNumber(isStrikethrough || BooleanNumber.FALSE) }, styles.buttonItem)}
+ className={clsx(buttonItemClassName, {
+ 'univer-bg-gray-100': getBooleanFromNumber(isStrikethrough || BooleanNumber.FALSE),
+ })}
onClick={() => isStrikethroughSet(getAnotherBooleanNumber(isStrikethrough))}
>
<StrikethroughSingle />
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/index.module.less b/packages/sheets-conditional-formatting-ui/src/components/panel/index.module.less
deleted file mode 100644
index fbf9e71a2d..0000000000
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/index.module.less
+++ /dev/null
@@ -1,45 +0,0 @@
-.conditional-formatting-wrap {
- height: 100%;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
-
- .cf-rule-item {
- display: flex;
- justify-content: space-between;
- align-items: center;
- .preview {
- flex-shrink: 0;
- }
- }
- .create-rule {
- margin-bottom: 20px;
- .button {
- border: 1px solid rgb(var(--border-color));
- border-radius: var(--border-radius-base);
- display: flex;
- align-items: center;
- justify-content: center;
- padding: var(--padding-base);
- cursor: pointer;
- font-size: var(--font-size-sm);
- }
- }
- .title {
- margin-top: var(--margin-base);
- font-size: 15px;
- color: rgb(var(--text-color-secondary));
- }
- .label {
- font-size: 12px;
- margin-top: var(--margin-sm);
- color: rgb(var(--text-color-secondary));
- }
- .label-container {
- display: flex;
- align-items: center;
- .input-width {
- width: 100px;
- }
- }
-}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx
index 37493f2b9f..2fb6aa95dd 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/index.tsx
@@ -14,11 +14,10 @@
* limitations under the License.
*/
-import React, { useState } from 'react';
import type { IConditionFormattingRule } from '@univerjs/sheets-conditional-formatting';
-import styles from './index.module.less';
-import { RuleList } from './rule-list';
+import { useState } from 'react';
import { RuleEdit } from './rule-edit';
+import { RuleList } from './rule-list';
interface IConditionFormattingPanelProps { rule?: IConditionFormattingRule };
@@ -41,7 +40,7 @@ export const ConditionFormattingPanel = (props: IConditionFormattingPanelProps)
};
return (
- <div className={styles.conditionalFormattingWrap}>
+ <div className="univer-flex univer-h-full univer-flex-col univer-justify-between">
{isShowRuleEditor
? (
<RuleEdit onCancel={handleCancel} rule={currentEditRule} />
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
index 0b5e344edd..1c7a2a1654 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/ColorScale.tsx
@@ -19,15 +19,14 @@ import type { IColorScale, IConditionalFormattingRuleConfig } from '@univerjs/sh
import type { IFormulaEditorRef } from '@univerjs/sheets-formula-ui';
import type { IStyleEditorProps } from './type';
import { IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
-import { clsx, InputNumber, Select } from '@univerjs/design';
+import { InputNumber, Select } from '@univerjs/design';
import { CFRuleType, CFValueType, createDefaultValueByValueType } from '@univerjs/sheets-conditional-formatting';
import { FormulaEditor } from '@univerjs/sheets-formula-ui';
import { useDependency, useSidebarClick } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
import { ColorPicker } from '../../color-picker';
import { Preview } from '../../preview';
-import stylesBase from '../index.module.less';
-import styles from './index.module.less';
+import { previewClassName } from './styles';
const createOptionItem = (text: string, localeService: LocaleService) => ({ label: localeService.t(`sheet.cf.valueType.${text}`), value: text });
@@ -57,16 +56,16 @@ const TextInput = (props: { id: string; type: CFValueType | 'none'; value: numbe
}, [type]);
const formulaEditorRef = useRef<IFormulaEditorRef>(null);
- const [isFocusFormulaEditor, isFocusFormulaEditorSet] = useState(false);
+ const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
useSidebarClick((e: MouseEvent) => {
const isOutSide = formulaEditorRef.current?.isClickOutSide(e);
- isOutSide && isFocusFormulaEditorSet(false);
+ isOutSide && setIsFocusFormulaEditor(false);
});
if (type === CFValueType.formula) {
return (
- <div style={{ width: '100%', marginLeft: 4 }}>
+ <div className="univer-ml-1 univer-w-full">
<FormulaEditor
initValue={formulaInitValue as any}
unitId={unitId}
@@ -76,7 +75,7 @@ const TextInput = (props: { id: string; type: CFValueType | 'none'; value: numbe
const formula = v || '';
onChange(formula);
}}
- onFocus={() => isFocusFormulaEditorSet(true)}
+ onFocus={() => setIsFocusFormulaEditor(true)}
ref={formulaEditorRef}
/>
</div>
@@ -95,14 +94,14 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
const medianOptions = [createOptionItem('none', localeService), ...commonOptions];
const maxOptions = [createOptionItem(CFValueType.max, localeService), ...commonOptions];
- const [minType, minTypeSet] = useState(() => {
+ const [minType, setMinType] = useState(() => {
const defaultV = CFValueType.min;
if (!rule) {
return defaultV;
}
return rule.config[0]?.value.type || defaultV;
});
- const [medianType, medianTypeSet] = useState<CFValueType | 'none'>(() => {
+ const [medianType, setMedianType] = useState<CFValueType | 'none'>(() => {
const defaultV = 'none';
if (!rule) {
return defaultV;
@@ -112,7 +111,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
}
return rule.config[1]?.value.type || defaultV;
});
- const [maxType, maxTypeSet] = useState(() => {
+ const [maxType, setMaxType] = useState(() => {
const defaultV = CFValueType.max;
if (!rule) {
return defaultV;
@@ -120,7 +119,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
return rule.config[rule.config.length - 1]?.value.type || defaultV;
});
- const [minValue, minValueSet] = useState(() => {
+ const [minValue, setMinValue] = useState(() => {
const defaultV = 10;
if (!rule) {
return defaultV;
@@ -128,7 +127,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
const valueConfig = rule.config[0];
return valueConfig?.value.value === undefined ? defaultV : valueConfig?.value.value;
});
- const [medianValue, medianValueSet] = useState(() => {
+ const [medianValue, setMedianValue] = useState(() => {
const defaultV = 50;
if (!rule) {
return defaultV;
@@ -139,7 +138,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
const v = rule.config[1]?.value.value;
return v === undefined ? defaultV : v;
});
- const [maxValue, maxValueSet] = useState(() => {
+ const [maxValue, setMaxValue] = useState(() => {
const defaultV = 90;
if (!rule) {
return defaultV;
@@ -148,14 +147,14 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
return v === undefined ? defaultV : v;
});
- const [minColor, minColorSet] = useState(() => {
+ const [minColor, setMinColor] = useState(() => {
const defaultV = '#d0d9fb';
if (!rule) {
return defaultV;
}
return rule.config[0]?.color || defaultV;
});
- const [medianColor, medianColorSet] = useState(() => {
+ const [medianColor, setMedianColor] = useState(() => {
const defaultV = '#7790f3';
if (!rule) {
return defaultV;
@@ -165,7 +164,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
}
return rule.config[1]?.color || defaultV;
});
- const [maxColor, maxColorSet] = useState(() => {
+ const [maxColor, setMaxColor] = useState(() => {
const defaultV = '#2e55ef';
if (!rule) {
return defaultV;
@@ -217,29 +216,24 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
};
return (
<div>
- <div className={stylesBase.title}>{localeService.t('sheet.cf.panel.styleRule')}</div>
- <div
- className={`
- ${styles.cfPreviewWrap}
- `}
- >
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ {localeService.t('sheet.cf.panel.styleRule')}
+ </div>
+ <div className={previewClassName}>
<Preview rule={getResult({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor, medianColor, maxColor }) as IConditionalFormattingRuleConfig} />
</div>
- <div className={stylesBase.label}>{localeService.t('sheet.cf.valueType.min')}</div>
- <div
- className={clsx(`
- ${stylesBase.labelContainer}
- univer-mt-3
- `, 'univer-box-border univer-h-8')}
- >
+ <div className="univer-mt-3 univer-text-xs univer-text-gray-600">
+ {localeService.t('sheet.cf.valueType.min')}
+ </div>
+ <div className="univer-mt-3 univer-flex univer-h-8 univer-items-center">
<Select
className="univer-flex-shrink-0"
options={minOptions}
value={minType}
onChange={(v) => {
- minTypeSet(v as CFValueType);
+ setMinType(v as CFValueType);
const value = createDefaultValueByValueType(v as CFValueType, 10);
- minValueSet(value);
+ setMinValue(value);
handleChange({ minType: v as CFValueType, medianType, maxType, minValue: value, medianValue, maxValue, minColor, medianColor, maxColor });
}}
/>
@@ -249,7 +243,7 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
value={minValue}
type={minType}
onChange={(v) => {
- minValueSet(v);
+ setMinValue(v);
handleChange({ minType, medianType, maxType, minValue: v, medianValue, maxValue, minColor, medianColor, maxColor });
}}
/>
@@ -257,27 +251,32 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
className="univer-ml-1"
color={minColor}
onChange={(v) => {
- minColorSet(v);
+ setMinColor(v);
handleChange({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor: v, medianColor, maxColor });
}}
/>
</div>
- <div className={stylesBase.label}>{localeService.t('sheet.cf.panel.medianValue')}</div>
- <div
- className={clsx(`
- ${stylesBase.labelContainer}
- univer-mt-3
- `, 'univer-box-border univer-h-8')}
- >
+ <div className="univer-mt-3 univer-text-xs univer-text-gray-600">{localeService.t('sheet.cf.panel.medianValue')}</div>
+ <div className="univer-mt-3 univer-flex univer-h-8 univer-items-center">
<Select
className="univer-flex-shrink-0"
options={medianOptions}
value={medianType}
onChange={(v) => {
- medianTypeSet(v as CFValueType);
+ setMedianType(v as CFValueType);
const value = createDefaultValueByValueType(v as CFValueType, 50);
- medianValueSet(value);
- handleChange({ minType, medianType: v as CFValueType, maxType, minValue, medianValue: value, maxValue, minColor, medianColor, maxColor });
+ setMedianValue(value);
+ handleChange({
+ minType,
+ medianType: v as CFValueType,
+ maxType,
+ minValue,
+ medianValue: value,
+ maxValue,
+ minColor,
+ medianColor,
+ maxColor,
+ });
}}
/>
@@ -287,8 +286,18 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
value={medianValue}
type={medianType}
onChange={(v) => {
- medianValueSet(v);
- handleChange({ minType, medianType, maxType, minValue, medianValue: v, maxValue, minColor, medianColor, maxColor });
+ setMedianValue(v);
+ handleChange({
+ minType,
+ medianType,
+ maxType,
+ minValue,
+ medianValue: v,
+ maxValue,
+ minColor,
+ medianColor,
+ maxColor,
+ });
}}
/>
{medianType !== 'none' && (
@@ -296,29 +305,44 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
className="univer-ml-1"
color={medianColor}
onChange={(v) => {
- medianColorSet(v);
- handleChange({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor, medianColor: v, maxColor });
+ setMedianColor(v);
+ handleChange({
+ minType,
+ medianType,
+ maxType,
+ minValue,
+ medianValue,
+ maxValue,
+ minColor,
+ medianColor: v,
+ maxColor,
+ });
}}
/>
)}
</div>
- <div className={stylesBase.label}>{localeService.t('sheet.cf.valueType.max')}</div>
- <div
- className={clsx(`
- ${stylesBase.labelContainer}
- univer-mt-3 univer-box-border univer-h-8
- `)}
- >
+ <div className="univer-mt-3 univer-text-xs univer-text-gray-600">{localeService.t('sheet.cf.valueType.max')}</div>
+ <div className="univer-mt-3 univer-flex univer-h-8 univer-items-center">
<Select
className="univer-flex-shrink-0"
options={maxOptions}
value={maxType}
onChange={(v) => {
- maxTypeSet(v as CFValueType);
+ setMaxType(v as CFValueType);
const value = createDefaultValueByValueType(v as CFValueType, 90);
- maxValueSet(value);
- handleChange({ minType, medianType, maxType: v as CFValueType, minValue, medianValue, maxValue: value, minColor, medianColor, maxColor });
+ setMaxValue(value);
+ handleChange({
+ minType,
+ medianType,
+ maxType: v as CFValueType,
+ minValue,
+ medianValue,
+ maxValue: value,
+ minColor,
+ medianColor,
+ maxColor,
+ });
}}
/>
<TextInput
@@ -327,20 +351,39 @@ export const ColorScaleStyleEditor = (props: IStyleEditorProps) => {
value={maxValue}
type={maxType}
onChange={(v) => {
- maxValueSet(v);
- handleChange({ minType, medianType, maxType, minValue, medianValue, maxValue: v, minColor, medianColor, maxColor });
+ setMaxValue(v);
+ handleChange({
+ minType,
+ medianType,
+ maxType,
+ minValue,
+ medianValue,
+ maxValue: v,
+ minColor,
+ medianColor,
+ maxColor,
+ });
}}
/>
<ColorPicker
className="univer-ml-1"
color={maxColor}
onChange={(v) => {
- maxColorSet(v);
- handleChange({ minType, medianType, maxType, minValue, medianValue, maxValue, minColor, medianColor, maxColor: v });
+ setMaxColor(v);
+ handleChange({
+ minType,
+ medianType,
+ maxType,
+ minValue,
+ medianValue,
+ maxValue,
+ minColor,
+ medianColor,
+ maxColor: v,
+ });
}}
/>
</div>
-
</div>
);
};
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
index f20cea4ca7..7b8a390c39 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/DataBar.tsx
@@ -26,8 +26,7 @@ import { useDependency, useSidebarClick } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
import { ColorPicker } from '../../color-picker';
import { Preview } from '../../preview';
-import stylesBase from '../index.module.less';
-import styles from './index.module.less';
+import { previewClassName } from './styles';
const createOptionItem = (text: CFValueType, localeService: LocaleService) => ({ label: localeService.t(`sheet.cf.valueType.${text}`), value: text });
@@ -38,11 +37,11 @@ const InputText = (props: { disabled?: boolean; id: string; className: string; t
const subUnitId = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getActiveSheet()?.getSheetId();
const formulaEditorRef = useRef<IFormulaEditorRef>(null);
- const [isFocusFormulaEditor, isFocusFormulaEditorSet] = useState(false);
+ const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
useSidebarClick((e: MouseEvent) => {
const isOutSide = formulaEditorRef.current?.isClickOutSide(e);
- isOutSide && isFocusFormulaEditorSet(false);
+ isOutSide && setIsFocusFormulaEditor(false);
});
const _value = useRef(value);
@@ -58,10 +57,11 @@ const InputText = (props: { disabled?: boolean; id: string; className: string; t
max: Number.MAX_SAFE_INTEGER,
};
}, [type]);
+
if (type === CFValueType.formula) {
const v = String(_value.current).startsWith('=') ? String(_value.current) || '' : '=';
return (
- <div style={{ width: '100%', marginLeft: 12 }}>
+ <div className="univer-ml-3 univer-w-full">
<FormulaEditor
initValue={v as any}
unitId={unitId}
@@ -71,7 +71,7 @@ const InputText = (props: { disabled?: boolean; id: string; className: string; t
const formula = v || '';
onChange(formula);
}}
- onFocus={() => isFocusFormulaEditorSet(true)}
+ onFocus={() => setIsFocusFormulaEditor(true)}
ref={formulaEditorRef}
/>
</div>
@@ -224,27 +224,29 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
return (
<div>
- <div className={stylesBase.title}>
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
{localeService.t('sheet.cf.panel.styleRule')}
</div>
- <div
- className={`
- ${styles.cfPreviewWrap}
- `}
- >
- <Preview rule={getResult({ isGradient, minValue, minValueType, maxValue, maxValueType, positiveColor, nativeColor, isShowValue }) as IConditionalFormattingRuleConfig} />
+ <div className={previewClassName}>
+ <Preview
+ rule={getResult({
+ isGradient,
+ minValue,
+ minValueType,
+ maxValue,
+ maxValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue,
+ }) as IConditionalFormattingRuleConfig}
+ />
</div>
<div>
- <div className={stylesBase.label}>
+ <div className="univer-mt-3 univer-text-sm univer-text-gray-600">
{localeService.t('sheet.cf.panel.fillType')}
</div>
- <div
- className={`
- univer-ml-1 univer-mt-3
- ${stylesBase.labelContainer}
- `}
- >
+ <div className="univer-ml-1 univer-mt-3 univer-flex univer-items-center">
<RadioGroup
value={isGradient}
onChange={(v) => {
@@ -253,23 +255,27 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
}}
>
<Radio value="0">
- <span className={styles.text}>{localeService.t('sheet.cf.panel.pureColor')}</span>
+ <span className="univer-text-xs">{localeService.t('sheet.cf.panel.pureColor')}</span>
</Radio>
<Radio value="1">
- <span className={styles.text}>{localeService.t('sheet.cf.panel.gradient')}</span>
+ <span className="univer-text-xs">{localeService.t('sheet.cf.panel.gradient')}</span>
</Radio>
</RadioGroup>
- <div
- className={`
- ${styles.utilItem}
- univer-ml-6
- `}
- >
+ <div className="univer-ml-6 univer-flex univer-items-center univer-text-xs">
<Checkbox
checked={!isShowValue}
onChange={(v) => {
setIsShowValue(!v);
- _handleChange({ isGradient: v as string, minValue, minValueType, maxValue, maxValueType, positiveColor, nativeColor, isShowValue: !v });
+ _handleChange({
+ isGradient: v as string,
+ minValue,
+ minValueType,
+ maxValue,
+ maxValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue: !v,
+ });
}}
/>
{localeService.t('sheet.cf.panel.onlyShowDataBar')}
@@ -277,23 +283,10 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
</div>
</div>
<div>
- <div className={stylesBase.label}>{localeService.t('sheet.cf.panel.colorSet')}</div>
- <div
- className={`
- ${stylesBase.labelContainer}
- univer-ml-1 univer-mt-3
- `}
- >
- <div
- className={`
- ${stylesBase.labelContainer}
- `}
- >
- <div
- className={`
- ${styles.text}
- `}
- >
+ <div className="univer-mt-3 univer-text-sm univer-text-gray-600">{localeService.t('sheet.cf.panel.colorSet')}</div>
+ <div className="univer-ml-1 univer-mt-3 univer-flex univer-items-center">
+ <div className="univer-flex univer-items-center">
+ <div className="univer-text-xs">
{localeService.t('sheet.cf.panel.native')}
</div>
<ColorPicker
@@ -301,17 +294,8 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
onChange={handleNativeColorChange}
/>
</div>
- <div
- className={`
- ${stylesBase.labelContainer}
- univer-ml-3
- `}
- >
- <div
- className={`
- ${styles.text}
- `}
- >
+ <div className="univer-ml-3 univer-flex univer-items-center">
+ <div className="univer-text-xs">
{localeService.t('sheet.cf.panel.positive')}
</div>
<ColorPicker
@@ -323,7 +307,7 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
</div>
<div>
- <div className={stylesBase.label}>{localeService.t('sheet.cf.valueType.min')}</div>
+ <div className="univer-mt-3 univer-text-sm univer-text-gray-600">{localeService.t('sheet.cf.valueType.min')}</div>
<div className="univer-mt-3 univer-flex univer-items-center">
<Select
className="univer-w-1/2 univer-flex-shrink-0"
@@ -333,23 +317,41 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
setMinValueType(v as CFValueType);
const value = createDefaultValueByValueType(v as CFValueType, 10);
minValueSet(value);
- _handleChange({ isGradient, minValue: value, minValueType: v as CFValueType, maxValue, maxValueType, positiveColor, nativeColor, isShowValue });
+ _handleChange({
+ isGradient,
+ minValue: value,
+ minValueType: v as CFValueType,
+ maxValue,
+ maxValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue,
+ });
}}
/>
<InputText
- disabled={!isShowInput(minValueType)}
id="min"
- type={minValueType}
className="univer-ml-3"
+ disabled={!isShowInput(minValueType)}
+ type={minValueType}
value={minValue}
onChange={(v) => {
minValueSet(v || 0);
- _handleChange({ isGradient, minValue: v || 0, minValueType, maxValue, maxValueType, positiveColor, nativeColor, isShowValue });
+ _handleChange({
+ isGradient,
+ minValue: v || 0,
+ minValueType,
+ maxValue,
+ maxValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue,
+ });
}}
/>
</div>
- <div className={stylesBase.label}>{localeService.t('sheet.cf.valueType.max')}</div>
+ <div className="univer-mt-3 univer-text-sm univer-text-gray-600">{localeService.t('sheet.cf.valueType.max')}</div>
<div className="univer-mt-3 univer-flex univer-items-center">
<Select
className="univer-w-1/2 univer-flex-shrink-0"
@@ -359,7 +361,16 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
setMaxValueType(v as CFValueType);
const value = createDefaultValueByValueType(v as CFValueType, 90);
setMaxValue(value);
- _handleChange({ isGradient, minValue, minValueType, maxValue: value, maxValueType: v as CFValueType, positiveColor, nativeColor, isShowValue });
+ _handleChange({
+ isGradient,
+ minValue,
+ minValueType,
+ maxValue: value,
+ maxValueType: v as CFValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue,
+ });
}}
/>
<InputText
@@ -370,12 +381,20 @@ export const DataBarStyleEditor = (props: IStyleEditorProps) => {
value={maxValue}
onChange={(v) => {
setMaxValue(v || 0);
- _handleChange({ isGradient, minValue, minValueType, maxValue: v || 0, maxValueType, positiveColor, nativeColor, isShowValue });
+ _handleChange({
+ isGradient,
+ minValue,
+ minValueType,
+ maxValue: v || 0,
+ maxValueType,
+ positiveColor,
+ nativeColor,
+ isShowValue,
+ });
}}
/>
</div>
</div>
-
</div>
);
};
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
index 81d9dc4f3c..db96b1d750 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Formula.tsx
@@ -25,8 +25,7 @@ import { useDependency, useSidebarClick } from '@univerjs/ui';
import { useEffect, useRef, useState } from 'react';
import { ConditionalStyleEditor } from '../../conditional-style-editor';
import { Preview } from '../../preview';
-import stylesBase from '../index.module.less';
-import styles from './index.module.less';
+import { previewClassName } from './styles';
export const FormulaStyleEditor = (props: IStyleEditorProps) => {
const { onChange, interceptorManager } = props;
@@ -38,16 +37,16 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
const rule = props.rule?.type === CFRuleType.highlightCell ? props.rule : undefined as IRankHighlightCell | IAverageHighlightCell | undefined;
const divEleRef = useRef<HTMLDivElement>(null);
- const [isFocusFormulaEditor, isFocusFormulaEditorSet] = useState(false);
+ const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
const formulaEditorRef = useRef<IFormulaEditorRef>(null);
- const [style, styleSet] = useState<IHighlightCell['style']>({});
- const [formula, formulaSet] = useState(() => {
+ const [style, setStyle] = useState<IHighlightCell['style']>({});
+ const [formula, setFormula] = useState(() => {
if (rule?.subType === CFSubRuleType.formula) {
return rule.value;
}
return '=';
});
- const [formulaError, formulaErrorSet] = useState<string | undefined>(undefined);
+ const [formulaError, setFormulaError] = useState<string | undefined>(undefined);
const getResult = (config: {
style: IHighlightCell['style'];
@@ -73,7 +72,7 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
const dispose = interceptorManager.intercept(interceptorManager.getInterceptPoints().beforeSubmit, {
handler: (v, _c, next) => {
if (formulaError || formula.length === 1 || !formula.startsWith('=')) {
- formulaErrorSet(localeService.t('sheet.cf.errorMessage.formulaError'));
+ setFormulaError(localeService.t('sheet.cf.errorMessage.formulaError'));
return false;
}
return next(v);
@@ -91,34 +90,29 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
useSidebarClick((e: MouseEvent) => {
const isOutSide = formulaEditorRef.current?.isClickOutSide(e);
- isOutSide && isFocusFormulaEditorSet(false);
+ isOutSide && setIsFocusFormulaEditor(false);
});
return (
<div ref={divEleRef}>
- <div
- className={`
- ${stylesBase.title}
- univer-mt-4
- `}
- >
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className="univer-mt-3">
<FormulaEditor
onChange={(formula) => {
- formulaSet(formula);
+ setFormula(formula);
_onChange({ style, formula });
}}
onVerify={(result, formula) => {
if (!result || formula.length === 1) {
- formulaErrorSet(localeService.t('sheet.cf.errorMessage.formulaError'));
+ setFormulaError(localeService.t('sheet.cf.errorMessage.formulaError'));
} else {
- formulaErrorSet(undefined);
+ setFormulaError(undefined);
}
}}
errorText={formulaError}
- onFocus={() => { isFocusFormulaEditorSet(true); }}
+ onFocus={() => { setIsFocusFormulaEditor(true); }}
isFocus={isFocusFormulaEditor}
initValue={formula as any}
unitId={workbook.getUnitId()}
@@ -128,18 +122,14 @@ export const FormulaStyleEditor = (props: IStyleEditorProps) => {
</div>
- <div
- className={`
- ${styles.cfPreviewWrap}
- `}
- >
+ <div className={previewClassName}>
<Preview rule={getResult({ style, formula }) as IConditionalFormattingRuleConfig} />
</div>
<ConditionalStyleEditor
style={rule?.style}
className="univer-mt-3"
onChange={(v) => {
- styleSet(v);
+ setStyle(v);
_onChange({ style: v, formula });
}}
/>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
index ee8ebc6870..147d012db1 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/HighlightCell.tsx
@@ -33,12 +33,11 @@ import {
createDefaultValue,
} from '@univerjs/sheets-conditional-formatting';
import { useDependency } from '@univerjs/ui';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import { ConditionalStyleEditor } from '../../conditional-style-editor';
import { Preview } from '../../preview';
import { WrapperError } from '../../wrapper-error/WrapperError';
-import stylesBase from '../index.module.less';
-import styles from './index.module.less';
+import { previewClassName } from './styles';
const createOptionItem = (text: string, localeService: LocaleService) => ({ label: localeService.t(`sheet.cf.operator.${text}`), value: text });
type IValue = number | string | [number, number];
@@ -55,16 +54,16 @@ const HighlightCellInput = (props: {
const { type, operator, onChange, value, interceptorManager } = props;
const localeService = useDependency(LocaleService);
- const [inputNumberValue, inputNumberValueSet] = useState(() => typeof value === 'number' ? value : 0);
- const [numberError, numberErrorSet] = useState('');
+ const [inputNumberValue, setInputNumberValue] = useState(() => typeof value === 'number' ? value : 0);
+ const [numberError, setNumberError] = useState('');
- const [inputTextValue, inputTextValueSet] = useState(() => typeof value === 'string' ? value : '');
- const [textError, textErrorSet] = useState('');
- const [inputNumberMin, inputNumberMinSet] = useState(() => Array.isArray(value) ? value[0] === undefined ? 0 : value[0] : 0);
- const [numberMinError, numberMinErrorSet] = useState('');
+ const [inputTextValue, setInputTextValue] = useState(() => typeof value === 'string' ? value : '');
+ const [textError, setTextError] = useState('');
+ const [inputNumberMin, setInputNumberMin] = useState(() => Array.isArray(value) ? value[0] === undefined ? 0 : value[0] : 0);
+ const [numberMinError, setNumberMinError] = useState('');
- const [inputNumberMax, inputNumberMaxSet] = useState(() => Array.isArray(value) ? value[1] === undefined ? 100 : value[1] : 100);
- const [numberMaxError, numberMaxErrorSet] = useState('');
+ const [inputNumberMax, setInputNumberMax] = useState(() => Array.isArray(value) ? value[1] === undefined ? 100 : value[1] : 100);
+ const [numberMaxError, setNumberMaxError] = useState('');
useEffect(() => {
switch (type) {
@@ -93,7 +92,7 @@ const HighlightCellInput = (props: {
case CFSubRuleType.text: {
if ([CFTextOperator.beginsWith, CFTextOperator.containsText, CFTextOperator.endsWith, CFTextOperator.notEqual, CFTextOperator.notContainsText, CFTextOperator.equal].includes(operator as any)) {
if (!inputTextValue) {
- textErrorSet(localeService.t('sheet.cf.errorMessage.notBlank'));
+ setTextError(localeService.t('sheet.cf.errorMessage.notBlank'));
return false;
}
return next(v);
@@ -112,7 +111,7 @@ const HighlightCellInput = (props: {
case CFSubRuleType.text: {
if ([CFTextOperator.beginsWith, CFTextOperator.endsWith, CFTextOperator.containsText, CFTextOperator.notContainsText, CFTextOperator.equal, CFTextOperator.notEqual].includes(operator as CFTextOperator)) {
const _onChange = (value: string) => {
- inputTextValueSet(value);
+ setInputTextValue(value);
onChange(value);
};
return (
@@ -121,7 +120,7 @@ const HighlightCellInput = (props: {
<Input
value={inputTextValue}
onChange={(v) => {
- textErrorSet('');
+ setTextError('');
_onChange(v);
}}
/>
@@ -134,9 +133,9 @@ const HighlightCellInput = (props: {
case CFSubRuleType.number: {
if ([CFNumberOperator.equal, CFNumberOperator.notEqual, CFNumberOperator.greaterThan, CFNumberOperator.greaterThanOrEqual, CFNumberOperator.lessThan, CFNumberOperator.lessThanOrEqual].includes(operator as CFNumberOperator)) {
const _onChange = (value: number | null) => {
- inputNumberValueSet(value || 0);
+ setInputNumberValue(value || 0);
onChange(value || 0);
- numberErrorSet('');
+ setNumberError('');
};
return (
<div className="univer-mt-3">
@@ -154,24 +153,19 @@ const HighlightCellInput = (props: {
}
if ([CFNumberOperator.between, CFNumberOperator.notBetween].includes(operator as CFNumberOperator)) {
const onChangeMin = (_value: number | null) => {
- inputNumberMinSet(_value || 0);
+ setInputNumberMin(_value || 0);
const value: [number, number] = [_value || 0, inputNumberMax];
onChange(value);
- numberMinErrorSet('');
+ setNumberMinError('');
};
const onChangeMax = (_value: number | null) => {
- inputNumberMaxSet(_value || 0);
+ setInputNumberMax(_value || 0);
const value: [number, number] = [inputNumberMin, _value || 0];
onChange(value);
- numberMaxErrorSet('');
+ setNumberMaxError('');
};
return (
- <div
- className={`
- univer-mt-3
- ${stylesBase.labelContainer}
- `}
- >
+ <div className="univer-mt-3 univer-flex univer-items-center">
<WrapperError errorText={numberMinError}>
<InputNumber min={Number.MIN_SAFE_INTEGER} max={Number.MAX_SAFE_INTEGER} value={inputNumberMin} onChange={onChangeMin} />
</WrapperError>
@@ -285,7 +279,7 @@ export const HighlightCellStyleEditor = (props: IStyleEditorProps<any, ITextHigh
return v;
});
- const [style, styleSet] = useState<IHighlightCell['style']>({});
+ const [style, setStyle] = useState<IHighlightCell['style']>({});
const getResult = useMemo(() => (option: { subType?: string; operator?: string; value?: IValue; style?: IHighlightCell['style'] }) => {
switch (option.subType || subType) {
@@ -373,12 +367,7 @@ export const HighlightCellStyleEditor = (props: IStyleEditorProps<any, ITextHigh
return (
<div>
- <div
- className={`
- ${stylesBase.title}
- univer-mt-4
- `}
- >
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<div className="univer-flex univer-justify-between univer-gap-4">
@@ -397,19 +386,23 @@ export const HighlightCellStyleEditor = (props: IStyleEditorProps<any, ITextHigh
/>
)}
</div>
- <HighlightCellInput key={inputRenderKey} value={value} interceptorManager={interceptorManager} type={subType} operator={operator} rule={rule} onChange={onInputChange} />
- <div
- className={`
- ${styles.cfPreviewWrap}
- `}
- >
+ <HighlightCellInput
+ key={inputRenderKey}
+ value={value}
+ interceptorManager={interceptorManager}
+ type={subType}
+ operator={operator}
+ rule={rule}
+ onChange={onInputChange}
+ />
+ <div className={previewClassName}>
<Preview rule={getResult({}) as IConditionalFormattingRuleConfig} />
</div>
<ConditionalStyleEditor
style={rule?.style}
className="univer-ml-1"
onChange={(v) => {
- styleSet(v);
+ setStyle(v);
onChange(getResult({ style: v }));
}}
/>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
index 30df4462a3..de45138a5b 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/IconSet.tsx
@@ -36,8 +36,6 @@ import {
import { FormulaEditor } from '@univerjs/sheets-formula-ui';
import { ILayoutService, useDependency, useScrollYOverContainer, useSidebarClick } from '@univerjs/ui';
import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
-import stylesBase from '../index.module.less';
-import styles from './index.module.less';
const getIcon = (iconType: string, iconId: string | number) => {
const arr = iconMap[iconType] || [];
@@ -45,15 +43,11 @@ const getIcon = (iconType: string, iconId: string | number) => {
};
const TextInput = (props: { id: number; type: CFValueType; value: number | string; onChange: (v: number | string) => void; error?: string }) => {
+ const { error, type, onChange } = props;
+
const univerInstanceService = useDependency(IUniverInstanceService);
const unitId = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getUnitId();
const subUnitId = univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!.getActiveSheet()?.getSheetId();
- const className = useMemo(() => {
- if (props.error) {
- return styles.errorInput;
- }
- return '';
- }, [props.error]);
const formulaEditorRef = useRef<IFormulaEditorRef>(null);
const [isFocusFormulaEditor, isFocusFormulaEditorSet] = useState(false);
@@ -63,14 +57,20 @@ const TextInput = (props: { id: number; type: CFValueType; value: number | strin
isOutSide && isFocusFormulaEditorSet(false);
});
return (
- <div className={styles.positionRelative}>
- {props.type !== CFValueType.formula
+ <div className="univer-relative">
+ {type !== CFValueType.formula
? (
<>
- <InputNumber className={className} value={Number(props.value) || 0} onChange={(v) => props.onChange(v ?? 0)} />
- {props.error && (
- <div className={styles.errorText}>
- {props.error}
+ <InputNumber
+ className={clsx({
+ 'univer-border-red-500': error,
+ })}
+ value={Number(props.value) || 0}
+ onChange={(v) => onChange(v ?? 0)}
+ />
+ {error && (
+ <div className="univer-absolute univer-text-xs univer-text-red-500">
+ {error}
</div>
)}
</>
@@ -78,16 +78,16 @@ const TextInput = (props: { id: number; type: CFValueType; value: number | strin
: (
<div className="univer-w-full">
<FormulaEditor
+ ref={formulaEditorRef}
initValue={String(props.value) as any}
unitId={unitId}
subUnitId={subUnitId}
isFocus={isFocusFormulaEditor}
onChange={(v = '') => {
const formula = v || '';
- props.onChange(formula);
+ onChange(formula);
}}
onFocus={() => isFocusFormulaEditorSet(true)}
- ref={formulaEditorRef}
/>
</div>
)}
@@ -101,35 +101,46 @@ const createDefaultConfigItem = (iconType: IIconType, index: number, list: unkno
iconId: String(index),
});
-interface IconGroupListProps {
+interface IIconGroupListProps {
onClick: (iconType: IIconType) => void;
iconType?: IIconType;
};
-const IconGroupList = forwardRef<HTMLDivElement, IconGroupListProps>((props, ref) => {
+const IconGroupList = forwardRef<HTMLDivElement, IIconGroupListProps>((props, ref) => {
+ const { onClick } = props;
const localeService = useDependency(LocaleService);
const handleClick = (iconType: IIconType) => {
- props.onClick(iconType);
+ onClick(iconType);
};
return (
- <div ref={ref} className={styles.iconGroupList}>
+ <div ref={ref} className="univer-w-80">
{iconGroup.map((group, index) => {
return (
- <div key={index} className={styles.group}>
- <div className={styles.title}>{localeService.t(group.title)}</div>
- <div className={styles.itemContent}>
+ <div key={index} className="univer-mb-3">
+ <div className="univer-mb-1 univer-text-sm">{localeService.t(group.title)}</div>
+ <div className="univer-flex univer-flex-wrap">
{group.group.map((groupItem) => {
return (
- <div className={styles.itemWrap} key={groupItem.name} onClick={() => { handleClick(groupItem.name); }}>
- <div className={styles.item}>
+ <div
+ key={groupItem.name}
+ className="univer-mb-1 univer-flex univer-w-1/2 univer-items-center"
+ onClick={() => { handleClick(groupItem.name); }}
+ >
+ <a
+ className={`
+ univer-cursor-pointer univer-rounded
+ hover:univer-bg-gray-100
+ `}
+ >
{groupItem.list.map((base64, index) => (
<img
key={index}
className="univer-size-5"
src={base64}
+ draggable={false}
/>
))}
- </div>
+ </a>
</div>
);
})}
@@ -143,6 +154,8 @@ const IconGroupList = forwardRef<HTMLDivElement, IconGroupListProps>((props, ref
});
const IconItemList = (props: { onClick: (iconType: IIconType, iconId: string) => void; iconType?: IIconType; iconId: string }) => {
+ const { onClick } = props;
+
const list = useMemo(() => {
const result: { iconType: IIconType; iconId: string; base64: string }[] = [];
for (const key in iconMap) {
@@ -158,28 +171,40 @@ const IconItemList = (props: { onClick: (iconType: IIconType, iconId: string) =>
}
return result;
}, []);
+
const handleClick = (item: typeof list[0]) => {
- props.onClick(item.iconType, item.iconId);
+ onClick(item.iconType, item.iconId);
};
+
return (
- <div className={styles.iconItemListWrap}>
- <div className={styles.none} onClick={() => handleClick({ iconType: EMPTY_ICON_TYPE as any, iconId: '', base64: '' })}>
+ <div>
+ <div
+ className="univer-mb-2.5 univer-flex univer-cursor-pointer univer-items-center univer-pl-1"
+ onClick={() => handleClick({ iconType: EMPTY_ICON_TYPE as any, iconId: '', base64: '' })}
+ >
<SlashSingle className="univer-size-5" />
- <span>无单元格图标</span>
+ <span className="univer-ml-2">无单元格图标</span>
</div>
- <div className={styles.iconItemList}>
+ <div className="univer-flex univer-w-64 univer-flex-wrap">
{list.map((item) => (
- <div key={`${item.iconType}_${item.iconId}`} className={styles.item}>
+ <div
+ key={`${item.iconType}_${item.iconId}`}
+ className={`
+ univer-mb-2 univer-mr-2 univer-flex univer-cursor-pointer univer-items-center
+ univer-justify-center univer-rounded
+ hover:univer-bg-gray-100
+ `}
+ >
<img
className="univer-size-5"
- onClick={() => handleClick(item)}
src={item.base64}
+ draggable={false}
+ onClick={() => handleClick(item)}
/>
</div>
))}
</div>
</div>
-
);
};
@@ -235,8 +260,8 @@ const IconSetRuleEdit = (props: {
>
<div
className={`
- ${stylesBase.label}
- univer-flex univer-items-center univer-justify-between
+ univer-mt-3 univer-flex univer-items-center univer-justify-between univer-text-sm
+ univer-text-gray-600
`}
>
<div
@@ -250,7 +275,7 @@ const IconSetRuleEdit = (props: {
<>
{!isFirst && !isEnd && localeService.t('sheet.cf.iconSet.rule')}
{!isFirst && !isEnd && (
- <span className={styles.stress}>
+ <span className="univer-font-medium univer-text-gray-600">
(
{localeService.t('sheet.cf.iconSet.when')}
{localeService.t(`sheet.cf.symbol.${getOppositeOperator(preItem.operator)}`)}
@@ -272,8 +297,22 @@ const IconSetRuleEdit = (props: {
</div>
)}
>
- <div className={clsx(styles.dropdownIcon, 'univer-box-border univer-h-7')}>
- {icon ? <img src={icon} className={styles.icon} /> : <SlashSingle className={styles.icon} />}
+ <div
+ className={`
+ univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center
+ univer-justify-between univer-rounded-md univer-border univer-border-solid
+ univer-border-gray-200 univer-bg-white univer-px-4 univer-py-2 univer-text-xs
+ univer-text-gray-600 univer-transition-all
+ hover:univer-border-primary-600
+ `}
+ >
+ {icon
+ ? <img src={icon} className="univer-size-4" draggable={false} />
+ : (
+ <SlashSingle
+ className="univer-size-4"
+ />
+ )}
<MoreDownSingle />
</div>
</Dropdown>
@@ -287,15 +326,9 @@ const IconSetRuleEdit = (props: {
/>
)
: (
- <div
- className={`
- univer-w-[45%]
- ${stylesBase.label}
- `}
- style={{ marginTop: 0 }}
- >
+ <div className="univer-mt-0 univer-w-[45%] univer-text-sm univer-text-gray-600">
{localeService.t('sheet.cf.iconSet.rule')}
- <span className={styles.stress}>
+ <span className="univer-font-medium univer-text-gray-600">
{localeService.t('sheet.cf.iconSet.when')}
{localeService.t(`sheet.cf.symbol.${getOppositeOperator(preItem.operator)}`)}
{lessThanText}
@@ -309,9 +342,8 @@ const IconSetRuleEdit = (props: {
<>
<div
className={`
- univer-mt-3
- ${stylesBase.label}
- univer-flex univer-items-center univer-justify-between univer-gap-4
+ univer-mt-3 univer-flex univer-items-center univer-justify-between univer-gap-4
+ univer-text-sm univer-text-gray-600
`}
>
<div>
@@ -515,11 +547,11 @@ export const IconSet = (props: IStyleEditorProps<unknown, IIconSet>) => {
useScrollYOverContainer(iconGroupListEl, layoutService.rootContainerElement);
return (
- <div className={styles.iconSet}>
- <div className={stylesBase.title}>{localeService.t('sheet.cf.panel.styleRule')}</div>
- <div
- className="univer-mt-3"
- >
+ <div>
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ {localeService.t('sheet.cf.panel.styleRule')}
+ </div>
+ <div className="univer-mt-3">
<Dropdown
overlay={(
<div className="univer-rounded-lg univer-p-4">
@@ -533,28 +565,26 @@ export const IconSet = (props: IStyleEditorProps<unknown, IIconSet>) => {
</div>
)}
>
- <div className={clsx(styles.dropdownIcon, 'univer-box-border univer-h-7 univer-w-auto')}>
+ <div
+ className={clsx(`
+ univer-box-border univer-flex univer-h-8 univer-w-full univer-items-center
+ univer-justify-between univer-rounded-md univer-border univer-border-solid
+ univer-border-gray-200 univer-bg-white univer-px-4 univer-py-2 univer-text-xs
+ univer-text-gray-600 univer-transition-all
+ hover:univer-border-primary-600
+ `)}
+ >
{previewIcon}
<MoreDownSingle />
</div>
</Dropdown>
</div>
- <div
- className={`
- univer-mt-3
- ${styles.renderConfig}
- `}
- >
- <div className={styles.utilItem}>
+ <div className="univer-mt-3 univer-flex univer-items-center univer-text-xs">
+ <div className="univer-flex univer-items-center univer-text-xs">
<Checkbox onChange={reverseIcon} />
{localeService.t('sheet.cf.iconSet.reverseIconOrder')}
</div>
- <div
- className={`
- ${styles.utilItem}
- univer-ml-6
- `}
- >
+ <div className="univer-ml-6 univer-flex univer-items-center univer-text-xs">
<Checkbox checked={!isShowValue} onChange={(v) => { isShowValueSet(!v); }} />
{localeService.t('sheet.cf.iconSet.onlyShowIcon')}
</div>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
index 20751eff0d..e14ad65c99 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/Rank.tsx
@@ -20,11 +20,10 @@ import { LocaleService } from '@univerjs/core';
import { Checkbox, InputNumber, Select } from '@univerjs/design';
import { CFNumberOperator, CFRuleType, CFSubRuleType } from '@univerjs/sheets-conditional-formatting';
import { useDependency } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { ConditionalStyleEditor } from '../../conditional-style-editor';
import { Preview } from '../../preview';
-import stylesBase from '../index.module.less';
-import styles from './index.module.less';
+import { previewClassName } from './styles';
export const RankStyleEditor = (props: IStyleEditorProps) => {
const { onChange, interceptorManager } = props;
@@ -33,7 +32,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
const rule = props.rule?.type === CFRuleType.highlightCell ? props.rule : undefined as IRankHighlightCell | IAverageHighlightCell | undefined;
const options = [{ label: localeService.t('sheet.cf.panel.isNotBottom'), value: 'isNotBottom' }, { label: localeService.t('sheet.cf.panel.isBottom'), value: 'isBottom' }, { label: localeService.t('sheet.cf.panel.greaterThanAverage'), value: 'greaterThanAverage' }, { label: localeService.t('sheet.cf.panel.lessThanAverage'), value: 'lessThanAverage' }];
- const [type, typeSet] = useState(() => {
+ const [type, setType] = useState(() => {
const defaultV = options[0].value;
const type = rule?.type;
if (!rule) {
@@ -64,7 +63,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
}
return defaultV;
});
- const [value, valueSet] = useState(() => {
+ const [value, setValue] = useState(() => {
const defaultV = 10;
const type = rule?.type;
if (!rule) {
@@ -82,7 +81,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
}
return defaultV;
});
- const [isPercent, isPercentSet] = useState(() => {
+ const [isPercent, setIsPercent] = useState(() => {
const defaultV = false;
const type = rule?.type;
if (!rule) {
@@ -101,7 +100,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
return defaultV;
});
- const [style, styleSet] = useState<IHighlightCell['style']>({});
+ const [style, setStyle] = useState<IHighlightCell['style']>({});
const getResult = (config: {
type: string;
@@ -142,12 +141,7 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
};
return (
<div>
- <div
- className={`
- ${stylesBase.title}
- univer-mt-4
- `}
- >
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
{localeService.t('sheet.cf.panel.styleRule')}
</div>
<Select
@@ -155,38 +149,29 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
value={type}
options={options}
onChange={(v) => {
- typeSet(v);
+ setType(v);
_onChange({ type: v, isPercent, value, style });
}}
/>
{['isNotBottom', 'isBottom'].includes(type) && (
- <div
- className={`
- ${stylesBase.labelContainer}
- univer-mt-3
- `}
- >
+ <div className="univer-mt-3 univer-flex univer-items-center">
<InputNumber
min={1}
max={1000}
value={value}
onChange={(v) => {
const value = v || 0;
- valueSet(value);
+ setValue(value);
_onChange({ type, isPercent, value, style });
}}
/>
<div
- className={`
- univer-ml-3
- ${stylesBase.labelContainer}
- ${styles.text}
- `}
+ className="univer-ml-3 univer-flex univer-items-center univer-text-xs"
>
<Checkbox
checked={isPercent}
onChange={(v) => {
- isPercentSet(!!v);
+ setIsPercent(!!v);
_onChange({ type, isPercent: !!v, value, style });
}}
/>
@@ -195,18 +180,14 @@ export const RankStyleEditor = (props: IStyleEditorProps) => {
</div>
)}
- <div
- className={`
- ${styles.cfPreviewWrap}
- `}
- >
+ <div className={previewClassName}>
<Preview rule={getResult({ type, isPercent, value, style }) as IConditionalFormattingRuleConfig} />
</div>
<ConditionalStyleEditor
style={rule?.style}
className="univer-mt-3"
onChange={(v) => {
- styleSet(v);
+ setStyle(v);
_onChange({ type, isPercent, value, style: v });
}}
/>
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.module.less b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.module.less
deleted file mode 100644
index 74d4214e45..0000000000
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.module.less
+++ /dev/null
@@ -1,169 +0,0 @@
-.cf-rule-style-editor {
- .cf-error-text {
- color: rgb(var(--red-500));
- font-size: var(--font-size-xxs);
- margin-top: var(--margin-xxs);
- }
-
- .cf-preview-wrap {
- margin-top: var(--margin-lg);
- padding: var(--padding-xs) var(--padding-sm);
- border: 1px solid rgb(var(--border-color));
- border-radius: var(--border-radius-base);
- }
- .text {
- font-size: var(--font-size-xxs);
- }
- .position-relative {
- position: relative;
- }
-
- .btn-list {
- display: flex;
- justify-content: flex-end;
- margin-bottom: var(--margin-base);
- }
-
- .util-item {
- display: flex;
- justify-content: flex-start;
- align-items: center;
- font-size: var(--font-size-xxs);
- }
-
- .icon-set {
- .render-config {
- display: flex;
- align-items: center;
- font-size: var(--font-size-xxs);
- justify-content: flex-start;
- }
- .dropdown-icon {
- background-color: rgb(var(--bg-color-secondary));
- border: 1px solid rgb(var(--border-color));
- border-radius: var(--border-radius-base);
- display: flex;
- justify-content: space-between;
- width: 100%;
- align-items: center;
- padding: var(--padding-sm) var(--padding-lg);
- font-size: var(--font-size-xxs);
- color: rgb(var(--text-color-secondary));
- transition: all 0.15s;
- &:hover {
- border-color: rgb(var(--primary-color)) !important;
- }
- .icon {
- width: 16px;
- height: 16px;
- }
- }
- .error-input {
- border: 1px solid rgb(var(--red-400));
- }
- .error-text {
- color: rgb(var(--red-400));
- font-size: 12px;
- position: absolute;
- }
- }
-}
-.icon-group-list {
- padding: var(--padding-base);
- font-size: var(--font-size-xs);
- box-sizing: border-box;
- width: 328px;
- background-color: rgb(var(--bg-color-secondary));
- border: 1px solid rgb(var(--border-color));
- border-radius: var(--border-radius-lg);
- outline: none;
- box-shadow: var(--box-shadow-base);
- .title {
- font-size: 13px;
- margin-bottom: var(--margin-xxs);
- }
- .group {
- margin-bottom: var(--margin-sm);
- }
- .item-content {
- display: flex;
- flex-wrap: wrap;
- .item-wrap {
- display: flex;
- align-items: center;
- justify-content: flex-start;
- width: 50%;
- margin-bottom: 4px;
- .item {
- border-radius: var(--border-radius-base);
- cursor: pointer;
- :not(:first-child).icon {
- margin-left: 8px;
- }
-
- &:hover {
- background-color: rgb(var(--bg-color-hover));
- }
- }
- :not(:first-child).icon {
- margin-left: 8px;
- }
- }
- }
-
- .icon {
- width: 20px;
- height: 20px;
- }
-}
-.icon-item-list-wrap {
- padding: var(--padding-base) 4px var(--padding-base) var(--padding-base);
- font-size: var(--font-size-xs);
- background-color: rgb(var(--bg-color-secondary));
- border: 1px solid rgb(var(--border-color));
- border-radius: var(--border-radius-lg);
- outline: none;
- box-shadow: var(--box-shadow-base);
- .none {
- display: flex;
- align-items: center;
- margin-bottom: 10px;
- cursor: pointer;
- padding-left: 4px;
- span {
- margin-left: 8px;
- }
- }
-
- .icon-item-list {
- display: flex;
- width: 252px;
- flex-wrap: wrap;
- .item {
- display: flex;
- align-items: center;
- justify-content: center;
- border-radius: var(--border-radius-base);
- margin-right: 8px;
- margin-bottom: 8px;
- cursor: pointer;
-
- &:hover {
- background-color: rgb(var(--bg-color-hover));
- }
- }
-
- .icon {
- width: 20px;
- height: 20px;
- }
- }
-}
-
-.width100 {
- width: 100%;
-}
-.stress {
- color: rgb(var(--text-color));
- font-weight: 500;
-}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
index 1c47edf03d..661324a743 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/index.tsx
@@ -26,13 +26,11 @@ import { AddCfCommand, CFRuleType, CFSubRuleType, ConditionalFormattingRuleModel
import { RangeSelector } from '@univerjs/sheets-formula-ui';
import { useDependency } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
-import styleBase from '../index.module.less';
import { ColorScaleStyleEditor } from './ColorScale';
import { DataBarStyleEditor } from './DataBar';
import { FormulaStyleEditor } from './Formula';
import { HighlightCellStyleEditor } from './HighlightCell';
import { IconSet } from './IconSet';
-import styles from './index.module.less';
import { RankStyleEditor } from './Rank';
import { beforeSubmit, submit } from './type';
@@ -231,8 +229,10 @@ export const RuleEdit = (props: IRuleEditProps) => {
}
};
return (
- <div className={styles.cfRuleStyleEditor}>
- <div className={styleBase.title}>{localeService.t('sheet.cf.panel.range')}</div>
+ <div>
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ {localeService.t('sheet.cf.panel.range')}
+ </div>
<div className="univer-mt-4">
<RangeSelector
unitId={unitId}
@@ -241,9 +241,11 @@ export const RuleEdit = (props: IRuleEditProps) => {
onChange={(_, text) => onRangeSelectorChange(text)}
onVerify={handleVerify}
/>
- {errorText && <div className={styles.cfErrorText}>{errorText}</div>}
+ {errorText && <div className="univer-mt-1 univer-text-xs univer-text-red-500">{errorText}</div>}
+ </div>
+ <div className="univer-mt-4 univer-text-sm univer-text-gray-600">
+ {localeService.t('sheet.cf.panel.styleType')}
</div>
- <div className={styleBase.title}>{localeService.t('sheet.cf.panel.styleType')}</div>
<Select
className="univer-mt-4 univer-w-full"
value={ruleType}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/styles.ts b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/styles.ts
new file mode 100644
index 0000000000..1443d47f0a
--- /dev/null
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/styles.ts
@@ -0,0 +1,17 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export const previewClassName = 'univer-mt-5 univer-px-1 univer-py-2 univer-border univer-border-solid univer-border-gray-200 univer-rounded';
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/type.ts b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/type.ts
index be52d61df7..a4eae0c6d2 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/type.ts
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-edit/type.ts
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-import { createInterceptorKey } from '@univerjs/core';
import type { InterceptorManager } from '@univerjs/core';
import type { IConditionalFormattingRuleConfig } from '@univerjs/sheets-conditional-formatting';
+import { createInterceptorKey } from '@univerjs/core';
export const beforeSubmit = createInterceptorKey<boolean, null>('beforeSubmit');
export const submit = createInterceptorKey<any, null>('submit');
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.module.less b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.module.less
deleted file mode 100644
index ceac91747c..0000000000
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.module.less
+++ /dev/null
@@ -1,137 +0,0 @@
-.cf-rule-list {
- .rule-selector {
- color: rgb(var(--text-color-secondary));
- font-size: 12px;
- display: flex;
- justify-content: space-between;
- align-items: center;
- .select {
- color: rgb(var(--text-color));
- width: 138px;
- .select-selector {
- border: none;
- padding: 0;
- }
- .select-selection-item {
- top: -2px;
- left: 4px;
- }
- .select-selection-search-input {
- cursor: pointer;
- }
- }
- .btn-list {
- font-size: 16px;
- color: black;
- display: flex;
- justify-content: space-between;
- align-items: center;
- .gap {
- margin-left: 8px;
- }
- .icon {
- cursor: pointer;
- display: flex;
- justify-content: space-between;
- align-items: center;
- border-radius: 4px 4px 4px 4px;
- padding: 4px;
-
- &:hover {
- background: rgb(var(--grey-300));
- }
- }
- .disabled {
- color: rgb(var(--grey-500));
- display: flex;
- align-items: center;
- border-radius: 4px 4px 4px 4px;
- padding: 4px;
- }
- }
- }
- .rule-item {
- padding: 8px 32px 8px 20px;
- display: flex;
- justify-content: space-between;
- position: relative;
- align-items: center;
- border-radius: var(--border-radius-base);
- .rule-describe {
- max-width: 100%;
- min-width: 0px;
- overflow: hidden;
- flex-shrink: 1;
- font-size: var(--font-size-sm);
- line-height: 21px;
- .rule-type {
- font-size: 14px;
- line-height: 22px;
- color: #1e222b;
- }
- .rule-range {
- font-size: 12px;
- line-height: 22px;
- color: #7a7a7a;
- }
- }
- &:hover {
- background-color: rgb(var(--grey-100));
- }
- &.active {
- background-color: rgb(var(--grey-100));
- }
- .draggableHandle {
- display: none;
- position: absolute;
- left: 0px;
- width: 20px;
- height: 20px;
- border-radius: var(--border-radius-base);
- cursor: grab;
- // &:hover {
- // background-color: rgb(var(--grey-300));
- // }
- }
- &:hover {
- .delete-item {
- display: flex;
- align-items: center;
- justify-content: center;
- }
- .draggableHandle {
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- .delete-item {
- display: none;
- cursor: pointer;
- border-radius: var(--border-radius-base);
- position: absolute;
- right: 4px;
- width: 24px;
- height: 24px;
- &:hover {
- background-color: rgb(var(--grey-300));
- }
- }
- & .active {
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- .grid-layout-wrap {
- width: calc(100% - 2 * var(--padding-sm) + 2 * var(--padding-xl));
- margin-left: calc(-1 * var(--padding-xl));
- padding-left: var(--padding-sm);
- .react-grid-item {
- transition: none;
- }
- }
-}
-:global .react-grid-item.react-grid-placeholder {
- background: rgb(var(--grey-300)) !important;
-}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
index 8db470aacd..9df3e6d181 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/panel/rule-list/index.tsx
@@ -40,7 +40,6 @@ import GridLayout from 'react-grid-layout';
import { debounceTime, Observable } from 'rxjs';
import { ConditionalFormattingI18nController } from '../../../controllers/cf.i18n.controller';
import { Preview } from '../../preview';
-import styles from './index.module.less';
import 'react-grid-layout/css/styles.css';
import 'react-resizable/css/styles.css';
@@ -319,13 +318,13 @@ export const RuleList = (props: IRuleListProps) => {
}, [ruleList]);
return (
- <div className={styles.cfRuleList}>
- <div className={styles.ruleSelector}>
- <div>
+ <div>
+ <div className="univer-flex univer-items-center univer-justify-between univer-gap-2 univer-text-sm">
+ <div className="univer-flex univer-items-center univer-gap-2">
{conditionalFormattingI18nController.tWithReactNode(
'sheet.cf.panel.managerRuleSelect',
<Select
- className={styles.select}
+ className="univer-w-36"
options={selectOption}
value={selectValue}
onChange={(v) => { setSelectValue(v); }}
@@ -334,97 +333,119 @@ export const RuleList = (props: IRuleListProps) => {
</div>
<div className="univer-flex univer-justify-end">
<Tooltip title={localeService.t('sheet.cf.panel.createRule')} placement="bottom">
- <div
- className="univer-size-5"
+ <a
+ className="univer-size-5 univer-cursor-pointer"
onClick={handleCreate}
>
<IncreaseSingle />
- </div>
+ </a>
</Tooltip>
{(ruleList.length && isHasAllRuleEditPermission)
? (
<Tooltip title={localeService.t('sheet.cf.panel.clear')} placement="bottom">
- <div
- className={clsx(styles.gap, 'univer-size-5')}
+ <a
+ className="univer-size-5 univer-cursor-pointer"
onClick={handleClear}
>
- <DeleteSingle />
- </div>
+ <DeleteSingle className="univer-text-red-500" />
+ </a>
</Tooltip>
)
: (
- <div className={clsx(styles.gap, styles.disabled)}>
- <DeleteSingle />
+ <div>
+ <DeleteSingle className="univer-text-gray-300" />
</div>
)}
</div>
</div>
- <div ref={layoutContainerRef} className={styles.gridLayoutWrap}>
- {layoutWidth
- ? (
- <GridLayout
- draggableHandle=".draggableHandle"
- layout={layout}
- cols={12}
- rowHeight={60}
- width={layoutWidth}
- margin={[0, 10]}
- onDragStop={handleDragStop}
- onDragStart={handleDragStart}
- >
- {ruleListByPermissionCheck?.map((rule, index) => {
- return (
- <div key={`${rule.cfId}`}>
+
+ <div ref={layoutContainerRef}>
+ {layoutWidth > 0 && (
+ <GridLayout
+ className={`
+ [&_.react-grid-item]:univer-transition-none
+ [&_.react-grid-placeholder]:univer-rounded [&_.react-grid-placeholder]:!univer-bg-gray-200
+ `}
+ draggableHandle=".draggableHandle"
+ layout={layout}
+ cols={12}
+ rowHeight={60}
+ width={layoutWidth}
+ margin={[0, 10]}
+ onDragStop={handleDragStop}
+ onDragStart={handleDragStart}
+ >
+ {ruleListByPermissionCheck?.map((rule, index) => {
+ return (
+ <div key={`${rule.cfId}`}>
+ <div
+ className={clsx(`
+ univer-group univer-relative univer-flex univer-items-center
+ univer-justify-between univer-rounded univer-py-2 univer-pl-5 univer-pr-8
+ hover:univer-bg-gray-100
+ `, {
+ 'univer-bg-gray-100': draggingId === index,
+ })}
+ onMouseMove={() => {
+ rule.ranges !== currentRuleRanges && currentRuleRangesSet(rule.ranges);
+ }}
+ onMouseLeave={() => currentRuleRangesSet([])}
+ onClick={() => {
+ onClick(rule);
+ }}
+ >
<div
- className={clsx(styles.ruleItem, {
- [styles.active]: draggingId === index,
- })}
- onMouseMove={() => {
- rule.ranges !== currentRuleRanges && currentRuleRangesSet(rule.ranges);
- }}
- onMouseLeave={() => currentRuleRangesSet([])}
- onClick={() => {
- onClick(rule);
- }}
+ className={clsx(`
+ univer-absolute univer-left-0 univer-hidden univer-size-5
+ univer-cursor-grab univer-items-center univer-justify-center
+ univer-rounded
+ group-hover:univer-flex
+ `, 'draggableHandle')}
+ onClick={(e) => e.stopPropagation()}
>
- <div
- className={clsx(styles.draggableHandle, 'draggableHandle')}
- onClick={(e) => e.stopPropagation()}
- >
- <SequenceSingle />
- </div>
- <div className={styles.ruleDescribe}>
- <div className={styles.ruleType}>
- {getRuleDescribe(rule, localeService)}
- </div>
- <div className={styles.ruleRange}>
- {rule.ranges.map((range) => serializeRange(range)).join(',')}
- </div>
- </div>
- <div>
- <Preview rule={rule.rule} />
+ <SequenceSingle />
+ </div>
+ <div
+ className={`
+ univer-min-w-0 univer-max-w-full univer-flex-shrink univer-overflow-hidden
+ `}
+ >
+ <div className="univer-text-sm univer-text-gray-900">
+ {getRuleDescribe(rule, localeService)}
</div>
- <div
- className={clsx(styles.deleteItem, {
- [styles.active]: draggingId === index,
- })}
- onClick={(e) => {
- e.stopPropagation();
- handleDelete(rule);
- currentRuleRangesSet([]);
- }}
- >
- <DeleteSingle />
+ <div className="univer-text-xs univer-text-gray-400">
+ {rule.ranges.map((range) => serializeRange(range)).join(',')}
</div>
</div>
+ <div>
+ <Preview rule={rule.rule} />
+ </div>
+ <div
+ className={clsx(`
+ univer-absolute univer-right-1 univer-hidden univer-size-6
+ univer-cursor-pointer univer-items-center univer-justify-center
+ univer-rounded
+ group-hover:univer-flex
+ hover:univer-bg-gray-200
+ `, {
+ 'univer-flex univer-items-center univer-justify-center': draggingId === index,
+ })}
+ onClick={(e) => {
+ e.stopPropagation();
+ handleDelete(rule);
+ currentRuleRangesSet([]);
+ }}
+ >
+ <DeleteSingle />
+ </div>
</div>
- );
- })}
- </GridLayout>
- )
- : null}
+ </div>
+ );
+ })}
+ </GridLayout>
+ ) }
</div>
</div>
);
diff --git a/packages/sheets-conditional-formatting-ui/src/components/preview/index.module.less b/packages/sheets-conditional-formatting-ui/src/components/preview/index.module.less
deleted file mode 100644
index 47c06d9025..0000000000
--- a/packages/sheets-conditional-formatting-ui/src/components/preview/index.module.less
+++ /dev/null
@@ -1,9 +0,0 @@
-.cf-preview {
- display: flex;
- align-items: center;
- justify-content: center;
- pointer-events: none;
- min-width: 72px;
- height: 20px;
- font-size: 12px;
-}
diff --git a/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx
index b7cda628e3..25afadd3bb 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx
@@ -16,16 +16,16 @@
import type { IConditionalFormattingRuleConfig } from '@univerjs/sheets-conditional-formatting';
import { BooleanNumber, ColorKit } from '@univerjs/core';
+import { clsx } from '@univerjs/design';
import { SlashSingle } from '@univerjs/icons';
import { CFRuleType, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, defaultDataBarNativeColor, defaultDataBarPositiveColor, getColorScaleFromValue, iconMap } from '@univerjs/sheets-conditional-formatting';
-import React, { useMemo } from 'react';
-import styles from './index.module.less';
+import { useMemo } from 'react';
export const Preview = (props: { rule?: IConditionalFormattingRuleConfig }) => {
const rule = props.rule;
- if (!rule) {
- return null;
- }
+
+ if (!rule) return null;
+
const colorList = useMemo(() => {
if (rule.type === CFRuleType.colorScale) {
const config = rule.config.map((c, index) => ({ color: new ColorKit(c.color), value: index }));
@@ -35,6 +35,7 @@ export const Preview = (props: { rule?: IConditionalFormattingRuleConfig }) => {
}
return null;
}, [rule]);
+
const iconSet = useMemo(() => {
if (rule.type === CFRuleType.iconSet) {
return rule.config.map((item) => {
@@ -43,34 +44,53 @@ export const Preview = (props: { rule?: IConditionalFormattingRuleConfig }) => {
});
}
}, [rule]);
+
+ const previewClassName = `univer-pointer-events-none univer-flex univer-h-5 univer-min-w-[72px] univer-items-center
+ univer-justify-center univer-text-xs`;
+
switch (rule.type) {
case CFRuleType.dataBar:
{
const { isGradient } = rule.config;
- const commonStyle = { width: '50%', height: '100%' };
const positiveColor = isGradient ? `linear-gradient(to right, ${rule.config.positiveColor || defaultDataBarPositiveColor}, rgb(255 255 255))` : rule.config.positiveColor;
const nativeColor = isGradient ? `linear-gradient(to right, rgb(255 255 255),${rule.config.nativeColor || defaultDataBarNativeColor})` : rule.config.nativeColor;
+
return (
- <div className={styles.cfPreview}>
- <div style={{ ...commonStyle, background: nativeColor, border: `1px solid ${rule.config.nativeColor || defaultDataBarNativeColor}` }} />
- <div style={{ ...commonStyle, background: positiveColor, border: `1px solid ${rule.config.positiveColor || defaultDataBarPositiveColor}` }} />
+ <div className={previewClassName}>
+ <div
+ className="univer-h-full univer-w-1/2"
+ style={{
+ background: nativeColor,
+ border: `1px solid ${rule.config.nativeColor || defaultDataBarNativeColor}`,
+ }}
+ />
+ <div
+ className="univer-h-full univer-w-1/2"
+ style={{
+ background: positiveColor,
+ border: `1px solid ${rule.config.positiveColor || defaultDataBarPositiveColor}`,
+ }}
+ />
</div>
);
}
case CFRuleType.colorScale: {
return colorList && (
- <div className={styles.cfPreview}>
+ <div className={previewClassName}>
{colorList.map((item, index) => (
- <div key={index} style={{ width: `${100 / colorList.length}%`, height: '100%', background: item }} />
+ <div key={index} className="univer-h-full" style={{ width: `${100 / colorList.length}%`, background: item }} />
))}
</div>
);
}
case CFRuleType.iconSet: {
return iconSet && (
- <div className={styles.cfPreview}>
- {iconSet.map((base64, index) => (base64 ? <img style={{ height: '100%' }} key={index} src={base64} /> : <SlashSingle key={index} />))}
+ <div className={previewClassName}>
+ {iconSet.map((base64, index) => (
+ base64 ?
+ <img key={index} className="univer-h-full" src={base64} draggable={false} />
+ : <SlashSingle key={index} />))}
</div>
);
}
@@ -83,18 +103,22 @@ export const Preview = (props: { rule?: IConditionalFormattingRuleConfig }) => {
const bgColor = bg?.rgb ?? DEFAULT_BG_COLOR;
const fontColor = cl?.rgb ?? DEFAULT_FONT_COLOR;
const style = {
- fontWeight: isBold ? 'bold' : undefined,
- fontStyle: isItalic ? 'italic' : undefined,
- textDecoration: `${isUnderline ? 'underline' : ''} ${isStrikethrough ? 'line-through' : ''}`.replace(/^ /, '') || undefined,
+ textDecoration: `${isUnderline ? 'underline' : ''} ${isStrikethrough ? 'line-through' : ''}`.replace(/^ /, '') ?? undefined,
backgroundColor: bgColor,
color: fontColor,
};
+
return (
- <div style={style} className={styles.cfPreview}>
+ <div
+ className={clsx(previewClassName, {
+ 'univer-font-bold': isBold,
+ 'univer-italic': isItalic,
+ })}
+ style={style}
+ >
123
</div>
);
}
}
- return null;
};
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
index 2a13f9e040..5f3ab715f3 100644
--- a/packages/sheets-conditional-formatting/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -80,10 +80,10 @@
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
- "@univerjs/icons-svg": "^0.3.22",
+ "@univerjs/icons-svg": "^0.3.24",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json
index 7dfa9faa4a..98ff0b6336 100644
--- a/packages/sheets-crosshair-highlight/package.json
+++ b/packages/sheets-crosshair-highlight/package.json
@@ -92,7 +92,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json
index aef8e60875..3a69c9b944 100644
--- a/packages/sheets-data-validation-ui/package.json
+++ b/packages/sheets-data-validation-ui/package.json
@@ -90,7 +90,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.json
index 6067e9e5f6..e3664215c6 100644
--- a/packages/sheets-data-validation/package.json
+++ b/packages/sheets-data-validation/package.json
@@ -84,7 +84,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-drawing-ui/package.json b/packages/sheets-drawing-ui/package.json
index 956cd2c181..8a0a1a8fcb 100644
--- a/packages/sheets-drawing-ui/package.json
+++ b/packages/sheets-drawing-ui/package.json
@@ -98,7 +98,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-drawing/package.json b/packages/sheets-drawing/package.json
index 92d1a9a5d2..2a094afce2 100644
--- a/packages/sheets-drawing/package.json
+++ b/packages/sheets-drawing/package.json
@@ -63,7 +63,7 @@
"@univerjs-infra/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index 8f8e8af9d5..8a5a4049ad 100644
--- a/packages/sheets-filter-ui/package.json
+++ b/packages/sheets-filter-ui/package.json
@@ -84,7 +84,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-filter/package.json b/packages/sheets-filter/package.json
index 4345ecd2fe..6f5fa87a1f 100644
--- a/packages/sheets-filter/package.json
+++ b/packages/sheets-filter/package.json
@@ -79,7 +79,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.json
index ac58bf5d42..070ef79a85 100644
--- a/packages/sheets-find-replace/package.json
+++ b/packages/sheets-find-replace/package.json
@@ -88,7 +88,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json
index c892521eb3..61d3fd99cf 100644
--- a/packages/sheets-formula-ui/package.json
+++ b/packages/sheets-formula-ui/package.json
@@ -97,7 +97,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json
index a17fb6c4d7..9f32d27b9e 100644
--- a/packages/sheets-formula/package.json
+++ b/packages/sheets-formula/package.json
@@ -87,7 +87,7 @@
"@univerjs/docs": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-graphics/package.json b/packages/sheets-graphics/package.json
index 46dfaf2dec..acd61fe81d 100644
--- a/packages/sheets-graphics/package.json
+++ b/packages/sheets-graphics/package.json
@@ -63,7 +63,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index a518641d4f..e30ab3598d 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -100,7 +100,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-hyper-link/package.json b/packages/sheets-hyper-link/package.json
index cc4641cbfe..d6388d6f91 100644
--- a/packages/sheets-hyper-link/package.json
+++ b/packages/sheets-hyper-link/package.json
@@ -80,7 +80,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-note-ui/package.json b/packages/sheets-note-ui/package.json
index a1b95f5932..2c82a421c7 100644
--- a/packages/sheets-note-ui/package.json
+++ b/packages/sheets-note-ui/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/sheets-note-ui",
- "version": "0.6.10",
+ "version": "0.7.0-beta.0",
"private": false,
"description": "Univer sheets note UI plugin",
"author": "DreamNum <[email protected]>",
@@ -64,6 +64,7 @@
},
"dependencies": {
"@univerjs/core": "workspace:*",
+ "@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.3.24",
"@univerjs/sheets": "workspace:*",
@@ -75,9 +76,10 @@
"devDependencies": {
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
- "less": "^4.1.3",
- "typescript": "^5.4.3",
- "vite": "^4.5.2",
- "vitest": "^1.3.1"
+ "postcss": "^8.5.3",
+ "tailwindcss": "^3.4.17",
+ "typescript": "^5.8.3",
+ "vite": "^6.3.4",
+ "vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-note-ui/src/global.css b/packages/sheets-note-ui/src/global.css
new file mode 100644
index 0000000000..7c05d4ddc4
--- /dev/null
+++ b/packages/sheets-note-ui/src/global.css
@@ -0,0 +1,2 @@
+@tailwind components;
+@tailwind utilities;
diff --git a/packages/sheets-note-ui/src/index.ts b/packages/sheets-note-ui/src/index.ts
index ebc94d42b5..049a0ac636 100644
--- a/packages/sheets-note-ui/src/index.ts
+++ b/packages/sheets-note-ui/src/index.ts
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import './global.css';
+
export * from './plugin';
export * from './services/sheets-note-popup.service';
export * from './views/note';
diff --git a/packages/sheets-note-ui/src/views/note.tsx b/packages/sheets-note-ui/src/views/note.tsx
index 25ae1ca79e..cfa9ab6b5d 100644
--- a/packages/sheets-note-ui/src/views/note.tsx
+++ b/packages/sheets-note-ui/src/views/note.tsx
@@ -19,6 +19,7 @@ import type { ISheetNote } from '@univerjs/sheets-note';
import type { IPopup } from '@univerjs/ui';
import type { IUniverSheetsNoteUIPluginConfig } from '../plugin';
import { ICommandService, LocaleService } from '@univerjs/core';
+import { clsx, scrollbarClassName } from '@univerjs/design';
import { SheetDeleteNoteCommand, SheetsNoteModel, SheetUpdateNoteCommand } from '@univerjs/sheets-note';
import { useConfigValue, useDebounceFn, useDependency } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
@@ -111,16 +112,17 @@ export const SheetsNote = (props: { popup: IPopup<{ location: ISheetLocationBase
return (
<textarea
- style={{ width: note.width, height: note.height }}
ref={textareaRef}
- className={`
- univer-note-textarea univer-resize-both univer-ml-[1px] univer-rounded univer-border univer-border-solid
- univer-border-gray-200 univer-p-2 univer-shadow
+ data-u-comp="note-textarea"
+ className={clsx(`
+ univer-resize-both univer-ml-[1px] univer-rounded univer-border univer-border-solid univer-border-gray-200
+ univer-p-2 univer-shadow
focus:univer-outline-none
- `}
+ `, scrollbarClassName)}
+ style={{ width: note.width, height: note.height }}
value={note.note}
- onChange={handleNoteChange}
placeholder={localeService.t('note.placeholder')}
+ onChange={handleNoteChange}
/>
);
};
diff --git a/packages/sheets-note/package.json b/packages/sheets-note/package.json
index 6fc78c3b79..c04ac763e6 100644
--- a/packages/sheets-note/package.json
+++ b/packages/sheets-note/package.json
@@ -1,6 +1,6 @@
{
"name": "@univerjs/sheets-note",
- "version": "0.6.10",
+ "version": "0.7.0-beta.0",
"private": false,
"description": "Univer sheets note base plugin",
"author": "DreamNum <[email protected]>",
@@ -77,7 +77,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-note/src/plugin.ts b/packages/sheets-note/src/plugin.ts
index 18a9f3a41a..b0d9dfe3b8 100644
--- a/packages/sheets-note/src/plugin.ts
+++ b/packages/sheets-note/src/plugin.ts
@@ -30,8 +30,8 @@ export class SheetsNotePlugin extends Plugin {
static override type = UniverInstanceType.UNIVER_SHEET;
constructor(
- @Inject(Injector) protected override readonly _injector: Injector,
- @IConfigService private readonly _configService: IConfigService
+ @IConfigService private readonly _configService: IConfigService,
+ @Inject(Injector) protected override readonly _injector: Injector
) {
super();
}
diff --git a/packages/sheets-numfmt-ui/package.json b/packages/sheets-numfmt-ui/package.json
index daed6f861b..23e470aeec 100644
--- a/packages/sheets-numfmt-ui/package.json
+++ b/packages/sheets-numfmt-ui/package.json
@@ -87,7 +87,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-numfmt/package.json b/packages/sheets-numfmt/package.json
index 9bd1f3ab6e..8738827222 100644
--- a/packages/sheets-numfmt/package.json
+++ b/packages/sheets-numfmt/package.json
@@ -81,7 +81,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json
index 8161c5adfa..bee8500bd0 100644
--- a/packages/sheets-sort-ui/package.json
+++ b/packages/sheets-sort-ui/package.json
@@ -84,7 +84,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-sort/package.json b/packages/sheets-sort/package.json
index 163cbc7493..38d634abce 100644
--- a/packages/sheets-sort/package.json
+++ b/packages/sheets-sort/package.json
@@ -80,7 +80,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-table-ui/package.json b/packages/sheets-table-ui/package.json
index 6ae60f568b..72cc51bb30 100644
--- a/packages/sheets-table-ui/package.json
+++ b/packages/sheets-table-ui/package.json
@@ -90,7 +90,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-table/package.json b/packages/sheets-table/package.json
index 4a8ca05c30..336b1e1fbd 100644
--- a/packages/sheets-table/package.json
+++ b/packages/sheets-table/package.json
@@ -81,7 +81,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-thread-comment-ui/package.json b/packages/sheets-thread-comment-ui/package.json
index f20ced6351..207bb98662 100644
--- a/packages/sheets-thread-comment-ui/package.json
+++ b/packages/sheets-thread-comment-ui/package.json
@@ -84,7 +84,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-thread-comment/package.json b/packages/sheets-thread-comment/package.json
index 03b25395f2..994a4aa1bc 100644
--- a/packages/sheets-thread-comment/package.json
+++ b/packages/sheets-thread-comment/package.json
@@ -79,7 +79,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 4d0e66e507..c69cfe44d7 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -100,7 +100,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets-ui/src/views/count-bar/CountBar.tsx b/packages/sheets-ui/src/views/count-bar/CountBar.tsx
index d476475e56..a7dff0652b 100644
--- a/packages/sheets-ui/src/views/count-bar/CountBar.tsx
+++ b/packages/sheets-ui/src/views/count-bar/CountBar.tsx
@@ -14,9 +14,6 @@
* limitations under the License.
*/
-import React from 'react';
-
-import styles from './index.module.less';
import { ZoomSlider } from './ZoomSlider';
interface ICountBarProps {
@@ -26,7 +23,7 @@ interface ICountBarProps {
export function CountBar(props: ICountBarProps) {
return (
- <section className={styles.countBar}>
+ <section className="univer-flex univer-flex-shrink-0 univer-justify-end">
<ZoomSlider />
</section>
);
diff --git a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
index f1529e4506..57cc313286 100644
--- a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
@@ -16,15 +16,12 @@
import type { IScrollState } from './sheet-bar-tabs/utils/slide-tab-bar';
import { ICommandService, IPermissionService } from '@univerjs/core';
-import { clsx } from '@univerjs/design';
import { IncreaseSingle, MoreSingle } from '@univerjs/icons';
import { InsertSheetCommand, WorkbookCreateSheetPermission, WorkbookEditablePermission } from '@univerjs/sheets';
-
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { useActiveWorkbook } from '../../components/hook';
import { ISheetBarService } from '../../services/sheet-bar/sheet-bar.service';
-import styles from './index.module.less';
import { SheetBarButton } from './sheet-bar-button/SheetBarButton';
import { SheetBarMenu } from './sheet-bar-menu/SheetBarMenu';
import { SheetBarTabs } from './sheet-bar-tabs/SheetBarTabs';
@@ -78,8 +75,8 @@ export const SheetBar = () => {
};
return (
- <div className={clsx(styles.sheetBar, 'univer-relative univer-flex univer-h-full univer-flex-1')}>
- <div className={styles.sheetBarOptions}>
+ <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">
{/* Add sheet button */}
<SheetBarButton onClick={addSheet} disabled={!(workbookCreateSheetPermission?.value && workbookEditablePermission?.value)}>
<IncreaseSingle />
@@ -95,12 +92,13 @@ export const SheetBar = () => {
{(!leftScrollState || !rightScrollState) && (
<div
className={`
- ${styles.sheetBarOptions}
- ${styles.sheetBarOptionsDivider}
+ univer-relative univer-flex univer-items-center univer-px-2
+ after:univer-absolute after:univer-right-0 after:univer-top-1/2 after:univer-h-4 after:univer-w-px
+ after:-univer-translate-y-1/2 after:univer-bg-gray-200 after:univer-content-[""]
`}
>
<SheetBarButton disabled={leftScrollState} onClick={handleScrollLeft}>
- <MoreSingle style={{ transform: 'rotateZ(180deg)' }} />
+ <MoreSingle className="univer-rotate-180" />
</SheetBarButton>
<SheetBarButton disabled={rightScrollState} onClick={handleScrollRight}>
<MoreSingle />
diff --git a/packages/sheets-ui/src/views/sheet-bar/index.module.less b/packages/sheets-ui/src/views/sheet-bar/index.module.less
deleted file mode 100644
index d3e81a9450..0000000000
--- a/packages/sheets-ui/src/views/sheet-bar/index.module.less
+++ /dev/null
@@ -1,31 +0,0 @@
-@sheet-bar-max-width: 1515px;
-@status-bar-max-width: 332px;
-@zoom-slider-width: 260px;
-@margin-right: -4px;
-
-.sheet-bar {
- min-width: calc(100% - @zoom-slider-width - @status-bar-max-width);
- max-width: calc(100% - @zoom-slider-width);
-
- &-options {
- display: flex;
- flex-direction: row;
- align-items: center;
-
- margin: var(--margin-xxs);
-
- transition: display 0.2s;
-
- &-divider::after {
- content: '';
-
- display: block;
-
- width: 1px;
- height: 16px;
- margin: 0 var(--margin-xs);
-
- background-color: rgb(var(--grey-400));
- }
- }
-}
diff --git a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
index 5586f3084d..ff4043e80a 100644
--- a/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
+++ b/packages/sheets-ui/src/views/sheet-container/SheetContainer.tsx
@@ -56,7 +56,7 @@ export function RenderSheetFooter() {
{sheetBar && <SheetBar />}
{statisticBar && <StatusBar />}
{menus && footerMenus.length && (
- <div className="univer-mr-2 univer-flex univer-gap-2">
+ <div className="univer-box-border univer-flex univer-gap-2 univer-px-2">
{footerMenus.map((item) => item.children?.map((child) => (
child?.item && (
<ToolbarItem
diff --git a/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx b/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx
index cdc08f1bbe..4e33491779 100644
--- a/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx
+++ b/packages/sheets-ui/src/views/status-bar/CopyableStatisticItem.tsx
@@ -15,13 +15,11 @@
*/
import type { IFunctionNames } from '@univerjs/engine-formula';
+import type { FC } from 'react';
import { LocaleService, numfmt } from '@univerjs/core';
import { MessageType, Tooltip } from '@univerjs/design';
import { FUNCTION_NAMES_MATH, FUNCTION_NAMES_STATISTICAL, FUNCTION_NAMES_TEXT } from '@univerjs/engine-formula';
import { IClipboardInterfaceService, IMessageService, useDependency } from '@univerjs/ui';
-import React from 'react';
-
-import styles from './index.module.less';
export interface IStatisticItem {
name: IFunctionNames;
@@ -52,7 +50,7 @@ interface IFunctionNameMap {
[key: string]: string;
}
-export const CopyableStatisticItem: React.FC<IStatisticItem> = (item: IStatisticItem) => {
+export const CopyableStatisticItem: FC<IStatisticItem> = (item: IStatisticItem) => {
const localeService = useDependency(LocaleService);
const messageService = useDependency(IMessageService);
const clipboardService = useDependency(IClipboardInterfaceService);
@@ -68,7 +66,14 @@ export const CopyableStatisticItem: React.FC<IStatisticItem> = (item: IStatistic
};
return (
<Tooltip title={localeService.t('statusbar.clickToCopy')} placement="top">
- <div key={item.name} className={styles.statisticItem} onClick={copyToClipboard}>
+ <div
+ key={item.name}
+ className={`
+ univer-flex univer-max-w-24 univer-cursor-default univer-truncate univer-text-center univer-text-xs
+ univer-text-gray-400
+ `}
+ onClick={copyToClipboard}
+ >
<span>
{`${localeService.t(
functionDisplayNames?.[item.name as string] || (item.name as string)
diff --git a/packages/sheets-ui/src/views/status-bar/StatusBar.tsx b/packages/sheets-ui/src/views/status-bar/StatusBar.tsx
index 2409989c01..14a50c43c3 100644
--- a/packages/sheets-ui/src/views/status-bar/StatusBar.tsx
+++ b/packages/sheets-ui/src/views/status-bar/StatusBar.tsx
@@ -15,17 +15,17 @@
*/
import type { Nullable } from '@univerjs/core';
+import type { ComponentType } from 'react';
import type { IUniverSheetsUIConfig } from '../../controllers/config.schema';
import type { IStatusBarServiceStatus, StatusBarService } from '../../services/status-bar.service';
import type { IStatisticItem } from './CopyableStatisticItem';
import { debounce } from '@univerjs/core';
import { clsx } from '@univerjs/design';
import { useConfigValue, useDependency } from '@univerjs/ui';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { SHEETS_UI_PLUGIN_CONFIG_KEY } from '../../controllers/config.schema';
import { IStatusBarService } from '../../services/status-bar.service';
import { CopyableStatisticItem } from './CopyableStatisticItem';
-import styles from './index.module.less';
const SINGLE_MODE_WIDTH = 800;
const ROW_COUNT_THRESHOLD = 3;
@@ -120,10 +120,10 @@ export const StatusBar = () => {
const useStatisticLayout = (
showList: IStatisticItem[],
rowCountThreshold: number,
- CopyableStatisticItem: React.ComponentType<IStatisticItem>
+ CopyableStatisticItem: ComponentType<IStatisticItem>
) => {
if (!showStatistic) return null;
- const renderContent = React.useMemo(() => {
+ const renderContent = useMemo(() => {
if (showList.length > rowCountThreshold) {
const doubleLineList = showList.reduce<IStatisticItem[][]>((acc, _, index) => {
if (index % 2 === 0) {
@@ -135,10 +135,7 @@ export const StatusBar = () => {
return (
<>
{doubleLineList.map((item, index) => (
- <div
- key={`stat-col-${index}`}
- className={styles.statisticListColumn}
- >
+ <div key={`stat-col-${index}`}>
{item[0] && (
<CopyableStatisticItem
key={item[0].name}
@@ -177,12 +174,16 @@ export const StatusBar = () => {
return (
show && (
<div
- className={clsx(styles.statusBar, {
- [styles.singleMode]: isSingle,
+ className={clsx(`
+ univer-relative univer-box-border univer-flex univer-items-center univer-px-2
+ after:univer-absolute after:univer-right-0 after:univer-top-1/2 after:univer-block after:univer-h-4
+ after:univer-w-px after:-univer-translate-y-1/2 after:univer-bg-gray-200 after:univer-content-[""]
+ `, {
+ 'univer-max-w-32': isSingle,
+ 'univer-max-w-80': !isSingle,
})}
>
- <div className="univer-flex">{renderContent}</div>
- <div className={styles.statusBarDiv} />
+ <div className="univer-flex univer-gap-x-2">{renderContent}</div>
</div>
)
);
diff --git a/packages/sheets-ui/src/views/status-bar/index.module.less b/packages/sheets-ui/src/views/status-bar/index.module.less
deleted file mode 100644
index 63778ce61e..0000000000
--- a/packages/sheets-ui/src/views/status-bar/index.module.less
+++ /dev/null
@@ -1,93 +0,0 @@
-@statistic-menu-value-width: 55px;
-
-.status-bar {
- display: flex;
- align-items: center;
- max-width: 332px;
-
- &.single-mode {
- max-width: 136px;
- }
-}
-
-.status-bar-div {
- width: 1px;
- height: 16px;
- margin-left: 10px;
- background: rgb(var(--grey-400, #ccc));
-}
-
-.statistic {
- &-list-column &-item {
- font-size: 12px;
- line-height: 140%;
- color: rgb(var(--grey-500));
- }
-
- &-item {
- cursor: default;
-
- overflow: hidden;
- display: flex;
- justify-content: flex-start;
-
- max-width: 106px;
- margin-right: 8px;
-
- font-size: var(--font-size-xxs);
- font-weight: 400;
- font-style: normal;
- line-height: 20px; /* 181.818% */
- color: rgb(var(--grey-900));
- text-align: center;
- text-overflow: ellipsis;
- white-space: nowrap;
-
- &:hover {
- color: rgb(var(--color-black));
- }
- }
-
- &-picker {
- display: grid;
- gap: var(--margin-sm);
- align-items: center;
-
- box-sizing: border-box;
- width: 196px;
- padding: var(--padding-base);
-
- font-size: var(--font-size-xs);
-
- background-color: rgb(var(--color-white));
- border: 1px solid rgb(var(--border-color));
- border-radius: var(--border-radius-lg);
- box-shadow: var(--box-shadow-lg);
- }
-
- &-picker-item {
- display: flex;
- align-items: center;
- justify-content: flex-start;
- }
-
- &-more {
- transform: rotate(90deg);
-
- display: flex;
- align-items: center;
- justify-content: center;
-
- width: 24px;
- height: 24px;
-
- font-size: 12px;
- color: rgb(var(--grey-600, #e8e8e8));
-
- border-radius: 4px;
-
- &:hover {
- background: rgb(var(--grey-300, #e8e8e8));
- }
- }
-}
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index ebfc203fbc..309d2f8781 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -97,7 +97,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/sheets/package.json b/packages/sheets/package.json
index b7906dd03e..715661787b 100644
--- a/packages/sheets/package.json
+++ b/packages/sheets/package.json
@@ -90,7 +90,7 @@
"@univerjs/network": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index f7e49cae98..c00aa3ecff 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -85,7 +85,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/slides/package.json b/packages/slides/package.json
index d05c878a9a..50ec567fae 100644
--- a/packages/slides/package.json
+++ b/packages/slides/package.json
@@ -64,7 +64,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
index 99b18b9927..9490af9dd8 100644
--- a/packages/telemetry/package.json
+++ b/packages/telemetry/package.json
@@ -60,7 +60,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index e353c24162..5f4f531db9 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -81,7 +81,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/thread-comment/package.json b/packages/thread-comment/package.json
index c18727c647..801689113d 100644
--- a/packages/thread-comment/package.json
+++ b/packages/thread-comment/package.json
@@ -66,7 +66,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 2819e826ad..39d5bd72eb 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -100,7 +100,7 @@
"tailwindcss": "^3.4.17",
"tailwindcss-animate": "^1.0.7",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2",
"vue": "^3.5.13"
}
diff --git a/packages/ui/src/components/slider/Slider.tsx b/packages/ui/src/components/slider/Slider.tsx
index 1dce6e497c..ad073582d6 100644
--- a/packages/ui/src/components/slider/Slider.tsx
+++ b/packages/ui/src/components/slider/Slider.tsx
@@ -176,7 +176,10 @@ export function Slider(props: ISliderProps) {
</Button>
<div
- className="univer-relative univer-h-0.5 univer-rounded-2xl univer-bg-gray-400 univer-px-1.5"
+ className={`
+ univer-relative univer-hidden univer-h-0.5 univer-rounded-2xl univer-bg-gray-400 univer-px-1.5
+ sm:univer-block
+ `}
style={{
width: `${SLIDER_WIDTH}px`,
}}
diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json
index 50144b0ce1..cba3d6f29b 100644
--- a/packages/uniscript/package.json
+++ b/packages/uniscript/package.json
@@ -83,7 +83,7 @@
"rxjs": "^7.8.1",
"tailwindcss": "^3.4.17",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/packages/watermark/package.json b/packages/watermark/package.json
index ad860cba18..5bdb9730fe 100644
--- a/packages/watermark/package.json
+++ b/packages/watermark/package.json
@@ -79,7 +79,7 @@
"@univerjs-infra/shared": "workspace:*",
"rxjs": "^7.8.1",
"typescript": "^5.8.3",
- "vite": "^6.3.3",
+ "vite": "^6.3.4",
"vitest": "^3.1.2"
}
}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 986c49a3b7..c13aa25d40 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -58,7 +58,7 @@ importers:
version: link:packages/design
'@vitejs/plugin-react':
specifier: ^4.4.1
eslint:
specifier: 9.25.1
version: 9.25.1([email protected])
@@ -96,8 +96,8 @@ importers:
specifier: ^15.5.1
version: 15.5.1
posthog-node:
- specifier: ^4.14.0
- version: 4.14.0
+ specifier: ^4.15.0
+ version: 4.15.0
react:
specifier: '19'
version: 19.0.0
@@ -126,14 +126,14 @@ importers:
common/shared:
dependencies:
'@typescript-eslint/parser':
- specifier: ^8.31.0
+ specifier: ^8.31.1
'@vitejs/plugin-react':
specifier: ^4.4.1
'@vitejs/plugin-vue':
specifier: ^5.2.3
'@vitest/coverage-istanbul':
specifier: ^3.1.2
@@ -168,11 +168,11 @@ importers:
specifier: ^0.1.1
version: 0.1.1
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vite-plugin-dts:
specifier: ^4.5.3
vite-plugin-external:
specifier: ^6.2.1
version: 6.2.1
@@ -187,8 +187,8 @@ importers:
specifier: ^0.3.24
'@univerjs/icons-svg':
- specifier: ^0.3.22
- version: 0.3.22
+ specifier: ^0.3.24
+ version: 0.3.24
'@univerjs/protocol':
specifier: 0.1.45
version: 0.1.45(@grpc/[email protected])([email protected])
@@ -338,8 +338,8 @@ importers:
specifier: workspace:*
version: link:../packages/find-replace
'@univerjs/icons':
- specifier: 0.3.23
+ specifier: 0.3.24
'@univerjs/mockdata':
specifier: workspace:*
version: link:../mockdata
@@ -638,8 +638,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -699,8 +699,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -728,8 +728,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -774,8 +774,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -793,8 +793,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -854,8 +854,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -912,8 +912,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -961,8 +961,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1019,8 +1019,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1086,8 +1086,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1114,8 +1114,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1220,8 +1220,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1245,8 +1245,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1267,8 +1267,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1328,8 +1328,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1347,8 +1347,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1399,8 +1399,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1442,8 +1442,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1503,8 +1503,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1555,8 +1555,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1613,8 +1613,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1638,8 +1638,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1687,8 +1687,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1724,8 +1724,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1739,8 +1739,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1779,8 +1779,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1822,8 +1822,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1844,8 +1844,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1866,8 +1866,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1891,8 +1891,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1931,8 +1931,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -1956,8 +1956,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@univerjs/icons-svg':
- specifier: ^0.3.22
- version: 0.3.22
+ specifier: ^0.3.24
+ version: 0.3.24
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1965,8 +1965,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2019,9 +2019,6 @@ importers:
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
- less:
- specifier: ^4.3.0
- version: 4.3.0
postcss:
specifier: ^8.5.3
version: 8.5.3
@@ -2038,8 +2035,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2087,8 +2084,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2124,8 +2121,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2191,8 +2188,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2216,8 +2213,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2283,8 +2280,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2314,8 +2311,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2372,8 +2369,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2406,8 +2403,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2440,8 +2437,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2501,8 +2498,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2526,8 +2523,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2560,8 +2557,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2627,8 +2624,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2652,8 +2649,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2663,6 +2660,9 @@ importers:
'@univerjs/core':
specifier: workspace:*
version: link:../core
+ '@univerjs/design':
+ specifier: workspace:*
+ version: link:../design
'@univerjs/engine-render':
specifier: workspace:*
version: link:../engine-render
@@ -2694,18 +2694,21 @@ importers:
'@types/react-dom':
specifier: '19'
version: 19.1.2(@types/[email protected])
- less:
- specifier: ^4.1.3
- version: 4.3.0
+ postcss:
+ specifier: ^8.5.3
+ version: 8.5.3
+ tailwindcss:
+ specifier: ^3.4.17
+ version: 3.4.17
typescript:
- specifier: ^5.4.3
+ specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^4.5.2
+ specifier: ^6.3.4
vitest:
- specifier: ^1.3.1
+ specifier: ^3.1.2
packages/sheets-numfmt:
dependencies:
@@ -2732,8 +2735,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2793,8 +2796,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2818,8 +2821,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2876,8 +2879,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2901,8 +2904,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2962,8 +2965,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -2993,8 +2996,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3051,8 +3054,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3118,8 +3121,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3176,8 +3179,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3198,8 +3201,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3253,8 +3256,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3272,8 +3275,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3297,8 +3300,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3346,8 +3349,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3401,8 +3404,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3451,8 +3454,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -3476,8 +3479,8 @@ importers:
specifier: ^5.8.3
version: 5.8.3
vite:
- specifier: ^6.3.3
+ specifier: ^6.3.4
vitest:
specifier: ^3.1.2
@@ -4108,258 +4111,66 @@ packages:
resolution: {integrity: sha512-+zZymuVLH6zVwXPtCAtC+bDymxmEwEqDftdAK+f407IF1bnX49anIxvBhCA1AqUIfD6egj1jM1vUnSuijjNyYg==}
engines: {node: '>=18'}
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
- engines: {node: '>=12'}
- cpu: [ppc64]
- os: [aix]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-wCIboOL2yXZym2cgm6mlA742s9QeJ8DjGVaL39dLN4rRwrOgOyYSnOaFPhKZGLb2ngj4EyfAFjsNJwPXZvseag==}
- engines: {node: '>=18'}
- cpu: [ppc64]
- os: [aix]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [aix]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [android]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [android]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-5ZAX5xOmTligeBaeNEPnPaeEuah53Id2tX4c2CVP3JaROTH+j4fnfHCkr1PjXMd78hMst+TlkfKcW/DlTq0i4w==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [android]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [android]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
- engines: {node: '>=12'}
- cpu: [arm]
- os: [android]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
- engines: {node: '>=12'}
- cpu: [arm]
- os: [android]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-NQhH7jFstVY5x8CKbcfa166GoV0EFkaPkCKBQkdPJFvo5u+nGXLEH/ooniLb3QI8Fk58YAx7nsPLozUWfCBOJA==}
- engines: {node: '>=18'}
- cpu: [arm]
- os: [android]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==}
engines: {node: '>=18'}
cpu: [arm]
os: [android]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [android]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [android]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-Ffcx+nnma8Sge4jzddPHCZVRvIfQ0kMsUsCMcJRHkGJ1cDmhe4SsrYIjLUKn1xpHZybmOqCWwB0zQvsjdEHtkg==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [android]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==}
engines: {node: '>=18'}
cpu: [x64]
os: [android]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [darwin]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [darwin]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-MpM6LUVTXAzOvN4KbjzU/q5smzryuoNjlriAIx+06RpecwCkL9JpenNzpKd2YMzLJFOdPqBpuub6eVRP5IgiSA==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [darwin]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==}
engines: {node: '>=18'}
cpu: [arm64]
os: [darwin]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [darwin]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [darwin]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-5eRPrTX7wFyuWe8FqEFPG2cU0+butQQVNcT4sVipqjLYQjjh8a8+vUTfgBKM88ObB85ahsnTwF7PSIt6PG+QkA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [darwin]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==}
engines: {node: '>=18'}
cpu: [x64]
os: [darwin]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [freebsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [freebsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-mLwm4vXKiQ2UTSX4+ImyiPdiHjiZhIaE9QvC7sw0tZ6HoNMjYAqQpGyui5VRIi5sGd+uWq940gdCbY3VLvsO1w==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [freebsd]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==}
engines: {node: '>=18'}
cpu: [arm64]
os: [freebsd]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [freebsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [freebsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-6qyyn6TjayJSwGpm8J9QYYGQcRgc90nmfdUb0O7pp1s4lTY+9D0H9O02v5JqGApUyiHOtkz6+1hZNvNtEhbwRQ==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [freebsd]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==}
engines: {node: '>=18'}
cpu: [x64]
os: [freebsd]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-gq/sjLsOyMT19I8obBISvhoYiZIAaGF8JpeXu1u8yPv8BE5HlWYobmlsfijFIZ9hIVGYkbdFhEqC0NvM4kNO0g==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==}
engines: {node: '>=18'}
cpu: [arm64]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
- engines: {node: '>=12'}
- cpu: [arm]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
- engines: {node: '>=12'}
- cpu: [arm]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-UHBRgJcmjJv5oeQF8EpTRZs/1knq6loLxTsjc3nxO9eXAPDLcWW55flrMVc97qFPbmZP31ta1AZVUKQzKTzb0g==}
- engines: {node: '>=18'}
- cpu: [arm]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==}
engines: {node: '>=18'}
cpu: [arm]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-bBYCv9obgW2cBP+2ZWfjYTU+f5cxRoGGQ5SeDbYdFCAZpYWrfjjfYwvUpP8MlKbP0nwZ5gyOU/0aUzZ5HWPuvQ==}
- engines: {node: '>=18'}
- cpu: [ia32]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==}
engines: {node: '>=18'}
@@ -4372,263 +4183,71 @@ packages:
cpu: [loong64]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
- engines: {node: '>=12'}
- cpu: [loong64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
- engines: {node: '>=12'}
- cpu: [loong64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-SHNGiKtvnU2dBlM5D8CXRFdd+6etgZ9dXfaPCeJtz+37PIUlixvlIhI23L5khKXs3DIzAn9V8v+qb1TRKrgT5w==}
- engines: {node: '>=18'}
- cpu: [loong64]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==}
engines: {node: '>=18'}
cpu: [loong64]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
- engines: {node: '>=12'}
- cpu: [mips64el]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
- engines: {node: '>=12'}
- cpu: [mips64el]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-hDDRlzE6rPeoj+5fsADqdUZl1OzqDYow4TB4Y/3PlKBD0ph1e6uPHzIQcv2Z65u2K0kpeByIyAjCmjn1hJgG0Q==}
- engines: {node: '>=18'}
- cpu: [mips64el]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==}
engines: {node: '>=18'}
cpu: [mips64el]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
- engines: {node: '>=12'}
- cpu: [ppc64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
- engines: {node: '>=12'}
- cpu: [ppc64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-tsHu2RRSWzipmUi9UBDEzc0nLc4HtpZEI5Ba+Omms5456x5WaNuiG3u7xh5AO6sipnJ9r4cRWQB2tUjPyIkc6g==}
- engines: {node: '>=18'}
- cpu: [ppc64]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
- engines: {node: '>=12'}
- cpu: [riscv64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
- engines: {node: '>=12'}
- cpu: [riscv64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-k4LtpgV7NJQOml/10uPU0s4SAXGnowi5qBSjaLWMojNCUICNu7TshqHLAEbkBdAszL5TabfvQ48kK84hyFzjnw==}
- engines: {node: '>=18'}
- cpu: [riscv64]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==}
engines: {node: '>=18'}
cpu: [riscv64]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
- engines: {node: '>=12'}
- cpu: [s390x]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
- engines: {node: '>=12'}
- cpu: [s390x]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-GRa4IshOdvKY7M/rDpRR3gkiTNp34M0eLTaC1a08gNrh4u488aPhuZOCpkF6+2wl3zAN7L7XIpOFBhnaE3/Q8Q==}
- engines: {node: '>=18'}
- cpu: [s390x]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==}
engines: {node: '>=18'}
cpu: [s390x]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [linux]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-QInHERlqpTTZ4FRB0fROQWXcYRD64lAoiegezDunLpalZMjcUcld3YzZmVJ2H/Cp0wJRZ8Xtjtj0cEHhYc/uUg==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [linux]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==}
engines: {node: '>=18'}
cpu: [x64]
os: [linux]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-talAIBoY5M8vHc6EeI2WW9d/CkiO9MQJ0IOWX8hrLhxGbro/vBXJvaQXefW2cP0z0nQVTdQ/eNyGFV1GSKrxfw==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [netbsd]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==}
engines: {node: '>=18'}
cpu: [arm64]
os: [netbsd]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [netbsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [netbsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-voZT9Z+tpOxrvfKFyfDYPc4DO4rk06qamv1a/fkuzHpiVBMOhpjK+vBmWM8J1eiB3OLSMFYNaOaBNLXGChf5tg==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [netbsd]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==}
engines: {node: '>=18'}
cpu: [x64]
os: [netbsd]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-dcXYOC6NXOqcykeDlwId9kB6OkPUxOEqU+rkrYVqJbK2hagWOMrsTGsMr8+rW02M+d5Op5NNlgMmjzecaRf7Tg==}
- engines: {node: '>=18'}
- cpu: [arm64]
- os: [openbsd]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [openbsd]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [openbsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [openbsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-t/TkWwahkH0Tsgoq1Ju7QfgGhArkGLkF1uYz8nQS/PPFlXbP5YgRpqQR3ARRiC2iXoLTWFxc6DJMSK10dVXluw==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [openbsd]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [openbsd]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [sunos]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [sunos]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-cfZH1co2+imVdWCjd+D1gf9NjkchVhhdpgb1q5y6Hcv9TP6Zi9ZG/beI3ig8TvwT9lH9dlxLq5MQBBgwuj4xvA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [sunos]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [sunos]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [win32]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
- engines: {node: '>=12'}
- cpu: [arm64]
- os: [win32]
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [openbsd]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-7Loyjh+D/Nx/sOTzV8vfbB3GJuHdOQyrOryFdZvPHLf42Tk9ivBU5Aedi7iyX+x6rbn2Mh68T4qq1SDqJBQO5Q==}
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==}
engines: {node: '>=18'}
- cpu: [arm64]
- os: [win32]
+ cpu: [x64]
+ os: [sunos]
'@esbuild/[email protected]':
resolution: {integrity: sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==}
@@ -4636,48 +4255,12 @@ packages:
cpu: [arm64]
os: [win32]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [win32]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
- engines: {node: '>=12'}
- cpu: [ia32]
- os: [win32]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-WRJgsz9un0nqZJ4MfhabxaD9Ft8KioqU3JMinOTvobbX6MOSUigSBlogP8QB3uxpJDsFS6yN+3FDBdqE5lg9kg==}
- engines: {node: '>=18'}
- cpu: [ia32]
- os: [win32]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==}
engines: {node: '>=18'}
cpu: [ia32]
os: [win32]
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [win32]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
- engines: {node: '>=12'}
- cpu: [x64]
- os: [win32]
-
- '@esbuild/[email protected]':
- resolution: {integrity: sha512-kM3HKb16VIXZyIeVrM1ygYmZBKybX8N4p754bw390wGO3Tf2j4L2/WYL+4suWujpgf6GBYs3jv7TyUivdd05JA==}
- engines: {node: '>=18'}
- cpu: [x64]
- os: [win32]
-
'@esbuild/[email protected]':
resolution: {integrity: sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==}
engines: {node: '>=18'}
@@ -4865,10 +4448,6 @@ packages:
resolution: {integrity: sha512-CZFX7UZVN9VopGbjTx4UXaXsi9ewoM1buL0kY7j1ftYdSs7p2spv9opxFjHlQ/QGTgh4UqufYqJJ0WKLml7b6w==}
engines: {node: '>=4.0'}
- resolution: {integrity: sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==}
- engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
'@jridgewell/[email protected]':
resolution: {integrity: sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==}
engines: {node: '>=6.0.0'}
@@ -5413,103 +4992,103 @@ packages:
rollup:
optional: true
- '@rollup/[email protected]':
- resolution: {integrity: sha512-+Fbls/diZ0RDerhE8kyC6hjADCXA1K4yVNlH0EYfd2XjyH0UGgzaQ8MlT0pCXAThfxv3QUAczHaL+qSv1E4/Cg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==}
cpu: [arm]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-PPA6aEEsTPRz+/4xxAmaoWDqh67N7wFbgFUJGMnanCFs0TV99M0M8QhhaSCks+n6EbQoFvLQgYOGXxlMGQe/6w==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==}
cpu: [arm64]
os: [android]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-GwYOcOakYHdfnjjKwqpTGgn5a6cUX7+Ra2HeNj/GdXvO2VJOOXCiYYlRFU4CubFM67EhbmzLOmACKEfvp3J1kQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-VWXGISWFY18v/0JyNUy4A46KCFCb9NVsH+1100XP31lud+TzlezBbz24CYzbnA4x6w4hx+NYCXDfnvDVO6lcAA==}
cpu: [arm64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-CoLEGJ+2eheqD9KBSxmma6ld01czS52Iw0e2qMZNpPDlf7Z9mj8xmMemxEucinev4LgHalDPczMyxzbq+Q+EtA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==}
cpu: [x64]
os: [darwin]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-r7yGiS4HN/kibvESzmrOB/PxKMhPTlz+FcGvoUIKYoTyGd5toHp48g1uZy1o1xQvybwwpqpe010JrcGG2s5nkg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==}
cpu: [arm64]
os: [freebsd]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-mVDxzlf0oLzV3oZOr0SMJ0lSDd3xC4CmnWJ8Val8isp9jRGl5Dq//LLDSPFrasS7pSm6m5xAcKaw3sHXhBjoRw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==}
cpu: [x64]
os: [freebsd]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-y/qUMOpJxBMy8xCXD++jeu8t7kzjlOCkoxxajL58G62PJGBZVl/Gwpm7JK9+YvlB701rcQTzjUZ1JgUoPTnoQA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-GoCsPibtVdJFPv/BOIvBKO/XmwZLwaNWdyD8TKlXuqp0veo2sHE+A/vpMQ5iSArRUz/uaoj4h5S6Pn0+PdhRjg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==}
cpu: [arm]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-L5ZLphTjjAD9leJzSLI7rr8fNqJMlGDKlazW2tX4IUF9P7R5TMQPElpH82Q7eNIDQnQlAyiNVfRPfP2vM5Avvg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-ATZvCRGCDtv1Y4gpDIXsS+wfFeFuLwVxyUBSLawjgXK2tRE6fnsQEkE4csQQYWlBlsFztRzCnBvWVfcae/1qxQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==}
cpu: [arm64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-wG9e2XtIhd++QugU5MD9i7OnpaVb08ji3P1y/hNbxrQ3sYEelKJOq1UJ5dXczeo6Hj2rfDEL5GdtkMSVLa/AOg==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==}
cpu: [loong64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-vgXfWmj0f3jAUvC7TZSU/m/cOE558ILWDzS7jBhiCAFpY2WEBn5jqgbqvmzlMjtp8KlLcBlXVD2mkTSEQE6Ixw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==}
cpu: [ppc64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-uJkYTugqtPZBS3Z136arevt/FsKTF/J9dEMTX/cwR7lsAW4bShzI2R0pJVw+hcBTWF4dxVckYh72Hk3/hWNKvA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==}
cpu: [riscv64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-rKmSj6EXQRnhSkE22+WvrqOqRtk733x3p5sWpZilhmjnkHkpeCgWsFFo0dGnUGeA+OZjRl3+VYq+HyCOEuwcxQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==}
cpu: [riscv64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-SpnYlAfKPOoVsQqmTFJ0usx0z84bzGOS9anAC0AZ3rdSo3snecihbhFTlJZ8XMwzqAcodjFU4+/SM311dqE5Sw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==}
cpu: [s390x]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-RcDGMtqF9EFN8i2RYN2W+64CdHruJ5rPqrlYw+cgM3uOVPSsnAQps7cpjXe9be/yDp8UC7VLoCoKC8J3Kn2FkQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-XiK5z70PEFEFqcNj3/zRSz/qX4bp4QIraTy9QjwJAb/Z8GM7kVUsD0Uk8maIPeTyPCP03ChdI+VVmJriKYbRHQ==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-HZvjpiUmSNx5zFgwtQAV1GaGazT2RWvqeDi0hV+AtC8unqqDSsaFjPxfsO6qPtKRRg25SisACWnJ37Yio8ttaw==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==}
cpu: [x64]
os: [linux]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-UtZQQI5k/b8d7d3i9AZmA/t+Q4tk3hOC0tMOMSq2GlMYOfxbesxG4mJSeDp0EHs30N9bsfwUvs3zF4v/RzOeTQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==}
cpu: [arm64]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-+m03kvI2f5syIqHXCZLPVYplP8pQch9JHyXKZ3AGMKlg8dCyr2PKHjwRLiW53LTrN/Nc3EqHOKxUxzoSPdKddA==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==}
cpu: [ia32]
os: [win32]
- '@rollup/[email protected]':
- resolution: {integrity: sha512-lpPE1cLfP5oPzVjKMx10pgBmKELQnFJXHgvtHCtuJWOv8MxqdEIMNtgHgBFf7Ea2/7EuVwa9fodWUfXAlXZLZQ==}
+ '@rollup/[email protected]':
+ resolution: {integrity: sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==}
cpu: [x64]
os: [win32]
@@ -5535,9 +5114,6 @@ packages:
'@rushstack/[email protected]':
resolution: {integrity: sha512-jg70HfoK44KfSP3MTiL5rxsZH7X1ktX3cZs9Sl8eDu1/LxJSbPsh0MOFRC710lIuYYSgxWjI5AjbCBAl7u3RxA==}
- '@sinclair/[email protected]':
- resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
-
'@sindresorhus/[email protected]':
resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
engines: {node: '>=18'}
@@ -6036,8 +5612,8 @@ packages:
eslint: ^8.57.0 || ^9.0.0
typescript: '>=4.8.4 <5.9.0'
- '@typescript-eslint/[email protected]':
- resolution: {integrity: sha512-67kYYShjBR0jNI5vsf/c3WG4u+zDnCTHTPqVMQguffaWWFs7artgwKmfwdifl+r6XyM5LYLas/dInj2T0SgJyw==}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-oU/OtYVydhXnumd0BobL9rkJg7wFJ9bFFPmSmB/bf/XWN85hlViji59ko6bSKBXyseT9V8l+CN1nwmlbiN0G7Q==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
@@ -6051,6 +5627,10 @@ packages:
resolution: {integrity: sha512-knO8UyF78Nt8O/B64i7TlGXod69ko7z6vJD9uhSlm0qkAbGeRUSudcm0+K/4CrRjrpiHfBCjMWlc08Vav1xwcw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-BMNLOElPxrtNQMIsFHE+3P0Yf1z0dJqV9zLdDxN/xLlWMlXK/ApEsVEKzpizg9oal8bAT5Sc7+ocal7AC1HCVw==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-DkDUSDwZVCYN71xA4wzySqqcZsHKic53A4BLqmrWFFpOpNSoxX233lwGu/2135ymTCR04PoKiEEEvN1gFYg4Tw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6073,6 +5653,10 @@ packages:
resolution: {integrity: sha512-Ch8oSjVyYyJxPQk8pMiP2FFGYatqXQfQIaMp+TpuuLlDachRWpUAeEu1u9B/v/8LToehUIWyiKcA/w5hUFRKuQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-SfepaEFUDQYRoA70DD9GtytljBePSj17qPxFHA/h3eg6lPTqGJ5mWOtbXCk1YrVU1cTJRd14nhaXWFu0l2troQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-l1enRoSaUkQxOQnbi0KPUtqeZkSiFlqrx9/3ns2rEDhGKfTa+88RmXqedC1zmVTOWrLc2e6DEJrTA51C9iLH5g==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6085,6 +5669,12 @@ packages:
peerDependencies:
typescript: '>=4.8.4 <5.9.0'
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-kaA0ueLe2v7KunYOyWYtlf/QhhZb7+qh4Yw6Ni5kgukMIG+iP773tjgBiLWIXYumWCwEq3nLW+TUywEp8uEeag==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ peerDependencies:
+ typescript: '>=4.8.4 <5.9.0'
+
'@typescript-eslint/[email protected]':
resolution: {integrity: sha512-QAkFEbytSaB8wnmB+DflhUPz6CLbFWE2SnSCrRMEa+KnXIzDYbpsn++1HGvnfAsUY44doDXmvRkO5shlM/3UfA==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -6107,14 +5697,12 @@ packages:
resolution: {integrity: sha512-QcGHmlRHWOl93o64ZUMNewCdwKGU6WItOU52H0djgNmn1EOrhVudrDzXz4OycCRSCPwFCDrE2iIt5vmuUdHxuQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-jVLFpjAIj+LureEEmovOKpPNLN7/z4fUPY7aOOZ+qpiEXjhMpUKX5S+7REGOeG5LHRL4pQpB9tb4GRUb7PTZ8A==}
+ '@typescript-eslint/[email protected]':
+ resolution: {integrity: sha512-I+/rgqOVBn6f0o7NDTmAPWWC6NuqhV174lfYvAm9fUaWeiefLdux9/YI3/nLugEn9L8fcSi0XmpKi/r5u0nmpw==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-/LPKDxGUGTYgY21SJzEDzx+3zU9bQNidWoOMYHpRyi/BUgqPbLHoS9VLD1rg49z+Z5XfnpavKr2RbGSfgZ7evg==}
- peerDependencies:
- react: '19'
- react-dom: '19'
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-QMeC8N/zqIx6rQUDhs6NkDNLVMJFwxKXrZFD6I5p/qxlalUenQ1PVcM5XB0b2VmaSNbZ9+7ZFNNWq0S2TojEwA==}
'@univerjs/[email protected]':
resolution: {integrity: sha512-ClGOKE0GS+hgvtP4XAI0ekKCmcrs4VZqZUVQddunuP7h+prCr01vMEuoLax9I/PrjOrSrl2u/xpvs9iGtXP1xw==}
@@ -6234,9 +5822,6 @@ packages:
vitest:
optional: true
- '@vitest/[email protected]':
- resolution: {integrity: sha512-jXL+9+ZNIJKruofqXuuTClf44eSpcHlgj3CiuNihUF3Ioujtmc0zIa3UJOW5RjDK1YLBJZnWBlPuqhYycLioog==}
-
'@vitest/[email protected]':
resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==}
@@ -6263,30 +5848,18 @@ packages:
'@vitest/[email protected]':
resolution: {integrity: sha512-R0xAiHuWeDjTSB3kQ3OQpT8Rx3yhdOAIm/JM4axXxnG7Q/fS8XUwggv/A4xzbQA+drYRjzkMnpYnOGAc4oeq8w==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-3nSnYXkVkf3mXFfE7vVyPmi3Sazhb/2cfZGGs0JRzFsPFvAMBEcrweV1V1GsrstdXeKCTXlJbvnQwGWgEIHmOA==}
-
'@vitest/[email protected]':
resolution: {integrity: sha512-bhLib9l4xb4sUMPXnThbnhX2Yi8OutBMA8Yahxa7yavQsFDtwY/jrUZwpKp2XH9DhRFJIeytlyGpXCqZ65nR+g==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-WvidQuWAzU2p95u8GAKlRMqMyN1yOJkGHnx3M1PL9Raf7AQ1kwLKg04ADlCa3+OXUZE7BceOhVZiuWAbzCKcUQ==}
-
'@vitest/[email protected]':
resolution: {integrity: sha512-Q1qkpazSF/p4ApZg1vfZSQ5Yw6OCQxVMVrLjslbLFA1hMDrT2uxtqMaw8Tc/jy5DLka1sNs1Y7rBcftMiaSH/Q==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-MGcMmpGkZebsMZhbQKkAf9CX5zGvjkBTqf8Zx3ApYWXr3wG+QvEu2eXWfnIIWYSJExIp4V9FCKDEeygzkYrXMw==}
-
'@vitest/[email protected]':
resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==}
'@vitest/[email protected]':
resolution: {integrity: sha512-OEc5fSXMws6sHVe4kOFyDSj/+4MSwst0ib4un0DlcYgQvRuYQ0+M2HyqGaauUMnjq87tmUaMNDxKQx7wNfVqPA==}
- '@vitest/[email protected]':
- resolution: {integrity: sha512-jOrrUvXM4Av9ZWiG1EajNto0u96kWAhJ1LmPmJhXXQx/32MecEKd10pOLYgS2BQx1TgkGhloPU1ArDW2vvaY6g==}
-
'@vitest/[email protected]':
resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==}
@@ -6439,10 +6012,6 @@ packages:
peerDependencies:
acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
- resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
- engines: {node: '>=0.4.0'}
-
resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
engines: {node: '>=0.4.0'}
@@ -6646,9 +6215,6 @@ packages:
resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
- resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==}
-
resolution: {integrity: sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==}
engines: {node: '>=12'}
@@ -6834,10 +6400,6 @@ packages:
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
- resolution: {integrity: sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==}
- engines: {node: '>=4'}
-
resolution: {integrity: sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==}
engines: {node: '>=12'}
@@ -6882,9 +6444,6 @@ packages:
resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
- resolution: {integrity: sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==}
-
resolution: {integrity: sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==}
engines: {node: '>= 16'}
@@ -7382,10 +6941,6 @@ packages:
resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
- resolution: {integrity: sha512-SUwdGfqdKOwxCPeVYjwSyRpJ7Z+fhpwIAtmCUdZIWZ/YP5R9WAsyuSgpLVDi9bjWoN2LXHNss/dk3urXtdQxGg==}
- engines: {node: '>=6'}
-
resolution: {integrity: sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==}
engines: {node: '>=6'}
@@ -7469,10 +7024,6 @@ packages:
resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
- resolution: {integrity: sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==}
- engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
engines: {node: '>=8'}
@@ -7610,6 +7161,9 @@ packages:
resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
+ resolution: {integrity: sha512-jEQoCwk8hyb2AZziIOLhDqpm5+2ww5uIE6lkO/6jcOCusfk6LhMHpXXfBLXTZ7Ydyt0j4VoUQv6uGNYbdW+kBA==}
+
resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
engines: {node: '>= 0.4'}
@@ -7797,21 +7351,6 @@ packages:
engines: {node: '>=12'}
hasBin: true
- resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
- engines: {node: '>=12'}
- hasBin: true
-
- resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
- engines: {node: '>=12'}
- hasBin: true
-
- resolution: {integrity: sha512-16854zccKPnC+toMywC+uKNeYSv+/eXkevRAfwRD/G9Cleq66m8XFIrigkbvauLLlCfDL45Q2cWegSg53gGBnQ==}
- engines: {node: '>=18'}
- hasBin: true
-
resolution: {integrity: sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==}
engines: {node: '>=18'}
@@ -8396,9 +7935,6 @@ packages:
resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
engines: {node: '>=18'}
- resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
-
resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
engines: {node: '>= 0.4'}
@@ -9067,9 +8603,6 @@ packages:
resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
- resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
-
resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
hasBin: true
@@ -9208,10 +8741,6 @@ packages:
resolution: {integrity: sha512-FMJTLMXfCLMLfJxcX9PFqX5qD88Z5MRGaZCVzfuqeZSPsyiBzs+pahDQjbIWz2QIzPZz0NX9Zy4FX3lmK6YHIg==}
engines: {node: '>= 12.13.0'}
- resolution: {integrity: sha512-9rrA30MRRP3gBD3HTGnC6cDFpaE1kVDWxWgqWJUN0RvDNAo+Nz/9GxB+nHOH0ifbVFy0hSA1V6vFDvnx54lTEQ==}
- engines: {node: '>=14'}
-
resolution: {integrity: sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==}
engines: {node: '>=14'}
@@ -9298,9 +8827,6 @@ packages:
resolution: {integrity: sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==}
hasBin: true
- resolution: {integrity: sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==}
-
resolution: {integrity: sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==}
@@ -9822,10 +9348,6 @@ packages:
resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
- resolution: {integrity: sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==}
- engines: {node: '>=18'}
-
resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
engines: {node: '>=8'}
@@ -9957,18 +9479,12 @@ packages:
resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==}
engines: {node: '>=12'}
- resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
-
resolution: {integrity: sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==}
resolution: {integrity: sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==}
- resolution: {integrity: sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==}
-
resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
engines: {node: '>= 14.16'}
@@ -10300,8 +9816,8 @@ packages:
resolution: {integrity: sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==}
engines: {node: ^10 || ^12 || >=14}
- resolution: {integrity: sha512-PitSiuxGiVFl0ItuhIfi3Sq1tcaMU4vlbPu1wv0qufTJGDjWthOOr4vYfFIs1xkbJFOQcfGczMXkr44kX5TDDg==}
+ resolution: {integrity: sha512-wn9mtxjsp789vtr+5D4M8fIuiol/83u5LV87TJAya0Efr4ScMZGQC+OjTlc2/YFqt3RZTjCQXhDWy15KPMsonA==}
engines: {node: '>=15.0.0'}
@@ -10328,10 +9844,6 @@ packages:
resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
- resolution: {integrity: sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==}
- engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
-
resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
engines: {node: '>= 0.6.0'}
@@ -10780,13 +10292,8 @@ packages:
deprecated: Rimraf versions prior to v4 are no longer supported
hasBin: true
- resolution: {integrity: sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==}
- engines: {node: '>=14.18.0', npm: '>=8.0.0'}
- hasBin: true
-
- resolution: {integrity: sha512-Noe455xmA96nnqH5piFtLobsGbCij7Tu+tb3c1vYjNbTkfzGqXqQXG3wJaYXkRZuQ0vEYN4bhwg7QnIrqB5B+w==}
+ resolution: {integrity: sha512-C5VvvgCCyfyotVITIAv+4efVytl5F7wt+/I2i9q9GZcEXW9BP52YYOXC58igUi+LFZVHukErIIqQSWwv/M3WRw==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
@@ -11151,9 +10658,6 @@ packages:
resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
engines: {node: '>=8'}
- resolution: {integrity: sha512-631UJ6O00eNGfMiWG78ck80dfBab8X6IVFB51jZK5Icd7XAs60Z5y7QdSd/wGIklnWvRbUNloVzhOKKmutxQ6Q==}
-
resolution: {integrity: sha512-H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==}
@@ -11298,10 +10802,6 @@ packages:
resolution: {integrity: sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==}
engines: {node: '>=12.0.0'}
- resolution: {integrity: sha512-i11VH5gS6IFeLY3gMBQ00/MmLncVP7JLXOw1vlgkytLmJK7QnEr7NXf0LBdxfmNPAeyetukOk0bOYrJrFGjYJQ==}
- engines: {node: '>=14.0.0'}
-
resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
engines: {node: ^18.0.0 || >=20.0.0}
@@ -11314,10 +10814,6 @@ packages:
resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
engines: {node: '>=14.0.0'}
- resolution: {integrity: sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==}
- engines: {node: '>=14.0.0'}
-
resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
engines: {node: '>=14.0.0'}
@@ -11434,10 +10930,6 @@ packages:
resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
engines: {node: '>= 0.8.0'}
- resolution: {integrity: sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==}
- engines: {node: '>=4'}
-
resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
engines: {node: '>=10'}
@@ -11625,11 +11117,6 @@ packages:
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'}
- resolution: {integrity: sha512-YAXkfvGtuTzwWbDSACdJSg4A4DZiAqckWe90Zapc/sEX3XvHcw1NdurM/6od8J207tSDqNbSsgdCacBgvJKFuA==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
-
resolution: {integrity: sha512-/8iMryv46J3aK13iUXsei5G/A3CUlW4665THCPS+K8xAaqrVWiGB4RfXMQXCLjpK9P2eK//BczrVkn5JLAk6DA==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -11648,67 +11135,8 @@ packages:
resolution: {integrity: sha512-5OOg0H0AAPE1ew8DumHP0PnVdhbJncgpxWH4rvyrCt+Sw48ar5+/pCDeQbV3DcZwz7qL/A0JYeRoluPmvz+MMQ==}
engines: {node: '>=14.18.0', vite: '>=3.1.0'}
- resolution: {integrity: sha512-Hgp8IF/yZDzKsN1hQWOuQZbrKiaFsbQud+07jJ8h9m9PaHWkpvZ5u55Xw5yYjWRXwRQ4jwFlJvY7T7FUJG9MCA==}
- engines: {node: ^14.18.0 || >=16.0.0}
- hasBin: true
- peerDependencies:
- '@types/node': '>= 14'
- less: '*'
- lightningcss: ^1.21.0
- sass: '*'
- stylus: '*'
- sugarss: '*'
- terser: ^5.4.0
- peerDependenciesMeta:
- '@types/node':
- optional: true
- less:
- optional: true
- lightningcss:
- optional: true
- sass:
- optional: true
- stylus:
- optional: true
- sugarss:
- optional: true
- terser:
- optional: true
-
- resolution: {integrity: sha512-1oDcnEp3lVyHCuQ2YFelM4Alm2o91xNoMncRm1U7S+JdYfYOvbiGZ3/CxGttrOu2M/KcGz7cRC2DoNUA6urmMA==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
- peerDependencies:
- '@types/node': ^18.0.0 || >=20.0.0
- less: '*'
- lightningcss: ^1.21.0
- sass: '*'
- sass-embedded: '*'
- stylus: '*'
- sugarss: '*'
- terser: ^5.4.0
- peerDependenciesMeta:
- '@types/node':
- optional: true
- less:
- optional: true
- lightningcss:
- optional: true
- sass:
- optional: true
- sass-embedded:
- optional: true
- stylus:
- optional: true
- sugarss:
- optional: true
- terser:
- optional: true
-
- resolution: {integrity: sha512-5nXH+QsELbFKhsEfWLkHrvgRpTdGJzqOZ+utSdmPTvwHmvU6ITTm3xx+mRusihkcI8GeC7lCDyn3kDtiki9scw==}
+ resolution: {integrity: sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
hasBin: true
peerDependencies:
@@ -11747,31 +11175,6 @@ packages:
yaml:
optional: true
- resolution: {integrity: sha512-Ljb1cnSJSivGN0LqXd/zmDbWEM0RNNg2t1QW/XUhYl/qPqyu7CsqeWtqQXHVaJsecLPuDoak2oJcZN2QoRIOag==}
- engines: {node: ^18.0.0 || >=20.0.0}
- hasBin: true
- peerDependencies:
- '@edge-runtime/vm': '*'
- '@types/node': ^18.0.0 || >=20.0.0
- '@vitest/browser': 1.6.1
- '@vitest/ui': 1.6.1
- happy-dom: '*'
- jsdom: '*'
- peerDependenciesMeta:
- '@edge-runtime/vm':
- optional: true
- '@types/node':
- optional: true
- '@vitest/browser':
- optional: true
- '@vitest/ui':
- optional: true
- happy-dom:
- optional: true
- jsdom:
- optional: true
-
resolution: {integrity: sha512-WaxpJe092ID1C0mr+LH9MmNrhfzi8I65EX/NRU/Ld016KqQNRgxSOlGNP1hHN+a/F8L15Mh8klwaF77zR3GeDQ==}
engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -12075,8 +11478,8 @@ snapshots:
'@eslint-community/eslint-plugin-eslint-comments': 4.4.1([email protected]([email protected]))
'@eslint/markdown': 6.3.0
'@stylistic/eslint-plugin': 4.2.0([email protected]([email protected]))([email protected])
- '@typescript-eslint/parser': 8.31.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.31.1([email protected]([email protected]))([email protected])
ansis: 3.17.0
cac: 6.7.14
@@ -12096,7 +11499,7 @@ snapshots:
eslint-plugin-regexp: 2.7.0([email protected]([email protected]))
eslint-plugin-toml: 0.12.0([email protected]([email protected]))
eslint-plugin-unicorn: 58.0.0([email protected]([email protected]))
eslint-plugin-yml: 1.17.0([email protected]([email protected]))
eslint-processor-vue-blocks: 2.0.0(@vue/[email protected])([email protected]([email protected]))
@@ -12707,167 +12110,71 @@ snapshots:
dependencies:
postcss: 8.4.49
- '@dprint/[email protected]': {}
-
- '@dprint/[email protected]': {}
-
- '@dprint/[email protected]': {}
-
- '@emnapi/[email protected]':
- dependencies:
- '@emnapi/wasi-threads': 1.0.1
- tslib: 2.8.1
- optional: true
-
- '@emnapi/[email protected]':
- dependencies:
- tslib: 2.8.1
- optional: true
-
- '@emnapi/[email protected]':
- dependencies:
- tslib: 2.8.1
- optional: true
-
- '@es-joy/[email protected]':
- dependencies:
- comment-parser: 1.4.1
- esquery: 1.6.0
- jsdoc-type-pratt-parser: 4.1.0
-
- '@es-joy/[email protected]':
- dependencies:
- '@types/eslint': 9.6.1
- '@types/estree': 1.0.7
- '@typescript-eslint/types': 8.29.1
- comment-parser: 1.4.1
- esquery: 1.6.0
- jsdoc-type-pratt-parser: 4.1.0
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
+ '@dprint/[email protected]': {}
- '@esbuild/[email protected]':
- optional: true
+ '@dprint/[email protected]': {}
- '@esbuild/[email protected]':
- optional: true
+ '@dprint/[email protected]': {}
- '@esbuild/[email protected]':
+ '@emnapi/[email protected]':
+ dependencies:
+ '@emnapi/wasi-threads': 1.0.1
+ tslib: 2.8.1
optional: true
- '@esbuild/[email protected]':
+ '@emnapi/[email protected]':
+ dependencies:
+ tslib: 2.8.1
optional: true
- '@esbuild/[email protected]':
+ '@emnapi/[email protected]':
+ dependencies:
+ tslib: 2.8.1
optional: true
- '@esbuild/[email protected]':
- optional: true
+ '@es-joy/[email protected]':
+ dependencies:
+ comment-parser: 1.4.1
+ esquery: 1.6.0
+ jsdoc-type-pratt-parser: 4.1.0
- '@esbuild/[email protected]':
- optional: true
+ '@es-joy/[email protected]':
+ dependencies:
+ '@types/eslint': 9.6.1
+ '@types/estree': 1.0.7
+ '@typescript-eslint/types': 8.29.1
+ comment-parser: 1.4.1
+ esquery: 1.6.0
+ jsdoc-type-pratt-parser: 4.1.0
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
+ '@esbuild/[email protected]':
optional: true
'@esbuild/[email protected]':
@@ -12876,159 +12183,45 @@ snapshots:
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
- '@esbuild/[email protected]':
- optional: true
-
'@esbuild/[email protected]':
optional: true
@@ -13278,10 +12471,6 @@ snapshots:
'@javascript-obfuscator/[email protected]': {}
- dependencies:
- '@sinclair/typebox': 0.27.8
-
'@jridgewell/[email protected]':
dependencies:
'@jridgewell/set-array': 1.2.1
@@ -13846,72 +13035,72 @@ snapshots:
- conventional-commits-filter
- conventional-commits-parser
dependencies:
'@types/estree': 1.0.6
estree-walker: 2.0.2
picomatch: 4.0.2
optionalDependencies:
- rollup: 4.40.0
+ rollup: 4.40.1
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
- '@rollup/[email protected]':
+ '@rollup/[email protected]':
optional: true
'@rushstack/[email protected](@types/[email protected])':
@@ -13948,8 +13137,6 @@ snapshots:
transitivePeerDependencies:
- '@types/node'
- '@sinclair/[email protected]': {}
-
'@sindresorhus/[email protected]': {}
@@ -14531,10 +13718,10 @@ snapshots:
'@types/[email protected]': {}
dependencies:
'@eslint-community/regexpp': 4.12.1
- '@typescript-eslint/parser': 8.31.0([email protected]([email protected]))([email protected])
+ '@typescript-eslint/parser': 8.31.1([email protected]([email protected]))([email protected])
'@typescript-eslint/scope-manager': 8.29.1
'@typescript-eslint/type-utils': 8.29.1([email protected]([email protected]))([email protected])
'@typescript-eslint/utils': 8.29.1([email protected]([email protected]))([email protected])
@@ -14548,12 +13735,12 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@typescript-eslint/scope-manager': 8.31.0
- '@typescript-eslint/types': 8.31.0
- '@typescript-eslint/typescript-estree': 8.31.0([email protected])
- '@typescript-eslint/visitor-keys': 8.31.0
+ '@typescript-eslint/scope-manager': 8.31.1
+ '@typescript-eslint/types': 8.31.1
+ '@typescript-eslint/typescript-estree': 8.31.1([email protected])
+ '@typescript-eslint/visitor-keys': 8.31.1
debug: 4.4.0
eslint: 9.25.1([email protected])
typescript: 5.8.3
@@ -14570,6 +13757,11 @@ snapshots:
'@typescript-eslint/types': 8.31.0
'@typescript-eslint/visitor-keys': 8.31.0
+ '@typescript-eslint/[email protected]':
+ dependencies:
+ '@typescript-eslint/types': 8.31.1
+ '@typescript-eslint/visitor-keys': 8.31.1
+
dependencies:
'@typescript-eslint/typescript-estree': 8.29.1([email protected])
@@ -14596,6 +13788,8 @@ snapshots:
'@typescript-eslint/[email protected]': {}
+ '@typescript-eslint/[email protected]': {}
+
'@typescript-eslint/[email protected]([email protected])':
dependencies:
'@typescript-eslint/types': 8.29.1
@@ -14624,6 +13818,20 @@ snapshots:
transitivePeerDependencies:
- supports-color
+ '@typescript-eslint/[email protected]([email protected])':
+ dependencies:
+ '@typescript-eslint/types': 8.31.1
+ '@typescript-eslint/visitor-keys': 8.31.1
+ debug: 4.4.0
+ fast-glob: 3.3.3
+ is-glob: 4.0.3
+ minimatch: 9.0.5
+ semver: 7.7.1
+ ts-api-utils: 2.1.0([email protected])
+ typescript: 5.8.3
+ transitivePeerDependencies:
+ - supports-color
+
dependencies:
'@eslint-community/eslint-utils': 4.5.1([email protected]([email protected]))
@@ -14656,12 +13864,12 @@ snapshots:
'@typescript-eslint/types': 8.31.0
eslint-visitor-keys: 4.2.0
- '@univerjs/[email protected]': {}
-
+ '@typescript-eslint/[email protected]':
dependencies:
- react: 19.0.0
- react-dom: 19.0.0([email protected])
+ '@typescript-eslint/types': 8.31.1
+ eslint-visitor-keys: 4.2.0
+
+ '@univerjs/[email protected]': {}
dependencies:
@@ -14720,20 +13928,20 @@ snapshots:
optional: true
dependencies:
'@babel/core': 7.26.10
'@babel/plugin-transform-react-jsx-self': 7.25.9(@babel/[email protected])
'@babel/plugin-transform-react-jsx-source': 7.25.9(@babel/[email protected])
'@types/babel__core': 7.20.5
react-refresh: 0.17.0
transitivePeerDependencies:
- supports-color
dependencies:
vue: 3.4.38([email protected])
@@ -14759,12 +13967,6 @@ snapshots:
typescript: 5.8.3
- '@vitest/[email protected]':
- dependencies:
- '@vitest/spy': 1.6.1
- '@vitest/utils': 1.6.1
- chai: 4.5.0
-
'@vitest/[email protected]':
dependencies:
'@vitest/spy': 2.0.5
@@ -14779,13 +13981,13 @@ snapshots:
chai: 5.2.0
tinyrainbow: 2.0.0
dependencies:
'@vitest/spy': 3.1.2
estree-walker: 3.0.3
magic-string: 0.30.17
optionalDependencies:
'@vitest/[email protected]':
dependencies:
@@ -14799,33 +14001,17 @@ snapshots:
dependencies:
tinyrainbow: 2.0.0
- '@vitest/[email protected]':
- dependencies:
- '@vitest/utils': 1.6.1
- p-limit: 5.0.0
- pathe: 1.1.2
-
'@vitest/[email protected]':
dependencies:
'@vitest/utils': 3.1.2
pathe: 2.0.3
- '@vitest/[email protected]':
- dependencies:
- magic-string: 0.30.17
- pathe: 1.1.2
- pretty-format: 29.7.0
-
'@vitest/[email protected]':
dependencies:
'@vitest/pretty-format': 3.1.2
magic-string: 0.30.17
pathe: 2.0.3
- '@vitest/[email protected]':
- dependencies:
- tinyspy: 2.2.1
-
'@vitest/[email protected]':
dependencies:
tinyspy: 3.0.2
@@ -14834,13 +14020,6 @@ snapshots:
dependencies:
tinyspy: 3.0.2
- '@vitest/[email protected]':
- dependencies:
- diff-sequences: 29.6.3
- estree-walker: 3.0.3
- loupe: 2.3.7
- pretty-format: 29.7.0
-
'@vitest/[email protected]':
dependencies:
'@vitest/pretty-format': 2.0.5
@@ -15084,10 +14263,6 @@ snapshots:
dependencies:
acorn: 8.14.1
- dependencies:
- acorn: 8.14.1
-
@@ -15287,8 +14462,6 @@ snapshots:
object-is: 1.1.6
util: 0.12.5
-
@@ -15497,16 +14670,6 @@ snapshots:
- dependencies:
- assertion-error: 1.1.0
- check-error: 1.0.3
- deep-eql: 4.1.4
- get-func-name: 2.0.2
- loupe: 2.3.7
- pathval: 1.1.1
- type-detect: 4.1.0
-
dependencies:
assertion-error: 2.0.1
@@ -15549,10 +14712,6 @@ snapshots:
- dependencies:
- get-func-name: 2.0.2
-
@@ -16028,10 +15187,6 @@ snapshots:
- dependencies:
- type-detect: 4.1.0
-
@@ -16106,8 +15261,6 @@ snapshots:
-
dependencies:
path-type: 4.0.0
@@ -16310,6 +15463,8 @@ snapshots:
+
dependencies:
es-errors: 1.3.0
@@ -16461,85 +15616,6 @@ snapshots:
esbuild-windows-64: 0.14.54
esbuild-windows-arm64: 0.14.54
- optionalDependencies:
- '@esbuild/android-arm': 0.18.20
- '@esbuild/android-arm64': 0.18.20
- '@esbuild/android-x64': 0.18.20
- '@esbuild/darwin-arm64': 0.18.20
- '@esbuild/darwin-x64': 0.18.20
- '@esbuild/freebsd-arm64': 0.18.20
- '@esbuild/freebsd-x64': 0.18.20
- '@esbuild/linux-arm': 0.18.20
- '@esbuild/linux-arm64': 0.18.20
- '@esbuild/linux-ia32': 0.18.20
- '@esbuild/linux-loong64': 0.18.20
- '@esbuild/linux-mips64el': 0.18.20
- '@esbuild/linux-ppc64': 0.18.20
- '@esbuild/linux-riscv64': 0.18.20
- '@esbuild/linux-s390x': 0.18.20
- '@esbuild/linux-x64': 0.18.20
- '@esbuild/netbsd-x64': 0.18.20
- '@esbuild/openbsd-x64': 0.18.20
- '@esbuild/sunos-x64': 0.18.20
- '@esbuild/win32-arm64': 0.18.20
- '@esbuild/win32-ia32': 0.18.20
- '@esbuild/win32-x64': 0.18.20
-
- optionalDependencies:
- '@esbuild/aix-ppc64': 0.21.5
- '@esbuild/android-arm': 0.21.5
- '@esbuild/android-arm64': 0.21.5
- '@esbuild/android-x64': 0.21.5
- '@esbuild/darwin-arm64': 0.21.5
- '@esbuild/darwin-x64': 0.21.5
- '@esbuild/freebsd-arm64': 0.21.5
- '@esbuild/freebsd-x64': 0.21.5
- '@esbuild/linux-arm': 0.21.5
- '@esbuild/linux-arm64': 0.21.5
- '@esbuild/linux-ia32': 0.21.5
- '@esbuild/linux-loong64': 0.21.5
- '@esbuild/linux-mips64el': 0.21.5
- '@esbuild/linux-ppc64': 0.21.5
- '@esbuild/linux-riscv64': 0.21.5
- '@esbuild/linux-s390x': 0.21.5
- '@esbuild/linux-x64': 0.21.5
- '@esbuild/netbsd-x64': 0.21.5
- '@esbuild/openbsd-x64': 0.21.5
- '@esbuild/sunos-x64': 0.21.5
- '@esbuild/win32-arm64': 0.21.5
- '@esbuild/win32-ia32': 0.21.5
- '@esbuild/win32-x64': 0.21.5
-
- optionalDependencies:
- '@esbuild/aix-ppc64': 0.25.2
- '@esbuild/android-arm': 0.25.2
- '@esbuild/android-arm64': 0.25.2
- '@esbuild/android-x64': 0.25.2
- '@esbuild/darwin-arm64': 0.25.2
- '@esbuild/darwin-x64': 0.25.2
- '@esbuild/freebsd-arm64': 0.25.2
- '@esbuild/freebsd-x64': 0.25.2
- '@esbuild/linux-arm': 0.25.2
- '@esbuild/linux-arm64': 0.25.2
- '@esbuild/linux-ia32': 0.25.2
- '@esbuild/linux-loong64': 0.25.2
- '@esbuild/linux-mips64el': 0.25.2
- '@esbuild/linux-ppc64': 0.25.2
- '@esbuild/linux-riscv64': 0.25.2
- '@esbuild/linux-s390x': 0.25.2
- '@esbuild/linux-x64': 0.25.2
- '@esbuild/netbsd-arm64': 0.25.2
- '@esbuild/netbsd-x64': 0.25.2
- '@esbuild/openbsd-arm64': 0.25.2
- '@esbuild/openbsd-x64': 0.25.2
- '@esbuild/sunos-x64': 0.25.2
- '@esbuild/win32-arm64': 0.25.2
- '@esbuild/win32-ia32': 0.25.2
- '@esbuild/win32-x64': 0.25.2
-
optionalDependencies:
'@esbuild/aix-ppc64': 0.25.3
@@ -16954,11 +16030,11 @@ snapshots:
semver: 7.7.1
strip-indent: 4.0.0
dependencies:
eslint: 9.25.1([email protected])
optionalDependencies:
dependencies:
@@ -17328,8 +16404,6 @@ snapshots:
-
dependencies:
es-errors: 1.3.0
@@ -18036,8 +17110,6 @@ snapshots:
-
dependencies:
argparse: 2.0.1
@@ -18194,11 +17266,6 @@ snapshots:
- dependencies:
- mlly: 1.7.4
- pkg-types: 1.3.1
-
dependencies:
mlly: 1.7.4
@@ -18277,10 +17344,6 @@ snapshots:
dependencies:
js-tokens: 4.0.0
- dependencies:
- get-func-name: 2.0.2
-
@@ -18971,10 +18034,6 @@ snapshots:
dependencies:
yocto-queue: 1.2.0
- dependencies:
- yocto-queue: 1.2.0
-
dependencies:
p-limit: 2.3.0
@@ -19106,14 +18165,10 @@ snapshots:
-
-
@@ -19490,7 +18545,7 @@ snapshots:
picocolors: 1.1.1
source-map-js: 1.2.1
dependencies:
axios: 1.8.4
transitivePeerDependencies:
@@ -19517,12 +18572,6 @@ snapshots:
ansi-styles: 5.2.0
react-is: 17.0.2
- dependencies:
- '@jest/schemas': 29.6.3
- ansi-styles: 5.2.0
- react-is: 18.3.1
-
@@ -20069,34 +19118,30 @@ snapshots:
dependencies:
glob: 7.2.3
- optionalDependencies:
- fsevents: 2.3.3
-
dependencies:
'@types/estree': 1.0.7
optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.40.0
- '@rollup/rollup-android-arm64': 4.40.0
- '@rollup/rollup-darwin-arm64': 4.40.0
- '@rollup/rollup-darwin-x64': 4.40.0
- '@rollup/rollup-freebsd-arm64': 4.40.0
- '@rollup/rollup-freebsd-x64': 4.40.0
- '@rollup/rollup-linux-arm-gnueabihf': 4.40.0
- '@rollup/rollup-linux-arm-musleabihf': 4.40.0
- '@rollup/rollup-linux-arm64-gnu': 4.40.0
- '@rollup/rollup-linux-arm64-musl': 4.40.0
- '@rollup/rollup-linux-loongarch64-gnu': 4.40.0
- '@rollup/rollup-linux-powerpc64le-gnu': 4.40.0
- '@rollup/rollup-linux-riscv64-gnu': 4.40.0
- '@rollup/rollup-linux-riscv64-musl': 4.40.0
- '@rollup/rollup-linux-s390x-gnu': 4.40.0
- '@rollup/rollup-linux-x64-gnu': 4.40.0
- '@rollup/rollup-linux-x64-musl': 4.40.0
- '@rollup/rollup-win32-arm64-msvc': 4.40.0
- '@rollup/rollup-win32-ia32-msvc': 4.40.0
- '@rollup/rollup-win32-x64-msvc': 4.40.0
+ '@rollup/rollup-android-arm-eabi': 4.40.1
+ '@rollup/rollup-android-arm64': 4.40.1
+ '@rollup/rollup-darwin-arm64': 4.40.1
+ '@rollup/rollup-darwin-x64': 4.40.1
+ '@rollup/rollup-freebsd-arm64': 4.40.1
+ '@rollup/rollup-freebsd-x64': 4.40.1
+ '@rollup/rollup-linux-arm-gnueabihf': 4.40.1
+ '@rollup/rollup-linux-arm-musleabihf': 4.40.1
+ '@rollup/rollup-linux-arm64-gnu': 4.40.1
+ '@rollup/rollup-linux-arm64-musl': 4.40.1
+ '@rollup/rollup-linux-loongarch64-gnu': 4.40.1
+ '@rollup/rollup-linux-powerpc64le-gnu': 4.40.1
+ '@rollup/rollup-linux-riscv64-gnu': 4.40.1
+ '@rollup/rollup-linux-riscv64-musl': 4.40.1
+ '@rollup/rollup-linux-s390x-gnu': 4.40.1
+ '@rollup/rollup-linux-x64-gnu': 4.40.1
+ '@rollup/rollup-linux-x64-musl': 4.40.1
+ '@rollup/rollup-win32-arm64-msvc': 4.40.1
+ '@rollup/rollup-win32-ia32-msvc': 4.40.1
+ '@rollup/rollup-win32-x64-msvc': 4.40.1
fsevents: 2.3.3
@@ -20497,10 +19542,6 @@ snapshots:
- dependencies:
- js-tokens: 9.0.1
-
@@ -20658,16 +19699,12 @@ snapshots:
fdir: 6.4.4([email protected])
picomatch: 4.0.2
-
-
@@ -20776,8 +19813,6 @@ snapshots:
dependencies:
prelude-ls: 1.2.1
-
@@ -20986,31 +20021,13 @@ snapshots:
- dependencies:
- cac: 6.7.14
- debug: 4.4.0
- pathe: 1.1.2
- picocolors: 1.1.1
- transitivePeerDependencies:
- - '@types/node'
- - less
- - lightningcss
- - sass
- - sass-embedded
- - stylus
- - sugarss
- - supports-color
- - terser
-
dependencies:
cac: 6.7.14
debug: 4.4.0
- es-module-lexer: 1.6.0
+ es-module-lexer: 1.7.0
pathe: 2.0.3
transitivePeerDependencies:
- '@types/node'
- jiti
@@ -21025,10 +20042,10 @@ snapshots:
- tsx
- yaml
dependencies:
'@microsoft/api-extractor': 7.51.1(@types/[email protected])
- '@rollup/pluginutils': 5.1.4([email protected])
+ '@rollup/pluginutils': 5.1.4([email protected])
'@volar/typescript': 2.4.11
'@vue/language-core': 2.2.0([email protected])
compare-versions: 6.1.1
@@ -21038,7 +20055,7 @@ snapshots:
magic-string: 0.30.17
typescript: 5.8.3
optionalDependencies:
transitivePeerDependencies:
- '@types/node'
- rollup
@@ -21052,37 +20069,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
- dependencies:
- esbuild: 0.18.20
- postcss: 8.5.3
- rollup: 3.29.5
- optionalDependencies:
- '@types/node': 22.15.3
- fsevents: 2.3.3
- less: 4.3.0
- sass: 1.77.5
- terser: 5.39.0
-
dependencies:
- esbuild: 0.21.5
- postcss: 8.5.3
- rollup: 4.40.0
- optionalDependencies:
- '@types/node': 22.15.3
- fsevents: 2.3.3
- less: 4.3.0
- sass: 1.77.5
- terser: 5.39.0
-
- dependencies:
- esbuild: 0.25.2
+ esbuild: 0.25.3
fdir: 6.4.4([email protected])
picomatch: 4.0.2
postcss: 8.5.3
- rollup: 4.40.0
+ rollup: 4.40.1
tinyglobby: 0.2.13
optionalDependencies:
'@types/node': 22.15.3
@@ -21094,46 +20087,10 @@ snapshots:
tsx: 4.19.4
yaml: 2.7.1
- dependencies:
- '@vitest/expect': 1.6.1
- '@vitest/runner': 1.6.1
- '@vitest/snapshot': 1.6.1
- '@vitest/spy': 1.6.1
- '@vitest/utils': 1.6.1
- acorn-walk: 8.3.4
- chai: 4.5.0
- debug: 4.4.0
- execa: 8.0.1
- local-pkg: 0.5.1
- magic-string: 0.30.17
- pathe: 1.1.2
- picocolors: 1.1.1
- std-env: 3.9.0
- strip-literal: 2.1.1
- tinybench: 2.9.0
- tinypool: 0.8.4
- why-is-node-running: 2.3.0
- optionalDependencies:
- '@types/node': 22.15.3
- happy-dom: 17.4.4
- jsdom: 24.1.1
- transitivePeerDependencies:
- - less
- - lightningcss
- - sass
- - sass-embedded
- - stylus
- - sugarss
- - supports-color
- - terser
-
dependencies:
'@vitest/expect': 3.1.2
'@vitest/pretty-format': 3.1.2
'@vitest/runner': 3.1.2
'@vitest/snapshot': 3.1.2
@@ -21150,7 +20107,7 @@ snapshots:
tinyglobby: 0.2.13
tinypool: 1.0.2
tinyrainbow: 2.0.0
why-is-node-running: 2.3.0
optionalDependencies: