Merge pull request #1566 from hollow-owl/master

Fix Mouse back button not doing anything
nukeop · Mar 13, 2024 · 6ad71a5 · 6ad71a5
2 parents 779a4ad + f91cfe3
commit 6ad71a5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/packages/app/app/App.js b/packages/app/app/App.js
@@ -67,7 +67,7 @@ class App extends React.PureComponent {
 
     this.updateConnectivityStatus(navigator.onLine);
     window.addEventListener('online', () => this.updateConnectivityStatus(true));
-    window.addEventListener('offline', () => this.updateConnectivityStatus(false));
+    window.addEventListener('offline', () => this.updateConnectivityStatus(false)); 
   }
 
   updateConnectivityStatus = (isConnected) => {

diff --git a/packages/app/app/containers/IpcContainer/index.js b/packages/app/app/containers/IpcContainer/index.js
@@ -108,6 +108,17 @@ class IpcContainer extends React.Component {
       }
     });
 
+    ipcRenderer.on(IpcEvents.NAVIGATE_BACK, () => {
+      if (this.props.history.index > 1) {
+        this.props.history.goBack();
+      }
+    });
+    ipcRenderer.on(IpcEvents.NAVIGATE_FORWARD, () => {
+      if (this.props.history.index < (this.props.history.length - 1)) {
+        this.props.history.goForward();
+      }
+    });
+
   }
 
   componentDidUpdate({ queue: prevQueue }) {

diff --git a/packages/core/src/ipc/events.ts b/packages/core/src/ipc/events.ts
@@ -73,7 +73,11 @@ enum IpcEvents {
 
   PLAY_STARTUP_TRACK = 'play-startup-track',
 
-  ELECTRON_TIMBER_ERROR_EVENT = '__ELECTRON_TIMBER_ERROR__'
+  ELECTRON_TIMBER_ERROR_EVENT = '__ELECTRON_TIMBER_ERROR__',
+
+  NAVIGATE_BACK = 'navigate-back',
+  NAVIGATE_FORWARD = 'navigate-forward',
+
 }
 
 export default IpcEvents;
diff --git a/packages/main/src/services/window/index.ts b/packages/main/src/services/window/index.ts
@@ -9,6 +9,7 @@ import Config from '../config';
 import Logger, { $mainLogger, $ipcLogger } from '../logger';
 import Platform from '../platform';
 import Store from '../store';
+import { IpcEvents } from '@nuclear/core';
 
 const urlMapper: Record<Env, string> = {
   [Env.DEV]: url.format({
@@ -79,6 +80,16 @@ class Window {
       this.browserWindow.once('focus', () => this.browserWindow.flashFrame(false));
     }
 
+    this.browserWindow.on('app-command', (e, cmd) => {
+      if (cmd === 'browser-backward') {
+        this.browserWindow.webContents.send(IpcEvents.NAVIGATE_BACK);
+
+      }
+      if (cmd === 'browser-forward') {
+        this.browserWindow.webContents.send(IpcEvents.NAVIGATE_FORWARD);
+      }
+    });
+
     this.isReady = new Promise((resolve) => {
       this.resolve = resolve;
     });