From ebc3eee45e0c5868cd78b3ea6e8a64903e2b0a2f Mon Sep 17 00:00:00 2001
From: Lachlan Kermode <lachiekermode@gmail.com>
Date: Wed, 9 Jan 2019 17:57:46 +0000
Subject: [PATCH] fixes from rebase

---
 src/components/Timeline.jsx                     | 6 +++---
 src/components/presentational/DatetimeDot.js    | 1 +
 src/components/presentational/TimelineEvents.js | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/Timeline.jsx b/src/components/Timeline.jsx
index 61a2c11..fc3f15b 100644
--- a/src/components/Timeline.jsx
+++ b/src/components/Timeline.jsx
@@ -271,15 +271,15 @@ class Timeline extends React.Component {
               <TimelineMarkers
                 selected={this.props.app.selected}
                 getEventX={this.getDatetimeX}
-                getCategoryY={this.getCategoryY}
+                getCategoryY={this.state.scaleY}
                 transitionDuration={this.state.transitionDuration}
               />
               <TimelineEvents
                 datetimes={this.props.domain.datetimes}
                 styleDatetime={this.styleDatetime}
                 narrative={this.props.app.narrative}
-                getEventX={this.getEventX}
-                getCategoryY={this.getCategoryY}
+                getDatetimeX={this.getDatetimeX}
+                getCategoryY={this.state.scaleY}
                 getCategoryColor={this.props.methods.getCategoryColor}
                 transitionDuration={this.state.transitionDuration}
                 onSelect={this.props.methods.onSelect}
diff --git a/src/components/presentational/DatetimeDot.js b/src/components/presentational/DatetimeDot.js
index a0d4b6e..8caf52a 100644
--- a/src/components/presentational/DatetimeDot.js
+++ b/src/components/presentational/DatetimeDot.js
@@ -5,6 +5,7 @@ export default ({
   events,
   x,
   y,
+  onSelect,
   styleProps,
   extraRender
 }) => (
diff --git a/src/components/presentational/TimelineEvents.js b/src/components/presentational/TimelineEvents.js
index 17966ed..035ab64 100644
--- a/src/components/presentational/TimelineEvents.js
+++ b/src/components/presentational/TimelineEvents.js
@@ -58,6 +58,7 @@ const TimelineEvents = ({
 
       return (
         <DatetimeDot
+          onSelect={onSelect}
           category={dot.category}
           events={dot.events}
           x={getDatetimeX(datetime)}