From 2ca1973add9c49bfbba65e3d812bee5851198b05 Mon Sep 17 00:00:00 2001
From: DMYTRO ZHARKOV <dmytrozharkov@DMYTROs-MBP.fritz.box>
Date: Tue, 18 Jan 2022 14:59:09 +0100
Subject: [PATCH] Add reaction to update terminals. Cleanup

Signed-off-by: DMYTRO ZHARKOV <dmytrozharkov@DMYTROs-MBP.fritz.box>
---
 .../components/+preferences/terminal.tsx      | 21 ++-----------------
 .../components/dock/terminal.store.ts         |  8 -------
 .../components/dock/terminal/terminal.ts      |  6 ++++++
 3 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/src/renderer/components/+preferences/terminal.tsx b/src/renderer/components/+preferences/terminal.tsx
index d5c207112c..cd0a0be1fa 100644
--- a/src/renderer/components/+preferences/terminal.tsx
+++ b/src/renderer/components/+preferences/terminal.tsx
@@ -25,13 +25,9 @@ import { SubTitle } from "../layout/sub-title";
 import { Input, InputValidators } from "../input";
 import { isWindows } from "../../../common/vars";
 import { Switch } from "../switch";
-import { TerminalStore } from "../dock/terminal.store";
-import { dockStore, TabKind } from "../dock/dock.store";
 
 export const Terminal = observer(() => {
   const userStore = UserStore.getInstance();
-  const terminalStore = TerminalStore.getInstance();
-  const { tabs, selectedTab, isOpen  } = dockStore;
   const [terminalSettings, setTerminalSettings] = React.useState({
     shell: userStore.shell || "",
     terminalFontSize: userStore.terminalConfig.fontSize,
@@ -81,17 +77,7 @@ export const Terminal = observer(() => {
           ...terminalSettings,
           terminalFontSize: Number(value),
         })}
-        onBlur={() => {
-          userStore.terminalConfig.fontSize = terminalSettings.terminalFontSize;
-          console.log("tabs", tabs);
-          console.log("selectedTab", selectedTab);
-
-          if (selectedTab?.kind === TabKind.TERMINAL && isOpen) {
-            terminalStore.reconnect(selectedTab.id);
-          }
-
-          terminalStore.reconnectTerminals();
-        }}
+        onBlur={() => userStore.terminalConfig.fontSize = terminalSettings.terminalFontSize}
       />
     </section>
     <section>
@@ -104,10 +90,7 @@ export const Terminal = observer(() => {
           ...terminalSettings,
           terminalFontFamily: value.toString(),
         })}
-        onBlur={() => {
-          userStore.terminalConfig.fontFamily = terminalSettings.terminalFontFamily;
-          terminalStore.reconnectTerminals();
-        }}
+        onBlur={() => userStore.terminalConfig.fontFamily = terminalSettings.terminalFontFamily}
       />
     </section>
   </div>);
diff --git a/src/renderer/components/dock/terminal.store.ts b/src/renderer/components/dock/terminal.store.ts
index d291250b8d..bc6bda61e8 100644
--- a/src/renderer/components/dock/terminal.store.ts
+++ b/src/renderer/components/dock/terminal.store.ts
@@ -107,14 +107,6 @@ export class TerminalStore extends Singleton {
     return this.connections.get(tabId)?.readyState === WebSocketApiState.CLOSED;
   }
 
-  reconnectTerminals() {
-    console.log("Reconencting connections", this.connections);
-    console.log("Reconencting terminals", this.terminals);
-    this.connections.forEach(cn => {
-      console.log("cn", cn);
-    });  
-  }
-
   async sendCommand(command: string, options: { enter?: boolean; newTab?: boolean; tabId?: TabId } = {}) {
     const { enter, newTab, tabId } = options;
 
diff --git a/src/renderer/components/dock/terminal/terminal.ts b/src/renderer/components/dock/terminal/terminal.ts
index 6b34b2b41f..8a2fba925e 100644
--- a/src/renderer/components/dock/terminal/terminal.ts
+++ b/src/renderer/components/dock/terminal/terminal.ts
@@ -101,6 +101,12 @@ export class Terminal {
       }, {
         fireImmediately: true,
       }),
+      reaction(() => UserStore.getInstance().terminalConfig.fontSize, this.setFontSize, {
+        fireImmediately: true,
+      }),
+      reaction(() => UserStore.getInstance().terminalConfig.fontFamily, this.setFontFamily, {
+        fireImmediately: true,
+      }),
       dependencies.dockStore.onResize(this.onResize),
       () => onDataHandler.dispose(),
       () => this.fitAddon.dispose(),