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(docs-ui): skip resize after editor render disposed (#6974)

wpxp1234564b281685bae3
diff --git a/packages/docs-drawing-ui/src/__tests__/create-doc-ui-test-bed.ts b/packages/docs-drawing-ui/src/__tests__/create-doc-ui-test-bed.ts
index d167617f03..a612b84172 100644
--- a/packages/docs-drawing-ui/src/__tests__/create-doc-ui-test-bed.ts
+++ b/packages/docs-drawing-ui/src/__tests__/create-doc-ui-test-bed.ts
@@ -133,6 +133,7 @@ class MockRenderManagerService implements Pick<IRenderManagerService, 'getRender
getRenderById(): Nullable<IRender> {
return {
with: <T>(identifier: DependencyIdentifier<T>) => this._injector.get(identifier),
+ isDisposed: () => false,
} as unknown as IRender;
}
}
diff --git a/packages/docs-hyper-link-ui/src/__tests__/create-doc-ui-test-bed.ts b/packages/docs-hyper-link-ui/src/__tests__/create-doc-ui-test-bed.ts
index d167617f03..a612b84172 100644
--- a/packages/docs-hyper-link-ui/src/__tests__/create-doc-ui-test-bed.ts
+++ b/packages/docs-hyper-link-ui/src/__tests__/create-doc-ui-test-bed.ts
@@ -133,6 +133,7 @@ class MockRenderManagerService implements Pick<IRenderManagerService, 'getRender
getRenderById(): Nullable<IRender> {
return {
with: <T>(identifier: DependencyIdentifier<T>) => this._injector.get(identifier),
+ isDisposed: () => false,
} as unknown as IRender;
}
}
diff --git a/packages/docs-mention-ui/src/__tests__/create-doc-ui-test-bed.ts b/packages/docs-mention-ui/src/__tests__/create-doc-ui-test-bed.ts
index d167617f03..a612b84172 100644
--- a/packages/docs-mention-ui/src/__tests__/create-doc-ui-test-bed.ts
+++ b/packages/docs-mention-ui/src/__tests__/create-doc-ui-test-bed.ts
@@ -133,6 +133,7 @@ class MockRenderManagerService implements Pick<IRenderManagerService, 'getRender
getRenderById(): Nullable<IRender> {
return {
with: <T>(identifier: DependencyIdentifier<T>) => this._injector.get(identifier),
+ isDisposed: () => false,
} as unknown as IRender;
}
}
diff --git a/packages/docs-ui/src/commands/commands/__tests__/create-command-test-bed.ts b/packages/docs-ui/src/commands/commands/__tests__/create-command-test-bed.ts
index e8e323c624..fe180cdd07 100644
--- a/packages/docs-ui/src/commands/commands/__tests__/create-command-test-bed.ts
+++ b/packages/docs-ui/src/commands/commands/__tests__/create-command-test-bed.ts
@@ -179,6 +179,7 @@ export class MockRenderManagerService implements Pick<IRenderManagerService, 'ge
getRenderById(_unitId: string): Nullable<IRender> {
return {
with: <T>(identifier: DependencyIdentifier<T>) => this._injector.get(identifier),
+ isDisposed: () => false,
} as unknown as IRender;
}
}
diff --git a/packages/docs-ui/src/views/rich-text-editor/hooks/use-resize.ts b/packages/docs-ui/src/views/rich-text-editor/hooks/use-resize.ts
index 7d6ae9b2c3..f21c8f0125 100644
--- a/packages/docs-ui/src/views/rich-text-editor/hooks/use-resize.ts
+++ b/packages/docs-ui/src/views/rich-text-editor/hooks/use-resize.ts
@@ -49,7 +49,7 @@ export const useResize = (editor?: Editor, isSingle = true, autoScrollbar?: bool
// eslint-disable-next-line complexity
return debounce(() => {
if (!autoScrollbar) return;
- if (!editor || !autoScrollbar) {
+ if (!editor || !autoScrollbar || editor.render.isDisposed()) {
return;
}
diff --git a/packages/engine-render/src/render-manager/render-unit.ts b/packages/engine-render/src/render-manager/render-unit.ts
index 7487c9e204..2bcb854b90 100644
--- a/packages/engine-render/src/render-manager/render-unit.ts
+++ b/packages/engine-render/src/render-manager/render-unit.ts
@@ -55,6 +55,8 @@ export interface IRender {
* Activate the render unit, means the render unit would be updated and rendered.
*/
activate(): void;
+
+ isDisposed(): boolean;
}
/**
@@ -66,7 +68,7 @@ export interface IRenderModule extends IDisposable { }
* Necessary context for a render module.This interface would be the first argument of render modules' constructor
* functions.
*/
-export interface IRenderContext<T extends UnitModel = UnitModel> extends Omit<IRender, 'with'> {
+export interface IRenderContext<T extends UnitModel = UnitModel> extends Omit<IRender, 'with' | 'isDisposed'> {
unit: T;
type: UniverInstanceType;
}
@@ -138,6 +140,10 @@ export class RenderUnit extends Disposable implements IRender {
this._renderContext.components.clear();
}
+ isDisposed(): boolean {
+ return this._disposed;
+ }
+
/**
* Get a dependency from the RenderUnit's injector.
*/
diff --git a/packages/sheets-formula-ui/src/controllers/__tests__/formula-clipboard.controller.spec.ts b/packages/sheets-formula-ui/src/controllers/__tests__/formula-clipboard.controller.spec.ts
index 16f5c47df3..9b1cb6f2df 100644
--- a/packages/sheets-formula-ui/src/controllers/__tests__/formula-clipboard.controller.spec.ts
+++ b/packages/sheets-formula-ui/src/controllers/__tests__/formula-clipboard.controller.spec.ts
@@ -175,6 +175,7 @@ export function clipboardTestBed(workbookData?: IWorkbookData, dependencies?: De
activated$: new BehaviorSubject(true),
activate: () => {},
deactivate: () => {},
+ isDisposed: () => false,
});
return {
diff --git a/packages/sheets-ui/src/commands/commands/__tests__/create-selection-command-test-bed.ts b/packages/sheets-ui/src/commands/commands/__tests__/create-selection-command-test-bed.ts
index 4dea97808c..6785979ffb 100644
--- a/packages/sheets-ui/src/commands/commands/__tests__/create-selection-command-test-bed.ts
+++ b/packages/sheets-ui/src/commands/commands/__tests__/create-selection-command-test-bed.ts
@@ -226,6 +226,7 @@ export function createFrozenCommandTestBed(workbookData?: IWorkbookData) {
activated$: new BehaviorSubject(true),
activate: () => {},
deactivate: () => {},
+ isDisposed: () => false,
});
return {
diff --git a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts
index 1ba4944e74..c1ddb17af3 100644
--- a/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts
+++ b/packages/sheets-ui/src/services/clipboard/__tests__/clipboard-test-bed.ts
@@ -623,6 +623,7 @@ export function clipboardTestBed(workbookData?: IWorkbookData, dependencies?: De
activated$: new BehaviorSubject(true),
activate: () => {},
deactivate: () => {},
+ isDisposed: () => false,
});
return {