Merge pull request #237 from JunoLab/sp/terminalfixes

Fix terminals on newer Windows versions

Author: pfitzseb

lib/console/console.js

@@ -178,12 +178,6 @@ export default class InkTerminal extends PaneItem {
     this.ty = ty
 
     this.onData = this.terminal.onData(data => this.ty.write(data))
-    this.onResize = this.terminal.onResize(size => {
-      if (this.ty && this.ty.resize) {
-        this.ty.resize(size.cols, size.rows)
-      }
-    })
-
     this.ty.on('data', data => this.terminal.write(data.toString()))
 
     if (this.element.parentElement) {
@@ -199,10 +193,6 @@ export default class InkTerminal extends PaneItem {
         this.onData.dispose()
         this.onData = undefined
       }
-      if (this.onResize != undefined) {
-        this.onResize.dispose()
-        this.onResize = undefined
-      }
 
       if (keepTy) this.ty.destroy()
 
@@ -219,11 +209,14 @@ export default class InkTerminal extends PaneItem {
   }
 
   resize () {
-    const {cols, rows} = this.fitAddon.proposeDimensions()
-    // resize twice with different sizes to actually force a resize:
+    let {cols, rows} = this.fitAddon.proposeDimensions()
+    // slightly narrower terminal looks better:
+    cols -= 1
     if (this.terminal && !isNaN(cols) && !isNaN(rows)) {
-      this.terminal.resize(cols - 2, rows)
-      this.terminal.resize(cols - 1, rows)
+      this.terminal.resize(cols, rows)
+      if (this.ty && this.ty.resize) {
+        this.ty.resize(cols, rows)
+      }
     }
   }
 

package-lock.json

@@ -24,10 +24,10 @@
     "katex": "0.11.0",
     "replace-in-file": "^3.0.0",
     "underscore-plus": "^1.6.6",
-    "xterm": "4.0.0",
-    "xterm-addon-fit": "^0.2.0",
-    "xterm-addon-search": "^0.2.0",
-    "xterm-addon-web-links": "^0.2.0"
+    "xterm": "4.2.0",
+    "xterm-addon-fit": "^0.3.0",
+    "xterm-addon-search": "^0.3.0",
+    "xterm-addon-web-links": "^0.2.1"
   },
   "scripts": {
     "postinstall": "node scripts/postinstall.js"