expo-calendar-kit 2.1.9 → 2.2.1

package/ios/ExpoCalendarKitView.swift

@@ -3,6 +3,23 @@ import UIKit
 import CalendarKit
 import EventKit
 
+// MARK: - UIColor Hex Extension
+extension UIColor {
+    convenience init?(hex: String) {
+        let hexColor = hex.trimmingCharacters(in: .whitespacesAndNewlines)
+        let scanner = Scanner(string: hexColor.hasPrefix("#") ? String(hexColor.dropFirst()) : hexColor)
+        var hexNumber: UInt64 = 0
+        
+        guard scanner.scanHexInt64(&hexNumber) else { return nil }
+        
+        let r = CGFloat((hexNumber & 0xff0000) >> 16) / 255
+        let g = CGFloat((hexNumber & 0x00ff00) >> 8) / 255
+        let b = CGFloat(hexNumber & 0x0000ff) / 255
+        
+        self.init(red: r, green: g, blue: b, alpha: 1.0)
+    }
+}
+
 // MARK: - MyEKWrapper (copied from CalendarApp, renamed to avoid conflicts)
 final class MyEKWrapper: EventDescriptor {
     public var dateInterval: DateInterval {
@@ -136,57 +153,95 @@ final class MyEKWrapper: EventDescriptor {
 // MARK: - Calendar View Controller (following CalendarApp pattern)
 final class CalendarViewController: DayViewController {
     private var eventStore = EKEventStore() // Not used but needed for EKEvent creation
+    private var dynamicEvents: [[String: Any]] = [] // Store events from React Native
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        print("🔥 CalendarViewController viewDidLoad called")
-        // Don't request calendar access - we'll use hardcoded events
+        print("🔥🔥🔥 CalendarViewController viewDidLoad called")
+        print("🔥🔥🔥 dynamicEvents count: \(dynamicEvents.count)")
+        // Don't request calendar access - we'll use events from React Native
+        print("🔥🔥🔥 CalendarViewController viewDidLoad complete")
+    }
+    
+    // Function to update events from React Native
+    func updateEvents(_ events: [[String: Any]]) {
+        print("🔥🔥🔥 CalendarViewController updateEvents called with \(events.count) events")
+        for (index, event) in events.enumerated() {
+            print("🔥🔥🔥 Received Event \(index): \(event)")
+        }
+        print("🔥🔥🔥 About to update dynamicEvents array")
+        self.dynamicEvents = events
+        print("🔥🔥🔥 dynamicEvents updated, new count: \(self.dynamicEvents.count)")
+        print("🔥🔥🔥 About to call reloadData")
+        self.reloadData() // Refresh the calendar view
+        print("🔥🔥🔥 CalendarViewController reloadData called after updateEvents")
     }
     
     // MARK: - DayViewDataSource
     
     // This is the main method - following CalendarApp pattern exactly
     override func eventsForDate(_ date: Date) -> [EventDescriptor] {
-        print("🔥 eventsForDate called for \(date)")
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        print("🔥🔥🔥🔥🔥 ===== eventsForDate CALLED =====")
+        print("🔥🔥🔥🔥🔥 Requested date: \(formatter.string(from: date))")
+        print("🔥🔥🔥🔥🔥 dynamicEvents count: \(dynamicEvents.count)")
         
         let calendar = Calendar.current
+        var events: [MyEKWrapper] = []
         
-        // Check if the requested date is today
-        guard calendar.isDate(date, inSameDayAs: Date()) else {
-            print("🔥 Not today, returning empty events")
+        if dynamicEvents.isEmpty {
+            print("🔥🔥🔥🔥🔥 NO DYNAMIC EVENTS TO PROCESS!")
             return []
         }
         
-        print("🔥 Creating hardcoded events for today using CalendarApp pattern")
-        
-        // Create hardcoded events using EKEvent (like CalendarApp)
-        var events: [MyEKWrapper] = []
-        
-        // Event 1: Meeting
-        let meetingEvent = EKEvent(eventStore: eventStore)
-        meetingEvent.title = "🔥 HARDCODED Meeting"
-        meetingEvent.startDate = calendar.date(bySettingHour: 10, minute: 0, second: 0, of: Date()) ?? Date()
-        meetingEvent.endDate = calendar.date(bySettingHour: 11, minute: 0, second: 0, of: Date()) ?? Date()
-        meetingEvent.calendar = createMockCalendar(color: UIColor.red)
-        events.append(MyEKWrapper(eventKitEvent: meetingEvent))
-        
-        // Event 2: Lunch
-        let lunchEvent = EKEvent(eventStore: eventStore)
-        lunchEvent.title = "🔥 HARDCODED Lunch"
-        lunchEvent.startDate = calendar.date(bySettingHour: 12, minute: 0, second: 0, of: Date()) ?? Date()
-        lunchEvent.endDate = calendar.date(bySettingHour: 13, minute: 0, second: 0, of: Date()) ?? Date()
-        lunchEvent.calendar = createMockCalendar(color: UIColor.green)
-        events.append(MyEKWrapper(eventKitEvent: lunchEvent))
-        
-        // Event 3: Review
-        let reviewEvent = EKEvent(eventStore: eventStore)
-        reviewEvent.title = "🔥 HARDCODED Review"
-        reviewEvent.startDate = calendar.date(bySettingHour: 14, minute: 0, second: 0, of: Date()) ?? Date()
-        reviewEvent.endDate = calendar.date(bySettingHour: 15, minute: 0, second: 0, of: Date()) ?? Date()
-        reviewEvent.calendar = createMockCalendar(color: UIColor.blue)
-        events.append(MyEKWrapper(eventKitEvent: reviewEvent))
+        // Process dynamic events from React Native
+        for (index, eventDict) in dynamicEvents.enumerated() {
+            print("🔥🔥🔥🔥🔥 Processing event \(index): \(eventDict)")
+            
+            guard let title = eventDict["title"] as? String,
+                  let startTimestamp = eventDict["startDate"] as? Double,
+                  let endTimestamp = eventDict["endDate"] as? Double else {
+                print("🔥🔥🔥🔥🔥 SKIPPING event \(index) with missing data: \(eventDict)")
+                continue
+            }
+            
+            let startDate = Date(timeIntervalSince1970: startTimestamp / 1000)
+            let endDate = Date(timeIntervalSince1970: endTimestamp / 1000)
+            
+            print("🔥🔥🔥🔥🔥 Event \(index) '\(title)':")
+            print("🔥🔥🔥🔥🔥   Start: \(formatter.string(from: startDate))")
+            print("🔥🔥🔥🔥🔥   End: \(formatter.string(from: endDate))")
+            print("🔥🔥🔥🔥🔥   Requested: \(formatter.string(from: date))")
+            
+            let isSameDay = calendar.isDate(startDate, inSameDayAs: date)
+            print("🔥🔥🔥🔥🔥   Same day check: \(isSameDay)")
+            
+            // Check if this event is on the requested date
+            guard isSameDay else {
+                print("🔥🔥🔥🔥🔥   NOT on requested date, skipping")
+                continue
+            }
+            
+            print("🔥🔥🔥🔥🔥   Creating EKEvent for this event")
+            // Create EKEvent
+            let ekEvent = EKEvent(eventStore: eventStore)
+            ekEvent.title = title
+            ekEvent.startDate = startDate
+            ekEvent.endDate = endDate
+            
+            // Set color from React Native or default
+            let colorString = eventDict["backgroundColor"] as? String ?? "#007AFF"
+            let color = UIColor(hex: colorString) ?? UIColor.blue
+            ekEvent.calendar = createMockCalendar(color: color)
+            
+            events.append(MyEKWrapper(eventKitEvent: ekEvent))
+            print("🔥🔥🔥🔥🔥   SUCCESSFULLY ADDED event: \(title)")
+        }
         
-        print("🔥 Returning \(events.count) hardcoded events")
+        print("🔥🔥🔥🔥🔥 ===== FINAL RESULT =====")
+        print("🔥🔥🔥🔥🔥 Returning \(events.count) events for \(formatter.string(from: date))")
+        print("🔥🔥🔥🔥🔥 ========================")
         return events
     }
     
@@ -211,22 +266,33 @@ public class ExpoCalendarKitView: UIView {
     private var calendarViewController: CalendarViewController!
     
     public override init(frame: CGRect) {
-        print("🔥 ExpoCalendarKitView init called with frame: \(frame)")
+        print("🔥🔥🔥 ExpoCalendarKitView init called with frame: \(frame)")
         super.init(frame: frame)
+        print("🔥🔥🔥 About to call setupCalendarViewController")
         setupCalendarViewController()
+        print("🔥🔥🔥 ExpoCalendarKitView init complete")
     }
     
     required public init?(coder: NSCoder) {
+        print("🔥🔥🔥 ExpoCalendarKitView init(coder) called")
         super.init(coder: coder)
+        print("🔥🔥🔥 About to call setupCalendarViewController from coder init")
         setupCalendarViewController()
+        print("🔥🔥🔥 ExpoCalendarKitView init(coder) complete")
     }
     
     private func setupCalendarViewController() {
-        print("🔥 setupCalendarViewController called")
+        print("🔥🔥🔥 setupCalendarViewController called")
         
+        print("🔥🔥🔥 Creating CalendarViewController")
         calendarViewController = CalendarViewController()
+        print("🔥🔥🔥 CalendarViewController created: \(calendarViewController != nil)")
+        
+        print("🔥🔥🔥 Adding calendarViewController.view as subview")
         addSubview(calendarViewController.view)
+        print("🔥🔥🔥 Subview added")
         
+        print("🔥🔥🔥 Setting up constraints")
         calendarViewController.view.translatesAutoresizingMaskIntoConstraints = false
         NSLayoutConstraint.activate([
             calendarViewController.view.topAnchor.constraint(equalTo: topAnchor),
@@ -234,15 +300,29 @@ public class ExpoCalendarKitView: UIView {
             calendarViewController.view.trailingAnchor.constraint(equalTo: trailingAnchor),
             calendarViewController.view.bottomAnchor.constraint(equalTo: bottomAnchor)
         ])
+        print("🔥🔥🔥 Constraints activated")
+        
+        print("🔥🔥🔥 CalendarViewController setup complete")
         
-        print("🔥 CalendarViewController setup complete")
+        // Force initial load
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            print("🔥🔥🔥 About to call initial reloadData")
+            self.calendarViewController.reloadData()
+            print("🔥🔥🔥 Initial reloadData called")
+        }
     }
     
     // MARK: - Public Methods (for React Native bridge)
     public func setEvents(_ eventDicts: [[String: Any]]) {
-        print("🔥 setEvents called with \(eventDicts.count) events (ignored - using hardcoded)")
-        // For now, ignore and use hardcoded events
-        calendarViewController.reloadData()
+        print("🔥🔥🔥 setEvents called with \(eventDicts.count) events")
+        print("🔥🔥🔥 calendarViewController exists: \(calendarViewController != nil)")
+        for (index, event) in eventDicts.enumerated() {
+            print("🔥🔥🔥 Input Event \(index): \(event)")
+        }
+        print("🔥🔥🔥 About to call calendarViewController.updateEvents")
+        // Pass events to the calendar controller
+        calendarViewController.updateEvents(eventDicts)
+        print("🔥🔥🔥 setEvents complete")
     }
     
     public func setDate(_ timestamp: Double) {

package/package.json

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