if same day -

mikeyyyzhao · Feb 21, 2024 · edc863a · edc863a
1 parent 7effc72
commit edc863a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/.size-snapshot.json b/.size-snapshot.json
@@ -1,18 +1,18 @@
 {
   "./dist/react-big-calendar.js": {
-    "bundled": 543609,
-    "minified": 167855,
-    "gzipped": 51575
+    "bundled": 545956,
+    "minified": 168840,
+    "gzipped": 51916
   },
   "./dist/react-big-calendar.min.js": {
-    "bundled": 471477,
-    "minified": 146012,
-    "gzipped": 45768
+    "bundled": 473824,
+    "minified": 147009,
+    "gzipped": 46084
   },
   "dist/react-big-calendar.esm.js": {
-    "bundled": 226542,
-    "minified": 102424,
-    "gzipped": 25443,
+    "bundled": 226875,
+    "minified": 102569,
+    "gzipped": 25479,
     "treeshaked": {
       "rollup": {
         "code": 64993,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rbc-fork-react-big-calendar",
-  "version": "0.33.17",
+  "version": "0.33.18",
   "description": "Calendar! with events",
   "author": {
     "name": "Jason Quense",

diff --git a/src/localizer.js b/src/localizer.js
@@ -102,6 +102,16 @@ function sortEvents({
   let durA = daySpan(aStart, aEnd)
 
   let durB = daySpan(bStart, bEnd)
+
+  if (startSort === 0) {
+    // same day
+    return (
+      !!bAllDay - !!aAllDay || // allDay single events go first
+      durB - durA || // events spanning multiple days go first
+      +aStart - +bStart || // then sort by start time
+      +aEnd - +bEnd // then sort by end time
+    )
+  }
 
   return (
     startSort || // sort by start Day first