[fixed] event layout sort

optimis · Oct 28, 2015 · 0eeb43f · 0eeb43f
1 parent 0574eed
commit 0eeb43f
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/src/utils/eventLevels.js b/src/utils/eventLevels.js
@@ -72,16 +72,20 @@ export function segsOverlap(seg, otherSegs) {
 
 
 export function sortEvents(evtA, evtB, { startAccessor, endAccessor, allDayAccessor }) {
-  let durA = dates.duration(
-          get(evtA, startAccessor)
-        , get(evtA, endAccessor)
-        , 'day')
-    , durB = dates.duration(
+  let startSort = +dates.startOf(get(evtA, startAccessor), 'day') - +dates.startOf(get(evtB, startAccessor), 'day')
+
+  let durA = dates.diff(
+        get(evtA, startAccessor)
+      , dates.ceil(get(evtA, endAccessor), 'day')
+      , 'day');
+
+  let durB = dates.diff(
         get(evtB, startAccessor)
-      , get(evtB, endAccessor)
+      , dates.ceil(get(evtB, endAccessor), 'day')
       , 'day');
 
-  return (+get(evtA, startAccessor) - +get(evtB, startAccessor))
-    || (durB - durA)
-    || !!get(evtA, allDayAccessor) - !!get(evtB, allDayAccessor)
+  return startSort // sort by start Day first
+    || Math.max(durB, 1) - Math.max(durA, 1) // events spanning multiple days go first
+    || !!get(evtB, allDayAccessor) - !!get(evtA, allDayAccessor) // then allDay single day events
+    || +get(evtA, startAccessor) - +get(evtB, startAccessor)     // then sort by start time
 }