Merge branch 'master' of https://github.com/jquense/react-big-calendar

src/TimeGrid.js

@@ -315,7 +315,7 @@ export default class TimeGrid extends Component {
     const { min, max, scrollToTime, localizer } = props
 
     const diffMillis = scrollToTime - localizer.startOf(scrollToTime, 'day')
-    const totalMillis = localizer.diff(max, min)
+    const totalMillis = localizer.diff(min, max, 'milliseconds')
 
     this._scrollRatio = diffMillis / totalMillis
   }

src/utils/selection.js

@@ -1,6 +1,8 @@
+import isEqual from 'lodash/isEqual'
+
 export function isSelected(event, selected) {
   if (!event || selected == null) return false
-  return [].concat(selected).indexOf(event) !== -1
+  return isEqual(event, selected)
 }
 
 export function slotWidth(rowBox, slots) {
@@ -18,7 +20,7 @@ export function getSlotAtX(rowBox, x, rtl, slots) {
 }
 
 export function pointInBox(box, { x, y }) {
-  return y >= box.top && y <= box.bottom && (x >= box.left && x <= box.right)
+  return y >= box.top && y <= box.bottom && x >= box.left && x <= box.right
 }
 
 export function dateCellSelection(start, rowBox, box, slots, rtl) {

test/utils/selection.test.js

@@ -0,0 +1,38 @@
+import { isSelected } from '../../src/utils/selection'
+
+describe('isSelected', () => {
+  test('it returns true if it is the same object by reference', () => {
+    const value = {
+      x: { sample: 'value' },
+      y: 1,
+    }
+    expect(isSelected(value, value)).toBeTruthy()
+  })
+
+  test('it returns true if it is the same object by equality', () => {
+    const value = {
+      x: { sample: 'value' },
+      y: 1,
+    }
+
+    const equalivalentValue = {
+      x: { sample: 'value' },
+      y: 1,
+    }
+    expect(isSelected(value, equalivalentValue)).toBeTruthy()
+  })
+
+  test('it returns false if the object is not equal', () => {
+    const value = {
+      x: { sample: 'value' },
+      y: 1,
+    }
+
+    const nonEqualivalentValue = {
+      x: { sample: 'value' },
+      y: 2,
+    }
+
+    expect(isSelected(value, nonEqualivalentValue)).toBeFalsy()
+  })
+})