@forcecalendar/core 2.1.53 → 2.1.54

package/core/conflicts/ConflictDetector.js

@@ -500,13 +500,36 @@ export class ConflictDetector {
    * @private
    */
   _isWithinBusinessHours(start, end, options) {
-    // Simple implementation - can be enhanced
-    const startHour = start.getHours();
-    const endHour = end.getHours();
+    if (options.excludeWeekends) {
+      const day = start.getDay();
+      if (day === 0 || day === 6) {
+        return false;
+      }
+    }
+
+    // Business hours describe a window within a single day, so a period
+    // spanning multiple calendar days can never fit inside them
+    if (
+      start.getFullYear() !== end.getFullYear() ||
+      start.getMonth() !== end.getMonth() ||
+      start.getDate() !== end.getDate()
+    ) {
+      return false;
+    }
+
+    const [businessStartHour, businessStartMinute = 0] = options.businessHours.start
+      .split(':')
+      .map(Number);
+    const [businessEndHour, businessEndMinute = 0] = options.businessHours.end
+      .split(':')
+      .map(Number);
+
+    const businessStart = businessStartHour * 60 + businessStartMinute;
+    const businessEnd = businessEndHour * 60 + businessEndMinute;
 
-    const businessStart = parseInt(options.businessHours.start.split(':')[0]);
-    const businessEnd = parseInt(options.businessHours.end.split(':')[0]);
+    const startMinutes = start.getHours() * 60 + start.getMinutes();
+    const endMinutes = end.getHours() * 60 + end.getMinutes();
 
-    return startHour >= businessStart && endHour <= businessEnd;
+    return startMinutes >= businessStart && endMinutes <= businessEnd;
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forcecalendar/core",
-  "version": "2.1.53",
+  "version": "2.1.54",
   "type": "module",
   "private": false,
   "description": "A modern, lightweight, framework-agnostic calendar engine optimized for Salesforce",