Skip to content

Commit

Permalink
feat: update icon
Browse files Browse the repository at this point in the history
  • Loading branch information
@wzhudev
wzhudev committed Oct 21, 2024
1 parent 6700919 commit 708cffa
Show file tree
Hide file tree
Showing 37 changed files with 116 additions and 106 deletions.
2 changes: 1 addition & 1 deletion examples/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/facade": "workspace:*",
"@univerjs/find-replace": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/mockdata": "workspace:*",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/action-recorder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter-ui": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/uni-docs-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"@univerjs/docs-drawing-ui": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/ui": "workspace:*",
"@univerjs/uniui": "workspace:*",
"clsx": "^2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/uni-formula-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/uni-formula/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/docs": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"clsx": "^2.1.1"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/uni-sheets-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing-ui": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/uni-slides-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/slides": "workspace:*",
"@univerjs/slides-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages-experimental/uniui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/design/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@rc-component/color-picker": "^2.0.1",
"@rc-component/trigger": "^2.2.3",
"@types/react-mentions": "^4.4.0",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"clsx": "^2.1.1",
"dayjs": "^1.11.13",
"rc-dialog": "^9.6.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-drawing-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-hyper-link-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@univerjs/docs-hyper-link": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-hyper-link/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/icons": "^0.1.79"
"@univerjs/icons": "^0.1.84"
},
"devDependencies": {
"@univerjs-infra/shared": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-thread-comment-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/drawing-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/drawing/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
},
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"ot-json1": "^1.0.2"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/find-replace/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-conditional-formatting-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/protocol": "0.1.39-alpha.30",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-crosshair-highlight/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"dependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-data-validation-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/protocol": "0.1.39-alpha.30",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-data-validation/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/data-validation": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/protocol": "0.1.39-alpha.30",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-drawing-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-filter-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/rpc": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-formula-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-hyper-link-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
"@univerjs/sheets-hyper-link": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-numfmt/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-numfmt": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*"
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-sort-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-sort": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-thread-comment/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-thread-comment-base": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/protocol": "0.1.39-alpha.30",
"@univerjs/sheets": "workspace:*",
"@univerjs/telemetry": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/sheets-ui/src/controllers/menu/gridlines.menu.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export function ToggleGridlinesMenuFactory(accessor: IAccessor): IMenuButtonItem
id: ToggleGridlinesCommand.id,
type: MenuItemType.BUTTON,
tooltip: 'toolbar.toggleGridlines',
icon: 'Insert',
icon: 'HideGridlines',
activated$: new Observable<boolean>((observer) => {
const getValue = () => {
const workbook = instanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET);
Expand Down
12 changes: 9 additions & 3 deletions packages/sheets-ui/src/controllers/sheet-ui.controller.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
import type { IUniverSheetsUIConfig } from './config.schema';
import { connectInjector, Disposable, ICommandService, IConfigService, Inject, Injector, UniverInstanceType } from '@univerjs/core';
import { DocSelectionRenderService } from '@univerjs/docs-ui';

import { IRenderManagerService } from '@univerjs/engine-render';

import { HideGridlines } from '@univerjs/icons';
import {
SetBoldCommand,
SetFontFamilyCommand,
Expand Down Expand Up @@ -175,23 +176,28 @@ export class SheetUIController extends Disposable {
}

private _init(): void {
this._initCustomComponents();
this._initComponents();
this._initCommands();
this._initMenus();
this._initShortcuts();
this._initWorkbenchParts();
this._initFocusHandler();
}

private _initCustomComponents(): void {
private _initComponents(): void {
const componentManager = this._componentManager;

// init custom components
this.disposeWithMe(componentManager.register(MENU_ITEM_INPUT_COMPONENT, MenuItemInput));
this.disposeWithMe(componentManager.register(BORDER_PANEL_COMPONENT, BorderPanel));
this.disposeWithMe(componentManager.register(COLOR_PICKER_COMPONENT, ColorPicker));
this.disposeWithMe(componentManager.register(FONT_FAMILY_COMPONENT, FontFamily));
this.disposeWithMe(componentManager.register(FONT_FAMILY_ITEM_COMPONENT, FontFamilyItem));
this.disposeWithMe(componentManager.register(FONT_SIZE_COMPONENT, FontSize));
this.disposeWithMe(componentManager.register(DEFINED_NAME_CONTAINER, DefinedNameContainer));

// init icons
this.disposeWithMe(componentManager.register('HideGridlines', HideGridlines));
}

// eslint-disable-next-line max-lines-per-function
Expand Down
4 changes: 4 additions & 0 deletions packages/sheets-ui/src/views/sheet-container/index.module.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,8 @@
padding: 0 var(--padding-xl);

background-color: rgb(var(--bg-color-secondary));

> span:not(:last-of-type) {
margin-right: 4px;
}
}
2 changes: 1 addition & 1 deletion packages/sheets-zen-editor/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/slides-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@univerjs/docs-ui": "workspace:*",
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/slides": "workspace:*",
"@univerjs/ui": "workspace:*",
"clsx": "^2.1.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/thread-comment-ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/docs-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"@univerjs/protocol": "0.1.39-alpha.30",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/ui": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/icons": "^0.1.79",
"@univerjs/icons": "^0.1.84",
"clsx": "^2.1.1",
"localforage": "^1.10.0",
"rc-notification": "^5.6.2",
Expand Down
Loading

0 comments on commit 708cffa

Please sign in to comment.