fixed reload for remote feature and added option to the electron hand…

…ler to add change url (#13891) Signed-off-by: Jonah Iden <jonah.iden@typefox.io>
eclipse-theia · Jul 9, 2024 · 10b156c · 10b156c
1 parent 77c66e4
commit 10b156c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/packages/core/src/electron-browser/preload.ts b/packages/core/src/electron-browser/preload.ts
@@ -199,7 +199,7 @@ const api: TheiaCoreAPI = {
  ipcRenderer.send(CHANNEL_TOGGLE_FULL_SCREEN);
  },
 
- requestReload: () => ipcRenderer.send(CHANNEL_REQUEST_RELOAD),
+ requestReload: (newUrl?: string) => ipcRenderer.send(CHANNEL_REQUEST_RELOAD, newUrl),
  restart: () => ipcRenderer.send(CHANNEL_RESTART),
 
  applicationStateChanged: state => {

diff --git a/packages/core/src/electron-browser/window/electron-window-service.ts b/packages/core/src/electron-browser/window/electron-window-service.ts
@@ -100,7 +100,7 @@ export class ElectronWindowService extends DefaultWindowService {
  if (params.hash) {
  newLocation.hash = '#' + params.hash;
  }
- location.assign(newLocation);
+ window.electronTheiaCore.requestReload(newLocation.toString());
  } else {
  window.electronTheiaCore.requestReload();
  }

diff --git a/packages/core/src/electron-common/electron-api.ts b/packages/core/src/electron-common/electron-api.ts
@@ -84,7 +84,7 @@ export interface TheiaCoreAPI {
  isFullScreen(): boolean; // TODO: this should really be async, since it blocks the renderer process
  toggleFullScreen(): void;
 
- requestReload(): void;
+ requestReload(newUrl?: string): void;
  restart(): void;
 
  applicationStateChanged(state: FrontendApplicationState): void;

diff --git a/packages/core/src/electron-main/theia-electron-window.ts b/packages/core/src/electron-main/theia-electron-window.ts
@@ -147,10 +147,14 @@ export class TheiaElectronWindow {
  return this.handleStopRequest(() => this.doCloseWindow(), reason);
  }
 
- protected reload(): void {
+ protected reload(newUrl?: string): void {
  this.handleStopRequest(async () => {
  this.applicationState = 'init';
- this._window.reload();
+ if (newUrl) {
+ this._window.loadURL(newUrl);
+ } else {
+ this._window.reload();
+ }
  }, StopReason.Reload);
  }
 
@@ -195,7 +199,7 @@ export class TheiaElectronWindow {
  }
 
  protected attachReloadListener(): void {
- this.toDispose.push(TheiaRendererAPI.onRequestReload(this.window.webContents, () => this.reload()));
+ this.toDispose.push(TheiaRendererAPI.onRequestReload(this.window.webContents, (newUrl?: string) => this.reload(newUrl)));
  }
 
  dispose(): void {