Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

feat: add symbol picker and refine editor controls (#7313)

白熱fc6d01afccfe
diff --git a/common/debugger/package.json b/common/debugger/package.json
index 249b1b24bd..d4a78aea35 100644
--- a/common/debugger/package.json
+++ b/common/debugger/package.json
@@ -35,7 +35,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/docs-drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/mockdata": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing-ui": "workspace:*",
diff --git a/common/shared/package.json b/common/shared/package.json
index 358436b911..c8b2db041c 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -51,8 +51,8 @@
"vitest": "^4.1.10"
},
"devDependencies": {
- "@univerjs/icons": "1.33.0",
- "@univerjs/icons-svg": "^1.32.0",
+ "@univerjs/icons": "1.34.0",
+ "@univerjs/icons-svg": "^1.34.0",
"typescript": "^6.0.3",
"vue-tsc": "^3.3.6"
}
diff --git a/packages/action-recorder/package.json b/packages/action-recorder/package.json
index 346f78a0e0..028a9ac01a 100644
--- a/packages/action-recorder/package.json
+++ b/packages/action-recorder/package.json
@@ -76,7 +76,7 @@
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/design/package.json b/packages/design/package.json
index 83739872be..d3d320ffbd 100644
--- a/packages/design/package.json
+++ b/packages/design/package.json
@@ -81,7 +81,7 @@
"@radix-ui/react-popover": "^1.1.19",
"@radix-ui/react-separator": "^1.1.11",
"@radix-ui/react-slot": "^1.3.0",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "1.1.1",
diff --git a/packages/docs-drawing-ui/src/menu/__tests__/schema.spec.ts b/packages/docs-drawing-ui/src/menu/__tests__/schema.spec.ts
deleted file mode 100644
index 850fd2f0e4..0000000000
--- a/packages/docs-drawing-ui/src/menu/__tests__/schema.spec.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright 2023-present DreamNum Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import {
- DOC_CONTENT_INSERT_MENU_ID,
- DOC_PARAGRAPH_T_INSERT_BELOW_MENU_ID,
- DOC_PARAGRAPH_T_INSERT_MENU_ID,
- EMPTY_PARAGRAPH_MENU_ID,
- INSERT_BELLOW_MENU_ID,
-} from '@univerjs/docs-ui';
-import { ContextMenuGroup, ContextMenuPosition } from '@univerjs/ui';
-import { describe, expect, it } from 'vitest';
-import { InsertDocImageCommand } from '../../commands/commands/insert-image.command';
-import {
- InsertDocEllipseShapeCommand,
- InsertDocRectangleShapeCommand,
-} from '../../commands/commands/insert-shape.command';
-import { UploadFloatImageMenuFactory } from '../image.menu';
-import { menuSchema } from '../schema';
-import {
- DOCS_SHAPE_BELOW_MENU_ID,
- DOCS_SHAPE_MENU_ID,
-} from '../shape.menu';
-
-describe('docs drawing menu schema', () => {
- it('adds image to paragraph insert menus', () => {
- const paragraph = (menuSchema as any)[ContextMenuPosition.PARAGRAPH];
-
- expect(paragraph[ContextMenuGroup.LAYOUT][INSERT_BELLOW_MENU_ID][InsertDocImageCommand.id].menuItemFactory).toBeDefined();
- expect(paragraph[EMPTY_PARAGRAPH_MENU_ID][ContextMenuGroup.LAYOUT][InsertDocImageCommand.id].menuItemFactory).toBeDefined();
- expect(paragraph[DOC_CONTENT_INSERT_MENU_ID][ContextMenuGroup.LAYOUT][InsertDocImageCommand.id].menuItemFactory).toBeDefined();
- expect(paragraph[DOC_PARAGRAPH_T_INSERT_MENU_ID].insert[InsertDocImageCommand.id].menuItemFactory).toBeDefined();
- expect(paragraph[DOC_PARAGRAPH_T_INSERT_BELOW_MENU_ID].insert[`${InsertDocImageCommand.id}.below`].menuItemFactory).toBeDefined();
- });
-
- it('uses the same image icon in paragraph insert menus', () => {
- const item = UploadFloatImageMenuFactory({ get: () => undefined } as never);
-
- expect(item.icon).toBe('AddImageIcon');
- });
-
- it('registers shape submenu options for paragraph insert menus', () => {
- const paragraph = (menuSchema as any)[ContextMenuPosition.PARAGRAPH];
- const rootShapeMenu = paragraph[DOCS_SHAPE_MENU_ID].shapes;
- const belowShapeMenu = paragraph[DOCS_SHAPE_BELOW_MENU_ID].shapes;
-
- expect(paragraph[DOC_PARAGRAPH_T_INSERT_MENU_ID].insert[DOCS_SHAPE_MENU_ID].menuItemFactory).toBeDefined();
- expect(paragraph[DOC_PARAGRAPH_T_INSERT_BELOW_MENU_ID].insert[DOCS_SHAPE_BELOW_MENU_ID].menuItemFactory).toBeDefined();
- expect(rootShapeMenu[InsertDocRectangleShapeCommand.id].menuItemFactory).toBeDefined();
- expect(rootShapeMenu[InsertDocEllipseShapeCommand.id].menuItemFactory).toBeDefined();
- expect(belowShapeMenu[`${InsertDocRectangleShapeCommand.id}.below`].menuItemFactory).toBeDefined();
- expect(belowShapeMenu[`${InsertDocEllipseShapeCommand.id}.below`].menuItemFactory).toBeDefined();
- });
-});
diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json
index d334944988..81506fd63d 100644
--- a/packages/docs-hyper-link-ui/package.json
+++ b/packages/docs-hyper-link-ui/package.json
@@ -80,7 +80,7 @@
"@univerjs/docs-hyper-link": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-hyper-link-ui/src/menu/__tests__/schema.spec.ts b/packages/docs-hyper-link-ui/src/menu/__tests__/schema.spec.ts
deleted file mode 100644
index e9053abadb..0000000000
--- a/packages/docs-hyper-link-ui/src/menu/__tests__/schema.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright 2023-present DreamNum Co., Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { EMPTY_PARAGRAPH_MENU_ID, FLOAT_TOOLBAR_MENU_POSITION, INSERT_BELLOW_MENU_ID } from '@univerjs/docs-ui';
-import { ContextMenuGroup, ContextMenuPosition } from '@univerjs/ui';
-import { describe, expect, it } from 'vitest';
-import { ShowDocHyperLinkEditPopupOperation } from '../../commands/operations/popup.operation';
-import { menuSchema } from '../schema';
-
-describe('docs hyperlink menu schema', () => {
- it('adds hyperlink to paragraph insert menus', () => {
- const paragraph = (menuSchema as any)[ContextMenuPosition.PARAGRAPH];
-
- expect(paragraph[ContextMenuGroup.LAYOUT][INSERT_BELLOW_MENU_ID][ShowDocHyperLinkEditPopupOperation.id].menuItemFactory).toBeDefined();
- expect(paragraph[EMPTY_PARAGRAPH_MENU_ID][ContextMenuGroup.LAYOUT][ShowDocHyperLinkEditPopupOperation.id].menuItemFactory).toBeDefined();
- });
-
- it('adds hyperlink to docs text floating toolbar', () => {
- const floatToolbar = (menuSchema as any)[FLOAT_TOOLBAR_MENU_POSITION];
- const hyperlink = floatToolbar[ShowDocHyperLinkEditPopupOperation.id];
-
- expect(hyperlink.order).toBe(20);
- expect(hyperlink.menuItemFactory).toBeDefined();
- });
-});
diff --git a/packages/docs-quick-insert-ui/package.json b/packages/docs-quick-insert-ui/package.json
index 3feb5b5734..97e3dabce4 100644
--- a/packages/docs-quick-insert-ui/package.json
+++ b/packages/docs-quick-insert-ui/package.json
@@ -83,7 +83,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json
index c91e3c29a8..75683a8aac 100644
--- a/packages/docs-thread-comment-ui/package.json
+++ b/packages/docs-thread-comment-ui/package.json
@@ -78,7 +78,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*"
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index 49cfa28577..363db0f97a 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -89,7 +89,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/docs": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-ui/src/views/float-toolbar/FloatToolbar.tsx b/packages/docs-ui/src/views/float-toolbar/FloatToolbar.tsx
index 52ca2e78e2..fb42f56e50 100644
--- a/packages/docs-ui/src/views/float-toolbar/FloatToolbar.tsx
+++ b/packages/docs-ui/src/views/float-toolbar/FloatToolbar.tsx
@@ -32,12 +32,21 @@ import {
import { FLOAT_TEXT_STYLE_MENU_ID, FLOAT_TOOLBAR_MENU_POSITION } from '../../menu/menu';
interface IFloatToolbarProps {
- avaliableMenus?: string[];
+ avaliableMenus?: Array<string | IFloatToolbarMenuConfig>;
+}
+
+interface IFloatToolbarMenuConfig {
+ id: string;
+ iconColor?: string;
+}
+
+interface IFloatToolbarMenuSchema extends IMenuSchema {
+ iconColor?: string;
}
export const FLOAT_MENU_COMPONENT_KEY = 'univer.doc.float-menu';
-const DEFAULT_AVALIABLE_MENUS: string[] = [
+const DEFAULT_AVALIABLE_MENUS: Array<string | IFloatToolbarMenuConfig> = [
FLOAT_TEXT_STYLE_MENU_ID,
SetInlineFormatFontSizeCommand.id,
SetInlineFormatBoldCommand.id,
@@ -47,30 +56,35 @@ const DEFAULT_AVALIABLE_MENUS: string[] = [
SetInlineFormatSubscriptCommand.id,
SetInlineFormatSuperscriptCommand.id,
SetInlineFormatTextColorCommand.id,
- SetInlineFormatTextBackgroundColorCommand.id,
+ {
+ id: SetInlineFormatTextBackgroundColorCommand.id,
+ iconColor: 'var(--univer-primary-600)',
+ },
];
export function resolveFloatToolbarMenus(
menuManagerService: IMenuManagerServiceType,
- avaliableMenus: string[]
-): { menus: IMenuSchema[]; extraMenus: IMenuSchema[] } {
+ avaliableMenus: Array<string | IFloatToolbarMenuConfig>
+): { menus: IFloatToolbarMenuSchema[]; extraMenus: IMenuSchema[] } {
const floatToolbarMenus = menuManagerService.getMenuByPositionKey(FLOAT_TOOLBAR_MENU_POSITION);
const flatMenus = [
...menuManagerService.getFlatMenuByPositionKey(FLOAT_TOOLBAR_MENU_POSITION),
...menuManagerService.getFlatMenuByPositionKey(MenuManagerPosition.RIBBON),
];
- const menus: IMenuSchema[] = [];
- for (const key of avaliableMenus) {
- const item = flatMenus.find((item) => item.key === key);
+ const menus: IFloatToolbarMenuSchema[] = [];
+ const menuIds = avaliableMenus.map((config) => typeof config === 'string' ? config : config.id);
+ for (const config of avaliableMenus) {
+ const menuId = typeof config === 'string' ? config : config.id;
+ const item = flatMenus.find((item) => item.key === menuId);
if (item) {
- menus.push(item);
+ menus.push(typeof config === 'string' ? item : { ...item, iconColor: config.iconColor });
}
}
return {
menus,
- extraMenus: floatToolbarMenus.filter((item) => item.item && !avaliableMenus.includes(item.key)),
+ extraMenus: floatToolbarMenus.filter((item) => item.item && !menuIds.includes(item.key)),
};
}
@@ -79,7 +93,7 @@ export function FloatToolbar(props: IFloatToolbarProps) {
const menuManagerService = useDependency(IMenuManagerService);
- const [menus, setMenus] = useState<IMenuSchema[]>([]);
+ const [menus, setMenus] = useState<IFloatToolbarMenuSchema[]>([]);
const [extraMenus, setExtraMenus] = useState<IMenuSchema[]>([]);
// subscribe to menu changes
@@ -107,7 +121,7 @@ export function FloatToolbar(props: IFloatToolbarProps) {
>
{menus.map((groupItem) => groupItem.item && (
<div key={groupItem.key} className="univer-flex univer-flex-nowrap univer-gap-2 univer-px-2">
- <ToolbarItem key={groupItem.key} {...groupItem.item} />
+ <ToolbarItem key={groupItem.key} {...groupItem.item} iconColor={groupItem.iconColor} />
</div>
))}
{extraMenus.length > 0 && (
diff --git a/packages/docs-ui/src/views/float-toolbar/__tests__/FloatToolbar.spec.tsx b/packages/docs-ui/src/views/float-toolbar/__tests__/FloatToolbar.spec.tsx
index 6b8df5e80c..9e05d09ac3 100644
--- a/packages/docs-ui/src/views/float-toolbar/__tests__/FloatToolbar.spec.tsx
+++ b/packages/docs-ui/src/views/float-toolbar/__tests__/FloatToolbar.spec.tsx
@@ -41,7 +41,10 @@ import { act } from 'react';
import { createRoot } from 'react-dom/client';
import { Subject } from 'rxjs';
import { afterEach, describe, expect, it } from 'vitest';
-import { SetInlineFormatBoldCommand } from '../../../commands/commands/inline-format.command';
+import {
+ SetInlineFormatBoldCommand,
+ SetInlineFormatTextBackgroundColorCommand,
+} from '../../../commands/commands/inline-format.command';
import { FLOAT_TEXT_STYLE_MENU_ID, FLOAT_TOOLBAR_MENU_POSITION } from '../../../menu/menu';
import { FloatToolbar, resolveFloatToolbarMenus } from '../FloatToolbar';
@@ -244,6 +247,20 @@ describe('FloatToolbar', () => {
]);
});
+ it('passes presentation config through to the resolved floating toolbar menu', () => {
+ const backgroundItem = createMenuItem(SetInlineFormatTextBackgroundColorCommand.id);
+ const menuManagerService = new TestMenuManagerService();
+ menuManagerService.setMenus([backgroundItem]);
+
+ const { menus, extraMenus } = resolveFloatToolbarMenus(menuManagerService as never, [{
+ id: SetInlineFormatTextBackgroundColorCommand.id,
+ iconColor: 'var(--univer-primary-600)',
+ }]);
+
+ expect(menus[0]?.iconColor).toBe('var(--univer-primary-600)');
+ expect(extraMenus).toEqual([]);
+ });
+
it('renders available menus and refreshes when the menu service changes', async () => {
const testBed = createToolbarTestBed();
const textStyleItem = createMenuItem(FLOAT_TEXT_STYLE_MENU_ID, 'Text style');
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index bc56ac5783..decaa2e7e7 100644
--- a/packages/drawing-ui/package.json
+++ b/packages/drawing-ui/package.json
@@ -78,7 +78,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/drawing-ui/src/views/object-list-panel/ObjectListPanelBase.tsx b/packages/drawing-ui/src/views/object-list-panel/ObjectListPanelBase.tsx
index 528be2810b..b9d032e726 100644
--- a/packages/drawing-ui/src/views/object-list-panel/ObjectListPanelBase.tsx
+++ b/packages/drawing-ui/src/views/object-list-panel/ObjectListPanelBase.tsx
@@ -25,6 +25,7 @@ import {
LockIcon,
MoreDownIcon,
MoreRightIcon,
+ UnlockIcon,
} from '@univerjs/icons';
import { useEffect, useMemo, useRef, useState } from 'react';
import { OBJECT_LIST_CANVAS_SECTION_ID, OBJECT_LIST_FLOATING_SECTION_ID } from './object-list-panel-layer';
@@ -703,7 +704,7 @@ function ObjectListRow(props: {
{showLock && (
<button
type="button"
- className={clsx(iconButtonClassName, !locked && 'univer-opacity-70')}
+ className={iconButtonClassName}
disabled={disabled}
title={locked ? labels.unlock : labels.lock}
aria-label={locked ? labels.unlock : labels.lock}
@@ -712,7 +713,7 @@ function ObjectListRow(props: {
onToggleSelectable();
}}
>
- <LockIcon />
+ {locked ? <LockIcon /> : <UnlockIcon />}
</button>
)}
{showVisible && (
diff --git a/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts b/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts
index afcb9dce0f..e4bffaaca9 100644
--- a/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts
+++ b/packages/engine-render/src/__tests__/engine-scene-viewport.spec.ts
@@ -666,6 +666,43 @@ describe('engine scene viewport extra', () => {
engine.dispose();
});
+ it('insets the icon inside a small rotate control and matches the connector to its border', () => {
+ const { engine, scene } = createFixture();
+ engine.setActiveScene(scene.sceneKey);
+
+ const rect = scene.getObject('rect-main') as Rect;
+ rect.transformerConfig = {
+ rotateAnchorPosition: 'bottom',
+ rotateAnchorOffset: 20,
+ rotateLineEnabled: true,
+ rotateSize: 14,
+ rotateCornerRadius: 4,
+ rotateStroke: '#d1d5db',
+ rotateIconEnabled: true,
+ };
+ const transformer = new Transformer(scene, {
+ rotateEnabled: true,
+ resizeEnabled: true,
+ borderEnabled: true,
+ });
+
+ transformer.setSelectedControl(rect);
+ const control = (transformer as any)._transformerControlMap.get(rect.oKey) as Group;
+ const controlObjects = control.getObjects();
+ const rotateLine = controlObjects.find((o) => o.oKey.includes('__SpreadsheetTransformerRotateLine__')) as Rect;
+ const rotate = controlObjects.find((o) => o.oKey.includes('__SpreadsheetTransformerRotate__') && !o.oKey.includes('_ICON_')) as Rect;
+ const rotateIcon = controlObjects.find((o) => o.oKey.includes('_ICON_')) as Rect;
+
+ expect(rotateLine.stroke).toBe('#d1d5db');
+ expect(rotate.radius).toBe(4);
+ expect(rotateIcon.width).toBe(10);
+ expect(rotateIcon.height).toBe(10);
+
+ transformer.dispose();
+ scene.dispose();
+ engine.dispose();
+ });
+
it('expands transformer outline symmetrically when border spacing is configured', () => {
const { engine, scene } = createFixture();
const rect = scene.getObject('rect-main') as Rect;
diff --git a/packages/engine-render/src/scene.transformer.ts b/packages/engine-render/src/scene.transformer.ts
index aef555efa3..02e17705dc 100644
--- a/packages/engine-render/src/scene.transformer.ts
+++ b/packages/engine-render/src/scene.transformer.ts
@@ -1367,15 +1367,16 @@ export class Transformer extends Disposable implements ITransformerConfig {
private _createRotateIcon(applyObject: BaseObject, zIndex: number, left: number, top: number) {
const { rotateSize, rotateIconStroke, rotateIconStrokeWidth, borderStroke } = this._getConfig(applyObject);
- const iconOffset = (rotateSize - ROTATE_ICON_SIZE) / 2;
+ const iconSize = Math.min(ROTATE_ICON_SIZE, Math.max(rotateSize - 4, 1));
+ const iconOffset = (rotateSize - iconSize) / 2;
return new TransformerRotateIcon(`${TransformerManagerType.ROTATE}_ICON_${zIndex}`, {
zIndex,
evented: false,
left: left + iconOffset,
top: top + iconOffset,
- width: ROTATE_ICON_SIZE,
- height: ROTATE_ICON_SIZE,
+ width: iconSize,
+ height: iconSize,
fill: null,
stroke: rotateIconStroke ?? borderStroke,
strokeWidth: rotateIconStrokeWidth,
@@ -1873,7 +1874,7 @@ export class Transformer extends Disposable implements ITransformerConfig {
height: rotateAnchorOffset,
width: 1,
strokeWidth: borderStrokeWidth,
- stroke: borderStroke,
+ stroke: rotateStroke ?? borderStroke,
});
const { left: rotateLeft, top: rotateTop } = this._getRotateAnchorPosition(TransformerManagerType.ROTATE, height, width, applyObject);
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index dfb656a167..0069adef81 100644
--- a/packages/find-replace/package.json
+++ b/packages/find-replace/package.json
@@ -77,7 +77,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index bd3005a5f0..d8f19232f2 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -78,7 +78,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
index b0cc0545f4..14f93f2cd6 100644
--- a/packages/sheets-conditional-formatting/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -93,7 +93,7 @@
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
"@univerjs/formula": "workspace:*",
- "@univerjs/icons-svg": "^1.32.0",
+ "@univerjs/icons-svg": "^1.34.0",
"@univerjs/sheets-formula": "workspace:*",
"rxjs": "^7.8.2",
"typescript": "^6.0.3",
diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json
index de24f73744..eb2cab1382 100644
--- a/packages/sheets-crosshair-highlight/package.json
+++ b/packages/sheets-crosshair-highlight/package.json
@@ -88,7 +88,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*"
diff --git a/packages/sheets-data-validation-ui/package.json b/packages/sheets-data-validation-ui/package.json
index 6961def931..fc6873c4ac 100644
--- a/packages/sheets-data-validation-ui/package.json
+++ b/packages/sheets-data-validation-ui/package.json
@@ -80,7 +80,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index 73de1ee4ee..25027def4b 100644
--- a/packages/sheets-filter-ui/package.json
+++ b/packages/sheets-filter-ui/package.json
@@ -77,7 +77,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
diff --git a/packages/sheets-formula-ui/package.json b/packages/sheets-formula-ui/package.json
index 2fe678ae8d..297d213c6c 100644
--- a/packages/sheets-formula-ui/package.json
+++ b/packages/sheets-formula-ui/package.json
@@ -93,7 +93,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/formula": "workspace:*",
"@univerjs/formula-ui": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index 40490c4f18..81a5246d53 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -91,7 +91,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages/sheets-note-ui/package.json b/packages/sheets-note-ui/package.json
index b34ca0aab1..7c96463dad 100644
--- a/packages/sheets-note-ui/package.json
+++ b/packages/sheets-note-ui/package.json
@@ -74,7 +74,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-note": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-numfmt-ui/package.json b/packages/sheets-numfmt-ui/package.json
index ca70df5d5a..d258ed5a43 100644
--- a/packages/sheets-numfmt-ui/package.json
+++ b/packages/sheets-numfmt-ui/package.json
@@ -78,7 +78,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json
index 8c126788cd..47b2e032d5 100644
--- a/packages/sheets-sort-ui/package.json
+++ b/packages/sheets-sort-ui/package.json
@@ -77,7 +77,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-sort": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-table-ui/package.json b/packages/sheets-table-ui/package.json
index d5ba22e281..f78fa7a7d4 100644
--- a/packages/sheets-table-ui/package.json
+++ b/packages/sheets-table-ui/package.json
@@ -79,7 +79,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-sort": "workspace:*",
diff --git a/packages/sheets-thread-comment-ui/package.json b/packages/sheets-thread-comment-ui/package.json
index b4ddf408c3..3b4d7cca82 100644
--- a/packages/sheets-thread-comment-ui/package.json
+++ b/packages/sheets-thread-comment-ui/package.json
@@ -77,7 +77,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-thread-comment": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 0615d6ca4f..c5aa051e30 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -91,7 +91,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/protocol": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/telemetry": "workspace:*",
diff --git a/packages/sheets-ui/src/commands/operations/__tests__/sidebar-defined-name.operation.spec.ts b/packages/sheets-ui/src/commands/operations/__tests__/sidebar-defined-name.operation.spec.ts
index 9dbe59bc88..e052e6e619 100644
--- a/packages/sheets-ui/src/commands/operations/__tests__/sidebar-defined-name.operation.spec.ts
+++ b/packages/sheets-ui/src/commands/operations/__tests__/sidebar-defined-name.operation.spec.ts
@@ -140,10 +140,6 @@ describe('SidebarDefinedNameOperation', () => {
width: 333,
header: { title: 'localized:sheets-ui.definedName.featureTitle' },
children: { label: DEFINED_NAME_CONTAINER },
- bodyStyle: {
- height: '100%',
- overflow: 'hidden',
- },
})]);
(sidebarService.openCalls[0] as { onClose: () => void }).onClose();
expect(sidebarService.closeCount).toBe(0);
diff --git a/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts b/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts
index 25ce86aafc..847c60d9f0 100644
--- a/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts
+++ b/packages/sheets-ui/src/commands/operations/sidebar-defined-name.operation.ts
@@ -48,10 +48,6 @@ export const SidebarDefinedNameOperation: ICommand = {
onClose: () => {
},
width: 333,
- bodyStyle: {
- height: '100%',
- overflow: 'hidden',
- },
});
break;
diff --git a/packages/sheets-ui/src/menu/schema.ts b/packages/sheets-ui/src/menu/schema.ts
index 01015a9dd8..c2c4bd7f5b 100644
--- a/packages/sheets-ui/src/menu/schema.ts
+++ b/packages/sheets-ui/src/menu/schema.ts
@@ -310,7 +310,7 @@ export const menuSchema: MenuSchemaType = {
[RibbonStartGroup.LAYOUT]: {
[SetHorizontalTextAlignCommand.id]: {
order: 0,
- gridLayout: { row: 1, column: 1 },
+ gridLayout: { row: 1, column: 3 },
menuItemFactory: HorizontalAlignMenuItemFactory,
},
[SetVerticalTextAlignCommand.id]: {
@@ -358,7 +358,7 @@ export const menuSchema: MenuSchemaType = {
[RibbonStartGroup.OTHERS]: {
[AddRangeProtectionFromToolbarCommand.id]: {
order: 0,
- gridLayout: { row: 1, column: 1, rowSpan: 2, showLabel: true },
+ gridLayout: { row: 1, column: 3 },
menuItemFactory: sheetPermissionToolbarMenuFactory,
},
},
diff --git a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
index 34a9d214f6..6f6db3f679 100644
--- a/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
+++ b/packages/sheets-ui/src/views/defined-name/DefinedNameContainer.tsx
@@ -234,7 +234,10 @@ export const DefinedNameContainer = () => {
return (
<div
data-u-comp="defined-name-container"
- className="univer-relative univer-box-border univer-flex univer-h-full univer-w-full univer-flex-col"
+ className="
+ univer-relative univer-box-border univer-flex univer-h-full univer-w-full univer-flex-col
+ univer-overflow-hidden
+ "
>
<div key="insertDefinedName" className="univer-mb-4">
<Button
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index c422da92ba..88caf54746 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -80,7 +80,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/slides": "workspace:*",
"@univerjs/ui": "workspace:*"
},
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index b53d5dde11..528c064058 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -77,7 +77,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/ui": "workspace:*"
},
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 70d1e14d90..9656210806 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -90,7 +90,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@univerjs/icons": "1.33.0",
+ "@univerjs/icons": "1.34.0",
"@wendellhu/redi": "1.1.2"
},
"devDependencies": {
diff --git a/packages/ui/src/controllers/components.controller.ts b/packages/ui/src/controllers/components.controller.ts
index 41141fcbd1..67455a01a4 100644
--- a/packages/ui/src/controllers/components.controller.ts
+++ b/packages/ui/src/controllers/components.controller.ts
@@ -44,6 +44,7 @@ import {
import { FontSize } from '../views/font-size/FontSize';
import { FONT_SIZE_COMPONENT } from '../views/font-size/interface';
import { HEADING_ITEM_COMPONENT, HeadingItem } from '../views/index';
+import { SYMBOL_PICKER_COMPONENT, SymbolPicker } from '../views/symbol-picker/index';
export class ComponentsController extends Disposable {
constructor(
@@ -80,6 +81,7 @@ export class ComponentsController extends Disposable {
[FONT_SIZE_COMPONENT, FontSize],
[COLOR_PICKER_COMPONENT, ColorPicker],
[EMOJI_PICKER_COMPONENT, EmojiPicker],
+ [SYMBOL_PICKER_COMPONENT, SymbolPicker],
[FEATURE_SEARCH_COMPONENT, FeatureSearch],
] as const).forEach(([key, comp]) => {
this.disposeWithMe(
diff --git a/packages/ui/src/locale/ar-SA.ts b/packages/ui/src/locale/ar-SA.ts
index 1d44ed0fbc..c4de849d50 100644
--- a/packages/ui/src/locale/ar-SA.ts
+++ b/packages/ui/src/locale/ar-SA.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'لم يتم العثور على رمز تعبيري',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'الرياضيات',
+ greek: 'اليونانية',
+ common: 'شائع',
+ },
toolbar: {
heading: {
normal: 'عادي',
diff --git a/packages/ui/src/locale/ca-ES.ts b/packages/ui/src/locale/ca-ES.ts
index 19ffa8e277..9ca0b80235 100644
--- a/packages/ui/src/locale/ca-ES.ts
+++ b/packages/ui/src/locale/ca-ES.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'No s’ha trobat cap emoji',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matemàtiques',
+ greek: 'Grec',
+ common: 'Comuns',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/de-DE.ts b/packages/ui/src/locale/de-DE.ts
index b907fcef61..6c4d5a773f 100644
--- a/packages/ui/src/locale/de-DE.ts
+++ b/packages/ui/src/locale/de-DE.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Kein Emoji gefunden',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Mathematik',
+ greek: 'Griechisch',
+ common: 'Allgemein',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/en-US.ts b/packages/ui/src/locale/en-US.ts
index b66368a669..8afa577e03 100644
--- a/packages/ui/src/locale/en-US.ts
+++ b/packages/ui/src/locale/en-US.ts
@@ -40,6 +40,11 @@ const locale = {
noResults: 'No emoji found',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Mathematics',
+ greek: 'Greek',
+ common: 'Common',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/es-ES.ts b/packages/ui/src/locale/es-ES.ts
index 3afe7aaae5..205b4d9f6f 100644
--- a/packages/ui/src/locale/es-ES.ts
+++ b/packages/ui/src/locale/es-ES.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'No se encontraron emojis',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matemáticas',
+ greek: 'Griego',
+ common: 'Comunes',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/fa-IR.ts b/packages/ui/src/locale/fa-IR.ts
index 8ea3189d1a..a7a5bb1674 100644
--- a/packages/ui/src/locale/fa-IR.ts
+++ b/packages/ui/src/locale/fa-IR.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'ایموجی پیدا نشد',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'ریاضیات',
+ greek: 'یونانی',
+ common: 'رایج',
+ },
toolbar: {
heading: {
normal: 'متن عادی',
diff --git a/packages/ui/src/locale/fr-FR.ts b/packages/ui/src/locale/fr-FR.ts
index 16ac112ff1..b876e49e97 100644
--- a/packages/ui/src/locale/fr-FR.ts
+++ b/packages/ui/src/locale/fr-FR.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Aucun emoji trouvé',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Mathématiques',
+ greek: 'Grec',
+ common: 'Courants',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/id-ID.ts b/packages/ui/src/locale/id-ID.ts
index e304876237..d63dfe6bc6 100644
--- a/packages/ui/src/locale/id-ID.ts
+++ b/packages/ui/src/locale/id-ID.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Emoji tidak ditemukan',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matematika',
+ greek: 'Yunani',
+ common: 'Umum',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/it-IT.ts b/packages/ui/src/locale/it-IT.ts
index 34cee8446a..27716d5d2e 100644
--- a/packages/ui/src/locale/it-IT.ts
+++ b/packages/ui/src/locale/it-IT.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Nessun emoji trovato',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matematica',
+ greek: 'Greco',
+ common: 'Comuni',
+ },
toolbar: {
heading: {
normal: 'Normale',
diff --git a/packages/ui/src/locale/ja-JP.ts b/packages/ui/src/locale/ja-JP.ts
index 1a0e59e774..730b96b5c5 100644
--- a/packages/ui/src/locale/ja-JP.ts
+++ b/packages/ui/src/locale/ja-JP.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: '絵文字が見つかりません',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: '数学',
+ greek: 'ギリシャ文字',
+ common: '一般',
+ },
toolbar: {
heading: {
normal: '標準',
diff --git a/packages/ui/src/locale/ko-KR.ts b/packages/ui/src/locale/ko-KR.ts
index 0966fdc157..f1ffc88327 100644
--- a/packages/ui/src/locale/ko-KR.ts
+++ b/packages/ui/src/locale/ko-KR.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: '이모지를 찾을 수 없음',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: '수학',
+ greek: '그리스 문자',
+ common: '일반',
+ },
toolbar: {
heading: {
normal: '일반',
diff --git a/packages/ui/src/locale/pl-PL.ts b/packages/ui/src/locale/pl-PL.ts
index 435f8ac531..914baa3688 100644
--- a/packages/ui/src/locale/pl-PL.ts
+++ b/packages/ui/src/locale/pl-PL.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Nie znaleziono emoji',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matematyka',
+ greek: 'Grecki',
+ common: 'Ogólne',
+ },
toolbar: {
heading: {
normal: 'Normalny',
diff --git a/packages/ui/src/locale/pt-BR.ts b/packages/ui/src/locale/pt-BR.ts
index 645bd9f04e..1e9b4c627c 100644
--- a/packages/ui/src/locale/pt-BR.ts
+++ b/packages/ui/src/locale/pt-BR.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Nenhum emoji encontrado',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matemática',
+ greek: 'Grego',
+ common: 'Comuns',
+ },
toolbar: {
heading: {
normal: 'Normal',
diff --git a/packages/ui/src/locale/ru-RU.ts b/packages/ui/src/locale/ru-RU.ts
index f2d48158bf..82163989fb 100644
--- a/packages/ui/src/locale/ru-RU.ts
+++ b/packages/ui/src/locale/ru-RU.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Эмодзи не найден',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Математика',
+ greek: 'Греческие буквы',
+ common: 'Общие',
+ },
toolbar: {
heading: {
normal: 'Обычный текст',
diff --git a/packages/ui/src/locale/sk-SK.ts b/packages/ui/src/locale/sk-SK.ts
index 79668e77a3..f4949110cb 100644
--- a/packages/ui/src/locale/sk-SK.ts
+++ b/packages/ui/src/locale/sk-SK.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Nenašli sa žiadne emoji',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Matematika',
+ greek: 'Grécke písmená',
+ common: 'Bežné',
+ },
toolbar: {
heading: {
normal: 'Normálne',
diff --git a/packages/ui/src/locale/vi-VN.ts b/packages/ui/src/locale/vi-VN.ts
index 14c4d16716..982bb2cd0d 100644
--- a/packages/ui/src/locale/vi-VN.ts
+++ b/packages/ui/src/locale/vi-VN.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: 'Không tìm thấy emoji',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: 'Toán học',
+ greek: 'Chữ Hy Lạp',
+ common: 'Thông dụng',
+ },
toolbar: {
heading: {
normal: 'Văn bản',
diff --git a/packages/ui/src/locale/zh-CN.ts b/packages/ui/src/locale/zh-CN.ts
index 52a542aa75..4257cc1e93 100644
--- a/packages/ui/src/locale/zh-CN.ts
+++ b/packages/ui/src/locale/zh-CN.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: '未找到表情',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: '数学',
+ greek: '希腊字母',
+ common: '常用',
+ },
toolbar: {
heading: {
normal: '正文',
diff --git a/packages/ui/src/locale/zh-HK.ts b/packages/ui/src/locale/zh-HK.ts
index e75b170649..4322ad9959 100644
--- a/packages/ui/src/locale/zh-HK.ts
+++ b/packages/ui/src/locale/zh-HK.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: '找不到表情',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: '數學',
+ greek: '希臘字母',
+ common: '常用',
+ },
toolbar: {
heading: {
normal: '正文',
diff --git a/packages/ui/src/locale/zh-TW.ts b/packages/ui/src/locale/zh-TW.ts
index 63f797a4b8..6dc3018883 100644
--- a/packages/ui/src/locale/zh-TW.ts
+++ b/packages/ui/src/locale/zh-TW.ts
@@ -41,6 +41,11 @@ const locale: typeof enUS = {
noResults: '找不到表情',
...emojiLocale,
},
+ symbolPicker: {
+ mathematics: '數學',
+ greek: '希臘字母',
+ common: '常用',
+ },
toolbar: {
heading: {
normal: '正文',
diff --git a/packages/ui/src/views/components/ribbon/RibbonGrid.tsx b/packages/ui/src/views/components/ribbon/RibbonGrid.tsx
index c1c5e7e96a..6eb203dfcc 100644
--- a/packages/ui/src/views/components/ribbon/RibbonGrid.tsx
+++ b/packages/ui/src/views/components/ribbon/RibbonGrid.tsx
@@ -17,7 +17,7 @@
import type { HTMLAttributes } from 'react';
import type { IMenuSchema } from '../../../services/menu/menu-manager.service';
import { LocaleService } from '@univerjs/core';
-import { borderBottomClassName, borderRightClassName, clsx } from '@univerjs/design';
+import { borderBottomClassName, borderRightClassName, clsx, scrollbarClassName } from '@univerjs/design';
import { useDependency } from '../../../utils/di';
import { placeRibbonGridItems } from './ribbon-grid-layout';
import { ToolbarItem } from './ToolbarItem';
@@ -40,7 +40,7 @@ export function RibbonGrid({ groups, title, className, ...props }: IRibbonGridPr
univer-box-border univer-flex univer-h-[88px] univer-overflow-x-auto univer-overflow-y-hidden
univer-bg-gray-50 univer-px-2 univer-text-sm
dark:!univer-bg-gray-900
- `, borderBottomClassName, className)}
+ `, borderBottomClassName, scrollbarClassName, className)}
role="toolbar"
aria-label={localeService.t(title)}
>
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 221e42a82c..d74a4f0c9f 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -35,6 +35,7 @@ type IToolbarItemProps = IDisplayMenuItem<IMenuItem> & {
large?: boolean;
showLabel?: boolean;
iconSize?: number;
+ iconColor?: string;
fullWidth?: boolean;
};
@@ -200,7 +201,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IToolbarItemProps>((pr
commandService.executeCommand(commandId, params);
};
- const { tooltip, shortcut, icon, title, label, id, commandId, type, slot, params, grid, large, showLabel, iconSize, fullWidth } = props;
+ const { tooltip, shortcut, icon, title, label, id, commandId, type, slot, params, grid, large, showLabel, iconSize, iconColor, fullWidth } = props;
const gridLabel = title ?? tooltip;
const shortcutDisplay = useToolbarShortcutDisplay({ id, commandId, shortcut });
@@ -288,7 +289,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IToolbarItemProps>((pr
icon={iconToDisplay}
iconSize={iconSize}
title={titleToDisplay}
- value={value}
+ value={iconColor ?? value}
label={label}
onChange={handleSelectionsValueChange}
/>
diff --git a/packages/ui/src/views/components/ribbon/__tests__/RibbonGrid.spec.tsx b/packages/ui/src/views/components/ribbon/__tests__/RibbonGrid.spec.tsx
new file mode 100644
index 0000000000..0b76e6ff83
--- /dev/null
+++ b/packages/ui/src/views/components/ribbon/__tests__/RibbonGrid.spec.tsx
@@ -0,0 +1,41 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { ComponentType } from 'react';
+import { render } from '@testing-library/react';
+import { Injector, LocaleService } from '@univerjs/core';
+import { scrollbarClassName } from '@univerjs/design';
+import { describe, expect, it } from 'vitest';
+import { connectInjector } from '../../../../utils/di';
+import { RibbonGrid } from '../RibbonGrid';
+
+describe('RibbonGrid', () => {
+ it('uses the design scrollbar classes', () => {
+ const injector = new Injector([
+ [LocaleService, { useValue: { t: (key: string) => key } }],
+ ]);
+ const ConnectedRibbonGrid = connectInjector(RibbonGrid, injector) as ComponentType<{
+ groups: [];
+ title: string;
+ }>;
+ const { getByRole } = render(<ConnectedRibbonGrid groups={[]} title="Start" />);
+ const toolbar = getByRole('toolbar');
+
+ for (const className of scrollbarClassName.split(' ')) {
+ expect(toolbar.classList.contains(className)).toBe(true);
+ }
+ });
+});
diff --git a/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx b/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
index 66c7c4f2ef..2c2f8b6833 100644
--- a/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
+++ b/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import type { ComponentType, CSSProperties, ReactElement } from 'react';
+import type { ComponentType, ReactElement } from 'react';
+import type { IIconProps } from '../../../../common/icon-manager';
import { act, cleanup, fireEvent, render, waitFor } from '@testing-library/react';
import { ICommandService, ILogService, Injector, LocaleService } from '@univerjs/core';
import { BehaviorSubject, Subject } from 'rxjs';
@@ -81,8 +82,8 @@ function renderWithDependencies(element: ReactElement) {
));
injector.get(IconManager).register({
- TestIcon: ({ className, style }: { className?: string; style?: CSSProperties }) => (
- <span className={className} data-icon="test" style={style} />
+ TestIcon: ({ className, style, extend }: IIconProps) => (
+ <span className={className} data-color-channel={extend?.colorChannel1} data-icon="test" style={style} />
),
});
@@ -418,6 +419,28 @@ describe('ToolbarItem', () => {
]);
});
+ it('overrides a button selector icon color without changing its command value', () => {
+ const { container, commandService } = renderWithDependencies(
+ <ToolbarItem
+ id="test-color-selector"
+ type={MenuItemType.BUTTON_SELECTOR}
+ icon="TestIcon"
+ iconColor="var(--univer-primary-600)"
+ value$={new BehaviorSubject('#ffffff')}
+ selections={[]}
+ />
+ );
+
+ expect(container.querySelector('[data-icon="test"]')?.getAttribute('data-color-channel'))
+ .toBe('var(--univer-primary-600)');
+
+ fireEvent.click(container.querySelector('.univer-toolbar-button-selector-main') as HTMLElement);
+ expect(commandService.calls).toEqual([{
+ commandId: 'test-color-selector',
+ params: { value: '#ffffff' },
+ }]);
+ });
+
it('resolves option params with a value emitted by a custom option', async () => {
const { container, findByRole, commandService } = renderWithDependencies(
<ToolbarItem
diff --git a/packages/ui/src/views/components/sidebar/Sidebar.tsx b/packages/ui/src/views/components/sidebar/Sidebar.tsx
index 254d534982..169acf8eac 100644
--- a/packages/ui/src/views/components/sidebar/Sidebar.tsx
+++ b/packages/ui/src/views/components/sidebar/Sidebar.tsx
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import type { CSSProperties, ReactNode } from 'react';
+import type { ReactNode } from 'react';
import type { LocaleKey } from '../../../locale/types';
import type { ICustomLabelProps } from '../../custom-label/CustomLabel';
import { LocaleService } from '@univerjs/core';
@@ -29,7 +29,6 @@ export interface ISidebarMethodOptions {
id?: string;
header?: ICustomLabelProps;
children?: ICustomLabelProps;
- bodyStyle?: CSSProperties;
footer?: ICustomLabelProps;
visible?: boolean;
@@ -269,7 +268,7 @@ export function Sidebar() {
</button>
</header>
- <section className="univer-box-border univer-cursor-default univer-px-4" style={options?.bodyStyle}>
+ <section className="univer-box-border univer-cursor-default univer-px-4">
{options?.children}
</section>
diff --git a/packages/ui/src/views/index.ts b/packages/ui/src/views/index.ts
index 6177f5e521..1bc1c4c414 100644
--- a/packages/ui/src/views/index.ts
+++ b/packages/ui/src/views/index.ts
@@ -18,7 +18,8 @@ export * from './CommonLabel';
export * from './custom-label/index';
export * from './emoji-picker/index';
export * from './HeadingItem';
-
export { useScrollYOverContainer } from './hooks/layout';
export { type ISliderProps, type IZoomInputProps, Slider, ZoomInput } from './slider/index';
+
+export * from './symbol-picker/index';
diff --git a/packages/ui/src/views/symbol-picker/SymbolPicker.tsx b/packages/ui/src/views/symbol-picker/SymbolPicker.tsx
new file mode 100644
index 0000000000..75eeadae55
--- /dev/null
+++ b/packages/ui/src/views/symbol-picker/SymbolPicker.tsx
@@ -0,0 +1,127 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { LocaleKey } from '../../locale/types';
+import type { IPopup } from '../../services/popup/canvas-popup.service';
+import type { ISymbolCategory } from './symbols';
+import { LocaleService } from '@univerjs/core';
+import { clsx } from '@univerjs/design';
+import { useState } from 'react';
+import { useDependency, useObservable } from '../../utils/di';
+import { SYMBOL_CATEGORIES } from './symbols';
+
+export const SYMBOL_PICKER_COMPONENT = 'ui.symbol-picker';
+
+export interface ISymbolPickerPopupProps {
+ activeSymbol?: string;
+ onSelect?: (symbol: string, options?: { keepOpen?: boolean }) => void;
+}
+
+export function SymbolPicker(props: { popup?: IPopup<ISymbolPickerPopupProps>; className?: string }) {
+ const extraProps = props.popup?.extraProps;
+ const localeService = useDependency(LocaleService);
+ useObservable(localeService.currentLocale$, localeService.getCurrentLocale());
+ const [activeSymbol, setActiveSymbol] = useState(extraProps?.activeSymbol);
+
+ const handleSelect = (symbol: string) => {
+ setActiveSymbol(symbol);
+ extraProps?.onSelect?.(symbol, { keepOpen: true });
+ };
+
+ return (
+ <section
+ data-u-comp={SYMBOL_PICKER_COMPONENT}
+ className={clsx(
+ `
+ univer-flex univer-h-[340px] univer-w-[420px] univer-flex-col univer-overflow-hidden
+ univer-rounded-[10px] univer-border univer-border-solid univer-border-gray-200 univer-bg-white
+ univer-shadow-lg
+ dark:!univer-border-gray-600 dark:!univer-bg-gray-900
+ `,
+ props.className
+ )}
+ >
+ <div className="univer-min-h-0 univer-flex-1 univer-overflow-y-auto univer-p-4">
+ <div className="univer-flex univer-flex-col univer-gap-5">
+ {SYMBOL_CATEGORIES.map((category) => (
+ <SymbolSection
+ key={category.key}
+ activeSymbol={activeSymbol}
+ category={category}
+ onSelect={handleSelect}
+ />
+ ))}
+ </div>
+ </div>
+ </section>
+ );
+}
+
+function SymbolSection(props: {
+ activeSymbol?: string;
+ category: ISymbolCategory;
+ onSelect: (symbol: string) => void;
+}) {
+ const localeService = useDependency(LocaleService);
+
+ return (
+ <section className="univer-flex univer-flex-col univer-gap-2">
+ <div
+ className="
+ univer-text-sm univer-font-semibold univer-text-gray-900
+ dark:!univer-text-gray-100
+ "
+ >
+ {localeService.t<LocaleKey>(props.category.titleKey)}
+ </div>
+ <div className="univer-grid univer-grid-cols-10 univer-gap-1">
+ {props.category.symbols.map((symbol, index) => {
+ const active = props.activeSymbol === symbol;
+
+ return (
+ <button
+ key={`${props.category.key}-${symbol}-${index}`}
+ type="button"
+ aria-label={symbol}
+ aria-pressed={active}
+ title={symbol}
+ className={clsx(
+ `
+ univer-flex univer-size-8 univer-cursor-pointer univer-items-center
+ univer-justify-center univer-rounded-lg univer-border-0 univer-bg-transparent
+ univer-p-0 univer-text-lg univer-text-gray-900
+ dark:!univer-text-gray-100
+ `,
+ active
+ ? `
+ univer-bg-primary-50 univer-shadow-sm
+ dark:!univer-bg-gray-800 dark:!univer-shadow-sm
+ `
+ : `
+ hover:univer-bg-gray-100
+ dark:hover:!univer-bg-gray-800
+ `
+ )}
+ onClick={() => props.onSelect(symbol)}
+ >
+ {symbol}
+ </button>
+ );
+ })}
+ </div>
+ </section>
+ );
+}
diff --git a/packages/ui/src/views/symbol-picker/index.ts b/packages/ui/src/views/symbol-picker/index.ts
new file mode 100644
index 0000000000..2dcc5b8e24
--- /dev/null
+++ b/packages/ui/src/views/symbol-picker/index.ts
@@ -0,0 +1,20 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export { SYMBOL_PICKER_COMPONENT, SymbolPicker } from './SymbolPicker';
+export type { ISymbolPickerPopupProps } from './SymbolPicker';
+export { SYMBOL_CATEGORIES } from './symbols';
+export type { ISymbolCategory, SymbolCategory } from './symbols';
diff --git a/packages/ui/src/views/symbol-picker/symbols.ts b/packages/ui/src/views/symbol-picker/symbols.ts
new file mode 100644
index 0000000000..65d1ed5288
--- /dev/null
+++ b/packages/ui/src/views/symbol-picker/symbols.ts
@@ -0,0 +1,196 @@
+/**
+ * Copyright 2023-present DreamNum Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { LocaleKey } from '../../locale/types';
+
+export type SymbolCategory = 'mathematics' | 'greek' | 'common';
+
+export interface ISymbolCategory {
+ key: SymbolCategory;
+ symbols: string[];
+ titleKey: LocaleKey;
+}
+
+export const SYMBOL_CATEGORIES: ISymbolCategory[] = [
+ {
+ key: 'mathematics',
+ titleKey: 'ui.symbolPicker.mathematics',
+ symbols: [
+ '+',
+ '−',
+ '×',
+ '÷',
+ '≠',
+ '≈',
+ '<',
+ '>',
+ '≤',
+ '≥',
+ '≪',
+ '≫',
+ '≡',
+ '±',
+ '%',
+ '‰',
+ '‱',
+ '½',
+ '⅓',
+ '⅔',
+ '¼',
+ '¾',
+ '¹',
+ '²',
+ '³',
+ 'ⁿ',
+ '₁',
+ '₂',
+ '₃',
+ '|a|',
+ '∟',
+ '∠',
+ '⊿',
+ '△',
+ '∥',
+ '⊥',
+ '∫',
+ '∬',
+ '∭',
+ '∮',
+ '∯',
+ '∰',
+ '∝',
+ '∞',
+ '∼',
+ '≌',
+ '∈',
+ '∉',
+ '⊆',
+ '⊂',
+ '∅',
+ '∩',
+ '∪',
+ '∧',
+ '∨',
+ '⋅',
+ '⋮',
+ '⋰',
+ '⋱',
+ '⋯',
+ '∏',
+ '∑',
+ '∃',
+ '∄',
+ '∀',
+ '∂',
+ '∆',
+ '⊙',
+ '⊕',
+ '%',
+ ],
+ },
+ {
+ key: 'greek',
+ titleKey: 'ui.symbolPicker.greek',
+ symbols: [
+ 'α',
+ 'β',
+ 'γ',
+ 'δ',
+ 'ε',
+ 'ζ',
+ 'η',
+ 'θ',
+ 'ι',
+ 'κ',
+ 'λ',
+ 'μ',
+ 'ν',
+ 'ξ',
+ 'ο',
+ 'π',
+ 'ρ',
+ 'σ',
+ 'τ',
+ 'υ',
+ 'φ',
+ 'χ',
+ 'ψ',
+ 'ω',
+ 'Α',
+ 'Β',
+ 'Γ',
+ 'Δ',
+ 'Ε',
+ 'Ζ',
+ 'Η',
+ 'Θ',
+ 'Ι',
+ 'Κ',
+ 'Λ',
+ 'Μ',
+ 'Ν',
+ 'Ξ',
+ 'Ο',
+ 'Π',
+ 'Ρ',
+ 'Σ',
+ 'Τ',
+ 'Υ',
+ 'Φ',
+ 'Χ',
+ 'Ψ',
+ 'Ω',
+ ],
+ },
+ {
+ key: 'common',
+ titleKey: 'ui.symbolPicker.common',
+ symbols: [
+ 'kg',
+ 'mm',
+ 'cm',
+ 'm²',
+ '°C',
+ '°',
+ '§',
+ '◎',
+ '©',
+ '®',
+ '{',
+ '⌜',
+ '〚',
+ '№',
+ '$',
+ '¥',
+ '@',
+ '&',
+ '*',
+ '|',
+ '#',
+ '※',
+ '√',
+ '×',
+ '…',
+ '①',
+ '②',
+ '③',
+ '↑',
+ '↓',
+ '←',
+ '→',
+ ],
+ },
+];
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 604b414854..ff6051affb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -112,8 +112,8 @@ importers:
specifier: workspace:*
version: link:../../packages/engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/mockdata':
specifier: workspace:*
version: link:../mockdata
@@ -358,11 +358,11 @@ importers:
devDependencies:
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/icons-svg':
- specifier: ^1.32.0
- version: 1.32.0
+ specifier: ^1.34.0
+ version: 1.34.0
typescript:
specifier: ^6.0.3
version: 6.0.3
@@ -741,8 +741,8 @@ importers:
specifier: workspace:*
version: link:../design
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -876,8 +876,8 @@ importers:
specifier: ^1.3.0
version: 1.3.0(@types/[email protected])([email protected])
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
class-variance-authority:
specifier: ^0.7.1
version: 0.7.1
@@ -1070,8 +1070,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1171,8 +1171,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1214,8 +1214,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/thread-comment':
specifier: workspace:*
version: link:../thread-comment
@@ -1263,8 +1263,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1337,8 +1337,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1448,8 +1448,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1655,8 +1655,8 @@ importers:
specifier: workspace:*
version: link:../formula
'@univerjs/icons-svg':
- specifier: ^1.32.0
- version: 1.32.0
+ specifier: ^1.34.0
+ version: 1.34.0
'@univerjs/sheets-formula':
specifier: workspace:*
version: link:../sheets-formula
@@ -1685,8 +1685,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -1740,8 +1740,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -1829,8 +1829,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2001,8 +2001,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/rpc':
specifier: workspace:*
version: link:../rpc
@@ -2139,8 +2139,8 @@ importers:
specifier: workspace:*
version: link:../formula-ui
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2225,8 +2225,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2311,8 +2311,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2388,8 +2388,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2459,8 +2459,8 @@ importers:
specifier: workspace:*
version: link:../engine-formula
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2545,8 +2545,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2628,8 +2628,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2692,8 +2692,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/protocol':
specifier: workspace:*
version: link:../protocol
@@ -2775,8 +2775,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/slides':
specifier: workspace:*
version: link:../slides
@@ -2859,8 +2859,8 @@ importers:
specifier: workspace:*
version: link:../docs-ui
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@univerjs/thread-comment':
specifier: workspace:*
version: link:../thread-comment
@@ -2905,8 +2905,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.33.0
+ specifier: 1.34.0
'@wendellhu/redi':
specifier: 1.1.2
version: 1.1.2([email protected])
@@ -6894,8 +6894,8 @@ packages:
resolution: {integrity: sha512-UexrHGnGTpbuQHct2ExOc2ZcFbGUS9FOesCxxqdBGcpI1BxYu/LZ6U8Aq6/72XtF/qRBk9nhuGHFJIXXMhPMdw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-kQ+lM+JC4jeWZWYvF0x61PjSuyqU6Db+JoAVLxVKbwcxUv9ecBEL4U5uIZUKKdJGkFflyDh8T7qI4BgOuMcQxQ==}
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-AEq5yaYFR8NBUraUEvmQbtXa0/NZYw6evKGuzWDIaT2MshlgvX2Z+I5J42nc05+2AjAsvKHQ5aS5oIScUqRVKg==}
'@univerjs/[email protected]':
resolution: {integrity: sha512-TaS1xFezdLDpcNvtGg8Mod+rnL1T3mqnj5YEoDrvo+WlRZqfM846nTdxcjJyPddij007jr/Id7BeVtDp52xGeA==}
@@ -6903,6 +6903,12 @@ packages:
react: 19.2.7
react-dom: 19.2.7
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-W7PQQHGMg9+7Z5TRlU/BJUo2DiR4K3kVbCby+fH/HgtefBsbL1jAtwuVJfCww6DEy/qyXTG+uPk1kIQNqrzRng==}
+ peerDependencies:
+ react: 19.2.7
+ react-dom: 19.2.7
+
'@univerkit/[email protected]':
resolution: {integrity: sha512-lIq1yt9W3QviHjDCuhg7Oh5vNucGMNCOJllq9vCAuk5486YpVdpM3Amg7NmGkbuzuyreuPtx/voOr0ahcTwJYA==}
cpu: [arm64]
@@ -14363,8 +14369,8 @@ snapshots:
'@typescript-eslint/[email protected]([email protected])':
dependencies:
- '@typescript-eslint/tsconfig-utils': 8.56.1([email protected])
- '@typescript-eslint/types': 8.56.1
+ '@typescript-eslint/tsconfig-utils': 8.63.0([email protected])
+ '@typescript-eslint/types': 8.63.0
debug: 4.4.3
typescript: 6.0.3
transitivePeerDependencies:
@@ -14592,13 +14598,18 @@ snapshots:
'@typescript-eslint/types': 8.63.0
eslint-visitor-keys: 5.0.1
- '@univerjs/[email protected]': {}
+ '@univerjs/[email protected]': {}
dependencies:
react: 19.2.7
react-dom: 19.2.7([email protected])
+ dependencies:
+ react: 19.2.7
+ react-dom: 19.2.7([email protected])
+
'@univerkit/[email protected]':
optional: true