Activate existing open files

Author: apoco

src/components/app.js

@@ -61,6 +61,27 @@ class AppComponent extends React.Component {
     });
   };
 
+  handleTabActivation = (e) => {
+    const { windowId, tabId } = e;
+    console.log('Got tab activation event?!', e);
+
+    if (windowId !== this.windowId) {
+      return;
+    }
+
+    const { tabs } = this.state;
+
+    this.setState({
+      activeTabId: tabId,
+      tabs: Object.values(tabs).reduce((allTabs, tab) => Object.assign(allTabs, {
+        [tab.tabId]: {
+          ...tab,
+          isActive: tab.tabId === tabId
+        }
+      }), {})
+    })
+  };
+
   handleCloseTab = ({ tabId, windowId }) => {
     if (windowId !== this.windowId) {
       return;
@@ -230,9 +251,9 @@ class AppComponent extends React.Component {
           [NEW_TAB]: this.handleNewTab,
           [OPEN_FILE]: this.handleOpenFile,
           [RENDER_RESULT]: this.handleRender,
-          [SAVE_DOT_FILE]: this.handleSave,
           [SAVE_COMPLETED]: this.handleSaveCompleted,
-          [CLOSE_TAB]: this.handleCloseTab
+          [CLOSE_TAB]: this.handleCloseTab,
+          [SET_ACTIVE_TAB]: this.handleTabActivation
         }}
       />
     );

src/dialogs/open.js

@@ -9,7 +9,7 @@ export default function showOpenDialog() {
         filters,
         properties: ["openFile"]
       },
-      filePaths => resolve(filePaths[0])
+      filePaths => resolve(filePaths && filePaths[0])
     );
   });
 }

src/menu/index.js

