fix: fix resize when switching docks (#129)

bus-stop · Jul 30, 2020 · 888a26b · 888a26b
1 parent d91c0a4
commit 888a26b
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 75 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -18,5 +18,6 @@ module.exports = {
  'comma-dangle': ['error', 'always-multiline'],
  indent: ['error', 'tab', { SwitchCase: 1 }],
  'no-tabs': ['error', { allowIndentationTabs: true }],
+ 'no-console': 'warn',
  },
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,6 @@
  },
  "dependencies": {
  "deep-object-diff": "^1.1.0",
- "element-resize-detector": "^1.2.1",
  "fs-extra": "^9.0.1",
  "marked": "^1.1.1",
  "node-pty-prebuilt-multiarch": "^0.9.0",

diff --git a/spec/custom-runner.js b/spec/custom-runner.js
@@ -22,6 +22,7 @@
 import { createRunner } from 'atom-jasmine3-test-runner'
 
 module.exports = createRunner({}, () => {
+ // eslint-disable-next-line no-console
  const warn = console.warn.bind(console)
  beforeEach(() => {
  spyOn(console, 'warn').and.callFake((...args) => {

diff --git a/spec/element-spec.js b/spec/element-spec.js
@@ -1592,21 +1592,14 @@ describe('XTerminalElement', () => {
 
  it('refitTerminal() terminal not visible', () => {
  spyOn(this.element.fitAddon, 'proposeDimensions')
- this.element.terminalDivIntersectionRatio = 0.0
- this.element.refitTerminal()
- expect(this.element.fitAddon.proposeDimensions).not.toHaveBeenCalled()
- })
-
- it('refitTerminal() terminal partially visible', () => {
- spyOn(this.element.fitAddon, 'proposeDimensions')
- this.element.terminalDivIntersectionRatio = 0.5
+ this.element.terminalDivInitiallyVisible = false
  this.element.refitTerminal()
  expect(this.element.fitAddon.proposeDimensions).not.toHaveBeenCalled()
  })
 
  it('refitTerminal() terminal completely visible', () => {
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(null)
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.refitTerminal()
  expect(this.element.fitAddon.proposeDimensions).toHaveBeenCalled()
  })
@@ -1617,7 +1610,7 @@ describe('XTerminalElement', () => {
  rows: this.element.terminal.rows,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = false
  this.element.refitTerminal()
  expect(this.element.terminal.resize).not.toHaveBeenCalled()
@@ -1629,7 +1622,7 @@ describe('XTerminalElement', () => {
  rows: this.element.terminal.rows,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = false
  this.element.refitTerminal()
  expect(this.element.terminal.resize).toHaveBeenCalled()
@@ -1641,7 +1634,7 @@ describe('XTerminalElement', () => {
  rows: this.element.terminal.rows + 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = false
  this.element.refitTerminal()
  expect(this.element.terminal.resize).toHaveBeenCalled()
@@ -1653,7 +1646,7 @@ describe('XTerminalElement', () => {
  rows: this.element.terminal.rows + 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = false
  this.element.refitTerminal()
  expect(this.element.terminal.resize).toHaveBeenCalled()
@@ -1665,7 +1658,7 @@ describe('XTerminalElement', () => {
  rows: this.element.terminal.rows - 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = false
  this.element.refitTerminal()
  expect(this.element.terminal.resize).toHaveBeenCalled()
@@ -1677,7 +1670,7 @@ describe('XTerminalElement', () => {
  rows: this.element.terminal.rows - 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = false
  this.element.refitTerminal()
  expect(this.element.terminal.resize).toHaveBeenCalled()
@@ -1689,7 +1682,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).not.toHaveBeenCalled()
@@ -1701,7 +1694,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalled()
@@ -1713,7 +1706,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows + 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalled()
@@ -1725,7 +1718,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows + 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalled()
@@ -1737,7 +1730,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalled()
@@ -1749,7 +1742,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows - 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalled()
@@ -1761,7 +1754,7 @@ describe('XTerminalElement', () => {
  rows: this.element.ptyProcessRows - 1,
  })
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalled()
@@ -1774,7 +1767,7 @@ describe('XTerminalElement', () => {
  }
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(expected)
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalledWith(expected.cols, expected.rows)
@@ -1787,7 +1780,7 @@ describe('XTerminalElement', () => {
  }
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(expected)
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalledWith(expected.cols, expected.rows)
@@ -1800,7 +1793,7 @@ describe('XTerminalElement', () => {
  }
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(expected)
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalledWith(expected.cols, expected.rows)
@@ -1813,7 +1806,7 @@ describe('XTerminalElement', () => {
  }
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(expected)
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalledWith(expected.cols, expected.rows)
@@ -1826,7 +1819,7 @@ describe('XTerminalElement', () => {
  }
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(expected)
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalledWith(expected.cols, expected.rows)
@@ -1839,7 +1832,7 @@ describe('XTerminalElement', () => {
  }
  spyOn(this.element.fitAddon, 'proposeDimensions').and.returnValue(expected)
  spyOn(this.element.terminal, 'resize')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.ptyProcessRunning = true
  this.element.refitTerminal()
  expect(this.element.ptyProcess.resize).toHaveBeenCalledWith(expected.cols, expected.rows)
@@ -2224,7 +2217,7 @@ describe('XTerminalElement', () => {
 
  it('applyPendingTerminalProfileOptions() terminal not visible', () => {
  spyOn(this.element, 'refitTerminal')
- this.element.terminalDivIntersectionRatio = 0.0
+ this.element.terminalDivInitiallyVisible = false
  this.element.applyPendingTerminalProfileOptions()
  expect(this.element.refitTerminal).not.toHaveBeenCalled()
  })
@@ -2234,7 +2227,7 @@ describe('XTerminalElement', () => {
  spyOn(this.element, 'setMainBackgroundColor')
  spyOn(this.element, 'restartPtyProcess')
  spyOn(this.element.terminal, 'setOption')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.applyPendingTerminalProfileOptions()
  expect(this.element.setMainBackgroundColor).toHaveBeenCalled()
  expect(this.element.terminal.setOption).not.toHaveBeenCalled()
@@ -2247,7 +2240,7 @@ describe('XTerminalElement', () => {
  spyOn(this.element, 'setMainBackgroundColor')
  spyOn(this.element, 'restartPtyProcess')
  spyOn(this.element.terminal, 'setOption')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.pendingTerminalProfileOptions.xtermOptions = {
  cursorBlink: true,
  }
@@ -2263,7 +2256,7 @@ describe('XTerminalElement', () => {
  spyOn(this.element, 'setMainBackgroundColor')
  spyOn(this.element, 'restartPtyProcess')
  spyOn(this.element.terminal, 'setOption')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.pendingTerminalProfileOptions.command = 'somecommand'
  this.element.applyPendingTerminalProfileOptions()
  expect(this.element.setMainBackgroundColor).toHaveBeenCalled()
@@ -2277,7 +2270,7 @@ describe('XTerminalElement', () => {
  spyOn(this.element, 'setMainBackgroundColor')
  spyOn(this.element, 'restartPtyProcess')
  spyOn(this.element.terminal, 'setOption')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.pendingTerminalProfileOptions.xtermOptions = {
  cursorBlink: true,
  }
@@ -2291,7 +2284,7 @@ describe('XTerminalElement', () => {
 
  it('applyPendingTerminalProfileOptions() terminal not visible pending xtermOptions and pty changes kept', () => {
  spyOn(this.element, 'refitTerminal')
- this.element.terminalDivIntersectionRatio = 0.0
+ this.element.terminalDivInitiallyVisible = false
  this.element.pendingTerminalProfileOptions.xtermOptions = {
  cursorBlink: true,
  }
@@ -2307,7 +2300,7 @@ describe('XTerminalElement', () => {
 
  it('applyPendingTerminalProfileOptions() terminal visible pending xtermOptions and pty changes removed', () => {
  spyOn(this.element, 'refitTerminal')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.pendingTerminalProfileOptions.xtermOptions = {
  cursorBlink: true,
  }
@@ -2318,7 +2311,7 @@ describe('XTerminalElement', () => {
 
  it('applyPendingTerminalProfileOptions() terminal not visible x-terminal options removed', () => {
  spyOn(this.element, 'refitTerminal')
- this.element.terminalDivIntersectionRatio = 0.0
+ this.element.terminalDivInitiallyVisible = false
  this.element.pendingTerminalProfileOptions.leaveOpenAfterExit = true
  this.element.pendingTerminalProfileOptions.relaunchTerminalOnStartup = true
  this.element.pendingTerminalProfileOptions.title = 'foo'
@@ -2328,7 +2321,7 @@ describe('XTerminalElement', () => {
 
  it('applyPendingTerminalProfileOptions() terminal visible x-terminal options removed', () => {
  spyOn(this.element, 'refitTerminal')
- this.element.terminalDivIntersectionRatio = 1.0
+ this.element.terminalDivInitiallyVisible = true
  this.element.pendingTerminalProfileOptions.leaveOpenAfterExit = true
  this.element.pendingTerminalProfileOptions.relaunchTerminalOnStartup = true
  this.element.pendingTerminalProfileOptions.title = 'foo'

diff --git a/spec/profiles-spec.js b/spec/profiles-spec.js
@@ -443,10 +443,11 @@ describe('XTerminalProfilesSingleton', () => {
 
  it('sanitizeData() valid and unknown keys set', () => {
  const expected = getDefaultExpectedProfile()
- const data = Object.assign({}, expected, {
+ const data = {
+ ...expected,
  foo: 'bar',
  baz: null,
- })
+ }
  expect(XTerminalProfilesSingleton.instance.sanitizeData(data)).toEqual(expected)
  })
 
@@ -481,7 +482,10 @@ describe('XTerminalProfilesSingleton', () => {
  command: './manage.py',
  args: ['runserver', '9000'],
  }
- const expected = Object.assign({}, XTerminalProfilesSingleton.instance.getBaseProfile(), data)
+ const expected = {
+ ...XTerminalProfilesSingleton.instance.getBaseProfile(),
+ ...data,
+ }
  const profileName = 'Django module runserver'
  await XTerminalProfilesSingleton.instance.setProfile(profileName, data)
  const profile = await XTerminalProfilesSingleton.instance.getProfile(profileName)
@@ -566,10 +570,11 @@ describe('XTerminalProfilesSingleton', () => {
  promptToStartup: false,
  copyOnSelect: false,
  }
- const data = Object.assign({}, validData, {
+ const data = {
+ ...validData,
  foo: 'bar',
  baz: null,
- })
+ }
  const expected = 'args=%5B%5D&command=somecommand&copyOnSelect=false&cwd=%2Fsome%2Fpath&deleteEnv=%5B%5D&encoding=&env=null&fontSize=14&leaveOpenAfterExit=true&name=sometermtype&promptToStartup=false&relaunchTerminalOnStartup=true&setEnv=%7B%7D&title=&xtermOptions=%7B%22cursorBlink%22%3Atrue%7D'
  const url = XTerminalProfilesSingleton.instance.generateNewUrlFromProfileData(data)
  url.searchParams.sort()