expo-calendar-kit 2.1.6 → 2.1.8

package/ios/ExpoCalendarKitView.swift

@@ -1,403 +1,265 @@
 import ExpoModulesCore
 import UIKit
-import EventKit
 import CalendarKit
+import EventKit
 
-// MARK: - Event Models
-struct CalendarEvent {
-    let id: String
-    let title: String
-    let startDate: Date
-    let endDate: Date
-    let color: UIColor?
-    let backgroundColor: UIColor?
-    let isAllDay: Bool
-    let location: String?
-    let notes: String?
-    let userInfo: [String: Any]?
-    
-    init(from dict: [String: Any]) {
-        self.id = dict["id"] as? String ?? UUID().uuidString
-        self.title = dict["title"] as? String ?? ""
-        
-        // Handle date parsing
-        if let startTimestamp = dict["startDate"] as? Double {
-            self.startDate = Date(timeIntervalSince1970: startTimestamp / 1000)
-        } else {
-            self.startDate = Date()
+// MARK: - MyEKWrapper (copied from CalendarApp, renamed to avoid conflicts)
+final class MyEKWrapper: EventDescriptor {
+    public var dateInterval: DateInterval {
+        get {
+            DateInterval(start: ekEvent.startDate, end: ekEvent.endDate)
         }
         
-        if let endTimestamp = dict["endDate"] as? Double {
-            self.endDate = Date(timeIntervalSince1970: endTimestamp / 1000)
-        } else {
-            self.endDate = Date().addingTimeInterval(3600) // 1 hour later
+        set {
+            ekEvent.startDate = newValue.start
+            ekEvent.endDate = newValue.end
         }
-        
-        // Handle colors
-        if let colorHex = dict["color"] as? String {
-            self.color = UIColor(hex: colorHex)
-        } else {
-            self.color = nil
+    }
+    
+    public var isAllDay: Bool {
+        get {
+            ekEvent.isAllDay
         }
-        
-        if let backgroundColorHex = dict["backgroundColor"] as? String {
-            self.backgroundColor = UIColor(hex: backgroundColorHex)
-        } else {
-            self.backgroundColor = nil
+        set {
+            ekEvent.isAllDay = newValue
         }
-        
-        self.isAllDay = dict["isAllDay"] as? Bool ?? false
-        self.location = dict["location"] as? String
-        self.notes = dict["notes"] as? String
-        self.userInfo = dict["userInfo"] as? [String: Any]
     }
     
-    // Convert to EventKit EKEvent for use with CalendarKit
-    func toEKEvent() -> EKEvent {
-        let ekEvent = EKEvent(eventStore: EKEventStore())
-        ekEvent.title = self.title
-        ekEvent.startDate = self.startDate
-        ekEvent.endDate = self.endDate
-        ekEvent.isAllDay = self.isAllDay
-        if let location = self.location {
-            ekEvent.location = location
+    public var text: String {
+        get {
+            ekEvent.title
         }
-        if let notes = self.notes {
-            ekEvent.notes = notes
+        
+        set {
+            ekEvent.title = newValue
         }
-        // Store the original ID in the notes if notes is empty
-        if ekEvent.notes?.isEmpty != false {
-            ekEvent.notes = "ExpoCalendarKit_ID:\(self.id)"
+    }
+
+    public var attributedText: NSAttributedString?
+    public var lineBreakMode: NSLineBreakMode?
+    
+    public var color: UIColor {
+        get {
+            UIColor(cgColor: ekEvent.calendar.cgColor)
         }
-        return ekEvent
     }
     
-    // Extract original ID from EKEvent
-    static func extractOriginalId(from ekEvent: EKEvent) -> String? {
-        if let notes = ekEvent.notes, notes.hasPrefix("ExpoCalendarKit_ID:") {
-            return String(notes.dropFirst("ExpoCalendarKit_ID:".count))
+    public var backgroundColor = UIColor()
+    public var textColor = SystemColors.label
+    public var font = UIFont.boldSystemFont(ofSize: 12)
+    public weak var editedEvent: EventDescriptor? {
+        didSet {
+            updateColors()
         }
-        return nil
     }
-}
-
-// MARK: - Main Calendar View  
-public class ExpoCalendarKitView: UIView, DayViewDelegate, EventDataSource {
-    private var dayView: DayView!
-    private var events: [CalendarEvent] = []
-    private var currentDate: Date = Date()
     
-    // Style properties  
-    private var customCalendarStyle = ExpoCalendarStyle()
+    public private(set) var ekEvent: EKEvent
     
-    // Event callbacks - using closures for callback
-    var onEventPress: ((String) -> Void)?
-    var onEventLongPress: ((String) -> Void)?
-    var onTimePress: ((Double) -> Void)?
-    var onTimeLongPress: ((Double) -> Void)?
-    var onDateChanged: ((Double) -> Void)?
+    public init(eventKitEvent: EKEvent) {
+        self.ekEvent = eventKitEvent
+        applyStandardColors()
+    }
     
-    public override init(frame: CGRect) {
-        print("🔥 ExpoCalendarKitView init called with frame: \(frame)")
-        super.init(frame: frame)
-        setupCalendarView()
+    public func makeEditable() -> MyEKWrapper {
+        let cloned = MyEKWrapper(eventKitEvent: ekEvent)
+        cloned.editedEvent = self
+        return cloned
     }
     
-    required public init?(coder: NSCoder) {
-        super.init(coder: coder)
-        setupCalendarView()
+    public func commitEditing() {
+        guard let edited = editedEvent else {return}
+        edited.dateInterval = dateInterval
     }
     
-    private func setupCalendarView() {
-        print("🔥 setupCalendarView called")
-        
-        dayView = DayView()
-        dayView.delegate = self
-        dayView.dataSource = self
-        dayView.translatesAutoresizingMaskIntoConstraints = false
-        addSubview(dayView)
-        
-        NSLayoutConstraint.activate([
-            dayView.topAnchor.constraint(equalTo: topAnchor),
-            dayView.leadingAnchor.constraint(equalTo: leadingAnchor),
-            dayView.trailingAnchor.constraint(equalTo: trailingAnchor),
-            dayView.bottomAnchor.constraint(equalTo: bottomAnchor)
-        ])
-        
-        // Apply default style
-        applyStyle()
-        
-        // Set initial date
-        dayView.move(to: currentDate)
-        
-        print("🔥 CalendarKit DayView setup complete")
+    private func updateColors() {
+      (editedEvent != nil) ? applyEditingColors() : applyStandardColors()
     }
     
-    // MARK: - Public Methods
-    public func setEvents(_ eventDicts: [[String: Any]]) {
-        print("🔥 setEvents called with \(eventDicts.count) events")
-        self.events = eventDicts.map { CalendarEvent(from: $0) }
-        print("🔥 Converted to \(self.events.count) CalendarEvent objects")
-        for (index, event) in self.events.enumerated() {
-            print("🔥 Event \(index): \(event.title) from \(event.startDate) to \(event.endDate)")
-        }
-        if let dayView = dayView {
-            dayView.reloadData()
-        }
+    /// Colors used when event is not in editing mode
+    private func applyStandardColors() {
+      backgroundColor = dynamicStandardBackgroundColor()
+      textColor = dynamicStandardTextColor()
     }
     
-    public func setDate(_ timestamp: Double) {
-        self.currentDate = Date(timeIntervalSince1970: timestamp / 1000)
-        if let dayView = dayView {
-            dayView.move(to: currentDate)
-        }
+    /// Colors used in editing mode
+    private func applyEditingColors() {
+      backgroundColor = color.withAlphaComponent(0.95)
+      textColor = .white
     }
     
-    public func updateStyle(_ styleDict: [String: Any]) {
-        customCalendarStyle.update(from: styleDict)
-        applyStyle()
+    /// Dynamic color that changes depending on the user interface style (dark / light)
+    private func dynamicStandardBackgroundColor() -> UIColor {
+      let light = backgroundColorForLightTheme(baseColor: color)
+      let dark = backgroundColorForDarkTheme(baseColor: color)
+      return dynamicColor(light: light, dark: dark)
     }
     
-    public func scrollToCurrentTime() {
-        if let dayView = dayView {
-            dayView.scrollTo(hour24: Float(Calendar.current.component(.hour, from: Date())))
-        }
+    /// Dynamic color that changes depending on the user interface style (dark / light)
+    private func dynamicStandardTextColor() -> UIColor {
+      let light = textColorForLightTheme(baseColor: color)
+      return dynamicColor(light: light, dark: color)
     }
     
-    private func applyStyle() {
-        guard let dayView = dayView else { return }
-        
-        var style = CalendarStyle()
-        
-        // Apply only the colors that are supported by CalendarKit
-        if let headerBgColor = customCalendarStyle.headerBackgroundColor {
-            style.header.backgroundColor = headerBgColor
-        }
-        
-        if let timelineBgColor = customCalendarStyle.timelineBackgroundColor {
-            style.timeline.backgroundColor = timelineBgColor
-        }
-        
-        if let timeTextColor = customCalendarStyle.timeTextColor {
-            style.timeline.timeColor = timeTextColor
-        }
-        
-        if let separatorColor = customCalendarStyle.separatorColor {
-            style.timeline.separatorColor = separatorColor
-        }
-        
-        dayView.updateStyle(style)
+    private func textColorForLightTheme(baseColor: UIColor) -> UIColor {
+      var h: CGFloat = 0, s: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
+      baseColor.getHue(&h, saturation: &s, brightness: &b, alpha: &a)
+      return UIColor(hue: h, saturation: s, brightness: b * 0.4, alpha: a)
     }
     
-    // MARK: - EventDataSource
-    public func eventsForDate(_ date: Date) -> [EventDescriptor] {
-        let calendar = Calendar.current
+    private func backgroundColorForLightTheme(baseColor: UIColor) -> UIColor {
+      baseColor.withAlphaComponent(0.3)
+    }
+    
+    private func backgroundColorForDarkTheme(baseColor: UIColor) -> UIColor {
+      var h: CGFloat = 0, s: CGFloat = 0, b: CGFloat = 0, a: CGFloat = 0
+      color.getHue(&h, saturation: &s, brightness: &b, alpha: &a)
+      return UIColor(hue: h, saturation: s, brightness: b * 0.4, alpha: a * 0.8)
+    }
+    
+    private func dynamicColor(light: UIColor, dark: UIColor) -> UIColor {
+      if #available(iOS 13.0, *) {
+        return UIColor { traitCollection in
+          let interfaceStyle = traitCollection.userInterfaceStyle
+          switch interfaceStyle {
+          case .dark:
+            return dark
+          default:
+            return light
+          }
+        }
+      } else {
+        return light
+      }
+    }
+}
+
+// MARK: - Calendar View Controller (following CalendarApp pattern)
+final class CalendarViewController: DayViewController {
+    private var eventStore = EKEventStore() // Not used but needed for EKEvent creation
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        print("🔥 CalendarViewController viewDidLoad called")
+        // Don't request calendar access - we'll use hardcoded events
+    }
+    
+    // MARK: - DayViewDataSource
+    
+    // This is the main method - following CalendarApp pattern exactly
+    override func eventsForDate(_ date: Date) -> [EventDescriptor] {
         print("🔥 eventsForDate called for \(date)")
         
-        // HARDCODED EVENTS FOR TESTING - Following CalendarKit docs exactly
-        let today = Date()
+        let calendar = Calendar.current
         
         // Check if the requested date is today
-        guard calendar.isDate(date, inSameDayAs: today) else {
+        guard calendar.isDate(date, inSameDayAs: Date()) else {
             print("🔥 Not today, returning empty events")
             return []
         }
         
-        print("🔥 Creating hardcoded events for today")
+        print("🔥 Creating hardcoded events for today using CalendarApp pattern")
         
-        // Create events using CalendarKit's Event class (EventDescriptor)
-        var events = [Event]()
+        // Create hardcoded events using EKEvent (like CalendarApp)
+        var events: [MyEKWrapper] = []
         
         // 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)
+        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 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)
+        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 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")
+        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))
+        
+        print("🔥 Returning \(events.count) hardcoded events")
         return events
     }
     
-    // MARK: - DayViewDelegate
-    public func dayViewDidSelectEventView(_ eventView: EventView) {
-        if let ekWrapper = eventView.descriptor as? EKWrapper {
-            let eventId = CalendarEvent.extractOriginalId(from: ekWrapper.ekEvent) ?? ekWrapper.ekEvent.title ?? ""
-            onEventPress?(eventId)
-        }
+    private func createMockCalendar(color: UIColor) -> EKCalendar {
+        let calendar = EKCalendar(for: .event, eventStore: eventStore)
+        calendar.cgColor = color.cgColor
+        return calendar
     }
     
-    public func dayViewDidLongPressEventView(_ eventView: EventView) {
-        if let ekWrapper = eventView.descriptor as? EKWrapper {
-            let eventId = CalendarEvent.extractOriginalId(from: ekWrapper.ekEvent) ?? ekWrapper.ekEvent.title ?? ""
-            onEventLongPress?(eventId)
-        }
-    }
+    // MARK: - DayViewDelegate
     
-    public func dayView(dayView: DayView, didTapTimelineAt date: Date) {
-        onTimePress?(date.timeIntervalSince1970 * 1000)
+    override func dayViewDidSelectEventView(_ eventView: EventView) {
+        guard let ckEvent = eventView.descriptor as? MyEKWrapper else {
+            return
+        }
+        print("🔥 Event selected: \(ckEvent.ekEvent.title ?? "Unknown")")
     }
+}
+
+// MARK: - Expo View Wrapper
+public class ExpoCalendarKitView: UIView {
+    private var calendarViewController: CalendarViewController!
     
-    public func dayView(dayView: DayView, didLongPressTimelineAt date: Date) {
-        onTimeLongPress?(date.timeIntervalSince1970 * 1000)
+    public override init(frame: CGRect) {
+        print("🔥 ExpoCalendarKitView init called with frame: \(frame)")
+        super.init(frame: frame)
+        setupCalendarViewController()
     }
     
-    public func dayViewDidBeginDragging(dayView: DayView) {
-        // Handle drag begin if needed
+    required public init?(coder: NSCoder) {
+        super.init(coder: coder)
+        setupCalendarViewController()
     }
     
-    public func dayViewDidTransitionCancel(dayView: DayView) {
-        // Handle transition cancel if needed
+    private func setupCalendarViewController() {
+        print("🔥 setupCalendarViewController called")
+        
+        calendarViewController = CalendarViewController()
+        addSubview(calendarViewController.view)
+        
+        calendarViewController.view.translatesAutoresizingMaskIntoConstraints = false
+        NSLayoutConstraint.activate([
+            calendarViewController.view.topAnchor.constraint(equalTo: topAnchor),
+            calendarViewController.view.leadingAnchor.constraint(equalTo: leadingAnchor),
+            calendarViewController.view.trailingAnchor.constraint(equalTo: trailingAnchor),
+            calendarViewController.view.bottomAnchor.constraint(equalTo: bottomAnchor)
+        ])
+        
+        print("🔥 CalendarViewController setup complete")
     }
     
-    public func dayView(dayView: DayView, willMoveTo date: Date) {
-        currentDate = date
-        onDateChanged?(date.timeIntervalSince1970 * 1000)
+    // 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()
     }
     
-    public func dayView(dayView: DayView, didMoveTo date: Date) {
-        currentDate = date
-        onDateChanged?(date.timeIntervalSince1970 * 1000)
+    public func setDate(_ timestamp: Double) {
+        let date = Date(timeIntervalSince1970: timestamp / 1000)
+        print("🔥 setDate called with \(date)")
+        calendarViewController.move(to: date)
     }
     
-    public func dayView(dayView: DayView, didUpdate event: EventDescriptor) {
-        // Handle event update if needed
-    }
-}
-
-// MARK: - Helper Extensions
-extension UIColor {
-    convenience init?(hex: String) {
-        var hexSanitized = hex.trimmingCharacters(in: .whitespacesAndNewlines)
-        hexSanitized = hexSanitized.replacingOccurrences(of: "#", with: "")
-        
-        var rgb: UInt64 = 0
-        
-        guard Scanner(string: hexSanitized).scanHexInt64(&rgb) else { return nil }
-        
-        let red = CGFloat((rgb & 0xFF0000) >> 16) / 255.0
-        let green = CGFloat((rgb & 0x00FF00) >> 8) / 255.0
-        let blue = CGFloat(rgb & 0x0000FF) / 255.0
-        
-        self.init(red: red, green: green, blue: blue, alpha: 1.0)
+    public func updateStyle(_ styleDict: [String: Any]) {
+        print("🔥 updateStyle called")
+        // Apply custom style if needed
     }
-}
-
-// MARK: - Style Configuration
-struct ExpoCalendarStyle {
-    var backgroundColor: UIColor?
-    var headerBackgroundColor: UIColor?
-    var headerTextColor: UIColor?
-    var weekdayTextColor: UIColor?
-    var timelineBackgroundColor: UIColor?
-    var timeTextColor: UIColor?
-    var eventBackgroundColor: UIColor?
-    var eventTextColor: UIColor?
-    var todayBackgroundColor: UIColor?
-    var todayTextColor: UIColor?
-    var separatorColor: UIColor?
-    var hourLineColor: UIColor?
-    var halfHourLineColor: UIColor?
-    var quarterHourLineColor: UIColor?
-    var timelineWidth: CGFloat?
-    var hourHeight: CGFloat?
-    var eventMargin: CGFloat?
-    var eventCornerRadius: CGFloat?
     
-    mutating func update(from dict: [String: Any]) {
-        if let bgColorHex = dict["backgroundColor"] as? String {
-            backgroundColor = UIColor(hex: bgColorHex)
-        }
-        
-        if let headerBgColorHex = dict["headerBackgroundColor"] as? String {
-            headerBackgroundColor = UIColor(hex: headerBgColorHex)
-        }
-        
-        if let headerTextColorHex = dict["headerTextColor"] as? String {
-            headerTextColor = UIColor(hex: headerTextColorHex)
-        }
-        
-        if let weekdayTextColorHex = dict["weekdayTextColor"] as? String {
-            weekdayTextColor = UIColor(hex: weekdayTextColorHex)
-        }
-        
-        if let timelineBgColorHex = dict["timelineBackgroundColor"] as? String {
-            timelineBackgroundColor = UIColor(hex: timelineBgColorHex)
-        }
-        
-        if let timeTextColorHex = dict["timeTextColor"] as? String {
-            timeTextColor = UIColor(hex: timeTextColorHex)
-        }
-        
-        if let eventBgColorHex = dict["eventBackgroundColor"] as? String {
-            eventBackgroundColor = UIColor(hex: eventBgColorHex)
-        }
-        
-        if let eventTextColorHex = dict["eventTextColor"] as? String {
-            eventTextColor = UIColor(hex: eventTextColorHex)
-        }
-        
-        if let todayBgColorHex = dict["todayBackgroundColor"] as? String {
-            todayBackgroundColor = UIColor(hex: todayBgColorHex)
-        }
-        
-        if let todayTextColorHex = dict["todayTextColor"] as? String {
-            todayTextColor = UIColor(hex: todayTextColorHex)
-        }
-        
-        if let separatorColorHex = dict["separatorColor"] as? String {
-            separatorColor = UIColor(hex: separatorColorHex)
-        }
-        
-        if let hourLineColorHex = dict["hourLineColor"] as? String {
-            hourLineColor = UIColor(hex: hourLineColorHex)
-        }
-        
-        if let halfHourLineColorHex = dict["halfHourLineColor"] as? String {
-            halfHourLineColor = UIColor(hex: halfHourLineColorHex)
-        }
-        
-        if let quarterHourLineColorHex = dict["quarterHourLineColor"] as? String {
-            quarterHourLineColor = UIColor(hex: quarterHourLineColorHex)
-        }
-        
-        if let width = dict["timelineWidth"] as? NSNumber {
-            timelineWidth = CGFloat(width.floatValue)
-        }
-        
-        if let height = dict["hourHeight"] as? NSNumber {
-            hourHeight = CGFloat(height.floatValue)
-        }
-        
-        if let margin = dict["eventMargin"] as? NSNumber {
-            eventMargin = CGFloat(margin.floatValue)
-        }
-        
-        if let radius = dict["eventCornerRadius"] as? NSNumber {
-            eventCornerRadius = CGFloat(radius.floatValue)
-        }
+    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))
     }
-}
+}

package/package.json

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