@@ -11,7 +11,7 @@ function setupMenu() {
   const emitter = new EventEmitter();
 
   const emit = (eventName, payload) => (menuItem, browserWindow, event) => {
-    emitter.emit(eventName, { menuItem, browserWindow, event, payload });
+    emitter.emit(eventName, event, { menuItem, browserWindow, ...payload });
   };
 
   const menu = Menu.buildFromTemplate([

src/sessions/app.js

@@ -1,7 +1,8 @@
 import createMenu from "../menu/index";
 import createWindowSession from "./window";
 import SessionManager from "./session-manager";
-import { NEW_WINDOW, WINDOW_CLOSED } from "../constants/messages";
+import { NEW_WINDOW, OPEN_FILE, WINDOW_CLOSED } from "../constants/messages";
+import showOpenDialog from "../dialogs/open";
 
 class AppSession extends SessionManager {
   menu = null;
@@ -13,7 +14,8 @@ class AppSession extends SessionManager {
     this.menu = createMenu();
     this.openWindow();
 
-    this.subscribeToEvent(this.menu, NEW_WINDOW, this.openWindow);
+    this.subscribeToMenuEvent(NEW_WINDOW, this.openWindow);
+    this.subscribeToMenuEvent(OPEN_FILE, this.showOpenDialog);
   }
 
   openWindow = () => {
@@ -23,11 +25,32 @@ class AppSession extends SessionManager {
     this.subscribeToEvent(windowSession, WINDOW_CLOSED, () =>
       this.handleWindowClosed(windowSession)
     );
+
+    return windowSession;
+  };
+
+  showOpenDialog = async ({ browserWindow }) => {
+    const filename = await showOpenDialog();
+    if (!filename) {
+      return;
+    }
+
+    const windowSessions = Object.values(this.windowSessions);
+    const target = windowSessions.find(w => w.hasFileOpen(filename))
+       || windowSessions.find(w => w.window === browserWindow)
+       || this.openWindow();
+
+    await target.openFile(filename);
+    target.window.focus();
   };
 
   handleWindowClosed(windowSession) {
     delete this.windowSessions[windowSession.id];
   }
+
+  subscribeToMenuEvent(eventName, ...handlers) {
+    return this.subscribeToEvent(this.menu, eventName, ...handlers);
+  }
 }
 
 export default function startAppSession() {

src/sessions/tab.js

@@ -18,7 +18,7 @@ import {
   NEW_TAB,
   OPEN_FILE,
   RENDER_RESULT,
-  SAVE_COMPLETED,
+  SAVE_COMPLETED, SET_ACTIVE_TAB,
   SOURCE_CHANGED
 } from "../constants/messages";
 import showSaveDialog from "../dialogs/save";
@@ -85,6 +85,10 @@ class TabSession extends SessionManager {
 
   setIsActive(isActive) {
     this.isActive = isActive;
+
+    if (isActive) {
+      this.sendTabEvent(SET_ACTIVE_TAB);
+    }
   }
 
   async open(filename) {

src/sessions/window.js

@@ -1,21 +1,19 @@
 import { fromEvent } from "rxjs";
 import { filter } from "rxjs/operators";
-import { BrowserWindow, dialog, ipcMain } from "electron";
+import { BrowserWindow, ipcMain } from "electron";
 
 import {
   CLOSE_TAB,
   DECREASE_FONT,
   INCREASE_FONT,
   NEW_TAB,
-  OPEN_FILE,
   SAVE_BUFFER,
   SET_ACTIVE_TAB,
   WINDOW_CLOSED,
   WINDOW_READY
 } from "../constants/messages";
 import SessionManager from "./session-manager";
 import createTabSession from "./tab";
-import showOpenDialog from "../dialogs/open";
 
 class WindowSession extends SessionManager {
   window = null;
@@ -47,7 +45,7 @@ class WindowSession extends SessionManager {
         windowId === this.windowId && this.setActiveTab(tabId)
     );
 
-    this.subscribeToEvent(this.window, 'close', this.closeAllTabs);
+    this.subscribeToEvent(this.window, "close", this.closeAllTabs);
     this.subscribeToEvent(this.window, "closed", this.dispose);
 
     this.setupMenuListeners();
@@ -59,7 +57,6 @@ class WindowSession extends SessionManager {
     this.handleMenuEvent(NEW_TAB, this.openTab);
     this.handleMenuEvent(CLOSE_TAB, this.closeTab);
 
-    this.handleMenuEvent(OPEN_FILE, this.showOpenFileDialog);
     this.handleMenuEvent(SAVE_BUFFER, this.saveActiveBuffer);
 
     this.handleMenuEvent(INCREASE_FONT, () =>
@@ -104,17 +101,21 @@ class WindowSession extends SessionManager {
     });
   };
 
-  showOpenFileDialog = async () => {
-    const filename = await showOpenDialog();
-    if (!filename) {
-      return;
-    }
-
-    let tab = this.activeTabSession;
-    if (tab.filename || tab.isDirty) tab = this.openTab();
+  async openFile(filename) {
+    const existingTab = Object.values(this.tabSessions).find(
+      t => t.filename === filename
+    );
 
-    await tab.open(filename);
-  };
+    if (existingTab) {
+      this.setActiveTab(existingTab.id);
+    } else {
+      const activeTab = this.activeTabSession;
+      const targetTab = (activeTab.filename || activeTab.isDirty)
+        ? this.openTab()
+        : activeTab;
+      await targetTab.open(filename);
+    }
+  }
 
   saveActiveBuffer = () => {
     this.activeTabSession.save();
@@ -139,9 +140,13 @@ class WindowSession extends SessionManager {
     return Object.values(this.tabSessions).find(s => s.isActive);
   }
 
+  hasFileOpen(filename) {
+    return Object.values(this.tabSessions).some(t => t.filename === filename);
+  }
+
   handleMenuEvent(eventName, ...handlers) {
     return this.subscribeTo(
-      fromEvent(this.menu, eventName).pipe(
+      this.eventsFrom(this.menu, eventName).pipe(
         filter(({ browserWindow }) => browserWindow === this.window)
       ),
       ...handlers