expo-calendar-kit 2.1.8 → 2.2.0

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,63 @@ 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
+        // Don't request calendar access - we'll use events from React Native
+    }
+    
+    // Function to update events from React Native
+    func updateEvents(_ events: [[String: Any]]) {
+        print("🔥 CalendarViewController updateEvents called with \(events.count) events")
+        self.dynamicEvents = events
+        self.reloadData() // Refresh the calendar view
     }
     
     // MARK: - DayViewDataSource
     
     // This is the main method - following CalendarApp pattern exactly
     override func eventsForDate(_ date: Date) -> [EventDescriptor] {
-        print("🔥 eventsForDate called for \(date)")
+        print("🔥 eventsForDate called for \(date) with \(dynamicEvents.count) dynamic events")
         
         let calendar = Calendar.current
-        
-        // Check if the requested date is today
-        guard calendar.isDate(date, inSameDayAs: Date()) else {
-            print("🔥 Not today, returning empty events")
-            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 eventDict in dynamicEvents {
+            guard let title = eventDict["title"] as? String,
+                  let startTimestamp = eventDict["startDate"] as? Double,
+                  let endTimestamp = eventDict["endDate"] as? Double else {
+                print("🔥 Skipping event with missing data: \(eventDict)")
+                continue
+            }
+            
+            let startDate = Date(timeIntervalSince1970: startTimestamp / 1000)
+            let endDate = Date(timeIntervalSince1970: endTimestamp / 1000)
+            
+            // Check if this event is on the requested date
+            guard calendar.isDate(startDate, inSameDayAs: date) else {
+                continue
+            }
+            
+            // 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("🔥 Added event: \(title) from \(startDate) to \(endDate)")
+        }
         
-        print("🔥 Returning \(events.count) hardcoded events")
+        print("🔥 Returning \(events.count) dynamic events for \(date)")
         return events
     }
     
@@ -240,9 +263,9 @@ public class ExpoCalendarKitView: UIView {
     
     // 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")
+        // Pass events to the calendar controller
+        calendarViewController.updateEvents(eventDicts)
     }
     
     public func setDate(_ timestamp: Double) {
@@ -258,8 +281,7 @@ public class ExpoCalendarKitView: UIView {
     
     public func scrollToCurrentTime() {
         print("🔥 scrollToCurrentTime called")
-        // Scroll to current time - method name was wrong
-        let hour = Calendar.current.component(.hour, from: Date())
-        calendarViewController.scrollTo(hour24: Float(hour))
+        // Use the correct method from DayViewController
+        calendarViewController.dayView.scrollToFirstEventIfNeeded()
     }
 }

package/package.json

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