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: update @univerjs/icons (#5281)

白熱2bbbfa750def
diff --git a/common/shared/package.json b/common/shared/package.json
index 0f59cd44ff..a13294dca7 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -46,8 +46,8 @@
},
"devDependencies": {
"@types/fs-extra": "^11.0.4",
- "@univerjs/icons": "^0.3.24",
- "@univerjs/icons-svg": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
+ "@univerjs/icons-svg": "^0.4.3",
"@univerjs/protocol": "0.1.46"
}
}
diff --git a/common/storybook/.storybook/preview.tsx b/common/storybook/.storybook/preview.tsx
index 00965e3ec7..cc151f1449 100644
--- a/common/storybook/.storybook/preview.tsx
+++ b/common/storybook/.storybook/preview.tsx
@@ -47,7 +47,7 @@ import zhCN from '@univerjs/design/locale/zh-CN';
import { defaultTheme, greenTheme } from '@univerjs/themes';
import { DesktopLocalStorageService, RediContext, ThemeSwitcherService } from '@univerjs/ui';
-import React, { useEffect, useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
import './global.css';
export const themes: Record<string, Theme> = {
diff --git a/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png b/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png
index 18246e6b03..c2211e199c 100644
Binary files a/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png and b/e2e/visual-comparison/docs/docs-visual-comparison.spec.ts-snapshots/default-doc-ci-chromium-linux.png differ
diff --git a/examples/package.json b/examples/package.json
index ff224087dc..43f255edb0 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -35,7 +35,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/find-replace": "workspace:*",
- "@univerjs/icons": "0.3.24",
+ "@univerjs/icons": "0.4.3",
"@univerjs/mockdata": "workspace:*",
"@univerjs/network": "workspace:*",
"@univerjs/rpc": "workspace:*",
diff --git a/examples/src/sheets-webcomponent/main.tsx b/examples/src/sheets-webcomponent/main.tsx
index e7e4e39e16..44a576bb63 100644
--- a/examples/src/sheets-webcomponent/main.tsx
+++ b/examples/src/sheets-webcomponent/main.tsx
@@ -35,7 +35,6 @@ import { customElement } from 'lit/decorators.js';
import React from 'react';
import '../global.css';
-// 创建 Lit Element
@customElement('my-univer')
class MyWebComponent extends LitElement {
override firstUpdated() {
@@ -77,13 +76,12 @@ class MyWebComponent extends LitElement {
}
}
-// 将 Web Component 包装为 React 组件
const App = createComponent({
tagName: 'my-univer',
elementClass: MyWebComponent,
react: React,
events: {
- onMyEvent: 'my-event', // 事件映射
+ onMyEvent: 'my-event',
},
});
diff --git a/examples/src/sheets/custom-plugin/import-csv-button.ts b/examples/src/sheets/custom-plugin/import-csv-button.ts
index 835fb341f3..7eba7cb6cb 100644
--- a/examples/src/sheets/custom-plugin/import-csv-button.ts
+++ b/examples/src/sheets/custom-plugin/import-csv-button.ts
@@ -28,7 +28,7 @@ import {
sequenceExecute,
UniverInstanceType,
} from '@univerjs/core';
-import { FolderSingle } from '@univerjs/icons';
+import { FolderIcon } from '@univerjs/icons';
import {
SetRangeValuesMutation,
SetRangeValuesUndoMutationFactory,
@@ -115,7 +115,7 @@ class ImportCSVButtonPlugin extends Plugin {
// eslint-disable-next-line max-lines-per-function
override onStarting() {
// register icon component
- this.componentManager.register('FolderSingle2', FolderSingle);
+ this.componentManager.register('FolderIcon2', FolderIcon);
const buttonId = 'import-csv-button';
@@ -206,7 +206,7 @@ class ImportCSVButtonPlugin extends Plugin {
id: buttonId,
title: 'Import CSV',
tooltip: 'Import CSV',
- icon: 'FolderSingle2', // icon name
+ icon: 'FolderIcon2', // icon name
type: MenuItemType.BUTTON,
});
diff --git a/packages-experimental/debugger/package.json b/packages-experimental/debugger/package.json
index c2787d6506..1ffe9b52ef 100644
--- a/packages-experimental/debugger/package.json
+++ b/packages-experimental/debugger/package.json
@@ -61,7 +61,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/docs-drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/mockdata": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing-ui": "workspace:*",
diff --git a/packages-experimental/debugger/src/controllers/watermark.menu.controller.ts b/packages-experimental/debugger/src/controllers/watermark.menu.controller.ts
index a986dcf31d..4b458acd0d 100644
--- a/packages-experimental/debugger/src/controllers/watermark.menu.controller.ts
+++ b/packages-experimental/debugger/src/controllers/watermark.menu.controller.ts
@@ -36,8 +36,8 @@ export class UniverWatermarkMenuController extends Disposable {
([
[WATERMARK_PANEL, WatermarkPanel],
[WATERMARK_PANEL_FOOTER, WatermarkPanelFooter],
- ] as const).forEach(([key, component]) => {
- this.disposeWithMe(this._componentManager.register(key, component));
+ ] as const).forEach(([key, comp]) => {
+ this.disposeWithMe(this._componentManager.register(key, comp));
});
}
}
diff --git a/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx b/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx
index 681ee2322a..7dda53986a 100644
--- a/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx
+++ b/packages-experimental/debugger/src/views/watermark/WatermarkTextSetting.tsx
@@ -16,7 +16,7 @@
import type { ITextWatermarkConfig } from '@univerjs/engine-render';
import { Checkbox, clsx, ColorPicker, Dropdown, Input, InputNumber, Select } from '@univerjs/design';
-import { BoldSingle, FontColor, ItalicSingle } from '@univerjs/icons';
+import { BoldIcon, FontColorDoubleIcon, ItalicIcon } from '@univerjs/icons';
interface IWatermarkTextSettingProps {
config?: ITextWatermarkConfig;
@@ -105,7 +105,7 @@ export function WatermarkTextSetting(props: IWatermarkTextSettingProps) {
hover:univer-bg-gray-100
`}
>
- <FontColor extend={{ colorChannel1: config.color ?? '#2c53f1' }} />
+ <FontColorDoubleIcon extend={{ colorChannel1: config.color ?? '#2c53f1' }} />
</a>
</Dropdown>
<a
@@ -117,7 +117,7 @@ export function WatermarkTextSetting(props: IWatermarkTextSettingProps) {
})}
onClick={() => { onChange({ ...config, bold: !config.bold }); }}
>
- <BoldSingle />
+ <BoldIcon />
</a>
<a
className={clsx(`
@@ -128,7 +128,7 @@ export function WatermarkTextSetting(props: IWatermarkTextSettingProps) {
})}
onClick={() => { onChange({ ...config, italic: !config.italic }); }}
>
- <ItalicSingle />
+ <ItalicIcon />
</a>
</div>
</div>
diff --git a/packages-experimental/uni-docs-ui/src/controllers/menu.ts b/packages-experimental/uni-docs-ui/src/controllers/menu.ts
index 234fb3f11b..68892d88ab 100644
--- a/packages-experimental/uni-docs-ui/src/controllers/menu.ts
+++ b/packages-experimental/uni-docs-ui/src/controllers/menu.ts
@@ -35,7 +35,7 @@ export function DocBoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: DOC_BOLD_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'BoldSingle',
+ icon: 'BoldIcon',
title: 'Set bold',
tooltip: 'toolbar.bold',
activated$: new Observable<boolean>((subscriber) => {
@@ -69,7 +69,7 @@ export function DocItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: DOC_ITALIC_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'ItalicSingle',
+ icon: 'ItalicIcon',
title: 'Set italic',
tooltip: 'toolbar.italic',
activated$: new Observable<boolean>((subscriber) => {
@@ -103,7 +103,7 @@ export function DocUnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonIte
return {
id: DOC_UNDERLINE_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'UnderlineSingle',
+ icon: 'UnderlineIcon',
title: 'Set underline',
tooltip: 'toolbar.underline',
activated$: new Observable<boolean>((subscriber) => {
@@ -137,7 +137,7 @@ export function DocStrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButto
return {
id: DOC_STRIKE_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'StrikethroughSingle',
+ icon: 'StrikethroughIcon',
title: 'Set strike through',
tooltip: 'toolbar.strikethrough',
activated$: new Observable<boolean>((subscriber) => {
@@ -169,7 +169,7 @@ export function DocTableMenuFactory(accessor: IAccessor): IMenuItem {
return {
id: DOC_TABLE_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'GridSingle',
+ icon: 'GridIcon',
tooltip: 'toolbar.table.main',
disabled$: getTableDisabledObservable(accessor),
// Do not show header footer menu and insert table at zen mode.
diff --git a/packages-experimental/uni-formula-ui/package.json b/packages-experimental/uni-formula-ui/package.json
index 9b69179520..160fe6ab8f 100644
--- a/packages-experimental/uni-formula-ui/package.json
+++ b/packages-experimental/uni-formula-ui/package.json
@@ -71,7 +71,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx b/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx
index 8b3171629d..64d84fbb00 100644
--- a/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx
+++ b/packages-experimental/uni-formula-ui/src/views/components/DocFormulaPopup.tsx
@@ -29,10 +29,9 @@ import {
WrapStrategy,
} from '@univerjs/core';
import { borderClassName, clsx } from '@univerjs/design';
-import { CheckMarkSingle, CloseSingle } from '@univerjs/icons';
+import { CheckMarkIcon, CloseIcon } from '@univerjs/icons';
import { useDependency, useObservable } from '@univerjs/ui';
-
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
import { CloseFormulaPopupOperation, ConfirmFormulaPopupCommand } from '../../commands/operations/operation';
import { DOC_FORMULA_POPUP_KEY, UniFormulaPopupService } from '../../services/formula-popup.service';
@@ -146,13 +145,13 @@ function DocFormula(props: { popupInfo: IUniFormulaPopupInfo }) {
className="univer-flex univer-items-center univer-gap-2 univer-rounded-lg univer-p-1"
onClick={onCancel}
>
- <CloseSingle />
+ <CloseIcon />
</span>
<span
className="univer-flex univer-items-center univer-gap-2 univer-rounded-lg univer-p-1"
onClick={onConfirm}
>
- <CheckMarkSingle />
+ <CheckMarkIcon />
</span>
</div>
</div>
diff --git a/packages-experimental/uni-sheets-ui/package.json b/packages-experimental/uni-sheets-ui/package.json
index 924d44a8b4..4d00c371c8 100644
--- a/packages-experimental/uni-sheets-ui/package.json
+++ b/packages-experimental/uni-sheets-ui/package.json
@@ -64,7 +64,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing-ui": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages-experimental/uni-sheets-ui/src/controllers/menu.ts b/packages-experimental/uni-sheets-ui/src/controllers/menu.ts
index 279b855972..b8abb7452e 100644
--- a/packages-experimental/uni-sheets-ui/src/controllers/menu.ts
+++ b/packages-experimental/uni-sheets-ui/src/controllers/menu.ts
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+import type { IAccessor } from '@univerjs/core';
+import type { IMenuButtonItem } from '@univerjs/ui';
import { BooleanNumber, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, EDITOR_ACTIVATED, FOCUSING_SHEET, FontItalic, FontWeight, ICommandService, IContextService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { DocSelectionManagerService, SetTextSelectionsOperation } from '@univerjs/docs';
import { SetInlineFormatCommand } from '@univerjs/docs-ui';
@@ -28,9 +30,8 @@ import {
WorksheetSetCellStylePermission,
} from '@univerjs/sheets';
import { deriveStateFromActiveSheet$, getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
-import { getMenuHiddenObservable, type IMenuButtonItem, MenuItemType } from '@univerjs/ui';
+import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { Observable } from 'rxjs';
-import type { IAccessor } from '@univerjs/core';
export const SHEET_BOLD_MUTATION_ID = 'sheet.command.uni-bold';
export const SHEET_ITALIC_MUTATION_ID = 'sheet.command.uni-italic';
@@ -46,7 +47,7 @@ export function SheetBoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SHEET_BOLD_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'BoldSingle',
+ icon: 'BoldIcon',
title: 'Set bold',
tooltip: 'toolbar.bold',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
@@ -108,7 +109,7 @@ export function SheetItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: SHEET_ITALIC_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'ItalicSingle',
+ icon: 'ItalicIcon',
title: 'Set italic',
tooltip: 'toolbar.italic',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
@@ -162,7 +163,7 @@ export function SheetUnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonI
return {
id: SHEET_UNDERLINE_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'UnderlineSingle',
+ icon: 'UnderlineIcon',
title: 'Set underline',
tooltip: 'toolbar.underline',
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
@@ -216,7 +217,7 @@ export function SheetStrikeThroughMenuItemFactory(accessor: IAccessor): IMenuBut
return {
id: SHEET_STRIKE_MUTATION_ID,
type: MenuItemType.BUTTON,
- icon: 'StrikethroughSingle',
+ icon: 'StrikethroughIcon',
title: 'Set strike through',
tooltip: 'toolbar.strikethrough',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
diff --git a/packages-experimental/uni-sheets-ui/src/controllers/uni-sheets-ui.controller.tsx b/packages-experimental/uni-sheets-ui/src/controllers/uni-sheets-ui.controller.tsx
index ca2da57072..efc0640dcb 100644
--- a/packages-experimental/uni-sheets-ui/src/controllers/uni-sheets-ui.controller.tsx
+++ b/packages-experimental/uni-sheets-ui/src/controllers/uni-sheets-ui.controller.tsx
@@ -18,10 +18,29 @@ import type { Workbook } from '@univerjs/core';
import { ICommandService, IConfigService, Inject, Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { SetBackgroundColorCommand } from '@univerjs/sheets';
import { SHEETS_IMAGE_MENU_ID } from '@univerjs/sheets-drawing-ui';
-import { RenderSheetContent, SetRangeBoldCommand, SetRangeFontFamilyCommand, SetRangeFontSizeCommand, SetRangeItalicCommand, SetRangeStrickThroughCommand, SetRangeTextColorCommand, SetRangeUnderlineCommand, SheetUIController } from '@univerjs/sheets-ui';
-import { BuiltInUIPart, ComponentManager, connectInjector, ILayoutService, IMenuManagerService, IShortcutService, IUIPartsService, useDependency, useObservable } from '@univerjs/ui';
+import {
+ RenderSheetContent,
+ SetRangeBoldCommand,
+ SetRangeFontFamilyCommand,
+ SetRangeFontSizeCommand,
+ SetRangeItalicCommand,
+ SetRangeStrickThroughCommand,
+ SetRangeTextColorCommand,
+ SetRangeUnderlineCommand,
+ SheetUIController,
+} from '@univerjs/sheets-ui';
+import {
+ BuiltInUIPart,
+ ComponentManager,
+ connectInjector,
+ ILayoutService,
+ IMenuManagerService,
+ IShortcutService,
+ IUIPartsService,
+ useDependency,
+ useObservable,
+} from '@univerjs/ui';
import { BuiltinUniToolbarItemId, generateCloneMutation, UniToolbarService, UniUIPart } from '@univerjs/uniui';
-import React from 'react';
import { UniSheetBar } from '../views/uni-sheet-bar/UniSheetBar';
import { SHEET_BOLD_MUTATION_ID, SHEET_ITALIC_MUTATION_ID, SHEET_STRIKE_MUTATION_ID, SHEET_UNDERLINE_MUTATION_ID } from './menu';
import { menuSchema } from './menu.schema';
diff --git a/packages-experimental/uni-sheets-ui/src/views/uni-sheet-bar/UniSheetBar.tsx b/packages-experimental/uni-sheets-ui/src/views/uni-sheet-bar/UniSheetBar.tsx
index 6e2307e33c..bedcaca044 100644
--- a/packages-experimental/uni-sheets-ui/src/views/uni-sheet-bar/UniSheetBar.tsx
+++ b/packages-experimental/uni-sheets-ui/src/views/uni-sheet-bar/UniSheetBar.tsx
@@ -18,11 +18,20 @@ import type { ICommandInfo } from '@univerjs/core';
import type { IBaseSheetBarProps } from '@univerjs/sheets-ui';
import { ICommandService } from '@univerjs/core';
import { clsx, scrollbarClassName, Tooltip } from '@univerjs/design';
-import { IncreaseSingle } from '@univerjs/icons';
-import { InsertSheetCommand, InsertSheetMutation, RemoveSheetMutation, SetTabColorMutation, SetWorksheetActiveOperation, SetWorksheetHideMutation, SetWorksheetNameMutation, SetWorksheetOrderMutation } from '@univerjs/sheets';
+import { IncreaseIcon } from '@univerjs/icons';
+import {
+ InsertSheetCommand,
+ InsertSheetMutation,
+ RemoveSheetMutation,
+ SetTabColorMutation,
+ SetWorksheetActiveOperation,
+ SetWorksheetHideMutation,
+ SetWorksheetNameMutation,
+ SetWorksheetOrderMutation,
+} from '@univerjs/sheets';
import { useActiveWorkbook } from '@univerjs/sheets-ui';
import { useDependency } from '@univerjs/ui';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
export function UniSheetBar() {
const [sheetList, setSheetList] = useState<IBaseSheetBarProps[]>([]);
@@ -132,7 +141,7 @@ export function UniSheetBar() {
onClick={handleSheetAdd}
>
- <IncreaseSingle className="univer-mr-1 univer-size-4" />
+ <IncreaseIcon className="univer-mr-1 univer-size-4" />
<span>New sheet</span>
</button>
</div>
diff --git a/packages-experimental/uni-slides-ui/package.json b/packages-experimental/uni-slides-ui/package.json
index 43c0838dac..97ef543c81 100644
--- a/packages-experimental/uni-slides-ui/package.json
+++ b/packages-experimental/uni-slides-ui/package.json
@@ -62,7 +62,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/slides-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@univerjs/uniui": "workspace:*"
diff --git a/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx b/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx
index ae1ea95731..e99b72ab0a 100644
--- a/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx
+++ b/packages-experimental/uni-slides-ui/src/controllers/uni-slides-ui.controller.tsx
@@ -19,7 +19,6 @@ import { ICommandService, Inject, Injector, IUniverInstanceService, UniverInstan
import { SHAPE_MENU_ID, SlideAddTextCommand, SlideEditorContainer, SLIDES_IMAGE_MENU_ID, SlidesUIController } from '@univerjs/slides-ui';
import { BuiltInUIPart, ComponentManager, connectInjector, IMenuManagerService, IShortcutService, IUIPartsService, useDependency, useObservable } from '@univerjs/ui';
import { BuiltinUniToolbarItemId, UniToolbarService, UniUIPart } from '@univerjs/uniui';
-import React from 'react';
import { UniSlideSideBar } from '../views/UniSlideSideBar';
import { menuSchema } from './menu.schema';
diff --git a/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx b/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx
index c05a74b4eb..e1583305a3 100644
--- a/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx
+++ b/packages-experimental/uni-slides-ui/src/views/UniSlideSideBar.tsx
@@ -18,10 +18,10 @@ import type { SlideDataModel } from '@univerjs/core';
import { ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { borderClassName, clsx, scrollbarClassName } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { IncreaseSingle } from '@univerjs/icons';
+import { IncreaseIcon } from '@univerjs/icons';
import { ActivateSlidePageOperation, AppendSlideOperation, SetSlidePageThumbOperation } from '@univerjs/slides-ui';
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { createRef, useCallback, useEffect, useMemo, useRef, useState } from 'react';
/**
* This components works as the root component of the left Sidebar of Slide.
@@ -52,7 +52,7 @@ export function UniSlideSideBar() {
const [activatePageId, setActivatePageId] = useState<string | null>(pageOrder[0]);
const [barHeight, setBarHeight] = useState(0);
- const divRefs = useMemo(() => slideList.map(() => React.createRef<HTMLDivElement>()), [slideList]);
+ const divRefs = useMemo(() => slideList.map(() => createRef<HTMLDivElement>()), [slideList]);
useEffect(() => {
const subscriber = currentSlide?.activePage$.subscribe((page) => {
@@ -137,7 +137,7 @@ export function UniSlideSideBar() {
`}
onClick={handleAppendSlide}
>
- <IncreaseSingle className="univer-mr-1 univer-size-4" />
+ <IncreaseIcon className="univer-mr-1 univer-size-4" />
<span>{localeService.t('slide.append')}</span>
</button>
</div>
diff --git a/packages-experimental/uniui/package.json b/packages-experimental/uniui/package.json
index a6c15c0395..7624933031 100644
--- a/packages-experimental/uniui/package.json
+++ b/packages-experimental/uniui/package.json
@@ -65,7 +65,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
diff --git a/packages-experimental/uniui/src/controllers/menu.ts b/packages-experimental/uniui/src/controllers/menu.ts
index 7182dc2c5a..10a5ce1c30 100644
--- a/packages-experimental/uniui/src/controllers/menu.ts
+++ b/packages-experimental/uniui/src/controllers/menu.ts
@@ -47,7 +47,7 @@ export enum UNI_MENU_POSITIONS {
TOOLBAR_FLOAT = 'toolbar_float',
}
-export function FakeFontFamilySelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
+export function FakeFontFamilySelectorMenuItemFactory(): IMenuSelectorItem<string> {
return {
id: FAKE_FONT_FAMILY_MENU_ID,
tooltip: 'toolbar.font',
@@ -58,7 +58,7 @@ export function FakeFontFamilySelectorMenuItemFactory(accessor: IAccessor): IMen
};
}
-export function FakeFontSizeSelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<number> {
+export function FakeFontSizeSelectorMenuItemFactory(): IMenuSelectorItem<number> {
return {
id: FAKE_FONT_SIZE_MENU_ID,
type: MenuItemType.SELECTOR,
@@ -75,10 +75,10 @@ export function FakeFontSizeSelectorMenuItemFactory(accessor: IAccessor): IMenuS
};
}
-export function FakeTextColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
+export function FakeTextColorSelectorMenuItemFactory(): IMenuSelectorItem<string> {
return {
id: FAKE_FONT_COLOR_MENU_ID,
- icon: 'FontColor',
+ icon: 'FontColorDoubleIcon',
tooltip: 'toolbar.textColor.main',
type: MenuItemType.BUTTON_SELECTOR,
selections: [],
@@ -86,42 +86,42 @@ export function FakeTextColorSelectorMenuItemFactory(accessor: IAccessor): IMenu
};
}
-export function FakeBackgroundColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<string> {
+export function FakeBackgroundColorSelectorMenuItemFactory(): IMenuSelectorItem<string> {
return {
id: FAKE_BG_COLOR_MENU_ID,
tooltip: 'toolbar.fillColor.main',
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'PaintBucket',
+ icon: 'PaintBucketDoubleIcon',
selections: [],
disabled$: new Observable((subscriber) => { subscriber.next(true); }),
};
}
-export function FakeImageMenuFactory(accessor: IAccessor): IMenuItem {
+export function FakeImageMenuFactory(): IMenuItem {
return {
id: FAKE_IMAGE_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'addition-and-subtraction-single',
+ icon: 'AdditionAndSubtractionIcon',
tooltip: 'sheetImage.title',
disabled$: new Observable((subscriber) => { subscriber.next(true); }),
};
}
-export function FakeUnorderListMenuItemFactory(accessor: IAccessor): IMenuItem {
+export function FakeUnorderListMenuItemFactory(): IMenuItem {
return {
id: FAKE_UNORDER_LIST_MENU_ID,
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'UnorderSingle',
+ icon: 'UnorderIcon',
tooltip: 'toolbar.unorder',
disabled$: new Observable((subscriber) => { subscriber.next(true); }),
};
}
-export function FakeOrderListMenuItemFactory(accessor: IAccessor): IMenuItem {
+export function FakeOrderListMenuItemFactory(): IMenuItem {
return {
id: FAKE_ORDER_LIST_MENU_ID,
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'OrderSingle',
+ icon: 'OrderIcon',
tooltip: 'toolbar.order',
disabled$: new Observable((subscriber) => { subscriber.next(true); }),
};
@@ -133,7 +133,7 @@ export function FontGroupMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
id: FONT_GROUP_MENU_ID,
type: MenuItemType.SUBITEMS,
tooltip: 'Font group',
- icon: 'BoldSingle',
+ icon: 'BoldIcon',
hidden$: new Observable((subscriber) => {
const subscription = univerInstanceService.focused$.subscribe((unitId) => {
if (unitId == null) {
@@ -158,27 +158,27 @@ export function FontGroupMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
};
}
-export function FakeFontGroupMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {
+export function FakeFontGroupMenuItemFactory(): IMenuSelectorItem {
return {
id: FAKE_FONT_GROUP_MENU_ID,
type: MenuItemType.SUBITEMS,
tooltip: 'Font group',
- icon: 'BoldSingle',
+ icon: 'BoldIcon',
disabled$: new Observable((subscriber) => { subscriber.next(true); }),
};
}
-export function FakePivotTableMenuItemFactory(accessor: IAccessor): IMenuItem {
+export function FakePivotTableMenuItemFactory(): IMenuItem {
return {
id: FAKE_TABLE_MENU_ID,
type: MenuItemType.BUTTON,
- icon: 'PivotTableSingle',
+ icon: 'PivotTableIcon',
tooltip: 'PivotTable',
disabled$: new Observable((subscriber) => { subscriber.next(true); }),
};
}
-export function UnitLineColorMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function UnitLineColorMenuItemFactory(): IMenuButtonItem {
return {
id: UNIT_LINE_COLOR_MENU_ID,
type: MenuItemType.BUTTON,
@@ -187,62 +187,62 @@ export function UnitLineColorMenuItemFactory(accessor: IAccessor): IMenuButtonIt
};
}
-export function DownloadMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function DownloadMenuItemFactory(): IMenuButtonItem {
return {
id: DOWNLOAD_MENU_ID,
type: MenuItemType.BUTTON,
title: '',
tooltip: 'Download',
- icon: 'DownloadSingle',
+ icon: 'DownloadIcon',
};
}
-export function ShareMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function ShareMenuItemFactory(): IMenuButtonItem {
return {
id: SHARE_MENU_ID,
type: MenuItemType.BUTTON,
title: '',
tooltip: 'Share',
- icon: 'ShareSingle',
+ icon: 'ShareIcon',
};
}
-export function LockMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function LockMenuItemFactory(): IMenuButtonItem {
return {
id: LOCK_MENU_ID,
type: MenuItemType.BUTTON,
title: '',
tooltip: 'Lock',
- icon: 'LockSingle',
+ icon: 'LockIcon',
};
}
-export function PrintMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function PrintMenuItemFactory(): IMenuButtonItem {
return {
id: PRINT_MENU_ID,
type: MenuItemType.BUTTON,
title: '',
tooltip: 'Print',
- icon: 'PrintSingle',
+ icon: 'PrintIcon',
};
}
-export function ZenMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function ZenMenuItemFactory(): IMenuButtonItem {
return {
id: ZEN_MENU_ID,
type: MenuItemType.BUTTON,
title: '',
- icon: 'ZenSingle',
+ icon: 'ZenIcon',
tooltip: 'Full screen',
};
}
-export function DeleteMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function DeleteMenuItemFactory(): IMenuButtonItem {
return {
id: DELETE_MENU_ID,
type: MenuItemType.BUTTON,
title: 'Delete',
tooltip: 'Delete',
- icon: 'DeleteSingle',
+ icon: 'DeleteIcon',
};
}
diff --git a/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx b/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
index ac68eb5c81..e436ba2adf 100644
--- a/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
+++ b/packages-experimental/uniui/src/controllers/uniui-toolbar.controller.tsx
@@ -16,7 +16,7 @@
import type { MenuConfig } from '@univerjs/ui';
import { Disposable, ICommandService, Inject, Injector } from '@univerjs/core';
-import { DeleteSingle, DownloadSingle, LockSingle, PivotTableSingle, PrintSingle, ShareSingle, ZenSingle } from '@univerjs/icons';
+import { DeleteIcon, DownloadIcon, LockIcon, PivotTableIcon, PrintIcon, ShareIcon, ZenIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
import { DisposeUnitOperation } from '../commands/operations/uni.operation';
import { UniToolbarService } from '../services/toolbar/uni-toolbar-service';
@@ -45,13 +45,13 @@ export class UniuiToolbarController extends Disposable {
private _initComponent(): void {
const componentManager = this._componentManager;
const iconList: Record<string, React.ForwardRefExoticComponent<any>> = {
- DownloadSingle,
- ShareSingle,
- LockSingle,
- PrintSingle,
- ZenSingle,
- DeleteSingle,
- PivotTableSingle,
+ DownloadIcon,
+ ShareIcon,
+ LockIcon,
+ PrintIcon,
+ ZenIcon,
+ DeleteIcon,
+ PivotTableIcon,
};
for (const k in iconList) {
this.disposeWithMe(componentManager.register(k, iconList[k]));
diff --git a/packages-experimental/uniui/src/views/outline/Outline.tsx b/packages-experimental/uniui/src/views/outline/Outline.tsx
index 97cbcdadf1..76f621e5a6 100644
--- a/packages-experimental/uniui/src/views/outline/Outline.tsx
+++ b/packages-experimental/uniui/src/views/outline/Outline.tsx
@@ -15,7 +15,6 @@
*/
import { ComponentContainer, useComponentsOfPart } from '@univerjs/ui';
-import React from 'react';
export enum UniUIPart {
OUTLINE = 'OUTLINE',
diff --git a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
index 83ae322e8f..bc8f6f0719 100644
--- a/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
+++ b/packages-experimental/uniui/src/views/uni-controls/UniControls.tsx
@@ -14,16 +14,17 @@
* limitations under the License.
*/
+import type { CSSProperties, ReactElement } from 'react';
import type { IProjectNode } from '../../services/unit-grid/unit-grid.service';
import { borderClassName, Button, clsx, Dropdown, Tooltip } from '@univerjs/design';
-import { CheckMarkSingle, FullscreenSingle, IncreaseSingle, ZoomReduceSingle } from '@univerjs/icons';
+import { CheckMarkIcon, FullscreenIcon, IncreaseIcon, ZoomReduceIcon } from '@univerjs/icons';
import { ISidebarService, useDependency } from '@univerjs/ui';
import { useReactFlow } from '@xyflow/react';
-import React, { useCallback, useEffect, useLayoutEffect } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useState } from 'react';
import { IUnitGridService } from '../../services/unit-grid/unit-grid.service';
import { UniDiv } from '../uni-toolbar/UniFloatToolbar';
-export const UniControlButton = (props: { tooltips: string; children?: React.ReactElement; onClick: () => void; style?: React.CSSProperties }) => {
+export const UniControlButton = (props: { tooltips: string; children?: ReactElement; onClick: () => void; style?: CSSProperties }) => {
const { children, onClick, style, tooltips } = props;
return (
<Tooltip title={tooltips}>
@@ -131,10 +132,10 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
style={{ right: `${rightPadding}px` }}
>
<UniControlButton tooltips="Full screen" onClick={onFullscreenHandler}>
- <FullscreenSingle />
+ <FullscreenIcon />
</UniControlButton>
<UniControlButton tooltips="Zoom in" onClick={onZoomInHandler}>
- <IncreaseSingle />
+ <IncreaseIcon />
</UniControlButton>
<Dropdown
overlay={(
@@ -163,7 +164,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
univer-items-center univer-text-green-600
`}
>
- <CheckMarkSingle />
+ <CheckMarkIcon />
</span>
)}
<span>
@@ -188,7 +189,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
</a>
</Dropdown>
<UniControlButton tooltips="Zoom out" onClick={onZoomOutHandler}>
- <ZoomReduceSingle />
+ <ZoomReduceIcon />
</UniControlButton>
<UniDiv />
<UniControlButton tooltips="AI" onClick={() => onItemClick?.(UniControlItem.AI)} style={{ background: '#274FEE' }}>
@@ -208,7 +209,7 @@ export const UniControls = ({ zoom, onItemClick }: { zoom: number; onItemClick?:
function useRightSidebarVisible() {
const sidebarService = useDependency(ISidebarService);
- const [visible, setVisible] = React.useState(false);
+ const [visible, setVisible] = useState(false);
useEffect(() => {
const sidebarSubscription = sidebarService.sidebarOptions$.subscribe((options) => {
setVisible(!!options.visible);
diff --git a/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx b/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx
index 9fd7f27722..1647208a6e 100644
--- a/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx
+++ b/packages-experimental/uniui/src/views/uni-sidebar/UniSidebar.tsx
@@ -15,10 +15,11 @@
*/
import type { ISidebarMethodOptions } from '@univerjs/ui';
+import type { ReactNode } from 'react';
import { borderClassName, clsx, scrollbarClassName } from '@univerjs/design';
-import { CloseSingle } from '@univerjs/icons';
+import { CloseIcon } from '@univerjs/icons';
import { CustomLabel, ILeftSidebarService, ISidebarService, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
export interface IUniSidebarProps {
position: 'left' | 'right';
@@ -47,9 +48,9 @@ export function UniSidebar(props: IUniSidebarProps) {
}
const copy = { ...sidebarOptions } as Omit<ISidebarMethodOptions, 'children'> & {
- children?: React.ReactNode;
- header?: React.ReactNode;
- footer?: React.ReactNode;
+ children?: ReactNode;
+ header?: ReactNode;
+ footer?: ReactNode;
};
for (const key of ['children', 'header', 'footer']) {
@@ -133,7 +134,7 @@ export function UniSidebar(props: IUniSidebarProps) {
{options?.header}
<a className="univer-cursor-pointer" onClick={handleClose}>
- <CloseSingle />
+ <CloseIcon />
</a>
</header>
)}
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
index 1937b57415..5a6f7721ab 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFloatToolbar.tsx
@@ -20,7 +20,7 @@ import type { IUnitRendererProps } from '../workbench/UniWorkbench';
import { flip, offset, shift, useFloating } from '@floating-ui/react-dom';
import { IUniverInstanceService } from '@univerjs/core';
import { ComponentContainer, IMenuManagerService, ToolbarItem, useComponentsOfPart, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useImperativeHandle, useState } from 'react';
+import { forwardRef, useEffect, useImperativeHandle, useState } from 'react';
import { DELETE_MENU_ID, DOWNLOAD_MENU_ID, LOCK_MENU_ID, PRINT_MENU_ID, SHARE_MENU_ID, UNI_MENU_POSITIONS, ZEN_MENU_ID } from '../../controllers/menu';
export interface IFloatingToolbarRef {
@@ -40,7 +40,7 @@ const UNI_FLOATING_TOOLBAR_SCHEMA: string[] = [
DELETE_MENU_ID,
];
-export const UniFloatingToolbar = React.forwardRef<IFloatingToolbarRef, { node: Nullable<IUnitRendererProps> }>(({ node }, ref) => {
+export const UniFloatingToolbar = forwardRef<IFloatingToolbarRef, { node: Nullable<IUnitRendererProps> }>(({ node }, ref) => {
const menuManagerService = useDependency(IMenuManagerService);
const isMenuChange = useObservable(menuManagerService.menuChanged$);
const [uniVisibleItems, setUniVisibleItems] = useState<IMenuItem[]>([]);
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx
index 4fe5ef0419..6f16d3fa62 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniFormulaBar.tsx
@@ -27,7 +27,7 @@ import {
} from '@univerjs/core';
import { Button, clsx } from '@univerjs/design';
import { DeviceInputEventType } from '@univerjs/engine-render';
-import { CheckMarkSingle, CloseSingle, FxSingle } from '@univerjs/icons';
+import { CheckMarkIcon, CloseIcon, FxIcon } from '@univerjs/icons';
import {
RangeProtectionPermissionEditPoint,
RangeProtectionRuleModel,
@@ -39,7 +39,7 @@ import {
} from '@univerjs/sheets';
import { EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, IEditorBridgeService, IFormulaEditorManagerService, SetCellEditVisibleOperation, useActiveWorkbook, useKeyEventConfig } from '@univerjs/sheets-ui';
import { ComponentManager, KeyCode, useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback, useLayoutEffect, useRef, useState } from 'react';
+import { useCallback, useLayoutEffect, useRef, useState } from 'react';
import { EMPTY, merge, switchMap } from 'rxjs';
export const UniFormulaBar = () => {
@@ -73,7 +73,7 @@ export const UniFormulaBar = () => {
})}
onClick={() => handleOpenWrite()}
>
- <FxSingle />
+ <FxIcon />
<span className="univer-whitespace-nowrap univer-text-xs">
Write formula
</span>
@@ -201,10 +201,10 @@ export function FormulaBar() {
})}
>
<Button size="small" variant="text" className="univer-text-red-600" onClick={handleCloseBtnClick}>
- <CloseSingle />
+ <CloseIcon />
</Button>
<Button size="small" variant="text" className="univer-text-green-600" onClick={handleConfirmBtnClick}>
- <CheckMarkSingle />
+ <CheckMarkIcon />
</Button>
</div>
{FormulaEditor && (
diff --git a/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx b/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx
index 439de97969..aeca3e52f4 100644
--- a/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx
+++ b/packages-experimental/uniui/src/views/uni-toolbar/UniToolbar.tsx
@@ -19,7 +19,7 @@ import type { ComponentType } from 'react';
import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { useWorkbooks } from '@univerjs/sheets-ui';
import { IMenuManagerService, ToolbarItem, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { UNI_MENU_POSITIONS } from '../../controllers/menu';
import { UniToolbarService } from '../../services/toolbar/uni-toolbar-service';
import { UniFormulaBar } from './UniFormulaBar';
diff --git a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
index 30c34600ca..8040f443b6 100644
--- a/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
+++ b/packages-experimental/uniui/src/views/workbench/UniWorkbench.tsx
@@ -18,16 +18,12 @@
import type { ILocale } from '@univerjs/design';
import type { IWorkbenchOptions } from '@univerjs/ui';
-import type {
- NodeTypes,
- ReactFlowInstance,
- Viewport,
-} from '@xyflow/react';
+import type { NodeTypes, ReactFlowInstance, Viewport } from '@xyflow/react';
import type { IFloatingToolbarRef } from '../uni-toolbar/UniFloatToolbar';
import { debounce, ICommandService, IContextService, IUniverInstanceService, LocaleService, ThemeService } from '@univerjs/core';
import { borderClassName, clsx, ConfigContext, ConfigProvider } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { MenuSingle } from '@univerjs/icons';
+import { MenuIcon } from '@univerjs/icons';
import {
BuiltInUIPart,
ComponentContainer,
@@ -316,12 +312,13 @@ function UnitNode({ data }: IUnitNodeProps) {
univer-justify-center univer-rounded univer-p-1 univer-shadow-sm
`}
>
- <MenuSingle />
+ <MenuIcon />
</div>
<div
className={`
- univer-absolute -univer-top-6 univer-left-0 univer-text-sm univer-text-gray-600 !univer-text-gray-200
+ univer-absolute -univer-top-6 univer-left-0 univer-text-sm univer-text-gray-600
+ dark:!univer-text-gray-200
`}
>
{title}
diff --git a/packages/action-recorder/package.json b/packages/action-recorder/package.json
index ead1d2e8cb..71d01a2a3a 100644
--- a/packages/action-recorder/package.json
+++ b/packages/action-recorder/package.json
@@ -68,7 +68,7 @@
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/action-recorder/src/controllers/action-recorder.controller.tsx b/packages/action-recorder/src/controllers/action-recorder.controller.tsx
index 522c970dc0..10e1acd89e 100644
--- a/packages/action-recorder/src/controllers/action-recorder.controller.tsx
+++ b/packages/action-recorder/src/controllers/action-recorder.controller.tsx
@@ -15,7 +15,7 @@
*/
import { Disposable, ICommandService, Inject, Injector } from '@univerjs/core';
-import { RecordSingle } from '@univerjs/icons';
+import { RecordIcon } from '@univerjs/icons';
import {
AddWorksheetMergeAllCommand,
AddWorksheetMergeCommand,
@@ -116,7 +116,7 @@ export class ActionRecorderController extends Disposable {
private _initUI(): void {
this._uiPartsSrv.registerComponent(BuiltInUIPart.GLOBAL, () => connectInjector(RecorderPanel, this._injector));
this.disposeWithMe(
- this._componentManager.register('RecordSingle', RecordSingle)
+ this._componentManager.register('RecordIcon', RecordIcon)
);
this._menuManagerService.mergeMenu(menuSchema);
}
diff --git a/packages/action-recorder/src/controllers/action-recorder.menu.ts b/packages/action-recorder/src/controllers/action-recorder.menu.ts
index e1a7bc802d..21e802d3b3 100644
--- a/packages/action-recorder/src/controllers/action-recorder.menu.ts
+++ b/packages/action-recorder/src/controllers/action-recorder.menu.ts
@@ -26,7 +26,7 @@ export function RecordMenuItemFactory(): IMenuSelectorItem {
return {
id: RECORD_MENU_ITEM_ID,
type: MenuItemType.SUBITEMS,
- icon: 'RecordSingle',
+ icon: 'RecordIcon',
tooltip: 'action-recorder.menu.title',
};
}
diff --git a/packages/action-recorder/src/views/components/RecorderPanel.tsx b/packages/action-recorder/src/views/components/RecorderPanel.tsx
index 907904dfe1..c8e6f82300 100644
--- a/packages/action-recorder/src/views/components/RecorderPanel.tsx
+++ b/packages/action-recorder/src/views/components/RecorderPanel.tsx
@@ -16,7 +16,7 @@
import { ICommandService } from '@univerjs/core';
import { Button } from '@univerjs/design';
-import { RecordSingle } from '@univerjs/icons';
+import { RecordIcon } from '@univerjs/icons';
import { useDependency, useObservable } from '@univerjs/ui';
import { useCallback } from 'react';
import { CompleteRecordingActionCommand, StartRecordingActionCommand, StopRecordingActionCommand } from '../../commands/commands/record.command';
@@ -67,7 +67,7 @@ function RecordPanelImpl() {
`}
>
<div className="univer-mr-2 univer-size-5 univer-shrink-0 univer-grow-0 univer-text-xl">
- <RecordSingle />
+ <RecordIcon />
</div>
<div className="univer-flex-1 univer-text-sm">{titleText}</div>
<div className="univer-flex univer-w-64 univer-shrink-0 univer-grow-0 univer-justify-between">
diff --git a/packages/design/package.json b/packages/design/package.json
index 8adacec656..284d45ddd4 100644
--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -76,7 +76,7 @@
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-tooltip": "^1.2.7",
"@rc-component/trigger": "^2.2.6",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/themes": "workspace:*",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
diff --git a/packages/design/src/components/accordion/Accordion.tsx b/packages/design/src/components/accordion/Accordion.tsx
index c479eeba0c..d5720f6b30 100644
--- a/packages/design/src/components/accordion/Accordion.tsx
+++ b/packages/design/src/components/accordion/Accordion.tsx
@@ -15,7 +15,7 @@
*/
import type { ReactNode } from 'react';
-import { DownSingle } from '@univerjs/icons';
+import { DownIcon } from '@univerjs/icons';
import { useState } from 'react';
import { clsx } from '../../helper/clsx';
@@ -59,7 +59,7 @@ export function Accordion(props: IAccordionProps) {
type="button"
onClick={() => toggleItem(index)}
>
- <DownSingle
+ <DownIcon
className={clsx('univer-size-2.5 univer-flex-shrink-0 univer-transition-transform', {
'-univer-rotate-90': openIndex !== index,
'univer-rotate-0': openIndex === index,
diff --git a/packages/design/src/components/badge/Badge.tsx b/packages/design/src/components/badge/Badge.tsx
index 5ec5fc8eb1..b6ab6d5433 100644
--- a/packages/design/src/components/badge/Badge.tsx
+++ b/packages/design/src/components/badge/Badge.tsx
@@ -15,7 +15,7 @@
*/
import type { ReactNode } from 'react';
-import { CloseSingle } from '@univerjs/icons';
+import { CloseIcon } from '@univerjs/icons';
import { clsx } from '../../helper/clsx';
export interface IBadgeProps {
@@ -54,7 +54,7 @@ export function Badge(props: IBadgeProps) {
`}
onClick={onClose}
>
- <CloseSingle className="univer-text-current" />
+ <CloseIcon className="univer-text-current" />
</a>
)}
</span>
diff --git a/packages/design/src/components/button/__tests__/index.spec.tsx b/packages/design/src/components/button/__tests__/index.spec.tsx
index 1ee422be73..3c12cd0fbb 100644
--- a/packages/design/src/components/button/__tests__/index.spec.tsx
+++ b/packages/design/src/components/button/__tests__/index.spec.tsx
@@ -15,9 +15,7 @@
*/
import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
import { describe, expect, it } from 'vitest';
-
import { Button } from '../Button';
describe('Button', () => {
diff --git a/packages/design/src/components/cascader-list/CascaderList.stories.tsx b/packages/design/src/components/cascader-list/CascaderList.stories.tsx
index 7f13a6e436..0fe75dc7c4 100644
--- a/packages/design/src/components/cascader-list/CascaderList.stories.tsx
+++ b/packages/design/src/components/cascader-list/CascaderList.stories.tsx
@@ -15,7 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { CascaderList } from './CascaderList';
diff --git a/packages/design/src/components/cascader-list/CascaderList.tsx b/packages/design/src/components/cascader-list/CascaderList.tsx
index 2e658f97bc..61bde1da62 100644
--- a/packages/design/src/components/cascader-list/CascaderList.tsx
+++ b/packages/design/src/components/cascader-list/CascaderList.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { useContext, useMemo } from 'react';
import { borderClassName, scrollbarClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
@@ -147,7 +147,7 @@ export function CascaderList(props: ICascaderListProps) {
`}
>
{option.value === value[index] && (
- <CheckMarkSingle
+ <CheckMarkIcon
className="univer-text-primary-600"
/>
)}
diff --git a/packages/design/src/components/cascader-list/__tests__/index.spec.tsx b/packages/design/src/components/cascader-list/__tests__/index.spec.tsx
index e1adbe6602..040b4efc94 100644
--- a/packages/design/src/components/cascader-list/__tests__/index.spec.tsx
+++ b/packages/design/src/components/cascader-list/__tests__/index.spec.tsx
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-import { afterEach, describe, expect, it } from 'vitest';
-import React from 'react';
import { cleanup, render } from '@testing-library/react';
+import { afterEach, describe, expect, it } from 'vitest';
import { CascaderList } from '../CascaderList';
describe('CascaderList', () => {
diff --git a/packages/design/src/components/checkbox-group/CheckboxGroup.stories.tsx b/packages/design/src/components/checkbox-group/CheckboxGroup.stories.tsx
index d8a6167cdb..8d62cf6773 100644
--- a/packages/design/src/components/checkbox-group/CheckboxGroup.stories.tsx
+++ b/packages/design/src/components/checkbox-group/CheckboxGroup.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { Checkbox } from '../checkbox/Checkbox';
import { CheckboxGroup } from './CheckboxGroup';
diff --git a/packages/design/src/components/checkbox-group/__tests__/index.spec.tsx b/packages/design/src/components/checkbox-group/__tests__/index.spec.tsx
index 522dbd35e3..dfff124f44 100644
--- a/packages/design/src/components/checkbox-group/__tests__/index.spec.tsx
+++ b/packages/design/src/components/checkbox-group/__tests__/index.spec.tsx
@@ -15,9 +15,8 @@
*/
import { fireEvent, render } from '@testing-library/react';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { describe, expect, it } from 'vitest';
-
import { Checkbox } from '../../checkbox/Checkbox';
import { CheckboxGroup } from '../CheckboxGroup';
diff --git a/packages/design/src/components/checkbox/Checkbox.stories.tsx b/packages/design/src/components/checkbox/Checkbox.stories.tsx
index 178b9d15a1..6929c53780 100644
--- a/packages/design/src/components/checkbox/Checkbox.stories.tsx
+++ b/packages/design/src/components/checkbox/Checkbox.stories.tsx
@@ -15,7 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Checkbox } from './Checkbox';
diff --git a/packages/design/src/components/checkbox/Checkbox.tsx b/packages/design/src/components/checkbox/Checkbox.tsx
index dc5904aed6..71a35f2109 100644
--- a/packages/design/src/components/checkbox/Checkbox.tsx
+++ b/packages/design/src/components/checkbox/Checkbox.tsx
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-import type { CSSProperties, ReactNode } from 'react';
-import { CheckMarkSingle } from '@univerjs/icons';
+import type { ChangeEvent, CSSProperties, ReactNode } from 'react';
+import { CheckMarkIcon } from '@univerjs/icons';
import { useRef } from 'react';
import { clsx } from '../../helper/clsx';
@@ -72,7 +72,7 @@ export function Checkbox(props: ICheckboxProps) {
const inputRef = useRef<HTMLInputElement>(null);
- function handleChange(e: React.ChangeEvent<HTMLInputElement>) {
+ function handleChange(e: ChangeEvent<HTMLInputElement>) {
e.stopPropagation();
if (!onChange || disabled) return;
@@ -115,7 +115,7 @@ export function Checkbox(props: ICheckboxProps) {
})}
>
{checked && (
- <CheckMarkSingle
+ <CheckMarkIcon
className={`
univer-absolute univer-left-1/2 univer-top-1/2 univer-block univer-size-3
-univer-translate-x-1/2 -univer-translate-y-1/2 univer-text-white
diff --git a/packages/design/src/components/checkbox/__tests__/index.spec.tsx b/packages/design/src/components/checkbox/__tests__/index.spec.tsx
index d8fb3abb41..4ea989a6e0 100644
--- a/packages/design/src/components/checkbox/__tests__/index.spec.tsx
+++ b/packages/design/src/components/checkbox/__tests__/index.spec.tsx
@@ -15,7 +15,7 @@
*/
import { fireEvent, render } from '@testing-library/react';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { describe, expect, it } from 'vitest';
import { Checkbox } from '../Checkbox';
diff --git a/packages/design/src/components/color-picker/AlphaSlider.tsx b/packages/design/src/components/color-picker/AlphaSlider.tsx
index 4450d37596..6a3ae84563 100644
--- a/packages/design/src/components/color-picker/AlphaSlider.tsx
+++ b/packages/design/src/components/color-picker/AlphaSlider.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { hsvToRgb } from './color-conversion';
interface IAlphaSliderProps {
@@ -24,7 +24,7 @@ interface IAlphaSliderProps {
onChanged?: (alpha: number) => void;
}
-export const AlphaSlider: React.FC<IAlphaSliderProps> = ({ hsv, alpha, onChange, onChanged }) => {
+export function AlphaSlider({ hsv, alpha, onChange, onChanged }: IAlphaSliderProps) {
const [isDragging, setIsDragging] = useState(false);
const sliderRef = useRef<HTMLDivElement>(null);
const thumbRef = useRef<HTMLDivElement>(null);
diff --git a/packages/design/src/components/color-picker/HueSlider.tsx b/packages/design/src/components/color-picker/HueSlider.tsx
index c4a2d32cda..e9004e3a0d 100644
--- a/packages/design/src/components/color-picker/HueSlider.tsx
+++ b/packages/design/src/components/color-picker/HueSlider.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
interface IHueSliderProps {
hsv: [number, number, number];
diff --git a/packages/design/src/components/config-provider/ConfigProvider.tsx b/packages/design/src/components/config-provider/ConfigProvider.tsx
index 252b7a0473..ef1444f322 100644
--- a/packages/design/src/components/config-provider/ConfigProvider.tsx
+++ b/packages/design/src/components/config-provider/ConfigProvider.tsx
@@ -14,12 +14,13 @@
* limitations under the License.
*/
+import type { ReactNode } from 'react';
import type { ILocale } from '../../locale/interface';
-import React, { createContext, useMemo } from 'react';
+import { createContext, useMemo } from 'react';
import { isBrowser } from '../../helper/is-browser';
export interface IConfigProviderProps {
- children: React.ReactNode;
+ children: ReactNode;
locale?: ILocale['design'];
mountContainer: HTMLElement | null;
}
diff --git a/packages/design/src/components/config-provider/__tests__/index.spec.tsx b/packages/design/src/components/config-provider/__tests__/index.spec.tsx
index e1df370a28..dc77e2fa87 100644
--- a/packages/design/src/components/config-provider/__tests__/index.spec.tsx
+++ b/packages/design/src/components/config-provider/__tests__/index.spec.tsx
@@ -14,12 +14,11 @@
* limitations under the License.
*/
+import type { ILocale } from '../../../locale/interface';
import { render } from '@testing-library/react';
-import React, { useContext } from 'react';
+import { useContext } from 'react';
import { describe, expect, it } from 'vitest';
-
import zhCN from '../../../locale/zh-CN';
-import type { ILocale } from '../../../locale/interface';
import { ConfigContext, ConfigProvider } from '../ConfigProvider';
describe('ConfigProvider', () => {
diff --git a/packages/design/src/components/confirm/Confirm.stories.tsx b/packages/design/src/components/confirm/Confirm.stories.tsx
index c2a9543d89..812c44accd 100644
--- a/packages/design/src/components/confirm/Confirm.stories.tsx
+++ b/packages/design/src/components/confirm/Confirm.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { Button } from '../button/Button';
import { Confirm } from './Confirm';
diff --git a/packages/design/src/components/confirm/Confirm.tsx b/packages/design/src/components/confirm/Confirm.tsx
index 2953078aec..977377bbc3 100644
--- a/packages/design/src/components/confirm/Confirm.tsx
+++ b/packages/design/src/components/confirm/Confirm.tsx
@@ -14,15 +14,15 @@
* limitations under the License.
*/
+import type { ReactNode } from 'react';
import type { ILocale } from '../../locale/interface';
-
-import React, { useContext } from 'react';
+import { useContext } from 'react';
import { Button } from '../button/Button';
import { ConfigContext } from '../config-provider/ConfigProvider';
import { Dialog } from '../dialog/Dialog';
export interface IConfirmProps {
- children: React.ReactNode;
+ children: ReactNode;
/**
* Whether the Confirm is visible.
diff --git a/packages/design/src/components/date-picker/DatePicker.stories.tsx b/packages/design/src/components/date-picker/DatePicker.stories.tsx
index c5dd575a87..83ae04356b 100644
--- a/packages/design/src/components/date-picker/DatePicker.stories.tsx
+++ b/packages/design/src/components/date-picker/DatePicker.stories.tsx
@@ -16,8 +16,7 @@
import type { Meta } from '@storybook/react';
import { dayjs } from '@univerjs/core';
-
-import React, { useState } from 'react';
+import { useState } from 'react';
import { DatePicker } from './DatePicker';
const meta: Meta<typeof DatePicker> = {
diff --git a/packages/design/src/components/date-picker/DatePicker.tsx b/packages/design/src/components/date-picker/DatePicker.tsx
index 8022a1f182..422b18431c 100644
--- a/packages/design/src/components/date-picker/DatePicker.tsx
+++ b/packages/design/src/components/date-picker/DatePicker.tsx
@@ -16,7 +16,7 @@
import type { dayjs } from '@univerjs/core';
import type { PickerProps } from 'rc-picker';
-import { CalendarSingle } from '@univerjs/icons';
+import { CalendarIcon } from '@univerjs/icons';
import RcPicker from 'rc-picker';
import generateConfig from 'rc-picker/lib/generate/dayjs';
import { useContext } from 'react';
@@ -53,7 +53,7 @@ export function DatePicker(props: IDatePickerProps) {
prefixCls="univer-date-picker"
generateConfig={generateConfig}
locale={locale?.Picker!}
- suffixIcon={<CalendarSingle className="univer-date-picker-suffix-icon" />}
+ suffixIcon={<CalendarIcon className="univer-date-picker-suffix-icon" />}
onChange={handleChange}
/>
);
diff --git a/packages/design/src/components/date-range-picker/DateRangePicker.tsx b/packages/design/src/components/date-range-picker/DateRangePicker.tsx
index 043ea92416..87549801ab 100644
--- a/packages/design/src/components/date-range-picker/DateRangePicker.tsx
+++ b/packages/design/src/components/date-range-picker/DateRangePicker.tsx
@@ -16,7 +16,7 @@
import type { dayjs } from '@univerjs/core';
import type { NoUndefinedRangeValueType, RangePickerProps } from 'rc-picker/lib/PickerInput/RangePicker';
-import { CalendarSingle, GuideSingle } from '@univerjs/icons';
+import { CalendarIcon, GuideIcon } from '@univerjs/icons';
import { RangePicker } from 'rc-picker';
import generateConfig from 'rc-picker/lib/generate/dayjs';
import { useContext } from 'react';
@@ -53,8 +53,8 @@ export function DateRangePicker(props: IDateRangePickerProps) {
prefixCls="univer-date-range-picker"
generateConfig={generateConfig}
locale={locale?.Picker!}
- separator={<GuideSingle />}
- suffixIcon={<CalendarSingle className="univer-date-range-picker-suffix-icon" />}
+ separator={<GuideIcon />}
+ suffixIcon={<CalendarIcon className="univer-date-range-picker-suffix-icon" />}
onChange={handleChange}
/>
);
diff --git a/packages/design/src/components/dialog/Dialog.stories.tsx b/packages/design/src/components/dialog/Dialog.stories.tsx
index 7e4db14a8c..3b0075d71d 100644
--- a/packages/design/src/components/dialog/Dialog.stories.tsx
+++ b/packages/design/src/components/dialog/Dialog.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { Button } from '../button/Button';
import { Dialog } from './Dialog';
diff --git a/packages/design/src/components/dialog/DialogPrimitive.tsx b/packages/design/src/components/dialog/DialogPrimitive.tsx
index 8ef83a128a..6bff2863cb 100644
--- a/packages/design/src/components/dialog/DialogPrimitive.tsx
+++ b/packages/design/src/components/dialog/DialogPrimitive.tsx
@@ -16,7 +16,7 @@
import type { ComponentPropsWithoutRef, ElementRef, HTMLAttributes } from 'react';
import { Close, Content, Description, Overlay, Portal, Root, Title, Trigger } from '@radix-ui/react-dialog';
-import { CloseSingle } from '@univerjs/icons';
+import { CloseIcon } from '@univerjs/icons';
import { forwardRef } from 'react';
import { borderClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
@@ -90,7 +90,7 @@ const DialogContent = forwardRef<
`}
onClick={onClickClose}
>
- <CloseSingle className="univer-size-4 univer-text-gray-400" />
+ <CloseIcon className="univer-size-4 univer-text-gray-400" />
<span className="univer-sr-only">Close</span>
</Close>
)}
diff --git a/packages/design/src/components/draggable-list/DraggableList.stories.tsx b/packages/design/src/components/draggable-list/DraggableList.stories.tsx
index 29bba8b00d..1aa4dae598 100644
--- a/packages/design/src/components/draggable-list/DraggableList.stories.tsx
+++ b/packages/design/src/components/draggable-list/DraggableList.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { DraggableList } from './DraggableList';
const meta: Meta<typeof DraggableList> = {
diff --git a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
index 1c6f6c9942..0be3c0cba7 100644
--- a/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
+++ b/packages/design/src/components/dropdown-menu/DropdownMenuPrimitive.tsx
@@ -32,7 +32,7 @@ import {
SubTrigger,
Trigger,
} from '@radix-ui/react-dropdown-menu';
-import { CheckMarkSingle, MoreRightSingle } from '@univerjs/icons';
+import { CheckMarkIcon, MoreRightIcon } from '@univerjs/icons';
import { borderClassName, scrollbarClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
@@ -112,7 +112,7 @@ function DropdownMenuSubTrigger({
{...props}
>
{children}
- <MoreRightSingle className="ml-auto" />
+ <MoreRightIcon className="ml-auto" />
</SubTrigger>
);
}
@@ -248,7 +248,7 @@ function DropdownMenuCheckboxItem({
`}
>
<ItemIndicator>
- <CheckMarkSingle
+ <CheckMarkIcon
className="univer-block univer-size-4 univer-fill-current univer-text-primary-600"
/>
</ItemIndicator>
@@ -293,7 +293,7 @@ function DropdownMenuRadioItem({
>
<ItemIndicator>
- <CheckMarkSingle
+ <CheckMarkIcon
className="univer-block univer-size-4 univer-fill-current univer-text-primary-600"
/>
</ItemIndicator>
diff --git a/packages/design/src/components/form-layout/FormLayout.tsx b/packages/design/src/components/form-layout/FormLayout.tsx
index 88258eb8a3..2aa4a14438 100644
--- a/packages/design/src/components/form-layout/FormLayout.tsx
+++ b/packages/design/src/components/form-layout/FormLayout.tsx
@@ -15,7 +15,7 @@
*/
import type { CSSProperties, PropsWithChildren, ReactNode } from 'react';
-import { MoreUpSingle } from '@univerjs/icons';
+import { MoreUpIcon } from '@univerjs/icons';
import { createContext, useState } from 'react';
import { clsx } from '../../helper/clsx';
@@ -55,7 +55,7 @@ export const FormLayout = (props: IFormLayoutProps) => {
{label}
{collapsable
? (
- <MoreUpSingle
+ <MoreUpIcon
className={clsx('univer-ml-1 univer-transition-transform', {
'univer-rotate-180': collapsed,
})}
diff --git a/packages/design/src/components/gallery/Gallery.tsx b/packages/design/src/components/gallery/Gallery.tsx
index 3aac6e9a75..e751822472 100644
--- a/packages/design/src/components/gallery/Gallery.tsx
+++ b/packages/design/src/components/gallery/Gallery.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { OneToOneSingle, ZoomInSingle, ZoomOutSingle } from '@univerjs/icons';
+import { OneToOneIcon, ZoomInIcon, ZoomOutIcon } from '@univerjs/icons';
import { useEffect, useMemo, useState } from 'react';
import { createPortal } from 'react-dom';
import { clsx } from '../../helper/clsx';
@@ -122,7 +122,7 @@ export function Gallery(props: IGalleryProps) {
`}
onClick={() => handleToggleZoom(0.25)}
>
- <ZoomInSingle />
+ <ZoomInIcon />
</a>
<a
className={`
@@ -131,7 +131,7 @@ export function Gallery(props: IGalleryProps) {
`}
onClick={() => handleToggleZoom(-0.25)}
>
- <ZoomOutSingle />
+ <ZoomOutIcon />
</a>
<a
className={`
@@ -140,7 +140,7 @@ export function Gallery(props: IGalleryProps) {
`}
onClick={() => handleToggleZoom('reset')}
>
- <OneToOneSingle />
+ <OneToOneIcon />
</a>
</footer>
</div>,
diff --git a/packages/design/src/components/input-number/InputNumber.tsx b/packages/design/src/components/input-number/InputNumber.tsx
index 637273d14a..eb5e445552 100644
--- a/packages/design/src/components/input-number/InputNumber.tsx
+++ b/packages/design/src/components/input-number/InputNumber.tsx
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-import React, { forwardRef, useEffect, useRef, useState } from 'react';
+import type { FocusEvent, InputHTMLAttributes, KeyboardEvent } from 'react';
+import { forwardRef, useEffect, useRef, useState } from 'react';
import { clsx } from '../../helper/clsx';
import { Button } from '../button/Button';
import { Input } from '../input/Input';
export interface IInputNumberProps
- extends Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'defaultValue' | 'size'> {
+ extends Omit<InputHTMLAttributes<HTMLInputElement>, 'onChange' | 'value' | 'defaultValue' | 'size'> {
value?: number | null;
defaultValue?: number;
size?: 'mini' | 'small';
@@ -35,8 +36,8 @@ export interface IInputNumberProps
inputClassName?: string;
controlsClassName?: string;
onChange?: (value: number | null) => void;
- onKeyDown?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
- onPressEnter?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
+ onKeyDown?: (e: KeyboardEvent<HTMLInputElement>) => void;
+ onPressEnter?: (e: KeyboardEvent<HTMLInputElement>) => void;
allowEmpty?: boolean;
}
@@ -205,7 +206,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
onChange?.(parsedValue);
}
- function handleBlur(e: React.FocusEvent<HTMLInputElement>) {
+ function handleBlur(e: FocusEvent<HTMLInputElement>) {
// If allowEmpty is true and input is empty, do not restore the last valid value
if (internalValue === null) {
if (inputValue === '' && allowEmpty) {
@@ -287,7 +288,7 @@ export const InputNumber = forwardRef<HTMLInputElement, IInputNumberProps>(
}
// Handle key down events for arrow keys
- function handleKeyDown(e: React.KeyboardEvent<HTMLInputElement>) {
+ function handleKeyDown(e: KeyboardEvent<HTMLInputElement>) {
if (disabled) return;
onKeyDown?.(e);
diff --git a/packages/design/src/components/input/Input.tsx b/packages/design/src/components/input/Input.tsx
index 0986f82756..e9c21bd118 100644
--- a/packages/design/src/components/input/Input.tsx
+++ b/packages/design/src/components/input/Input.tsx
@@ -15,13 +15,14 @@
*/
import type { VariantProps } from 'class-variance-authority';
-import { CloseSingle } from '@univerjs/icons';
+import type { InputHTMLAttributes } from 'react';
+import { CloseIcon } from '@univerjs/icons';
import { cva } from 'class-variance-authority';
-import React, { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
+import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
import { borderClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
-type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
+type InputProps = InputHTMLAttributes<HTMLInputElement>;
export const inputVariants = cva(
`
@@ -173,7 +174,7 @@ export const Input = forwardRef<HTMLInputElement, IInputProps>(
hover:univer-text-gray-500
`}
>
- <CloseSingle className="univer-size-3" />
+ <CloseIcon className="univer-size-3" />
</button>
)}
</div>
diff --git a/packages/design/src/components/menu/Menu.tsx b/packages/design/src/components/menu/Menu.tsx
index f7ee3c17e5..ac66e916f7 100644
--- a/packages/design/src/components/menu/Menu.tsx
+++ b/packages/design/src/components/menu/Menu.tsx
@@ -15,15 +15,16 @@
*/
import type { MenuItemGroupProps, MenuItemProps, MenuProps, MenuRef, SubMenuProps } from 'rc-menu';
+import type { ComponentType } from 'react';
import RcMenu, { MenuItem as RcMenuItem, MenuItemGroup as RcMenuItemGroup, SubMenu as RcSubMenu } from 'rc-menu';
-import React, { useContext } from 'react';
+import { forwardRef, useContext } from 'react';
import { clsx } from '../../helper/clsx';
import { ConfigContext } from '../config-provider/ConfigProvider';
import { Tooltip } from '../tooltip/Tooltip';
import './index.css';
/** @deprecated */
-export const Menu = React.forwardRef<MenuRef, MenuProps & { wrapperClass?: string }>((props, ref) => {
+export const Menu = forwardRef<MenuRef, MenuProps & { wrapperClass?: string }>((props, ref) => {
const { mountContainer } = useContext(ConfigContext);
const { wrapperClass, ...rest } = props;
return mountContainer && (
@@ -55,7 +56,7 @@ export function MenuItemGroup(props: MenuItemGroupProps) {
export interface ITinyMenuItem {
onClick: () => void;
className: string;
- Icon: React.ComponentType<{ className?: string }>;
+ Icon: ComponentType<{ className?: string }>;
key: string;
active?: boolean;
tooltip?: string;
diff --git a/packages/design/src/components/menu/menu.stories.tsx b/packages/design/src/components/menu/menu.stories.tsx
index 17a21b6b3b..0403fe73d4 100644
--- a/packages/design/src/components/menu/menu.stories.tsx
+++ b/packages/design/src/components/menu/menu.stories.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { CopySingle, CutSingle, DeleteSingle } from '@univerjs/icons';
+import { CopyIcon, CutIcon, DeleteIcon } from '@univerjs/icons';
import { Menu, MenuItem, MenuItemGroup, SubMenu, TinyMenuGroup } from './Menu';
export default {
@@ -34,80 +34,80 @@ export const Default = () => {
{
onClick: () => {},
className: '',
- Icon: CopySingle,
+ Icon: CopyIcon,
key: 'copy',
},
{
onClick: () => {},
className: '',
- Icon: CutSingle,
+ Icon: CutIcon,
key: 'cut',
},
{
onClick: () => {},
className: '',
- Icon: DeleteSingle,
+ Icon: DeleteIcon,
key: 'delete',
},
{
onClick: () => {},
className: '',
- Icon: CopySingle,
+ Icon: CopyIcon,
key: 'copy1',
},
{
onClick: () => {},
className: '',
- Icon: CutSingle,
+ Icon: CutIcon,
key: 'cut1',
},
{
onClick: () => {},
className: '',
- Icon: DeleteSingle,
+ Icon: DeleteIcon,
key: 'delete1',
},
{
onClick: () => {},
className: '',
- Icon: CopySingle,
+ Icon: CopyIcon,
key: 'copy2',
},
{
onClick: () => {},
className: '',
- Icon: CutSingle,
+ Icon: CutIcon,
key: 'cut2',
},
{
onClick: () => {},
className: '',
- Icon: DeleteSingle,
+ Icon: DeleteIcon,
key: 'delete2',
},
]}
/>
<MenuItemGroup>
<MenuItem>
- <CopySingle />
+ <CopyIcon />
Item 1
</MenuItem>
<MenuItem>
- <CutSingle />
+ <CutIcon />
Item 2
</MenuItem>
<MenuItem>
- <DeleteSingle />
+ <DeleteIcon />
Item 3
</MenuItem>
</MenuItemGroup>
<MenuItemGroup title="Group 1">
<MenuItem>
- <CopySingle />
+ <CopyIcon />
Item 4
</MenuItem>
<MenuItem>
- <CutSingle />
+ <CutIcon />
Item 5
</MenuItem>
</MenuItemGroup>
@@ -115,14 +115,14 @@ export const Default = () => {
<SubMenu
title={(
<div>
- <CopySingle />
+ <CopyIcon />
SubMenu
</div>
)}
>
<MenuItemGroup>
<MenuItem>
- <CopySingle />
+ <CopyIcon />
Item 6
</MenuItem>
</MenuItemGroup>
@@ -130,11 +130,11 @@ export const Default = () => {
<SubMenu title="SubMenu2">
<MenuItemGroup>
<MenuItem>
- <CopySingle />
+ <CopyIcon />
Item 7
</MenuItem>
<MenuItem>
- <CutSingle />
+ <CutIcon />
Item 8
</MenuItem>
</MenuItemGroup>
diff --git a/packages/design/src/components/message/Message.tsx b/packages/design/src/components/message/Message.tsx
index 20bf0b2fcf..24aa57c36f 100644
--- a/packages/design/src/components/message/Message.tsx
+++ b/packages/design/src/components/message/Message.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { ErrorSingle, InfoSingle, Loading, SuccessSingle, WarningSingle } from '@univerjs/icons';
+import { ErrorIcon, InfoIcon, LoadingMultiIcon, SuccessIcon, WarningIcon } from '@univerjs/icons';
import { useEffect, useMemo, useState } from 'react';
import { createPortal } from 'react-dom';
import { clsx } from '../../helper/clsx';
@@ -37,18 +37,18 @@ export interface IMessageProps {
}
const iconMap = {
- [MessageType.Success]: <SuccessSingle className="univer-text-green-500" />,
+ [MessageType.Success]: <SuccessIcon className="univer-text-green-500" />,
[MessageType.Info]: (
- <InfoSingle
+ <InfoIcon
className={`
univer-text-indigo-600
dark:!univer-text-primary-500
`}
/>
),
- [MessageType.Warning]: <WarningSingle className="univer-text-yellow-400" />,
- [MessageType.Error]: <ErrorSingle className="univer-text-red-500" />,
- [MessageType.Loading]: <Loading className="univer-animate-spin univer-text-yellow-400" />,
+ [MessageType.Warning]: <WarningIcon className="univer-text-yellow-400" />,
+ [MessageType.Error]: <ErrorIcon className="univer-text-red-500" />,
+ [MessageType.Loading]: <LoadingMultiIcon className="univer-animate-spin univer-text-yellow-400" />,
};
const Message = ({ content, type = MessageType.Info }: IMessageProps) => {
diff --git a/packages/design/src/components/message/__tests__/index.spec.tsx b/packages/design/src/components/message/__tests__/index.spec.tsx
index 92eb3920e6..4719543306 100644
--- a/packages/design/src/components/message/__tests__/index.spec.tsx
+++ b/packages/design/src/components/message/__tests__/index.spec.tsx
@@ -15,9 +15,7 @@
*/
import { fireEvent, render, screen } from '@testing-library/react';
-import React from 'react';
import { describe, expect, it } from 'vitest';
-
import { Button } from '../../button/Button';
import { message, Messager, MessageType } from '../Message';
diff --git a/packages/design/src/components/pager/Pager.stories.tsx b/packages/design/src/components/pager/Pager.stories.tsx
index 0ba263ae3b..ed9aaa5269 100644
--- a/packages/design/src/components/pager/Pager.stories.tsx
+++ b/packages/design/src/components/pager/Pager.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { Pager } from './Pager';
const meta: Meta = {
diff --git a/packages/design/src/components/pager/Pager.tsx b/packages/design/src/components/pager/Pager.tsx
index e7fc543908..f8902b8dc2 100644
--- a/packages/design/src/components/pager/Pager.tsx
+++ b/packages/design/src/components/pager/Pager.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { MoreLeftSingle, MoreRightSingle } from '@univerjs/icons';
+import { MoreLeftIcon, MoreRightIcon } from '@univerjs/icons';
import { useMemo } from 'react';
import { clsx } from '../../helper/clsx';
@@ -77,7 +77,7 @@ export function Pager(props: IPagerProps) {
role="button"
onClick={onClickLeftArrow}
>
- <MoreLeftSingle />
+ <MoreLeftIcon />
</div>
<div className="univer-mx-1">{text}</div>
<div
@@ -90,7 +90,7 @@ export function Pager(props: IPagerProps) {
role="button"
onClick={onClickRightArrow}
>
- <MoreRightSingle />
+ <MoreRightIcon />
</div>
</>
)
diff --git a/packages/design/src/components/pager/__tests__/index.spec.tsx b/packages/design/src/components/pager/__tests__/index.spec.tsx
index 3145631215..bda05c7399 100644
--- a/packages/design/src/components/pager/__tests__/index.spec.tsx
+++ b/packages/design/src/components/pager/__tests__/index.spec.tsx
@@ -14,10 +14,9 @@
* limitations under the License.
*/
-import { afterEach, describe, expect, it, vi } from 'vitest';
-import React from 'react';
-import { cleanup, render } from '@testing-library/react';
import type { IPagerProps } from '../Pager';
+import { cleanup, render } from '@testing-library/react';
+import { afterEach, describe, expect, it, vi } from 'vitest';
import { Pager } from '../Pager';
describe('Pager', () => {
diff --git a/packages/design/src/components/popup/Popup.stories.tsx b/packages/design/src/components/popup/Popup.stories.tsx
index 3fd8b246c7..72859f4c41 100644
--- a/packages/design/src/components/popup/Popup.stories.tsx
+++ b/packages/design/src/components/popup/Popup.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { Button } from '../button/Button';
import { Popup } from './Popup';
diff --git a/packages/design/src/components/radio-group/RadioGroup.stories.tsx b/packages/design/src/components/radio-group/RadioGroup.stories.tsx
index 42da8ad72a..4bc47741aa 100644
--- a/packages/design/src/components/radio-group/RadioGroup.stories.tsx
+++ b/packages/design/src/components/radio-group/RadioGroup.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { Radio } from '../radio/Radio';
import { RadioGroup } from './RadioGroup';
diff --git a/packages/design/src/components/radio-group/__tests__/index.spec.tsx b/packages/design/src/components/radio-group/__tests__/index.spec.tsx
index 579cffb882..ba65596573 100644
--- a/packages/design/src/components/radio-group/__tests__/index.spec.tsx
+++ b/packages/design/src/components/radio-group/__tests__/index.spec.tsx
@@ -15,9 +15,7 @@
*/
import { fireEvent, render, screen } from '@testing-library/react';
-import React from 'react';
import { describe, expect, it } from 'vitest';
-
import { Radio } from '../../radio/Radio';
import { RadioGroup } from '../RadioGroup';
diff --git a/packages/design/src/components/radio/Radio.tsx b/packages/design/src/components/radio/Radio.tsx
index bcb376afdf..f16b553b30 100644
--- a/packages/design/src/components/radio/Radio.tsx
+++ b/packages/design/src/components/radio/Radio.tsx
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-import React, { useRef } from 'react';
+import type { ReactNode } from 'react';
+import { useRef } from 'react';
import { clsx } from '../../helper/clsx';
export interface IRadioProps {
- children?: React.ReactNode;
+ children?: ReactNode;
/**
* Used for setting the currently selected value
diff --git a/packages/design/src/components/radio/__tests__/index.spec.tsx b/packages/design/src/components/radio/__tests__/index.spec.tsx
index d2195d2e5e..01fa9a9187 100644
--- a/packages/design/src/components/radio/__tests__/index.spec.tsx
+++ b/packages/design/src/components/radio/__tests__/index.spec.tsx
@@ -15,9 +15,7 @@
*/
import { fireEvent, render } from '@testing-library/react';
-import React from 'react';
import { describe, expect, it } from 'vitest';
-
import { Radio } from '../Radio';
describe('Radio', () => {
diff --git a/packages/design/src/components/select-list/SelectList.stories.tsx b/packages/design/src/components/select-list/SelectList.stories.tsx
index 356c311f14..4d5b9a4e2a 100644
--- a/packages/design/src/components/select-list/SelectList.stories.tsx
+++ b/packages/design/src/components/select-list/SelectList.stories.tsx
@@ -15,8 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
-
+import { useState } from 'react';
import { SelectList } from './SelectList';
const meta: Meta<typeof SelectList> = {
diff --git a/packages/design/src/components/select-list/SelectList.tsx b/packages/design/src/components/select-list/SelectList.tsx
index 9333c117d3..fd7e5c0b37 100644
--- a/packages/design/src/components/select-list/SelectList.tsx
+++ b/packages/design/src/components/select-list/SelectList.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { borderClassName, scrollbarClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
@@ -106,7 +106,7 @@ export function SelectList(props: ISelectListProps) {
>
{!hideCheckMark && (
checked && (
- <CheckMarkSingle
+ <CheckMarkIcon
className={`
univer-absolute univer-left-0 univer-top-1/2 -univer-translate-y-1/2
univer-pl-2 univer-text-primary-600
diff --git a/packages/design/src/components/select/MultipleSelect.tsx b/packages/design/src/components/select/MultipleSelect.tsx
index 135793c63c..243d44eebc 100644
--- a/packages/design/src/components/select/MultipleSelect.tsx
+++ b/packages/design/src/components/select/MultipleSelect.tsx
@@ -16,7 +16,7 @@
import type { ReactNode } from 'react';
import type { IDropdownMenuProps } from '../dropdown-menu/DropdownMenu';
-import { MoreDownSingle } from '@univerjs/icons';
+import { MoreDownIcon } from '@univerjs/icons';
import { useMemo, useState } from 'react';
import { clsx } from '../../helper/clsx';
import { Badge } from '../badge/Badge';
@@ -138,7 +138,7 @@ export function MultipleSelect(props: IMultipleSelectProps) {
>
{displayValue}
</div>
- <MoreDownSingle
+ <MoreDownIcon
className={`
univer-flex-shrink-0
dark:!univer-text-white
diff --git a/packages/design/src/components/select/Select.tsx b/packages/design/src/components/select/Select.tsx
index 3e6030998e..bd3a330956 100644
--- a/packages/design/src/components/select/Select.tsx
+++ b/packages/design/src/components/select/Select.tsx
@@ -16,7 +16,7 @@
import type { ReactNode } from 'react';
import type { IDropdownMenuProps } from '../dropdown-menu/DropdownMenu';
-import { MoreDownSingle } from '@univerjs/icons';
+import { MoreDownIcon } from '@univerjs/icons';
import { useMemo, useState } from 'react';
import { borderClassName } from '../../helper/class-utilities';
import { clsx } from '../../helper/clsx';
@@ -171,7 +171,7 @@ export function Select(props: ISelectProps) {
>
{displayValue}
</div>
- <MoreDownSingle
+ <MoreDownIcon
className={`
univer-flex-shrink-0
dark:!univer-text-white
diff --git a/packages/design/src/components/switch/Switch.tsx b/packages/design/src/components/switch/Switch.tsx
index a2a3864893..2ab04d232a 100644
--- a/packages/design/src/components/switch/Switch.tsx
+++ b/packages/design/src/components/switch/Switch.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { clsx } from '../../helper/clsx';
export interface ISwitchProps {
diff --git a/packages/design/src/components/switch/__tests__/index.spec.tsx b/packages/design/src/components/switch/__tests__/index.spec.tsx
index d7b2893a0a..d342ca3670 100644
--- a/packages/design/src/components/switch/__tests__/index.spec.tsx
+++ b/packages/design/src/components/switch/__tests__/index.spec.tsx
@@ -14,10 +14,8 @@
* limitations under the License.
*/
-import { afterEach, describe, expect, it } from 'vitest';
import { cleanup, render } from '@testing-library/react';
-import React from 'react';
-
+import { afterEach, describe, expect, it } from 'vitest';
import { Switch } from '../Switch';
describe('Switch', () => {
diff --git a/packages/design/src/components/tree/Tree.stories.tsx b/packages/design/src/components/tree/Tree.stories.tsx
index a3ebf927ff..cd2d76a944 100644
--- a/packages/design/src/components/tree/Tree.stories.tsx
+++ b/packages/design/src/components/tree/Tree.stories.tsx
@@ -16,8 +16,7 @@
import type { Meta } from '@storybook/react';
import type { ITreeNodeProps } from './Tree';
-
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Tree, TreeSelectionMode } from './Tree';
const meta: Meta<typeof Tree> = {
diff --git a/packages/design/src/components/tree/Tree.tsx b/packages/design/src/components/tree/Tree.tsx
index 15b2998267..958d12f99d 100644
--- a/packages/design/src/components/tree/Tree.tsx
+++ b/packages/design/src/components/tree/Tree.tsx
@@ -15,7 +15,7 @@
*/
import type { CSSProperties, ReactNode } from 'react';
-import { DropdownSingle } from '@univerjs/icons';
+import { DropdownIcon } from '@univerjs/icons';
import VirtualList from 'rc-virtual-list';
import { useEffect, useMemo, useState } from 'react';
import { clsx } from '../../helper/clsx';
@@ -161,7 +161,7 @@ export function Tree(props: ITreeProps) {
handleExpendItem(treeItem);
}}
>
- <DropdownSingle />
+ <DropdownIcon />
</span>
)}
<Checkbox
diff --git a/packages/design/src/components/tree/__tests__/index.spec.tsx b/packages/design/src/components/tree/__tests__/index.spec.tsx
index 16ef342e48..21f4c049ff 100644
--- a/packages/design/src/components/tree/__tests__/index.spec.tsx
+++ b/packages/design/src/components/tree/__tests__/index.spec.tsx
@@ -15,9 +15,7 @@
*/
import { render } from '@testing-library/react';
-import React from 'react';
import { describe, expect, it } from 'vitest';
-
import { Tree } from '../Tree';
import { findNodeFromPath, findNodePathFromTree, findSubTreeFromPath, isIntermediated, mergeTreeSelected } from '../util';
diff --git a/packages/docs-drawing-ui/src/views/menu/image.menu.ts b/packages/docs-drawing-ui/src/views/menu/image.menu.ts
index aa88ff2a5e..4b588a3729 100644
--- a/packages/docs-drawing-ui/src/views/menu/image.menu.ts
+++ b/packages/docs-drawing-ui/src/views/menu/image.menu.ts
@@ -65,7 +65,7 @@ export function ImageMenuFactory(accessor: IAccessor): IMenuItem {
return {
id: DOCS_IMAGE_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'AddImageSingle',
+ icon: 'AddImageIcon',
tooltip: 'docImage.title',
disabled$: getDisableWhenSelectionInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, undefined, DOCS_ZEN_EDITOR_UNIT_ID_KEY),
diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json
index 8b0b2d5193..c21502758d 100644
--- a/packages/docs-hyper-link-ui/package.json
+++ b/packages/docs-hyper-link-ui/package.json
@@ -72,7 +72,7 @@
"@univerjs/docs-hyper-link": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts b/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts
index d5ba971598..eb1ac7b32c 100644
--- a/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts
+++ b/packages/docs-hyper-link-ui/src/controllers/ui.controller.ts
@@ -16,7 +16,7 @@
import type { MenuConfig } from '@univerjs/ui';
import { Disposable, ICommandService, Inject } from '@univerjs/core';
-import { LinkSingle } from '@univerjs/icons';
+import { LinkIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService, IShortcutService } from '@univerjs/ui';
import { AddDocHyperLinkCommand } from '../commands/commands/add-link.command';
import { DeleteDocHyperLinkCommand } from '../commands/commands/delete-link.command';
@@ -48,10 +48,10 @@ export class DocHyperLinkUIController extends Disposable {
private _initComponents() {
([
- [DocHyperLinkEdit, DocHyperLinkEdit.componentKey],
- [DocLinkPopup, DocLinkPopup.componentKey],
- [LinkSingle, DOC_LINK_ICON],
- ] as const).forEach(([comp, key]) => {
+ [DocHyperLinkEdit.componentKey, DocHyperLinkEdit],
+ [DocLinkPopup.componentKey, DocLinkPopup],
+ [DOC_LINK_ICON, LinkIcon],
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
this._componentManager.register(key, comp)
);
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 eebc73d3e5..fff953f0d9 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
@@ -17,7 +17,7 @@
import type { DocumentDataModel } from '@univerjs/core';
import { CustomRangeType, ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { borderClassName, clsx, MessageType, Tooltip } from '@univerjs/design';
-import { CopySingle, LinkSingle, UnlinkSingle, WriteSingle } from '@univerjs/icons';
+import { CopyIcon, LinkIcon, UnlinkIcon, WriteIcon } from '@univerjs/icons';
import { IMessageService, useDependency, useObservable } from '@univerjs/ui';
import { DeleteDocHyperLinkCommand } from '../../commands/commands/delete-link.command';
import { ShowDocHyperLinkEditPopupOperation } from '../../commands/operations/popup.operation';
@@ -70,7 +70,7 @@ export const DocLinkPopup = () => {
dark:!univer-text-white
`}
>
- <LinkSingle />
+ <LinkIcon />
</div>
<Tooltip showIfEllipsis title={url}>
<span className="univer-flex-1 univer-truncate">{url}</span>
@@ -91,7 +91,7 @@ export const DocLinkPopup = () => {
}}
>
<Tooltip placement="bottom" title={localeService.t('docLink.info.copy')}>
- <CopySingle />
+ <CopyIcon />
</Tooltip>
</div>
@@ -107,7 +107,7 @@ export const DocLinkPopup = () => {
}}
>
<Tooltip placement="bottom" title={localeService.t('docLink.info.edit')}>
- <WriteSingle />
+ <WriteIcon />
</Tooltip>
</div>
<div
@@ -124,7 +124,7 @@ export const DocLinkPopup = () => {
}}
>
<Tooltip placement="bottom" title={localeService.t('docLink.info.cancel')}>
- <UnlinkSingle />
+ <UnlinkIcon />
</Tooltip>
</div>
</div>
diff --git a/packages/docs-quick-insert-ui/package.json b/packages/docs-quick-insert-ui/package.json
index d6e4b5b20c..94e4343652 100644
--- a/packages/docs-quick-insert-ui/package.json
+++ b/packages/docs-quick-insert-ui/package.json
@@ -75,7 +75,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-quick-insert-ui/src/controllers/built-in-menus.ts b/packages/docs-quick-insert-ui/src/controllers/built-in-menus.ts
index 4e3b4a3dea..6be55e5794 100644
--- a/packages/docs-quick-insert-ui/src/controllers/built-in-menus.ts
+++ b/packages/docs-quick-insert-ui/src/controllers/built-in-menus.ts
@@ -26,42 +26,42 @@ export enum QuickInsertMenuGroup {
export const textMenu: IDocPopupMenuItem = {
id: 'quick-insert.text.menu',
title: 'docQuickInsert.menu.text',
- icon: 'TextSingle',
+ icon: 'TextIcon',
keywords: ['text'],
};
export const numberedListMenu: IDocPopupMenuItem = {
id: OrderListCommand.id,
title: 'docQuickInsert.menu.numberedList',
- icon: 'OrderSingle',
+ icon: 'OrderIcon',
keywords: ['numbered', 'list', 'ordered'],
};
export const bulletedListMenu: IDocPopupMenuItem = {
id: BulletListCommand.id,
title: 'docQuickInsert.menu.bulletedList',
- icon: 'UnorderSingle',
+ icon: 'UnorderIcon',
keywords: ['bulleted', 'list', 'unordered'],
};
export const dividerMenu: IDocPopupMenuItem = {
id: HorizontalLineCommand.id,
title: 'docQuickInsert.menu.divider',
- icon: 'DividerSingle',
+ icon: 'DividerIcon',
keywords: ['divider', 'line', 'separate'],
};
export const tableMenu: IDocPopupMenuItem = {
id: DocCreateTableOperation.id,
title: 'docQuickInsert.menu.table',
- icon: 'GridSingle',
+ icon: 'GridIcon',
keywords: ['table', 'grid', 'spreadsheet'],
};
export const imageMenu: IDocPopupMenuItem = {
id: InsertDocImageCommand.id,
title: 'docQuickInsert.menu.image',
- icon: 'addition-and-subtraction-single',
+ icon: 'AdditionAndSubtractionIcon',
keywords: ['image', 'picture', 'photo'],
};
diff --git a/packages/docs-quick-insert-ui/src/controllers/doc-quick-insert-ui.controller.ts b/packages/docs-quick-insert-ui/src/controllers/doc-quick-insert-ui.controller.ts
index d52716e09b..78eb479e41 100644
--- a/packages/docs-quick-insert-ui/src/controllers/doc-quick-insert-ui.controller.ts
+++ b/packages/docs-quick-insert-ui/src/controllers/doc-quick-insert-ui.controller.ts
@@ -17,7 +17,7 @@
import type { ITextRangeWithStyle } from '@univerjs/engine-render';
import type { IDocPopup } from '../services/doc-quick-insert-popup.service';
import { Disposable, ICommandService, Inject } from '@univerjs/core';
-import { DividerSingle, TextSingle } from '@univerjs/icons';
+import { DividerIcon, TextIcon } from '@univerjs/icons';
import { ComponentManager } from '@univerjs/ui';
import { of } from 'rxjs';
import { DeleteSearchKeyCommand } from '../commands/commands/doc-quick-insert.command';
@@ -57,12 +57,12 @@ export class DocQuickInsertUIController extends Disposable {
[QuickInsertPopup.componentKey, QuickInsertPopup],
[KeywordInputPlaceholder.componentKey, KeywordInputPlaceholder],
[QuickInsertPlaceholder.componentKey, QuickInsertPlaceholder],
- [DividerSingle.displayName, DividerSingle],
- [TextSingle.displayName, TextSingle],
+ [DividerIcon.displayName, DividerIcon],
+ [TextIcon.displayName, TextIcon],
[QuickInsertButton.componentKey, QuickInsertButton],
- ] as const).forEach(([name, component]) => {
- if (name) {
- this.disposeWithMe(this._componentManager.register(name, component));
+ ] as const).forEach(([key, comp]) => {
+ if (key) {
+ this.disposeWithMe(this._componentManager.register(key, comp));
}
});
diff --git a/packages/docs-quick-insert-ui/src/views/menu/index.tsx b/packages/docs-quick-insert-ui/src/views/menu/index.tsx
index 872fa72677..ee24b5c3e9 100644
--- a/packages/docs-quick-insert-ui/src/views/menu/index.tsx
+++ b/packages/docs-quick-insert-ui/src/views/menu/index.tsx
@@ -20,7 +20,7 @@ import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { borderClassName, clsx } from '@univerjs/design';
import { DocSelectionManagerService } from '@univerjs/docs';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { PlusSingle } from '@univerjs/icons';
+import { IncreaseIcon } from '@univerjs/icons';
import { ILayoutService, useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useMemo } from 'react';
import { combineLatest, map } from 'rxjs';
@@ -90,7 +90,7 @@ export const QuickInsertButton = ({ className = '' }: IQuickInsertButtonProps) =
tabIndex={0}
onClick={onClick}
>
- <PlusSingle
+ <IncreaseIcon
className={`
univer-text-gray-800
dark:!univer-text-gray-200
diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json
index 533fcadb3a..dd9c15cbcc 100644
--- a/packages/docs-thread-comment-ui/package.json
+++ b/packages/docs-thread-comment-ui/package.json
@@ -64,7 +64,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*"
diff --git a/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts b/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts
index 53e58da281..fa2c2c2fd1 100644
--- a/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts
+++ b/packages/docs-thread-comment-ui/src/controllers/doc-thread-comment-ui.controller.ts
@@ -15,7 +15,7 @@
*/
import { Disposable, ICommandService, Inject } from '@univerjs/core';
-import { CommentSingle } from '@univerjs/icons';
+import { CommentIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
import { AddDocCommentComment } from '../commands/commands/add-doc-comment.command';
import { DeleteDocCommentComment } from '../commands/commands/delete-doc-comment.command';
@@ -54,10 +54,10 @@ export class DocThreadCommentUIController extends Disposable {
private _initComponents() {
([
[DocThreadCommentPanel.componentKey, DocThreadCommentPanel],
- ['CommentSingle', CommentSingle],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ ['CommentIcon', CommentIcon],
+ ] as const).forEach(([id, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(id, comp)
);
});
}
diff --git a/packages/docs-thread-comment-ui/src/controllers/menu.ts b/packages/docs-thread-comment-ui/src/controllers/menu.ts
index 6a8f13717d..79b59853d7 100644
--- a/packages/docs-thread-comment-ui/src/controllers/menu.ts
+++ b/packages/docs-thread-comment-ui/src/controllers/menu.ts
@@ -51,7 +51,7 @@ export function AddDocCommentMenuItemFactory(accessor: IAccessor): IMenuButtonIt
return {
id: StartAddCommentOperation.id,
type: MenuItemType.BUTTON,
- icon: 'CommentSingle',
+ icon: 'CommentIcon',
title: 'threadCommentUI.panel.addComment',
tooltip: 'threadCommentUI.panel.addComment',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, undefined, SHEET_EDITOR_UNITS),
@@ -72,7 +72,7 @@ export function ToolbarDocCommentMenuItemFactory(accessor: IAccessor): IMenuButt
return {
id: ToggleCommentPanelOperation.id,
type: MenuItemType.BUTTON,
- icon: 'CommentSingle',
+ icon: 'CommentIcon',
title: 'threadCommentUI.panel.addComment',
tooltip: 'threadCommentUI.panel.addComment',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
diff --git a/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx b/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx
index 30ccbff963..b17199d6a9 100644
--- a/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx
+++ b/packages/docs-thread-comment-ui/src/views/doc-thread-comment-panel/index.tsx
@@ -21,7 +21,7 @@ import { ICommandService, Injector, isInternalEditorID, IUniverInstanceService,
import { DocSelectionManagerService, RichTextEditingMutation } from '@univerjs/docs';
import { ThreadCommentPanel } from '@univerjs/thread-comment-ui';
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import { debounceTime, filter, Observable } from 'rxjs';
import { AddDocCommentComment } from '../../commands/commands/add-doc-comment.command';
import { DeleteDocCommentComment } from '../../commands/commands/delete-doc-comment.command';
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index 4dae0dc9b6..3595fb4723 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -84,7 +84,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-ui/src/components/float-toolbar/FloatToolbar.stories.tsx b/packages/docs-ui/src/components/float-toolbar/FloatToolbar.stories.tsx
index d1f603e170..0946ab844d 100644
--- a/packages/docs-ui/src/components/float-toolbar/FloatToolbar.stories.tsx
+++ b/packages/docs-ui/src/components/float-toolbar/FloatToolbar.stories.tsx
@@ -15,7 +15,6 @@
*/
import type { Meta } from '@storybook/react';
-
import type { Dependency } from '@univerjs/core';
import { LocaleService, LocaleType } from '@univerjs/core';
import { ColorPicker } from '@univerjs/design';
@@ -37,7 +36,6 @@ import {
} from '../../commands/commands/inline-format.command';
import { menuSchema } from '../../controllers/menu.schema';
import enUS from '../../locale/en-US';
-import ruRU from '../../locale/ru-RU';
import zhCN from '../../locale/zh-CN';
import { FloatToolbar } from './FloatToolbar';
@@ -69,7 +67,6 @@ export const Playground = {
injector?.get(LocaleService).load({
[LocaleType.EN_US]: enUS,
[LocaleType.ZH_CN]: zhCN,
- [LocaleType.RU_RU]: ruRU,
});
deps.forEach((dependency) => injector?.add(dependency));
@@ -80,11 +77,14 @@ export const Playground = {
useEffect(() => {
if (!inject) return;
- const componentManager = inject.get(ComponentManager);
- componentManager.register(COLOR_PICKER_COMPONENT, ColorPicker);
- componentManager.register(FONT_FAMILY_COMPONENT, FontFamily);
- componentManager.register(FONT_FAMILY_ITEM_COMPONENT, FontFamilyItem);
- componentManager.register(FONT_SIZE_COMPONENT, FontSize);
+ ([
+ [COLOR_PICKER_COMPONENT, ColorPicker],
+ [FONT_FAMILY_COMPONENT, FontFamily],
+ [FONT_FAMILY_ITEM_COMPONENT, FontFamilyItem],
+ [FONT_SIZE_COMPONENT, FontSize],
+ ] as const).forEach(([key, comp]) => {
+ inject.get(ComponentManager).register(key, comp);
+ });
const menuManagerService = inject.get(IMenuManagerService);
menuManagerService.mergeMenu(menuSchema);
diff --git a/packages/docs-ui/src/components/paragraph-menu/index.tsx b/packages/docs-ui/src/components/paragraph-menu/index.tsx
index 4b0aba49e1..d910b17827 100644
--- a/packages/docs-ui/src/components/paragraph-menu/index.tsx
+++ b/packages/docs-ui/src/components/paragraph-menu/index.tsx
@@ -19,7 +19,7 @@ import type { IPopup } from '@univerjs/ui';
import { ICommandService, IUniverInstanceService, NamedStyleType, UniverInstanceType } from '@univerjs/core';
import { borderClassName, clsx } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { DownSingle } from '@univerjs/icons';
+import { DownIcon } from '@univerjs/icons';
import { ContextMenuPosition, DesktopMenu, ILayoutService, RectPopup, useDependency, useObservable } from '@univerjs/ui';
import { useMemo, useRef, useState } from 'react';
import { BehaviorSubject } from 'rxjs';
@@ -97,7 +97,7 @@ export const ParagraphMenu = ({ popup }: { popup: IPopup }) => {
dark:!univer-text-white
`}
/>
- <DownSingle
+ <DownIcon
className={`
univer-size-3 univer-text-gray-600
dark:!univer-text-gray-200
diff --git a/packages/docs-ui/src/components/side-menu/index.tsx b/packages/docs-ui/src/components/side-menu/index.tsx
index 8cbf39de34..d5fdb4e316 100644
--- a/packages/docs-ui/src/components/side-menu/index.tsx
+++ b/packages/docs-ui/src/components/side-menu/index.tsx
@@ -15,7 +15,7 @@
*/
import { clsx, scrollbarClassName } from '@univerjs/design';
-import { CatalogueSingle, LeftSingle } from '@univerjs/icons';
+import { CatalogueIcon, LeftIcon } from '@univerjs/icons';
import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
export interface ISideMenuItem {
@@ -104,7 +104,7 @@ export const SideMenu = forwardRef<ISideMenuInstance, ISideMenuProps>((props, re
`, iconClass)}
style={iconStyle}
>
- {open ? <LeftSingle /> : <CatalogueSingle />}
+ {open ? <LeftIcon /> : <CatalogueIcon />}
</div>
<div
className={clsx(
diff --git a/packages/docs-ui/src/controllers/doc-ui.controller.ts b/packages/docs-ui/src/controllers/doc-ui.controller.ts
index b5412ae8ae..b176393b20 100644
--- a/packages/docs-ui/src/controllers/doc-ui.controller.ts
+++ b/packages/docs-ui/src/controllers/doc-ui.controller.ts
@@ -24,7 +24,7 @@ import {
UniverInstanceType,
} from '@univerjs/core';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { CutSingle, DeleteSingle, DocSettingSingle, TodoList } from '@univerjs/icons';
+import { CutIcon, DeleteIcon, DocSettingIcon, TodoListDoubleIcon } from '@univerjs/icons';
import { BuiltInUIPart, ComponentManager, connectInjector, ILayoutService, IMenuManagerService, IShortcutService, IUIPartsService } from '@univerjs/ui';
import { CoreHeaderFooterCommand, OpenHeaderFooterPanelCommand } from '../commands/commands/doc-header-footer.command';
import { SidebarDocHeaderFooterPanelOperation } from '../commands/operations/doc-header-footer-panel.operation';
@@ -72,12 +72,12 @@ export class DocUIController extends Disposable {
const componentManager = this._componentManager;
this.disposeWithMe(componentManager.register(BULLET_LIST_TYPE_COMPONENT, BulletListTypePicker));
this.disposeWithMe(componentManager.register(ORDER_LIST_TYPE_COMPONENT, OrderListTypePicker));
- this.disposeWithMe(componentManager.register('TodoList', TodoList));
+ this.disposeWithMe(componentManager.register('TodoListDoubleIcon', TodoListDoubleIcon));
this.disposeWithMe(componentManager.register('doc.paragraph.menu', ParagraphMenu));
- this.disposeWithMe(componentManager.register('CutSingle', CutSingle));
- this.disposeWithMe(componentManager.register('DeleteSingle', DeleteSingle));
+ this.disposeWithMe(componentManager.register('CutIcon', CutIcon));
+ this.disposeWithMe(componentManager.register('DeleteIcon', DeleteIcon));
this.disposeWithMe(componentManager.register(PAGE_SETTING_COMPONENT_ID, PageSettings));
- this.disposeWithMe(componentManager.register('DocumentSettingSingle', DocSettingSingle));
+ this.disposeWithMe(componentManager.register('DocumentSettingIcon', DocSettingIcon));
}
private _initUiParts() {
diff --git a/packages/docs-ui/src/controllers/menu/context-menu.ts b/packages/docs-ui/src/controllers/menu/context-menu.ts
index db0e252cf1..bf11d13486 100644
--- a/packages/docs-ui/src/controllers/menu/context-menu.ts
+++ b/packages/docs-ui/src/controllers/menu/context-menu.ts
@@ -101,7 +101,7 @@ export const CopyMenuFactory = (accessor: IAccessor): IMenuButtonItem => {
id: DocCopyCommand.name,
commandId: DocCopyCommand.id,
type: MenuItemType.BUTTON,
- icon: 'Copy',
+ icon: 'CopyDoubleIcon',
title: 'rightClick.copy',
disabled$: getDisableOnCollapsedObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
@@ -112,7 +112,7 @@ export const ParagraphSettingMenuFactory = (accessor: IAccessor): IMenuButtonIte
return {
id: DocParagraphSettingPanelOperation.id,
type: MenuItemType.BUTTON,
- icon: 'MenuSingle24',
+ icon: 'MenuIcon',
title: 'doc.menu.paragraphSetting',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -122,7 +122,7 @@ export const CutMenuFactory = (accessor: IAccessor): IMenuButtonItem => {
return {
id: DocCutCommand.id,
type: MenuItemType.BUTTON,
- icon: 'Copy',
+ icon: 'CopyDoubleIcon',
title: 'rightClick.cut',
disabled$: getDisableOnCollapsedObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
@@ -133,7 +133,7 @@ export const PasteMenuFactory = (accessor: IAccessor): IMenuButtonItem => {
return {
id: DocPasteCommand.id,
type: MenuItemType.BUTTON,
- icon: 'PasteSpecial',
+ icon: 'PasteSpecialDoubleIcon',
title: 'rightClick.paste',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -143,7 +143,7 @@ export const DeleteMenuFactory = (accessor: IAccessor): IMenuButtonItem => {
return {
id: DeleteLeftCommand.id,
type: MenuItemType.BUTTON,
- icon: 'PasteSpecial',
+ icon: 'PasteSpecialDoubleIcon',
title: 'rightClick.delete',
disabled$: getDisableOnCollapsedObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
@@ -156,7 +156,7 @@ export function TableInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorIt
id: TABLE_INSERT_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'table.insert',
- icon: 'Insert',
+ icon: 'InsertDoubleIcon',
hidden$: combineLatest(getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC), getDisableWhenSelectionNotInTableObservable(accessor), (one, two) => {
return one || two;
}),
@@ -168,7 +168,7 @@ export function InsertRowBeforeMenuItemFactory(accessor: IAccessor): IMenuButton
id: DocTableInsertRowAboveCommand.id,
type: MenuItemType.BUTTON,
title: 'table.insertRowAbove',
- icon: 'InsertRowAbove',
+ icon: 'InsertRowAboveDoubleIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -179,7 +179,7 @@ export function InsertRowAfterMenuItemFactory(accessor: IAccessor): IMenuButtonI
id: DocTableInsertRowBellowCommand.id,
type: MenuItemType.BUTTON,
title: 'table.insertRowBelow',
- icon: 'InsertRowBelow',
+ icon: 'InsertRowBelowDoubleIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -190,7 +190,7 @@ export function InsertColumnLeftMenuItemFactory(accessor: IAccessor): IMenuButto
id: DocTableInsertColumnLeftCommand.id,
type: MenuItemType.BUTTON,
title: 'table.insertColumnLeft',
- icon: 'LeftInsertColumn',
+ icon: 'LeftInsertColumnDoubleIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -201,7 +201,7 @@ export function InsertColumnRightMenuItemFactory(accessor: IAccessor): IMenuButt
id: DocTableInsertColumnRightCommand.id,
type: MenuItemType.BUTTON,
title: 'table.insertColumnRight',
- icon: 'RightInsertColumn',
+ icon: 'RightInsertColumnDoubleIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -213,7 +213,7 @@ export function TableDeleteMenuItemFactory(accessor: IAccessor): IMenuSelectorIt
id: TABLE_DELETE_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'table.delete',
- icon: 'Reduce',
+ icon: 'ReduceDoubleIcon',
hidden$: combineLatest(getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC), getDisableWhenSelectionNotInTableObservable(accessor), (one, two) => {
return one || two;
}),
@@ -225,7 +225,7 @@ export function DeleteRowsMenuItemFactory(accessor: IAccessor): IMenuButtonItem
id: DocTableDeleteRowsCommand.id,
type: MenuItemType.BUTTON,
title: 'table.deleteRows',
- icon: 'DeleteRow',
+ icon: 'DeleteRowDoubleIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -236,7 +236,7 @@ export function DeleteColumnsMenuItemFactory(accessor: IAccessor): IMenuButtonIt
id: DocTableDeleteColumnsCommand.id,
type: MenuItemType.BUTTON,
title: 'table.deleteColumns',
- icon: 'DeleteColumn',
+ icon: 'DeleteColumnDoubleIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
@@ -247,7 +247,7 @@ export function DeleteTableMenuItemFactory(accessor: IAccessor): IMenuButtonItem
id: DocTableDeleteTableCommand.id,
type: MenuItemType.BUTTON,
title: 'table.deleteTable',
- icon: 'GridSingle',
+ icon: 'GridIcon',
disabled$: getDisableWhenSelectionNotInTableObservable(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
diff --git a/packages/docs-ui/src/controllers/menu/menu.ts b/packages/docs-ui/src/controllers/menu/menu.ts
index a47ff70118..7252aabf89 100644
--- a/packages/docs-ui/src/controllers/menu/menu.ts
+++ b/packages/docs-ui/src/controllers/menu/menu.ts
@@ -246,7 +246,7 @@ export function BoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetInlineFormatBoldCommand.id,
type: MenuItemType.BUTTON,
- icon: 'BoldSingle',
+ icon: 'BoldIcon',
title: 'Set bold',
tooltip: 'toolbar.bold',
activated$: new Observable<boolean>((subscriber) => {
@@ -285,7 +285,7 @@ export function ItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetInlineFormatItalicCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ItalicSingle',
+ icon: 'ItalicIcon',
title: 'Set italic',
tooltip: 'toolbar.italic',
activated$: new Observable<boolean>((subscriber) => {
@@ -324,7 +324,7 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetInlineFormatUnderlineCommand.id,
type: MenuItemType.BUTTON,
- icon: 'UnderlineSingle',
+ icon: 'UnderlineIcon',
title: 'Set underline',
tooltip: 'toolbar.underline',
activated$: new Observable<boolean>((subscriber) => {
@@ -363,7 +363,7 @@ export function StrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButtonIt
return {
id: SetInlineFormatStrikethroughCommand.id,
type: MenuItemType.BUTTON,
- icon: 'StrikethroughSingle',
+ icon: 'StrikethroughIcon',
title: 'Set strike through',
tooltip: 'toolbar.strikethrough',
activated$: new Observable<boolean>((subscriber) => {
@@ -402,7 +402,7 @@ export function SubscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetInlineFormatSubscriptCommand.id,
type: MenuItemType.BUTTON,
- icon: 'SubscriptSingle',
+ icon: 'SubscriptIcon',
tooltip: 'toolbar.subscript',
activated$: new Observable<boolean>((subscriber) => {
const calc = () => {
@@ -440,7 +440,7 @@ export function SuperscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: SetInlineFormatSuperscriptCommand.id,
type: MenuItemType.BUTTON,
- icon: 'SuperscriptSingle',
+ icon: 'SuperscriptIcon',
tooltip: 'toolbar.superscript',
activated$: new Observable<boolean>((subscriber) => {
const calc = () => {
@@ -623,7 +623,7 @@ export function TextColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSele
return {
id: SetInlineFormatTextColorCommand.id,
- icon: 'FontColor',
+ icon: 'FontColorDoubleIcon',
tooltip: 'toolbar.textColor.main',
type: MenuItemType.BUTTON_SELECTOR,
@@ -659,7 +659,7 @@ export function HeaderFooterMenuItemFactory(accessor: IAccessor): IMenuButtonIte
return {
id: OpenHeaderFooterPanelCommand.id,
type: MenuItemType.BUTTON,
- icon: 'HeaderFooterSingle',
+ icon: 'HeaderFooterIcon',
tooltip: 'toolbar.headerFooter',
hidden$: combineLatest(getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, undefined, DOCS_ZEN_EDITOR_UNIT_ID_KEY), getHeaderFooterMenuHiddenObservable(accessor), (one, two) => {
return one || two;
@@ -667,7 +667,7 @@ export function HeaderFooterMenuItemFactory(accessor: IAccessor): IMenuButtonIte
};
}
-export const TableIcon = 'GridSingle';
+export const TableIcon = 'GridIcon';
export const TABLE_MENU_ID = 'doc.menu.table';
export function TableMenuFactory(accessor: IAccessor): IMenuItem {
@@ -699,7 +699,7 @@ export function AlignLeftMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: AlignLeftCommand.id,
type: MenuItemType.BUTTON,
- icon: 'LeftJustifyingSingle',
+ icon: 'LeftJustifyingIcon',
tooltip: 'toolbar.alignLeft',
disabled$: disableMenuWhenNoDocRange(accessor),
activated$: new Observable<boolean>((subscriber) => {
@@ -733,7 +733,7 @@ export function AlignCenterMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: AlignCenterCommand.id,
type: MenuItemType.BUTTON,
- icon: 'HorizontallySingle',
+ icon: 'HorizontallyIcon',
tooltip: 'toolbar.alignCenter',
activated$: new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
@@ -767,7 +767,7 @@ export function AlignRightMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: AlignRightCommand.id,
type: MenuItemType.BUTTON,
- icon: 'RightJustifyingSingle',
+ icon: 'RightJustifyingIcon',
tooltip: 'toolbar.alignRight',
activated$: new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
@@ -801,7 +801,7 @@ export function AlignJustifyMenuItemFactory(accessor: IAccessor): IMenuButtonIte
return {
id: AlignJustifyCommand.id,
type: MenuItemType.BUTTON,
- icon: 'AlignTextBothSingle',
+ icon: 'AlignTextBothIcon',
tooltip: 'toolbar.alignJustify',
activated$: new Observable<boolean>((subscriber) => {
const disposable = commandService.onCommandExecuted((c) => {
@@ -833,7 +833,7 @@ export function HorizontalLineFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: HorizontalLineCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ReduceSingle',
+ icon: 'ReduceIcon',
tooltip: 'toolbar.horizontalLine',
disabled$: disableMenuWhenNoDocRange(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, undefined, DOCS_ZEN_EDITOR_UNIT_ID_KEY),
@@ -902,7 +902,7 @@ export function OrderListMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
value$: listValueFactory$(accessor),
},
],
- icon: 'OrderSingle',
+ icon: 'OrderIcon',
tooltip: 'toolbar.order',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
disabled$: disableMenuWhenNoDocRange(accessor),
@@ -925,7 +925,7 @@ export function BulletListMenuItemFactory(accessor: IAccessor): IMenuSelectorIte
value$: listValueFactory$(accessor),
},
],
- icon: 'UnorderSingle',
+ icon: 'UnorderIcon',
tooltip: 'toolbar.unorder',
disabled$: disableMenuWhenNoDocRange(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
@@ -937,7 +937,7 @@ export function CheckListMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: CheckListCommand.id,
type: MenuItemType.BUTTON,
- icon: 'TodoList',
+ icon: 'TodoListDoubleIcon',
tooltip: 'toolbar.checklist',
disabled$: disableMenuWhenNoDocRange(accessor),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
@@ -952,7 +952,7 @@ export function DocSwitchModeMenuItemFactory(accessor: IAccessor): IMenuButtonIt
return {
id: SwitchDocModeCommand.id,
type: MenuItemType.BUTTON,
- icon: 'KeyboardSingle',
+ icon: 'KeyboardIcon',
tooltip: 'toolbar.documentFlavor',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC, undefined, DOCS_ZEN_EDITOR_UNIT_ID_KEY),
activated$: new Observable<boolean>((subscriber) => {
@@ -978,7 +978,7 @@ export function ResetBackgroundColorMenuItemFactory(accessor: IAccessor): IMenuB
id: ResetInlineFormatTextBackgroundColorCommand.id,
type: MenuItemType.BUTTON,
title: 'toolbar.resetColor',
- icon: 'NoColor',
+ icon: 'NoColorDoubleIcon',
};
}
@@ -990,7 +990,7 @@ export function BackgroundColorSelectorMenuItemFactory(accessor: IAccessor): IMe
id: SetInlineFormatTextBackgroundColorCommand.id,
tooltip: 'toolbar.fillColor.main',
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'PaintBucket',
+ icon: 'PaintBucketDoubleIcon',
selections: [
{
label: {
@@ -1105,7 +1105,7 @@ export function PageSettingMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: DocOpenPageSettingCommand.id,
type: MenuItemType.BUTTON,
- icon: 'DocumentSettingSingle',
+ icon: 'DocumentSettingIcon',
tooltip: 'toolbar.pageSetup',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_DOC),
};
diff --git a/packages/docs-ui/src/controllers/menu/paragraph-menu.ts b/packages/docs-ui/src/controllers/menu/paragraph-menu.ts
index 9b1218c804..93d2268942 100644
--- a/packages/docs-ui/src/controllers/menu/paragraph-menu.ts
+++ b/packages/docs-ui/src/controllers/menu/paragraph-menu.ts
@@ -18,7 +18,7 @@ import type { IAccessor, ICommand } from '@univerjs/core';
import type { IMenuItem, IMenuSelectorItem } from '@univerjs/ui';
import { ICommandService, NamedStyleType, UniverInstanceType } from '@univerjs/core';
import { SetTextSelectionsOperation } from '@univerjs/docs';
-import { H1Single, H2Single, H3Single, H4Single, H5Single, TextTypeSingle } from '@univerjs/icons';
+import { H1Icon, H2Icon, H3Icon, H4Icon, H5Icon, TextTypeIcon } from '@univerjs/icons';
import { ComponentManager, getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { Observable } from 'rxjs';
import { DocCopyCurrentParagraphCommand, DocCutCurrentParagraphCommand } from '../../commands/commands/clipboard.command';
@@ -42,15 +42,15 @@ const HEADING_MAP: Record<NamedStyleType, ICommand> = {
};
export const HEADING_ICON_MAP: Record<NamedStyleType, { key: string; component: React.ComponentType<{ className: string }> }> = {
- [NamedStyleType.HEADING_1]: { key: 'H1Single', component: H1Single },
- [NamedStyleType.HEADING_2]: { key: 'H2Single', component: H2Single },
- [NamedStyleType.HEADING_3]: { key: 'H3Single', component: H3Single },
- [NamedStyleType.HEADING_4]: { key: 'H4Single', component: H4Single },
- [NamedStyleType.HEADING_5]: { key: 'H5Single', component: H5Single },
- [NamedStyleType.NORMAL_TEXT]: { key: 'TextTypeSingle', component: TextTypeSingle },
- [NamedStyleType.TITLE]: { key: 'TextTypeSingle', component: TextTypeSingle },
- [NamedStyleType.SUBTITLE]: { key: 'TextTypeSingle', component: TextTypeSingle },
- [NamedStyleType.NAMED_STYLE_TYPE_UNSPECIFIED]: { key: 'TextTypeSingle', component: TextTypeSingle },
+ [NamedStyleType.HEADING_1]: { key: 'H1Icon', component: H1Icon },
+ [NamedStyleType.HEADING_2]: { key: 'H2Icon', component: H2Icon },
+ [NamedStyleType.HEADING_3]: { key: 'H3Icon', component: H3Icon },
+ [NamedStyleType.HEADING_4]: { key: 'H4Icon', component: H4Icon },
+ [NamedStyleType.HEADING_5]: { key: 'H5Icon', component: H5Icon },
+ [NamedStyleType.NORMAL_TEXT]: { key: 'TextTypeIcon', component: TextTypeIcon },
+ [NamedStyleType.TITLE]: { key: 'TextTypeIcon', component: TextTypeIcon },
+ [NamedStyleType.SUBTITLE]: { key: 'TextTypeIcon', component: TextTypeIcon },
+ [NamedStyleType.NAMED_STYLE_TYPE_UNSPECIFIED]: { key: 'TextTypeIcon', component: TextTypeIcon },
};
const createHeadingSelectorMenuItemFactory = (headingType: NamedStyleType) => (accessor: IAccessor): IMenuItem => {
@@ -108,7 +108,7 @@ export const CopyCurrentParagraphMenuItemFactory = (accessor: IAccessor): IMenuI
return {
id: DocCopyCurrentParagraphCommand.id,
type: MenuItemType.BUTTON,
- icon: 'Copy',
+ icon: 'CopyDoubleIcon',
title: 'rightClick.copy',
};
};
@@ -117,7 +117,7 @@ export const CutCurrentParagraphMenuItemFactory = (accessor: IAccessor): IMenuIt
return {
id: DocCutCurrentParagraphCommand.id,
type: MenuItemType.BUTTON,
- icon: 'CutSingle',
+ icon: 'CutIcon',
title: 'rightClick.cut',
};
};
@@ -126,7 +126,7 @@ export const DeleteCurrentParagraphMenuItemFactory = (accessor: IAccessor): IMen
return {
id: DeleteCurrentParagraphCommand.id,
type: MenuItemType.BUTTON,
- icon: 'DeleteSingle',
+ icon: 'DeleteIcon',
title: 'rightClick.delete',
};
};
@@ -135,7 +135,7 @@ export const InsertBulletListBellowMenuItemFactory = (accessor: IAccessor): IMen
return {
id: InsertBulletListBellowCommand.id,
type: MenuItemType.BUTTON,
- icon: 'UnorderSingle',
+ icon: 'UnorderIcon',
title: 'rightClick.bulletList',
};
};
@@ -144,7 +144,7 @@ export const InsertOrderListBellowMenuItemFactory = (accessor: IAccessor): IMenu
return {
id: InsertOrderListBellowCommand.id,
type: MenuItemType.BUTTON,
- icon: 'OrderSingle',
+ icon: 'OrderIcon',
title: 'rightClick.orderList',
};
};
@@ -153,7 +153,7 @@ export const InsertCheckListBellowMenuItemFactory = (accessor: IAccessor): IMenu
return {
id: InsertCheckListBellowCommand.id,
type: MenuItemType.BUTTON,
- icon: 'TodoList',
+ icon: 'TodoListDoubleIcon',
title: 'rightClick.checkList',
};
};
@@ -162,7 +162,7 @@ export const InsertHorizontalLineBellowMenuItemFactory = (accessor: IAccessor):
return {
id: InsertHorizontalLineBellowCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ReduceSingle',
+ icon: 'ReduceIcon',
title: 'toolbar.horizontalLine',
};
};
diff --git a/packages/docs-ui/src/views/count-bar/CountBar.tsx b/packages/docs-ui/src/views/count-bar/CountBar.tsx
index 41bdacfd64..7b63f6a01a 100644
--- a/packages/docs-ui/src/views/count-bar/CountBar.tsx
+++ b/packages/docs-ui/src/views/count-bar/CountBar.tsx
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import React from 'react';
import { ZoomSlider } from './ZoomSlider';
interface ICountBarProps {
diff --git a/packages/docs-ui/src/views/page-settings/index.tsx b/packages/docs-ui/src/views/page-settings/index.tsx
index 73857f672b..7597a0616d 100644
--- a/packages/docs-ui/src/views/page-settings/index.tsx
+++ b/packages/docs-ui/src/views/page-settings/index.tsx
@@ -19,7 +19,7 @@ import type { IConfirmChildrenProps } from '@univerjs/ui';
import { IUniverInstanceService, LocaleService, PAGE_SIZE, PageOrientType, PAPER_TYPES, UniverInstanceType } from '@univerjs/core';
import { InputNumber, Select } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
export interface IPageSettingsProps {
onClose: () => void;
diff --git a/packages/docs-ui/src/views/paragraph-setting/Setting.tsx b/packages/docs-ui/src/views/paragraph-setting/Setting.tsx
index 455d42e441..900bef50d7 100644
--- a/packages/docs-ui/src/views/paragraph-setting/Setting.tsx
+++ b/packages/docs-ui/src/views/paragraph-setting/Setting.tsx
@@ -16,7 +16,7 @@
import { HorizontalAlign, LocaleService, SpacingRule } from '@univerjs/core';
import { borderClassName, clsx, InputNumber, Select, Tooltip } from '@univerjs/design';
-import { AlignTextBothSingle, HorizontallySingle, LeftJustifyingSingle, RightJustifyingSingle } from '@univerjs/icons';
+import { AlignTextBothIcon, HorizontallyIcon, LeftJustifyingIcon, RightJustifyingIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useMemo, useRef } from 'react';
import {
@@ -66,10 +66,10 @@ export function ParagraphSetting() {
const localeService = useDependency(LocaleService);
const alignmentOptions = useMemo(() => [
- { label: localeService.t('toolbar.alignLeft'), value: String(HorizontalAlign.LEFT), icon: <LeftJustifyingSingle /> },
- { label: localeService.t('toolbar.alignCenter'), value: String(HorizontalAlign.CENTER), icon: <HorizontallySingle /> },
- { label: localeService.t('toolbar.alignRight'), value: String(HorizontalAlign.RIGHT), icon: <RightJustifyingSingle /> },
- { label: localeService.t('toolbar.alignJustify'), value: String(HorizontalAlign.JUSTIFIED), icon: <AlignTextBothSingle /> },
+ { label: localeService.t('toolbar.alignLeft'), value: String(HorizontalAlign.LEFT), icon: <LeftJustifyingIcon /> },
+ { label: localeService.t('toolbar.alignCenter'), value: String(HorizontalAlign.CENTER), icon: <HorizontallyIcon /> },
+ { label: localeService.t('toolbar.alignRight'), value: String(HorizontalAlign.RIGHT), icon: <RightJustifyingIcon /> },
+ { label: localeService.t('toolbar.alignJustify'), value: String(HorizontalAlign.JUSTIFIED), icon: <AlignTextBothIcon /> },
], []);
const currentParagraph = useCurrentParagraph();
diff --git a/packages/docs-ui/src/views/rich-text-editor/index.tsx b/packages/docs-ui/src/views/rich-text-editor/index.tsx
index ad9edf6144..9e8298ec9f 100644
--- a/packages/docs-ui/src/views/rich-text-editor/index.tsx
+++ b/packages/docs-ui/src/views/rich-text-editor/index.tsx
@@ -15,7 +15,7 @@
*/
import type { IDocumentData } from '@univerjs/core';
-import type { ReactNode } from 'react';
+import type { CSSProperties, ReactNode, RefObject } from 'react';
import type { Editor } from '../../services/editor/editor';
import type { IKeyboardEventConfig } from './hooks';
import { BuildTextUtils, createInternalEditorID, generateRandomId, getPlainText } from '@univerjs/core';
@@ -23,7 +23,7 @@ import { borderClassName, clsx } from '@univerjs/design';
import { DocSkeletonManagerService } from '@univerjs/docs';
import { IRenderManagerService } from '@univerjs/engine-render';
import { useDependency, useEvent, useObservable } from '@univerjs/ui';
-import React, { useEffect, useLayoutEffect, useMemo, useState } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
import { IEditorService } from '../../services/editor/editor-manager.service';
import { DocSelectionRenderService } from '../../services/selection/doc-selection-render.service';
import { useKeyboardEvent, useResize } from './hooks';
@@ -39,7 +39,7 @@ export interface IRichTextEditorProps {
onClickOutside?: () => void;
keyboardEventConfig?: IKeyboardEventConfig;
moveCursor?: boolean;
- style?: React.CSSProperties;
+ style?: CSSProperties;
isSingle?: boolean;
placeholder?: string;
editorId?: string;
@@ -48,7 +48,7 @@ export interface IRichTextEditorProps {
maxHeight?: number;
defaultHeight?: number;
icon?: ReactNode;
- editorRef?: React.RefObject<Editor | null> | ((editor: Editor | null) => void);
+ editorRef?: RefObject<Editor | null> | ((editor: Editor | null) => void);
}
export const RichTextEditor = (props: IRichTextEditorProps) => {
@@ -75,7 +75,7 @@ export const RichTextEditor = (props: IRichTextEditorProps) => {
const onFocusChange = useEvent(_onFocusChange);
const onClickOutside = useEvent(_onClickOutside);
const [height, setHeight] = useState(defaultHeight);
- const formulaEditorContainerRef = React.useRef<HTMLDivElement>(null!);
+ const formulaEditorContainerRef = useRef<HTMLDivElement>(null!);
const editorId = useMemo(() => propsEditorId ?? createInternalEditorID(`RICH_TEXT_EDITOR-${generateRandomId(4)}`), [propsEditorId]);
const editor = useEditor({
editorId,
@@ -89,7 +89,7 @@ export const RichTextEditor = (props: IRichTextEditorProps) => {
const docSelectionRenderService = renderer?.with(DocSelectionRenderService);
const selections = useObservable(docSelectionRenderService?.textSelectionInner$);
const isFocusing = Boolean((docSelectionRenderService?.isFocusing ?? false) && selections?.textRanges.some((r) => r.collapsed));
- const sheetEmbeddingRef = React.useRef<HTMLDivElement>(null);
+ const sheetEmbeddingRef = useRef<HTMLDivElement>(null);
const [showPlaceholder, setShowPlaceholder] = useState(() => !BuildTextUtils.transform.getPlainText(editor?.getDocumentData().body?.dataStream ?? ''));
const { checkScrollBar } = useResize(editor, isSingle, true, true);
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index 4381ce7b62..b922cebcb7 100644
--- a/packages/drawing-ui/package.json
+++ b/packages/drawing-ui/package.json
@@ -70,7 +70,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
index 4eb3692409..ce51fdbf67 100644
--- a/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
+++ b/packages/drawing-ui/src/views/image-popup-menu/ImagePopupMenu.tsx
@@ -17,9 +17,9 @@
import type { IDrawingSearch } from '@univerjs/core';
import { ICommandService, LocaleService } from '@univerjs/core';
import { borderClassName, clsx, DropdownMenu } from '@univerjs/design';
-import { Autofill, MoreDownSingle } from '@univerjs/icons';
+import { AutofillDoubleIcon, MoreDownIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
-import React, { useState } from 'react';
+import { useState } from 'react';
export interface IImagePopupMenuItem {
label: string;
@@ -39,7 +39,7 @@ export interface IImagePopupMenuProps {
};
}
-export const ImagePopupMenu: React.FC<IImagePopupMenuProps> = (props: IImagePopupMenuProps) => {
+export function ImagePopupMenu(props: IImagePopupMenuProps) {
const { popup } = props;
const menuItems = popup?.extraProps?.menuItems;
@@ -98,13 +98,13 @@ export const ImagePopupMenu: React.FC<IImagePopupMenuProps> = (props: IImagePopu
'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
- <Autofill
+ <AutofillDoubleIcon
className={`
univer-fill-primary-600 univer-text-gray-900
dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
+ {showMore && <MoreDownIcon className="dark:!univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/drawing-ui/src/views/panel/DrawingArrange.tsx b/packages/drawing-ui/src/views/panel/DrawingArrange.tsx
index 57aa6ee3e0..b12f779d00 100644
--- a/packages/drawing-ui/src/views/panel/DrawingArrange.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingArrange.tsx
@@ -18,7 +18,7 @@ import type { IDrawingParam } from '@univerjs/core';
import { ArrangeTypeEnum, LocaleService } from '@univerjs/core';
import { Button, clsx } from '@univerjs/design';
import { IDrawingManagerService } from '@univerjs/drawing';
-import { BottomSingle, MoveDownSingle, MoveUpSingle, TopmostSingle } from '@univerjs/icons';
+import { BottomIcon, MoveDownIcon, MoveUpIcon, TopmostIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
@@ -70,19 +70,19 @@ export const DrawingArrange = (props: IDrawingArrangeProps) => {
<div className="univer-grid univer-grid-cols-2 univer-gap-2 univer-px-8">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.forward); }}>
- <MoveUpSingle />
+ <MoveUpIcon />
{localeService.t('image-panel.arrange.forward')}
</Button>
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.backward); }}>
- <MoveDownSingle />
+ <MoveDownIcon />
{localeService.t('image-panel.arrange.backward')}
</Button>
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.front); }}>
- <TopmostSingle />
+ <TopmostIcon />
{localeService.t('image-panel.arrange.front')}
</Button>
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.back); }}>
- <BottomSingle />
+ <BottomIcon />
{localeService.t('image-panel.arrange.back')}
</Button>
</div>
diff --git a/packages/drawing-ui/src/views/panel/DrawingGroup.tsx b/packages/drawing-ui/src/views/panel/DrawingGroup.tsx
index 365d0b5af1..01a3440cce 100644
--- a/packages/drawing-ui/src/views/panel/DrawingGroup.tsx
+++ b/packages/drawing-ui/src/views/panel/DrawingGroup.tsx
@@ -20,7 +20,7 @@ import { DrawingTypeEnum, LocaleService, Tools } from '@univerjs/core';
import { Button, clsx } from '@univerjs/design';
import { IDrawingManagerService } from '@univerjs/drawing';
import { getGroupState, IRenderManagerService, transformObjectOutOfGroup } from '@univerjs/engine-render';
-import { GroupSingle, UngroupSingle } from '@univerjs/icons';
+import { GroupIcon, UngroupIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
import { getUpdateParams } from '../../utils/get-update-params';
@@ -202,7 +202,7 @@ export const DrawingGroup = (props: IDrawingGroupProps) => {
})}
onClick={onGroupBtnClick}
>
- <GroupSingle />
+ <GroupIcon />
{localeService.t('image-panel.group.group')}
</Button>
<Button
@@ -211,7 +211,7 @@ export const DrawingGroup = (props: IDrawingGroupProps) => {
})}
onClick={onUngroupBtnClick}
>
- <UngroupSingle />
+ <UngroupIcon />
{localeService.t('image-panel.group.unGroup')}
</Button>
</div>
diff --git a/packages/drawing-ui/src/views/panel/ImageCropper.tsx b/packages/drawing-ui/src/views/panel/ImageCropper.tsx
index 221ce2d111..7cdade00a0 100644
--- a/packages/drawing-ui/src/views/panel/ImageCropper.tsx
+++ b/packages/drawing-ui/src/views/panel/ImageCropper.tsx
@@ -17,7 +17,7 @@
import type { IDrawingParam } from '@univerjs/core';
import { ICommandService, LocaleService } from '@univerjs/core';
import { Button, clsx, Select } from '@univerjs/design';
-import { CreateCopySingle } from '@univerjs/icons';
+import { CreateCopyIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useEffect, useRef, useState } from 'react';
import { AutoImageCropOperation, CloseImageCropOperation, CropType } from '../../commands/operations/image-crop.operation';
@@ -134,7 +134,7 @@ export const ImageCropper = (props: IImageCropperProps) => {
<div className="univer-flex univer-items-center univer-justify-center univer-gap-2">
<Button onClick={() => { onCropperBtnClick(cropValue as CropType); }}>
- <CreateCopySingle />
+ <CreateCopyIcon />
{localeService.t('image-panel.crop.start')}
</Button>
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index b5c3df85b7..72f17a7181 100644
--- a/packages/find-replace/package.json
+++ b/packages/find-replace/package.json
@@ -71,7 +71,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/find-replace/src/controllers/find-replace.controller.ts b/packages/find-replace/src/controllers/find-replace.controller.ts
index 2a24bb0160..0f0c2415b1 100644
--- a/packages/find-replace/src/controllers/find-replace.controller.ts
+++ b/packages/find-replace/src/controllers/find-replace.controller.ts
@@ -14,10 +14,7 @@
* limitations under the License.
*/
-import type {
- IDisposable,
- Nullable,
-} from '@univerjs/core';
+import type { IDisposable, Nullable } from '@univerjs/core';
import {
ICommandService,
Inject,
@@ -27,10 +24,9 @@ import {
RxDisposable,
toDisposable,
} from '@univerjs/core';
-import { SearchSingle } from '@univerjs/icons';
+import { SearchIcon } from '@univerjs/icons';
import { ComponentManager, IDialogService, ILayoutService, IMenuManagerService, IShortcutService } from '@univerjs/ui';
import { takeUntil } from 'rxjs';
-
import { ReplaceAllMatchesCommand, ReplaceCurrentMatchCommand } from '../commands/commands/replace.command';
import {
FocusSelectionOperation,
@@ -112,10 +108,10 @@ export class FindReplaceController extends RxDisposable {
private _initUI(): void {
([
['FindReplaceDialog', FindReplaceDialog],
- ['SearchIcon', SearchSingle],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ ['SearchIcon', SearchIcon],
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(key, comp)
);
});
diff --git a/packages/find-replace/src/views/dialog/FindReplaceDialog.stories.tsx b/packages/find-replace/src/views/dialog/FindReplaceDialog.stories.tsx
index 5fe1e5ac12..747806f2d1 100644
--- a/packages/find-replace/src/views/dialog/FindReplaceDialog.stories.tsx
+++ b/packages/find-replace/src/views/dialog/FindReplaceDialog.stories.tsx
@@ -18,8 +18,7 @@ import type { Meta } from '@storybook/react';
import type { Dependency } from '@univerjs/core';
import { LocaleService, LocaleType } from '@univerjs/core';
import { DesktopLayoutService, ILayoutService, RediContext } from '@univerjs/ui';
-
-import React, { useContext, useMemo, useState } from 'react';
+import { useContext, useMemo, useState } from 'react';
import { FindReplaceController } from '../../controllers/find-replace.controller';
import enUS from '../../locale/en-US';
import ruRU from '../../locale/ru-RU';
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index 48d85e5db1..7c00ccd4e6 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -72,7 +72,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx b/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx
index c99f0247fa..38b14bf56c 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/color-picker/index.tsx
@@ -17,7 +17,7 @@
import type { IconProps } from '@univerjs/icons';
import { ColorKit } from '@univerjs/core';
import { clsx, Dropdown, ColorPicker as OriginColorPicker } from '@univerjs/design';
-import { PaintBucket } from '@univerjs/icons';
+import { PaintBucketDoubleIcon } from '@univerjs/icons';
import { useMemo } from 'react';
interface IColorPickerProps {
@@ -29,7 +29,7 @@ interface IColorPickerProps {
};
export const ColorPicker = (props: IColorPickerProps) => {
- const { color, onChange, disable = false, Icon = PaintBucket, className } = props;
+ const { color, onChange, disable = false, Icon = PaintBucketDoubleIcon, className } = props;
const colorKit = useMemo(() => new ColorKit(color), [color]);
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 d4fdc7f268..b1e814b566 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
@@ -17,7 +17,7 @@
import type { IHighlightCell } from '@univerjs/sheets-conditional-formatting';
import { BooleanNumber } from '@univerjs/core';
import { clsx } from '@univerjs/design';
-import { BoldSingle, FontColor, ItalicSingle, StrikethroughSingle, UnderlineSingle } from '@univerjs/icons';
+import { BoldIcon, FontColorDoubleIcon, ItalicIcon, StrikethroughIcon, UnderlineIcon } from '@univerjs/icons';
import { removeUndefinedAttr } from '@univerjs/sheets-conditional-formatting';
import { ComponentManager, useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
@@ -109,7 +109,7 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
})}
onClick={() => setIsBold(getAnotherBooleanNumber(isBold))}
>
- <BoldSingle />
+ <BoldIcon />
</div>
<div
className={clsx(buttonItemClassName, {
@@ -117,7 +117,7 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
})}
onClick={() => setIsItalic(getAnotherBooleanNumber(isItalic))}
>
- <ItalicSingle />
+ <ItalicIcon />
</div>
<div
className={clsx(buttonItemClassName, {
@@ -125,7 +125,7 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
})}
onClick={() => setIsUnderline(getAnotherBooleanNumber(isUnderline))}
>
- <UnderlineSingle />
+ <UnderlineIcon />
</div>
<div
className={clsx(buttonItemClassName, {
@@ -133,9 +133,9 @@ export const ConditionalStyleEditor = (props: IConditionalStyleEditorProps) => {
})}
onClick={() => setIsStrikethrough(getAnotherBooleanNumber(isStrikethrough))}
>
- <StrikethroughSingle />
+ <StrikethroughIcon />
</div>
- <ColorPicker color={fontColor} onChange={setFontColor} Icon={FontColor} />
+ <ColorPicker color={fontColor} onChange={setFontColor} Icon={FontColorDoubleIcon} />
<ColorPicker color={bgColor} onChange={setBgColor} />
</div>
);
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 8e4703d150..5525c8ae49 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
@@ -20,7 +20,7 @@ import type { IFormulaEditorRef } from '@univerjs/sheets-formula-ui';
import type { IStyleEditorProps } from './type';
import { get, IUniverInstanceService, LocaleService, set, Tools, UniverInstanceType } from '@univerjs/core';
import { borderClassName, Checkbox, clsx, Dropdown, InputNumber, Select } from '@univerjs/design';
-import { MoreDownSingle, SlashSingle } from '@univerjs/icons';
+import { MoreDownIcon, SlashIcon } from '@univerjs/icons';
import {
CFNumberOperator,
CFRuleType,
@@ -183,7 +183,7 @@ const IconItemList = (props: { onClick: (iconType: IIconType, iconId: string) =>
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" />
+ <SlashIcon className="univer-size-5" />
<span className="univer-ml-2">无单元格图标</span>
</div>
<div className="univer-flex univer-w-64 univer-flex-wrap">
@@ -224,7 +224,6 @@ const IconSetRuleEdit = (props: {
{ label: localeService.t(`sheet.cf.valueType.${CFValueType.percent}`), value: CFValueType.percent },
{ label: localeService.t(`sheet.cf.valueType.${CFValueType.percentile}`), value: CFValueType.percentile },
{ label: localeService.t(`sheet.cf.valueType.${CFValueType.formula}`), value: CFValueType.formula },
-
];
const handleValueValueChange = (v: number | string, index: number) => {
onChange([String(index), 'value', 'value'], v);
@@ -317,11 +316,11 @@ const IconSetRuleEdit = (props: {
{icon
? <img src={icon} className="univer-size-4" draggable={false} />
: (
- <SlashSingle
+ <SlashIcon
className="univer-size-4"
/>
)}
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</Dropdown>
</div>
@@ -459,7 +458,7 @@ export const IconSet = (props: IStyleEditorProps<unknown, IIconSet>) => {
src={icon}
/>
)
- : <SlashSingle className="univer-size-5" key={index} />))}
+ : <SlashIcon className="univer-size-5" key={index} />))}
</div>
);
}, [configList]);
@@ -588,7 +587,7 @@ export const IconSet = (props: IStyleEditorProps<unknown, IIconSet>) => {
`, borderClassName)}
>
{previewIcon}
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</Dropdown>
</div>
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 eb2740f69e..511b8ab9ce 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
@@ -19,7 +19,7 @@ import type { IConditionFormattingRule, IDeleteCfCommandParams, IMoveCfCommandPa
import { ICommandService, Injector, IUniverInstanceService, LocaleService, Rectangle, UniverInstanceType } from '@univerjs/core';
import { clsx, ReactGridLayout, Select, Tooltip } from '@univerjs/design';
import { serializeRange } from '@univerjs/engine-formula';
-import { DeleteSingle, IncreaseSingle, SequenceSingle } from '@univerjs/icons';
+import { DeleteIcon, IncreaseIcon, SequenceIcon } from '@univerjs/icons';
import { checkRangesEditablePermission, SetSelectionsOperation, SetWorksheetActiveOperation, SheetsSelectionsService } from '@univerjs/sheets';
import {
AddConditionalRuleMutation,
@@ -334,7 +334,7 @@ export const RuleList = (props: IRuleListProps) => {
className="univer-size-5 univer-cursor-pointer"
onClick={handleCreate}
>
- <IncreaseSingle />
+ <IncreaseIcon />
</a>
</Tooltip>
{(ruleList.length && isHasAllRuleEditPermission)
@@ -344,13 +344,13 @@ export const RuleList = (props: IRuleListProps) => {
className="univer-size-5 univer-cursor-pointer"
onClick={handleClear}
>
- <DeleteSingle className="univer-text-red-500" />
+ <DeleteIcon className="univer-text-red-500" />
</a>
</Tooltip>
)
: (
<div>
- <DeleteSingle className="univer-text-gray-300" />
+ <DeleteIcon className="univer-text-gray-300" />
</div>
)}
@@ -403,7 +403,7 @@ export const RuleList = (props: IRuleListProps) => {
`, 'draggableHandle')}
onClick={(e) => e.stopPropagation()}
>
- <SequenceSingle />
+ <SequenceIcon />
</div>
<div
className={`
@@ -441,7 +441,7 @@ export const RuleList = (props: IRuleListProps) => {
setCurrentRuleRanges([]);
}}
>
- <DeleteSingle />
+ <DeleteIcon />
</div>
</div>
</div>
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 5655612b0c..2444781199 100644
--- a/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx
+++ b/packages/sheets-conditional-formatting-ui/src/components/preview/index.tsx
@@ -17,7 +17,7 @@
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 { SlashIcon } from '@univerjs/icons';
import { CFRuleType, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, defaultDataBarNativeColor, defaultDataBarPositiveColor, getColorScaleFromValue, iconMap } from '@univerjs/sheets-conditional-formatting';
import { useMemo } from 'react';
@@ -93,7 +93,7 @@ export const Preview = (props: { rule?: IConditionalFormattingRuleConfig }) => {
{iconSet.map((base64, index) => (
base64 ?
<img key={index} className="univer-h-full" src={base64} draggable={false} />
- : <SlashSingle key={index} />))}
+ : <SlashIcon key={index} />))}
</div>
);
}
diff --git a/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts b/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts
index a5227879bd..888b309365 100644
--- a/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts
+++ b/packages/sheets-conditional-formatting-ui/src/menu/manage-rule.ts
@@ -191,7 +191,7 @@ export const FactoryManageConditionalFormattingRule = (accessor: IAccessor): IMe
return {
id: OpenConditionalFormattingOperator.id,
type: MenuItemType.SELECTOR,
- icon: 'Conditions',
+ icon: 'ConditionsDoubleIcon',
tooltip: 'sheet.cf.title',
selections: selections$,
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
index 773d76323b..46e43ea666 100644
--- a/packages/sheets-conditional-formatting/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -80,7 +80,7 @@
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
- "@univerjs/icons-svg": "^0.3.24",
+ "@univerjs/icons-svg": "^0.4.3",
"rxjs": "^7.8.2",
"typescript": "^5.8.3",
"vite": "^6.3.5",
diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json
index 73e9802e30..9706e347b7 100644
--- a/packages/sheets-crosshair-highlight/package.json
+++ b/packages/sheets-crosshair-highlight/package.json
@@ -80,7 +80,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*"
diff --git a/packages/sheets-crosshair-highlight/src/controllers/crosshair.controller.tsx b/packages/sheets-crosshair-highlight/src/controllers/crosshair.controller.tsx
index fe3912ce5f..b50d8d2eb5 100644
--- a/packages/sheets-crosshair-highlight/src/controllers/crosshair.controller.tsx
+++ b/packages/sheets-crosshair-highlight/src/controllers/crosshair.controller.tsx
@@ -15,8 +15,8 @@
*/
import { Disposable, ICommandService, Inject } from '@univerjs/core';
+import { CrossHighlightingIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
-import { CrossHighlightingSingle } from '@univerjs/icons';
import {
DisableCrosshairHighlightOperation,
EnableCrosshairHighlightOperation,
@@ -55,6 +55,6 @@ export class SheetsCrosshairHighlightController extends Disposable {
private _initComponents(): void {
this._componentMgr.register(CROSSHAIR_HIGHLIGHT_OVERLAY_COMPONENT, CrosshairOverlay);
- this._componentMgr.register('CrossHighlightingSingle', CrossHighlightingSingle);
+ this._componentMgr.register('CrossHighlightingIcon', CrossHighlightingIcon);
}
}
diff --git a/packages/sheets-crosshair-highlight/src/controllers/crosshair.menu.ts b/packages/sheets-crosshair-highlight/src/controllers/crosshair.menu.ts
index 97be5a2f54..02fc1535b0 100644
--- a/packages/sheets-crosshair-highlight/src/controllers/crosshair.menu.ts
+++ b/packages/sheets-crosshair-highlight/src/controllers/crosshair.menu.ts
@@ -30,7 +30,7 @@ export function CrosshairHighlightMenuItemFactory(accessor: IAccessor): IMenuSel
id: ToggleCrosshairHighlightOperation.id,
tooltip: 'crosshair.button.tooltip',
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'CrossHighlightingSingle',
+ icon: 'CrossHighlightingIcon',
selections: [
{
label: {
diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json
index 05bc6728ec..32fd107ee3 100644
--- a/packages/sheets-data-validation-ui/package.json
+++ b/packages/sheets-data-validation-ui/package.json
@@ -75,7 +75,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts
index 02473220a8..c4adada55f 100644
--- a/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts
+++ b/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts
@@ -20,7 +20,7 @@ import { Button } from '@univerjs/design';
import { SheetInterceptorService, VALIDATE_CELL } from '@univerjs/sheets';
import { SheetDataValidationModel, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';
import { IDialogService } from '@univerjs/ui';
-import React from 'react';
+import { createElement } from 'react';
export class DataValidationRejectInputController extends Disposable {
constructor(
@@ -71,7 +71,7 @@ export class DataValidationRejectInputController extends Disposable {
title: validator.getRuleFinalError(rule, { row, col, unitId, subUnitId }),
},
footer: {
- title: React.createElement(
+ title: createElement(
Button,
{
variant: 'primary',
@@ -102,7 +102,7 @@ export class DataValidationRejectInputController extends Disposable {
title,
},
footer: {
- title: React.createElement(
+ title: createElement(
Button,
{
variant: 'primary',
diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts
index 2c322b47c4..b26a646019 100644
--- a/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts
+++ b/packages/sheets-data-validation-ui/src/controllers/dv-ui.controller.ts
@@ -18,7 +18,7 @@ import type { Ctor } from '@univerjs/core';
import type { BaseSheetDataValidatorView } from '../views/validator-views/sheet-validator-view';
import { Inject, Injector, RxDisposable } from '@univerjs/core';
import { DataValidatorRegistryService } from '@univerjs/data-validation';
-import { DataValidationSingle } from '@univerjs/icons';
+import { DataValidationIcon } from '@univerjs/icons';
import { ComponentManager } from '@univerjs/ui';
import { DATA_VALIDATION_PANEL } from '../commands/operations/data-validation.operation';
import { DataValidationPanel } from '../views/components';
@@ -33,7 +33,6 @@ import { ListMultipleValidatorView } from '../views/validator-views/list-multipl
import { ListValidatorView } from '../views/validator-views/list-validator-view';
import { TextLengthValidatorView } from '../views/validator-views/text-length-validator.view';
import { WholeValidatorView } from '../views/validator-views/whole-validator-view';
-import { DataValidationIcon } from './dv.menu';
export class SheetsDataValidationUIController extends RxDisposable {
constructor(
@@ -49,15 +48,15 @@ export class SheetsDataValidationUIController extends RxDisposable {
private _initComponents() {
([
- [DataValidationIcon, DataValidationSingle],
+ ['DataValidationIcon', DataValidationIcon],
[DATA_VALIDATION_PANEL, DataValidationPanel],
[ListRenderModeInput.componentKey, ListRenderModeInput],
[DateShowTimeOption.componentKey, DateShowTimeOption],
...FORMULA_INPUTS,
- ] as const).forEach(([key, component]) => {
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(this._componentManger.register(
key,
- component
+ comp
));
});
}
diff --git a/packages/sheets-data-validation-ui/src/controllers/dv.menu.ts b/packages/sheets-data-validation-ui/src/controllers/dv.menu.ts
index 6d7000cf37..48590a4bf6 100644
--- a/packages/sheets-data-validation-ui/src/controllers/dv.menu.ts
+++ b/packages/sheets-data-validation-ui/src/controllers/dv.menu.ts
@@ -15,21 +15,21 @@
*/
import type { IAccessor } from '@univerjs/core';
+import type { IMenuItem } from '@univerjs/ui';
import { UniverInstanceType } from '@univerjs/core';
import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission } from '@univerjs/sheets';
import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
-import { getMenuHiddenObservable, type IMenuItem, MenuItemType } from '@univerjs/ui';
+import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { AddSheetDataValidationAndOpenCommand } from '../commands/commands/data-validation-ui.command';
import { OpenValidationPanelOperation } from '../commands/operations/data-validation.operation';
-export const DataValidationIcon = 'data-validation-single';
export const DATA_VALIDATION_MENU_ID = 'sheet.menu.data-validation';
export function dataValidationMenuFactory(accessor: IAccessor): IMenuItem {
return {
id: DATA_VALIDATION_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: DataValidationIcon,
+ icon: 'DataValidationIcon',
tooltip: 'dataValidation.title',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetSetCellStylePermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx
index 8db874b424..64331ffa95 100644
--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/CheckboxFormulaInput.tsx
@@ -18,7 +18,7 @@ import type { IFormulaInputProps } from '@univerjs/data-validation';
import { LocaleService } from '@univerjs/core';
import { Checkbox, FormLayout, Input } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
-import React, { useState } from 'react';
+import { useState } from 'react';
export function CheckboxFormulaInput(props: IFormulaInputProps) {
const { value, onChange, showError, validResult } = props;
diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx
index 8102c0838a..0af134b7a1 100644
--- a/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/formula-input/ListFormulaInput.tsx
@@ -20,7 +20,7 @@ import type { IFormulaEditorRef } from '@univerjs/sheets-formula-ui';
import { DataValidationType, isFormulaString, LocaleService, Tools } from '@univerjs/core';
import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
import { borderClassName, clsx, DraggableList, Dropdown, FormLayout, Input, Radio, RadioGroup } from '@univerjs/design';
-import { DeleteSingle, IncreaseSingle, MoreDownSingle, SequenceSingle } from '@univerjs/icons';
+import { DeleteIcon, IncreaseIcon, MoreDownIcon, SequenceIcon } 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';
@@ -115,7 +115,7 @@ const ColorSelect = (props: IColorSelectProps) => {
style={{ background: value }}
/>
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</Dropdown>
);
@@ -129,7 +129,7 @@ const Template = (props: { item: IDropdownItem; commonProps: any; className?: st
<div className={clsx('univer-flex univer-items-center univer-gap-2', className)}>
{!item.isRef && (
<div className={clsx('univer-cursor-move', 'draggableHandle')}>
- <SequenceSingle />
+ <SequenceIcon />
</div>
)}
<ColorSelect
@@ -154,7 +154,7 @@ const Template = (props: { item: IDropdownItem; commonProps: any; className?: st
hover:univer-bg-gray-200
`}
>
- <DeleteSingle onClick={() => onItemDelete(item.id)} />
+ <DeleteIcon onClick={() => onItemDelete(item.id)} />
</div>
)}
</div>
@@ -419,7 +419,7 @@ export function ListFormulaInput(props: IFormulaInputProps) {
`}
onClick={handleAdd}
>
- <IncreaseSingle className="univer-mr-1" />
+ <IncreaseIcon className="univer-mr-1" />
{localeService.t('dataValidation.list.add')}
</a>
</div>
diff --git a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
index 5ff4f2a8c9..e63887afa5 100644
--- a/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/item/index.tsx
@@ -19,7 +19,7 @@ import { ColorKit, ICommandService, ThemeService } from '@univerjs/core';
import { DataValidatorRegistryService } from '@univerjs/data-validation';
import { clsx } from '@univerjs/design';
import { serializeRange } from '@univerjs/engine-formula';
-import { DeleteSingle } from '@univerjs/icons';
+import { DeleteIcon } from '@univerjs/icons';
import { RemoveSheetDataValidationCommand } from '@univerjs/sheets-data-validation';
import { IMarkSelectionService } from '@univerjs/sheets-ui';
import { useDependency, useObservable } from '@univerjs/ui';
@@ -131,7 +131,7 @@ export const DataValidationItem = (props: IDataValidationDetailProps) => {
`}
onClick={handleDelete}
>
- <DeleteSingle />
+ <DeleteIcon />
</div>
)
: null}
diff --git a/packages/sheets-data-validation-ui/src/views/components/list/index.tsx b/packages/sheets-data-validation-ui/src/views/components/list/index.tsx
index e41e63786e..2ed5426472 100644
--- a/packages/sheets-data-validation-ui/src/views/components/list/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/list/index.tsx
@@ -21,7 +21,7 @@ import { Button } from '@univerjs/design';
import { checkRangesEditablePermission } from '@univerjs/sheets';
import { AddSheetDataValidationCommand, createDefaultNewRule, RemoveSheetAllDataValidationCommand, SheetDataValidationModel } from '@univerjs/sheets-data-validation';
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { DataValidationPanelService } from '../../../services/data-validation-panel.service';
import { DataValidationItem } from '../item';
diff --git a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
index 52529a45bb..71420599bf 100644
--- a/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/options/index.tsx
@@ -17,9 +17,9 @@
import type { IDataValidationRuleOptions } from '@univerjs/core';
import { DataValidationErrorStyle, LocaleService } from '@univerjs/core';
import { Checkbox, FormLayout, Input, Radio, RadioGroup } from '@univerjs/design';
-import { MoreDownSingle, MoreUpSingle } from '@univerjs/icons';
+import { MoreDownIcon, MoreUpIcon } from '@univerjs/icons';
import { ComponentManager, useDependency } from '@univerjs/ui';
-import React, { useState } from 'react';
+import { useState } from 'react';
export interface IDataValidationOptionsParams {
value: IDataValidationRuleOptions;
@@ -47,10 +47,10 @@ export function DataValidationOptions(props: IDataValidationOptionsParams) {
{localeService.t('dataValidation.panel.options')}
{show
? (
- <MoreUpSingle className="univer-ml-1" />
+ <MoreUpIcon className="univer-ml-1" />
)
: (
- <MoreDownSingle className="univer-ml-1" />
+ <MoreDownIcon className="univer-ml-1" />
)}
</div>
{show && (
diff --git a/packages/sheets-data-validation-ui/src/views/components/show-time/index.tsx b/packages/sheets-data-validation-ui/src/views/components/show-time/index.tsx
index 28183918d7..216df945e9 100644
--- a/packages/sheets-data-validation-ui/src/views/components/show-time/index.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/show-time/index.tsx
@@ -18,7 +18,6 @@ import type { IDataValidationRuleOptions } from '@univerjs/core';
import { LocaleService } from '@univerjs/core';
import { Checkbox, FormLayout } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
-import React from 'react';
export interface IDateShowTimeOptionProps {
value: IDataValidationRuleOptions;
diff --git a/packages/sheets-drawing-ui/src/views/menu/image.menu.ts b/packages/sheets-drawing-ui/src/views/menu/image.menu.ts
index edae13fc19..0941f089cc 100644
--- a/packages/sheets-drawing-ui/src/views/menu/image.menu.ts
+++ b/packages/sheets-drawing-ui/src/views/menu/image.menu.ts
@@ -28,7 +28,7 @@ export function ImageMenuFactory(accessor: IAccessor): IMenuItem {
return {
id: SHEETS_IMAGE_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'AddImageSingle',
+ icon: 'AddImageIcon',
tooltip: 'sheetImage.title',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index ffa3d9af80..4bfc7ba0f6 100644
--- a/packages/sheets-filter-ui/package.json
+++ b/packages/sheets-filter-ui/package.json
@@ -69,7 +69,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts
index bcd0e96478..e67a3eb52c 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts
+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter-ui-desktop.controller.ts
@@ -18,7 +18,7 @@ import type { IDisposable, Nullable } from '@univerjs/core';
import { ICommandService, IContextService, Inject, Injector, LocaleService } from '@univerjs/core';
import { MessageType } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { FilterSingle } from '@univerjs/icons';
+import { FilterIcon } from '@univerjs/icons';
import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, RemoveSheetFilterCommand, SetSheetFilterRangeCommand, SetSheetsFilterCriteriaCommand, SheetsFilterService, SmartToggleSheetsFilterCommand } from '@univerjs/sheets-filter';
import { SheetCanvasPopManagerService, SheetsRenderService } from '@univerjs/sheets-ui';
import { ComponentManager, IMenuManagerService, IMessageService, IShortcutService } from '@univerjs/ui';
@@ -96,10 +96,10 @@ export class SheetsFilterUIDesktopController extends SheetsFilterUIMobileControl
private _initUI(): void {
([
[FILTER_PANEL_POPUP_KEY, FilterPanel],
- ['FilterSingle', FilterSingle],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ ['FilterIcon', FilterIcon],
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(key, comp)
);
});
diff --git a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts
index 60a8dfce6d..a91431669e 100644
--- a/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts
+++ b/packages/sheets-filter-ui/src/controllers/sheets-filter.menu.ts
@@ -30,7 +30,7 @@ export function SmartToggleFilterMenuItemFactory(accessor: IAccessor): IMenuSele
return {
id: SmartToggleSheetsFilterCommand.id,
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'FilterSingle',
+ icon: 'FilterIcon',
tooltip: 'sheets-filter.toolbar.smart-toggle-filter-tooltip',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterByConditionsPanel.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterByConditionsPanel.tsx
index bdbe85ebf4..e44b789081 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterByConditionsPanel.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterByConditionsPanel.tsx
@@ -20,8 +20,7 @@ import type { ByConditionsModel } from '../../services/sheets-filter-panel.servi
import { LocaleService } from '@univerjs/core';
import { borderClassName, clsx, Input, Radio, RadioGroup, Select } from '@univerjs/design';
import { useDependency, useObservable } from '@univerjs/ui';
-
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
import { FilterConditionItems } from '../../models/conditions';
/**
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
index 118ee0bcb8..00595dd3bd 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterByValuesPanel.tsx
@@ -18,7 +18,7 @@ import type { ByValuesModel, IFilterByValueWithTreeItem } from '../../services/s
import { LocaleService } from '@univerjs/core';
import { borderClassName, Checkbox, clsx, Input, Tree } from '@univerjs/design';
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { statisticFilterByValueItems } from '../../models/utils';
/**
diff --git a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx
index 13dcbdea23..301fcf2434 100644
--- a/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx
+++ b/packages/sheets-filter-ui/src/views/components/SheetsFilterPanel.stories.tsx
@@ -22,7 +22,7 @@ import { RefRangeService, SheetInterceptorService, SheetsSelectionsService, Work
import { ClearSheetsFilterCriteriaCommand, ReCalcSheetsFilterCommand, SetSheetsFilterCriteriaCommand, SmartToggleSheetsFilterCommand, UniverSheetsFilterPlugin } from '@univerjs/sheets-filter';
import { SetCellEditVisibleOperation } from '@univerjs/sheets-ui';
import { IShortcutService, IUIPartsService, RediContext, ShortcutService, UIPartsService } from '@univerjs/ui';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { WithCustomFilterModelFactory, WithValuesFilterModelFactory } from '../../__testing__/data';
import { ChangeFilterByOperation, CloseFilterPanelOperation, OpenFilterPanelOperation } from '../../commands/operations/sheets-filter.operation';
import enUS from '../../locale/en-US';
diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json
index d4c2e413b8..913e8006bd 100644
--- a/packages/sheets-formula-ui/package.json
+++ b/packages/sheets-formula-ui/package.json
@@ -84,7 +84,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-formula-ui/src/controllers/menu.ts b/packages/sheets-formula-ui/src/controllers/menu.ts
index 8a5551701c..1a678c1a87 100644
--- a/packages/sheets-formula-ui/src/controllers/menu.ts
+++ b/packages/sheets-formula-ui/src/controllers/menu.ts
@@ -29,7 +29,7 @@ import { MoreFunctionsOperation } from '../commands/operations/more-functions.op
export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
return {
id: InsertFunctionOperation.id,
- icon: 'FunctionSingle',
+ icon: 'FunctionIcon',
tooltip: 'formula.insert.tooltip',
type: MenuItemType.SELECTOR,
selections: [
@@ -39,7 +39,7 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
selectable: false,
},
value: 'SUM',
- icon: 'SumSingle',
+ icon: 'SumIcon',
},
{
label: {
@@ -47,7 +47,7 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
selectable: false,
},
value: 'AVERAGE',
- icon: 'AvgSingle',
+ icon: 'AvgIcon',
},
{
label: {
@@ -55,7 +55,7 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
selectable: false,
},
value: 'COUNT',
- icon: 'CntSingle',
+ icon: 'CntIcon',
},
{
label: {
@@ -63,7 +63,7 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
selectable: false,
},
value: 'MAX',
- icon: 'MaxSingle',
+ icon: 'MaxIcon',
},
{
label: {
@@ -71,7 +71,7 @@ export function InsertFunctionMenuItemFactory(accessor: IAccessor): IMenuItem {
selectable: false,
},
value: 'MIN',
- icon: 'MinSingle',
+ icon: 'MinIcon',
},
],
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
@@ -84,7 +84,7 @@ export function InsertSUMFunctionMenuItemFactory(accessor: IAccessor): IMenuItem
return {
id: InsertFunctionOperation.id,
title: 'SUM',
- icon: 'SumSingle',
+ icon: 'SumIcon',
type: MenuItemType.BUTTON,
params: {
value: 'SUM',
@@ -103,7 +103,7 @@ export function InsertCOUNTFunctionMenuItemFactory(accessor: IAccessor): IMenuIt
return {
id: InsertFunctionOperation.id,
title: 'COUNT',
- icon: 'CntSingle',
+ icon: 'CntIcon',
type: MenuItemType.BUTTON,
params: {
value: 'COUNT',
@@ -122,7 +122,7 @@ export function InsertAVERAGEFunctionMenuItemFactory(accessor: IAccessor): IMenu
return {
id: InsertFunctionOperation.id,
title: 'AVERAGE',
- icon: 'AvgSingle',
+ icon: 'AvgIcon',
type: MenuItemType.BUTTON,
params: {
value: 'AVERAGE',
@@ -141,7 +141,7 @@ export function InsertMAXFunctionMenuItemFactory(accessor: IAccessor): IMenuItem
return {
id: InsertFunctionOperation.id,
title: 'MAX',
- icon: 'MaxSingle',
+ icon: 'MaxIcon',
type: MenuItemType.BUTTON,
params: {
value: 'MAX',
@@ -160,7 +160,7 @@ export function InsertMINFunctionMenuItemFactory(accessor: IAccessor): IMenuItem
return {
id: InsertFunctionOperation.id,
title: 'MIN',
- icon: 'MinSingle',
+ icon: 'MinIcon',
type: MenuItemType.BUTTON,
params: {
value: 'MIN',
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx b/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
index 43f24e14d6..4b2424c4f8 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/help-function/HelpFunction.tsx
@@ -18,7 +18,7 @@ import type { Editor } from '@univerjs/docs-ui';
import type { IFunctionParam } from '@univerjs/engine-formula';
import { LocaleService } from '@univerjs/core';
import { borderClassName, borderTopClassName, clsx } from '@univerjs/design';
-import { CloseSingle, MoreSingle } from '@univerjs/icons';
+import { CloseIcon, MoreIcon } from '@univerjs/icons';
import { IEditorBridgeService } from '@univerjs/sheets-ui';
import { RectPopup, useDependency, useEvent, useObservable } from '@univerjs/ui';
import { useMemo, useState } from 'react';
@@ -158,7 +158,7 @@ export function HelpFunction(props: IHelpFunctionProps) {
style={{ transform: contentVisible ? 'rotateZ(-90deg)' : 'rotateZ(90deg)' }}
onClick={() => setContentVisible(!contentVisible)}
>
- <MoreSingle />
+ <MoreIcon />
</div>
<div
className={`
@@ -171,7 +171,7 @@ export function HelpFunction(props: IHelpFunctionProps) {
`}
onClick={onClose}
>
- <CloseSingle />
+ <CloseIcon />
</div>
</div>
</div>
diff --git a/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx b/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
index 4f938b8da8..93c6fde65a 100644
--- a/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-editor/search-function/SearchFunction.tsx
@@ -20,7 +20,7 @@ import { CommandType, DisposableCollection, ICommandService } from '@univerjs/co
import { borderClassName, clsx, scrollbarClassName } from '@univerjs/design';
import { DeviceInputEventType } from '@univerjs/engine-render';
import { IShortcutService, KeyCode, RectPopup, useDependency } from '@univerjs/ui';
-import React, { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
+import { forwardRef, useEffect, useMemo, useRef, useState } from 'react';
import { useEditorPosition } from '../hooks/use-editor-position';
import { useFormulaSearch } from '../hooks/use-formula-search';
import { useStateRef } from '../hooks/use-state-ref';
diff --git a/packages/sheets-formula-ui/src/views/formula-progress/FormulaProgress.tsx b/packages/sheets-formula-ui/src/views/formula-progress/FormulaProgress.tsx
index 1fa79229ef..f8fd128340 100644
--- a/packages/sheets-formula-ui/src/views/formula-progress/FormulaProgress.tsx
+++ b/packages/sheets-formula-ui/src/views/formula-progress/FormulaProgress.tsx
@@ -18,7 +18,7 @@ import { ICommandService } from '@univerjs/core';
import { SetFormulaCalculationStopMutation } from '@univerjs/engine-formula';
import { TriggerCalculationController } from '@univerjs/sheets-formula';
import { ProgressBar, useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
export function FormulaProgressBar() {
const triggerCalculationController = useDependency(TriggerCalculationController);
diff --git a/packages/sheets-formula-ui/src/views/more-functions/MoreFunctions.tsx b/packages/sheets-formula-ui/src/views/more-functions/MoreFunctions.tsx
index 2a01d793d9..d7a159ed8a 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/MoreFunctions.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/MoreFunctions.tsx
@@ -22,7 +22,7 @@ import { DeviceInputEventType } from '@univerjs/engine-render';
import { getSheetCommandTarget } from '@univerjs/sheets';
import { IEditorBridgeService, SetCellEditVisibleOperation, useActiveWorkbook } from '@univerjs/sheets-ui';
import { useDependency } from '@univerjs/ui';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { InputParams } from './input-params/InputParams';
import { SelectFunction } from './select-function/SelectFunction';
diff --git a/packages/sheets-formula-ui/src/views/more-functions/function-help/FunctionHelp.tsx b/packages/sheets-formula-ui/src/views/more-functions/function-help/FunctionHelp.tsx
index 21011a68ec..eecf48084c 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/function-help/FunctionHelp.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/function-help/FunctionHelp.tsx
@@ -15,7 +15,6 @@
*/
import type { IFunctionParam } from '@univerjs/engine-formula';
-import React from 'react';
import { generateParam } from '../../../services/utils';
interface IFunctionHelpProps {
diff --git a/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx b/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
index 652d1168b3..acf264a728 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/function-params/FunctionParams.tsx
@@ -14,16 +14,17 @@
* limitations under the License.
*/
-import React from 'react';
+import type { ReactElement } from 'react';
interface IParamsProps {
className?: string;
- title?: string | React.ReactElement;
- value?: string | React.ReactElement;
+ title?: string | ReactElement;
+ value?: string | ReactElement;
}
export function FunctionParams(props: IParamsProps) {
const { className, value, title } = props;
+
return (
<div className="univer-mb-2 univer-text-xs">
<div
diff --git a/packages/sheets-formula-ui/src/views/more-functions/input-params/InputParams.tsx b/packages/sheets-formula-ui/src/views/more-functions/input-params/InputParams.tsx
index 5fd2813d8b..f809d03f1b 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/input-params/InputParams.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/input-params/InputParams.tsx
@@ -16,8 +16,7 @@
import type { IFunctionInfo, IFunctionParam } from '@univerjs/engine-formula';
import { borderLeftClassName, clsx } from '@univerjs/design';
-
-import React, { useState } from 'react';
+import { useState } from 'react';
import { FunctionHelp } from '../function-help/FunctionHelp';
import { FunctionParams } from '../function-params/FunctionParams';
diff --git a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
index c50ad38765..d9ee5a59ed 100644
--- a/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
+++ b/packages/sheets-formula-ui/src/views/more-functions/select-function/SelectFunction.tsx
@@ -17,13 +17,14 @@
import type { IFunctionInfo, IFunctionParam } from '@univerjs/engine-formula';
import type { ISearchItem } from '@univerjs/sheets-formula';
import type { ISidebarMethodOptions } from '@univerjs/ui';
+import type { KeyboardEvent } from 'react';
import { LocaleService } from '@univerjs/core';
import { borderClassName, clsx, Input, Select } from '@univerjs/design';
import { FunctionType } from '@univerjs/engine-formula';
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { IDescriptionService } from '@univerjs/sheets-formula';
import { ISidebarService, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { getFunctionTypeValues } from '../../../services/utils';
import { FunctionHelp } from '../function-help/FunctionHelp';
import { FunctionParams } from '../function-params/FunctionParams';
@@ -124,7 +125,7 @@ export function SelectFunction(props: ISelectFunctionProps) {
setSelectList(selectList);
}
- function handleSelectListKeyDown(e: React.KeyboardEvent<HTMLUListElement> | React.KeyboardEvent<HTMLInputElement>) {
+ function handleSelectListKeyDown(e: KeyboardEvent<HTMLUListElement> | KeyboardEvent<HTMLInputElement>) {
e.stopPropagation();
if (e.key === 'ArrowDown') {
const nextActive = active + 1;
@@ -184,7 +185,7 @@ export function SelectFunction(props: ISelectFunctionProps) {
onClick={() => setCurrentFunctionInfo(index)}
>
{nameSelected === index && (
- <CheckMarkSingle
+ <CheckMarkIcon
className={`
univer-absolute univer-left-1.5 univer-top-1/2 univer-inline-flex
-univer-translate-y-1/2 univer-text-base univer-text-primary-600
diff --git a/packages/sheets-formula-ui/src/views/range-selector/index.tsx b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
index e61fa1a040..aac848336f 100644
--- a/packages/sheets-formula-ui/src/views/range-selector/index.tsx
+++ b/packages/sheets-formula-ui/src/views/range-selector/index.tsx
@@ -21,7 +21,7 @@ import { ICommandService, LocaleService, RichTextBuilder } from '@univerjs/core'
import { Button, clsx, Dialog, Input, scrollbarClassName, Tooltip } from '@univerjs/design';
import { IEditorService, RichTextEditor } from '@univerjs/docs-ui';
import { deserializeRangeWithSheet, LexerTreeBuilder, matchToken, sequenceNodeType, serializeRange, serializeRangeWithSheet } from '@univerjs/engine-formula';
-import { DeleteSingle, IncreaseSingle, SelectRangeSingle } from '@univerjs/icons';
+import { DeleteIcon, IncreaseIcon, SelectRangeIcon } from '@univerjs/icons';
import { SetSelectionsOperation } from '@univerjs/sheets';
import { useDependency, useEvent } from '@univerjs/ui';
import { useEffect, useRef, useState } from 'react';
@@ -197,7 +197,7 @@ export function RangeSelectorDialog(props: IRangeSelectorDialogProps) {
onChange={(value) => handleRangeInput(index, value)}
/>
{ranges.length > 1 && (
- <DeleteSingle
+ <DeleteIcon
className="univer-cursor-pointer"
onClick={() => handleRangeRemove(index)}
/>
@@ -207,7 +207,7 @@ export function RangeSelectorDialog(props: IRangeSelectorDialogProps) {
{ranges.length < maxRangeCount && (
<div>
<Button variant="link" onClick={handleRangeAdd}>
- <IncreaseSingle />
+ <IncreaseIcon />
<span>{localeService.t('rangeSelector.addAnotherRange')}</span>
</Button>
</div>
@@ -330,7 +330,7 @@ export function RangeSelector(props: IRangeSelectorProps) {
}}
icon={(
<Tooltip title={localeService.t('rangeSelector.buttonTooltip')} placement="bottom">
- <SelectRangeSingle
+ <SelectRangeIcon
className={`
univer-cursor-pointer
dark:!univer-text-gray-300
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index d8005c7c20..8d597168b6 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -85,7 +85,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages/sheets-hyper-link-ui/src/controllers/menu.ts b/packages/sheets-hyper-link-ui/src/controllers/menu.ts
index 966d766a30..7b833d32f7 100644
--- a/packages/sheets-hyper-link-ui/src/controllers/menu.ts
+++ b/packages/sheets-hyper-link-ui/src/controllers/menu.ts
@@ -104,7 +104,7 @@ const linkMenu = {
commandId: InsertHyperLinkOperation.id,
type: MenuItemType.BUTTON,
title: 'hyperLink.menu.add',
- icon: 'LinkSingle',
+ icon: 'LinkIcon',
};
export const genZenEditorMenuId = (id: string) => `${id}-zen-editor`;
@@ -132,7 +132,7 @@ const linkToolbarMenu = {
tooltip: 'hyperLink.form.addTitle',
commandId: InsertHyperLinkToolbarOperation.id,
type: MenuItemType.BUTTON,
- icon: 'LinkSingle',
+ icon: 'LinkIcon',
};
export const insertLinkMenuToolbarFactory = (accessor: IAccessor) => {
diff --git a/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts b/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts
index f4a14afde3..5f21e3c722 100644
--- a/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts
+++ b/packages/sheets-hyper-link-ui/src/controllers/ui.controller.ts
@@ -15,7 +15,7 @@
*/
import { Disposable, ICommandService, Inject, Injector } from '@univerjs/core';
-import { LinkSingle } from '@univerjs/icons';
+import { LinkIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService, IShortcutService } from '@univerjs/ui';
import { CloseHyperLinkPopupOperation, InsertHyperLinkOperation, InsertHyperLinkToolbarOperation, OpenHyperLinkEditPanelOperation } from '../commands/operations/popup.operations';
import { CellLinkEdit } from '../views/CellLinkEdit';
@@ -41,10 +41,10 @@ export class SheetsHyperLinkUIController extends Disposable {
private _initComponents() {
([
- [CellLinkPopup, CellLinkPopup.componentKey],
- [CellLinkEdit, CellLinkEdit.componentKey],
- [LinkSingle, 'LinkSingle'],
- ] as const).forEach(([comp, key]) => {
+ [CellLinkPopup.componentKey, CellLinkPopup],
+ [CellLinkEdit.componentKey, CellLinkEdit],
+ ['LinkIcon', LinkIcon],
+ ] as const).forEach(([key, comp]) => {
this._componentManager.register(key, comp);
});
}
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 0901c2d061..19a3cc0aca 100644
--- a/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
+++ b/packages/sheets-hyper-link-ui/src/views/CellLinkPopup/index.tsx
@@ -18,7 +18,7 @@ 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 { borderClassName, clsx, MessageType, Tooltip } from '@univerjs/design';
-import { AllBorderSingle, CopySingle, LinkSingle, UnlinkSingle, WriteSingle, Xlsx } from '@univerjs/icons';
+import { AllBorderIcon, CopyIcon, LinkIcon, UnlinkIcon, WriteIcon, XlsxMultiIcon } 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';
@@ -29,11 +29,11 @@ import { SheetsHyperLinkResolverService } from '../../services/resolver.service'
import { HyperLinkEditSourceType } from '../../types/enums/edit-source';
const iconsMap = {
- [SheetHyperLinkType.URL]: <LinkSingle />,
- [SheetHyperLinkType.SHEET]: <Xlsx className="univer-text-green-500" />,
- [SheetHyperLinkType.RANGE]: <AllBorderSingle />,
- [SheetHyperLinkType.DEFINE_NAME]: <AllBorderSingle />,
- [SheetHyperLinkType.INVALID]: <AllBorderSingle />,
+ [SheetHyperLinkType.URL]: <LinkIcon />,
+ [SheetHyperLinkType.SHEET]: <XlsxMultiIcon className="univer-text-green-500" />,
+ [SheetHyperLinkType.RANGE]: <AllBorderIcon />,
+ [SheetHyperLinkType.DEFINE_NAME]: <AllBorderIcon />,
+ [SheetHyperLinkType.INVALID]: <AllBorderIcon />,
};
interface ICellLinkPopupPureProps {
@@ -134,7 +134,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.copy')}>
- <CopySingle className="dark:!univer-text-white" />
+ <CopyIcon className="dark:!univer-text-white" />
</Tooltip>
</div>
)}
@@ -159,7 +159,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.edit')}>
- <WriteSingle className="dark:!univer-text-white" />
+ <WriteIcon className="dark:!univer-text-white" />
</Tooltip>
</div>
<div
@@ -186,7 +186,7 @@ export const CellLinkPopupPure = (props: ICellLinkPopupPureProps) => {
}}
>
<Tooltip placement="bottom" title={localeService.t('hyperLink.popup.cancel')}>
- <UnlinkSingle className="dark:!univer-text-white" />
+ <UnlinkIcon className="dark:!univer-text-white" />
</Tooltip>
</div>
</>
diff --git a/packages/sheets-note-ui/package.json b/packages/sheets-note-ui/package.json
index 91c95b5f96..386ebb244e 100644
--- a/packages/sheets-note-ui/package.json
+++ b/packages/sheets-note-ui/package.json
@@ -66,7 +66,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-note": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-note-ui/src/controllers/note.menu.ts b/packages/sheets-note-ui/src/controllers/note.menu.ts
index e7dcdac2ec..84a518b765 100644
--- a/packages/sheets-note-ui/src/controllers/note.menu.ts
+++ b/packages/sheets-note-ui/src/controllers/note.menu.ts
@@ -46,7 +46,7 @@ export function sheetNoteContextMenuFactory(accessor: IAccessor): IMenuItem {
id: AddNotePopupOperation.id,
type: MenuItemType.BUTTON,
title: 'rightClick.addNote',
- icon: 'AddNoteSingle',
+ icon: 'AddNoteIcon',
hidden$: combineLatest([getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET), getHasNote$(accessor)])
.pipe(map(([hidden, hasNote]) => hidden || hasNote)),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission] }),
@@ -59,7 +59,7 @@ export function sheetDeleteNoteMenuFactory(accessor: IAccessor): IMenuItem {
id: SheetDeleteNoteCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.deleteNote',
- icon: 'DeleteNoteSingle',
+ icon: 'DeleteNoteIcon',
hidden$: getHasNote$(accessor).pipe(map((hasNote) => !hasNote)),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission] }),
};
@@ -69,7 +69,7 @@ export function sheetNoteToggleMenuFactory(accessor: IAccessor): IMenuItem {
id: SheetToggleNotePopupCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.toggleNote',
- icon: 'HideNoteSingle',
+ icon: 'HideNoteIcon',
hidden$: getHasNote$(accessor).pipe(map((hasNote) => !hasNote)),
};
}
diff --git a/packages/sheets-note-ui/src/controllers/sheets-note-ui.controller.ts b/packages/sheets-note-ui/src/controllers/sheets-note-ui.controller.ts
index 9abfe25b40..399517b671 100644
--- a/packages/sheets-note-ui/src/controllers/sheets-note-ui.controller.ts
+++ b/packages/sheets-note-ui/src/controllers/sheets-note-ui.controller.ts
@@ -15,7 +15,7 @@
*/
import { Disposable, ICommandService, Inject } from '@univerjs/core';
-import { AddNoteSingle, DeleteNoteSingle, HideNoteSingle } from '@univerjs/icons';
+import { AddNoteIcon, DeleteNoteIcon, HideNoteIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
import { AddNotePopupOperation } from '../commands/operations/add-note-popup.operation';
import { SHEET_NOTE_COMPONENT } from '../views/config';
@@ -38,12 +38,12 @@ export class SheetsNoteUIController extends Disposable {
private _initComponents() {
([
[SHEET_NOTE_COMPONENT, SheetsNote],
- ['AddNoteSingle', AddNoteSingle],
- ['DeleteNoteSingle', DeleteNoteSingle],
- ['HideNoteSingle', HideNoteSingle],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ ['AddNoteIcon', AddNoteIcon],
+ ['DeleteNoteIcon', DeleteNoteIcon],
+ ['HideNoteIcon', HideNoteIcon],
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(key, comp)
);
});
}
diff --git a/packages/sheets-numfmt-ui/package.json b/packages/sheets-numfmt-ui/package.json
index 599dc635f0..fc9819e6af 100644
--- a/packages/sheets-numfmt-ui/package.json
+++ b/packages/sheets-numfmt-ui/package.json
@@ -72,7 +72,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-numfmt": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-numfmt-ui/src/controllers/menu.ts b/packages/sheets-numfmt-ui/src/controllers/menu.ts
index 105e6c2f75..54cf9e4dc6 100644
--- a/packages/sheets-numfmt-ui/src/controllers/menu.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/menu.ts
@@ -103,17 +103,17 @@ export const CurrencyMenuItem = (accessor: IAccessor) => {
const menuCurrencyService = accessor.get(MenuCurrencyService);
function getIconKey(symbol: string) {
const iconMap: Record<string, string> = {
- [countryCurrencyMap.US]: 'DollarSingle',
- [countryCurrencyMap.RU]: 'RoubleSingle',
- [countryCurrencyMap.CN]: 'RmbSingle',
- [countryCurrencyMap.AT]: 'EuroSingle',
+ [countryCurrencyMap.US]: 'DollarIcon',
+ [countryCurrencyMap.RU]: 'RoubleIcon',
+ [countryCurrencyMap.CN]: 'RmbIcon',
+ [countryCurrencyMap.AT]: 'EuroIcon',
};
- return iconMap[symbol] || 'DollarSingle';
+ return iconMap[symbol] ?? 'DollarIcon';
}
- const symbol = countryCurrencyMap[menuCurrencyService.getCurrencySymbol()] || '$';
+ const symbol = countryCurrencyMap[menuCurrencyService.getCurrencySymbol()] ?? '$';
subscribe.next(getIconKey(symbol));
return menuCurrencyService.currencySymbol$.subscribe((code) => {
- const symbol = countryCurrencyMap[code] || '$';
+ const symbol = countryCurrencyMap[code] ?? '$';
subscribe.next(getIconKey(symbol));
});
}),
@@ -129,7 +129,7 @@ export const CurrencyMenuItem = (accessor: IAccessor) => {
export const AddDecimalMenuItem = (accessor: IAccessor) => {
return {
- icon: 'AddDigitsSingle',
+ icon: 'AddDigitsIcon',
id: AddDecimalCommand.id,
title: 'sheet.numfmt.addDecimal',
tooltip: 'sheet.numfmt.addDecimal',
@@ -141,7 +141,7 @@ export const AddDecimalMenuItem = (accessor: IAccessor) => {
export const SubtractDecimalMenuItem = (accessor: IAccessor) => {
return {
- icon: 'ReduceDigitsSingle',
+ icon: 'ReduceDigitsIcon',
id: SubtractDecimalCommand.id,
title: 'sheet.numfmt.subtractDecimal',
tooltip: 'sheet.numfmt.subtractDecimal',
@@ -153,7 +153,7 @@ export const SubtractDecimalMenuItem = (accessor: IAccessor) => {
export const PercentMenuItem = (accessor: IAccessor) => {
return {
- icon: 'PercentSingle',
+ icon: 'PercentIcon',
id: SetPercentCommand.id,
title: 'sheet.numfmt.percent',
tooltip: 'sheet.numfmt.percent',
diff --git a/packages/sheets-numfmt-ui/src/controllers/numfmt.menu.controller.ts b/packages/sheets-numfmt-ui/src/controllers/numfmt.menu.controller.ts
index 74bf707974..d59dbbc829 100644
--- a/packages/sheets-numfmt-ui/src/controllers/numfmt.menu.controller.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/numfmt.menu.controller.ts
@@ -16,7 +16,6 @@
import { Disposable, Inject } from '@univerjs/core';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
-
import { MORE_NUMFMT_TYPE_KEY, MoreNumfmtType, Options, OPTIONS_KEY } from '../views/components/MoreNumfmtType';
import { menuSchema } from './menu.schema';
@@ -36,9 +35,9 @@ export class NumfmtMenuController extends Disposable {
([
[MORE_NUMFMT_TYPE_KEY, MoreNumfmtType],
[OPTIONS_KEY, Options],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(key, comp)
);
});
}
diff --git a/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx b/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
index 338c2e71e1..201c14432a 100644
--- a/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/CustomFormat.tsx
@@ -17,10 +17,10 @@
import type { IBusinessComponentProps } from './interface';
import { ILocalStorageService, LocaleService } from '@univerjs/core';
import { borderClassName, clsx, Input } from '@univerjs/design';
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { CURRENCYFORMAT, DATEFMTLISG, NUMBERFORMAT } from '@univerjs/sheets-numfmt';
import { useDependency } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { UserHabitController } from '../../controllers/user-habit.controller';
const key = 'customFormat';
@@ -91,7 +91,7 @@ export function CustomFormat(props: IBusinessComponentProps) {
`}
>
<div className="univer-flex univer-w-4 univer-items-center univer-text-primary-600">
- {pattern === p && <CheckMarkSingle />}
+ {pattern === p && <CheckMarkIcon />}
</div>
<div>
{p}
diff --git a/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx b/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
index 971ed05782..b0bd938fe3 100644
--- a/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/ThousandthPercentile.tsx
@@ -14,18 +14,17 @@
* limitations under the License.
*/
-import type { FC } from 'react';
import type { IBusinessComponentProps } from './interface';
import { LocaleService } from '@univerjs/core';
import { InputNumber, SelectList } from '@univerjs/design';
import { getDecimalFromPattern, getNumberFormatOptions, isPatternEqualWithoutDecimal, isPatternHasDecimal, setPatternDecimal } from '@univerjs/sheets-numfmt';
import { useDependency } from '@univerjs/ui';
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
export const isThousandthPercentilePanel = (pattern: string) =>
getNumberFormatOptions().some((item) => isPatternEqualWithoutDecimal(item.value, pattern));
-export const ThousandthPercentilePanel: FC<IBusinessComponentProps> = (props) => {
+export function ThousandthPercentilePanel(props: IBusinessComponentProps) {
const localeService = useDependency(LocaleService);
const options = useMemo(getNumberFormatOptions, []);
diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json
index 015db91505..d48c797eca 100644
--- a/packages/sheets-sort-ui/package.json
+++ b/packages/sheets-sort-ui/package.json
@@ -69,7 +69,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-sort": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts b/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts
index f35f28dc98..b788e393a3 100644
--- a/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts
+++ b/packages/sheets-sort-ui/src/controllers/sheets-sort-ui.controller.ts
@@ -15,16 +15,26 @@
*/
import type { UIPartsService } from '@univerjs/ui';
-
import type { ISheetSortLocation } from '../services/sheets-sort-ui.service';
import { ICommandService, Inject, Injector, LocaleService, RxDisposable } from '@univerjs/core';
import { serializeRange } from '@univerjs/engine-formula';
-import { AscendingSingle, CustomSortSingle, DescendingSingle, ExpandAscendingSingle, ExpandDescendingSingle } from '@univerjs/icons';
+import { AscendingIcon, CustomSortIcon, DescendingIcon, ExpandAscendingIcon, ExpandDescendingIcon } from '@univerjs/icons';
import { SortRangeCommand } from '@univerjs/sheets-sort';
import { SheetsRenderService, SheetsUIPart } from '@univerjs/sheets-ui';
import { ComponentManager, connectInjector, IDialogService, ILayoutService, IMenuManagerService, IUIPartsService } from '@univerjs/ui';
import { takeUntil } from 'rxjs';
-import { SortRangeAscCommand, SortRangeAscExtCommand, SortRangeAscExtInCtxMenuCommand, SortRangeAscInCtxMenuCommand, SortRangeCustomCommand, SortRangeCustomInCtxMenuCommand, SortRangeDescCommand, SortRangeDescExtCommand, SortRangeDescExtInCtxMenuCommand, SortRangeDescInCtxMenuCommand } from '../commands/commands/sheets-sort.command';
+import {
+ SortRangeAscCommand,
+ SortRangeAscExtCommand,
+ SortRangeAscExtInCtxMenuCommand,
+ SortRangeAscInCtxMenuCommand,
+ SortRangeCustomCommand,
+ SortRangeCustomInCtxMenuCommand,
+ SortRangeDescCommand,
+ SortRangeDescExtCommand,
+ SortRangeDescExtInCtxMenuCommand,
+ SortRangeDescInCtxMenuCommand,
+} from '../commands/commands/sheets-sort.command';
import { SheetsSortUIService } from '../services/sheets-sort-ui.service';
import { CustomSortPanel } from '../views/CustomSortPanel';
import EmbedSortBtn from '../views/EmbedSortBtn';
@@ -82,14 +92,14 @@ export class SheetsSortUIController extends RxDisposable {
([
['CustomSortPanel', CustomSortPanel],
- [SHEETS_SORT_ASC_ICON, AscendingSingle],
- [SHEETS_SORT_ASC_EXT_ICON, ExpandAscendingSingle],
- [SHEETS_SORT_DESC_ICON, DescendingSingle],
- [SHEETS_SORT_DESC_EXT_ICON, ExpandDescendingSingle],
- [SHEETS_SORT_CUSTOM_ICON, CustomSortSingle],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ [SHEETS_SORT_ASC_ICON, AscendingIcon],
+ [SHEETS_SORT_ASC_EXT_ICON, ExpandAscendingIcon],
+ [SHEETS_SORT_DESC_ICON, DescendingIcon],
+ [SHEETS_SORT_DESC_EXT_ICON, ExpandDescendingIcon],
+ [SHEETS_SORT_CUSTOM_ICON, CustomSortIcon],
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(key, comp)
);
});
diff --git a/packages/sheets-sort-ui/src/controllers/sheets-sort.menu.ts b/packages/sheets-sort-ui/src/controllers/sheets-sort.menu.ts
index 89cdfd9e97..7733290a3e 100644
--- a/packages/sheets-sort-ui/src/controllers/sheets-sort.menu.ts
+++ b/packages/sheets-sort-ui/src/controllers/sheets-sort.menu.ts
@@ -25,11 +25,11 @@ import { SortRangeAscCommand, SortRangeAscExtCommand, SortRangeAscExtInCtxMenuCo
export const SHEETS_SORT_MENU_ID = 'sheet.menu.sheets-sort';
export const SHEETS_SORT_CTX_MENU_ID = 'sheet.menu.sheets-sort-ctx';
-export const SHEETS_SORT_ASC_ICON = 'AscendingSingle';
-export const SHEETS_SORT_ASC_EXT_ICON = 'ExpandAscendingSingle';
-export const SHEETS_SORT_DESC_ICON = 'DescendingSingle';
-export const SHEETS_SORT_DESC_EXT_ICON = 'ExpandDescendingSingle';
-export const SHEETS_SORT_CUSTOM_ICON = 'CustomSortSingle';
+export const SHEETS_SORT_ASC_ICON = 'AscendingIcon';
+export const SHEETS_SORT_ASC_EXT_ICON = 'ExpandAscendingIcon';
+export const SHEETS_SORT_DESC_ICON = 'DescendingIcon';
+export const SHEETS_SORT_DESC_EXT_ICON = 'ExpandDescendingIcon';
+export const SHEETS_SORT_CUSTOM_ICON = 'CustomSortIcon';
export function sortRangeMenuFactory(accessor: IAccessor): IMenuItem {
return {
diff --git a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
index d14f162757..1a019fb53e 100644
--- a/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
+++ b/packages/sheets-sort-ui/src/views/CustomSortPanel.tsx
@@ -19,7 +19,7 @@ import type { IOrderRule } from '@univerjs/sheets-sort';
import type { ICustomSortState } from '../services/sheets-sort-ui.service';
import { LocaleService, LocaleType, throttle } from '@univerjs/core';
import { Button, Checkbox, DraggableList, Dropdown, Radio, RadioGroup } from '@univerjs/design';
-import { CheckMarkSingle, DeleteEmptySingle, IncreaseSingle, MoreDownSingle, SequenceSingle } from '@univerjs/icons';
+import { CheckMarkIcon, DeleteEmptyIcon, IncreaseIcon, MoreDownIcon, SequenceIcon } from '@univerjs/icons';
import { SheetsSortService, SortType } from '@univerjs/sheets-sort';
import { useDependency, useObservable } from '@univerjs/ui';
import { useCallback, useEffect, useRef, useState } from 'react';
@@ -125,7 +125,7 @@ function CustomSortPanelImpl({ state }: { state: ICustomSortState }) {
`}
onClick={newItem}
>
- <IncreaseSingle />
+ <IncreaseIcon />
<span className="univer-ml-1.5">{localeService.t('sheets-sort.dialog.add-condition')}</span>
</div>
)
@@ -138,7 +138,7 @@ function CustomSortPanelImpl({ state }: { state: ICustomSortState }) {
disabled:univer-text-gray-800
`}
>
- <IncreaseSingle />
+ <IncreaseIcon />
<span className="univer-ml-1.5 univer-text-xs">{localeService.t('sheets-sort.dialog.add-condition')}</span>
</div>
)}
@@ -234,7 +234,7 @@ export function SortOptionItem(props: ISortOptionItemProps) {
univer-text-gray-700
`}
>
- <SequenceSingle />
+ <SequenceIcon />
</div>
<div>
{/* TODO@wzhudev: change it to the Select component later. */}
@@ -267,7 +267,7 @@ export function SortOptionItem(props: ISortOptionItemProps) {
</span>
<span>
{menuItem.index === item.colIndex && (
- <CheckMarkSingle />
+ <CheckMarkIcon />
)}
</span>
</li>
@@ -290,7 +290,7 @@ export function SortOptionItem(props: ISortOptionItemProps) {
>
{itemLabel}
</span>
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</Dropdown>
</div>
@@ -308,7 +308,7 @@ export function SortOptionItem(props: ISortOptionItemProps) {
</RadioGroup>
</div>
<div className="univer-absolute univer-right-0 univer-cursor-pointer univer-text-sm univer-s-[14px]">
- {showDelete && <DeleteEmptySingle onClick={() => onChange(null, currentIndex)} />}
+ {showDelete && <DeleteEmptyIcon onClick={() => onChange(null, currentIndex)} />}
</div>
</div>
);
diff --git a/packages/sheets-sort-ui/src/views/EmbedSortBtn.tsx b/packages/sheets-sort-ui/src/views/EmbedSortBtn.tsx
index cb9e078f27..3ef5c18b87 100644
--- a/packages/sheets-sort-ui/src/views/EmbedSortBtn.tsx
+++ b/packages/sheets-sort-ui/src/views/EmbedSortBtn.tsx
@@ -17,10 +17,10 @@
import type { IRange } from '@univerjs/core';
import { IUniverInstanceService, LocaleService } from '@univerjs/core';
import { Button, ButtonGroup } from '@univerjs/design';
-import { AscendingSingle, DescendingSingle } from '@univerjs/icons';
+import { AscendingIcon, DescendingIcon } from '@univerjs/icons';
import { getSheetCommandTarget } from '@univerjs/sheets';
import { useDependency } from '@univerjs/ui';
-import React, { useCallback } from 'react';
+import { useCallback } from 'react';
import { SheetsSortUIService } from '../services/sheets-sort-ui.service';
export interface IEmbedSortBtnProps {
@@ -53,11 +53,11 @@ export default function EmbedSortBtn(props: IEmbedSortBtnProps) {
className="univer-mb-3 univer-grid univer-w-full univer-grid-flow-col univer-grid-cols-2 univer-gap-2"
>
<Button onClick={() => apply(true)}>
- <AscendingSingle />
+ <AscendingIcon />
{localeService.t('sheets-sort.general.sort-asc')}
</Button>
<Button onClick={() => apply(false)}>
- <DescendingSingle />
+ <DescendingIcon />
{localeService.t('sheets-sort.general.sort-desc')}
</Button>
</ButtonGroup>
diff --git a/packages/sheets-sort-ui/src/views/sheets-sort-ui.stories.tsx b/packages/sheets-sort-ui/src/views/sheets-sort-ui.stories.tsx
index 49bba44b83..063dc3521e 100644
--- a/packages/sheets-sort-ui/src/views/sheets-sort-ui.stories.tsx
+++ b/packages/sheets-sort-ui/src/views/sheets-sort-ui.stories.tsx
@@ -45,7 +45,7 @@ import {
TestConfirmService,
UIPartsService,
} from '@univerjs/ui';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { SortRangeCustomCommand } from '../commands/commands/sheets-sort.command';
import enUS from '../locale/en-US';
import { SheetsSortUIService } from '../services/sheets-sort-ui.service';
diff --git a/packages/sheets-table-ui/package.json b/packages/sheets-table-ui/package.json
index e30b49c27d..2ccc293636 100644
--- a/packages/sheets-table-ui/package.json
+++ b/packages/sheets-table-ui/package.json
@@ -75,7 +75,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-sort": "workspace:*",
diff --git a/packages/sheets-table-ui/src/controllers/sheet-table-component.controller.ts b/packages/sheets-table-ui/src/controllers/sheet-table-component.controller.ts
index 6aef159011..9ba8a73a40 100644
--- a/packages/sheets-table-ui/src/controllers/sheet-table-component.controller.ts
+++ b/packages/sheets-table-ui/src/controllers/sheet-table-component.controller.ts
@@ -60,8 +60,8 @@ export class SheetsTableComponentController extends Disposable {
private _initComponents() {
([
[SHEETS_TABLE_FILTER_PANEL_OPENED_KEY, SheetTableFilterPanel],
- ] as const).forEach(([key, component]) => {
- this.disposeWithMe(this._componentManager.register(key, component));
+ ] as const).forEach(([key, comp]) => {
+ this.disposeWithMe(this._componentManager.register(key, comp));
});
}
diff --git a/packages/sheets-table-ui/src/controllers/sheet-table-menu.controller.ts b/packages/sheets-table-ui/src/controllers/sheet-table-menu.controller.ts
index 98f1b8ac00..d1605e71d5 100644
--- a/packages/sheets-table-ui/src/controllers/sheet-table-menu.controller.ts
+++ b/packages/sheets-table-ui/src/controllers/sheet-table-menu.controller.ts
@@ -15,7 +15,7 @@
*/
import { Disposable, Inject } from '@univerjs/core';
-import { TableSingle } from '@univerjs/icons';
+import { TableIcon } from '@univerjs/icons';
import { ComponentManager, IMenuManagerService } from '@univerjs/ui';
import { SHEET_TABLE_THEME_PANEL, TABLE_SELECTOR_DIALOG, TABLE_TOOLBAR_BUTTON } from '../const';
import { SheetTableSelector } from '../views/components/SheetTableSelector';
@@ -34,11 +34,11 @@ export class SheetTableMenuController extends Disposable {
private _initComponents() {
([
- [TABLE_TOOLBAR_BUTTON, TableSingle],
+ [TABLE_TOOLBAR_BUTTON, TableIcon],
[TABLE_SELECTOR_DIALOG, SheetTableSelector],
[SHEET_TABLE_THEME_PANEL, SheetTableThemePanel],
- ] as const).forEach(([key, component]) => {
- this.disposeWithMe(this._componentManager.register(key, component));
+ ] as const).forEach(([key, comp]) => {
+ this.disposeWithMe(this._componentManager.register(key, comp));
});
}
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableAnchor.tsx b/packages/sheets-table-ui/src/views/components/SheetTableAnchor.tsx
index b9fce3b393..1836ff04bc 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableAnchor.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableAnchor.tsx
@@ -17,7 +17,7 @@
import type { IUniverSheetsTableUIConfig } from '../../controllers/config.schema';
import { cellToRange, ICommandService, IConfigService, Injector, IUniverInstanceService, LocaleService, Rectangle } from '@univerjs/core';
import { borderClassName, clsx, Dropdown, Input } from '@univerjs/design';
-import { DeleteSingle, GridOutlineSingle, MoreDownSingle, PaintBucket, RenameSingle } from '@univerjs/icons';
+import { DeleteIcon, GridOutlineIcon, MoreDownIcon, PaintBucketDoubleIcon, RenameIcon } from '@univerjs/icons';
import { getSheetCommandTarget, SheetRangeThemeModel, SheetsSelectionsService, WorkbookPermissionService } from '@univerjs/sheets';
import { DeleteSheetTableCommand, SetSheetTableCommand, TableManager } from '@univerjs/sheets-table';
import { ISidebarService, useDependency, useObservable } from '@univerjs/ui';
@@ -189,7 +189,7 @@ export const SheetTableAnchor = () => {
setInputValue(item.tableName);
}}
>
- <RenameSingle />
+ <RenameIcon />
{localeService.t('sheets-table.rename')}
</div>
<div
@@ -205,7 +205,7 @@ export const SheetTableAnchor = () => {
hover:univer-bg-gray-200
`}
>
- <GridOutlineSingle />
+ <GridOutlineIcon />
{localeService.t('sheets-table.updateRange')}
</div>
<div
@@ -234,7 +234,7 @@ export const SheetTableAnchor = () => {
sidebarService.open(sidebarConfig);
}}
>
- <PaintBucket
+ <PaintBucketDoubleIcon
extend={{ colorChannel1: 'rgb(53,91,183)' }}
/>
{localeService.t('sheets-table.setTheme')}
@@ -259,7 +259,7 @@ export const SheetTableAnchor = () => {
});
}}
>
- <DeleteSingle className="univer-mr-2" />
+ <DeleteIcon className="univer-mr-2" />
{localeService.t('sheets-table.removeTable')}
</div>
</div>
@@ -269,7 +269,7 @@ export const SheetTableAnchor = () => {
updateOpenState(item.tableId, isOpen);
}}
>
- <MoreDownSingle />
+ <MoreDownIcon />
</Dropdown>
</div>
);
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx
index dc9831170a..aff101523c 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableConditionPanel.tsx
@@ -18,7 +18,7 @@ import type { ITableFilterItem } from '@univerjs/sheets-table';
import type { IConditionCompareTypeEnum, IConditionExpect, IConditionInfo, ITableConditionTypeEnumWithoutLogic } from './type';
import { dayjs, Injector, LocaleService } from '@univerjs/core';
import { borderClassName, CascaderList, clsx, DatePicker, DateRangePicker, Dropdown, Input, InputNumber, Select } from '@univerjs/design';
-import { MoreDownSingle } from '@univerjs/icons';
+import { MoreDownIcon } from '@univerjs/icons';
import { TableConditionTypeEnum, TableDateCompareTypeEnum, TableStringCompareTypeEnum } from '@univerjs/sheets-table';
import { useDependency } from '@univerjs/ui';
import { useState } from 'react';
@@ -119,7 +119,7 @@ export const SheetTableConditionPanel = (props: IConditionFilterProps) => {
{selectType}
</span>
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</Dropdown>
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
index 4b13a750ed..e720d65c2b 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableFilterPanel.tsx
@@ -19,7 +19,7 @@ import type { ITableConditionFilterItem, ITableManualFilterItem } from '@univerj
import type { IConditionInfo } from './type';
import { ICommandService, IPermissionService, LocaleService } from '@univerjs/core';
import { Button, ButtonGroup, Segmented } from '@univerjs/design';
-import { AscendingSingle, DescendingSingle } from '@univerjs/icons';
+import { AscendingIcon, DescendingIcon } from '@univerjs/icons';
import { WorkbookEditablePermission } from '@univerjs/sheets';
import { SortRangeCommand, SortType } from '@univerjs/sheets-sort';
import { SheetsTableSortStateEnum, TableColumnFilterTypeEnum, TableDateCompareTypeEnum, TableManager } from '@univerjs/sheets-table';
@@ -155,11 +155,11 @@ export function SheetTableFilterPanel() {
<div className="univer-mb-3 univer-flex">
<ButtonGroup className="univer-mb-3 univer-w-full">
<Button className="univer-w-1/2" onClick={() => applySort(true)}>
- <AscendingSingle className="univer-mr-1" />
+ <AscendingIcon className="univer-mr-1" />
{localeService.t('sheets-sort.general.sort-asc')}
</Button>
<Button className="univer-w-1/2" onClick={() => applySort(false)}>
- <DescendingSingle className="univer-mr-1" />
+ <DescendingIcon className="univer-mr-1" />
{localeService.t('sheets-sort.general.sort-desc')}
</Button>
</ButtonGroup>
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx
index aca3d39dd6..98a7009389 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableItemsFilterPanel.tsx
@@ -15,10 +15,11 @@
*/
import type { ITableFilterItem } from '@univerjs/sheets-table';
+import type { Dispatch, SetStateAction } from 'react';
import { LocaleService } from '@univerjs/core';
import { borderClassName, Checkbox, clsx, Input, scrollbarClassName } from '@univerjs/design';
import { useDependency } from '@univerjs/ui';
-import React, { useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
import { SheetsTableUiService } from '../../services/sheets-table-ui-service';
interface ISheetTableItemsFilterPanelProps {
@@ -28,7 +29,7 @@ interface ISheetTableItemsFilterPanelProps {
tableId: string;
columnIndex: number;
checkedItemSet: Set<string>;
- setCheckedItemSet: React.Dispatch<React.SetStateAction<Set<string>>>;
+ setCheckedItemSet: Dispatch<SetStateAction<Set<string>>>;
}
const getCheckedCount = (map: Map<string, number>) => {
diff --git a/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx b/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx
index a3d6544e01..42c074db36 100644
--- a/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx
+++ b/packages/sheets-table-ui/src/views/components/SheetTableThemePanel.tsx
@@ -18,7 +18,7 @@ import type { IRangeThemeStyleItem, ISetRangeThemeMutationParams } from '@univer
import type { IAddTableThemeCommandParams, ISetSheetTableCommandParams, ITableSetConfig } from '@univerjs/sheets-table';
import { ColorKit, ErrorService, ICommandService, LocaleService } from '@univerjs/core';
import { borderClassName, clsx, ColorPicker, Dropdown } from '@univerjs/design';
-import { DropdownSingle } from '@univerjs/icons';
+import { DropdownIcon } from '@univerjs/icons';
import { RangeThemeStyle, SetRangeThemeMutation, SheetRangeThemeModel } from '@univerjs/sheets';
import { AddTableThemeCommand, customEmptyThemeWithBorderStyle, processStyleWithBorderStyle, RemoveTableThemeCommand, SetSheetTableCommand, TableManager } from '@univerjs/sheets-table';
import { useDependency, useObservable } from '@univerjs/ui';
@@ -272,7 +272,7 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
background: headerBg,
}}
/>
- <DropdownSingle className="univer-h-2 univer-w-2" />
+ <DropdownIcon className="univer-h-2 univer-w-2" />
</div>
</Dropdown>
</div>
@@ -322,7 +322,7 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
className={clsx('univer-h-4 univer-w-4 univer-rounded-lg univer-bg-gray-400', borderClassName)}
style={{ background: firstRowBg }}
/>
- <DropdownSingle className="univer-h-2 univer-w-2" />
+ <DropdownIcon className="univer-h-2 univer-w-2" />
</div>
</Dropdown>
</div>
@@ -370,7 +370,7 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
className={clsx('univer-h-4 univer-w-4 univer-rounded-lg univer-bg-gray-400', borderClassName)}
style={{ background: secondRowBg }}
/>
- <DropdownSingle className="univer-h-2 univer-w-2" />
+ <DropdownIcon className="univer-h-2 univer-w-2" />
</div>
</Dropdown>
</div>
@@ -419,7 +419,7 @@ export const SheetTableThemePanel = (props: ISheetTableThemePanelProps) => {
className={clsx('univer-h-4 univer-w-4 univer-rounded-lg univer-bg-gray-400', borderClassName)}
style={{ background: lastRowBg }}
/>
- <DropdownSingle className="univer-h-2 univer-w-2" />
+ <DropdownIcon className="univer-h-2 univer-w-2" />
</div>
</Dropdown>
</div>
diff --git a/packages/sheets-table-ui/src/views/menu.ts b/packages/sheets-table-ui/src/views/menu.ts
index 73f5b29c2b..07b77b845d 100644
--- a/packages/sheets-table-ui/src/views/menu.ts
+++ b/packages/sheets-table-ui/src/views/menu.ts
@@ -20,11 +20,11 @@ import type { Observable } from 'rxjs';
import { IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { SheetsSelectionsService } from '@univerjs/sheets';
import { SheetsTableController, SheetTableInsertColCommand, SheetTableInsertRowCommand, SheetTableRemoveColCommand, SheetTableRemoveRowCommand } from '@univerjs/sheets-table';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
import { MenuItemType } from '@univerjs/ui';
import { of, switchMap } from 'rxjs';
import { OpenTableSelectorOperation } from '../commands/operations/open-table-selector.operation';
import { TABLE_TOOLBAR_BUTTON } from '../const';
-import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
export const SHEET_TABLE_CONTEXT_INSERT_MENU_ID = 'sheet.table.context-insert_menu-id';
export const SHEET_TABLE_CONTEXT_REMOVE_MENU_ID = 'sheet.table.context-remove_menu-id';
@@ -44,7 +44,7 @@ export function SheetTableInsertContextMenuFactory(accessor: IAccessor): IMenuSe
return {
id: SHEET_TABLE_CONTEXT_INSERT_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'Insert',
+ icon: 'InsertDoubleIcon',
title: 'sheets-table.insert.main',
hidden$: getSheetTableRowColOperationHidden$(accessor),
};
@@ -54,7 +54,7 @@ export function SheetTableRemoveContextMenuFactory(accessor: IAccessor): IMenuSe
return {
id: SHEET_TABLE_CONTEXT_REMOVE_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'Reduce',
+ icon: 'ReduceDoubleIcon',
title: 'sheets-table.remove.main',
hidden$: getSheetTableRowColOperationHidden$(accessor),
};
diff --git a/packages/sheets-thread-comment-ui/package.json b/packages/sheets-thread-comment-ui/package.json
index ca5005fbe6..9a46bea511 100644
--- a/packages/sheets-thread-comment-ui/package.json
+++ b/packages/sheets-thread-comment-ui/package.json
@@ -69,7 +69,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-thread-comment": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-thread-comment-ui/src/controllers/menu.ts b/packages/sheets-thread-comment-ui/src/controllers/menu.ts
index 88a3bd7f7c..bb47b86cc3 100644
--- a/packages/sheets-thread-comment-ui/src/controllers/menu.ts
+++ b/packages/sheets-thread-comment-ui/src/controllers/menu.ts
@@ -15,20 +15,19 @@
*/
import type { IAccessor } from '@univerjs/core';
-import type { IMenuItem, IShortcutItem } from '@univerjs/ui';
+import type { IShortcutItem } from '@univerjs/ui';
import { UniverInstanceType } from '@univerjs/core';
import { RangeProtectionPermissionViewPoint, WorkbookCommentPermission, WorksheetViewPermission } from '@univerjs/sheets';
import { getCurrentRangeDisable$, whenSheetEditorFocused } from '@univerjs/sheets-ui';
import { ToggleSheetCommentPanelOperation } from '@univerjs/thread-comment-ui';
import { getMenuHiddenObservable, KeyCode, MenuItemType, MetaKeys } from '@univerjs/ui';
import { ShowAddSheetCommentModalOperation } from '../commands/operations/comment.operation';
-import { COMMENT_SINGLE_ICON } from '../types/const';
export const threadCommentMenuFactory = (accessor: IAccessor) => {
return {
id: ShowAddSheetCommentModalOperation.id,
type: MenuItemType.BUTTON,
- icon: COMMENT_SINGLE_ICON,
+ icon: 'CommentIcon',
title: 'sheetThreadComment.menu.addComment',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
disabled$: getCurrentRangeDisable$(accessor, {
@@ -36,14 +35,14 @@ export const threadCommentMenuFactory = (accessor: IAccessor) => {
worksheetTypes: [WorksheetViewPermission],
rangeTypes: [RangeProtectionPermissionViewPoint],
}),
- } as IMenuItem;
+ };
};
export const threadPanelMenuFactory = (accessor: IAccessor) => {
return {
id: ToggleSheetCommentPanelOperation.id,
type: MenuItemType.BUTTON,
- icon: COMMENT_SINGLE_ICON,
+ icon: 'CommentIcon',
tooltip: 'sheetThreadComment.menu.commentManagement',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookCommentPermission],
@@ -51,7 +50,6 @@ export const threadPanelMenuFactory = (accessor: IAccessor) => {
rangeTypes: [RangeProtectionPermissionViewPoint],
}),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-
};
};
diff --git a/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts b/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts
index f3b85920eb..c998dbb9bf 100644
--- a/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts
+++ b/packages/sheets-thread-comment-ui/src/controllers/sheets-thread-comment.controller.ts
@@ -15,10 +15,10 @@
*/
import { Disposable, Inject } from '@univerjs/core';
-import { CommentSingle } from '@univerjs/icons';
+import { CommentIcon } from '@univerjs/icons';
import { THREAD_COMMENT_PANEL } from '@univerjs/thread-comment-ui';
import { ComponentManager, IMenuManagerService, IShortcutService } from '@univerjs/ui';
-import { COMMENT_SINGLE_ICON, SHEETS_THREAD_COMMENT_MODAL } from '../types/const';
+import { SHEETS_THREAD_COMMENT_MODAL } from '../types/const';
import { SheetsThreadCommentCell } from '../views/sheets-thread-comment-cell';
import { SheetsThreadCommentPanel } from '../views/sheets-thread-comment-panel';
import { AddCommentShortcut } from './menu';
@@ -48,7 +48,7 @@ export class SheetsThreadCommentController extends Disposable {
([
[SHEETS_THREAD_COMMENT_MODAL, SheetsThreadCommentCell],
[THREAD_COMMENT_PANEL, SheetsThreadCommentPanel],
- [COMMENT_SINGLE_ICON, CommentSingle],
+ ['CommentIcon', CommentIcon],
] as const).forEach(([key, comp]) => {
this.disposeWithMe(
this._componentManager.register(key, comp)
diff --git a/packages/sheets-thread-comment-ui/src/types/const.ts b/packages/sheets-thread-comment-ui/src/types/const.ts
index 9ceaef77f3..13a8fea55a 100644
--- a/packages/sheets-thread-comment-ui/src/types/const.ts
+++ b/packages/sheets-thread-comment-ui/src/types/const.ts
@@ -15,5 +15,4 @@
*/
export const SHEETS_THREAD_COMMENT_MODAL = 'univer.sheet.thread-comment-modal';
-export const COMMENT_SINGLE_ICON = 'comment-single';
export const SHEETS_THREAD_COMMENT = 'SHEET_THREAD_COMMENT';
diff --git a/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx b/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx
index 863e78d57e..6f3036cf6b 100644
--- a/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx
+++ b/packages/sheets-thread-comment-ui/src/views/sheets-thread-comment-panel/index.tsx
@@ -21,7 +21,7 @@ import { singleReferenceToGrid } from '@univerjs/engine-formula';
import { IMarkSelectionService } from '@univerjs/sheets-ui';
import { ThreadCommentPanel, ThreadCommentPanelService } from '@univerjs/thread-comment-ui';
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import { useCallback, useEffect, useMemo, useRef } from 'react';
import { map } from 'rxjs';
import { ShowAddSheetCommentModalOperation } from '../../commands/operations/comment.operation';
import { SheetsThreadCommentPopupService } from '../../services/sheets-thread-comment-popup.service';
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 521f8cabc7..bb72ed525f 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -86,7 +86,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-numfmt": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/protocol": "0.1.46",
"@univerjs/sheets": "workspace:*",
"@univerjs/telemetry": "workspace:*",
diff --git a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx b/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
index 4b0ccadad3..69ab714156 100644
--- a/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
+++ b/packages/sheets-ui/src/components/border-panel/BorderPanel.tsx
@@ -18,7 +18,7 @@ import type { IBorderInfo } from '@univerjs/sheets';
import type { IBorderPanelProps } from './interface';
import { BorderStyleTypes } from '@univerjs/core';
import { clsx, ColorPicker, Dropdown, Separator } from '@univerjs/design';
-import { MoreDownSingle, PaintBucket } from '@univerjs/icons';
+import { MoreDownIcon, PaintBucketDoubleIcon } from '@univerjs/icons';
import { BorderStyleManagerService } from '@univerjs/sheets';
import { ComponentManager, useDependency } from '@univerjs/ui';
import { BorderLine } from './border-line/BorderLine';
@@ -139,14 +139,14 @@ export function BorderPanel(props: IBorderPanelProps) {
`}
type="button"
>
- <PaintBucket
+ <PaintBucketDoubleIcon
className={`
univer-fill-primary-600
dark:!univer-text-white
`}
extend={{ colorChannel1: value?.color ?? '' }}
/>
- <MoreDownSingle className="dark:!univer-text-white" />
+ <MoreDownIcon className="dark:!univer-text-white" />
</button>
</Dropdown>
</div>
@@ -196,7 +196,7 @@ export function BorderPanel(props: IBorderPanelProps) {
`}
type={BorderStyleTypes.THIN}
/>
- <MoreDownSingle className="dark:!univer-text-white" />
+ <MoreDownIcon className="dark:!univer-text-white" />
</button>
</Dropdown>
</div>
diff --git a/packages/sheets-ui/src/components/border-panel/interface.ts b/packages/sheets-ui/src/components/border-panel/interface.ts
index 1f66c1d759..4656cd7432 100644
--- a/packages/sheets-ui/src/components/border-panel/interface.ts
+++ b/packages/sheets-ui/src/components/border-panel/interface.ts
@@ -25,78 +25,78 @@ export interface IBorderPanelProps extends ICustomComponentProps<IBorderInfo> {}
export const BORDER_LINE_CHILDREN = [
{
label: 'borderLine.borderTop',
- icon: 'UpBorder',
+ icon: 'UpBorderDoubleIcon',
value: 'top',
},
{
label: 'borderLine.borderBottom',
- icon: 'DownBorder',
+ icon: 'DownBorderDoubleIcon',
value: 'bottom',
},
{
label: 'borderLine.borderLeft',
- icon: 'LeftBorder',
+ icon: 'LeftBorderDoubleIcon',
value: 'left',
},
{
label: 'borderLine.borderRight',
- icon: 'RightBorder',
+ icon: 'RightBorderDoubleIcon',
value: 'right',
},
{
label: 'borderLine.borderNone',
- icon: 'NoBorderSingle',
+ icon: 'NoBorderIcon',
value: 'none',
},
{
label: 'borderLine.borderAll',
- icon: 'AllBorderSingle',
+ icon: 'AllBorderIcon',
value: 'all',
},
{
label: 'borderLine.borderOutside',
- icon: 'OuterBorder',
+ icon: 'OuterBorderDoubleIcon',
value: 'outside',
},
{
label: 'borderLine.borderInside',
- icon: 'InnerBorder',
+ icon: 'InnerBorderDoubleIcon',
value: 'inside',
},
{
label: 'borderLine.borderHorizontal',
- icon: 'HorizontalBorder',
+ icon: 'HorizontalBorderDoubleIcon',
value: 'horizontal',
},
{
label: 'borderLine.borderVertical',
- icon: 'VerticalBorder',
+ icon: 'VerticalBorderDoubleIcon',
value: 'vertical',
},
{
label: 'borderLine.borderTlbr',
- icon: 'BackSlashSingle',
+ icon: 'BackSlashIcon',
value: 'tlbr',
},
{
label: 'borderLine.borderTlbcTlmr',
- icon: 'LeftDoubleDiagonalSingle',
+ icon: 'LeftDoubleDiagonalIcon',
value: 'tlbc_tlmr',
},
{
label: 'borderLine.borderTlbrTlbcTlmr',
- icon: 'LeftTridiagonalSingle',
+ icon: 'LeftTridiagonalIcon',
value: 'tlbr_tlbc_tlmr',
},
{
label: 'borderLine.borderBlTr',
- icon: 'SlashSingle',
+ icon: 'SlashIcon',
value: 'bltr',
},
{
label: 'borderLine.borderMltrBctr',
- icon: 'RightDoubleDiagonalSingle',
+ icon: 'RightDoubleDiagonalIcon',
value: 'mltr_bctr',
},
];
diff --git a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
index 209bcd0c5d..9a1c75e541 100644
--- a/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
+++ b/packages/sheets-ui/src/components/menu-item-input/MenuItemInput.tsx
@@ -14,7 +14,6 @@
* limitations under the License.
*/
-import type { KeyboardEvent } from 'react';
import type { IMenuItemInputProps } from './interface';
import { LocaleService } from '@univerjs/core';
import { InputNumber } from '@univerjs/design';
@@ -49,15 +48,9 @@ export const MenuItemInput = (props: IMenuItemInputProps) => {
setInputValue(value);
}, [value]);
- function handleKeyDown(e: KeyboardEvent<HTMLInputElement>) {
- if (e.key === 'Backspace') {
- e.stopPropagation();
- }
- if (e.key === 'Enter') {
- e.stopPropagation();
- if (inputValue) {
- onChange(inputValue);
- }
+ function handlePressEnter() {
+ if (inputValue) {
+ onChange(inputValue);
}
}
@@ -71,7 +64,7 @@ export const MenuItemInput = (props: IMenuItemInputProps) => {
precision={0}
min={min}
max={max}
- onKeyDown={handleKeyDown}
+ onPressEnter={handlePressEnter}
onChange={handleChange}
/>
</div>
diff --git a/packages/sheets-ui/src/controllers/menu/border.menu.ts b/packages/sheets-ui/src/controllers/menu/border.menu.ts
index d7641f54d6..8e4a658f30 100644
--- a/packages/sheets-ui/src/controllers/menu/border.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/border.menu.ts
@@ -33,7 +33,7 @@ export function CellBorderSelectorMenuItemFactory(accessor: IAccessor): IMenuSel
return {
id: SetBorderBasicCommand.id,
icon: new Observable<string>((subscriber) => {
- const defaultIcon = 'AllBorderSingle';
+ const defaultIcon = 'AllBorderIcon';
const borderManager = accessor.get(BorderStyleManagerService);
const disposable = accessor.get(ICommandService).onCommandExecuted((c) => {
diff --git a/packages/sheets-ui/src/controllers/menu/clear.menu.ts b/packages/sheets-ui/src/controllers/menu/clear.menu.ts
index 8835a22f1c..c21dab4bf4 100644
--- a/packages/sheets-ui/src/controllers/menu/clear.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/clear.menu.ts
@@ -35,7 +35,7 @@ export function ClearSelectionMenuItemFactory(accessor: IAccessor): IMenuSelecto
return {
id: CLEAR_SELECTION_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'ClearFormat',
+ icon: 'ClearFormatDoubleIcon',
title: 'rightClick.clearSelection',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
@@ -45,7 +45,7 @@ export function ClearSelectionContentMenuItemFactory(accessor: IAccessor): IMenu
return {
id: ClearSelectionContentCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ClearFormat',
+ icon: 'ClearFormatDoubleIcon',
title: 'rightClick.clearContent',
disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
@@ -59,7 +59,7 @@ export function ClearSelectionFormatMenuItemFactory(accessor: IAccessor): IMenuB
return {
id: ClearSelectionFormatCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ClearFormat',
+ icon: 'ClearFormatDoubleIcon',
title: 'rightClick.clearFormat',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
@@ -73,7 +73,7 @@ export function ClearSelectionAllMenuItemFactory(accessor: IAccessor): IMenuButt
return {
id: ClearSelectionAllCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ClearFormat',
+ icon: 'ClearFormatDoubleIcon',
title: 'rightClick.clearAll',
tooltip: 'rightClick.clearAll',
disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, {
diff --git a/packages/sheets-ui/src/controllers/menu/delete.menu.ts b/packages/sheets-ui/src/controllers/menu/delete.menu.ts
index 1f6515a551..0ff906787b 100644
--- a/packages/sheets-ui/src/controllers/menu/delete.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/delete.menu.ts
@@ -33,7 +33,7 @@ export function DeleteRangeMenuItemFactory(accessor: IAccessor): IMenuSelectorIt
id: DELETE_RANGE_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'rightClick.delete',
- icon: 'Reduce',
+ icon: 'ReduceDoubleIcon',
hidden$: getObservableWithExclusiveRange$(accessor, getBaseRangeMenuHidden$(accessor)),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission] }),
};
@@ -43,7 +43,7 @@ export function RemoveColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: RemoveColConfirmCommand.id,
type: MenuItemType.BUTTON,
- icon: 'DeleteColumn',
+ icon: 'DeleteColumnDoubleIcon',
title: 'rightClick.deleteSelectedColumn',
hidden$: getDeleteMenuHidden$(accessor, 'col'),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetDeleteColumnPermission] }),
@@ -54,7 +54,7 @@ export function RemoveRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: RemoveRowConfirmCommand.id,
type: MenuItemType.BUTTON,
- icon: 'DeleteRow',
+ icon: 'DeleteRowDoubleIcon',
title: 'rightClick.deleteSelectedRow',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetDeleteRowPermission] }),
hidden$: getDeleteMenuHidden$(accessor, 'row'),
@@ -66,7 +66,7 @@ export function DeleteRangeMoveLeftMenuItemFactory(accessor: IAccessor): IMenuBu
id: DeleteRangeMoveLeftConfirmCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.moveLeft',
- icon: 'DeleteCellShiftLeft',
+ icon: 'DeleteCellShiftLeftDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getCellMenuHidden$(accessor, 'col'),
};
@@ -77,7 +77,7 @@ export function DeleteRangeMoveUpMenuItemFactory(accessor: IAccessor): IMenuButt
id: DeleteRangeMoveUpConfirmCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.moveUp',
- icon: 'DeleteCellShiftUp',
+ icon: 'DeleteCellShiftUpDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getCellMenuHidden$(accessor, 'row'),
};
diff --git a/packages/sheets-ui/src/controllers/menu/gridlines.menu.ts b/packages/sheets-ui/src/controllers/menu/gridlines.menu.ts
index 86d62dd8ff..7f0478681a 100644
--- a/packages/sheets-ui/src/controllers/menu/gridlines.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/gridlines.menu.ts
@@ -30,7 +30,7 @@ export function ToggleGridlinesMenuFactory(accessor: IAccessor): IMenuButtonItem
id: ToggleGridlinesCommand.id,
type: MenuItemType.BUTTON,
tooltip: 'toolbar.toggleGridlines',
- icon: 'HideGridlines',
+ icon: 'HideGridlinesDoubleIcon',
activated$: new Observable<boolean>((observer) => {
const getValue = () => {
const workbook = instanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
diff --git a/packages/sheets-ui/src/controllers/menu/insert.menu.ts b/packages/sheets-ui/src/controllers/menu/insert.menu.ts
index d383d98e2c..b96dcf5efb 100644
--- a/packages/sheets-ui/src/controllers/menu/insert.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/insert.menu.ts
@@ -48,7 +48,7 @@ export function ColInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
id: COL_INSERT_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'rightClick.insert',
- icon: 'Insert',
+ icon: 'InsertDoubleIcon',
hidden$: getBaseRangeMenuHidden$(accessor),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetInsertColumnPermission] }),
};
@@ -60,7 +60,7 @@ export function RowInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
id: ROW_INSERT_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'rightClick.insert',
- icon: 'Insert',
+ icon: 'InsertDoubleIcon',
hidden$: getBaseRangeMenuHidden$(accessor),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertRowPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
@@ -72,7 +72,7 @@ export function CellInsertMenuItemFactory(accessor: IAccessor): IMenuSelectorIte
id: CELL_INSERT_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'rightClick.insert',
- icon: 'Insert',
+ icon: 'InsertDoubleIcon',
hidden$: getObservableWithExclusiveRange$(accessor, getBaseRangeMenuHidden$(accessor)),
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertColumnPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
};
@@ -88,7 +88,7 @@ export function InsertRowBeforeMenuItemFactory(accessor: IAccessor): IMenuButton
id: InsertRowBeforeCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.insertRowBefore',
- icon: 'InsertRowAbove',
+ icon: 'InsertRowAboveDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertRowPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getInsertBeforeMenuHidden$(accessor, 'row'),
};
@@ -107,7 +107,7 @@ export function InsertRowBeforeCellMenuItemFactory(accessor: IAccessor): IMenuBu
return {
id: InsertRowBeforeCommand.id,
type: MenuItemType.BUTTON,
- icon: 'InsertRowAbove',
+ icon: 'InsertRowAboveDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
@@ -148,7 +148,7 @@ export function InsertRowAfterMenuItemFactory(accessor: IAccessor): IMenuButtonI
id: InsertRowAfterCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.insertRow',
- icon: 'InsertRowBelow',
+ icon: 'InsertRowBelowDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertRowPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getInsertAfterMenuHidden$(accessor, 'row'),
};
@@ -166,7 +166,7 @@ export function InsertColLeftCellMenuItemFactory(accessor: IAccessor): IMenuButt
return {
id: InsertColBeforeCommand.id,
type: MenuItemType.BUTTON,
- icon: 'LeftInsertColumn',
+ icon: 'LeftInsertColumnDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
@@ -207,7 +207,7 @@ export function InsertColBeforeMenuItemFactory(accessor: IAccessor): IMenuButton
id: InsertColBeforeCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.insertColumnBefore',
- icon: 'LeftInsertColumn',
+ icon: 'LeftInsertColumnDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertColumnPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getInsertBeforeMenuHidden$(accessor, 'col'),
};
@@ -218,7 +218,7 @@ export function InsertColAfterMenuItemFactory(accessor: IAccessor): IMenuButtonI
id: InsertColAfterCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.insertColumn',
- icon: 'RightInsertColumn',
+ icon: 'RightInsertColumnDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetInsertColumnPermission, WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getInsertAfterMenuHidden$(accessor, 'col'),
};
@@ -229,7 +229,7 @@ export function InsertRangeMoveRightMenuItemFactory(accessor: IAccessor): IMenuB
id: InsertRangeMoveRightConfirmCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.moveRight',
- icon: 'InsertCellShiftRight',
+ icon: 'InsertCellShiftRightDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getCellMenuHidden$(accessor, 'col'),
};
@@ -244,7 +244,7 @@ export function InsertRangeMoveDownMenuItemFactory(accessor: IAccessor): IMenuBu
id: InsertRangeMoveDownConfirmCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.moveDown',
- icon: 'InsertCellDown',
+ icon: 'InsertCellDownDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getCellMenuHidden$(accessor, 'row'),
};
@@ -262,7 +262,7 @@ export function InsertMultiRowsAfterHeaderMenuItemFactory(accessor: IAccessor):
return {
id: InsertMultiRowsAfterCommand.id,
type: MenuItemType.BUTTON,
- icon: 'InsertRowBelow',
+ icon: 'InsertRowBelowDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
@@ -311,7 +311,7 @@ export function InsertMultiRowsAboveHeaderMenuItemFactory(accessor: IAccessor):
return {
id: InsertMultiRowsAboveCommand.id,
type: MenuItemType.BUTTON,
- icon: 'InsertRowAbove',
+ icon: 'InsertRowAboveDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
@@ -359,7 +359,7 @@ export function InsertMultiColsLeftHeaderMenuItemFactory(accessor: IAccessor): I
return {
id: InsertMultiColsLeftCommand.id,
type: MenuItemType.BUTTON,
- icon: 'LeftInsertColumn',
+ icon: 'LeftInsertColumnDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
@@ -407,7 +407,7 @@ export function InsertMultiColsRightHeaderMenuItemFactory(accessor: IAccessor):
return {
id: InsertMultiColsRightCommand.id,
type: MenuItemType.BUTTON,
- icon: 'RightInsertColumn',
+ icon: 'RightInsertColumnDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
diff --git a/packages/sheets-ui/src/controllers/menu/menu.ts b/packages/sheets-ui/src/controllers/menu/menu.ts
index 865f308e38..12f7bce344 100644
--- a/packages/sheets-ui/src/controllers/menu/menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/menu.ts
@@ -125,7 +125,7 @@ export function FormatPainterMenuItemFactory(accessor: IAccessor): IMenuButtonIt
id: SetOnceFormatPainterCommand.id,
subId: SetInfiniteFormatPainterCommand.id,
type: MenuItemType.BUTTON,
- icon: 'BrushSingle',
+ icon: 'BrushIcon',
title: 'Format Painter',
tooltip: 'toolbar.formatPainter',
activated$: new Observable<boolean>((subscriber) => {
@@ -156,7 +156,7 @@ export function BoldMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetRangeBoldCommand.id,
type: MenuItemType.BUTTON,
- icon: 'BoldSingle',
+ icon: 'BoldIcon',
title: 'Set bold',
tooltip: 'toolbar.bold',
disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] }, true),
@@ -218,7 +218,7 @@ export function ItalicMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetRangeItalicCommand.id,
type: MenuItemType.BUTTON,
- icon: 'ItalicSingle',
+ icon: 'ItalicIcon',
title: 'Set italic',
tooltip: 'toolbar.italic',
disabled$: getCurrentRangeDisable$(
@@ -280,7 +280,7 @@ export function UnderlineMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetRangeUnderlineCommand.id,
type: MenuItemType.BUTTON,
- icon: 'UnderlineSingle',
+ icon: 'UnderlineIcon',
title: 'Set underline',
tooltip: 'toolbar.underline',
activated$: deriveStateFromActiveSheet$(univerInstanceService, false, ({ worksheet }) => new Observable<boolean>((subscriber) => {
@@ -338,7 +338,7 @@ export function StrikeThroughMenuItemFactory(accessor: IAccessor): IMenuButtonIt
return {
id: SetRangeStrickThroughCommand.id,
type: MenuItemType.BUTTON,
- icon: 'StrikethroughSingle',
+ icon: 'StrikethroughIcon',
title: 'Set strike through',
tooltip: 'toolbar.strikethrough',
disabled$: getCurrentRangeDisable$(accessor, {
@@ -523,7 +523,7 @@ export function ResetTextColorMenuItemFactory(accessor: IAccessor): IMenuButtonI
id: ResetRangeTextColorCommand.id,
type: MenuItemType.BUTTON,
title: 'toolbar.resetColor',
- icon: 'NoColor',
+ icon: 'NoColorDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
@@ -539,7 +539,7 @@ export function TextColorSelectorMenuItemFactory(accessor: IAccessor): IMenuSele
return {
id: SetRangeTextColorCommand.id,
- icon: 'FontColor',
+ icon: 'FontColorDoubleIcon',
tooltip: 'toolbar.textColor.main',
type: MenuItemType.BUTTON_SELECTOR,
selections: [
@@ -577,7 +577,7 @@ export function ResetBackgroundColorMenuItemFactory(accessor: IAccessor): IMenuB
id: ResetBackgroundColorCommand.id,
type: MenuItemType.BUTTON,
title: 'toolbar.resetColor',
- icon: 'NoColor',
+ icon: 'NoColorDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
worksheetTypes: [WorksheetEditPermission, WorksheetSetCellStylePermission],
@@ -594,7 +594,7 @@ export function BackgroundColorSelectorMenuItemFactory(accessor: IAccessor): IMe
id: SetBackgroundColorCommand.id,
tooltip: 'toolbar.fillColor.main',
type: MenuItemType.BUTTON_SELECTOR,
- icon: 'PaintBucket',
+ icon: 'PaintBucketDoubleIcon',
selections: [
{
label: {
@@ -628,17 +628,17 @@ export function BackgroundColorSelectorMenuItemFactory(accessor: IAccessor): IMe
export const HORIZONTAL_ALIGN_CHILDREN = [
{
label: 'align.left',
- icon: 'LeftJustifyingSingle',
+ icon: 'LeftJustifyingIcon',
value: HorizontalAlign.LEFT,
},
{
label: 'align.center',
- icon: 'HorizontallySingle',
+ icon: 'HorizontallyIcon',
value: HorizontalAlign.CENTER,
},
{
label: 'align.right',
- icon: 'RightJustifyingSingle',
+ icon: 'RightJustifyingIcon',
value: HorizontalAlign.RIGHT,
},
];
@@ -695,17 +695,17 @@ export function HorizontalAlignMenuItemFactory(accessor: IAccessor): IMenuSelect
export const VERTICAL_ALIGN_CHILDREN = [
{
label: 'align.top',
- icon: 'AlignTopSingle',
+ icon: 'AlignTopIcon',
value: VerticalAlign.TOP,
},
{
label: 'align.middle',
- icon: 'VerticalCenterSingle',
+ icon: 'VerticalCenterIcon',
value: VerticalAlign.MIDDLE,
},
{
label: 'align.bottom',
- icon: 'AlignBottomSingle',
+ icon: 'AlignBottomIcon',
value: VerticalAlign.BOTTOM,
},
];
@@ -762,17 +762,17 @@ export function VerticalAlignMenuItemFactory(accessor: IAccessor): IMenuSelector
export const TEXT_WRAP_CHILDREN = [
{
label: 'textWrap.overflow',
- icon: 'OverflowSingle',
+ icon: 'OverflowIcon',
value: WrapStrategy.OVERFLOW,
},
{
label: 'textWrap.wrap',
- icon: 'AutowrapSingle',
+ icon: 'AutowrapIcon',
value: WrapStrategy.WRAP,
},
{
label: 'textWrap.clip',
- icon: 'TruncationSingle',
+ icon: 'TruncationIcon',
value: WrapStrategy.CLIP,
},
];
@@ -829,32 +829,32 @@ export function WrapTextMenuItemFactory(accessor: IAccessor): IMenuSelectorItem<
export const TEXT_ROTATE_CHILDREN = [
{
label: 'textRotate.none',
- icon: 'NoRotationSingle',
+ icon: 'NoRotationIcon',
value: 0,
},
{
label: 'textRotate.angleUp',
- icon: 'LeftRotationFortyFiveDegreesSingle',
+ icon: 'LeftRotationFortyFiveDegreesIcon',
value: -45,
},
{
label: 'textRotate.angleDown',
- icon: 'RightRotationFortyFiveDegreesSingle',
+ icon: 'RightRotationFortyFiveDegreesIcon',
value: 45,
},
{
label: 'textRotate.vertical',
- icon: 'VerticalTextSingle',
+ icon: 'VerticalTextIcon',
value: 'v',
},
{
label: 'textRotate.rotationUp',
- icon: 'LeftRotationNinetyDegreesSingle',
+ icon: 'LeftRotationNinetyDegreesIcon',
value: -90,
},
{
label: 'textRotate.rotationDown',
- icon: 'RightRotationNinetyDegreesSingle',
+ icon: 'RightRotationNinetyDegreesIcon',
value: 90,
},
];
@@ -930,7 +930,7 @@ export function CopyMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
commandId: SheetCopyCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.copy',
- icon: 'Copy',
+ icon: 'CopyDoubleIcon',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookCopyPermission],
worksheetTypes: [WorksheetCopyPermission],
@@ -961,7 +961,7 @@ export function PasteMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
commandId: SheetPasteCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.paste',
- icon: 'PasteSpecial',
+ icon: 'PasteSpecialDoubleIcon',
disabled$: menuClipboardDisabledObservable(accessor).pipe(
combineLatestWith(getCurrentRangeDisable$(accessor, {
rangeTypes: [RangeProtectionPermissionEditPoint],
@@ -979,7 +979,7 @@ export function PasteSpacialMenuItemFactory(accessor: IAccessor): IMenuSelectorI
return {
id: PASTE_SPECIAL_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'PasteSpecial',
+ icon: 'PasteSpecialDoubleIcon',
title: 'rightClick.pasteSpecial',
hidden$: getObservableWithExclusiveRange$(accessor, getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET)),
};
@@ -1062,7 +1062,7 @@ export function FitContentMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: SetWorksheetRowIsAutoHeightCommand.id,
type: MenuItemType.BUTTON,
- icon: 'AutoHeight',
+ icon: 'AutoHeightDoubleIcon',
title: 'rightClick.fitContent',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
@@ -1077,7 +1077,7 @@ export function ColAutoWidthMenuItemFactory(accessor: IAccessor): IMenuButtonIte
return {
id: SetWorksheetColAutoWidthCommand.id,
type: MenuItemType.BUTTON,
- icon: 'AutoWidth',
+ icon: 'AutoWidthDoubleIcon',
title: 'rightClick.fitContent',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
@@ -1095,7 +1095,7 @@ export function SheetFrozenMenuItemFactory(accessor: IAccessor): IMenuSelectorIt
id: SHEET_FROZEN_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'rightClick.freeze',
- icon: 'FreezeToSelectedSingle',
+ icon: 'FreezeToSelectedIcon',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -1107,7 +1107,7 @@ export function SheetFrozenHeaderMenuItemFactory(accessor: IAccessor): IMenuSele
id: SHEET_FROZEN_HEADER_MENU_ID,
type: MenuItemType.SUBITEMS,
title: 'rightClick.freeze',
- icon: 'FreezeToSelectedSingle',
+ icon: 'FreezeToSelectedIcon',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -1117,7 +1117,7 @@ export function FrozenMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
id: SetSelectionFrozenCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.freeze',
- icon: 'FreezeToSelectedSingle',
+ icon: 'FreezeToSelectedIcon',
// disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
@@ -1128,7 +1128,7 @@ export function FrozenRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
id: SetRowFrozenCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.freezeRow',
- icon: 'FreezeRowSingle',
+ icon: 'FreezeRowIcon',
// disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
@@ -1139,7 +1139,7 @@ export function FrozenColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
id: SetColumnFrozenCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.freezeCol',
- icon: 'FreezeColumnSingle',
+ icon: 'FreezeColumnIcon',
// disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
@@ -1150,7 +1150,7 @@ export function CancelFrozenMenuItemFactory(accessor: IAccessor): IMenuButtonIte
id: CancelFrozenCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.cancelFreeze',
- icon: 'CancelFreezeSingle',
+ icon: 'CancelFreezeIcon',
// disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
@@ -1160,7 +1160,7 @@ export function HideRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: HideRowConfirmCommand.id,
type: MenuItemType.BUTTON,
- icon: 'Hide',
+ icon: 'HideDoubleIcon',
title: 'rightClick.hideSelectedRow',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
@@ -1175,7 +1175,7 @@ export function HideColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: HideColConfirmCommand.id,
type: MenuItemType.BUTTON,
- icon: 'Hide',
+ icon: 'HideDoubleIcon',
title: 'rightClick.hideSelectedColumn',
disabled$: getCurrentRangeDisable$(accessor, {
workbookTypes: [WorkbookEditablePermission],
@@ -1197,7 +1197,7 @@ export function ShowRowMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetSelectedRowsVisibleCommand.id,
type: MenuItemType.BUTTON,
- icon: 'EyeOutlineSingle',
+ icon: 'EyeOutlineIcon',
title: 'rightClick.showHideRow',
hidden$: deriveStateFromActiveSheet$(univerInstanceService, true, ({ worksheet }) => new Observable((subscriber) => {
function hasHiddenRowsInSelections(): boolean {
@@ -1236,7 +1236,7 @@ export function ShowColMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: SetSelectedColsVisibleCommand.id,
type: MenuItemType.BUTTON,
- icon: 'EyeOutlineSingle',
+ icon: 'EyeOutlineIcon',
title: 'rightClick.showHideColumn',
hidden$: deriveStateFromActiveSheet$(univerInstanceService, true, ({ worksheet }) => new Observable((subscriber) => {
function hasHiddenColsInSelections(): boolean {
@@ -1277,7 +1277,7 @@ export function SetRowHeightMenuItemFactory(accessor: IAccessor): IMenuButtonIte
return {
id: SetRowHeightCommand.id,
type: MenuItemType.BUTTON,
- icon: 'AdjustHeight',
+ icon: 'AdjustHeightDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
@@ -1322,7 +1322,7 @@ export function SetColWidthMenuItemFactory(accessor: IAccessor): IMenuButtonItem
return {
id: SetColWidthCommand.id,
type: MenuItemType.BUTTON,
- icon: 'AdjustWidth',
+ icon: 'AdjustWidthDoubleIcon',
label: {
name: MENU_ITEM_INPUT_COMPONENT,
props: {
diff --git a/packages/sheets-ui/src/controllers/menu/merge.menu.ts b/packages/sheets-ui/src/controllers/menu/merge.menu.ts
index 2ef64b589e..265e5f86e5 100644
--- a/packages/sheets-ui/src/controllers/menu/merge.menu.ts
+++ b/packages/sheets-ui/src/controllers/menu/merge.menu.ts
@@ -14,11 +14,11 @@
* limitations under the License.
*/
+import type { IAccessor } from '@univerjs/core';
+import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { UniverInstanceType } from '@univerjs/core';
import { RangeProtectionPermissionEditPoint, RemoveWorksheetMergeCommand, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
-import type { IMenuButtonItem, IMenuSelectorItem } from '@univerjs/ui';
import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
-import type { IAccessor } from '@univerjs/core';
import { combineLatestWith, map } from 'rxjs';
import {
@@ -36,7 +36,7 @@ export function CellMergeMenuItemFactory(accessor: IAccessor): IMenuSelectorItem
return {
id: AddWorksheetMergeCommand.id,
- icon: 'MergeAllSingle',
+ icon: 'MergeAllIcon',
tooltip: 'toolbar.mergeCell.main',
type: MenuItemType.SUBITEMS,
// selections: [...MERGE_CHILDREN],
@@ -53,7 +53,7 @@ export function CellMergeAllMenuItemFactory(accessor: IAccessor): IMenuButtonIte
id: AddWorksheetMergeAllCommand.id,
type: MenuItemType.BUTTON,
title: 'merge.all',
- icon: 'MergeAllSingle',
+ icon: 'MergeAllIcon',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -63,7 +63,7 @@ export function CellMergeVerticalMenuItemFactory(accessor: IAccessor): IMenuButt
id: AddWorksheetMergeVerticalCommand.id,
type: MenuItemType.BUTTON,
title: 'merge.vertical',
- icon: 'VerticalIntegrationSingle',
+ icon: 'VerticalIntegrationIcon',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -73,7 +73,7 @@ export function CellMergeHorizontalMenuItemFactory(accessor: IAccessor): IMenuBu
id: AddWorksheetMergeHorizontalCommand.id,
type: MenuItemType.BUTTON,
title: 'merge.horizontal',
- icon: 'HorizontalMergeSingle',
+ icon: 'HorizontalMergeIcon',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
@@ -83,7 +83,7 @@ export function CellMergeCancelMenuItemFactory(accessor: IAccessor): IMenuButton
id: RemoveWorksheetMergeCommand.id,
type: MenuItemType.BUTTON,
title: 'merge.cancel',
- icon: 'CancelMergeSingle',
+ icon: 'CancelMergeIcon',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
diff --git a/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts b/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
index ab54d64236..3538f1bcac 100644
--- a/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
+++ b/packages/sheets-ui/src/controllers/permission/sheet-permission-render.controller.ts
@@ -19,7 +19,7 @@ import type { MenuConfig } from '@univerjs/ui';
import type { IUniverSheetsUIConfig } from '../config.schema';
import { Disposable, IConfigService, Inject, Injector, IPermissionService, IUniverInstanceService } from '@univerjs/core';
import { IRenderManagerService } from '@univerjs/engine-render';
-import { CheckMarkSingle, DeleteSingle, LockSingle, ProtectSingle, WriteSingle } from '@univerjs/icons';
+import { CheckMarkIcon, DeleteIcon, LockIcon, ProtectIcon, WriteIcon } from '@univerjs/icons';
import { RangeProtectionRuleModel, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import { ComponentManager, connectInjector, IUIPartsService } from '@univerjs/ui';
import { merge, throttleTime } from 'rxjs';
@@ -54,19 +54,19 @@ export class SheetPermissionRenderManagerController extends Disposable {
private _initComponents(): void {
([
- [permissionMenuIconKey, ProtectSingle],
- [permissionDeleteIconKey, DeleteSingle],
- [permissionEditIconKey, WriteSingle],
- [permissionCheckIconKey, CheckMarkSingle],
- [permissionLockIconKey, LockSingle],
+ [permissionMenuIconKey, ProtectIcon],
+ [permissionDeleteIconKey, DeleteIcon],
+ [permissionEditIconKey, WriteIcon],
+ [permissionCheckIconKey, CheckMarkIcon],
+ [permissionLockIconKey, LockIcon],
[UNIVER_SHEET_PERMISSION_PANEL, SheetPermissionPanel],
[UNIVER_SHEET_PERMISSION_USER_DIALOG, SheetPermissionUserDialog],
[UNIVER_SHEET_PERMISSION_DIALOG, SheetPermissionDialog],
[UNIVER_SHEET_PERMISSION_ALERT_DIALOG, AlertDialog],
- ] as const).forEach(([key, component]) => {
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(this._componentManager.register(
key,
- component
+ comp
));
});
}
diff --git a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
index bd442a3a69..7581c3b12a 100644
--- a/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
+++ b/packages/sheets-ui/src/controllers/sheet-ui.controller.ts
@@ -17,8 +17,7 @@
import { Disposable, ICommandService, IConfigService, Inject, Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { DocSelectionRenderService } from '@univerjs/docs-ui';
import { getCurrentTypeOfRenderer, IRenderManagerService } from '@univerjs/engine-render';
-
-import { HideGridlines } from '@univerjs/icons';
+import { HideGridlinesDoubleIcon } from '@univerjs/icons';
import {
SetBoldCommand,
SetFontFamilyCommand,
@@ -190,7 +189,7 @@ export class SheetUIController extends Disposable {
this.disposeWithMe(componentManager.register(CELL_POPUP_COMPONENT_KEY, CellPopup));
// init icons
- this.disposeWithMe(componentManager.register('HideGridlines', HideGridlines));
+ this.disposeWithMe(componentManager.register('HideGridlinesDoubleIcon', HideGridlinesDoubleIcon));
}
private _initCommands(): void {
diff --git a/packages/sheets-ui/src/services/cell-alert-manager.service.ts b/packages/sheets-ui/src/services/cell-alert-manager.service.ts
index ff6756a699..103720f6f6 100644
--- a/packages/sheets-ui/src/services/cell-alert-manager.service.ts
+++ b/packages/sheets-ui/src/services/cell-alert-manager.service.ts
@@ -20,7 +20,6 @@ import { Disposable, Inject } from '@univerjs/core';
import { IRenderManagerService } from '@univerjs/engine-render';
import { Subject } from 'rxjs';
import { CELL_ALERT_KEY } from '../views/cell-alert';
-import { SheetCanvasPopManagerService } from './canvas-pop-manager.service';
import { CellPopupManagerService } from './cell-popup-manager.service';
export enum CellAlertType {
@@ -51,7 +50,6 @@ export class CellAlertManagerService extends Disposable {
constructor(
@IRenderManagerService private readonly _renderManagerService: IRenderManagerService,
- @Inject(SheetCanvasPopManagerService) private readonly _canvasPopManagerService: SheetCanvasPopManagerService,
@Inject(CellPopupManagerService) private readonly _cellPopupManagerService: CellPopupManagerService
) {
super();
diff --git a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
index 68ba1fb1b9..2ee3d6f17b 100644
--- a/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/auto-fill-popup-menu/AutoFillPopupMenu.tsx
@@ -18,9 +18,9 @@ import type { ICommandInfo, IExecutionOptions } from '@univerjs/core';
import { ICommandService, IUniverInstanceService, LocaleService, toDisposable } from '@univerjs/core';
import { borderClassName, clsx, DropdownMenu } from '@univerjs/design';
import { convertTransformToOffsetX, convertTransformToOffsetY, IRenderManagerService } from '@univerjs/engine-render';
-import { Autofill, MoreDownSingle } from '@univerjs/icons';
+import { AutofillDoubleIcon, MoreDownIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { RefillCommand } from '../../commands/commands/refill.command';
import { SetScrollOperation } from '../../commands/operations/scroll.operation';
import { useActiveWorkbook } from '../../components/hook';
@@ -47,7 +47,7 @@ const useUpdate = () => {
return useCallback(() => setState((prevState) => !prevState), []);
};
-export const AutoFillPopupMenu: React.FC<{}> = () => {
+export function AutoFillPopupMenu() {
const commandService = useDependency(ICommandService);
const univerInstanceService = useDependency(IUniverInstanceService);
const renderManagerService = useDependency(IRenderManagerService);
@@ -208,13 +208,13 @@ export const AutoFillPopupMenu: React.FC<{}> = () => {
'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
- <Autofill
+ <AutofillDoubleIcon
className={`
univer-fill-primary-600 univer-text-gray-900
dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
+ {showMore && <MoreDownIcon className="dark:!univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx b/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
index 54f5cae2fc..1e0c6b36ed 100644
--- a/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
+++ b/packages/sheets-ui/src/views/cell-alert/CellAlertPopup.tsx
@@ -16,7 +16,7 @@
import type { ICanvasPopup } from '../../services/canvas-pop-manager.service';
import type { ICellAlert } from '../../services/cell-alert-manager.service';
-import { ErrorSingle, InfoSingle, WarningSingle } from '@univerjs/icons';
+import { ErrorIcon, InfoIcon, WarningIcon } from '@univerjs/icons';
import { CellAlertType } from '../../services/cell-alert-manager.service';
/**
@@ -33,9 +33,9 @@ export function CellAlert({ popup }: { popup: ICanvasPopup }) {
const { type, title, message } = alert as ICellAlert;
const iconMap = {
- [CellAlertType.ERROR]: <ErrorSingle className="univer-mr-1.5 univer-text-red-500" />,
- [CellAlertType.INFO]: <InfoSingle className="univer-mr-1.5 univer-text-blue-500" />,
- [CellAlertType.WARNING]: <WarningSingle className="univer-mr-1.5 univer-text-yellow-500" />,
+ [CellAlertType.ERROR]: <ErrorIcon className="univer-mr-1.5 univer-text-red-500" />,
+ [CellAlertType.INFO]: <InfoIcon className="univer-mr-1.5 univer-text-blue-500" />,
+ [CellAlertType.WARNING]: <WarningIcon className="univer-mr-1.5 univer-text-yellow-500" />,
};
return (
diff --git a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
index 8e012c420f..e791443829 100644
--- a/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
+++ b/packages/sheets-ui/src/views/clipboard/ClipboardPopupMenu.tsx
@@ -19,7 +19,7 @@ import type { IPasteHookKeyType } from '../../services/clipboard/type';
import { ICommandService, IUniverInstanceService, LocaleService } from '@univerjs/core';
import { borderClassName, clsx, DropdownMenu } from '@univerjs/design';
import { convertTransformToOffsetX, convertTransformToOffsetY, IRenderManagerService } from '@univerjs/engine-render';
-import { MoreDownSingle, PasteSpecial } from '@univerjs/icons';
+import { MoreDownIcon, PasteSpecialDoubleIcon } from '@univerjs/icons';
import { useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
import { SheetOptionalPasteCommand } from '../../commands/commands/clipboard.command';
@@ -167,13 +167,13 @@ export const ClipboardPopupMenu = () => {
'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
- <PasteSpecial
+ <PasteSpecialDoubleIcon
className={`
univer-fill-primary-600 univer-text-gray-900
dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
+ {showMore && <MoreDownIcon className="dark:!univer-text-white" />}
</div>
</DropdownMenu>
</div>
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedName.tsx b/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
index 4e9be562f2..c35ed3edaf 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedName.tsx
@@ -16,7 +16,7 @@
import { borderRightClassName, clsx, Dropdown } from '@univerjs/design';
import { IDefinedNamesService } from '@univerjs/engine-formula';
-import { MoreDownSingle } from '@univerjs/icons';
+import { MoreDownIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useEffect, useState } from 'react';
import { DefinedNameOverlay } from './DefinedNameOverlay';
@@ -80,7 +80,7 @@ export function DefinedName({ disable }: { disable: boolean }) {
'univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-700 hover:univer-bg-transparent': disable,
})}
>
- <MoreDownSingle />
+ <MoreDownIcon />
</a>
</Dropdown>
</div>
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
index 03f079cf77..6f1e8c977b 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
@@ -20,7 +20,7 @@ import type { IDefinedNamesServiceParam, ISetDefinedNameMutationParam } from '@u
import { ICommandService, IUniverInstanceService, LocaleService, Tools, UniverInstanceType } from '@univerjs/core';
import { Button, clsx, Confirm, Tooltip } from '@univerjs/design';
import { IDefinedNamesService, serializeRangeWithSheet } from '@univerjs/engine-formula';
-import { CheckMarkSingle, DeleteSingle, IncreaseSingle } from '@univerjs/icons';
+import { CheckMarkIcon, DeleteIcon, IncreaseIcon } from '@univerjs/icons';
import {
InsertDefinedNameCommand,
RemoveDefinedNameCommand,
@@ -190,7 +190,7 @@ export const DefinedNameContainer = () => {
)}
onClick={openInsertCloseKeyEditor}
>
- <IncreaseSingle />
+ <IncreaseIcon />
<span className="univer-ml-1">{localeService.t('definedName.addButton')}</span>
</Button>
{editState && (
@@ -264,7 +264,7 @@ export const DefinedNameContainer = () => {
closeInsertOpenKeyEditor(definedName.id);
}}
>
- <CheckMarkSingle />
+ <CheckMarkIcon />
</div>
</Tooltip>
<Tooltip title={localeService.t('definedName.deleteButton')} placement="top">
@@ -281,7 +281,7 @@ export const DefinedNameContainer = () => {
deleteDefinedName(definedName.id);
}}
>
- <DeleteSingle />
+ <DeleteIcon />
</div>
</Tooltip>
</div>
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
index 696953e32e..72c7e300b0 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameInput.tsx
@@ -16,15 +16,16 @@
import type { Nullable, Workbook } from '@univerjs/core';
import type { IDefinedNamesServiceParam } from '@univerjs/engine-formula';
+import type { ComponentType } from 'react';
import type { IRangeSelectorProps } from '../../basics/editor/range';
import { AbsoluteRefType, IUniverInstanceService, LocaleService, Tools, UniverInstanceType } from '@univerjs/core';
import { borderBottomClassName, borderClassName, Button, clsx, Input, Radio, RadioGroup, Select } from '@univerjs/design';
import { IDefinedNamesService, IFunctionService, isReferenceStrings, isReferenceStringWithEffectiveColumn, LexerTreeBuilder, operatorToken } from '@univerjs/engine-formula';
import { hasCJKText } from '@univerjs/engine-render';
-import { ErrorSingle } from '@univerjs/icons';
+import { ErrorIcon } from '@univerjs/icons';
import { SCOPE_WORKBOOK_VALUE_DEFINED_NAME } from '@univerjs/sheets';
import { ComponentManager, useDependency, useSidebarClick } from '@univerjs/ui';
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
import { EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY, RANGE_SELECTOR_COMPONENT_KEY } from '../../common/keys';
export interface IDefinedNameInputProps extends Omit<IDefinedNamesServiceParam, 'id'> {
@@ -59,7 +60,7 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
const lexerTreeBuilder = useDependency(LexerTreeBuilder);
const componentManager = useDependency(ComponentManager);
- const RangeSelector: React.ComponentType<IRangeSelectorProps> = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []) as any;
+ const RangeSelector: ComponentType<IRangeSelectorProps> = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []) as any;
const FormulaEditor = useMemo(() => componentManager.get(EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY), []);
if (workbook == null) {
return;
@@ -292,7 +293,7 @@ export const DefinedNameInput = (props: IDefinedNameInputProps) => {
<span>
{validString}
</span>
- <ErrorSingle />
+ <ErrorIcon />
</div>
<div className="univer-flex univer-gap-2">
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
index 0bc7cd98e5..8311d60191 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameOverlay.tsx
@@ -22,7 +22,7 @@ import { borderBottomClassName, clsx, scrollbarClassName } from '@univerjs/desig
import { IDefinedNamesService } from '@univerjs/engine-formula';
import { SetWorksheetShowCommand } from '@univerjs/sheets';
import { ISidebarService, useDependency } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { SidebarDefinedNameOperation } from '../../commands/operations/sidebar-defined-name.operation';
import { DEFINED_NAME_CONTAINER } from './component-name';
diff --git a/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx b/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
index 2afeb4b80f..fb2ab5c931 100644
--- a/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
+++ b/packages/sheets-ui/src/views/dropdown/list-dropdown/index.tsx
@@ -18,14 +18,15 @@ import type { DocumentDataModel } from '@univerjs/core';
import type { IRichTextEditingMutationParams } from '@univerjs/docs';
import type { ISheetLocation } from '@univerjs/sheets';
import type { IPopup } from '@univerjs/ui';
+import type { CSSProperties } from 'react';
import type { IBaseDropdownProps } from '../type';
import { BuildTextUtils, ICommandService, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { borderClassName, clsx, scrollbarClassName } from '@univerjs/design';
import { RichTextEditingMutation } from '@univerjs/docs';
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { RangeProtectionPermissionEditPoint, SheetPermissionCheckController, WorkbookEditablePermission, WorksheetEditPermission } from '@univerjs/sheets';
import { RectPopup, useDependency } from '@univerjs/ui';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import { IEditorBridgeService } from '../../../services/editor-bridge.service';
function serializeListOptions(options: string[]) {
@@ -43,7 +44,7 @@ interface ISelectListProps {
options: { label: string; value: string; color?: string }[];
title?: string;
onEdit?: () => void;
- style?: React.CSSProperties;
+ style?: CSSProperties;
filter?: string;
location: ISheetLocation;
showEdit?: boolean;
@@ -139,7 +140,7 @@ const SelectList = (props: ISelectListProps) => {
univer-text-base univer-text-primary-500
`}
>
- {selected && <CheckMarkSingle className="univer-text-primary-600" />}
+ {selected && <CheckMarkIcon className="univer-text-primary-600" />}
</div>
</div>
);
diff --git a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
index 0fdd7fd81b..fd0b6e229d 100644
--- a/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
+++ b/packages/sheets-ui/src/views/formula-bar/FormulaBar.tsx
@@ -16,14 +16,30 @@
import type { Workbook } from '@univerjs/core';
import type { IEditorBridgeServiceVisibleParam } from '../../services/editor-bridge.service';
-import { DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, FOCUSING_FX_BAR_EDITOR, ICommandService, IContextService, IPermissionService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import {
+ DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY,
+ FOCUSING_FX_BAR_EDITOR,
+ ICommandService,
+ IContextService,
+ IPermissionService,
+ IUniverInstanceService,
+ UniverInstanceType,
+} from '@univerjs/core';
import { borderBottomClassName, borderRightClassName, clsx } from '@univerjs/design';
import { IEditorService } from '@univerjs/docs-ui';
import { DeviceInputEventType } from '@univerjs/engine-render';
-import { CheckMarkSingle, CloseSingle, DropdownSingle, FxSingle } from '@univerjs/icons';
-import { RangeProtectionCache, RangeProtectionRuleModel, SheetsSelectionsService, UnitAction, WorksheetEditPermission, WorksheetProtectionRuleModel, WorksheetViewPermission } from '@univerjs/sheets';
+import { CheckMarkIcon, CloseIcon, DropdownIcon, FxIcon } from '@univerjs/icons';
+import {
+ RangeProtectionCache,
+ RangeProtectionRuleModel,
+ SheetsSelectionsService,
+ UnitAction,
+ WorksheetEditPermission,
+ WorksheetProtectionRuleModel,
+ WorksheetViewPermission,
+} from '@univerjs/sheets';
import { ComponentContainer, ComponentManager, KeyCode, useComponentsOfPart, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
import { EMPTY, merge, of, switchMap } from 'rxjs';
import { SetCellEditVisibleOperation } from '../../commands/operations/cell-edit.operation';
import { EMBEDDING_FORMULA_EDITOR_COMPONENT_KEY } from '../../common/keys';
@@ -239,7 +255,7 @@ export function FormulaBar(props: IProps) {
}
};
- const handlePointerUp = (e: React.PointerEvent<HTMLDivElement>) => {
+ const handlePointerUp = () => {
if (shouldSkipFocus.current) {
setTimeout(() => {
editorService.blur(true);
@@ -286,7 +302,7 @@ export function FormulaBar(props: IProps) {
})}
onClick={handleCloseBtnClick}
>
- <CloseSingle />
+ <CloseIcon />
</span>
<span
className={clsx(`
@@ -298,7 +314,7 @@ export function FormulaBar(props: IProps) {
})}
onClick={handleConfirmBtnClick}
>
- <CheckMarkSingle />
+ <CheckMarkIcon />
</span>
<span
className={`
@@ -309,7 +325,7 @@ export function FormulaBar(props: IProps) {
`}
onClick={handlerFxBtnClick}
>
- <FxSingle />
+ <FxIcon />
</span>
</div>
</div>
@@ -371,7 +387,7 @@ export function FormulaBar(props: IProps) {
`, { 'univer-cursor-not-allowed univer-text-gray-200 dark:!univer-text-gray-700': editDisable })}
onClick={handleArrowClick}
>
- <DropdownSingle
+ <DropdownIcon
className={clsx({
'univer-rotate-180': arrowDirection === ArrowDirection.Up,
})}
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx
index 72718191ee..1471e5bfaa 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailMainPart.tsx
@@ -15,13 +15,14 @@
*/
import type { IRange, Workbook } from '@univerjs/core';
+import type { ComponentType } from 'react';
import type { IRangeSelectorProps } from '../../../basics/editor/range';
import { Injector, isValidRange, IUniverInstanceService, LocaleService, UniverInstanceType } from '@univerjs/core';
import { FormLayout, Input } from '@univerjs/design';
import { deserializeRangeWithSheet, serializeRange } from '@univerjs/engine-formula';
import { setEndForRange } from '@univerjs/sheets';
import { ComponentManager, useDependency } from '@univerjs/ui';
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
import { RANGE_SELECTOR_COMPONENT_KEY } from '../../../common/keys';
import { checkRangeValid } from '../util';
@@ -37,7 +38,7 @@ interface IPermissionDetailMainPartProps {
export const PermissionDetailMainPart = (props: IPermissionDetailMainPartProps) => {
const { ranges, onRangesChange, desc, onDescChange, rangesErrMsg, permissionId } = props;
const componentManager = useDependency(ComponentManager);
- const RangeSelector: React.ComponentType<IRangeSelectorProps> = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []) as any;
+ const RangeSelector: ComponentType<IRangeSelectorProps> = useMemo(() => componentManager.get(RANGE_SELECTOR_COMPONENT_KEY), []) as any;
const univerInstanceService = useDependency(IUniverInstanceService);
const localeService = useDependency(LocaleService);
const injector = useDependency(Injector);
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx
index 71b91001a3..a7ab24cda2 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailPanel.tsx
@@ -19,7 +19,7 @@ import type { IPermissionPanelRule } from '../../../services/permission/sheet-pe
import { Injector, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { EditStateEnum, ViewStateEnum } from '@univerjs/sheets';
import { ComponentContainer, ISidebarService, useComponentsOfPart, useDependency } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { UNIVER_SHEET_PERMISSION_USER_PART } from '../../../consts/permission';
import { checkRangeValid, generateDefaultRule, generateRuleByUnitType } from '../util';
import { PermissionDetailFooterPart } from './PermissionDetailFooterPart';
diff --git a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
index f4e32e30f4..89decc2da4 100644
--- a/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-detail/PermissionDetailUserPart.tsx
@@ -21,7 +21,7 @@ import { Avatar, borderClassName, clsx, FormLayout, Radio, RadioGroup, Select }
import { UnitRole } from '@univerjs/protocol';
import { EditStateEnum, ViewStateEnum } from '@univerjs/sheets';
import { IDialogService, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
import { UNIVER_SHEET_PERMISSION_USER_DIALOG, UNIVER_SHEET_PERMISSION_USER_DIALOG_ID } from '../../../consts/permission';
import { SheetPermissionUserManagerService } from '../../../services/permission/sheet-permission-user-list.service';
import { UserEmptyBase64 } from '../user-dialog/constant';
diff --git a/packages/sheets-ui/src/views/permission/panel-list/index.tsx b/packages/sheets-ui/src/views/permission/panel-list/index.tsx
index a2b89f74b7..480db5f0fa 100644
--- a/packages/sheets-ui/src/views/permission/panel-list/index.tsx
+++ b/packages/sheets-ui/src/views/permission/panel-list/index.tsx
@@ -21,7 +21,7 @@ import type { IPermissionPanelRule } from '../../../services/permission/sheet-pe
import { IAuthzIoService, ICommandService, IPermissionService, IUniverInstanceService, LocaleService, Tools, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { Avatar, borderClassName, Button, clsx, Tooltip } from '@univerjs/design';
import { serializeRange } from '@univerjs/engine-formula';
-import { DeleteSingle, WriteSingle } from '@univerjs/icons';
+import { DeleteIcon, WriteIcon } from '@univerjs/icons';
import { UnitAction, UnitObject } from '@univerjs/protocol';
import { baseProtectionActions, DeleteRangeProtectionCommand, DeleteWorksheetProtectionCommand, RangeProtectionRuleModel, SetWorksheetActiveOperation, WorkbookCreateProtectPermission, WorksheetProtectionRuleModel } from '@univerjs/sheets';
import { ISidebarService, useDependency, useObservable } from '@univerjs/ui';
@@ -308,7 +308,7 @@ export const SheetPermissionPanelList = () => {
`}
onClick={() => handleEdit(rule as IPermissionPanelRule)}
>
- <WriteSingle />
+ <WriteIcon />
</div>
</Tooltip>
)}
@@ -321,7 +321,7 @@ export const SheetPermissionPanelList = () => {
`}
onClick={() => handleDelete(rule)}
>
- <DeleteSingle />
+ <DeleteIcon />
</div>
</Tooltip>
)}
diff --git a/packages/sheets-ui/src/views/permission/spin/index.tsx b/packages/sheets-ui/src/views/permission/spin/index.tsx
index a2f8b546aa..1162636d62 100644
--- a/packages/sheets-ui/src/views/permission/spin/index.tsx
+++ b/packages/sheets-ui/src/views/permission/spin/index.tsx
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-import React from 'react';
+import type { ReactNode } from 'react';
// TODO@jikkai: this component should be moved to the design package
// so it could be reused.
interface ISpinProps {
loading: boolean;
- children: React.ReactNode;
+ children: ReactNode;
}
const Spin = ({ loading, children }: ISpinProps) => {
diff --git a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx b/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
index e8da08b035..08eefab234 100644
--- a/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
+++ b/packages/sheets-ui/src/views/permission/user-dialog/index.tsx
@@ -17,7 +17,7 @@
import type { ICollaborator } from '@univerjs/protocol';
import { LocaleService } from '@univerjs/core';
import { Avatar, Button, Input } from '@univerjs/design';
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { UnitRole } from '@univerjs/protocol';
import { IDialogService, useDependency, useObservable } from '@univerjs/ui';
import { useState } from 'react';
@@ -73,7 +73,7 @@ export const SheetPermissionUserDialog = () => {
>
<Avatar src={item.subject?.avatar} size={24} />
<div className="univer-ml-1.5 univer-flex-1">{item.subject?.name}</div>
- {selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID) !== -1 && (<div><CheckMarkSingle /></div>)}
+ {selectUserInfo?.findIndex((v) => v.subject?.userID === item.subject?.userID) !== -1 && (<div><CheckMarkIcon /></div>)}
</div>
);
})}
diff --git a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
index 4b5e918c1d..4bbcd23fce 100644
--- a/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/SheetBar.tsx
@@ -16,7 +16,7 @@
import type { IScrollState } from './sheet-bar-tabs/utils/slide-tab-bar';
import { ICommandService, IPermissionService, throttle } from '@univerjs/core';
-import { IncreaseSingle, MoreSingle } from '@univerjs/icons';
+import { IncreaseIcon, MoreIcon } from '@univerjs/icons';
import { InsertSheetCommand, WorkbookCreateSheetPermission, WorkbookEditablePermission } from '@univerjs/sheets';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useState } from 'react';
@@ -83,7 +83,7 @@ export const SheetBar = () => {
onClick={addSheet}
disabled={!(workbookCreateSheetPermission?.value && workbookEditablePermission?.value)}
>
- <IncreaseSingle />
+ <IncreaseIcon />
</SheetBarButton>
{/* All sheets button */}
<SheetBarMenu />
@@ -102,10 +102,10 @@ export const SheetBar = () => {
`}
>
<SheetBarButton disabled={leftScrollState} onClick={handleScrollLeft}>
- <MoreSingle className="univer-rotate-180" />
+ <MoreIcon className="univer-rotate-180" />
</SheetBarButton>
<SheetBarButton disabled={rightScrollState} onClick={handleScrollRight}>
- <MoreSingle />
+ <MoreIcon />
</SheetBarButton>
</div>
)}
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx
index 366b7c36bb..6670b0b867 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-button/SheetBarButton.tsx
@@ -14,18 +14,17 @@
* limitations under the License.
*/
+import type { CSSProperties, MouseEvent, ReactNode } from 'react';
import { Button } from '@univerjs/design';
-import React from 'react';
-
export interface IBaseSheetBarButtonProps {
- children?: React.ReactNode;
+ children?: ReactNode;
/** Semantic DOM class */
className?: string;
/** Semantic DOM style */
- style?: React.CSSProperties;
+ style?: CSSProperties;
/**
* Disabled state of button
@@ -34,7 +33,7 @@ export interface IBaseSheetBarButtonProps {
disabled?: boolean;
/** Set the handler to handle `click` event */
- onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void;
+ onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
}
/**
@@ -43,7 +42,7 @@ export interface IBaseSheetBarButtonProps {
export function SheetBarButton(props: IBaseSheetBarButtonProps) {
const { children, className, style, disabled = false, onClick, ...restProps } = props;
- const handleClick = (e: React.MouseEvent<HTMLButtonElement>) => {
+ const handleClick = (e: MouseEvent<HTMLButtonElement>) => {
if (disabled) {
e.preventDefault();
return;
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
index 3ab97b9cef..d3f3817458 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-menu/SheetBarMenu.tsx
@@ -16,9 +16,10 @@
import type { ICommandInfo, Workbook } from '@univerjs/core';
import type { IDropdownMenuProps } from '@univerjs/design';
+import type { ReactNode } from 'react';
import { BooleanNumber, DisposableCollection, ICommandService, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
import { clsx, DropdownMenu } from '@univerjs/design';
-import { CheckMarkSingle, ConvertSingle, EyelashSingle } from '@univerjs/icons';
+import { CheckMarkIcon, ConvertIcon, EyelashIcon } from '@univerjs/icons';
import {
InsertSheetMutation,
RemoveSheetMutation,
@@ -31,13 +32,13 @@ import {
WorksheetProtectionRuleModel,
} from '@univerjs/sheets';
import { useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
import { ISheetBarService } from '../../../services/sheet-bar/sheet-bar.service';
import { SheetBarButton } from '../sheet-bar-button/SheetBarButton';
export interface ISheetBarMenuItem {
- label?: React.ReactNode;
+ label?: ReactNode;
hidden?: boolean;
selected?: boolean;
index?: string;
@@ -132,8 +133,8 @@ export function SheetBarMenu() {
<div className="univer-relative univer-box-border univer-pl-6">
{(item.selected || item.hidden) && (
<span className="univer-absolute univer-left-1 univer-top-0.5">
- {item.selected && <CheckMarkSingle className="univer-size-4 univer-text-primary-600" />}
- {item.hidden && <EyelashSingle className="univer-size-4 univer-text-gray-400" />}
+ {item.selected && <CheckMarkIcon className="univer-size-4 univer-text-primary-600" />}
+ {item.hidden && <EyelashIcon className="univer-size-4 univer-text-gray-400" />}
</span>
)}
@@ -160,7 +161,7 @@ export function SheetBarMenu() {
>
<div>
<SheetBarButton>
- <ConvertSingle />
+ <ConvertIcon />
</SheetBarButton>
</div>
</DropdownMenu>
diff --git a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
index adb875af34..6ef69b141d 100644
--- a/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
+++ b/packages/sheets-ui/src/views/sheet-bar/sheet-bar-tabs/SheetBarTabs.tsx
@@ -20,7 +20,7 @@ import type { IBaseSheetBarProps } from './SheetBarItem';
import type { IScrollState } from './utils/slide-tab-bar';
import { ICommandService, IPermissionService, LocaleService, nameCharacterCheck, Quantity } from '@univerjs/core';
import { DropdownLegacy } from '@univerjs/design';
-import { LockSingle } from '@univerjs/icons';
+import { LockIcon } from '@univerjs/icons';
import {
InsertSheetMutation,
@@ -38,7 +38,7 @@ import {
WorksheetProtectionRuleModel,
} from '@univerjs/sheets';
import { ContextMenuPosition, IConfirmService, UI_PLUGIN_CONFIG_KEY, UIMenu, useConfigValue, useDependency, useObservable } from '@univerjs/ui';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
import { merge } from 'rxjs';
import { useActiveWorkbook } from '../../../components/hook';
import { IEditorBridgeService } from '../../../services/editor-bridge.service';
@@ -82,7 +82,7 @@ export function SheetBarTabs() {
const name = hasProtect
? (
<>
- <LockSingle />
+ <LockIcon />
<span className="univer-outline-none">{sheet.getName()}</span>
</>
)
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index 8d4156518d..de9ed9974b 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -84,7 +84,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*"
diff --git a/packages/sheets-zen-editor/src/views/menu.ts b/packages/sheets-zen-editor/src/views/menu.ts
index cd59e85d48..415efee3aa 100644
--- a/packages/sheets-zen-editor/src/views/menu.ts
+++ b/packages/sheets-zen-editor/src/views/menu.ts
@@ -28,7 +28,7 @@ export function ZenEditorMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
id: OpenZenEditorCommand.id,
type: MenuItemType.BUTTON,
title: 'rightClick.zenEditor',
- icon: 'AmplifySingle',
+ icon: 'AmplifyIcon',
hidden$: getCurrentExclusiveRangeInterest$(accessor),
disabled$: editorBridgeService.currentEditCell$.pipe(
switchMap((cell) => getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission, WorksheetSetCellValuePermission, WorksheetSetCellStylePermission], rangeTypes: [RangeProtectionPermissionEditPoint] })
diff --git a/packages/sheets-zen-editor/src/views/zen-editor/ZenEditor.tsx b/packages/sheets-zen-editor/src/views/zen-editor/ZenEditor.tsx
index 3c163d9aee..59b6425794 100644
--- a/packages/sheets-zen-editor/src/views/zen-editor/ZenEditor.tsx
+++ b/packages/sheets-zen-editor/src/views/zen-editor/ZenEditor.tsx
@@ -18,7 +18,7 @@ import type { IDocumentData } from '@univerjs/core';
import { DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_ZEN_EDITOR_UNIT_ID_KEY, DocumentFlavor, ICommandService } from '@univerjs/core';
import { clsx } from '@univerjs/design';
import { IEditorService } from '@univerjs/docs-ui';
-import { CheckMarkSingle, CloseSingle } from '@univerjs/icons';
+import { CheckMarkIcon, CloseIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useEffect, useRef } from 'react';
import { CancelZenEditCommand, ConfirmZenEditCommand } from '../../commands/commands/zen-editor.command';
@@ -127,7 +127,7 @@ export function ZenEditor() {
`)}
onClick={handleCloseBtnClick}
>
- <CloseSingle className="univer-size-5" />
+ <CloseIcon className="univer-size-5" />
</span>
<span
@@ -137,7 +137,7 @@ export function ZenEditor() {
`)}
onClick={handleConfirmBtnClick}
>
- <CheckMarkSingle className="univer-size-5" />
+ <CheckMarkIcon className="univer-size-5" />
</span>
</div>
<div ref={editorRef} className="univer-absolute univer-inset-0 univer-size-full" />
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index 344acbcc26..661ec62e09 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -74,7 +74,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/slides": "workspace:*",
"@univerjs/ui": "workspace:*"
},
diff --git a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx b/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
index 45d7d7b568..440c261c58 100644
--- a/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
+++ b/packages/slides-ui/src/components/image-popup-menu/ImagePopupMenu.tsx
@@ -17,7 +17,7 @@
import type { IDrawingSearch } from '@univerjs/core';
import { ICommandService, LocaleService } from '@univerjs/core';
import { borderClassName, clsx, Dropdown } from '@univerjs/design';
-import { Autofill, MoreDownSingle } from '@univerjs/icons';
+import { AutofillDoubleIcon, MoreDownIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { useState } from 'react';
@@ -117,13 +117,13 @@ export function SlideImagePopupMenu(props: IImagePopupMenuProps) {
'univer-bg-white dark:!univer-bg-gray-900': !visible,
})}
>
- <Autofill
+ <AutofillDoubleIcon
className={`
univer-fill-primary-600 univer-text-gray-900
dark:!univer-text-white
`}
/>
- {showMore && <MoreDownSingle className="dark:!univer-text-white" />}
+ {showMore && <MoreDownIcon className="dark:!univer-text-white" />}
</div>
</Dropdown>
</div>
diff --git a/packages/slides-ui/src/components/panels/ArrangePanel.tsx b/packages/slides-ui/src/components/panels/ArrangePanel.tsx
index 73e047eb37..b0fcc9c904 100644
--- a/packages/slides-ui/src/components/panels/ArrangePanel.tsx
+++ b/packages/slides-ui/src/components/panels/ArrangePanel.tsx
@@ -18,7 +18,7 @@ import type { Nullable } from '@univerjs/core';
import type { Image, Rect, RichText } from '@univerjs/engine-render';
import { ICommandService, LocaleService } from '@univerjs/core';
import { Button } from '@univerjs/design';
-import { BottomSingle, MoveDownSingle, MoveUpSingle, TopmostSingle } from '@univerjs/icons';
+import { BottomIcon, MoveDownIcon, MoveUpIcon, TopmostIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
import { UpdateSlideElementOperation } from '../../commands/operations/update-element.operation';
import { CanvasView } from '../../controllers/canvas-view';
@@ -104,7 +104,7 @@ export default function ArrangePanel(props: IProps) {
<div className="univer-w-1/2">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.forward); }}>
<span className="univer-flex univer-items-center univer-gap-1">
- <MoveUpSingle />
+ <MoveUpIcon />
{localeService.t('image-panel.arrange.forward')}
</span>
@@ -113,7 +113,7 @@ export default function ArrangePanel(props: IProps) {
<div className="univer-w-1/2">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.backward); }}>
<span className="univer-flex univer-items-center univer-gap-1">
- <MoveDownSingle />
+ <MoveDownIcon />
{localeService.t('image-panel.arrange.backward')}
</span>
@@ -124,7 +124,7 @@ export default function ArrangePanel(props: IProps) {
<div className="univer-w-1/2">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.front); }}>
<span className="univer-flex univer-items-center univer-gap-1">
- <TopmostSingle />
+ <TopmostIcon />
{localeService.t('image-panel.arrange.front')}
</span>
@@ -133,7 +133,7 @@ export default function ArrangePanel(props: IProps) {
<div className="univer-w-1/2">
<Button onClick={() => { onArrangeBtnClick(ArrangeTypeEnum.back); }}>
<span className="univer-flex univer-items-center univer-gap-1">
- <BottomSingle />
+ <BottomIcon />
{localeService.t('image-panel.arrange.back')}
</span>
diff --git a/packages/slides-ui/src/components/panels/FillPanel.tsx b/packages/slides-ui/src/components/panels/FillPanel.tsx
index add97b735c..a8677a0f7f 100644
--- a/packages/slides-ui/src/components/panels/FillPanel.tsx
+++ b/packages/slides-ui/src/components/panels/FillPanel.tsx
@@ -15,14 +15,12 @@
*/
import type { Nullable } from '@univerjs/core';
-
import type { Rect } from '@univerjs/engine-render';
import { ICommandService, LocaleService } from '@univerjs/core';
import { borderTopClassName, clsx, ColorPicker, Dropdown } from '@univerjs/design';
-import { MoreDownSingle, PaintBucket } from '@univerjs/icons';
+import { MoreDownIcon, PaintBucketDoubleIcon } from '@univerjs/icons';
import { useDependency } from '@univerjs/ui';
-
-import React from 'react';
+import { useState } from 'react';
import { UpdateSlideElementOperation } from '../../commands/operations/update-element.operation';
import { CanvasView } from '../../controllers/canvas-view';
@@ -53,7 +51,7 @@ export default function ArrangePanel(props: IProps) {
const object = selectedObjects.values().next().value as Nullable<Rect>;
if (!object) return null;
- const [color, setColor] = React.useState<string>(object.fill?.toString() ?? '');
+ const [color, setColor] = useState<string>(object.fill?.toString() ?? '');
/**
*
@@ -107,8 +105,8 @@ export default function ArrangePanel(props: IProps) {
)}
>
<a className="univer-flex univer-cursor-pointer univer-items-center univer-gap-1">
- <PaintBucket className="univer-fill-primary-600" />
- <MoreDownSingle />
+ <PaintBucketDoubleIcon className="univer-fill-primary-600" />
+ <MoreDownIcon />
</a>
</Dropdown>
</div>
diff --git a/packages/slides-ui/src/controllers/image.menu.ts b/packages/slides-ui/src/controllers/image.menu.ts
index a198589fef..ba702209ad 100644
--- a/packages/slides-ui/src/controllers/image.menu.ts
+++ b/packages/slides-ui/src/controllers/image.menu.ts
@@ -26,7 +26,7 @@ export function SlideImageMenuFactory(accessor: IAccessor): IMenuItem {
return {
id: SLIDES_IMAGE_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: 'AddImageSingle',
+ icon: 'AddImageIcon',
tooltip: 'slide.image.insert.title',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SLIDE),
};
diff --git a/packages/slides-ui/src/controllers/shape.menu.ts b/packages/slides-ui/src/controllers/shape.menu.ts
index 7eae388ae7..014ee42e87 100644
--- a/packages/slides-ui/src/controllers/shape.menu.ts
+++ b/packages/slides-ui/src/controllers/shape.menu.ts
@@ -14,20 +14,19 @@
* limitations under the License.
*/
-import type { IMenuButtonItem, IMenuItem } from '@univerjs/ui';
-import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import type { IAccessor } from '@univerjs/core';
+import type { IMenuButtonItem, IMenuItem } from '@univerjs/ui';
import { UniverInstanceType } from '@univerjs/core';
+import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { InsertSlideShapeRectangleCommand } from '../commands/operations/insert-shape.operation';
-export const GRAPH_SINGLE_ICON = 'graph-single';
export const SHAPE_MENU_ID = 'slide.menu.shape';
export function SlideShapeMenuFactory(accessor: IAccessor): IMenuItem {
return {
id: SHAPE_MENU_ID,
type: MenuItemType.SUBITEMS,
- icon: GRAPH_SINGLE_ICON,
+ icon: 'GraphIcon',
tooltip: 'slide.shape.insert.title',
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SLIDE),
// disabled$: getCurrentRangeDisable$(accessor, { workbookTypes: [WorkbookEditablePermission], worksheetTypes: [WorksheetEditPermission], rangeTypes: [RangeProtectionPermissionEditPoint] }),
diff --git a/packages/slides-ui/src/controllers/slide-ui.controller.ts b/packages/slides-ui/src/controllers/slide-ui.controller.ts
index 00b40cf9ed..fb410afdce 100644
--- a/packages/slides-ui/src/controllers/slide-ui.controller.ts
+++ b/packages/slides-ui/src/controllers/slide-ui.controller.ts
@@ -15,7 +15,7 @@
*/
import { Disposable, ICommandService, Inject, Injector } from '@univerjs/core';
-import { GraphSingle, TextSingle } from '@univerjs/icons';
+import { GraphIcon, TextIcon } from '@univerjs/icons';
import { BuiltInUIPart, ComponentManager, connectInjector, IMenuManagerService, IShortcutService, IUIPartsService } from '@univerjs/ui';
import { ActivateSlidePageOperation } from '../commands/operations/activate.operation';
import { AppendSlideOperation } from '../commands/operations/append-slide.operation';
@@ -32,9 +32,7 @@ import Sidebar, { COMPONENT_SLIDE_SIDEBAR } from '../components/sidebar/Sidebar'
import { SlideSideBar } from '../components/slide-bar/SlideBar';
import { SlideEditorContainer } from '../views/editor-container';
import { menuSchema } from './menu.schema';
-import { GRAPH_SINGLE_ICON } from './shape.menu';
import { EditorDeleteLeftShortcut, generateArrowSelectionShortCutItem } from './shortcuts/editor.shortcuts';
-import { TEXT_ICON_ID } from './text.menu';
/**
* This controller registers UI parts of slide workbench to the base-ui workbench.
@@ -63,8 +61,8 @@ export class SlidesUIController extends Disposable {
private _initCustomComponents(): void {
const componentManager = this._componentManager;
- this.disposeWithMe(componentManager.register(TEXT_ICON_ID, TextSingle));
- this.disposeWithMe(componentManager.register(GRAPH_SINGLE_ICON, GraphSingle));
+ this.disposeWithMe(componentManager.register('TextIcon', TextIcon));
+ this.disposeWithMe(componentManager.register('GraphIcon', GraphIcon));
this.disposeWithMe(componentManager.register(COMPONENT_SLIDE_IMAGE_POPUP_MENU, SlideImagePopupMenu));
this.disposeWithMe(componentManager.register(COMPONENT_SLIDE_SIDEBAR, Sidebar));
}
diff --git a/packages/slides-ui/src/controllers/text.menu.ts b/packages/slides-ui/src/controllers/text.menu.ts
index a20ff039c9..11c59c4de4 100644
--- a/packages/slides-ui/src/controllers/text.menu.ts
+++ b/packages/slides-ui/src/controllers/text.menu.ts
@@ -15,18 +15,16 @@
*/
import type { IAccessor } from '@univerjs/core';
-import { UniverInstanceType } from '@univerjs/core';
import type { IMenuButtonItem } from '@univerjs/ui';
+import { UniverInstanceType } from '@univerjs/core';
import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { SlideAddTextCommand } from '../commands/operations/insert-text.operation';
-export const TEXT_ICON_ID = 'text-single';
-
export function SlideAddTextMenuItemFactory(_accessor: IAccessor): IMenuButtonItem {
return {
id: SlideAddTextCommand.id,
type: MenuItemType.BUTTON,
- icon: TEXT_ICON_ID,
+ icon: 'TextIcon',
tooltip: 'slide.text.insert.title',
hidden$: getMenuHiddenObservable(_accessor, UniverInstanceType.UNIVER_SLIDE),
};
diff --git a/packages/slides-ui/src/views/editor-container/EditorContainer.tsx b/packages/slides-ui/src/views/editor-container/EditorContainer.tsx
index cfc25d391a..a6bdf091d2 100644
--- a/packages/slides-ui/src/views/editor-container/EditorContainer.tsx
+++ b/packages/slides-ui/src/views/editor-container/EditorContainer.tsx
@@ -20,12 +20,10 @@ import { borderClassName, clsx } from '@univerjs/design';
import { IEditorService } from '@univerjs/docs-ui';
import { FIX_ONE_PIXEL_BLUR_OFFSET } from '@univerjs/engine-render';
import { DISABLE_AUTO_FOCUS_KEY, useDependency, useObservable } from '@univerjs/ui';
-import React, { useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
import { SLIDE_EDITOR_ID } from '../../const';
import { ISlideEditorManagerService } from '../../services/slide-editor-manager.service';
-interface ICellIEditorProps { }
-
const HIDDEN_EDITOR_POSITION = -1000;
const EDITOR_DEFAULT_POSITION = {
@@ -37,10 +35,8 @@ const EDITOR_DEFAULT_POSITION = {
/**
* Floating editor's container.
- * @returns
*/
-
-export const SlideEditorContainer: React.FC<ICellIEditorProps> = () => {
+export function SlideEditorContainer() {
const [state, setState] = useState({
...EDITOR_DEFAULT_POSITION,
});
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index 475c256db4..77ef24203c 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -69,7 +69,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/ui": "workspace:*"
},
diff --git a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
index f2a3284338..90d48eaf2f 100644
--- a/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
+++ b/packages/thread-comment-ui/src/views/thread-comment-panel/index.tsx
@@ -20,7 +20,7 @@ import type { Observable } from 'rxjs';
import type { IThreadCommentTreeProps } from '../thread-comment-tree';
import { ICommandService, LocaleService, UniverInstanceType, UserManagerService } from '@univerjs/core';
import { Button, Select } from '@univerjs/design';
-import { IncreaseSingle } from '@univerjs/icons';
+import { IncreaseIcon } from '@univerjs/icons';
import { ThreadCommentModel } from '@univerjs/thread-comment';
import { useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
@@ -263,7 +263,7 @@ export const ThreadCommentPanel = (props: IThreadCommentPanelProps) => {
? (
<div className="univer-mt-2 univer-flex univer-flex-row">
<Button onClick={onAdd}>
- <IncreaseSingle className="univer-mr-1.5" />
+ <IncreaseIcon className="univer-mr-1.5" />
{localeService.t('threadCommentUI.panel.add')}
</Button>
</div>
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 9f7e00f9f9..65ca3a6763 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
@@ -20,8 +20,16 @@ import type { IUniverUIConfig } from '@univerjs/ui';
import type { IThreadCommentEditorInstance } from '../thread-comment-editor';
import { generateRandomId, ICommandService, LocaleService, UserManagerService } from '@univerjs/core';
import { borderClassName, 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 { DeleteIcon, MoreHorizontalIcon, ReplyToCommentIcon, ResolvedIcon, SolveIcon } from '@univerjs/icons';
+import {
+ AddCommentCommand,
+ DeleteCommentCommand,
+ DeleteCommentTreeCommand,
+ getDT,
+ ResolveCommentCommand,
+ ThreadCommentModel,
+ UpdateCommentCommand,
+} from '@univerjs/thread-comment';
import { UI_PLUGIN_CONFIG_KEY, useConfigValue, useDependency, useObservable } from '@univerjs/ui';
import { useEffect, useMemo, useRef, useState } from 'react';
import { debounceTime } from 'rxjs';
@@ -132,7 +140,7 @@ const ThreadCommentItem = (props: IThreadCommentItemProps) => {
`}
onClick={() => onReply(user)}
>
- <ReplyToCommentSingle />
+ <ReplyToCommentIcon />
</div>
)
: null
@@ -179,7 +187,7 @@ const ThreadCommentItem = (props: IThreadCommentItemProps) => {
hover:univer-bg-gray-50
`}
>
- <MoreHorizontalSingle />
+ <MoreHorizontalIcon />
</div>
</Dropdown>
)
@@ -417,7 +425,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
})}
onClick={handleResolve}
>
- {resolved ? <ResolvedSingle /> : <SolveSingle />}
+ {resolved ? <ResolvedIcon /> : <SolveIcon />}
</div>
{currentUser?.userID === comments.root.personId
? (
@@ -430,7 +438,7 @@ export const ThreadCommentTree = (props: IThreadCommentTreeProps) => {
`}
onClick={handleDeleteRoot}
>
- <DeleteSingle />
+ <DeleteIcon />
</div>
)
: null}
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 430a5e0df4..175ebedfc7 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -83,7 +83,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "^0.3.24",
+ "@univerjs/icons": "^0.4.3",
"@wendellhu/redi": "0.18.0",
"localforage": "^1.10.0"
},
diff --git a/packages/ui/src/common/component-manager.ts b/packages/ui/src/common/component-manager.ts
index 7769e51c63..3bbf08d866 100644
--- a/packages/ui/src/common/component-manager.ts
+++ b/packages/ui/src/common/component-manager.ts
@@ -15,117 +15,117 @@
*/
import type { IDisposable } from '@univerjs/core';
-import type React from 'react';
+import type { ForwardRefExoticComponent } from 'react';
import type { defineComponent } from 'vue';
import { toDisposable } from '@univerjs/core';
-
import {
- AddDigitsSingle,
- AddImageSingle,
- AdjustHeight,
- AdjustWidth,
- AlignBottomSingle,
- AlignTextBothSingle,
- AlignTopSingle,
- AllBorderSingle,
- AmplifySingle,
- AutoHeight,
- AutoWidth,
- AutowrapSingle,
- AvgSingle,
- BackSlashSingle,
- BoldSingle,
- BrushSingle,
- CancelFreezeSingle,
- CancelMergeSingle,
- ClearFormat,
- CntSingle,
- CodeSingle,
- Conditions,
- ContentSingle16,
- Copy,
- DeleteCellMoveDown,
- DeleteCellShiftLeft,
- DeleteCellShiftRight,
- DeleteCellShiftUp,
- DeleteColumn,
- DeleteRow,
- DirectExportSingle,
- DollarSingle,
- DownBorder,
- EuroSingle,
- ExportSingle,
- EyeOutlineSingle,
- FolderSingle,
- FontColor,
- FontSizeIncreaseSingle,
- FontSizeReduceSingleSingle,
- FreezeColumnSingle,
- FreezeRowSingle,
- FreezeToSelectedSingle,
- FunctionSingle,
- GridSingle,
- HeaderFooterSingle,
- Hide,
- HorizontalBorder,
- HorizontallySingle,
- HorizontalMergeSingle,
- InnerBorder,
- Insert,
- InsertCellDown,
- InsertCellShiftRight,
- InsertRowAbove,
- InsertRowBelow,
- ItalicSingle,
- KeyboardSingle,
- LeftBorder,
- LeftDoubleDiagonalSingle,
- LeftInsertColumn,
- LeftJustifyingSingle,
- LeftRotationFortyFiveDegreesSingle,
- LeftRotationNinetyDegreesSingle,
- LeftTridiagonalSingle,
- MaxSingle,
- MenuSingle24,
- MergeAllSingle,
- MinSingle,
- MoreDownSingle,
- NoBorderSingle,
- NoColor,
- NoRotationSingle,
- OrderSingle,
- OuterBorder,
- OverflowSingle,
- PaintBucket,
- PasteSpecial,
- PercentSingle,
- PipingSingle,
- RedoSingle,
- Reduce,
- ReduceDigitsSingle,
- ReduceSingle,
- RightBorder,
- RightDoubleDiagonalSingle,
- RightInsertColumn,
- RightJustifyingSingle,
- RightRotationFortyFiveDegreesSingle,
- RightRotationNinetyDegreesSingle,
- RmbSingle,
- RoubleSingle,
- SlashSingle,
- StrikethroughSingle,
- SubscriptSingle,
- SumSingle,
- SuperscriptSingle,
- TruncationSingle,
- UnderlineSingle,
- UndoSingle,
- UnorderSingle,
- UpBorder,
- VerticalBorder,
- VerticalCenterSingle,
- VerticalIntegrationSingle,
- VerticalTextSingle,
+ AddDigitsIcon,
+ AddImageIcon,
+ AdditionAndSubtractionIcon,
+ AdjustHeightDoubleIcon,
+ AdjustWidthDoubleIcon,
+ AlignBottomIcon,
+ AlignTextBothIcon,
+ AlignTopIcon,
+ AllBorderIcon,
+ AmplifyIcon,
+ AutoHeightDoubleIcon,
+ AutoWidthDoubleIcon,
+ AutowrapIcon,
+ AvgIcon,
+ BackSlashIcon,
+ BoldIcon,
+ BrushIcon,
+ CancelFreezeIcon,
+ CancelMergeIcon,
+ ClearFormatDoubleIcon,
+ CntIcon,
+ CodeIcon,
+ ConditionsDoubleIcon,
+ CopyDoubleIcon,
+ DeleteCellMoveDownDoubleIcon,
+ DeleteCellShiftLeftDoubleIcon,
+ DeleteCellShiftRightDoubleIcon,
+ DeleteCellShiftUpDoubleIcon,
+ DeleteColumnDoubleIcon,
+ DeleteRowDoubleIcon,
+ DirectExportIcon,
+ DollarIcon,
+ DownBorderDoubleIcon,
+ EuroIcon,
+ ExportIcon,
+ EyeOutlineIcon,
+ FolderIcon,
+ FontColorDoubleIcon,
+ FontSizeIncreaseIcon,
+ FontSizeReduceIcon,
+ FreezeColumnIcon,
+ FreezeRowIcon,
+ FreezeToSelectedIcon,
+ FunctionIcon,
+ GridIcon,
+ HeaderFooterIcon,
+ HideDoubleIcon,
+ HorizontalBorderDoubleIcon,
+ HorizontallyIcon,
+ HorizontalMergeIcon,
+ InnerBorderDoubleIcon,
+ InsertCellDownDoubleIcon,
+ InsertCellShiftRightDoubleIcon,
+ InsertDoubleIcon,
+ InsertRowAboveDoubleIcon,
+ InsertRowBelowDoubleIcon,
+ ItalicIcon,
+ KeyboardIcon,
+ LeftBorderDoubleIcon,
+ LeftDoubleDiagonalIcon,
+ LeftInsertColumnDoubleIcon,
+ LeftJustifyingIcon,
+ LeftRotationFortyFiveDegreesIcon,
+ LeftRotationNinetyDegreesIcon,
+ LeftTridiagonalIcon,
+ MaxIcon,
+ MenuIcon,
+ MergeAllIcon,
+ MinIcon,
+ MoreDownIcon,
+ NoBorderIcon,
+ NoColorDoubleIcon,
+ NoRotationIcon,
+ OrderIcon,
+ OuterBorderDoubleIcon,
+ OverflowIcon,
+ PaintBucketDoubleIcon,
+ PasteSpecialDoubleIcon,
+ PercentIcon,
+ PipingIcon,
+ RedoIcon,
+ ReduceDigitsIcon,
+ ReduceDoubleIcon,
+ ReduceIcon,
+ RightBorderDoubleIcon,
+ RightDoubleDiagonalIcon,
+ RightInsertColumnDoubleIcon,
+ RightJustifyingIcon,
+ RightRotationFortyFiveDegreesIcon,
+ RightRotationNinetyDegreesIcon,
+ RmbIcon,
+ RoubleIcon,
+ ShortcutIcon,
+ SlashIcon,
+ StrikethroughIcon,
+ SubscriptIcon,
+ SumIcon,
+ SuperscriptIcon,
+ TruncationIcon,
+ UnderlineIcon,
+ UndoIcon,
+ UnorderIcon,
+ UpBorderDoubleIcon,
+ VerticalBorderDoubleIcon,
+ VerticalCenterIcon,
+ VerticalIntegrationIcon,
+ VerticalTextIcon,
} from '@univerjs/icons';
import { cloneElement, createElement, useEffect, useRef } from 'react';
@@ -141,10 +141,10 @@ export interface IVue3Component<T extends Record<string, any> = Record<string, a
}
export interface IReactComponent<T extends Record<string, any> = Record<string, any>> {
framework: 'react';
- component: React.ForwardRefExoticComponent<T>;
+ component: ForwardRefExoticComponent<T>;
};
-export type ComponentType<T extends Record<string, any> = Record<string, any>> = React.ForwardRefExoticComponent<T> | ReturnType<typeof defineComponent>;
+export type ComponentType<T extends Record<string, any> = Record<string, any>> = ForwardRefExoticComponent<T> | ReturnType<typeof defineComponent>;
export type ComponentList = Map<string, IVue3Component | IReactComponent>;
@@ -154,113 +154,114 @@ export class ComponentManager {
// eslint-disable-next-line max-lines-per-function
constructor() {
- const iconList: Record<string, React.ForwardRefExoticComponent<any>> = {
- AddImageSingle,
- AlignBottomSingle,
- AlignTopSingle,
- AllBorderSingle,
- AmplifySingle,
- AutowrapSingle,
- BoldSingle,
- BrushSingle,
- Copy,
- ClearFormat,
- DownBorder,
- FontColor,
- FunctionSingle,
- HorizontallySingle,
- InnerBorder,
- ItalicSingle,
- KeyboardSingle,
- ContentSingle16,
- LeftBorder,
- LeftJustifyingSingle,
- LeftRotationFortyFiveDegreesSingle,
- LeftRotationNinetyDegreesSingle,
- MergeAllSingle,
- HorizontalMergeSingle,
- VerticalIntegrationSingle,
- PipingSingle,
- CancelMergeSingle,
- NoBorderSingle,
- NoColor,
- NoRotationSingle,
- OuterBorder,
- OverflowSingle,
- PaintBucket,
- PasteSpecial,
- MenuSingle24,
- RedoSingle,
- RightBorder,
- RightJustifyingSingle,
- AlignTextBothSingle,
- ReduceSingle,
- RightRotationFortyFiveDegreesSingle,
- RightRotationNinetyDegreesSingle,
- StrikethroughSingle,
- OrderSingle,
- UnorderSingle,
- SuperscriptSingle,
- SubscriptSingle,
- TruncationSingle,
- UnderlineSingle,
- UndoSingle,
- UpBorder,
- VerticalBorder,
- VerticalCenterSingle,
- VerticalTextSingle,
- Insert,
- InsertCellDown,
- InsertCellShiftRight,
- InsertRowAbove,
- InsertRowBelow,
- LeftInsertColumn,
- RightInsertColumn,
- DeleteColumn,
- DeleteRow,
- DeleteCellShiftUp,
- DeleteCellShiftRight,
- DeleteCellShiftLeft,
- DeleteCellMoveDown,
- Reduce,
- Hide,
- HorizontalBorder,
- AutoHeight,
- AutoWidth,
- AdjustHeight,
- AdjustWidth,
- AvgSingle,
- CntSingle,
- MaxSingle,
- MinSingle,
- SumSingle,
- CancelFreezeSingle,
- FreezeColumnSingle,
- FreezeRowSingle,
- GridSingle,
- HeaderFooterSingle,
- FreezeToSelectedSingle,
- CodeSingle,
- FontSizeIncreaseSingle,
- FontSizeReduceSingleSingle,
- BackSlashSingle,
- LeftDoubleDiagonalSingle,
- LeftTridiagonalSingle,
- SlashSingle,
- RightDoubleDiagonalSingle,
- DirectExportSingle,
- FolderSingle,
- ExportSingle,
- Conditions,
- RmbSingle,
- MoreDownSingle,
- AddDigitsSingle,
- ReduceDigitsSingle,
- PercentSingle,
- EuroSingle,
- RoubleSingle,
- DollarSingle,
- EyeOutlineSingle,
+ const iconList: Record<string, ForwardRefExoticComponent<any>> = {
+ AddDigitsIcon,
+ AddImageIcon,
+ AdditionAndSubtractionIcon,
+ AdjustHeightDoubleIcon,
+ AdjustWidthDoubleIcon,
+ AlignBottomIcon,
+ AlignTextBothIcon,
+ AlignTopIcon,
+ AllBorderIcon,
+ AmplifyIcon,
+ AutoHeightDoubleIcon,
+ AutoWidthDoubleIcon,
+ AutowrapIcon,
+ AvgIcon,
+ BackSlashIcon,
+ BoldIcon,
+ BrushIcon,
+ CancelFreezeIcon,
+ CancelMergeIcon,
+ ClearFormatDoubleIcon,
+ CntIcon,
+ CodeIcon,
+ ConditionsDoubleIcon,
+ CopyDoubleIcon,
+ DeleteCellMoveDownDoubleIcon,
+ DeleteCellShiftLeftDoubleIcon,
+ DeleteCellShiftRightDoubleIcon,
+ DeleteCellShiftUpDoubleIcon,
+ DeleteColumnDoubleIcon,
+ DeleteRowDoubleIcon,
+ DirectExportIcon,
+ DollarIcon,
+ DownBorderDoubleIcon,
+ EuroIcon,
+ ExportIcon,
+ EyeOutlineIcon,
+ FolderIcon,
+ FontColorDoubleIcon,
+ FontSizeIncreaseIcon,
+ FontSizeReduceIcon,
+ FreezeColumnIcon,
+ FreezeRowIcon,
+ FreezeToSelectedIcon,
+ FunctionIcon,
+ GridIcon,
+ HeaderFooterIcon,
+ HideDoubleIcon,
+ HorizontalBorderDoubleIcon,
+ HorizontallyIcon,
+ HorizontalMergeIcon,
+ InnerBorderDoubleIcon,
+ InsertCellDownDoubleIcon,
+ InsertCellShiftRightDoubleIcon,
+ InsertDoubleIcon,
+ InsertRowAboveDoubleIcon,
+ InsertRowBelowDoubleIcon,
+ ItalicIcon,
+ KeyboardIcon,
+ LeftBorderDoubleIcon,
+ LeftDoubleDiagonalIcon,
+ LeftInsertColumnDoubleIcon,
+ LeftJustifyingIcon,
+ LeftRotationFortyFiveDegreesIcon,
+ LeftRotationNinetyDegreesIcon,
+ LeftTridiagonalIcon,
+ MaxIcon,
+ MenuIcon,
+ MergeAllIcon,
+ MinIcon,
+ MoreDownIcon,
+ NoBorderIcon,
+ NoColorDoubleIcon,
+ NoRotationIcon,
+ OrderIcon,
+ OuterBorderDoubleIcon,
+ OverflowIcon,
+ PaintBucketDoubleIcon,
+ PasteSpecialDoubleIcon,
+ PercentIcon,
+ PipingIcon,
+ RedoIcon,
+ ReduceDigitsIcon,
+ ReduceDoubleIcon,
+ ReduceIcon,
+ RightBorderDoubleIcon,
+ RightDoubleDiagonalIcon,
+ RightInsertColumnDoubleIcon,
+ RightJustifyingIcon,
+ RightRotationFortyFiveDegreesIcon,
+ RightRotationNinetyDegreesIcon,
+ RmbIcon,
+ RoubleIcon,
+ ShortcutIcon,
+ SlashIcon,
+ StrikethroughIcon,
+ SubscriptIcon,
+ SumIcon,
+ SuperscriptIcon,
+ TruncationIcon,
+ UnderlineIcon,
+ UndoIcon,
+ UnorderIcon,
+ UpBorderDoubleIcon,
+ VerticalBorderDoubleIcon,
+ VerticalCenterIcon,
+ VerticalIntegrationIcon,
+ VerticalTextIcon,
};
for (const k in iconList) {
diff --git a/packages/ui/src/components/custom-label/CustomLabel.tsx b/packages/ui/src/components/custom-label/CustomLabel.tsx
index 18a9eca6cc..3d937699d8 100644
--- a/packages/ui/src/components/custom-label/CustomLabel.tsx
+++ b/packages/ui/src/components/custom-label/CustomLabel.tsx
@@ -14,10 +14,11 @@
* limitations under the License.
*/
+import type { ReactNode } from 'react';
import type { Observable } from 'rxjs';
import type { IMenuSelectorItem } from '../../services/menu/menu';
import { ColorKit, LocaleService } from '@univerjs/core';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import { isObservable } from 'rxjs';
import { ComponentManager } from '../../common/component-manager';
@@ -32,7 +33,7 @@ export type ICustomLabelProps<T = undefined> = {
onChange?(v: string | number): void;
- title?: React.ReactNode;
+ title?: ReactNode;
} & Pick<IMenuSelectorItem<unknown>, 'label' | 'icon'>;
/**
diff --git a/packages/ui/src/components/font-size/FontSize.tsx b/packages/ui/src/components/font-size/FontSize.tsx
index 12714e312d..ccc8450758 100644
--- a/packages/ui/src/components/font-size/FontSize.tsx
+++ b/packages/ui/src/components/font-size/FontSize.tsx
@@ -14,9 +14,10 @@
* limitations under the License.
*/
+import type { KeyboardEvent } from 'react';
import type { IFontSizeProps } from './interface';
import { InputNumber } from '@univerjs/design';
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
import { useObservable } from '../../utils/di';
export const FontSize = (props: IFontSizeProps) => {
@@ -32,7 +33,7 @@ export const FontSize = (props: IFontSizeProps) => {
setRealValue(value);
}
- function handleStopPropagation(e: React.KeyboardEvent<HTMLInputElement>) {
+ function handleStopPropagation(e: KeyboardEvent<HTMLInputElement>) {
e.stopPropagation();
if (e.code === 'Enter') {
diff --git a/packages/ui/src/components/hooks/update-effect.ts b/packages/ui/src/components/hooks/update-effect.ts
index 723925902e..6f1cd53413 100644
--- a/packages/ui/src/components/hooks/update-effect.ts
+++ b/packages/ui/src/components/hooks/update-effect.ts
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-import React, { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
-export const useUpdateEffect: typeof React.useEffect = (effect, deps) => {
- const hasMount = React.useRef(false);
+export const useUpdateEffect: typeof useEffect = (effect, deps) => {
+ const hasMount = useRef(false);
useEffect(() => {
if (hasMount.current) {
diff --git a/packages/ui/src/components/menu/desktop/Menu.tsx b/packages/ui/src/components/menu/desktop/Menu.tsx
index ca5322380e..453e31e8dc 100644
--- a/packages/ui/src/components/menu/desktop/Menu.tsx
+++ b/packages/ui/src/components/menu/desktop/Menu.tsx
@@ -31,7 +31,7 @@ import {
MenuItemGroup as DesignMenuItemGroup,
SubMenu as DesignSubMenu,
} from '@univerjs/design';
-import { CheckMarkSingle, MoreSingle } from '@univerjs/icons';
+import { CheckMarkIcon, MoreIcon } from '@univerjs/icons';
import { useEffect, useMemo, useState } from 'react';
import { combineLatest, isObservable, of } from 'rxjs';
import { ILayoutService } from '../../../services/layout/layout.service';
@@ -170,7 +170,7 @@ function MenuOptionsWrapper(props: IBaseMenuProps) {
>
{typeof value !== 'undefined' && String(value) === String(option.value) && (
<span className="univer-absolute univer-left-0 univer-inline-flex univer-items-center">
- <CheckMarkSingle className="univer-text-primary-600" />
+ <CheckMarkIcon className="univer-text-primary-600" />
</span>
)}
<CustomLabel
@@ -294,7 +294,7 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
{item.shortcut && ` (${item.shortcut})`}
</span>
)}
- expandIcon={<MoreSingle className={moreIconClassName} />}
+ expandIcon={<MoreIcon className={moreIconClassName} />}
>
<DesignMenuItemGroup>
{selections.length > 0 && (
@@ -343,7 +343,7 @@ function MenuItem({ menuItem, onClick }: IMenuItemProps) {
<CustomLabel title={item.title} icon={item.icon} label={item.label} onChange={onChange} />
</span>
)}
- expandIcon={<MoreSingle className={moreIconClassName} />}
+ expandIcon={<MoreIcon className={moreIconClassName} />}
>
<DesignMenuItemGroup>
{subMenuItems.length && <MenuWrapper menuType={item.id} parentKey={item.id} onOptionSelect={onClick} />}
diff --git a/packages/ui/src/components/menu/mobile/MobileMenu.stories.tsx b/packages/ui/src/components/menu/mobile/MobileMenu.stories.tsx
index 2b579bde7f..b39dfd799f 100644
--- a/packages/ui/src/components/menu/mobile/MobileMenu.stories.tsx
+++ b/packages/ui/src/components/menu/mobile/MobileMenu.stories.tsx
@@ -16,7 +16,7 @@
import type { Meta } from '@storybook/react';
import { Inject, Injector, LocaleType, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { ComponentManager } from '../../../common';
import { ContextMenuPosition } from '../../../services/menu/types';
import { IPlatformService, PlatformService } from '../../../services/platform/platform.service';
diff --git a/packages/ui/src/components/progress-bar/ProgressBar.tsx b/packages/ui/src/components/progress-bar/ProgressBar.tsx
index 09876c1ed9..b0695db439 100644
--- a/packages/ui/src/components/progress-bar/ProgressBar.tsx
+++ b/packages/ui/src/components/progress-bar/ProgressBar.tsx
@@ -15,7 +15,7 @@
*/
import { clsx, Tooltip } from '@univerjs/design';
-import { CloseSingle } from '@univerjs/icons';
+import { CloseIcon } from '@univerjs/icons';
import { useEffect, useRef, useState } from 'react';
export interface IProgressBarProps {
@@ -109,7 +109,7 @@ export function ProgressBar(props: IProgressBarProps) {
type="button"
onClick={onTerminate}
>
- <CloseSingle
+ <CloseIcon
className={`
univer-size-3.5
dark:!univer-text-white
diff --git a/packages/ui/src/components/slider/Slider.stories.tsx b/packages/ui/src/components/slider/Slider.stories.tsx
index ea4de800a8..9f535c06aa 100644
--- a/packages/ui/src/components/slider/Slider.stories.tsx
+++ b/packages/ui/src/components/slider/Slider.stories.tsx
@@ -15,7 +15,7 @@
*/
import type { Meta } from '@storybook/react';
-import React, { useState } from 'react';
+import { useState } from 'react';
import { Slider } from './Slider';
diff --git a/packages/ui/src/components/slider/Slider.tsx b/packages/ui/src/components/slider/Slider.tsx
index d478532bac..5bfd1ce29b 100644
--- a/packages/ui/src/components/slider/Slider.tsx
+++ b/packages/ui/src/components/slider/Slider.tsx
@@ -17,7 +17,7 @@
import type { IDropdownMenuProps } from '@univerjs/design';
import { LocaleService } from '@univerjs/core';
import { Button, clsx, DropdownMenu, Tooltip } from '@univerjs/design';
-import { IncreaseSingle, ReduceSingle } from '@univerjs/icons';
+import { IncreaseIcon, ReduceIcon } from '@univerjs/icons';
import React, { useMemo, useRef, useState } from 'react';
import { useDependency } from '../../utils/di';
@@ -172,7 +172,7 @@ export function Slider(props: ISliderProps) {
disabled={value <= min || disabled}
onClick={() => handleStep(-10)}
>
- <ReduceSingle />
+ <ReduceIcon />
</Button>
<div
@@ -223,7 +223,7 @@ export function Slider(props: ISliderProps) {
disabled={value >= max || disabled}
onClick={() => handleStep(10)}
>
- <IncreaseSingle />
+ <IncreaseIcon />
</Button>
<DropdownMenu
diff --git a/packages/ui/src/controllers/menus/menus.ts b/packages/ui/src/controllers/menus/menus.ts
index 442a8c6b44..874c2570a5 100644
--- a/packages/ui/src/controllers/menus/menus.ts
+++ b/packages/ui/src/controllers/menus/menus.ts
@@ -38,7 +38,7 @@ export function UndoMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: UndoCommand.id,
type: MenuItemType.BUTTON,
- icon: 'UndoSingle',
+ icon: 'UndoIcon',
title: 'Undo',
tooltip: 'toolbar.undo',
disabled$: undoRedoDisableFactory$(accessor, true),
@@ -49,7 +49,7 @@ export function RedoMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: RedoCommand.id,
type: MenuItemType.BUTTON,
- icon: 'RedoSingle',
+ icon: 'RedoIcon',
title: 'Redo',
tooltip: 'toolbar.redo',
disabled$: undoRedoDisableFactory$(accessor, false),
diff --git a/packages/ui/src/controllers/shortcut-display/menu.ts b/packages/ui/src/controllers/shortcut-display/menu.ts
index c8ee78f671..4feaa4c7a6 100644
--- a/packages/ui/src/controllers/shortcut-display/menu.ts
+++ b/packages/ui/src/controllers/shortcut-display/menu.ts
@@ -14,18 +14,16 @@
* limitations under the License.
*/
-import type { IAccessor } from '@univerjs/core';
import type { IMenuButtonItem } from '../../services/menu/menu';
import { ToggleShortcutPanelOperation } from '../../commands/operations/toggle-shortcut-panel.operation';
import { MenuItemType } from '../../services/menu/menu';
-export function ShortcutPanelMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
+export function ShortcutPanelMenuItemFactory(): IMenuButtonItem {
return {
id: ToggleShortcutPanelOperation.id,
title: 'toggle-shortcut-panel',
tooltip: 'toggle-shortcut-panel',
- icon: 'KeyboardSingle',
+ icon: 'ShortcutIcon',
type: MenuItemType.BUTTON,
- // hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
};
}
diff --git a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
index c07d70891e..afabdf980a 100644
--- a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
+++ b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx
@@ -15,13 +15,13 @@
*/
import type { IDisposable } from '@univerjs/core';
+import type { ComponentType } from 'react';
import type { IUniverWorkbenchProps } from '../../views/workbench/Workbench';
import type { IUniverUIConfig } from '../config.schema';
import type { IWorkbenchOptions } from './ui.controller';
import { Inject, Injector, IUniverInstanceService, LifecycleService, toDisposable } from '@univerjs/core';
import { ColorPicker, render as createRoot, unmount } from '@univerjs/design';
import { IRenderManagerService } from '@univerjs/engine-render';
-import React from 'react';
import { ComponentManager } from '../../common';
import { HEADING_ITEM_COMPONENT, HeadingItem } from '../../components';
import { COLOR_PICKER_COMPONENT } from '../../components/color-picker/interface';
@@ -70,9 +70,9 @@ export class DesktopUIController extends SingleUnitUIController {
[FONT_FAMILY_ITEM_COMPONENT, FontFamilyItem],
[FONT_SIZE_COMPONENT, FontSize],
[COLOR_PICKER_COMPONENT, ColorPicker],
- ] as [string, React.FC][]).forEach(([id, component]) => {
+ ] as const).forEach(([key, comp]) => {
this.disposeWithMe(
- this._componentManager.register(id, component)
+ this._componentManager.register(key, comp)
);
});
}
@@ -109,7 +109,7 @@ function bootstrap(
mountContainer = createContainer('univer');
}
- const ConnectedApp = connectInjector(DesktopWorkbench, injector) as React.ComponentType<IUniverWorkbenchProps>;
+ const ConnectedApp = connectInjector(DesktopWorkbench, injector) as ComponentType<IUniverWorkbenchProps>;
const onRendered = (contentElement: HTMLElement) => callback(contentElement, mountContainer);
function render() {
diff --git a/packages/ui/src/facade/f-univer.ts b/packages/ui/src/facade/f-univer.ts
index 8a1356d1bd..6795c35a82 100644
--- a/packages/ui/src/facade/f-univer.ts
+++ b/packages/ui/src/facade/f-univer.ts
@@ -141,10 +141,10 @@ export interface IFUniverUIMixin {
* @example
* ```ts
* // Univer Icon can be viewed at https://univer.ai/en-US/icons
- * import { SmileSingle } from '@univerjs/icons'
+ * import { SmileIcon } from '@univerjs/icons'
*
* // Create a custom menu with an univer icon
- * univerAPI.registerComponent('custom-menu-icon', SmileSingle);
+ * univerAPI.registerComponent('custom-menu-icon', SmileIcon);
* univerAPI.createMenu({
* id: 'custom-menu',
* icon: 'custom-menu-icon',
diff --git a/packages/ui/src/views/components/ComponentContainer.tsx b/packages/ui/src/views/components/ComponentContainer.tsx
index 69a3663921..8310bc92ff 100644
--- a/packages/ui/src/views/components/ComponentContainer.tsx
+++ b/packages/ui/src/views/components/ComponentContainer.tsx
@@ -15,25 +15,25 @@
*/
import type { Injector } from '@univerjs/core';
-import type { ComponentType } from 'react';
+import type { ComponentType, ReactNode } from 'react';
import type { ComponentRenderer } from '../../services/parts/parts.service';
-import React, { useMemo, useRef } from 'react';
+import { createElement, useMemo, useRef } from 'react';
import { debounceTime, filter, map, startWith } from 'rxjs';
import { IUIPartsService } from '../../services/parts/parts.service';
import { useDependency, useObservable } from '../../utils/di';
export interface IComponentContainerProps {
components?: Set<ComponentType>;
- fallback?: React.ReactNode;
+ fallback?: ReactNode;
sharedProps?: Record<string, unknown>;
}
-export function ComponentContainer(props: IComponentContainerProps): React.ReactNode {
+export function ComponentContainer(props: IComponentContainerProps): ReactNode {
const { components, fallback, sharedProps } = props;
if (!components || components.size === 0) return fallback ?? null;
return Array.from(components.values()).map((component, index) => {
- return React.createElement(component, { key: `${component.displayName ?? index}`, ...sharedProps });
+ return createElement(component, { key: `${component.displayName ?? index}`, ...sharedProps });
});
}
@@ -44,7 +44,7 @@ export function ComponentContainer(props: IComponentContainerProps): React.React
* @param injector The injector to get the service. It is optional. However, you should not change this prop in a given
* component.
*/
-// eslint-disable-next-line react-refresh/only-export-components
+
export function useComponentsOfPart(part: string, injector?: Injector): Set<ComponentRenderer> {
const uiPartsService = injector?.get(IUIPartsService) ?? useDependency(IUIPartsService);
const uiVisibleChange$ = useMemo(() => uiPartsService.uiVisibleChange$.pipe(filter((ui) => ui.ui === part)), [part, uiPartsService]);
@@ -63,6 +63,5 @@ export function useComponentsOfPart(part: string, injector?: Injector): Set<Comp
[uiPartsService, part, changeInfo]
);
- // eslint-disable-next-line react-hooks/exhaustive-deps
return useMemo(() => uiPartsService.isUIVisible(part) ? uiPartsService.getComponents(part) : new Set(), [componentPartUpdateCount]);
}
diff --git a/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx b/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx
index 327c38c2cb..1077bbf376 100644
--- a/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx
+++ b/packages/ui/src/views/components/confirm-part/ConfirmPart.tsx
@@ -17,7 +17,7 @@
import type { IConfirmProps } from '@univerjs/design';
import type { IConfirmChildrenProps, IConfirmPartMethodOptions, IContextConfirmProps } from './interface';
import { Confirm } from '@univerjs/design';
-import React, { useEffect, useState } from 'react';
+import { cloneElement, useEffect, useState } from 'react';
import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { IConfirmService } from '../../../services/confirm/confirm.service';
@@ -29,7 +29,7 @@ const ContextConfirm = (props: IContextConfirmProps) => {
const [hooks] = useState<IConfirmChildrenProps['hooks']>({});
// eslint-disable-next-line react/no-clone-element
- const childrenWithHooks = children ? React.cloneElement(children, { hooks }) : null;
+ const childrenWithHooks = children ? cloneElement(children, { hooks }) : null;
return (
<Confirm
diff --git a/packages/ui/src/views/components/context-menu/ContextMenu.tsx b/packages/ui/src/views/components/context-menu/ContextMenu.tsx
index bdc93b3c38..dd58d501a5 100644
--- a/packages/ui/src/views/components/context-menu/ContextMenu.tsx
+++ b/packages/ui/src/views/components/context-menu/ContextMenu.tsx
@@ -17,7 +17,7 @@
import type { IMouseEvent } from '@univerjs/engine-render';
import { ICommandService } from '@univerjs/core';
import { Popup } from '@univerjs/design';
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { Menu } from '../../../components/menu/desktop/Menu';
import { IContextMenuService } from '../../../services/contextmenu/contextmenu.service';
diff --git a/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx b/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx
index b73140f7c2..070dcc49c5 100644
--- a/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx
+++ b/packages/ui/src/views/components/context-menu/MobileContextMenu.tsx
@@ -17,7 +17,7 @@
import type { IMouseEvent } from '@univerjs/engine-render';
import { ICommandService } from '@univerjs/core';
import { Popup } from '@univerjs/design';
-import React, { useEffect, useRef, useState } from 'react';
+import { useEffect, useRef, useState } from 'react';
import { MobileMenu } from '../../../components/menu/mobile/MobileMenu';
import { IContextMenuService } from '../../../services/contextmenu/contextmenu.service';
import { useDependency } from '../../../utils/di';
diff --git a/packages/ui/src/views/components/dom/FloatDom.tsx b/packages/ui/src/views/components/dom/FloatDom.tsx
index 73f7fd66f3..84f49c0e83 100644
--- a/packages/ui/src/views/components/dom/FloatDom.tsx
+++ b/packages/ui/src/views/components/dom/FloatDom.tsx
@@ -14,9 +14,10 @@
* limitations under the License.
*/
+import type { CSSProperties } from 'react';
import type { IFloatDom } from '../../../services/dom/canvas-dom-layer.service';
import { DocumentDataModel, IUniverInstanceService } from '@univerjs/core';
-import React, { memo, useEffect, useMemo, useRef } from 'react';
+import { memo, useEffect, useMemo, useRef } from 'react';
import { distinctUntilChanged, first } from 'rxjs';
import { ComponentManager } from '../../../common';
import { CanvasFloatDomService } from '../../../services/dom/canvas-dom-layer.service';
@@ -40,7 +41,7 @@ export const FloatDomSingle = memo((props: { layer: IFloatDom; id: string }) =>
const transformRef = useRef<string>(`transform: rotate(${position?.rotate}deg) translate(${position?.startX}px, ${position?.startY}px)`);
const topRef = useRef<number>(position?.startY ?? 0);
const leftRef = useRef<number>(position?.startX ?? 0);
- const innerStyle = useRef<React.CSSProperties>({
+ const innerStyle = useRef<CSSProperties>({
});
const Component = typeof layer.componentKey === 'string' ? useDependency(ComponentManager).get(layer.componentKey) : layer.componentKey;
diff --git a/packages/ui/src/views/components/popup/CanvasPopup.tsx b/packages/ui/src/views/components/popup/CanvasPopup.tsx
index 40a8a553ff..0935e27072 100644
--- a/packages/ui/src/views/components/popup/CanvasPopup.tsx
+++ b/packages/ui/src/views/components/popup/CanvasPopup.tsx
@@ -14,8 +14,9 @@
* limitations under the License.
*/
+import type { ReactNode } from 'react';
import type { IPopup } from '../../../services/popup/canvas-popup.service';
-import React, { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
import { animationFrameScheduler, combineLatest, map, of, throttleTime } from 'rxjs';
import { ComponentManager } from '../../../common';
import { ICanvasPopupService } from '../../../services/popup/canvas-popup.service';
@@ -24,7 +25,7 @@ import { RectPopup } from './RectPopup';
interface ISingleCanvasPopupProps {
popup: IPopup;
- children?: React.ReactNode;
+ children?: ReactNode;
}
export const SingleCanvasPopup = ({ popup, children }: ISingleCanvasPopupProps) => {
diff --git a/packages/ui/src/views/components/popup/RectPopup.tsx b/packages/ui/src/views/components/popup/RectPopup.tsx
index 811b9dd305..9516c27395 100644
--- a/packages/ui/src/views/components/popup/RectPopup.tsx
+++ b/packages/ui/src/views/components/popup/RectPopup.tsx
@@ -15,12 +15,12 @@
*/
import type { Nullable } from '@univerjs/core';
-import type { RefObject } from 'react';
+import type { ReactNode, RefObject } from 'react';
import type { Observable } from 'rxjs';
import type { IUniverUIConfig } from '../../../controllers/config.schema';
import { IConfigService } from '@univerjs/core';
import { clsx } from '@univerjs/design';
-import React, { createContext, useContext, useEffect, useRef } from 'react';
+import { createContext, useContext, useEffect, useRef } from 'react';
import { createPortal } from 'react-dom';
import { useEvent } from '../../../components/hooks/event';
import { UI_PLUGIN_CONFIG_KEY } from '../../../controllers/config.schema';
@@ -62,7 +62,7 @@ export type RectPopupDirection =
| 'horizontal-center';
export interface IRectPopupProps {
- children?: React.ReactNode;
+ children?: ReactNode;
/**
* the anchor element bounding rect
diff --git a/packages/ui/src/views/components/ribbon/Ribbon.tsx b/packages/ui/src/views/components/ribbon/Ribbon.tsx
index 6a0307a9e3..13c6ad8706 100644
--- a/packages/ui/src/views/components/ribbon/Ribbon.tsx
+++ b/packages/ui/src/views/components/ribbon/Ribbon.tsx
@@ -20,7 +20,7 @@ import type { RibbonType } from '../../../controllers/ui/ui.controller';
import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
import { LocaleService, throttle } from '@univerjs/core';
import { borderBottomClassName, borderClassName, clsx, divideXClassName, Dropdown, HoverCard } from '@univerjs/design';
-import { DatabaseSingle, EyeSingle, FunctionSingle, HomeSingle, InsertSingle, MoreDownSingle, MoreFunctionSingle } from '@univerjs/icons';
+import { DatabaseIcon, EyeIcon, FunctionIcon, HomeIcon, InsertIcon, MoreDownIcon, MoreFunctionIcon } from '@univerjs/icons';
import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { combineLatest } from 'rxjs';
import { IMenuManagerService } from '../../../services/menu/menu-manager.service';
@@ -37,12 +37,12 @@ interface IRibbonProps {
}
const iconMap = {
- [RibbonPosition.START]: HomeSingle,
- [RibbonPosition.INSERT]: InsertSingle,
- [RibbonPosition.FORMULAS]: FunctionSingle,
- [RibbonPosition.DATA]: DatabaseSingle,
- [RibbonPosition.VIEW]: EyeSingle,
- [RibbonPosition.OTHERS]: MoreFunctionSingle,
+ [RibbonPosition.START]: HomeIcon,
+ [RibbonPosition.INSERT]: InsertIcon,
+ [RibbonPosition.FORMULAS]: FunctionIcon,
+ [RibbonPosition.DATA]: DatabaseIcon,
+ [RibbonPosition.VIEW]: EyeIcon,
+ [RibbonPosition.OTHERS]: MoreFunctionIcon,
};
export function Ribbon(props: IRibbonProps) {
@@ -375,7 +375,7 @@ export function Ribbon(props: IRibbonProps) {
onClick={() => setGroupSelectorVisible(true)}
>
{localeService.t(activatedTab)}
- <MoreDownSingle
+ <MoreDownIcon
className={`
univer-text-gray-200
dark:!univer-text-gray-500
@@ -438,7 +438,7 @@ export function Ribbon(props: IRibbonProps) {
)}
>
<a className={toolbarButtonClassName} type="button">
- <MoreFunctionSingle />
+ <MoreFunctionIcon />
</a>
</Dropdown>
</div>
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 3d79ba977b..cfee247e26 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -18,7 +18,7 @@ import type { IDisplayMenuItem, IMenuItem, IMenuSelectorItem, IValueOption } fro
import type { ITooltipWrapperRef } from './TooltipButtonWrapper';
import { ICommandService, LocaleService } from '@univerjs/core';
import { clsx } from '@univerjs/design';
-import { MoreDownSingle } from '@univerjs/icons';
+import { MoreDownIcon } from '@univerjs/icons';
import { forwardRef, useMemo } from 'react';
import { isObservable, Observable } from 'rxjs';
import { ComponentManager } from '../../../common/component-manager';
@@ -160,7 +160,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
})}
data-disabled={disabled}
>
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</DropdownMenuWrapper>
</div>
@@ -202,7 +202,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IDisplayMenuItem<IMenu
'univer-pointer-events-none univer-cursor-not-allowed univer-text-gray-300 dark:!univer-text-gray-600': disabled,
})}
>
- <MoreDownSingle />
+ <MoreDownIcon />
</div>
</div>
</DropdownMenuWrapper>
diff --git a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
index e4cf93158d..2bb2fcda5f 100644
--- a/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
+++ b/packages/ui/src/views/components/ribbon/TooltipButtonWrapper.tsx
@@ -18,7 +18,7 @@ import type { IDropdownMenuProps, IDropdownProps, ITooltipProps } from '@univerj
import type { ReactNode } from 'react';
import type { IMenuItem, IValueOption } from '../../../services/menu/menu';
import { clsx, Dropdown, DropdownMenu, Tooltip } from '@univerjs/design';
-import { CheckMarkSingle } from '@univerjs/icons';
+import { CheckMarkIcon } from '@univerjs/icons';
import { createContext, forwardRef, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
import { combineLatest, of } from 'rxjs';
import { CustomLabel } from '../../../components/custom-label/CustomLabel';
@@ -125,7 +125,7 @@ function Label({ icon, value, option, onOptionSelect }: {
})}
>
{hasCheckMark && String(value) === String(option.value) && (
- <CheckMarkSingle
+ <CheckMarkIcon
className="univer-absolute univer-left-1 univer-top-0.5 univer-text-primary-600"
/>
)}
diff --git a/packages/ui/src/views/components/sidebar/Sidebar.tsx b/packages/ui/src/views/components/sidebar/Sidebar.tsx
index 70a066d419..654e292860 100644
--- a/packages/ui/src/views/components/sidebar/Sidebar.tsx
+++ b/packages/ui/src/views/components/sidebar/Sidebar.tsx
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-import type { CSSProperties } from 'react';
+import type { CSSProperties, ReactNode } from 'react';
import type { ICustomLabelProps } from '../../../components/custom-label/CustomLabel';
import { borderLeftBottomClassName, clsx, scrollbarClassName } from '@univerjs/design';
-import { CloseSingle } from '@univerjs/icons';
-import React, { useEffect, useMemo, useRef } from 'react';
+import { CloseIcon } from '@univerjs/icons';
+import { useEffect, useMemo, useRef } from 'react';
import { CustomLabel } from '../../../components/custom-label/CustomLabel';
import { ISidebarService } from '../../../services/sidebar/sidebar.service';
import { useDependency, useObservable } from '../../../utils/di';
@@ -49,9 +49,9 @@ export function Sidebar() {
}
const copy = { ...sidebarOptions } as Omit<ISidebarMethodOptions, 'children'> & {
- children?: React.ReactNode;
- header?: React.ReactNode;
- footer?: React.ReactNode;
+ children?: ReactNode;
+ header?: ReactNode;
+ footer?: ReactNode;
};
for (const key of ['children', 'header', 'footer']) {
@@ -148,7 +148,7 @@ export function Sidebar() {
`}
onClick={handleClose}
>
- <CloseSingle />
+ <CloseIcon />
</a>
</header>
diff --git a/packages/uniscript/src/controllers/menu.ts b/packages/uniscript/src/controllers/menu.ts
index 718c19e94a..bfdc9741bb 100644
--- a/packages/uniscript/src/controllers/menu.ts
+++ b/packages/uniscript/src/controllers/menu.ts
@@ -14,13 +14,12 @@
* limitations under the License.
*/
-import type { IMenuButtonItem } from '@univerjs/ui';
-import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import type { IAccessor } from '@univerjs/core';
-
+import type { IMenuButtonItem } from '@univerjs/ui';
import { UniverInstanceType } from '@univerjs/core';
-import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
import { RangeProtectionPermissionEditPoint, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, WorksheetSetCellValuePermission } from '@univerjs/sheets';
+import { getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
+import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
import { ToggleScriptPanelOperation } from '../commands/operations/panel.operation';
export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
@@ -28,7 +27,7 @@ export function UniscriptMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
id: ToggleScriptPanelOperation.id,
title: 'toggle-script-panel',
tooltip: 'script-panel.tooltip.menu-button',
- icon: 'CodeSingle',
+ icon: 'CodeIcon',
type: MenuItemType.BUTTON,
// FIXME hidden$ and disabled$ are not correctly in doc
hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9d4faf297d..d70ef34658 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -16,7 +16,7 @@ importers:
devDependencies:
'@antfu/eslint-config':
specifier: 4.13.2
'@commitlint/cli':
specifier: ^19.8.1
version: 19.8.1(@types/[email protected])([email protected])
@@ -133,7 +133,7 @@ importers:
'@vitejs/plugin-vue':
specifier: ^5.2.4
'@vitest/coverage-istanbul':
specifier: ^3.1.4
@@ -184,11 +184,11 @@ importers:
specifier: ^11.0.4
version: 11.0.4
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/icons-svg':
- specifier: ^0.3.24
- version: 0.3.24
+ specifier: ^0.4.3
+ version: 0.4.3
'@univerjs/protocol':
specifier: 0.1.46
version: 0.1.46(@grpc/[email protected])([email protected])
@@ -209,10 +209,10 @@ importers:
'@storybook/addon-styling-webpack':
specifier: ^1.0.1
'@storybook/addon-webpack5-compiler-swc':
specifier: ^3.0.0
'@storybook/blocks':
specifier: 8.6.14
@@ -224,7 +224,7 @@ importers:
'@storybook/react-webpack5':
specifier: 8.6.14
'@storybook/types':
specifier: 8.6.14
@@ -242,19 +242,19 @@ importers:
version: link:../../packages/ui
css-loader:
specifier: ^7.1.2
postcss-loader:
specifier: ^8.1.1
storybook:
specifier: 8.6.14
version: 8.6.14([email protected])
storybook-addon-swc:
specifier: ^1.2.0
style-loader:
specifier: ^4.0.0
tsconfig-paths-webpack-plugin:
specifier: ^4.2.0
version: 4.2.0
@@ -341,8 +341,8 @@ importers:
specifier: workspace:*
version: link:../packages/find-replace
'@univerjs/icons':
- specifier: 0.3.24
+ specifier: 0.4.3
'@univerjs/mockdata':
specifier: workspace:*
version: link:../mockdata
@@ -508,19 +508,19 @@ importers:
version: 2.1.0
esbuild:
specifier: ^0.25.4
- version: 0.25.4
+ version: 0.25.5
esbuild-plugin-alias:
specifier: ^0.2.1
version: 0.2.1
esbuild-plugin-clean:
specifier: ^1.0.1
- version: 1.0.1([email protected])
+ version: 1.0.1([email protected])
esbuild-plugin-copy:
specifier: ^2.1.1
- version: 2.1.1([email protected])
+ version: 2.1.1([email protected])
esbuild-plugin-vue3:
specifier: ^0.4.2
esbuild-style-plugin:
specifier: ^1.6.3
version: 1.6.3
@@ -703,8 +703,8 @@ importers:
specifier: workspace:*
version: link:../../packages/engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/mockdata':
specifier: workspace:*
version: link:../../mockdata
@@ -832,8 +832,8 @@ importers:
specifier: workspace:*
version: link:../../packages/engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/rpc':
specifier: workspace:*
version: link:../../packages/rpc
@@ -893,8 +893,8 @@ importers:
specifier: workspace:*
version: link:../../packages/docs-ui
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../../packages/sheets
@@ -948,8 +948,8 @@ importers:
specifier: workspace:*
version: link:../../packages/engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/slides-ui':
specifier: workspace:*
version: link:../../packages/slides-ui
@@ -1000,8 +1000,8 @@ importers:
specifier: workspace:*
version: link:../../packages/engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../../packages/sheets
@@ -1055,8 +1055,8 @@ importers:
specifier: workspace:*
version: link:../design
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -1211,8 +1211,8 @@ importers:
specifier: ^2.2.6
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/themes':
specifier: workspace:*
version: link:../themes
@@ -1432,8 +1432,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1536,8 +1536,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1582,8 +1582,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/thread-comment':
specifier: workspace:*
version: link:../thread-comment
@@ -1637,8 +1637,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1717,8 +1717,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1852,8 +1852,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -2011,8 +2011,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@univerjs/icons-svg':
- specifier: ^0.3.24
- version: 0.3.24
+ specifier: ^0.4.3
+ version: 0.4.3
rxjs:
specifier: ^7.8.2
version: 7.8.2
@@ -2041,8 +2041,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2096,8 +2096,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2191,8 +2191,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2366,8 +2366,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/rpc':
specifier: workspace:*
version: link:../rpc
@@ -2501,8 +2501,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2618,8 +2618,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2701,8 +2701,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2790,8 +2790,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2870,8 +2870,8 @@ importers:
specifier: workspace:*
version: link:../engine-formula
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2953,8 +2953,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -3042,8 +3042,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -3112,8 +3112,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/protocol':
specifier: 0.1.46
version: 0.1.46(@grpc/[email protected])([email protected])
@@ -3173,8 +3173,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -3253,8 +3253,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/slides':
specifier: workspace:*
version: link:../slides
@@ -3349,8 +3349,8 @@ importers:
specifier: workspace:*
version: link:../docs-ui
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@univerjs/thread-comment':
specifier: workspace:*
version: link:../thread-comment
@@ -3395,8 +3395,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: ^0.3.24
+ specifier: ^0.4.3
'@wendellhu/redi':
specifier: 0.18.0
version: 0.18.0
@@ -3443,7 +3443,7 @@ importers:
optionalDependencies:
vue:
specifier: '>=3.0.0'
- version: 3.5.14([email protected])
+ version: 3.5.15([email protected])
packages/uniscript:
dependencies:
@@ -4093,66 +4093,132 @@ packages:
cpu: [ppc64]
os: [aix]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==}
+ engines: {node: '>=18'}
+ cpu: [ppc64]
+ os: [aix]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==}
engines: {node: '>=18'}
cpu: [arm64]
os: [android]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [android]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==}
engines: {node: '>=18'}
cpu: [arm]
os: [android]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==}
+ engines: {node: '>=18'}
+ cpu: [arm]
+ os: [android]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==}
engines: {node: '>=18'}
cpu: [x64]
os: [android]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [android]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==}
engines: {node: '>=18'}
cpu: [arm64]
os: [darwin]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [darwin]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==}
engines: {node: '>=18'}
cpu: [x64]
os: [darwin]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [darwin]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [freebsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [freebsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==}
engines: {node: '>=18'}
cpu: [x64]
os: [freebsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [freebsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==}
engines: {node: '>=18'}
cpu: [arm]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==}
+ engines: {node: '>=18'}
+ cpu: [arm]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==}
engines: {node: '>=18'}
cpu: [ia32]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==}
+ engines: {node: '>=18'}
+ cpu: [ia32]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==}
engines: {node: '>=12'}
@@ -4165,84 +4231,168 @@ packages:
cpu: [loong64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==}
+ engines: {node: '>=18'}
+ cpu: [loong64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==}
engines: {node: '>=18'}
cpu: [mips64el]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==}
+ engines: {node: '>=18'}
+ cpu: [mips64el]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==}
engines: {node: '>=18'}
cpu: [ppc64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==}
+ engines: {node: '>=18'}
+ cpu: [ppc64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==}
engines: {node: '>=18'}
cpu: [riscv64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==}
+ engines: {node: '>=18'}
+ cpu: [riscv64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==}
engines: {node: '>=18'}
cpu: [s390x]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==}
+ engines: {node: '>=18'}
+ cpu: [s390x]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==}
engines: {node: '>=18'}
cpu: [x64]
os: [linux]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [linux]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [netbsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [netbsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==}
engines: {node: '>=18'}
cpu: [x64]
os: [netbsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [netbsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==}
engines: {node: '>=18'}
cpu: [arm64]
os: [openbsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [openbsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==}
engines: {node: '>=18'}
cpu: [x64]
os: [openbsd]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [openbsd]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==}
engines: {node: '>=18'}
cpu: [x64]
os: [sunos]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [sunos]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==}
engines: {node: '>=18'}
cpu: [arm64]
os: [win32]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==}
+ engines: {node: '>=18'}
+ cpu: [arm64]
+ os: [win32]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==}
engines: {node: '>=18'}
cpu: [ia32]
os: [win32]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==}
+ engines: {node: '>=18'}
+ cpu: [ia32]
+ os: [win32]
+
'@esbuild/[email protected]':
resolution: {integrity: sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==}
engines: {node: '>=18'}
cpu: [x64]
os: [win32]
+ '@esbuild/[email protected]':
+ resolution: {integrity: sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==}
+ engines: {node: '>=18'}
+ cpu: [x64]
+ os: [win32]
+
'@eslint-community/[email protected]':
resolution: {integrity: sha512-MAhuTKlr4y/CE3WYX26raZjy+I/kS2PLKSzvfmDCGrBLTFHOYwqROZdr4XwPgXwX3K9rjzMr4pSmUWGnzsUyMg==}
engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -5732,11 +5882,11 @@ packages:
resolution: {integrity: sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-QMeC8N/zqIx6rQUDhs6NkDNLVMJFwxKXrZFD6I5p/qxlalUenQ1PVcM5XB0b2VmaSNbZ9+7ZFNNWq0S2TojEwA==}
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-UnrXiMt1gzhSmzGtA/zvtslj2cxfGTvhl8yQqcjDlQw8OCkGgoBLQLOHyZJKSiJPR0/xBDPfU9jd/puSLe/xgg==}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-ClGOKE0GS+hgvtP4XAI0ekKCmcrs4VZqZUVQddunuP7h+prCr01vMEuoLax9I/PrjOrSrl2u/xpvs9iGtXP1xw==}
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-X017UthZP5XGwG+UMzO1AamL9ceCc+9N3kJzLNRtIrHPzIrK1ki/7273olctVrdMZ296nE3YJ/pJP7vW8VqOrQ==}
peerDependencies:
react: 19.1.0
react-dom: 19.1.0
@@ -5922,20 +6072,20 @@ packages:
resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
- resolution: {integrity: sha512-k7qMHMbKvoCXIxPhquKQVw3Twid3Kg4s7+oYURxLGRd56LiuHJVrvFKI4fm2AM3c8apqODPfVJGoh8nePbXMRA==}
+ resolution: {integrity: sha512-nGRc6YJg/kxNqbv/7Tg4juirPnjHvuVdhcmDvQWVZXlLHjouq7VsKmV1hIxM/8yKM0VUfwT/Uzc0lO510ltZqw==}
resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
- resolution: {integrity: sha512-1aOCSqxGOea5I80U2hQJvXYpPm/aXo95xL/m/mMhgyPUsKe9jhjwWpziNAw7tYRnbz1I61rd9Mld4W9KmmRoug==}
+ resolution: {integrity: sha512-ZelQd9n+O/UCBdL00rlwCrsArSak+YLZpBVuNDio1hN3+wrCshYZEDUO3khSLAzPbF1oQS2duEoMDUHScUlYjA==}
- resolution: {integrity: sha512-9T6m/9mMr81Lj58JpzsiSIjBgv2LiVoWjIVa7kuXHICUi8LiDSIotMpPRXYJsXKqyARrzjT24NAwttrMnMaCXA==}
+ resolution: {integrity: sha512-3zndKbxMsOU6afQWer75Zot/aydjtxNj0T2KLg033rAFaQUn2PGuE32ZRe4iMhflbTcAxL0yEYsRWFxtPro8RQ==}
- resolution: {integrity: sha512-Y0G7PcBxr1yllnHuS/NxNCSPWnRGH4Ogrp0tsLA5QemDZuJLs99YjAKQ7KqkHE0vCg4QTKlQzXLKCMF7WPSl7Q==}
+ resolution: {integrity: sha512-gShn8zRREZbrXqTtmLSCffgZXDWv8nHc/GhsW+mbwBfNZL5pI96e7IWcIq8XGQe1TLtVbu7EV9gFIVSmfyarPg==}
resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
@@ -5948,25 +6098,25 @@ packages:
typescript:
optional: true
- resolution: {integrity: sha512-7cK1Hp343Fu/SUCCO52vCabjvsYu7ZkOqyYu7bXV9P2yyfjUMUXHZafEbq244sP7gf+EZEz+77QixBTuEqkQQw==}
+ resolution: {integrity: sha512-GaA5VUm30YWobCwpvcs9nvFKf27EdSLKDo2jA0IXzGS344oNpFNbEQ9z+Pp5ESDaxyS8FcH0vFN/XSe95BZtHQ==}
- resolution: {integrity: sha512-w9JWEANwHXNgieAhxPpEpJa+0V5G0hz3NmjAZwlOebtfKyp2hKxKF0+qSh0Xs6/PhfGihuSdqMprMVcQU/E6ag==}
+ resolution: {integrity: sha512-CZAlIOQ93nj0OPpWWOx4+QDLCMzBNY85IQR4Voe6vIID149yF8g9WQaWnw042f/6JfvLttK7dnyWlC1EVCRK8Q==}
- resolution: {integrity: sha512-lCfR++IakeI35TVR80QgOelsUIdcKjd65rWAMfdSlCYnaEY5t3hYwru7vvcWaqmrK+LpI7ZDDYiGU5V3xjMacw==}
+ resolution: {integrity: sha512-wFplHKzKO/v998up2iCW3RN9TNUeDMhdBcNYZgs5LOokHntrB48dyuZHspcahKZczKKh3v6i164gapMPxBTKNw==}
- resolution: {integrity: sha512-Rf/ISLqokIvcySIYnv3tNWq40PLpNLDLSJwwVWzG6MNtyIhfbcrAxo5ZL9nARJhqjZyWWa40oRb2IDuejeuv6w==}
+ resolution: {integrity: sha512-Gehc693kVTYkLt6QSYEjGvqvdK2zZ/gf/D5zkgmvBdeB30dNnVZS8yY7+IlBmHRd1rR/zwaqeu06Ij04ZxBscg==}
peerDependencies:
- vue: 3.5.14
+ vue: 3.5.15
resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
- resolution: {integrity: sha512-oXTwNxVfc9EtP1zzXAlSlgARLXNC84frFYkS0HHz0h3E4WZSP9sywqjqzGCP9Y34M8ipNmd380pVgmMuwELDyQ==}
+ resolution: {integrity: sha512-bKvgFJJL1ZX9KxMCTQY6xD9Dhe3nusd1OhyOb1cJYGqvAr0Vg8FIjHPMOEVbJ9GDT9HG+Bjdn4oS8ohKP8EvoA==}
'@webassemblyjs/[email protected]':
resolution: {integrity: sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==}
@@ -7350,6 +7500,11 @@ packages:
engines: {node: '>=18'}
hasBin: true
+ resolution: {integrity: sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==}
+ engines: {node: '>=18'}
+ hasBin: true
+
resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
engines: {node: '>=6'}
@@ -11026,8 +11181,8 @@ packages:
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
- resolution: {integrity: sha512-LbOm50/vZFG6Mhy6KscQYXZMQ0LMCC/y40HDJPPvGFQ+i/lUH+PJHR6C3assgOQiXdl6tAfsXHbXYVBZZu65ew==}
+ resolution: {integrity: sha512-aD9zK4rB43JAMK/5BmS4LdPiEp8Fdh8P1Ve/XNuMF5YRf78fCyPE6FUbQwcaWQ5oZ1R2CD9NKE0FFOVpMR7gEQ==}
peerDependencies:
typescript: '*'
peerDependenciesMeta:
@@ -11275,7 +11430,7 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.8
'@jridgewell/trace-mapping': 0.3.25
dependencies:
'@antfu/install-pkg': 1.1.0
'@clack/prompts': 0.10.1
@@ -11306,7 +11461,7 @@ snapshots:
eslint-plugin-yml: 1.18.0([email protected]([email protected]))
- eslint-processor-vue-blocks: 2.0.0(@vue/[email protected])([email protected]([email protected]))
+ eslint-processor-vue-blocks: 2.0.0(@vue/[email protected])([email protected]([email protected]))
globals: 16.1.0
jsonc-eslint-parser: 2.4.0
local-pkg: 1.1.1
@@ -11887,81 +12042,156 @@ 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
+
dependencies:
escape-string-regexp: 4.0.0
@@ -13049,10 +13279,10 @@ snapshots:
storybook: 8.6.14([email protected])
ts-dedent: 2.2.0
dependencies:
'@storybook/node-logger': 8.6.12([email protected]([email protected]))
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
transitivePeerDependencies:
- storybook
@@ -13065,10 +13295,10 @@ snapshots:
memoizerific: 1.11.3
storybook: 8.6.14([email protected])
dependencies:
'@swc/core': 1.11.24
transitivePeerDependencies:
- '@swc/helpers'
- webpack
@@ -13082,7 +13312,7 @@ snapshots:
react: 19.1.0
react-dom: 19.1.0([email protected])
dependencies:
'@storybook/core-webpack': 8.6.14([email protected]([email protected]))
'@types/semver': 7.7.0
@@ -13090,23 +13320,23 @@ snapshots:
case-sensitive-paths-webpack-plugin: 2.4.0
cjs-module-lexer: 1.4.3
constants-browserify: 1.0.0
es-module-lexer: 1.7.0
- fork-ts-checker-webpack-plugin: 8.0.0([email protected])([email protected](@swc/[email protected])([email protected]))
- html-webpack-plugin: 5.6.3([email protected](@swc/[email protected])([email protected]))
+ fork-ts-checker-webpack-plugin: 8.0.0([email protected])([email protected](@swc/[email protected])([email protected]))
+ html-webpack-plugin: 5.6.3([email protected](@swc/[email protected])([email protected]))
magic-string: 0.30.17
path-browserify: 1.0.1
process: 0.11.10
semver: 7.7.1
storybook: 8.6.14([email protected])
ts-dedent: 2.2.0
url: 0.11.4
util: 0.12.5
util-deprecate: 1.0.2
- webpack: 5.99.8(@swc/[email protected])([email protected])
- webpack-dev-middleware: 6.1.3([email protected](@swc/[email protected])([email protected]))
+ webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack-dev-middleware: 6.1.3([email protected](@swc/[email protected])([email protected]))
webpack-hot-middleware: 2.26.1
webpack-virtual-modules: 0.6.2
optionalDependencies:
@@ -13132,8 +13362,8 @@ snapshots:
'@storybook/theming': 8.6.14([email protected]([email protected]))
better-opn: 3.0.2
browser-assert: 1.2.1
- esbuild: 0.25.4
- esbuild-register: 3.6.0([email protected])
+ esbuild: 0.25.5
+ esbuild-register: 3.6.0([email protected])
jsdoc-type-pratt-parser: 4.1.0
process: 0.11.10
recast: 0.23.11
@@ -13174,11 +13404,11 @@ snapshots:
dependencies:
storybook: 8.6.14([email protected])
dependencies:
'@storybook/core-webpack': 8.6.14([email protected]([email protected]))
- '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0([email protected])([email protected](@swc/[email protected])([email protected]))
+ '@storybook/react-docgen-typescript-plugin': 1.0.6--canary.9.0c3f3b7.0([email protected])([email protected](@swc/[email protected])([email protected]))
'@types/semver': 7.7.0
find-up: 5.0.0
magic-string: 0.30.17
@@ -13189,7 +13419,7 @@ snapshots:
semver: 7.7.1
storybook: 8.6.14([email protected])
tsconfig-paths: 4.2.0
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
optionalDependencies:
typescript: 5.8.3
transitivePeerDependencies:
@@ -13204,7 +13434,7 @@ snapshots:
dependencies:
storybook: 8.6.14([email protected])
dependencies:
debug: 4.4.1
endent: 2.1.0
@@ -13214,7 +13444,7 @@ snapshots:
react-docgen-typescript: 2.2.2([email protected])
tslib: 2.8.1
typescript: 5.8.3
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
transitivePeerDependencies:
- supports-color
@@ -13224,10 +13454,10 @@ snapshots:
react-dom: 19.1.0([email protected])
storybook: 8.6.14([email protected])
dependencies:
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -13617,9 +13847,9 @@ snapshots:
'@typescript-eslint/types': 8.32.1
eslint-visitor-keys: 4.2.0
- '@univerjs/[email protected]': {}
+ '@univerjs/[email protected]': {}
dependencies:
react: 19.1.0
react-dom: 19.1.0([email protected])
@@ -13694,10 +13924,10 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- vue: 3.5.14([email protected])
+ vue: 3.5.15([email protected])
dependencies:
@@ -13817,10 +14047,10 @@ snapshots:
estree-walker: 2.0.2
source-map-js: 1.2.1
dependencies:
'@babel/parser': 7.27.2
- '@vue/shared': 3.5.14
+ '@vue/shared': 3.5.15
entities: 4.5.0
estree-walker: 2.0.2
source-map-js: 1.2.1
@@ -13830,27 +14060,27 @@ snapshots:
'@vue/compiler-core': 3.5.13
'@vue/shared': 3.5.13
dependencies:
- '@vue/compiler-core': 3.5.14
- '@vue/shared': 3.5.14
+ '@vue/compiler-core': 3.5.15
+ '@vue/shared': 3.5.15
dependencies:
'@babel/parser': 7.27.2
- '@vue/compiler-core': 3.5.14
- '@vue/compiler-dom': 3.5.14
- '@vue/compiler-ssr': 3.5.14
- '@vue/shared': 3.5.14
+ '@vue/compiler-core': 3.5.15
+ '@vue/compiler-dom': 3.5.15
+ '@vue/compiler-ssr': 3.5.15
+ '@vue/shared': 3.5.15
estree-walker: 2.0.2
magic-string: 0.30.17
postcss: 8.5.3
source-map-js: 1.2.1
dependencies:
- '@vue/compiler-dom': 3.5.14
- '@vue/shared': 3.5.14
+ '@vue/compiler-dom': 3.5.15
+ '@vue/shared': 3.5.15
dependencies:
@@ -13870,31 +14100,31 @@ snapshots:
optionalDependencies:
typescript: 5.8.3
dependencies:
- '@vue/shared': 3.5.14
+ '@vue/shared': 3.5.15
dependencies:
- '@vue/reactivity': 3.5.14
- '@vue/shared': 3.5.14
+ '@vue/reactivity': 3.5.15
+ '@vue/shared': 3.5.15
dependencies:
- '@vue/reactivity': 3.5.14
- '@vue/runtime-core': 3.5.14
- '@vue/shared': 3.5.14
+ '@vue/reactivity': 3.5.15
+ '@vue/runtime-core': 3.5.15
+ '@vue/shared': 3.5.15
csstype: 3.1.3
dependencies:
- '@vue/compiler-ssr': 3.5.14
- '@vue/shared': 3.5.14
- vue: 3.5.14([email protected])
+ '@vue/compiler-ssr': 3.5.15
+ '@vue/shared': 3.5.15
+ vue: 3.5.15([email protected])
'@vue/[email protected]': {}
- '@vue/[email protected]': {}
+ '@vue/[email protected]': {}
'@webassemblyjs/[email protected]':
dependencies:
@@ -14751,7 +14981,7 @@ snapshots:
postcss-selector-parser: 7.1.0
postcss-value-parser: 4.2.0
dependencies:
icss-utils: 5.1.0([email protected])
postcss: 8.5.3
@@ -14762,9 +14992,9 @@ snapshots:
postcss-value-parser: 4.2.0
semver: 7.7.1
optionalDependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
icss-utils: 5.1.0([email protected])
postcss: 8.5.3
@@ -14775,7 +15005,7 @@ snapshots:
postcss-value-parser: 4.2.0
semver: 7.7.1
optionalDependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
@@ -15239,32 +15469,32 @@ snapshots:
dependencies:
chalk: 4.1.2
del: 6.1.1
- esbuild: 0.25.4
+ esbuild: 0.25.5
dependencies:
chalk: 4.1.2
chokidar: 3.6.0
- esbuild: 0.25.4
+ esbuild: 0.25.5
fs-extra: 10.1.0
globby: 11.1.0
dependencies:
esbuild: 0.14.54
typescript: 4.9.5
- vue: 3.5.14([email protected])
+ vue: 3.5.15([email protected])
optionalDependencies:
sass: 1.87.0
dependencies:
debug: 4.4.0
- esbuild: 0.25.4
+ esbuild: 0.25.5
transitivePeerDependencies:
- supports-color
@@ -15341,6 +15571,34 @@ snapshots:
'@esbuild/win32-ia32': 0.25.4
'@esbuild/win32-x64': 0.25.4
+ optionalDependencies:
+ '@esbuild/aix-ppc64': 0.25.5
+ '@esbuild/android-arm': 0.25.5
+ '@esbuild/android-arm64': 0.25.5
+ '@esbuild/android-x64': 0.25.5
+ '@esbuild/darwin-arm64': 0.25.5
+ '@esbuild/darwin-x64': 0.25.5
+ '@esbuild/freebsd-arm64': 0.25.5
+ '@esbuild/freebsd-x64': 0.25.5
+ '@esbuild/linux-arm': 0.25.5
+ '@esbuild/linux-arm64': 0.25.5
+ '@esbuild/linux-ia32': 0.25.5
+ '@esbuild/linux-loong64': 0.25.5
+ '@esbuild/linux-mips64el': 0.25.5
+ '@esbuild/linux-ppc64': 0.25.5
+ '@esbuild/linux-riscv64': 0.25.5
+ '@esbuild/linux-s390x': 0.25.5
+ '@esbuild/linux-x64': 0.25.5
+ '@esbuild/netbsd-arm64': 0.25.5
+ '@esbuild/netbsd-x64': 0.25.5
+ '@esbuild/openbsd-arm64': 0.25.5
+ '@esbuild/openbsd-x64': 0.25.5
+ '@esbuild/sunos-x64': 0.25.5
+ '@esbuild/win32-arm64': 0.25.5
+ '@esbuild/win32-ia32': 0.25.5
+ '@esbuild/win32-x64': 0.25.5
+
@@ -15753,9 +16011,9 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@vue/compiler-sfc': 3.5.14
+ '@vue/compiler-sfc': 3.5.15
eslint: 9.27.0([email protected])
@@ -15987,7 +16245,7 @@ snapshots:
cross-spawn: 7.0.6
signal-exit: 4.1.0
dependencies:
'@babel/code-frame': 7.27.1
chalk: 4.1.2
@@ -16002,7 +16260,7 @@ snapshots:
semver: 7.7.1
tapable: 2.2.1
typescript: 5.8.3
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
@@ -16276,7 +16534,7 @@ snapshots:
relateurl: 0.2.7
terser: 5.39.0
dependencies:
'@types/html-minifier-terser': 6.1.0
html-minifier-terser: 6.1.0
@@ -16284,7 +16542,7 @@ snapshots:
pretty-error: 4.0.0
tapable: 2.2.1
optionalDependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
@@ -17924,14 +18182,14 @@ snapshots:
optionalDependencies:
postcss: 8.5.3
dependencies:
cosmiconfig: 9.0.0([email protected])
jiti: 1.21.7
postcss: 8.5.3
semver: 7.7.1
optionalDependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
transitivePeerDependencies:
- typescript
@@ -18941,15 +19199,15 @@ snapshots:
dependencies:
'@babel/runtime': 7.27.1
'@swc/core': 1.11.24
deepmerge: 4.3.1
optionalDependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
@@ -19069,13 +19327,13 @@ snapshots:
dependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
@@ -19097,16 +19355,16 @@ snapshots:
dependencies:
'@swc/core': 1.11.24
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
'@swc/core': 1.11.24
'@swc/counter': 0.1.3
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
@@ -19167,17 +19425,17 @@ snapshots:
dependencies:
'@jridgewell/trace-mapping': 0.3.25
jest-worker: 27.5.1
schema-utils: 4.3.2
serialize-javascript: 6.0.2
terser: 5.39.0
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
optionalDependencies:
'@swc/core': 1.11.24
- esbuild: 0.25.4
+ esbuild: 0.25.5
dependencies:
@@ -19292,7 +19550,7 @@ snapshots:
dependencies:
- esbuild: 0.25.4
+ esbuild: 0.25.5
get-tsconfig: 4.10.0
optionalDependencies:
fsevents: 2.3.3
@@ -19671,13 +19929,13 @@ snapshots:
transitivePeerDependencies:
- supports-color
dependencies:
- '@vue/compiler-dom': 3.5.14
- '@vue/compiler-sfc': 3.5.14
- '@vue/runtime-dom': 3.5.14
- '@vue/server-renderer': 3.5.14([email protected]([email protected]))
- '@vue/shared': 3.5.14
+ '@vue/compiler-dom': 3.5.15
+ '@vue/compiler-sfc': 3.5.15
+ '@vue/runtime-dom': 3.5.15
+ '@vue/server-renderer': 3.5.15([email protected]([email protected]))
+ '@vue/shared': 3.5.15
optionalDependencies:
typescript: 5.8.3
@@ -19703,7 +19961,7 @@ snapshots:
dependencies:
colorette: 2.0.20
memfs: 3.5.3
@@ -19711,7 +19969,7 @@ snapshots:
range-parser: 1.2.1
schema-utils: 4.3.2
optionalDependencies:
- webpack: 5.99.8(@swc/[email protected])([email protected])
+ webpack: 5.99.8(@swc/[email protected])([email protected])
dependencies:
@@ -19723,7 +19981,7 @@ snapshots:
dependencies:
'@types/eslint-scope': 3.7.7
'@types/estree': 1.0.7
@@ -19746,7 +20004,7 @@ snapshots:
neo-async: 2.6.2
schema-utils: 4.3.2
tapable: 2.2.1
watchpack: 2.4.2
webpack-sources: 3.2.3
transitivePeerDependencies: