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: support region-aware currency formats and refine ribbon icons (#7310)

白熱c31ec1d8ffc1
diff --git a/common/debugger/package.json b/common/debugger/package.json
index e06a4585f6..249b1b24bd 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.32.0",
+ "@univerjs/icons": "1.33.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 b630fb77b2..358436b911 100644
--- a/common/shared/package.json
+++ b/common/shared/package.json
@@ -51,7 +51,7 @@
"vitest": "^4.1.10"
},
"devDependencies": {
- "@univerjs/icons": "1.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/icons-svg": "^1.32.0",
"typescript": "^6.0.3",
"vue-tsc": "^3.3.6"
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 8f7e1e0922..17c57b789a 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 5594ec7ad8..33e3d3f4d3 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -36,7 +36,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/find-replace": "workspace:*",
- "@univerjs/icons": "1.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/mockdata": "workspace:*",
"@univerjs/network": "workspace:*",
"@univerjs/preset-docs-core": "workspace:*",
diff --git a/packages/action-recorder/package.json b/packages/action-recorder/package.json
index 27dacdea08..346f78a0e0 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-filter": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/core/src/__tests__/univer-skeleton.spec.ts b/packages/core/src/__tests__/univer-skeleton.spec.ts
index de0a333920..9c8cd93505 100644
--- a/packages/core/src/__tests__/univer-skeleton.spec.ts
+++ b/packages/core/src/__tests__/univer-skeleton.spec.ts
@@ -22,6 +22,7 @@ import { COMMAND_LOG_EXECUTION_CONFIG_KEY } from '../services/command/command.se
import { IConfigService } from '../services/config/config.service';
import { LocaleService } from '../services/locale/locale.service';
import { LogLevel } from '../services/log/log.service';
+import { RegionService } from '../services/region/region.service';
import { Skeleton } from '../skeleton';
import { LocaleType } from '../types/enum/locale-type';
import { Univer } from '../univer';
@@ -56,6 +57,7 @@ describe('Univer', () => {
darkMode: true,
locales,
locale: LocaleType.EN_US,
+ region: LocaleType.FR_FR,
direction: 'rtl',
logLevel: LogLevel.VERBOSE,
logCommandExecution: true,
@@ -63,16 +65,22 @@ describe('Univer', () => {
const injector = univer.__getInjector();
const localeService = injector.get(LocaleService);
+ const regionService = injector.get(RegionService);
expect(localeService.getCurrentLocale()).toBe(LocaleType.EN_US);
+ expect(regionService.getCurrentRegion()).toBe(LocaleType.FR_FR);
expect(localeService.getDirection()).toBe('rtl');
expect(localeService.t('test.greeting', 'Univer')).toBe('Hello Univer');
expect(injector.get(IConfigService).getConfig(COMMAND_LOG_EXECUTION_CONFIG_KEY)).toBe(true);
univer.setLocale(LocaleType.ZH_CN);
expect(localeService.getCurrentLocale()).toBe(LocaleType.ZH_CN);
+ expect(regionService.getCurrentRegion()).toBe(LocaleType.FR_FR);
expect(localeService.getDirection()).toBe('rtl');
+ univer.setRegion(LocaleType.JA_JP);
+ expect(regionService.getCurrentRegion()).toBe(LocaleType.JA_JP);
+
univer.dispose();
});
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 5cf6f7ea67..3e6a624d6d 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -119,6 +119,7 @@ export { mergeOverrideWithDependencies } from './services/plugin/plugin-override
export type { DependencyOverride } from './services/plugin/plugin-override';
export type { PluginCtor } from './services/plugin/plugin.service';
export { DependentOn, Plugin, PluginService } from './services/plugin/plugin.service';
+export { RegionService } from './services/region/region.service';
export { IResourceLoaderService } from './services/resource-loader/type';
export { ResourceManagerService } from './services/resource-manager/resource-manager.service';
export type { IResourceHook, IResources } from './services/resource-manager/type';
diff --git a/packages/core/src/services/region/__tests__/region.service.spec.ts b/packages/core/src/services/region/__tests__/region.service.spec.ts
new file mode 100644
index 0000000000..7fcde38ce7
--- /dev/null
+++ b/packages/core/src/services/region/__tests__/region.service.spec.ts
@@ -0,0 +1,39 @@
+/**
+ * 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 { describe, expect, it } from 'vitest';
+import { LocaleType } from '../../../types/enum/locale-type';
+import { LocaleService } from '../../locale/locale.service';
+import { RegionService } from '../region.service';
+
+describe('RegionService', () => {
+ it('follows locale until a region is explicitly set', () => {
+ const localeService = new LocaleService();
+ const regionService = new RegionService(localeService);
+
+ expect(regionService.getCurrentRegion()).toBe(LocaleType.ZH_CN);
+
+ localeService.setLocale(LocaleType.EN_US);
+ expect(regionService.getCurrentRegion()).toBe(LocaleType.EN_US);
+
+ regionService.setRegion(LocaleType.FR_FR);
+ localeService.setLocale(LocaleType.JA_JP);
+ expect(regionService.getCurrentRegion()).toBe(LocaleType.FR_FR);
+
+ regionService.dispose();
+ localeService.dispose();
+ });
+});
diff --git a/packages/core/src/services/region/region.service.ts b/packages/core/src/services/region/region.service.ts
new file mode 100644
index 0000000000..3a111e4c96
--- /dev/null
+++ b/packages/core/src/services/region/region.service.ts
@@ -0,0 +1,52 @@
+/**
+ * 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 { Observable } from 'rxjs';
+import type { LocaleType } from '../../types/enum/locale-type';
+import { BehaviorSubject } from 'rxjs';
+import { Inject } from '../../common/di';
+import { Disposable, toDisposable } from '../../shared/lifecycle';
+import { LocaleService } from '../locale/locale.service';
+
+export class RegionService extends Disposable {
+ private readonly _currentRegion$: BehaviorSubject<LocaleType>;
+ readonly currentRegion$: Observable<LocaleType>;
+
+ private _hasExplicitRegion = false;
+
+ constructor(@Inject(LocaleService) private readonly _localeService: LocaleService) {
+ super();
+
+ this._currentRegion$ = new BehaviorSubject<LocaleType>(this._localeService.getCurrentLocale());
+ this.currentRegion$ = this._currentRegion$.asObservable();
+
+ this.disposeWithMe(this._localeService.currentLocale$.subscribe((locale) => {
+ if (!this._hasExplicitRegion && locale !== this._currentRegion$.value) {
+ this._currentRegion$.next(locale);
+ }
+ }));
+ this.disposeWithMe(toDisposable(() => this._currentRegion$.complete()));
+ }
+
+ setRegion(region: LocaleType): void {
+ this._hasExplicitRegion = true;
+ this._currentRegion$.next(region);
+ }
+
+ getCurrentRegion(): LocaleType {
+ return this._currentRegion$.value;
+ }
+}
diff --git a/packages/core/src/univer.ts b/packages/core/src/univer.ts
index 497704430d..a7426b98f2 100644
--- a/packages/core/src/univer.ts
+++ b/packages/core/src/univer.ts
@@ -42,6 +42,7 @@ import { PermissionService } from './services/permission/permission.service';
import { IPermissionService } from './services/permission/type';
import { mergeOverrideWithDependencies } from './services/plugin/plugin-override';
import { PluginService } from './services/plugin/plugin.service';
+import { RegionService } from './services/region/region.service';
import { ResourceLoaderService } from './services/resource-loader/resource-loader.service';
import { IResourceLoaderService } from './services/resource-loader/type';
import { ResourceManagerService } from './services/resource-manager/resource-manager.service';
@@ -70,6 +71,11 @@ export interface IUniverConfig {
*/
locale?: LocaleType;
+ /**
+ * The region of the Univer instance. It follows locale until explicitly configured.
+ */
+ region?: LocaleType;
+
/**
* The direction of the Univer instance.
* @default 'ltr'
@@ -123,11 +129,12 @@ export class Univer implements IDisposable {
constructor(config: Partial<IUniverConfig> = {}, parentInjector?: Injector) {
const injector = this._injector = createUniverInjector(parentInjector, config?.override);
- const { theme, darkMode, locale, locales, direction, logLevel, logCommandExecution } = config;
+ const { theme, darkMode, locale, region, locales, direction, logLevel, logCommandExecution } = config;
if (theme) this._injector.get(ThemeService).setTheme(theme);
if (darkMode) this._injector.get(ThemeService).setDarkMode(darkMode);
if (locales) this._injector.get(LocaleService).load(locales);
if (locale) this._injector.get(LocaleService).setLocale(locale);
+ if (region) this._injector.get(RegionService).setRegion(region);
if (direction) this._injector.get(LocaleService).setDirection(direction);
if (logLevel) this._injector.get(ILogService).setLogLevel(logLevel);
if (logCommandExecution !== undefined) {
@@ -166,6 +173,10 @@ export class Univer implements IDisposable {
this._injector.get(LocaleService).setLocale(locale);
}
+ setRegion(region: LocaleType): void {
+ this._injector.get(RegionService).setRegion(region);
+ }
+
createUnit<T, U extends UnitModel>(type: UniverInstanceType, data: Partial<T>): U {
return this._univerInstanceService.createUnit(type, data);
}
@@ -246,6 +257,7 @@ function createUniverInjector(parentInjector?: Injector, override?: DependencyOv
const dependencies: Dependency[] = mergeOverrideWithDependencies([
[ErrorService],
[LocaleService],
+ [RegionService],
[ThemeService],
[LifecycleService],
[PluginService],
diff --git a/packages/design/package.json b/packages/design/package.json
index 556c6dfb28..83739872be 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.32.0",
+ "@univerjs/icons": "1.33.0",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "1.1.1",
diff --git a/packages/docs-hyper-link-ui/package.json b/packages/docs-hyper-link-ui/package.json
index a6e6d4b146..d334944988 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-quick-insert-ui/package.json b/packages/docs-quick-insert-ui/package.json
index ae67063fd3..3feb5b5734 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/docs-thread-comment-ui/package.json b/packages/docs-thread-comment-ui/package.json
index 3ba65299ed..c91e3c29a8 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.32.0",
+ "@univerjs/icons": "1.33.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 bc0fe12477..49cfa28577 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index bdb9202091..bc56ac5783 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index 484fd9d5a2..dfb656a167 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/ui": "workspace:*"
},
"devDependencies": {
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index 45a2dd3cc8..bd3005a5f0 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-conditional-formatting": "workspace:*",
"@univerjs/sheets-formula": "workspace:*",
diff --git a/packages/sheets-crosshair-highlight/package.json b/packages/sheets-crosshair-highlight/package.json
index 4445dda76c..de24f73744 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.32.0",
+ "@univerjs/icons": "1.33.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 a023fc3aba..6961def931 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-data-validation": "workspace:*",
"@univerjs/sheets-formula-ui": "workspace:*",
diff --git a/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationDetail.spec.tsx b/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationDetail.spec.tsx
index 5e74064fab..fd3a4eb6b5 100644
--- a/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationDetail.spec.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationDetail.spec.tsx
@@ -101,9 +101,11 @@ import {
IPlatformService,
IShortcutService,
ISidebarService,
+ IUIRuntimeScopeService,
PlatformService,
RediContext,
ShortcutService,
+ UIRuntimeScopeService,
} from '@univerjs/ui';
import { act } from 'react';
import { createRoot } from 'react-dom/client';
@@ -406,6 +408,7 @@ function createDetailTestBed(rule: ISheetDataValidationRule) {
[IDescriptionService, { useClass: TestDescriptionService }],
[IRenderManagerService, { useClass: TestRenderManagerService as never }],
[IPlatformService, { useClass: PlatformService }],
+ [IUIRuntimeScopeService, { useClass: UIRuntimeScopeService }],
[IShortcutService, { useClass: ShortcutService }],
[ILayoutService, { useClass: TestLayoutService as never }],
[WorksheetPermissionService],
diff --git a/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationItem.spec.tsx b/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationItem.spec.tsx
index 2bdd2769a0..7e707a0528 100644
--- a/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationItem.spec.tsx
+++ b/packages/sheets-data-validation-ui/src/views/components/__tests__/DataValidationItem.spec.tsx
@@ -101,9 +101,11 @@ import {
IPlatformService,
IShortcutService,
ISidebarService,
+ IUIRuntimeScopeService,
PlatformService,
RediContext,
ShortcutService,
+ UIRuntimeScopeService,
} from '@univerjs/ui';
import { act } from 'react';
import { createRoot } from 'react-dom/client';
@@ -388,6 +390,7 @@ function createItemTestBed(rule: ISheetDataValidationRule = createCheckboxRule()
[IDescriptionService, { useClass: TestDescriptionService }],
[IRenderManagerService, { useClass: TestRenderManagerService as never }],
[IPlatformService, { useClass: PlatformService }],
+ [IUIRuntimeScopeService, { useClass: UIRuntimeScopeService }],
[IShortcutService, { useClass: ShortcutService }],
[ILayoutService, { useClass: TestLayoutService as never }],
[WorksheetPermissionService],
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index 553b54e583..73de1ee4ee 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.32.0",
+ "@univerjs/icons": "1.33.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 a19a0a9580..2fe678ae8d 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.32.0",
+ "@univerjs/icons": "1.33.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 f575576ed1..40490c4f18 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.32.0",
+ "@univerjs/icons": "1.33.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 eb219bb062..b34ca0aab1 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.32.0",
+ "@univerjs/icons": "1.33.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 c8e3be1591..ca70df5d5a 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
diff --git a/packages/sheets-numfmt-ui/src/controllers/components.controller.ts b/packages/sheets-numfmt-ui/src/controllers/components.controller.ts
index 6114146361..c78a55ef81 100644
--- a/packages/sheets-numfmt-ui/src/controllers/components.controller.ts
+++ b/packages/sheets-numfmt-ui/src/controllers/components.controller.ts
@@ -15,7 +15,20 @@
*/
import { Disposable, Inject } from '@univerjs/core';
-import { AddDigitsIcon, DollarIcon, EuroIcon, PercentIcon, ReduceDigitsIcon, RmbIcon, RoubleIcon } from '@univerjs/icons';
+import {
+ AddDigitsIcon,
+ DollarIcon,
+ DongIcon,
+ EuroIcon,
+ PercentIcon,
+ ReduceDigitsIcon,
+ RialIcon,
+ RmbIcon,
+ RoubleIcon,
+ RupiahIcon,
+ WonIcon,
+ ZlotyIcon,
+} from '@univerjs/icons';
import { ComponentManager, IconManager } from '@univerjs/ui';
import { MORE_NUMFMT_TYPE_KEY, MoreNumfmtType, Options, OPTIONS_KEY } from '../views/components/MoreNumfmtType';
import { SheetNumfmtPanel } from '../views/SheetNumfmtPanel';
@@ -37,11 +50,16 @@ export class ComponentsController extends Disposable {
this.disposeWithMe(this._iconManager.register({
AddDigitsIcon,
DollarIcon,
+ DongIcon,
EuroIcon,
PercentIcon,
ReduceDigitsIcon,
+ RialIcon,
RmbIcon,
RoubleIcon,
+ RupiahIcon,
+ WonIcon,
+ ZlotyIcon,
}));
}
diff --git a/packages/sheets-numfmt-ui/src/menu/menu.ts b/packages/sheets-numfmt-ui/src/menu/menu.ts
index 44169d160a..935373412b 100644
--- a/packages/sheets-numfmt-ui/src/menu/menu.ts
+++ b/packages/sheets-numfmt-ui/src/menu/menu.ts
@@ -25,6 +25,7 @@ import {
isPatternEqualWithoutDecimal,
IUniverInstanceService,
LocaleService,
+ RegionService,
UniverInstanceType,
} from '@univerjs/core';
import {
@@ -46,7 +47,7 @@ import {
} from '@univerjs/sheets-numfmt';
import { deriveStateFromActiveSheet$, getCurrentRangeDisable$ } from '@univerjs/sheets-ui';
import { getMenuHiddenObservable, MenuItemType } from '@univerjs/ui';
-import { filter, merge, Observable } from 'rxjs';
+import { filter, map, merge, Observable } from 'rxjs';
import { OpenNumfmtPanelOperator } from '../commands/operations/open.numfmt.panel.operation';
import { MORE_NUMFMT_TYPE_KEY, OPTIONS_KEY } from '../views/components/MoreNumfmtType';
@@ -119,14 +120,10 @@ export const MENU_OPTIONS = (currencySymbol: string): Array<{
};
export function CurrencySymbolIconMenuItem(accessor: IAccessor): IMenuButtonItem<LocaleKey> {
+ const regionService = accessor.get(RegionService);
+
return {
- icon: new Observable<string>((subscribe) => {
- const localeService = accessor.get(LocaleService);
- subscribe.next(getCurrencySymbolIconByLocale(localeService.getCurrentLocale()).icon);
- return localeService.localeChanged$.subscribe(() => {
- subscribe.next(getCurrencySymbolIconByLocale(localeService.getCurrentLocale()).icon);
- });
- }),
+ icon: regionService.currentRegion$.pipe(map((region) => getCurrencySymbolIconByLocale(region).icon)),
id: SetCurrencyCommand.id,
title: 'sheets-numfmt-ui.currency',
tooltip: 'sheets-numfmt-ui.currency',
@@ -193,6 +190,7 @@ export function FactoryOtherMenuItem(accessor: IAccessor): IMenuSelectorItem<Loc
const univerInstanceService = accessor.get(IUniverInstanceService);
const commandService = accessor.get(ICommandService);
const localeService = accessor.get(LocaleService);
+ const regionService = accessor.get(RegionService);
const selectionManagerService = accessor.get(SheetsSelectionsService);
const commandList = [RemoveNumfmtMutation.id, SetNumfmtMutation.id];
@@ -202,6 +200,7 @@ export function FactoryOtherMenuItem(accessor: IAccessor): IMenuSelectorItem<Loc
({ workbook, worksheet }) => new Observable((subscribe) =>
merge(
selectionManagerService.selectionMoveEnd$,
+ regionService.currentRegion$,
fromCallback(commandService.onCommandExecuted.bind(commandService)).pipe(
filter(([commandInfo]) => commandList.includes(commandInfo.id))
)
@@ -213,7 +212,7 @@ export function FactoryOtherMenuItem(accessor: IAccessor): IMenuSelectorItem<Loc
const col = range.startColumn;
const numfmtValue = workbook.getStyles().get(worksheet.getCell(row, col)?.s)?.n;
const pattern = numfmtValue?.pattern;
- const currencySymbol = getCurrencySymbolByLocale(localeService.getCurrentLocale());
+ const currencySymbol = getCurrencySymbolByLocale(regionService.getCurrentRegion());
// Adapts the 'General' obtained during import, or the 'General' set manually
let value: string = localeService.t<LocaleKey>('sheets-numfmt-ui.general');
diff --git a/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx b/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
index 110cd9bd6d..62100a9797 100644
--- a/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
+++ b/packages/sheets-numfmt-ui/src/views/components/MoreNumfmtType.tsx
@@ -16,13 +16,13 @@
import type { FormatType } from '@univerjs/sheets';
import type { LocaleKey } from '../../locale/types';
-import { ICommandService, LocaleService, Range } from '@univerjs/core';
+import { ICommandService, LocaleService, Range, RegionService } from '@univerjs/core';
import { Separator } from '@univerjs/design';
import { SheetsSelectionsService } from '@univerjs/sheets';
import {
+ getCurrencySymbolByLocale,
getPatternPreview,
getPatternType,
- localeCurrencySymbolMap,
SetNumfmtCommand,
SheetsNumfmtCellContentController,
} from '@univerjs/sheets-numfmt';
@@ -45,9 +45,11 @@ export function MoreNumfmtType(props: { value?: string }) {
export function Options() {
const commandService = useDependency(ICommandService);
const localeService = useDependency(LocaleService);
+ const regionService = useDependency(RegionService);
const layoutService = useDependency(ILayoutService);
const sheetsNumfmtCellContentController = useDependency(SheetsNumfmtCellContentController);
const direction = useObservable(localeService.direction$, localeService.getDirection());
+ const region = useObservable(regionService.currentRegion$, regionService.getCurrentRegion());
const selectionManagerService = useDependency(SheetsSelectionsService);
const setNumfmt = (pattern: string | null) => {
@@ -71,9 +73,9 @@ export function Options() {
};
const menuOptions = useMemo(() => {
- const currencySymbol = localeCurrencySymbolMap.get(localeService.getCurrentLocale()) as string;
+ const currencySymbol = getCurrencySymbolByLocale(region);
return MENU_OPTIONS(currencySymbol);
- }, [localeService]);
+ }, [region]);
const handleClick = (index: number) => {
if (index === 0) {
diff --git a/packages/sheets-numfmt/src/__tests__/utils.test.ts b/packages/sheets-numfmt/src/__tests__/utils.test.ts
index 550a3a624e..b1ace8ff1e 100644
--- a/packages/sheets-numfmt/src/__tests__/utils.test.ts
+++ b/packages/sheets-numfmt/src/__tests__/utils.test.ts
@@ -74,10 +74,23 @@ describe('test numfmt utils function', () => {
locale: LocaleType.FR_FR,
});
expect(getCurrencySymbolIconByLocale(LocaleType.KO_KR)).toEqual({
- icon: 'DollarIcon',
+ icon: 'WonIcon',
symbol: '₩',
locale: LocaleType.KO_KR,
});
+ expect([
+ LocaleType.VI_VN,
+ LocaleType.FA_IR,
+ LocaleType.AR_SA,
+ LocaleType.ID_ID,
+ LocaleType.PL_PL,
+ ].map((locale) => getCurrencySymbolIconByLocale(locale).icon)).toEqual([
+ 'DongIcon',
+ 'RialIcon',
+ 'RialIcon',
+ 'RupiahIcon',
+ 'ZlotyIcon',
+ ]);
expect(getCurrencyFormat(LocaleType.ZH_CN, 3)).toContain('"¥"#,##0.000');
expect(getCurrencyFormat(LocaleType.EN_US, 200)).toContain(`.${'0'.repeat(127)}`);
});
diff --git a/packages/sheets-numfmt/src/base/const/currency-symbols.ts b/packages/sheets-numfmt/src/base/const/currency-symbols.ts
index 3831b208a2..7ce263c65d 100644
--- a/packages/sheets-numfmt/src/base/const/currency-symbols.ts
+++ b/packages/sheets-numfmt/src/base/const/currency-symbols.ts
@@ -67,14 +67,39 @@ export function getCurrencySymbolIconByLocale(locale: LocaleType) {
symbol: localeCurrencySymbolMap.get(locale) || '¥',
locale,
};
+ case LocaleType.VI_VN:
+ return {
+ icon: 'DongIcon',
+ symbol: localeCurrencySymbolMap.get(locale) || '₫',
+ locale,
+ };
case LocaleType.AR_SA:
- case LocaleType.EN_US:
case LocaleType.FA_IR:
- case LocaleType.ID_ID:
+ return {
+ icon: 'RialIcon',
+ symbol: localeCurrencySymbolMap.get(locale) || '﷼',
+ locale,
+ };
case LocaleType.KO_KR:
+ return {
+ icon: 'WonIcon',
+ symbol: localeCurrencySymbolMap.get(locale) || '₩',
+ locale,
+ };
+ case LocaleType.ID_ID:
+ return {
+ icon: 'RupiahIcon',
+ symbol: localeCurrencySymbolMap.get(locale) || 'Rp',
+ locale,
+ };
case LocaleType.PL_PL:
+ return {
+ icon: 'ZlotyIcon',
+ symbol: localeCurrencySymbolMap.get(locale) || 'zł',
+ locale,
+ };
+ case LocaleType.EN_US:
case LocaleType.PT_BR:
- case LocaleType.VI_VN:
case LocaleType.ZH_HK:
case LocaleType.ZH_TW:
default:
diff --git a/packages/sheets-numfmt/src/commands/commands/__tests__/numfmt.command.spec.ts b/packages/sheets-numfmt/src/commands/commands/__tests__/numfmt.command.spec.ts
index 1e7b475573..b249032169 100644
--- a/packages/sheets-numfmt/src/commands/commands/__tests__/numfmt.command.spec.ts
+++ b/packages/sheets-numfmt/src/commands/commands/__tests__/numfmt.command.spec.ts
@@ -29,6 +29,7 @@ import {
Plugin,
RANGE_TYPE,
RedoCommand,
+ RegionService,
UndoCommand,
Univer,
UniverInstanceType,
@@ -353,9 +354,10 @@ describe('Sheets numfmt commands', () => {
},
]);
+ get(RegionService).setRegion(LocaleType.FR_FR);
await expect(commandService.executeCommand(SetCurrencyCommand.id)).resolves.toBe(true);
expect(numfmtService.getValue('test', 'sheet1', 0, 4)).toEqual({
- pattern: getCurrencyFormat(LocaleType.ZH_CN),
+ pattern: getCurrencyFormat(LocaleType.FR_FR),
});
});
diff --git a/packages/sheets-numfmt/src/commands/commands/set-currency.command.ts b/packages/sheets-numfmt/src/commands/commands/set-currency.command.ts
index 429372a495..64495d06b6 100644
--- a/packages/sheets-numfmt/src/commands/commands/set-currency.command.ts
+++ b/packages/sheets-numfmt/src/commands/commands/set-currency.command.ts
@@ -16,7 +16,7 @@
import type { IAccessor, ICommand } from '@univerjs/core';
import type { ISetNumfmtCommandParams } from './set-numfmt.command';
-import { CommandType, ICommandService, LocaleService, Range } from '@univerjs/core';
+import { CommandType, ICommandService, Range, RegionService } from '@univerjs/core';
import { SheetsSelectionsService } from '@univerjs/sheets';
import { getCurrencyFormat, getCurrencySymbolIconByLocale } from '../../base/const/currency-symbols';
import { SetNumfmtCommand } from './set-numfmt.command';
@@ -31,7 +31,7 @@ export const SetCurrencyCommand: ICommand = {
handler: async (accessor: IAccessor) => {
const commandService = accessor.get(ICommandService);
const selectionManagerService = accessor.get(SheetsSelectionsService);
- const localeService = accessor.get(LocaleService);
+ const regionService = accessor.get(RegionService);
const selections = selectionManagerService.getCurrentSelections();
if (!selections || !selections.length) {
@@ -39,7 +39,7 @@ export const SetCurrencyCommand: ICommand = {
}
const values: ISetNumfmtCommandParams['values'] = [];
- const currencySymbolIcon = getCurrencySymbolIconByLocale(localeService.getCurrentLocale());
+ const currencySymbolIcon = getCurrencySymbolIconByLocale(regionService.getCurrentRegion());
const currencyFormat = getCurrencyFormat(currencySymbolIcon.locale);
selections.forEach((selection) => {
diff --git a/packages/sheets-sort-ui/package.json b/packages/sheets-sort-ui/package.json
index 481f57bee2..8c126788cd 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.32.0",
+ "@univerjs/icons": "1.33.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 4e34446a66..d5ba22e281 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.32.0",
+ "@univerjs/icons": "1.33.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 30138ad402..b4ddf408c3 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.32.0",
+ "@univerjs/icons": "1.33.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 7f5a6e5a59..0615d6ca4f 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/protocol": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/telemetry": "workspace:*",
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index a2d3a6c48d..c422da92ba 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/slides": "workspace:*",
"@univerjs/ui": "workspace:*"
},
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index b678b8fbde..b53d5dde11 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/ui": "workspace:*"
},
diff --git a/packages/ui/package.json b/packages/ui/package.json
index b9d70a7dab..70d1e14d90 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.32.0",
+ "@univerjs/icons": "1.33.0",
"@wendellhu/redi": "1.1.2"
},
"devDependencies": {
diff --git a/packages/ui/src/views/components/ribbon/RibbonGrid.tsx b/packages/ui/src/views/components/ribbon/RibbonGrid.tsx
index c4c9c5e413..c1c5e7e96a 100644
--- a/packages/ui/src/views/components/ribbon/RibbonGrid.tsx
+++ b/packages/ui/src/views/components/ribbon/RibbonGrid.tsx
@@ -60,7 +60,7 @@ export function RibbonGrid({ groups, title, className, ...props }: IRibbonGridPr
data-testid="ribbon-grid-group-grid"
className="
univer-grid univer-min-h-0 univer-flex-1 univer-grid-flow-col univer-grid-rows-2
- univer-content-center univer-gap-x-1 univer-gap-y-3 univer-py-3.5
+ univer-content-center univer-gap-x-1 univer-gap-y-2 univer-py-2
[&>div>span>span]:univer-h-full
"
>
diff --git a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
index 6ecc15ec2b..221e42a82c 100644
--- a/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/ribbon/ToolbarItem.tsx
@@ -280,7 +280,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IToolbarItemProps>((pr
<div
className={clsx(toolbarButtonSelectorMainVariants({ active: activated, disabled }), {
'univer-h-full univer-w-full univer-flex-col univer-justify-center univer-rounded univer-px-1 univer-pb-4 [&>svg]:univer-size-8': grid && large,
- '[&>svg]:univer-size-5': grid && !large,
+ '[&>svg]:univer-size-4': grid && !large,
})}
onClick={handleClick}
>
@@ -330,7 +330,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IToolbarItemProps>((pr
'univer-box-border univer-h-full univer-min-w-14 univer-flex-col univer-justify-center univer-gap-1 univer-px-1.5 univer-py-1 univer-text-xs [&>svg]:univer-size-8': grid && large,
'univer-box-border univer-h-full': grid && !large,
'univer-bg-white dark:!univer-bg-gray-800': grid && !large && !icon,
- '[&>svg]:univer-size-5': grid && !large,
+ '[&>svg]:univer-size-4': grid && !large,
}, grid && !large && !icon && borderClassName)}
>
{grid && large
@@ -382,7 +382,7 @@ export const ToolbarItem = forwardRef<ITooltipWrapperRef, IToolbarItemProps>((pr
const isCustomComponent = componentManager.get(typeof label === 'string' ? label : label?.name ?? '');
const buttonClassName = clsx(grid && !large && `
univer-h-full univer-min-w-8
- [&>svg]:univer-size-5
+ [&>svg]:univer-size-4
`, grid && large
? `
univer-h-full univer-min-w-14 univer-flex-col univer-gap-1 univer-px-1.5 univer-py-1 univer-text-xs
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 87fc3f959a..66c7c4f2ef 100644
--- a/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
+++ b/packages/ui/src/views/components/ribbon/__tests__/ToolbarItem.spec.tsx
@@ -217,7 +217,7 @@ describe('ToolbarItem', () => {
expect(getByText('Financial')).toBeTruthy();
});
- it('uses a regular icon for a one-row Grid button', () => {
+ it('uses a compact icon for a one-row Grid button', () => {
const { getByRole } = renderWithDependencies(
<ToolbarItem
id="test-grid-regular-button"
@@ -227,7 +227,7 @@ describe('ToolbarItem', () => {
/>
);
- expect(getByRole('button').className).toContain('[&>svg]:univer-size-5');
+ expect(getByRole('button').className).toContain('[&>svg]:univer-size-4');
expect(getByRole('button').className).not.toContain('[&>svg]:univer-size-8');
expect(getByRole('button').className).toContain('univer-h-full');
expect(getByRole('button').className).toContain('univer-min-w-8');
@@ -292,6 +292,7 @@ describe('ToolbarItem', () => {
expect(container.querySelector('.univer-toolbar-button-selector-root')?.className).toContain('univer-h-full');
expect(container.querySelector('.univer-toolbar-button-selector-root')?.className).toContain('univer-box-border');
+ expect(container.querySelector('.univer-toolbar-button-selector-main')?.className).toContain('[&>svg]:univer-size-4');
expect(container.querySelector('.univer-toolbar-button-selector-trigger')?.className).toContain('univer-h-full');
});
@@ -324,6 +325,7 @@ describe('ToolbarItem', () => {
expect(container.querySelector('.univer-toolbar-selector-root')?.className).toContain('univer-h-full');
expect(container.querySelector('.univer-toolbar-selector-root')?.className).toContain('univer-box-border');
+ expect(container.querySelector('.univer-toolbar-selector-root')?.className).toContain('[&>svg]:univer-size-4');
expect(container.querySelector('.univer-toolbar-selector-root')?.className).toContain('univer-border-solid');
expect(container.querySelector('.univer-toolbar-selector-root')?.className).toContain('univer-bg-white');
expect(container.querySelector('.univer-toolbar-selector-trigger')?.className).toContain('univer-ml-auto');
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 58fc26f83f..604b414854 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.32.0
+ specifier: 1.33.0
'@univerjs/mockdata':
specifier: workspace:*
version: link:../mockdata
@@ -358,8 +358,8 @@ importers:
devDependencies:
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/icons-svg':
specifier: ^1.32.0
version: 1.32.0
@@ -503,8 +503,8 @@ importers:
specifier: workspace:*
version: link:../packages/find-replace
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/mockdata':
specifier: workspace:*
version: link:../common/mockdata
@@ -741,8 +741,8 @@ importers:
specifier: workspace:*
version: link:../design
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.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.32.0
+ specifier: 1.33.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.32.0
+ specifier: 1.33.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1171,8 +1171,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1214,8 +1214,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.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.32.0
+ specifier: 1.33.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1337,8 +1337,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1448,8 +1448,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/ui':
specifier: workspace:*
version: link:../ui
@@ -1685,8 +1685,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -1740,8 +1740,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -1829,8 +1829,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2001,8 +2001,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/rpc':
specifier: workspace:*
version: link:../rpc
@@ -2139,8 +2139,8 @@ importers:
specifier: workspace:*
version: link:../formula-ui
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2225,8 +2225,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2311,8 +2311,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2388,8 +2388,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2459,8 +2459,8 @@ importers:
specifier: workspace:*
version: link:../engine-formula
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2545,8 +2545,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2628,8 +2628,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/sheets':
specifier: workspace:*
version: link:../sheets
@@ -2692,8 +2692,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/protocol':
specifier: workspace:*
version: link:../protocol
@@ -2775,8 +2775,8 @@ importers:
specifier: workspace:*
version: link:../engine-render
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.0
'@univerjs/slides':
specifier: workspace:*
version: link:../slides
@@ -2859,8 +2859,8 @@ importers:
specifier: workspace:*
version: link:../docs-ui
'@univerjs/icons':
- specifier: 1.32.0
+ specifier: 1.33.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.32.0
+ specifier: 1.33.0
'@wendellhu/redi':
specifier: 1.1.2
version: 1.1.2([email protected])
@@ -6897,8 +6897,8 @@ packages:
'@univerjs/[email protected]':
resolution: {integrity: sha512-kQ+lM+JC4jeWZWYvF0x61PjSuyqU6Db+JoAVLxVKbwcxUv9ecBEL4U5uIZUKKdJGkFflyDh8T7qI4BgOuMcQxQ==}
- '@univerjs/[email protected]':
- resolution: {integrity: sha512-rVhC+58erUnV5JtdnIGPtnxgY+4VZU1fIrl87K0v6IStC3apJs45YUcHtXU62hPSLWIUFGpNwyMRWQHymL8ACQ==}
+ '@univerjs/[email protected]':
+ resolution: {integrity: sha512-TaS1xFezdLDpcNvtGg8Mod+rnL1T3mqnj5YEoDrvo+WlRZqfM846nTdxcjJyPddij007jr/Id7BeVtDp52xGeA==}
peerDependencies:
react: 19.2.7
react-dom: 19.2.7
@@ -14594,7 +14594,7 @@ snapshots:
'@univerjs/[email protected]': {}
dependencies:
react: 19.2.7
react-dom: 19.2.7([email protected])