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.

fix(core): fix disposing univer causing error (#2515)

Wenzhao Huca76011ffb56
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5b64c8bbde..874e799827 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -142,6 +142,26 @@ With the help of vscode and its rich ecosystem, you could directly debug unit te
![](./docs/img/debug-unit-test.png)
+### E2E test
+
+You may need to install dependencies of Playwright manually by running the following command:
+
+```shell
+pnpm exec playwright install
+```
+
+If you would like to develop E2E tests, you can use the following command to run the dev server:
+
+```shell
+pnpm dev:e2e
+```
+
+and then run the following command to run E2E tests:
+
+```shell
+pnpm test:e2e
+```
+
### Clean code
> Programs are meant to be ready by humans and only icidentally for computers to execute. - Harold Abelson
diff --git a/common/storybook/package.json b/common/storybook/package.json
index b70a9d50d6..1c5204769d 100644
--- a/common/storybook/package.json
+++ b/common/storybook/package.json
@@ -30,7 +30,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/design": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"css-loader": "^6.10.0",
"less-loader": "^12.2.0",
"storybook": "8.1.6",
diff --git a/e2e/disposing/disposing.spec.ts b/e2e/disposing/disposing.spec.ts
new file mode 100644
index 0000000000..eee4bb19e1
--- /dev/null
+++ b/e2e/disposing/disposing.spec.ts
@@ -0,0 +1,52 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * 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 { expect, test } from '@playwright/test';
+
+// The type definition is copied from:
+// examples/src/plugins/debugger/controllers/e2e/e2e-memory.controller.ts
+export interface IE2EControllerAPI {
+ loadAndRelease(id: number): Promise<void>;
+ loadDefaultSheet(): Promise<void>;
+ disposeUniver(): Promise<void>;
+}
+
+declare global {
+ // eslint-disable-next-line ts/naming-convention
+ interface Window {
+ E2EControllerAPI: IE2EControllerAPI;
+ }
+}
+
+test('no error on constructing and disposing', async ({ page }) => {
+ let errored = false;
+
+ page.on('pageerror', (error) => {
+ console.error('Page error:', error);
+ errored = true;
+ });
+
+ await page.goto('http://localhost:3000/sheets/');
+ await page.waitForTimeout(2000);
+
+ await page.evaluate(() => window.E2EControllerAPI.loadDefaultSheet());
+ await page.waitForTimeout(2000); // wait for long enough to let the GC do its job
+
+ await page.evaluate(() => window.E2EControllerAPI.disposeUniver());
+ await page.waitForTimeout(2000); // wait for long enough to let the GC do its job
+
+ expect(errored).toBeFalsy();
+});
diff --git a/e2e/memory/memory.spec.ts b/e2e/memory/memory.spec.ts
index 29f53d6317..c4acbbe88c 100644
--- a/e2e/memory/memory.spec.ts
+++ b/e2e/memory/memory.spec.ts
@@ -21,14 +21,15 @@ import { expect, test } from '@playwright/test';
// The type definition is copied from:
// examples/src/plugins/debugger/controllers/e2e/e2e-memory.controller.ts
-export interface IE2EMemoryControllerAPI {
+export interface IE2EControllerAPI {
loadAndRelease(id: number): Promise<void>;
- getHeapMemoryUsage(): number;
+ disposeUniver(): Promise<void>;
}
+
declare global {
// eslint-disable-next-line ts/naming-convention
interface Window {
- E2EMemoryAPI: IE2EMemoryControllerAPI;
+ E2EControllerAPI: IE2EControllerAPI;
}
}
@@ -39,12 +40,12 @@ test('memory', async ({ page }) => {
const memoryBeforeLoad = (await getMetrics(page)).JSHeapUsedSize;
console.log('Memory before load:', memoryBeforeLoad);
- await page.evaluate(() => window.E2EMemoryAPI.loadAndRelease(1));
+ await page.evaluate(() => window.E2EControllerAPI.loadAndRelease(1));
await page.waitForTimeout(5000); // wait for long enough to let the GC do its job
const memoryAfterFirstLoad = (await getMetrics(page)).JSHeapUsedSize;
console.log('Memory after first load:', memoryAfterFirstLoad);
- await page.evaluate(() => window.E2EMemoryAPI.loadAndRelease(2));
+ await page.evaluate(() => window.E2EControllerAPI.loadAndRelease(2));
const memoryAfterSecondLoad = (await getMetrics(page)).JSHeapUsedSize;
console.log('Memory after second load:', memoryAfterSecondLoad);
diff --git a/examples/esbuild.config.mjs b/examples/esbuild.config.mjs
index 3833ca8171..2486e9f96a 100644
--- a/examples/esbuild.config.mjs
+++ b/examples/esbuild.config.mjs
@@ -13,6 +13,7 @@ import vue from 'esbuild-plugin-vue3';
const nodeModules = path.resolve(process.cwd(), './node_modules');
const args = minimist(process.argv.slice(2));
+const isE2E = !!args.e2e;
// User should also config their bunlder to build monaco editor's resources for web worker.
const monacoEditorEntryPoints = ['vs/language/typescript/ts.worker.js', 'vs/editor/editor.worker.js'];
@@ -99,7 +100,7 @@ const ctx = await esbuild[args.watch ? 'context' : 'build']({
'process.env.GIT_COMMIT_HASH': `"${gitCommitHash}"`,
'process.env.GIT_REF_NAME': `"${gitRefName}"`,
'process.env.BUILD_TIME': `"${new Date().toISOString()}"`,
- 'process.env.IS_E2E': args.e2e ? 'true' : 'false',
+ 'process.env.IS_E2E': isE2E ? 'true' : 'false',
},
});
@@ -109,7 +110,7 @@ if (args.watch) {
const { port } = await ctx.serve({
servedir: './local',
- port: 3002,
+ port: isE2E ? 3000 : 3002,
});
const url = `http://localhost:${port}`;
diff --git a/examples/package.json b/examples/package.json
index dd6c78c35f..31442d51e6 100644
--- a/examples/package.json
+++ b/examples/package.json
@@ -50,7 +50,7 @@
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@univerjs/uniscript": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"monaco-editor": "0.49.0",
"react": "18.3.1",
diff --git a/packages/core/package.json b/packages/core/package.json
index 92f24b5384..c9bdf62478 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -59,7 +59,7 @@
"build": "tsc && vite build"
},
"peerDependencies": {
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -71,7 +71,7 @@
"devDependencies": {
"@types/numeral": "^2.0.5",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/core/src/services/permission/permission.service.ts b/packages/core/src/services/permission/permission.service.ts
index 4c68b5a380..ace881f7fd 100644
--- a/packages/core/src/services/permission/permission.service.ts
+++ b/packages/core/src/services/permission/permission.service.ts
@@ -81,10 +81,11 @@ export class PermissionService extends Disposable implements IPermissionService
const subjectList = permissionIdList.map((id) => {
const subject = this._permissionPointMap?.get(id);
if (!subject) {
- throw new Error(`${id} permissionPoint is not exist`);
+ throw new Error(`[PermissionService]: ${id} permissionPoint does not exist!`);
}
return subject.asObservable();
});
+
return combineLatest(subjectList).pipe(
// Check that all permissions exist
map((list) => {
@@ -97,10 +98,11 @@ export class PermissionService extends Disposable implements IPermissionService
const valueList = permissionIdList.map((id) => {
const subject = this._permissionPointMap?.get(id);
if (!subject) {
- throw new Error(`${id} permissionPoint is not exist`);
+ throw new Error(`[PermissionService]: ${id} permissionPoint does not exist!`);
}
return subject.getValue();
});
+
return valueList;
}
}
diff --git a/packages/data-validation/package.json b/packages/data-validation/package.json
index 2812120ecb..e595e831e4 100644
--- a/packages/data-validation/package.json
+++ b/packages/data-validation/package.json
@@ -64,7 +64,7 @@
"peerDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -74,7 +74,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/debugger/package.json b/packages/debugger/package.json
index cd4611d96a..99b3437e50 100644
--- a/packages/debugger/package.json
+++ b/packages/debugger/package.json
@@ -60,7 +60,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-drawing-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
@@ -75,7 +75,7 @@
"@univerjs/sheets-drawing-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@vitejs/plugin-vue": "^5.0.4",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/debugger/src/commands/commands/unit.command.ts b/packages/debugger/src/commands/commands/unit.command.ts
index 4b6c6c73ce..03f19462df 100644
--- a/packages/debugger/src/commands/commands/unit.command.ts
+++ b/packages/debugger/src/commands/commands/unit.command.ts
@@ -14,7 +14,24 @@
* limitations under the License.
*/
-import { CommandType, type ICommand, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
+import { CommandType, type ICommand, IUniverInstanceService, type Univer, UniverInstanceType } from '@univerjs/core';
+
+declare global {
+ // eslint-disable-next-line ts/naming-convention
+ interface Window {
+ univer?: Univer;
+ }
+}
+
+export const DisposeUniverCommand: ICommand = {
+ id: 'debugger.command.dispose-unit',
+ type: CommandType.COMMAND,
+ handler: () => {
+ window.univer?.dispose();
+
+ return true;
+ },
+};
export const DisposeCurrentUnitCommand: ICommand = {
id: 'debugger.command.dispose-current-unit',
diff --git a/packages/debugger/src/controllers/debugger.controller.ts b/packages/debugger/src/controllers/debugger.controller.ts
index 65d17b8294..76a92a611e 100644
--- a/packages/debugger/src/controllers/debugger.controller.ts
+++ b/packages/debugger/src/controllers/debugger.controller.ts
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-import { Disposable, ICommandService, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, ICommandService } from '@univerjs/core';
import type { IMenuItemFactory, MenuConfig } from '@univerjs/ui';
import { ComponentManager, IMenuService } from '@univerjs/ui';
import { Inject, Injector } from '@wendellhu/redi';
@@ -34,7 +34,7 @@ import { TEST_EDITOR_CONTAINER_COMPONENT } from '../views/test-editor/component-
// @ts-ignore
import VueI18nIcon from '../components/VueI18nIcon.vue';
-import { CreateEmptySheetCommand, DisposeCurrentUnitCommand } from '../commands/commands/unit.command';
+import { CreateEmptySheetCommand, DisposeCurrentUnitCommand, DisposeUniverCommand } from '../commands/commands/unit.command';
import { CreateFloatDomCommand } from '../commands/commands/float-dom.command';
import { ImageDemo } from '../components/Image';
import { ChangeUserCommand } from '../commands/operations/change-user.operation';
@@ -45,6 +45,7 @@ import {
CreateFloatDOMMenuItemFactory,
DialogMenuItemFactory,
DisposeCurrentUnitMenuItemFactory,
+ DisposeUniverItemFactory,
FloatDomMenuItemFactory,
LocaleMenuItemFactory,
MessageMenuItemFactory,
@@ -70,12 +71,11 @@ export class DebuggerController extends Disposable {
@Inject(Injector) private readonly _injector: Injector,
@IMenuService private readonly _menuService: IMenuService,
@ICommandService private readonly _commandService: ICommandService,
- @Inject(IUniverInstanceService) private _univerInstanceService: IUniverInstanceService,
@Inject(ComponentManager) private readonly _componentManager: ComponentManager
) {
super();
- this._initializeContextMenu();
+ this._initializeContextMenu();
this._initCustomComponents();
[
@@ -88,6 +88,7 @@ export class DebuggerController extends Disposable {
SidebarOperation,
SetEditable,
SaveSnapshotOptions,
+ DisposeUniverCommand,
DisposeCurrentUnitCommand,
CreateEmptySheetCommand,
CreateFloatDomCommand,
@@ -112,6 +113,7 @@ export class DebuggerController extends Disposable {
SetEditableMenuItemFactory,
SaveSnapshotSetEditableMenuItemFactory,
UnitMenuItemFactory,
+ DisposeUniverItemFactory,
DisposeCurrentUnitMenuItemFactory,
CreateEmptySheetMenuItemFactory,
FloatDomMenuItemFactory,
diff --git a/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts b/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts
index cb2586870b..3e9b786062 100644
--- a/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts
+++ b/packages/debugger/src/controllers/e2e/e2e-memory.controller.ts
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-import { IUniverInstanceService, LifecycleStages, LocaleType, OnLifecycle, UniverInstanceType } from '@univerjs/core';
+import { ICommandService, IUniverInstanceService, LifecycleStages, LocaleType, OnLifecycle, UniverInstanceType } from '@univerjs/core';
+import { DisposeUniverCommand } from '../../commands/commands/unit.command';
const DEFAULT_WORKBOOK_DATA_DEMO = {
id: 'test',
@@ -62,14 +63,16 @@ const DEFAULT_WORKBOOK_DATA_DEMO = {
const AWAIT_LOADING_TIMEOUT = 5000;
const AWAIT_DISPOSING_TIMEOUT = 5000;
-export interface IE2EMemoryControllerAPI {
+export interface IE2EControllerAPI {
loadAndRelease(id: number): Promise<void>;
+ loadDefaultSheet(): Promise<void>;
+ disposeUniver(): Promise<void>;
}
declare global {
// eslint-disable-next-line ts/naming-convention
interface Window {
- E2EMemoryAPI: IE2EMemoryControllerAPI;
+ E2EControllerAPI: IE2EControllerAPI;
}
}
@@ -79,14 +82,17 @@ declare global {
@OnLifecycle(LifecycleStages.Starting, E2EMemoryController)
export class E2EMemoryController {
constructor(
- @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService
+ @IUniverInstanceService private readonly _univerInstanceService: IUniverInstanceService,
+ @ICommandService private readonly _commandService: ICommandService
) {
this._initPlugin();
}
private _initPlugin(): void {
- window.E2EMemoryAPI = {
+ window.E2EControllerAPI = {
loadAndRelease: (id) => this._releaseAndLoad(id),
+ loadDefaultSheet: () => this._loadDefaultSheet(),
+ disposeUniver: () => this._disposeUniver(),
};
}
@@ -97,6 +103,15 @@ export class E2EMemoryController {
this._univerInstanceService.disposeUnit(unitId);
await timer(AWAIT_DISPOSING_TIMEOUT);
}
+
+ private async _loadDefaultSheet(): Promise<void> {
+ this._univerInstanceService.createUnit(UniverInstanceType.UNIVER_SHEET, DEFAULT_WORKBOOK_DATA_DEMO);
+ await timer(AWAIT_LOADING_TIMEOUT);
+ }
+
+ private async _disposeUniver(): Promise<void> {
+ await this._commandService.executeCommand(DisposeUniverCommand.id);
+ }
}
function timer(timeout: number): Promise<void> {
diff --git a/packages/debugger/src/controllers/menu.ts b/packages/debugger/src/controllers/menu.ts
index dff3e9a26d..be60b8bff5 100644
--- a/packages/debugger/src/controllers/menu.ts
+++ b/packages/debugger/src/controllers/menu.ts
@@ -29,7 +29,7 @@ import { SaveSnapshotOptions } from '../commands/operations/save-snapshot.operat
import { SetEditable } from '../commands/operations/set.editable.operation';
import { SidebarOperation } from '../commands/operations/sidebar.operation';
import { ThemeOperation } from '../commands/operations/theme.operation';
-import { CreateEmptySheetCommand, DisposeCurrentUnitCommand } from '../commands/commands/unit.command';
+import { CreateEmptySheetCommand, DisposeCurrentUnitCommand, DisposeUniverCommand } from '../commands/commands/unit.command';
import { CreateFloatDomCommand } from '../commands/commands/float-dom.command';
import { ChangeUserCommand, UnitRole } from '../commands/operations/change-user.operation';
@@ -225,13 +225,24 @@ const UNIT_ITEM_MENU_ID = 'debugger.unit-menu-item';
export function UnitMenuItemFactory(accessor: IAccessor): IMenuSelectorItem {
return {
id: UNIT_ITEM_MENU_ID,
- title: 'Unit',
- tooltip: 'Unit Commands',
+ title: 'Dispose',
+ tooltip: 'Lifecycle Related Commands',
type: MenuItemType.SUBITEMS,
positions: [MenuPosition.TOOLBAR_OTHERS],
};
}
+export function DisposeUniverItemFactory(_accessor: IAccessor): IMenuButtonItem {
+ return {
+ id: DisposeUniverCommand.id,
+ title: 'Dispose Univer',
+ tooltip: 'Dispose the Univer instance',
+ icon: 'DS',
+ type: MenuItemType.BUTTON,
+ positions: [UNIT_ITEM_MENU_ID],
+ };
+}
+
export function DisposeCurrentUnitMenuItemFactory(accessor: IAccessor): IMenuButtonItem {
return {
id: DisposeCurrentUnitCommand.id,
diff --git a/packages/debugger/src/debugger-plugin.ts b/packages/debugger/src/debugger-plugin.ts
index 8e7772afb2..6c07885c39 100644
--- a/packages/debugger/src/debugger-plugin.ts
+++ b/packages/debugger/src/debugger-plugin.ts
@@ -51,6 +51,7 @@ export class UniverDebuggerPlugin extends Plugin {
useFactory: () => this._injector.createInstance(DebuggerController, this._config),
},
]);
+
this._debuggerController = this._injector.get(DebuggerController);
}
diff --git a/packages/docs-drawing-ui/package.json b/packages/docs-drawing-ui/package.json
index 2f53e1b030..3dd821ce58 100644
--- a/packages/docs-drawing-ui/package.json
+++ b/packages/docs-drawing-ui/package.json
@@ -71,7 +71,7 @@
"@univerjs/drawing-ui": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -90,7 +90,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"ot-json1": "^1.0.2",
diff --git a/packages/docs-drawing/package.json b/packages/docs-drawing/package.json
index f53c3dbf4a..e7760aa166 100644
--- a/packages/docs-drawing/package.json
+++ b/packages/docs-drawing/package.json
@@ -70,7 +70,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "^0.15.2",
+ "@wendellhu/redi": "^0.15.4",
"typescript": "^5.4.5",
"vite": "^5.2.13",
"vitest": "^1.6.0"
diff --git a/packages/docs-ui/package.json b/packages/docs-ui/package.json
index dd083ceb99..f8a45a77d3 100644
--- a/packages/docs-ui/package.json
+++ b/packages/docs-ui/package.json
@@ -69,7 +69,7 @@
"@univerjs/docs": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
@@ -81,7 +81,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"less": "^4.2.0",
"react": "18.3.1",
"rxjs": "^7.8.1",
diff --git a/packages/docs/package.json b/packages/docs/package.json
index be575f4fbc..228de918ca 100644
--- a/packages/docs/package.json
+++ b/packages/docs/package.json
@@ -61,14 +61,14 @@
"peerDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/drawing-ui/package.json b/packages/drawing-ui/package.json
index fe39703836..21c38a3c7e 100644
--- a/packages/drawing-ui/package.json
+++ b/packages/drawing-ui/package.json
@@ -67,7 +67,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0"
},
@@ -81,7 +81,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/drawing/package.json b/packages/drawing/package.json
index ce1800277f..969f7984fc 100644
--- a/packages/drawing/package.json
+++ b/packages/drawing/package.json
@@ -58,7 +58,7 @@
},
"peerDependencies": {
"@univerjs/core": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -69,7 +69,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"less": "^4.2.0",
"ot-json1": "^1.0.2",
"react": "18.3.1",
diff --git a/packages/engine-formula/package.json b/packages/engine-formula/package.json
index bd12e75001..a0edf1d9fc 100644
--- a/packages/engine-formula/package.json
+++ b/packages/engine-formula/package.json
@@ -61,7 +61,7 @@
"peerDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/rpc": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -73,7 +73,7 @@
"@univerjs/core": "workspace:*",
"@univerjs/rpc": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/engine-render/package.json b/packages/engine-render/package.json
index 6391e746d0..2405bd2a5f 100644
--- a/packages/engine-render/package.json
+++ b/packages/engine-render/package.json
@@ -60,7 +60,7 @@
},
"peerDependencies": {
"@univerjs/core": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -72,7 +72,7 @@
"@types/opentype.js": "^1.3.8",
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/facade/package.json b/packages/facade/package.json
index e2aad45231..154a833024 100644
--- a/packages/facade/package.json
+++ b/packages/facade/package.json
@@ -68,7 +68,7 @@
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
@@ -84,7 +84,7 @@
"@univerjs/sheets-numfmt": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"jest-canvas-mock": "^2.5.2",
"jsdom": "^24.0.0",
"rxjs": "^7.8.1",
diff --git a/packages/find-replace/package.json b/packages/find-replace/package.json
index 5b790e584b..75711f3a1d 100644
--- a/packages/find-replace/package.json
+++ b/packages/find-replace/package.json
@@ -68,7 +68,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
@@ -83,7 +83,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"less": "^4.2.0",
"react": "18.3.1",
"rxjs": "^7.8.1",
diff --git a/packages/network/package.json b/packages/network/package.json
index b47122b83c..e6f8874910 100644
--- a/packages/network/package.json
+++ b/packages/network/package.json
@@ -59,13 +59,13 @@
},
"peerDependencies": {
"@univerjs/core": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/rpc/package.json b/packages/rpc/package.json
index 204d156150..c413604e7d 100644
--- a/packages/rpc/package.json
+++ b/packages/rpc/package.json
@@ -56,13 +56,13 @@
},
"peerDependencies": {
"@univerjs/core": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/sheets-conditional-formatting-ui/package.json b/packages/sheets-conditional-formatting-ui/package.json
index 38dde157fc..ec988063f2 100644
--- a/packages/sheets-conditional-formatting-ui/package.json
+++ b/packages/sheets-conditional-formatting-ui/package.json
@@ -72,7 +72,7 @@
"@univerjs/sheets-conditional-formatting": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
@@ -100,7 +100,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/sheets-conditional-formatting/package.json b/packages/sheets-conditional-formatting/package.json
index 0117c90522..fccc0e3d1d 100644
--- a/packages/sheets-conditional-formatting/package.json
+++ b/packages/sheets-conditional-formatting/package.json
@@ -64,7 +64,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"dayjs": ">=1.11.0",
"rxjs": ">=7.0.0"
},
@@ -78,7 +78,7 @@
"@univerjs/icons-svg": "^0.1.55",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"dayjs": "^1.11.11",
"rxjs": "^7.8.1",
"sharp": "^0.33.4",
diff --git a/packages/sheets-data-validation/package.json b/packages/sheets-data-validation/package.json
index 5d5df47dc9..66437505b6 100644
--- a/packages/sheets-data-validation/package.json
+++ b/packages/sheets-data-validation/package.json
@@ -70,7 +70,7 @@
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"dayjs": ">=1.11.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
@@ -91,7 +91,7 @@
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"dayjs": "^1.11.11",
"less": "^4.2.0",
diff --git a/packages/sheets-drawing-ui/package.json b/packages/sheets-drawing-ui/package.json
index d4a5795a64..c165474992 100644
--- a/packages/sheets-drawing-ui/package.json
+++ b/packages/sheets-drawing-ui/package.json
@@ -71,7 +71,7 @@
"@univerjs/sheets-drawing": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -90,7 +90,7 @@
"@univerjs/sheets-drawing": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/sheets-drawing/package.json b/packages/sheets-drawing/package.json
index e5b90904b8..677bb60bc0 100644
--- a/packages/sheets-drawing/package.json
+++ b/packages/sheets-drawing/package.json
@@ -66,7 +66,7 @@
"@univerjs/drawing": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "^0.15.2",
+ "@wendellhu/redi": "^0.15.4",
"typescript": "^5.4.5",
"vite": "^5.2.13",
"vitest": "^1.6.0"
diff --git a/packages/sheets-filter-ui/package.json b/packages/sheets-filter-ui/package.json
index f9244aae18..725a7a0eb0 100644
--- a/packages/sheets-filter-ui/package.json
+++ b/packages/sheets-filter-ui/package.json
@@ -69,7 +69,7 @@
"@univerjs/sheets-filter": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -88,7 +88,7 @@
"@univerjs/sheets-filter": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/sheets-filter/package.json b/packages/sheets-filter/package.json
index f2984e3a26..3c23139d0b 100644
--- a/packages/sheets-filter/package.json
+++ b/packages/sheets-filter/package.json
@@ -59,14 +59,14 @@
"peerDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/sheets-find-replace/package.json b/packages/sheets-find-replace/package.json
index 5e453ccff6..5b008ad874 100644
--- a/packages/sheets-find-replace/package.json
+++ b/packages/sheets-find-replace/package.json
@@ -66,7 +66,7 @@
"@univerjs/find-replace": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -80,7 +80,7 @@
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/sheets-formula/package.json b/packages/sheets-formula/package.json
index ae87929a89..1276583079 100644
--- a/packages/sheets-formula/package.json
+++ b/packages/sheets-formula/package.json
@@ -71,7 +71,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
@@ -91,7 +91,7 @@
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@vitejs/plugin-react": "^4.3.1",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"less": "^4.2.0",
"react": "18.3.1",
"rxjs": "^7.8.1",
diff --git a/packages/sheets-hyper-link-ui/package.json b/packages/sheets-hyper-link-ui/package.json
index 1ebd518452..80bdf083ec 100644
--- a/packages/sheets-hyper-link-ui/package.json
+++ b/packages/sheets-hyper-link-ui/package.json
@@ -73,7 +73,7 @@
"@univerjs/sheets-hyper-link": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -91,7 +91,7 @@
"@univerjs/sheets-formula": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "^0.15.2",
+ "@wendellhu/redi": "^0.15.4",
"clsx": "^2.1.1",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
diff --git a/packages/sheets-hyper-link/package.json b/packages/sheets-hyper-link/package.json
index 742adb7929..777a69db69 100644
--- a/packages/sheets-hyper-link/package.json
+++ b/packages/sheets-hyper-link/package.json
@@ -61,7 +61,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-hyper-link": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
@@ -70,7 +70,7 @@
"@univerjs/protocol": "0.1.38-alpha.3",
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
- "@wendellhu/redi": "^0.15.2",
+ "@wendellhu/redi": "^0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/sheets-numfmt/package.json b/packages/sheets-numfmt/package.json
index d6cb5ef5ac..1efc588e9d 100644
--- a/packages/sheets-numfmt/package.json
+++ b/packages/sheets-numfmt/package.json
@@ -71,7 +71,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
@@ -89,7 +89,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"less": "^4.2.0",
"react": "18.3.1",
"rxjs": "^7.8.1",
diff --git a/packages/sheets-thread-comment-base/package.json b/packages/sheets-thread-comment-base/package.json
index 652eac3e3f..299c2b594a 100644
--- a/packages/sheets-thread-comment-base/package.json
+++ b/packages/sheets-thread-comment-base/package.json
@@ -61,7 +61,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/thread-comment": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -73,7 +73,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "18.2.0",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
diff --git a/packages/sheets-thread-comment/package.json b/packages/sheets-thread-comment/package.json
index c685186095..77a19714cd 100644
--- a/packages/sheets-thread-comment/package.json
+++ b/packages/sheets-thread-comment/package.json
@@ -68,7 +68,7 @@
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
},
@@ -86,7 +86,7 @@
"@univerjs/thread-comment": "workspace:*",
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"react": "18.3.1",
"rxjs": "^7.8.1",
diff --git a/packages/sheets-ui/package.json b/packages/sheets-ui/package.json
index 3d31705e3f..3e25a6fccc 100644
--- a/packages/sheets-ui/package.json
+++ b/packages/sheets-ui/package.json
@@ -73,7 +73,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -93,7 +93,7 @@
"@univerjs/shared": "workspace:*",
"@univerjs/sheets": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/sheets-zen-editor/package.json b/packages/sheets-zen-editor/package.json
index b5c6215f9b..acd69e3bef 100644
--- a/packages/sheets-zen-editor/package.json
+++ b/packages/sheets-zen-editor/package.json
@@ -70,7 +70,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -88,7 +88,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/sheets/package.json b/packages/sheets/package.json
index 0aa3ff9cb0..ae26901c89 100644
--- a/packages/sheets/package.json
+++ b/packages/sheets/package.json
@@ -65,7 +65,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/rpc": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -78,7 +78,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/rpc": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/slides-ui/package.json b/packages/slides-ui/package.json
index 231c73dad1..8f037e4fef 100644
--- a/packages/slides-ui/package.json
+++ b/packages/slides-ui/package.json
@@ -68,7 +68,7 @@
"@univerjs/engine-render": "workspace:*",
"@univerjs/slides": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0"
},
@@ -80,7 +80,7 @@
"@univerjs/shared": "workspace:*",
"@univerjs/slides": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/slides/package.json b/packages/slides/package.json
index e57f2d606a..25e36d211b 100644
--- a/packages/slides/package.json
+++ b/packages/slides/package.json
@@ -63,14 +63,14 @@
"peerDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"devDependencies": {
"@univerjs/core": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/thread-comment-ui/package.json b/packages/thread-comment-ui/package.json
index e41421f2da..e638b55754 100644
--- a/packages/thread-comment-ui/package.json
+++ b/packages/thread-comment-ui/package.json
@@ -66,7 +66,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/thread-comment": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"dayjs": ">=1.11.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
@@ -82,7 +82,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"dayjs": "^1.11.11",
"less": "^4.2.0",
diff --git a/packages/thread-comment/package.json b/packages/thread-comment/package.json
index 4f57d88bba..957f341d1f 100644
--- a/packages/thread-comment/package.json
+++ b/packages/thread-comment/package.json
@@ -61,7 +61,7 @@
},
"peerDependencies": {
"@univerjs/core": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": ">=7.0.0"
},
"dependencies": {
@@ -72,7 +72,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/shared": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"rxjs": "^7.8.1",
"typescript": "^5.4.5",
"vite": "^5.2.13",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 7c67c3b471..b457c5253a 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -68,7 +68,7 @@
"@univerjs/design": "workspace:*",
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": ">=2.0.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.9.0 || ^17.0.0 || ^18.0.0",
@@ -94,7 +94,7 @@
"@univerjs/engine-formula": "workspace:*",
"@univerjs/engine-render": "workspace:*",
"@univerjs/shared": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"less": "^4.2.0",
"react": "18.3.1",
diff --git a/packages/ui/src/views/components/doc-bars/ToolbarItem.tsx b/packages/ui/src/views/components/doc-bars/ToolbarItem.tsx
index 1106af00cc..ab682affa0 100644
--- a/packages/ui/src/views/components/doc-bars/ToolbarItem.tsx
+++ b/packages/ui/src/views/components/doc-bars/ToolbarItem.tsx
@@ -16,9 +16,8 @@
import { ICommandService, LocaleService } from '@univerjs/core';
import { Dropdown, Tooltip } from '@univerjs/design';
-import { ITextSelectionRenderManager } from '@univerjs/engine-render';
import { MoreDownSingle } from '@univerjs/icons';
-import { useDependency, useInjector } from '@wendellhu/redi/react-bindings';
+import { useDependency } from '@wendellhu/redi/react-bindings';
import type { Ref } from 'react';
import React, { forwardRef, useMemo, useState } from 'react';
import { isObservable, Observable } from 'rxjs';
@@ -30,6 +29,7 @@ import { useObservable } from '../../../components/hooks/observable';
import { Menu } from '../../../components/menu/Menu';
import type { IDisplayMenuItem, IMenuItem, IMenuSelectorItem, IValueOption } from '../../../services/menu/menu';
import { MenuItemType } from '../../../services/menu/menu';
+import { ILayoutService } from '../../../services/layout/layout.service';
import { ToolbarButton } from './Button/ToolbarButton';
import styles from './index.module.less';
import { useToolbarItemStatus } from './hook';
@@ -37,16 +37,17 @@ import { useToolbarItemStatus } from './hook';
export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem>, ref: Ref<any>) => {
const localeService = useDependency(LocaleService);
const commandService = useDependency(ICommandService);
- const injector = useInjector();
+ const layoutService = useDependency(ILayoutService);
+ const componentManager = useDependency(ComponentManager);
+
const [tooltipVisible, setTooltipVisible] = useState(false);
const [dropdownVisible, setDropdownVisible] = useState(false);
const { value, hidden, disabled, activated } = useToolbarItemStatus(props);
const handleCommandExecuted = (commandId: string, params?: Record<string, any>) => {
+ layoutService.focus();
commandService.executeCommand(commandId, params);
- const textSelectionRenderManager = injector.get(ITextSelectionRenderManager);
- textSelectionRenderManager.focus();
};
function handleVisibleChange(visible: boolean) {
@@ -199,7 +200,6 @@ export const ToolbarItem = forwardRef((props: IDisplayMenuItem<IMenuItem>, ref:
}
function renderButtonType() {
- const componentManager = useDependency(ComponentManager);
const isCustomComponent = componentManager.get(typeof label === 'string' ? label : label?.name ?? '');
return (
diff --git a/packages/ui/src/views/components/popup/CanvasPopup.tsx b/packages/ui/src/views/components/popup/CanvasPopup.tsx
index 3eedd656d1..8aeefeddc0 100644
--- a/packages/ui/src/views/components/popup/CanvasPopup.tsx
+++ b/packages/ui/src/views/components/popup/CanvasPopup.tsx
@@ -54,8 +54,9 @@ const SingleCanvasPopup = ({ popup, children }: { popup: IPopup; children?: Reac
export function CanvasPopup() {
const popupService = useDependency(ICanvasPopupService);
- const popups = useObservable(popupService.popups$, undefined, true);
const componentManager = useDependency(ComponentManager);
+ const popups = useObservable(popupService.popups$, undefined, true);
+
return popups.map((item) => {
const [key, popup] = item;
const Component = componentManager.get(popup.componentKey);
diff --git a/packages/umd/package.json b/packages/umd/package.json
index 791bcef124..7dfb298b34 100644
--- a/packages/umd/package.json
+++ b/packages/umd/package.json
@@ -76,7 +76,7 @@
"@univerjs/thread-comment-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
"@univerjs/uniscript": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"clsx": "^2.1.1",
"dayjs": "^1.11.11",
"lodash": "^4.17.21",
diff --git a/packages/uniscript/package.json b/packages/uniscript/package.json
index 3039d2fa37..fa9cba0dc4 100644
--- a/packages/uniscript/package.json
+++ b/packages/uniscript/package.json
@@ -70,7 +70,7 @@
"@univerjs/sheets": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"monaco-editor": ">=0.44.0",
"react": "^16.9.0 || ^17.0.0 || ^18.0.0",
"rxjs": ">=7.0.0"
@@ -87,7 +87,7 @@
"@univerjs/shared": "workspace:*",
"@univerjs/sheets-ui": "workspace:*",
"@univerjs/ui": "workspace:*",
- "@wendellhu/redi": "0.15.2",
+ "@wendellhu/redi": "0.15.4",
"less": "^4.2.0",
"monaco-editor": "0.49.0",
"rxjs": "^7.8.1",
diff --git a/playwright.config.ts b/playwright.config.ts
index 2d53890b26..1a91ff7b1f 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -1,6 +1,11 @@
/* eslint-disable node/prefer-global/process */
import { defineConfig, devices } from '@playwright/test';
+/**
+ * If you are running tests in CI, you can use the `CI` environment variable to adjust the configuration.
+ */
+const isCI = !!process.env.CI;
+
/**
* Read environment variables from file.
* https://github.com/motdotla/dotenv
@@ -35,7 +40,7 @@ export default defineConfig({
projects: [
{
name: 'chromium',
- use: { ...devices['Desktop Chrome'], headless: true },
+ use: { ...devices['Desktop Chrome'], headless: isCI },
},
// {
@@ -72,7 +77,7 @@ export default defineConfig({
webServer: {
command: 'pnpm serve:e2e',
url: 'http://localhost:3000/sheets',
- reuseExistingServer: !process.env.CI,
+ reuseExistingServer: !isCI,
timeout: 10000,
stdout: 'pipe',
stderr: 'pipe',
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1f5c338c44..aab6274b61 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -171,8 +171,8 @@ importers:
specifier: workspace:*
version: link:../../packages/ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
css-loader:
specifier: ^6.10.0
@@ -316,8 +316,8 @@ importers:
specifier: workspace:*
version: link:../packages/uniscript
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -393,8 +393,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -424,8 +424,8 @@ importers:
specifier: workspace:*
version: link:../sheets
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -474,8 +474,8 @@ importers:
specifier: ^5.0.4
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -604,8 +604,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -640,8 +640,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: ^0.15.2
- version: 0.15.2
+ specifier: ^0.15.4
+ version: 0.15.4
typescript:
specifier: ^5.4.5
version: 5.4.5
@@ -689,8 +689,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -740,8 +740,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
less:
specifier: ^4.2.0
version: 4.2.0
@@ -780,8 +780,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
less:
specifier: ^4.2.0
version: 4.2.0
@@ -826,8 +826,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -872,8 +872,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -928,8 +928,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -982,8 +982,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
jest-canvas-mock:
specifier: ^2.5.2
version: 2.5.2
@@ -1031,8 +1031,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
less:
specifier: ^4.2.0
version: 4.2.0
@@ -1061,8 +1061,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1085,8 +1085,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1125,8 +1125,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1165,8 +1165,8 @@ importers:
specifier: workspace:*
version: link:../sheets
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
dayjs:
specifier: ^1.11.11
version: 1.11.11
@@ -1250,8 +1250,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1314,8 +1314,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1356,8 +1356,8 @@ importers:
specifier: workspace:*
version: link:../sheets
'@wendellhu/redi':
- specifier: ^0.15.2
- version: 0.15.2
+ specifier: ^0.15.4
+ version: 0.15.4
typescript:
specifier: ^5.4.5
version: 5.4.5
@@ -1405,8 +1405,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1441,8 +1441,8 @@ importers:
specifier: workspace:*
version: link:../sheets
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1496,8 +1496,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1548,8 +1548,8 @@ importers:
specifier: workspace:*
version: link:../sheets-ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1606,8 +1606,8 @@ importers:
specifier: ^4.3.1
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
less:
specifier: ^4.2.0
version: 4.2.0
@@ -1649,8 +1649,8 @@ importers:
specifier: workspace:*
version: link:../sheets
'@wendellhu/redi':
- specifier: ^0.15.2
- version: 0.15.2
+ specifier: ^0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -1704,8 +1704,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: ^0.15.2
- version: 0.15.2
+ specifier: ^0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1759,8 +1759,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
less:
specifier: ^4.2.0
version: 4.2.0
@@ -1820,8 +1820,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1866,8 +1866,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
react:
specifier: 18.2.0
version: 18.2.0
@@ -1927,8 +1927,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -1982,8 +1982,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -2018,8 +2018,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -2057,8 +2057,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -2100,8 +2100,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
rxjs:
specifier: ^7.8.1
version: 7.8.1
@@ -2140,8 +2140,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -2217,8 +2217,8 @@ importers:
specifier: workspace:*
version: link:../../common/shared
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -2364,8 +2364,8 @@ importers:
specifier: workspace:*
version: link:../uniscript
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
clsx:
specifier: ^2.1.1
version: 2.1.1
@@ -2422,8 +2422,8 @@ importers:
specifier: workspace:*
version: link:../ui
'@wendellhu/redi':
- specifier: 0.15.2
- version: 0.15.2
+ specifier: 0.15.4
+ version: 0.15.4
less:
specifier: ^4.2.0
version: 4.2.0
@@ -5063,8 +5063,8 @@ packages:
'@webassemblyjs/[email protected]':
resolution: {integrity: sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==}
- '@wendellhu/[email protected]':
- resolution: {integrity: sha512-a74HbcIU58K9knNEE3BRTMV9Be1PAHcdZphWoxbXJwJgK+OYa4eiG7nkP1SZqNeKgVj6nT885ShigEuTbmVBkg==}
+ '@wendellhu/[email protected]':
+ resolution: {integrity: sha512-XhflsMuOJKGpdhZUzr45t//3yjAsXP9uBtqwQaPcH8dK7MTqrP7saKffLn/GbVmZsJ/cORm8nCbsdvwZtmdkKA==}
resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
@@ -13891,7 +13891,7 @@ snapshots:
'@webassemblyjs/ast': 1.12.1
'@xtuc/long': 4.2.2
- '@wendellhu/[email protected]': {}
+ '@wendellhu/[email protected]': {}
'@xtuc/[email protected]': {}