Do not dispose dialogs on close (#14456)

Fixes #12093 The about dialog in Theia is reopened and must no be disposed on close. Contributed on behalf of STMicroelectronics
eclipse-theia · Nov 21, 2024 · 77cba8c · 77cba8c
1 parent 6bf4078
commit 77cba8c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - [Previous Changelogs](https://github.com/eclipse-theia/theia/tree/master/doc/changelogs/)
 
 <!-- ## 1.56.0 - not yet released -->
+<a name="breaking_changes_1.56.0">[Breaking Changes:](#breaking_changes_1.56.0)</a>
+- [core] Do not dispose dialogs on close - [#14456](https://github.com/eclipse-theia/theia/pull/14456) - Contributed on behalf of STMicroelectronics 
 
 - [plugin] added stubs for the additional LanguageModel APIs [#14446](https://github.com/eclipse-theia/theia/pull/14446) - Contributed on behalf of STMicroelectronics
 - [plugin] added support for ThemeColor property id [#14437](https://github.com/eclipse-theia/theia/pull/14437) - Contributed on behalf of STMicroelectronics

diff --git a/packages/core/src/browser/common-frontend-contribution.ts b/packages/core/src/browser/common-frontend-contribution.ts
@@ -1199,7 +1199,7 @@ export class CommonFrontendContribution implements FrontendApplicationContributi
     }
 
     protected async openAbout(): Promise<void> {
-        this.aboutDialog.open();
+        this.aboutDialog.open(false);
     }
 
     protected shouldPreventClose = false;

diff --git a/packages/core/src/browser/dialogs.ts b/packages/core/src/browser/dialogs.ts
@@ -258,13 +258,15 @@ export abstract class AbstractDialog<T> extends BaseWidget {
         }
     }
 
-    open(): Promise<T | undefined> {
+    open(disposeOnResolve: boolean = true): Promise<T | undefined> {
         if (this.resolve) {
             return Promise.reject(new Error('The dialog is already opened.'));
         }
         this.activeElement = this.node.ownerDocument.activeElement as HTMLElement;
         return new Promise<T | undefined>((resolve, reject) => {
-            this.resolve = resolve;
+            this.resolve = value => {
+                resolve(value);
+            };
             this.reject = reject;
             this.toDisposeOnDetach.push(Disposable.create(() => {
                 this.resolve = undefined;
@@ -273,9 +275,23 @@ export abstract class AbstractDialog<T> extends BaseWidget {
 
             Widget.attach(this, this.node.ownerDocument.body);
             this.activate();
+        }).finally(() => {
+            if (disposeOnResolve) {
+                this.dispose();
+            }
         });
     }
 
+    protected override onCloseRequest(msg: Message): void {
+        // super.onCloseRequest() would automatically dispose the dialog, which we don't want because we're reusing it
+        if (this.parent) {
+            // eslint-disable-next-line no-null/no-null
+            this.parent = null;
+        } else if (this.isAttached) {
+            Widget.detach(this);
+        }
+    }
+
     override close(): void {
         if (this.resolve) {
             if (this.activeElement) {