Merge branch 'master' into feature/unit-in-onZoom-and-onTimeChange-callbacks

Author: Ilaiwi

CHANGELOG.md

@@ -9,6 +9,11 @@ and this project adheres (more or less) to [Semantic Versioning](http://semver.o
 
 * Add unit argument to onZoom and onTimeChange callbacks
 
+## 0.26.7
+
+* fix scrolling with trackpad @ilaiwi #679
+* remove duplicate proptype validation in `TimelineStateContext` @xat
+
 ## 0.26.6
 
 * fix `visibleTimeStart`, `visibleTimeEnd` and `onTimeChange` not working as expected in controlled mode @ilaiwi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-calendar-timeline",
-  "version": "0.26.6",
+  "version": "0.26.7",
   "description": "react calendar timeline",
   "main": "lib/index.js",
   "scripts": {

src/lib/scroll/ScrollElement.js

@@ -22,7 +22,13 @@ class ScrollElement extends Component {
     }
   }
 
-  
+  /**
+   * needed to handle scrolling with trackpad
+   */
+  handleScroll = () => {
+    const scrollX = this.scrollComponent.scrollLeft
+    this.props.onScroll(scrollX)
+  }
 
   refHandler = el => {
     this.scrollComponent = el
@@ -192,6 +198,7 @@ class ScrollElement extends Component {
         onTouchStart={this.handleTouchStart}
         onTouchMove={this.handleTouchMove}
         onTouchEnd={this.handleTouchEnd}
+        onScroll={this.handleScroll}
       >
         {children}
       </div>

src/lib/timeline/TimelineStateContext.js

@@ -43,8 +43,6 @@ export class TimelineStateProvider extends React.Component {
     canvasWidth: PropTypes.number.isRequired,
     showPeriod: PropTypes.func.isRequired,
     timelineUnit: PropTypes.string.isRequired,
-    showPeriod: PropTypes.func.isRequired,
-    timelineUnit: PropTypes.string.isRequired,
     timelineWidth: PropTypes.number.isRequired,
   }