v0.18.1 Release (namespace-ee#387)

Author: mcMickJuice

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres (more or less) to [Semantic Versioning](http://semver.o
 
 ## Unreleased
 
+### 0.18.1
+
+### Fixed
+
+* Date passed to CursorMarker child is wrong - #379
+* groupRenderer doesnt work for right sidebar - #377
+
 ### 0.18.0
 
 ### Fixed

__tests__/utils/calendar/calculate-time-for-x-position.js

@@ -0,0 +1,65 @@
+import moment from 'moment'
+import { calculateTimeForXPosition } from 'lib/utility/calendar'
+
+describe('calculate time for x position', () => {
+  it('calculates point in middle of timeline', () => {
+    const canvasStart = moment('2018-01-01').valueOf()
+    const canvasEnd = moment('2018-01-03').valueOf()
+    const canvasWidthInPixels = 3000
+
+    const currentXPositionInPixels = canvasWidthInPixels / 2
+
+    const actual = calculateTimeForXPosition(
+      canvasStart,
+      canvasEnd,
+      canvasWidthInPixels,
+      currentXPositionInPixels
+    )
+
+    const expected = moment('2018-01-02').valueOf()
+
+    expect(actual).toBe(expected)
+  })
+
+  it('calculates point in first quarter of timeline', () => {
+    const canvasStart = moment('2018-01-01').valueOf()
+    const canvasEnd = moment('2018-01-02').valueOf()
+    const canvasWidthInPixels = 3000
+
+    const currentXPositionInPixels = canvasWidthInPixels / 4
+
+    const actual = calculateTimeForXPosition(
+      canvasStart,
+      canvasEnd,
+      canvasWidthInPixels,
+      currentXPositionInPixels
+    )
+
+    const expected = moment('2018-01-01')
+      .add(6, 'hour')
+      .valueOf()
+
+    expect(actual).toBe(expected)
+  })
+
+  it('calculates point in latter quarter of timeline', () => {
+    const canvasStart = moment('2018-01-01').valueOf()
+    const canvasEnd = moment('2018-01-02').valueOf()
+    const canvasWidthInPixels = 3000
+
+    const currentXPositionInPixels = canvasWidthInPixels * 0.75
+
+    const actual = calculateTimeForXPosition(
+      canvasStart,
+      canvasEnd,
+      canvasWidthInPixels,
+      currentXPositionInPixels
+    )
+
+    const expected = moment('2018-01-01')
+      .add(18, 'hour')
+      .valueOf()
+
+    expect(actual).toBe(expected)
+  })
+})

package.json

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

src/lib/Timeline.js

@@ -917,6 +917,7 @@ export default class ReactCalendarTimeline extends Component {
         <Sidebar
           groups={this.props.groups}
           keys={this.props.keys}
+          groupRenderer={this.props.groupRenderer}
           isRightSidebar
           width={this.props.rightSidebarWidth}
           groupHeights={groupHeights}

src/lib/utility/calendar.js

@@ -1,6 +1,13 @@
 import moment from 'moment'
 import { _get } from './generic'
 
+/**
+ * Calculate the ms / pixel ratio of the timeline state
+ * @param {number} canvasTimeStart
+ * @param {number} canvasTimeEnd
+ * @param {number} canvasWidth
+ * @returns {number}
+ */
 export function coordinateToTimeRatio(
   canvasTimeStart,
   canvasTimeEnd,
@@ -9,6 +16,15 @@ export function coordinateToTimeRatio(
   return (canvasTimeEnd - canvasTimeStart) / canvasWidth
 }
 
+/**
+ * For a given time, calculate the pixel position given timeline state
+ * (timeline width in px, canvas time range)
+ * @param {number} canvasTimeStart
+ * @param {number} canvasTimeEnd
+ * @param {number} canvasWidth
+ * @param {number} time
+ * @returns {number}
+ */
 export function calculateXPositionForTime(
   canvasTimeStart,
   canvasTimeEnd,
@@ -21,6 +37,15 @@ export function calculateXPositionForTime(
   return timeOffset * widthToZoomRatio
 }
 
+/**
+ * For a given x position (leftOffset) in pixels, calculate time based on
+ * timeline state (timeline width in px, canvas time range)
+ * @param {number} canvasTimeStart
+ * @param {number} canvasTimeEnd
+ * @param {number} canvasWidth
+ * @param {number} leftOffset
+ * @returns {number}
+ */
 export function calculateTimeForXPosition(
   canvasTimeStart,
   canvasTimeEnd,
@@ -31,7 +56,7 @@ export function calculateTimeForXPosition(
 
   const timeFromCanvasTimeStart = timeToPxRatio * leftOffset
 
-  return timeFromCanvasTimeStart + canvasTimeEnd
+  return timeFromCanvasTimeStart + canvasTimeStart
 }
 
 export function iterateTimes(start, end, unit, timeSteps, callback) {