Merge pull request atom#1281 from atom/ku-fix-scroll-bugs

kuychaco · web-flow · commit 32b919917ef8 · 2018-01-12T17:32:04.000-08:00
Scroll to selected diff line only if head of selection changes
diff --git a/lib/views/hunk-view.js b/lib/views/hunk-view.js
@@ -94,18 +94,17 @@ export default class HunkView extends React.Component {
     this.lineElements.set(line, element);
   }
 
-  componentDidUpdate() {
-    const selectedLine = Array.from(this.props.selectedLines)[0];
-    if (selectedLine && this.lineElements.get(selectedLine)) {
-      // QUESTION: why is this setTimeout needed?
-      const element = this.lineElements.get(selectedLine);
-      setTimeout(() => {
-        element.scrollIntoViewIfNeeded();
-      }, 0);
-    } else if (this.props.headHunk === this.props.hunk) {
-      this.element.scrollIntoViewIfNeeded();
-    } else if (this.props.headLine && this.lineElements.has(this.props.headLine)) {
-      this.lineElements.get(this.props.headLine).scrollIntoViewIfNeeded();
+  componentDidUpdate(prevProps) {
+    if (prevProps.headLine !== this.props.headLine) {
+      if (this.props.headLine && this.lineElements.has(this.props.headLine)) {
+        this.lineElements.get(this.props.headLine).scrollIntoViewIfNeeded();
+      }
+    }
+
+    if (prevProps.headHunk !== this.props.headHunk) {
+      if (this.props.headHunk === this.props.hunk) {
+        this.element.scrollIntoViewIfNeeded();
+      }
     }
   }
 }
