expo-calendar-kit 2.1.5 → 2.1.6

package/ios/ExpoCalendarKitView.swift

@@ -192,61 +192,54 @@ public class ExpoCalendarKitView: UIView, DayViewDelegate, EventDataSource {
     // MARK: - EventDataSource
     public func eventsForDate(_ date: Date) -> [EventDescriptor] {
         let calendar = Calendar.current
-        print("🔥 eventsForDate called for \(date), have \(events.count) total events")
+        print("🔥 eventsForDate called for \(date)")
         
-        // HARDCODED EVENTS FOR TESTING - BYPASS BRIDGING ISSUES
+        // HARDCODED EVENTS FOR TESTING - Following CalendarKit docs exactly
         let today = Date()
         
-        let meeting = calendar.date(bySettingHour: 10, minute: 0, second: 0, of: today) ?? today
-        let meetingEnd = calendar.date(bySettingHour: 11, minute: 0, second: 0, of: today) ?? today
+        // Check if the requested date is today
+        guard calendar.isDate(date, inSameDayAs: today) else {
+            print("🔥 Not today, returning empty events")
+            return []
+        }
         
-        let lunch = calendar.date(bySettingHour: 12, minute: 0, second: 0, of: today) ?? today
-        let lunchEnd = calendar.date(bySettingHour: 13, minute: 0, second: 0, of: today) ?? today
+        print("🔥 Creating hardcoded events for today")
         
-        let review = calendar.date(bySettingHour: 14, minute: 0, second: 0, of: today) ?? today
-        let reviewEnd = calendar.date(bySettingHour: 15, minute: 0, second: 0, of: today) ?? today
+        // Create events using CalendarKit's Event class (EventDescriptor)
+        var events = [Event]()
         
-        let hardcodedEvents: [CalendarEvent] = [
-            CalendarEvent(from: [
-                "id": "hardcoded1",
-                "title": "🔥 HARDCODED Meeting",
-                "startDate": meeting.timeIntervalSince1970 * 1000,
-                "endDate": meetingEnd.timeIntervalSince1970 * 1000,
-                "backgroundColor": "#FF0000",
-                "color": "#FFFFFF"
-            ]),
-            CalendarEvent(from: [
-                "id": "hardcoded2", 
-                "title": "🔥 HARDCODED Lunch",
-                "startDate": lunch.timeIntervalSince1970 * 1000,
-                "endDate": lunchEnd.timeIntervalSince1970 * 1000,
-                "backgroundColor": "#00FF00",
-                "color": "#FFFFFF"
-            ]),
-            CalendarEvent(from: [
-                "id": "hardcoded3",
-                "title": "🔥 HARDCODED Review", 
-                "startDate": review.timeIntervalSince1970 * 1000,
-                "endDate": reviewEnd.timeIntervalSince1970 * 1000,
-                "backgroundColor": "#0000FF",
-                "color": "#FFFFFF"
-            ])
-        ]
-        
-        print("🔥 Using hardcoded events instead of bridged events")
-        let result = hardcodedEvents.compactMap { event in
-            let isToday = calendar.isDate(event.startDate, inSameDayAs: date) ||
-                         calendar.isDate(event.endDate, inSameDayAs: date) ||
-                         (event.startDate < date && event.endDate > date)
-            print("🔥 Hardcoded Event '\(event.title)': \(event.startDate) - \(event.endDate), isToday: \(isToday)")
-            if isToday {
-                let ekEvent = event.toEKEvent()
-                return EKWrapper(eventKitEvent: ekEvent)
-            }
-            return nil
-        }
-        print("🔥 Returning \(result.count) hardcoded events for date \(date)")
-        return result
+        // Event 1: Meeting
+        let meeting = Event()
+        let meetingStart = calendar.date(bySettingHour: 10, minute: 0, second: 0, of: today) ?? today
+        let meetingEnd = calendar.date(bySettingHour: 11, minute: 0, second: 0, of: today) ?? today
+        meeting.dateInterval = DateInterval(start: meetingStart, end: meetingEnd)
+        meeting.text = "🔥 HARDCODED Meeting\nConference Room A\n10:00 - 11:00"
+        meeting.color = UIColor.white
+        meeting.backgroundColor = UIColor.red
+        events.append(meeting)
+        
+        // Event 2: Lunch
+        let lunch = Event()
+        let lunchStart = calendar.date(bySettingHour: 12, minute: 0, second: 0, of: today) ?? today
+        let lunchEnd = calendar.date(bySettingHour: 13, minute: 0, second: 0, of: today) ?? today
+        lunch.dateInterval = DateInterval(start: lunchStart, end: lunchEnd)
+        lunch.text = "🔥 HARDCODED Lunch\nCafeteria\n12:00 - 13:00"
+        lunch.color = UIColor.white
+        lunch.backgroundColor = UIColor.green
+        events.append(lunch)
+        
+        // Event 3: Review
+        let review = Event()
+        let reviewStart = calendar.date(bySettingHour: 14, minute: 0, second: 0, of: today) ?? today
+        let reviewEnd = calendar.date(bySettingHour: 15, minute: 0, second: 0, of: today) ?? today
+        review.dateInterval = DateInterval(start: reviewStart, end: reviewEnd)
+        review.text = "🔥 HARDCODED Review\nMeeting Room B\n14:00 - 15:00"
+        review.color = UIColor.white
+        review.backgroundColor = UIColor.blue
+        events.append(review)
+        
+        print("🔥 Returning \(events.count) hardcoded events for today")
+        return events
     }
     
     // MARK: - DayViewDelegate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-calendar-kit",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Expo module wrapping the native Swift CalendarKit library for React Native apps",
   "main": "src/index.ts",
   "types": "src/index.ts",