From b1921c8358f0f564da0a7bdc48a7bae72e677490 Mon Sep 17 00:00:00 2001
From: Jack Reed <phillipjreed@gmail.com>
Date: Thu, 19 Dec 2019 16:19:10 -0700
Subject: [PATCH] Fixes a regression where companion window would not scroll
---
__tests__/src/components/CompanionWindow.test.js | 2 +-
src/components/CompanionWindow.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/__tests__/src/components/CompanionWindow.test.js b/__tests__/src/components/CompanionWindow.test.js
index ea5ecf043..c185b9320 100644
--- a/__tests__/src/components/CompanionWindow.test.js
+++ b/__tests__/src/components/CompanionWindow.test.js
@@ -105,7 +105,7 @@ describe('CompanionWindow', () => {
companionWindow = createWrapper();
expect(companionWindow.find(Rnd).length).toBe(1);
expect(companionWindow.find(Rnd).prop('enableResizing').left).toBe(true);
- expect(companionWindow.find(Rnd).prop('default')).toEqual({ height: 'auto', width: 235 });
+ expect(companionWindow.find(Rnd).prop('default')).toEqual({ height: '100%', width: 235 });
companionWindow = createWrapper({ position: 'bottom' });
expect(companionWindow.find(Rnd).length).toBe(1);
diff --git a/src/components/CompanionWindow.js b/src/components/CompanionWindow.js
index 16cc49c5f..038bdd59b 100644
--- a/src/components/CompanionWindow.js
+++ b/src/components/CompanionWindow.js
@@ -71,7 +71,7 @@ export class CompanionWindow extends Component {
className={[classes.rnd]}
style={{ display: 'flex', position: 'relative' }}
default={{
- height: isBottom ? 201 : 'auto',
+ height: isBottom ? 201 : '100%',
width: isBottom ? 'auto' : 235,
}}
disableDragging
--
GitLab