From 51963841da0864bc189f3c68c0faa006162a1afd Mon Sep 17 00:00:00 2001
From: Joe Farro <joef@uber.com>
Date: Tue, 19 Mar 2019 12:27:28 -0400
Subject: [PATCH 1/2] Fix #241, extra vertical scrollbar in trace detail

Signed-off-by: Joe Farro <joef@uber.com>
---
 .../ListView/__snapshots__/index.test.js.snap             | 2 +-
 .../TracePage/TraceTimelineViewer/ListView/index.js       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
index baf54ebe67..2a3794e5e6 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
@@ -6,7 +6,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
   style={
     Object {
       "height": "100%",
-      "overflowY": "auto",
+      "overflowY": "scroll",
       "position": "relative",
     }
   }
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js
index 48e1b69238..0993e8bb86 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js
@@ -440,15 +440,13 @@ export default class ListView extends React.Component<ListViewProps> {
       onScroll?: Function,
     };
     const wrapperProps: wrapperPropsT = {
-      style: {
-        overflowY: 'auto',
-        position: 'relative',
-        height: '100%',
-      },
+      style: { position: 'relative' },
       ref: this._initWrapper,
     };
     if (!this.props.windowScroller) {
       wrapperProps.onScroll = this._onScroll;
+      wrapperProps.style.height = '100%';
+      wrapperProps.style.overflowY = 'scroll';
     }
     const scrollerStyle = {
       position: 'relative',

From 788e3d5af8dbc1bd706213698d1a3e6b205f30fe Mon Sep 17 00:00:00 2001
From: Joe Farro <joef@uber.com>
Date: Tue, 19 Mar 2019 12:30:56 -0400
Subject: [PATCH 2/2] Fix typo

Signed-off-by: Joe Farro <joef@uber.com>
---
 .../ListView/__snapshots__/index.test.js.snap                   | 2 +-
 .../components/TracePage/TraceTimelineViewer/ListView/index.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
index 2a3794e5e6..baf54ebe67 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/__snapshots__/index.test.js.snap
@@ -6,7 +6,7 @@ exports[`<ListView> shallow tests matches a snapshot 1`] = `
   style={
     Object {
       "height": "100%",
-      "overflowY": "scroll",
+      "overflowY": "auto",
       "position": "relative",
     }
   }
diff --git a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js
index 0993e8bb86..dbb1c0494c 100644
--- a/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js
+++ b/packages/jaeger-ui/src/components/TracePage/TraceTimelineViewer/ListView/index.js
@@ -446,7 +446,7 @@ export default class ListView extends React.Component<ListViewProps> {
     if (!this.props.windowScroller) {
       wrapperProps.onScroll = this._onScroll;
       wrapperProps.style.height = '100%';
-      wrapperProps.style.overflowY = 'scroll';
+      wrapperProps.style.overflowY = 'auto';
     }
     const scrollerStyle = {
       position: 'relative',