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.

chore: update package dependencies (#4735)

白熱8d655cc8ee62
diff --git a/common/shared/eslint/index.js b/common/shared/eslint/index.js
index 65e0996193..b9e4d52c52 100644
--- a/common/shared/eslint/index.js
+++ b/common/shared/eslint/index.js
@@ -80,7 +80,7 @@ exports.baseRules = {
'import/consistent-type-specifier-style': 'warn',
'no-restricted-imports': [
- 'warn',
+ 'error',
{
paths: [
{
diff --git a/common/shared/package.json b/common/shared/package.json
index f6fcaf1ecd..dfa8819918 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -27,7 +27,7 @@
"@typescript-eslint/parser": "^8.24.1",
"@vitejs/plugin-react": "^4.3.4",
"@vitejs/plugin-vue": "^5.2.1",
- "@vitest/coverage-istanbul": "^3.0.6",
+ "@vitest/coverage-istanbul": "^3.0.7",
"autoprefixer": "^10.4.20",
"eslint-plugin-readable-tailwind": "^1.9.0",
"fs-extra": "^11.3.0",
diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.json
index fe4efc04df..7a1239b73e 100644
--- a/packages/docs-drawing-ui/package.json
+++ b/packages/docs-drawing-ui/package.json
@@ -75,8 +75,7 @@
"@univerjs/drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.2.20",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json
index c8507d5298..1a28f25612 100644
--- a/packages/docs-hyper-link-ui/package.json
+++ b/packages/docs-hyper-link-ui/package.json
@@ -73,8 +73,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.2.20",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx b/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
index 49b13855aa..a82051a5bf 100644
--- a/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
+++ b/packages/docs-hyper-link-ui/src/views/hyper-link-popup/index.tsx
@@ -16,11 +16,9 @@
import type { DocumentDataModel } from '@univerjs/core';
import { CustomRangeType, ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
-import { MessageType, Tooltip } from '@univerjs/design';
+import { clsx, MessageType, Tooltip } from '@univerjs/design';
import { CopySingle, LinkSingle, UnlinkSingle, WriteSingle } from '@univerjs/icons';
import { IMessageService, useDependency, useObservable } from '@univerjs/ui';
-import cs from 'clsx';
-import React from 'react';
import { DeleteDocHyperLinkCommand } from '../../commands/commands/delete-link.command';
import { ShowDocHyperLinkEditPopupOperation } from '../../commands/operations/popup.operation';
import { DocHyperLinkPopupService } from '../../services/hyper-link-popup.service';
@@ -55,7 +53,7 @@ export const DocLinkPopup = () => {
hyperLinkService.hideInfoPopup();
}}
>
- <div className={cs(styles.docLinkContent)} onClick={() => window.open(url)}>
+ <div className={clsx(styles.docLinkContent)} onClick={() => window.open(url)}>
<div className={styles.docLinkType}>
<LinkSingle />
</div>
@@ -65,7 +63,7 @@ export const DocLinkPopup = () => {
</div>
<div className={styles.docLinkOperations}>
<div
- className={cs(styles.docLinkOperation)}
+ className={clsx(styles.docLinkOperation)}
onClick={() => {
navigator.clipboard.writeText(url);
messageService.show({
diff --git a/packages/docs-hyper-link/package.json b/packages/docs-hyper-link/package.json
index 8bfb40b946..c9267abfff 100644
--- a/packages/docs-hyper-link/package.json
+++ b/packages/docs-hyper-link/package.json
@@ -60,7 +60,6 @@
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
- "rxjs": "^7.8.1",
"typescript": "^5.7.3",
"vite": "^6.2.0",
"vitest": "^3.0.7"
diff --git a/packages/docs-mention-ui/package.json b/packages/docs-mention-ui/package.json
index d791a10966..f8aafc82a5 100644
--- a/packages/docs-mention-ui/package.json
+++ b/packages/docs-mention-ui/package.json
@@ -65,8 +65,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/docs-mention-ui/src/views/mention-list/index.tsx b/packages/docs-mention-ui/src/views/mention-list/index.tsx
index 9fc98b5f1d..f2c392d9a7 100644
--- a/packages/docs-mention-ui/src/views/mention-list/index.tsx
+++ b/packages/docs-mention-ui/src/views/mention-list/index.tsx
@@ -15,8 +15,8 @@
*/
import type { IMention, ITypeMentionList } from '@univerjs/core';
-import cs from 'clsx';
-import React, { useRef, useState } from 'react';
+import { clsx } from '@univerjs/design';
+import { useRef, useState } from 'react';
import styles from './index.module.less';
export interface IMentionListProps {
@@ -44,7 +44,7 @@ export const MentionList = (props: IMentionListProps) => {
<div
data-editorid={editorId}
key={mention.objectId}
- className={cs(styles.docMention, { [styles.docMentionActive]: activeId === mention.objectId })}
+ className={clsx(styles.docMention, { [styles.docMentionActive]: activeId === mention.objectId })}
onClick={() => handleSelect(mention)}
onMouseEnter={() => setActiveId(mention.objectId)}
>
diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json
index 4561998af4..24af34a0ab 100644
--- a/packages/docs-thread-comment-ui/package.json
+++ b/packages/docs-thread-comment-ui/package.json
@@ -67,8 +67,7 @@
"@univerjs/icons": "^0.2.20",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/docs-thread-comment-ui/src/services/doc-thread-comment.service.ts b/packages/docs-thread-comment-ui/src/services/doc-thread-comment.service.ts
index 4cc17c7ec7..740335b73a 100644
--- a/packages/docs-thread-comment-ui/src/services/doc-thread-comment.service.ts
+++ b/packages/docs-thread-comment-ui/src/services/doc-thread-comment.service.ts
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-import { Disposable, type ITextRange, type Nullable } from '@univerjs/core';
+import type { ITextRange, Nullable } from '@univerjs/core';
import type { IThreadComment } from '@univerjs/thread-comment';
+import { Disposable, Inject } from '@univerjs/core';
import { ThreadCommentPanelService } from '@univerjs/thread-comment-ui';
import { ISidebarService } from '@univerjs/ui';
-import { Inject } from '@univerjs/core';
import { BehaviorSubject } from 'rxjs';
export class DocThreadCommentService extends Disposable {
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index c4ee2e716d..112bd5a396 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -80,8 +80,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.2.20",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index ba48390b2a..c0c892b4c6 100644
--- a/packages/drawing-ui/package.json
+++ b/packages/drawing-ui/package.json
@@ -71,8 +71,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.2.20",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index a8e8ea6769..c6052f28fb 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -79,7 +79,6 @@
"@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1",
"react-grid-layout": "^1.4.4",
"react-resizable": "^3.0.5"
},
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 808d379083..5edde0611a 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
@@ -16,10 +16,10 @@
import type { IHighlightCell } from '@univerjs/sheets-conditional-formatting';
import { BooleanNumber } from '@univerjs/core';
+import { clsx } from '@univerjs/design';
import { removeUndefinedAttr } from '@univerjs/sheets-conditional-formatting';
import { ComponentManager, useDependency } from '@univerjs/ui';
-import cl from 'clsx';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { ColorPicker } from '../color-picker';
import styles from './index.module.less';
@@ -100,31 +100,40 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
resultStyle.ul = { s: isUnderline };
}
onChange(removeUndefinedAttr(resultStyle));
- // eslint-disable-next-line react-hooks/exhaustive-deps
}, [isBold, isItalic, isUnderline, isStrikethrough, fontColor, bgColor]);
return (
- <div className={`
- ${styles.cfStyleEdit}
- ${className}
- `}
+ <div
+ className={clsx(styles.cfStyleEdit, className)}
>
- { BoldSingleIcon && (
- <div className={cl({ [styles.isActive]: getBooleanFromNumber(isBold || BooleanNumber.FALSE) }, styles.buttonItem)} onClick={() => isBoldSet(getAnotherBooleanNumber(isBold))}>
+ {BoldSingleIcon && (
+ <div
+ className={clsx({ [styles.isActive]: getBooleanFromNumber(isBold || BooleanNumber.FALSE) }, styles.buttonItem)}
+ onClick={() => isBoldSet(getAnotherBooleanNumber(isBold))}
+ >
<BoldSingleIcon />
</div>
)}
- { ItalicSingleIcon && (
- <div className={cl({ [styles.isActive]: getBooleanFromNumber(isItalic || BooleanNumber.FALSE) }, styles.buttonItem)} onClick={() => isItalicSet(getAnotherBooleanNumber(isItalic))}>
+ {ItalicSingleIcon && (
+ <div
+ className={clsx({ [styles.isActive]: getBooleanFromNumber(isItalic || BooleanNumber.FALSE) }, styles.buttonItem)}
+ onClick={() => isItalicSet(getAnotherBooleanNumber(isItalic))}
+ >
<ItalicSingleIcon />
</div>
)}
- { UnderlineSingleIcon && (
- <div className={cl({ [styles.isActive]: getBooleanFromNumber(isUnderline || BooleanNumber.FALSE) }, styles.buttonItem)} onClick={() => isUnderlineSet(getAnotherBooleanNumber(isUnderline))}>
+ {UnderlineSingleIcon && (
+ <div
+ className={clsx({ [styles.isActive]: getBooleanFromNumber(isUnderline || BooleanNumber.FALSE) }, styles.buttonItem)}
+ onClick={() => isUnderlineSet(getAnotherBooleanNumber(isUnderline))}
+ >
<UnderlineSingleIcon />
</div>
)}
- { StrikethroughSingle && (
- <div className={cl({ [styles.isActive]: getBooleanFromNumber(isStrikethrough || BooleanNumber.FALSE) }, styles.buttonItem)} onClick={() => isStrikethroughSet(getAnotherBooleanNumber(isStrikethrough))}>
+ {StrikethroughSingle && (
+ <div
+ className={clsx({ [styles.isActive]: getBooleanFromNumber(isStrikethrough || BooleanNumber.FALSE) }, styles.buttonItem)}
+ onClick={() => isStrikethroughSet(getAnotherBooleanNumber(isStrikethrough))}
+ >
<StrikethroughSingle />
</div>
)}
diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json
index b47d23180a..0ae4728775 100644
--- a/packages/sheets-crosshair-highlight/package.json
+++ b/packages/sheets-crosshair-highlight/package.json
@@ -77,8 +77,7 @@
"@univerjs/icons": "^0.2.20",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json
index fee5d8d304..f430694c6b 100644
--- a/packages/sheets-data-validation-ui/package.json
+++ b/packages/sheets-data-validation-ui/package.json
@@ -82,8 +82,7 @@
"@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/list-formula-input.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/list-formula-input.tsx
index 4e31d83aa5..52c90d7904 100644
--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/list-formula-input.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/list-formula-input.tsx
@@ -16,16 +16,15 @@
import type { IFormulaInputProps } from '@univerjs/data-validation';
import type { ListValidator } from '@univerjs/sheets-data-validation';
+import type { CSSProperties } from 'react';
import { DataValidationType, isFormulaString, LocaleService, Tools } from '@univerjs/core';
import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
-import { DraggableList, FormLayout, Input, Radio, RadioGroup, Select } from '@univerjs/design';
+import { clsx, DraggableList, FormLayout, Input, Radio, RadioGroup, Select } from '@univerjs/design';
import { DeleteSingle, IncreaseSingle, SequenceSingle } from '@univerjs/icons';
import { DataValidationFormulaController, deserializeListOptions, serializeListOptions } from '@univerjs/sheets-data-validation';
import { FormulaEditor } from '@univerjs/sheets-formula-ui';
import { useDependency, useEvent, useObservable, useSidebarClick } from '@univerjs/ui';
-
-import cs from 'clsx';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
import { debounceTime } from 'rxjs';
import { DROP_DOWN_DEFAULT_COLOR } from '../../../const';
import styles from './index.module.less';
@@ -112,7 +111,7 @@ const ColorSelect = (props: IColorSelectProps) => {
);
};
-const Template = (props: { item: IDropdownItem; commonProps: any; style?: React.CSSProperties }) => {
+const Template = (props: { item: IDropdownItem; commonProps: any; style?: CSSProperties }) => {
const { item, commonProps, style } = props;
const { onItemChange, onItemDelete } = commonProps;
@@ -120,7 +119,7 @@ const Template = (props: { item: IDropdownItem; commonProps: any; style?: React.
<div className={styles.dataValidationFormulaListItem} style={style}>
{!item.isRef
? (
- <div className={cs(styles.dataValidationFormulaListItemDrag, 'draggableHandle')}>
+ <div className={clsx(styles.dataValidationFormulaListItemDrag, 'draggableHandle')}>
<SequenceSingle />
</div>
)
diff --git a/packages/sheets-drawing-ui/package.json b/packages/sheets-drawing-ui/package.json
index 862363d820..5729db10c3 100644
--- a/packages/sheets-drawing-ui/package.json
+++ b/packages/sheets-drawing-ui/package.json
@@ -83,8 +83,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index 5cde09090d..cfe61dd96c 100644
--- a/packages/sheets-filter-ui/package.json
+++ b/packages/sheets-filter-ui/package.json
@@ -74,9 +74,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1",
- "rc-virtual-list": "^3.15.0"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json
index d0803da6b2..0a8e30b85e 100644
--- a/packages/sheets-formula-ui/package.json
+++ b/packages/sheets-formula-ui/package.json
@@ -83,8 +83,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-graphics/package.json b/packages/sheets-graphics/package.json
index 210870815e..0fb14c1231 100644
--- a/packages/sheets-graphics/package.json
+++ b/packages/sheets-graphics/package.json
@@ -55,16 +55,12 @@
"lint:types": "tsc --noEmit",
"build": "univer-cli build"
},
- "peerDependencies": {
- "rxjs": ">=7.0.0"
- },
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-render": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
- "rxjs": "^7.8.1",
"typescript": "^5.7.3",
"vite": "^6.2.0",
"vitest": "^3.0.7"
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index 2a06d1db94..3b8468f0bc 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -86,8 +86,7 @@
"@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-hyper-link": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
index a1bd94b40a..169bcc5037 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
@@ -17,13 +17,12 @@
import type { ICustomRange, Nullable, Workbook } from '@univerjs/core';
import type { IHyperLinkPopup } from '../../services/popup.service';
import { DOCS_ZEN_EDITOR_UNIT_ID_KEY, ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
-import { MessageType, Tooltip } from '@univerjs/design';
+import { clsx, MessageType, Tooltip } from '@univerjs/design';
import { AllBorderSingle, CopySingle, LinkSingle, UnlinkSingle, WriteSingle, Xlsx } from '@univerjs/icons';
import { CancelHyperLinkCommand, CancelRichHyperLinkCommand, SheetHyperLinkType, SheetsHyperLinkParserService } from '@univerjs/sheets-hyper-link';
import { IEditorBridgeService } from '@univerjs/sheets-ui';
import { IMessageService, IZenZoneService, useDependency } from '@univerjs/ui';
-import cs from 'clsx';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { OpenHyperLinkEditPanelOperation } from '../../commands/operations/popup.operations';
import { SheetsHyperLinkPopupService } from '../../services/popup.service';
import { SheetsHyperLinkResolverService } from '../../services/resolver.service';
@@ -69,7 +68,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
return (
<div className={styles.cellLink} onClick={() => popupService.hideCurrentPopup()}>
<div
- className={cs(styles.cellLinkContent, { [styles.cellLinkContentError]: isError })}
+ className={clsx(styles.cellLinkContent, { [styles.cellLinkContentError]: isError })}
onClick={() => {
if (zenZoneService.visible) {
return;
@@ -92,7 +91,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
<div className={styles.cellLinkOperations}>
{copyPermission && (
<div
- className={cs(styles.cellLinkOperation, { [styles.cellLinkOperationError]: isError })}
+ className={clsx(styles.cellLinkOperation, { [styles.cellLinkOperationError]: isError })}
onClick={() => {
if (isError) {
return;
diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json
index 5905ac8e63..29a1f19c52 100644
--- a/packages/sheets-sort-ui/package.json
+++ b/packages/sheets-sort-ui/package.json
@@ -73,9 +73,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-sort": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1",
- "rc-virtual-list": "^3.15.0"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-thread-comment-ui/package.json b/packages/sheets-thread-comment-ui/package.json
index c2ff128288..423e35e96a 100644
--- a/packages/sheets-thread-comment-ui/package.json
+++ b/packages/sheets-thread-comment-ui/package.json
@@ -75,8 +75,7 @@
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index bd14bd132b..c38b22ffe9 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -85,8 +85,7 @@
"@univerjs/protocol": "0.1.43",
"@univerjs/sheets": "workspace:*",
"@univerjs/telemetry": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx b/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
index a82929c64e..0bcb100c49 100644
--- a/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
+++ b/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
@@ -16,9 +16,8 @@
import type { ICanvasPopup } from '../../services/canvas-pop-manager.service';
import type { ICellAlert } from '../../services/cell-alert-manager.service';
+import { clsx } from '@univerjs/design';
import { ErrorSingle, WarningSingle } from '@univerjs/icons';
-import cs from 'clsx';
-import React from 'react';
import { CellAlertType } from '../../services/cell-alert-manager.service';
import styles from './index.module.less';
@@ -36,9 +35,9 @@ export function CellAlert({ popup }: { popup: ICanvasPopup }) {
const { type, title, message } = alert as ICellAlert;
const iconMap = {
- [CellAlertType.ERROR]: <ErrorSingle className={cs(styles.cellAlertIcon, styles.cellAlertIconError)} />,
- [CellAlertType.INFO]: <WarningSingle className={cs(styles.cellAlertIcon, styles.cellAlertIconInfo)} />,
- [CellAlertType.WARNING]: <WarningSingle className={cs(styles.cellAlertIcon, styles.cellAlertIconWarning)} />,
+ [CellAlertType.ERROR]: <ErrorSingle className={clsx(styles.cellAlertIcon, styles.cellAlertIconError)} />,
+ [CellAlertType.INFO]: <WarningSingle className={clsx(styles.cellAlertIcon, styles.cellAlertIconInfo)} />,
+ [CellAlertType.WARNING]: <WarningSingle className={clsx(styles.cellAlertIcon, styles.cellAlertIconWarning)} />,
};
return (
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index e46da5af1e..6905ac48aa 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -81,8 +81,7 @@
"@univerjs/icons": "^0.2.20",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index 0243a42018..977c281d55 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -76,8 +76,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.2.20",
"@univerjs/slides": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index 1be5a54c94..266fa06c2a 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -71,8 +71,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/icons": "^0.2.20",
"@univerjs/thread-comment": "workspace:*",
- "@univerjs/ui": "workspace:*",
- "clsx": "^2.1.1"
+ "@univerjs/ui": "workspace:*"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
diff --git a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
index 25c0017bd6..e7196bd413 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-tree/index.tsx
@@ -18,12 +18,11 @@ import type { IUser, UniverInstanceType } from '@univerjs/core';
import type { IAddCommentCommandParams, IThreadComment, IUpdateCommentCommandParams } from '@univerjs/thread-comment';
import type { IThreadCommentEditorInstance } from '../thread-comment-editor';
import { generateRandomId, ICommandService, LocaleService, UserManagerService } from '@univerjs/core';
-import { Dropdown, Tooltip } from '@univerjs/design';
+import { clsx, Dropdown, Tooltip } from '@univerjs/design';
import { DeleteSingle, MoreHorizontalSingle, ReplyToCommentSingle, ResolvedSingle, SolveSingle } from '@univerjs/icons';
import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, getDT, ResolveCommentCommand, ThreadCommentModel, UpdateCommentCommand } from '@univerjs/thread-comment';
import { useDependency, useObservable } from '@univerjs/ui';
-import cs from 'clsx';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
import { debounceTime } from 'rxjs';
import { SetActiveCommentOperation } from '../../commands/operations/comment.operations';
import { ThreadCommentEditor } from '../thread-comment-editor';
@@ -309,7 +308,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
return (
<div
- className={cs(styles.threadComment, {
+ className={clsx(styles.threadComment, {
[styles.threadCommentActive]: !resolved && (showHighlight || isHover || prefix === 'cell'),
})}
onClick={onClick}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 5c68d0a8e5..b41c9d7744 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -80,7 +80,6 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.2.20",
"@wendellhu/redi": "0.17.1",
- "clsx": "^2.1.1",
"localforage": "^1.10.0",
"rc-notification": "^5.6.2"
},
diff --git a/packages/ui/src/components/menu/mobile/MobileMenu.tsx b/packages/ui/src/components/menu/mobile/MobileMenu.tsx
index aab77a796c..96584ecd54 100644
--- a/packages/ui/src/components/menu/mobile/MobileMenu.tsx
+++ b/packages/ui/src/components/menu/mobile/MobileMenu.tsx
@@ -17,8 +17,8 @@
import type { IDisplayMenuItem, IMenuItem, IValueOption, MenuItemDefaultValueType } from '../../../services/menu/menu';
import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
import type { IBaseMenuProps } from '../desktop/Menu';
-import { clsx } from 'clsx';
-import React, { useMemo } from 'react';
+import { clsx } from '@univerjs/design';
+import { useMemo } from 'react';
import { MenuItemType } from '../../../services/menu/menu';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
import { useDependency, useObservable } from '../../../utils/di';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3204e62751..55db2b5a3b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -126,8 +126,8 @@ importers:
specifier: ^5.2.1
'@vitest/coverage-istanbul':
- specifier: ^3.0.6
+ specifier: ^3.0.7
autoprefixer:
specifier: ^10.4.20
version: 10.4.20([email protected])
@@ -1266,9 +1266,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -1307,9 +1304,6 @@ importers:
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
- rxjs:
- specifier: ^7.8.1
- version: 7.8.1
typescript:
specifier: ^5.7.3
version: 5.7.3
@@ -1346,9 +1340,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -1389,9 +1380,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -1447,9 +1435,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -1499,9 +1484,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -1579,9 +1561,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2006,9 +1985,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
react-dom:
specifier: 19.0.0
version: 19.0.0([email protected])
@@ -2070,9 +2046,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2186,9 +2159,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2281,9 +2251,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2367,12 +2334,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
- rc-virtual-list:
- specifier: ^3.15.0
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2505,9 +2466,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2549,9 +2507,6 @@ importers:
'@univerjs-infra/shared':
specifier: workspace:*
version: link:../../common/shared
- rxjs:
- specifier: ^7.8.1
- version: 7.8.1
typescript:
specifier: ^5.7.3
version: 5.7.3
@@ -2637,9 +2592,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2809,12 +2761,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
- rc-virtual-list:
- specifier: ^3.15.0
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2907,9 +2853,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -2974,9 +2917,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -3032,9 +2972,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -3115,9 +3052,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -3211,9 +3145,6 @@ importers:
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
devDependencies:
'@univerjs-infra/shared':
specifier: workspace:*
@@ -3260,9 +3191,6 @@ importers:
'@wendellhu/redi':
specifier: 0.17.1
version: 0.17.1
- clsx:
- specifier: ^2.1.1
- version: 2.1.1
localforage:
specifier: ^1.10.0
version: 1.10.0
@@ -5610,10 +5538,10 @@ packages:
vite: ^5.0.0 || ^6.0.0
vue: ^3.2.25
- '@vitest/[email protected]':
- resolution: {integrity: sha512-e+8HkmVlPpqOZXIWGE8opxex3trTMCeCMHax7yG0JbWOtGRVKBjuNS/GGA/eta89LuXUrCIcQrRfJHLUrWl7Wg==}
+ '@vitest/[email protected]':
+ resolution: {integrity: sha512-hkd7rlfnqQJFlg6IPv9aFNaxJNkWLasdfaMJR3MBsBkxddSYy5ax9sW6Vv1/3tmmyT9m/b0lHDNknybKJ33cXw==}
peerDependencies:
- vitest: 3.0.6
+ vitest: 3.0.7
'@vitest/[email protected]':
resolution: {integrity: sha512-xlsLr+e+AXZ/00eVZCtNmMeCJoJaRCoLDiAgLcxgQjSS1EertieB2MUHf8xIqPKs9lECc/UpL+y1xDcpvi02hw==}
@@ -9721,13 +9649,6 @@ packages:
react: 19.0.0
react-dom: 19.0.0
- resolution: {integrity: sha512-dF2YQztqrU3ijAeWOqscTshCEr7vpimzSqAVjO1AyAmaqcHulaXpnGR0ptK5PXfxTUy48VkJOiglMIxlkYGs0w==}
- engines: {node: '>=8.x'}
- peerDependencies:
- react: 19.0.0
- react-dom: 19.0.0
-
resolution: {integrity: sha512-algM5UsB7vrlPNr9lsZEH8s9KHkP8XbT/Y0qylyPkiM8mIOlSJLjBNADcmbYPEQCm4zW82mZRJuVHNzqqN0EAQ==}
engines: {node: '>=8.x'}
@@ -13623,7 +13544,7 @@ snapshots:
vue: 3.4.38([email protected])
dependencies:
'@istanbuljs/schema': 0.1.3
debug: 4.4.0
@@ -18371,15 +18292,6 @@ snapshots:
react-dom: 19.0.0([email protected])
react-is: 18.3.1
- dependencies:
- '@babel/runtime': 7.26.0
- classnames: 2.5.1
- react: 19.0.0
- react-dom: 19.0.0([email protected])
-
dependencies:
'@babel/runtime': 7.26.0