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.
TypeScript boardcollaborationdocdocxexceloffce365officepdfpptpptxpresentationsdksheetslidesspreadsheetuniverwordwordprocessorworkspacexlsx
fix(memo): fix memo leak (#5988)
VicKun2c08a0c809aa
diff --git a/packages/core/src/services/instance/instance.service.ts b/packages/core/src/services/instance/instance.service.tsindex eb35a33045..ab9d1dfc1d 100644--- a/packages/core/src/services/instance/instance.service.ts+++ b/packages/core/src/services/instance/instance.service.ts@@ -116,6 +116,10 @@ export class UniverInstanceService extends Disposable implements IUniverInstancesuper.dispose();this._focused$.complete();+ this._currentUnits$.complete();+ this._unitAdded$.complete();+ this._currentUnits.clear();+ this._unitsByType.clear();}private _createHandler!: (diff --git a/packages/core/src/sheets/sheet-skeleton.ts b/packages/core/src/sheets/sheet-skeleton.tsindex 217744314f..f283875db1 100644--- a/packages/core/src/sheets/sheet-skeleton.ts+++ b/packages/core/src/sheets/sheet-skeleton.ts@@ -1037,6 +1037,8 @@ export class SheetSkeleton extends Skeleton {this._worksheetData = null as unknown as IWorksheetData;this._cellData = null as unknown as ObjectMatrix<Nullable<ICellData>>;this._styles = null as unknown as Styles;+ //@ts-ignore+ this.worksheet = null as unknown as Worksheet;}}diff --git a/packages/engine-render/src/render-manager/render-unit.ts b/packages/engine-render/src/render-manager/render-unit.tsindex 18f3ef1e33..6e518d07d2 100644--- a/packages/engine-render/src/render-manager/render-unit.ts+++ b/packages/engine-render/src/render-manager/render-unit.ts@@ -128,6 +128,10 @@ export class RenderUnit extends Disposable implements IRender {this._activated$.next(false);this._activated$.complete();++ //@ts-ignore+ this._renderContext.unit = null;+ this._renderContext.components.clear();}/**diff --git a/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts b/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.tsindex c4adada55f..4d257eab7a 100644--- a/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts+++ b/packages/sheets-data-validation-ui/src/controllers/dv-reject-input.controller.ts@@ -36,7 +36,7 @@ export class DataValidationRejectInputController extends Disposable {}private _initEditorBridgeInterceptor() {- this._sheetInterceptorService.writeCellInterceptor.intercept(+ this.disposeWithMe(this._sheetInterceptorService.writeCellInterceptor.intercept(VALIDATE_CELL,{handler: async (lastResult, context, next) => {@@ -88,7 +88,7 @@ export class DataValidationRejectInputController extends Disposable {return next(Promise.resolve(false))!; // Add explicit return for invalid data},}- );+ ));}showReject(title: string) {diff --git a/packages/sheets-data-validation/src/services/dv-custom-formula.service.ts b/packages/sheets-data-validation/src/services/dv-custom-formula.service.tsindex e66a07dde3..457e690087 100644--- a/packages/sheets-data-validation/src/services/dv-custom-formula.service.ts+++ b/packages/sheets-data-validation/src/services/dv-custom-formula.service.ts@@ -52,6 +52,12 @@ export class DataValidationCustomFormulaService extends Disposable {this._initDirtyRanges();}+ override dispose(): void {+ super.dispose();+ this._ruleFormulaMap.clear();+ this._ruleFormulaMap2.clear();+ }+private _initFormulaResultHandler() {this.disposeWithMe(this._registerOtherFormulaService.formulaResult$.subscribe((resultMap) => {for (const unitId in resultMap) {@@ -120,11 +126,11 @@ export class DataValidationCustomFormulaService extends Disposable {}private _initDirtyRanges() {- this._dataValidationCacheService.dirtyRanges$.subscribe((data) => {+ this.disposeWithMe(this._dataValidationCacheService.dirtyRanges$.subscribe((data) => {if (data.isSetRange) {this._handleDirtyRanges(data.unitId, data.subUnitId, data.ranges);}- });+ }));}deleteByRuleId(unitId: string, subUnitId: string, ruleId: string) {diff --git a/packages/sheets-filter/src/models/filter-model.ts b/packages/sheets-filter/src/models/filter-model.tsindex 0acd94d50e..6090abd9d8 100644--- a/packages/sheets-filter/src/models/filter-model.ts+++ b/packages/sheets-filter/src/models/filter-model.ts@@ -61,6 +61,8 @@ export class FilterModel extends Disposable {this._filteredOutRows$.complete();this._hasCriteria$.complete();+ //@ts-ignore+ this._worksheet = null;}/**diff --git a/packages/sheets-filter/src/services/sheet-filter.service.ts b/packages/sheets-filter/src/services/sheet-filter.service.tsindex 7f1008db8f..4029bfd6e3 100644--- a/packages/sheets-filter/src/services/sheet-filter.service.ts+++ b/packages/sheets-filter/src/services/sheet-filter.service.ts@@ -173,6 +173,19 @@ export class SheetsFilterService extends Disposable {});}+ override dispose(): void {+ super.dispose();++ this._loadedUnitId$.complete();+ this._errorMsg$.complete();+ this._activeFilterModel$.complete();+ this._filterModels.forEach((allFilterModels) => {+ allFilterModels.forEach((model) => model.dispose());+ allFilterModels.clear();+ });+ this._filterModels.clear();+ }+private _initModel(): void {this._resourcesManagerService.registerPluginResource<ISheetsFilterResource>({pluginName: SHEET_FILTER_SNAPSHOT_ID,diff --git a/packages/sheets-hyper-link-ui/src/services/popup.service.ts b/packages/sheets-hyper-link-ui/src/services/popup.service.tsindex 7d101670ea..77527c6339 100644--- a/packages/sheets-hyper-link-ui/src/services/popup.service.ts+++ b/packages/sheets-hyper-link-ui/src/services/popup.service.ts@@ -118,6 +118,7 @@ export class SheetsHyperLinkPopupService extends Disposable {return this._isKeepVisible;}+ // eslint-disable-next-line max-lines-per-functionshowPopup(location: IHyperLinkPopupOptions) {if (this._currentPopup && isEqualLink(location, this._currentPopup)) {return;@@ -182,6 +183,9 @@ export class SheetsHyperLinkPopupService extends Disposable {}if (disposable) {+ if (this._currentPopup) {+ this._currentPopup.disposable?.dispose();+ }this._currentPopup = {unitId,subUnitId,@@ -210,6 +214,14 @@ export class SheetsHyperLinkPopupService extends Disposable {}}+ override dispose(): void {+ super.dispose();+ this.hideCurrentPopup();+ this.endEditing();+ this._currentPopup$.complete();+ this._currentEditing$.complete();+ }+private _getEditingRange(): Nullable<ITextRange & { label: string }> {const visible = this._editorBridgeService.isVisible().visible;const state = this._editorBridgeService.getEditCellState();diff --git a/packages/sheets-hyper-link/src/controllers/rich-text-ref-range.controller.ts b/packages/sheets-hyper-link/src/controllers/rich-text-ref-range.controller.tsindex 7573609935..7202810152 100644--- a/packages/sheets-hyper-link/src/controllers/rich-text-ref-range.controller.ts+++ b/packages/sheets-hyper-link/src/controllers/rich-text-ref-range.controller.ts@@ -184,22 +184,24 @@ export class SheetsHyperLinkRichTextRefRangeController extends Disposable {}private _initWorkbookUnload() {- this._univerInstanceService.unitDisposed$.subscribe((unit) => {- if (unit.type === UniverInstanceType.UNIVER_SHEET) {- const workbook = unit as Workbook;- const unitId = workbook.getUnitId();- workbook.getSheets().forEach((sheet) => {- const subUnitId = sheet.getSheetId();- const map = this._enusreMap(unitId, subUnitId);- map.forValue((row, col, dispose) => {- if (dispose) {- dispose.dispose();- }+ this.disposeWithMe(+ this._univerInstanceService.unitDisposed$.subscribe((unit) => {+ if (unit.type === UniverInstanceType.UNIVER_SHEET) {+ const workbook = unit as Workbook;+ const unitId = workbook.getUnitId();+ workbook.getSheets().forEach((sheet) => {+ const subUnitId = sheet.getSheetId();+ const map = this._enusreMap(unitId, subUnitId);+ map.forValue((row, col, dispose) => {+ if (dispose) {+ dispose.dispose();+ }+ });});- });- this._refRangeMap.delete(unitId);- }- });+ this._refRangeMap.delete(unitId);+ }+ })+ );}private _initSetRangesListener() {diff --git a/packages/sheets-note-ui/src/controllers/sheets-note-attachment.controller.ts b/packages/sheets-note-ui/src/controllers/sheets-note-attachment.controller.tsindex 7f5740ff59..aa12b0b9ca 100644--- a/packages/sheets-note-ui/src/controllers/sheets-note-attachment.controller.ts+++ b/packages/sheets-note-ui/src/controllers/sheets-note-attachment.controller.ts@@ -64,6 +64,13 @@ export class SheetsNoteAttachmentController extends Disposable {);}+ override dispose(): void {+ super.dispose();+ this._noteMatrix.forValue((_, __, disposable) => {+ disposable.dispose();+ });+ }+private _initSheet(targetUnitId: string, targetSheetId: string) {const oldMatrix = this._noteMatrix;oldMatrix.forValue((_, __, disposable) => {diff --git a/packages/sheets-note-ui/src/services/sheets-note-popup.service.ts b/packages/sheets-note-ui/src/services/sheets-note-popup.service.tsindex 665023d99b..24406f0c2b 100644--- a/packages/sheets-note-ui/src/services/sheets-note-popup.service.ts+++ b/packages/sheets-note-ui/src/services/sheets-note-popup.service.ts@@ -59,6 +59,11 @@ export class SheetsNotePopupService extends Disposable {}));}+ override dispose(): void {+ super.dispose();+ this.hidePopup();+ }+showPopup(location: INotePopup, onHide?: () => void) {const { row, col, unitId, subUnitId } = location;if (diff --git a/packages/sheets-thread-comment-ui/src/services/sheets-thread-comment-popup.service.ts b/packages/sheets-thread-comment-ui/src/services/sheets-thread-comment-popup.service.tsindex 6568d6e5c9..7b790ec61f 100644--- a/packages/sheets-thread-comment-ui/src/services/sheets-thread-comment-popup.service.ts+++ b/packages/sheets-thread-comment-ui/src/services/sheets-thread-comment-popup.service.ts@@ -61,6 +61,11 @@ export class SheetsThreadCommentPopupService extends Disposable {}));}+ override dispose(): void {+ super.dispose();+ this.hidePopup();+ }+showPopup(location: IThreadCommentPopup, onHide?: () => void) {const { row, col, unitId, subUnitId } = location;if (diff --git a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts b/packages/sheets-ui/src/services/canvas-pop-manager.service.tsindex 69b814d4f5..c00f41f9be 100644--- a/packages/sheets-ui/src/services/canvas-pop-manager.service.ts+++ b/packages/sheets-ui/src/services/canvas-pop-manager.service.ts@@ -304,8 +304,8 @@ export class SheetCanvasPopManagerService extends Disposable {// #region attach to positionattachPopupByPosition(bound: IBoundRectNoAngle, popup: ICanvasPopup, location: ISheetLocationBase): Nullable<INeedCheckDisposable> {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const worksheet = workbook.getActiveSheet();+ let workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ let worksheet = workbook.getActiveSheet();if (!worksheet) {return null;}@@ -353,6 +353,10 @@ export class SheetCanvasPopManagerService extends Disposable {position$.complete();disposable.dispose();rectsObserverDisposable.dispose();+ //@ts-ignore+ workbook = null;+ //@ts-ignore+ worksheet = null;},canDispose: () => this._globalPopupManagerService.activePopupId !== id,};@@ -418,8 +422,8 @@ export class SheetCanvasPopManagerService extends Disposable {* @returns*/attachPopupToCell(row: number, col: number, popup: ICanvasPopup, _unitId?: string, _subUnitId?: string, viewport?: Viewport): Nullable<INeedCheckDisposable> {- const workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;- const worksheet = workbook.getActiveSheet();+ let workbook = this._univerInstanceService.getCurrentUnitForType<Workbook>(UniverInstanceType.UNIVER_SHEET)!;+ let worksheet = workbook.getActiveSheet();if (!worksheet) {return null;}@@ -484,6 +488,10 @@ export class SheetCanvasPopManagerService extends Disposable {return {dispose() {disposableCollection.dispose();+ //@ts-ignore+ worksheet = null;+ //@ts-ignore+ workbook = null;},canDispose: () => this._globalPopupManagerService.activePopupId !== id,};@@ -641,6 +649,15 @@ export class SheetCanvasPopManagerService extends Disposable {activeViewport: Viewport): IBoundRectNoAngle {const { scene, engine } = currentRender;+ //@ts-ignore this line for check disposed+ if (skeleton._disposed || scene._disposed) {+ return {+ left: 0,+ right: 0,+ top: 0,+ bottom: 0,+ };+ }const primaryWithCoord = skeleton.getCellWithCoordByIndex(row, col);const cellInfo = primaryWithCoord.isMergedMainCell ? primaryWithCoord.mergeInfo : primaryWithCoord;diff --git a/packages/sheets-ui/src/services/cell-alert-manager.service.ts b/packages/sheets-ui/src/services/cell-alert-manager.service.tsindex 103720f6f6..c6476c2f48 100644--- a/packages/sheets-ui/src/services/cell-alert-manager.service.ts+++ b/packages/sheets-ui/src/services/cell-alert-manager.service.ts@@ -103,6 +103,9 @@ export class CellAlertManagerService extends Disposable {});if (disposable) {+ if (lastPopup) {+ lastPopup.dispose?.dispose();+ }lastPopup.dispose = disposable;}diff --git a/packages/sheets-ui/src/services/hover-manager.service.ts b/packages/sheets-ui/src/services/hover-manager.service.tsindex 7142c4b3f4..80d00f93db 100644--- a/packages/sheets-ui/src/services/hover-manager.service.ts+++ b/packages/sheets-ui/src/services/hover-manager.service.ts@@ -20,7 +20,7 @@ import type { ISheetLocation, ISheetLocationBase } from '@univerjs/sheets';import type { ISheetSkeletonManagerParam } from './sheet-skeleton-manager.service';import { Disposable, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';import { IRenderManagerService, SHEET_VIEWPORT_KEY, Vector2 } from '@univerjs/engine-render';-import { BehaviorSubject, distinctUntilChanged, map, Subject } from 'rxjs';+import { BehaviorSubject, distinctUntilChanged, map, of, Subject } from 'rxjs';import { getHoverCellPosition } from '../common/utils';import { SheetScrollManagerService } from './scroll-manager.service';import { SheetSkeletonManagerService } from './sheet-skeleton-manager.service';@@ -219,6 +219,22 @@ export class HoverManagerService extends Disposable {this._currentPointerDownCell$.complete();this._currentPointerUpCell$.complete();this._currentCellWithEvent$.complete();++ this._currentRichText$.complete();+ this._currentDbClickedCell$.complete();+ this._currentHoveredRowHeader$.complete();+ this._currentHoveredColHeader$.complete();+ this._currentRowHeaderClick$.complete();+ this._currentColHeaderClick$.complete();+ this._currentRowHeaderDbClick$.complete();+ this._currentColHeaderDbClick$.complete();+ this._currentRowHeaderPointerDown$.complete();+ this._currentColHeaderPointerDown$.complete();+ this._currentRowHeaderPointerUp$.complete();+ this._currentColHeaderPointerUp$.complete();++ this.currentCellPosWithEvent$ = of(null);+ this.currentRichText$ = of(null);}private _initCellDisposableListener(): void {diff --git a/packages/sheets/src/facade/f-workbook.ts b/packages/sheets/src/facade/f-workbook.tsindex 0dbaa09f55..ad68325e32 100644--- a/packages/sheets/src/facade/f-workbook.ts+++ b/packages/sheets/src/facade/f-workbook.ts@@ -66,6 +66,12 @@ export class FWorkbook extends FBaseInitialable {return this._workbook;}+ override dispose(): void {+ super.dispose();+ //@ts-ignore+ this._workbook = null;+ }+/*** Get the id of the workbook.* @returns {string} The id of the workbook.diff --git a/packages/sheets/src/facade/f-worksheet.ts b/packages/sheets/src/facade/f-worksheet.tsindex 7c0415182b..097cd43d23 100644--- a/packages/sheets/src/facade/f-worksheet.ts+++ b/packages/sheets/src/facade/f-worksheet.ts@@ -59,6 +59,16 @@ export class FWorksheet extends FBaseInitialable {super(_injector);}+ override dispose(): void {+ super.dispose();+ //@ts-ignore+ delete this._fWorkbook;+ //@ts-ignore+ delete this._workbook;+ //@ts-ignore+ delete this._worksheet;+ }+/*** Get the worksheet instance.* @returns {Worksheet} The worksheet instance.@@ -1989,7 +1999,6 @@ export class FWorksheet extends FBaseInitialable {return this._worksheet.getTabColor() as string | undefined;}- // eslint-disable-next-line/*** @deprecated use `univerAPI.addEvent(univerAPI.Event.SheetValueChanged, (params) => {})` instead*/@@ -2009,7 +2018,6 @@ export class FWorksheet extends FBaseInitialable {});}- // eslint-disable-next-line/*** @deprecated use `univerAPI.addEvent(univerAPI.Event.BeforeSheetEditEnd, (params) => {})` instead*/diff --git a/packages/sheets/src/services/selections/ref-selections.service.ts b/packages/sheets/src/services/selections/ref-selections.service.tsindex 9b8a8d8d29..1105e1b750 100644--- a/packages/sheets/src/services/selections/ref-selections.service.ts+++ b/packages/sheets/src/services/selections/ref-selections.service.ts@@ -18,7 +18,7 @@ import type { Workbook } from '@univerjs/core';import type { Observable } from 'rxjs';import type { WorkbookSelectionModel } from './selection-data-model';import { createIdentifier, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';-import { BehaviorSubject, map, merge, switchMap, takeUntil } from 'rxjs';+import { BehaviorSubject, map, merge, of, switchMap, takeUntil } from 'rxjs';import { SheetsSelectionsService } from './selection.service';/**@@ -48,6 +48,22 @@ export class RefSelectionsService extends SheetsSelectionsService {this.selectionSet$ = $.pipe(switchMap((ss) => merge(...ss.map((s) => s.selectionSet$))));}+ override dispose(): void {+ super.dispose();++ // @ts-ignore+ this.selectionMoveStart$ = of(null);+ // @ts-ignore+ this.selectionMoving$ = of(null);+ // @ts-ignore+ this.selectionMoveEnd$ = of(null);+ // @ts-ignore+ this.selectionSet$ = of(null);+ //@ts-ignore+ delete this._instanceSrv;+ this._workbookSelections.clear();+ }+private _getAliveWorkbooks$(): Observable<WorkbookSelectionModel[]> {const aliveWorkbooks = this._instanceSrv.getAllUnitsForType<Workbook>(UniverInstanceType.UNIVER_SHEET);aliveWorkbooks.forEach((workbook) => this._ensureWorkbookSelection(workbook.getUnitId()));diff --git a/packages/sheets/src/services/selections/selection-data-model.ts b/packages/sheets/src/services/selections/selection-data-model.tsindex 794338bd79..36a44f1356 100644--- a/packages/sheets/src/services/selections/selection-data-model.ts+++ b/packages/sheets/src/services/selections/selection-data-model.ts@@ -64,6 +64,9 @@ export class WorkbookSelectionModel extends Disposable {this._selectionMoving$.complete();this._selectionMoveStart$.complete();this._selectionSet$.complete();++ //@ts-ignore+ this._workbook = null!;}addSelections(sheetId: string, selectionDatas: ISelectionWithStyle[]): void {diff --git a/packages/sheets/src/services/selections/selection.service.ts b/packages/sheets/src/services/selections/selection.service.tsindex 72ffea1f27..334527839b 100644--- a/packages/sheets/src/services/selections/selection.service.ts+++ b/packages/sheets/src/services/selections/selection.service.ts@@ -80,10 +80,10 @@ export class SheetsSelectionsService extends RxDisposable {protected _init(): void {const c$ = this._instanceSrv.getCurrentTypeOfUnit$(UniverInstanceType.UNIVER_SHEET).pipe(shareReplay(1), takeUntil(this.dispose$));// When workbook changed, unsubscribe the previous workbook selection$ and subscribe the new workbook selection$.- this.selectionMoveStart$ = c$.pipe(switchMap((workbook) => !workbook ? of() : this._ensureWorkbookSelection(workbook.getUnitId()).selectionMoveStart$));- this.selectionMoving$ = c$.pipe(switchMap((workbook) => !workbook ? of() : this._ensureWorkbookSelection(workbook.getUnitId()).selectionMoving$));- this.selectionMoveEnd$ = c$.pipe(switchMap((workbook) => !workbook ? of([]) : this._ensureWorkbookSelection(workbook.getUnitId()).selectionMoveEnd$));- this.selectionSet$ = c$.pipe(switchMap((workbook) => !workbook ? of([]) : this._ensureWorkbookSelection(workbook.getUnitId()).selectionSet$));+ this.selectionMoveStart$ = c$.pipe().pipe(switchMap((workbook) => !workbook ? of() : this._ensureWorkbookSelection(workbook.getUnitId()).selectionMoveStart$)).pipe(takeUntil(this.dispose$));+ this.selectionMoving$ = c$.pipe(switchMap((workbook) => !workbook ? of() : this._ensureWorkbookSelection(workbook.getUnitId()).selectionMoving$)).pipe(takeUntil(this.dispose$));+ this.selectionMoveEnd$ = c$.pipe(switchMap((workbook) => !workbook ? of([]) : this._ensureWorkbookSelection(workbook.getUnitId()).selectionMoveEnd$)).pipe(takeUntil(this.dispose$));+ this.selectionSet$ = c$.pipe(switchMap((workbook) => !workbook ? of([]) : this._ensureWorkbookSelection(workbook.getUnitId()).selectionSet$)).pipe(takeUntil(this.dispose$));this.selectionChanged$ = c$.pipe(switchMap((workbook) => !workbook ? of([]) : this._ensureWorkbookSelection(workbook.getUnitId()).selectionChanged$)).pipe(distinctUntilChanged((prev, curr) => {if (prev.length !== curr.length) return false;@@ -93,16 +93,34 @@ export class SheetsSelectionsService extends RxDisposable {});}),skip(1)- );+ ).pipe(takeUntil(this.dispose$));- this._instanceSrv.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {- this._removeWorkbookSelection(workbook.getUnitId());- });+ this.disposeWithMe(+ this._instanceSrv.getTypeOfUnitDisposed$(UniverInstanceType.UNIVER_SHEET).pipe(takeUntil(this.dispose$)).subscribe((workbook) => {+ this._removeWorkbookSelection(workbook.getUnitId());+ })+ );// Clear cell styles cache when current selections changed.- this.selectionChanged$.pipe(takeUntil(this.dispose$)).subscribe(() => {- this._cellStylesCache.clear();- });+ this.disposeWithMe(+ this.selectionChanged$.pipe(takeUntil(this.dispose$)).subscribe(() => {+ this._cellStylesCache.clear();+ })+ );+ }++ override dispose(): void {+ super.dispose();+ this._cellStylesCache.clear();+ this._workbookSelections.forEach((wbSelection) => wbSelection.dispose());+ this._workbookSelections.clear();+ // Observables do not have unsubscribe(); active subscriptions are handled via takeUntil(this.dispose$) and disposeWithMe.+ // Replace exposed observables with simple completed values to avoid holding references.+ this.selectionMoveStart$ = of(null);+ this.selectionMoving$ = of(null);+ this.selectionMoveEnd$ = of([]);+ this.selectionSet$ = of(null);+ this.selectionChanged$ = of(null);}/**diff --git a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx b/packages/ui/src/controllers/ui/ui-desktop.controller.tsxindex afabdf980a..0fb6156c1d 100644--- a/packages/ui/src/controllers/ui/ui-desktop.controller.tsx+++ b/packages/ui/src/controllers/ui/ui-desktop.controller.tsx@@ -77,6 +77,11 @@ export class DesktopUIController extends SingleUnitUIController {});}+ override dispose(): void {+ super.dispose();+ this._componentManager.dispose();+ }+override bootstrap(callback: (contentElement: HTMLElement, containerElement: HTMLElement) => void): IDisposable {return bootstrap(this._injector, this._config, callback);}diff --git a/packages/ui/src/controllers/ui/ui-shared.controller.ts b/packages/ui/src/controllers/ui/ui-shared.controller.tsindex bec5de8c45..3f41efe102 100644--- a/packages/ui/src/controllers/ui/ui-shared.controller.ts+++ b/packages/ui/src/controllers/ui/ui-shared.controller.ts@@ -43,6 +43,14 @@ export abstract class SingleUnitUIController extends Disposable {clearTimeout(this._steadyTimeout);clearTimeout(this._renderTimeout);+ //@ts-ignore+ delete this._instanceService;+ //@ts-ignore+ delete this._layoutService;+ //@ts-ignore+ delete this._lifecycleService;+ //@ts-ignore+ delete this._renderManagerService;}protected _bootstrapWorkbench() {