react-native-alarms 0.0.6 → 0.0.8

package/ios/alarm/AlarmModule.swift

@@ -14,20 +14,20 @@ final class AlarmModule: RCTEventEmitter {
   static let eventFired = "onAlarmFired"
   static let eventDismissed = "onAlarmDismissed"
   static let eventSnoozed = "onAlarmSnoozed"
-
+  
   private var hasListeners = false
   private var activeObserver: NSObjectProtocol?
-
+  
   override init() {
     super.init()
     NotificationBackend.install()
     NotificationBackend.shared.onEvent = { [weak self] name, alarm in self?.handle(name, alarm) }
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *) {
       AlarmKitBackend.shared.onEvent = { [weak self] name, alarm in self?.handle(name, alarm) }
       AlarmKitBackend.shared.startObserving()
     }
-    #endif
+#endif
     // App launched by tapping the alarm notification/alert before this module existed.
     DispatchQueue.main.async { [weak self] in self?.presentIfRinging() }
     // Tapping an AlarmKit alert (and some notification taps on a warm start) only
@@ -36,40 +36,44 @@ final class AlarmModule: RCTEventEmitter {
       forName: UIApplication.didBecomeActiveNotification, object: nil, queue: .main
     ) { [weak self] _ in self?.presentIfRinging() }
   }
-
+  
   deinit {
     if let activeObserver { NotificationCenter.default.removeObserver(activeObserver) }
   }
-
+  
   /// Shows the ring screen when a backend says an alarm is ringing right now.
   private func presentIfRinging() {
     var ringing = NotificationBackend.shared.ringing
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *), ringing == nil { ringing = AlarmKitBackend.shared.ringingAlarm() }
-    #endif
-    if let ringing { AlarmRingPresenter.present(ringing, bridge: bridge) }
+#endif
+    if let ringing { AlarmRingPresenter.present(ringing, bridge: bridge,
+                                                componentName: ringing.componentName ?? "AlarmRing",
+                                                componentProps: ringing.componentProps ?? [:]) }
   }
-
+  
   private func handle(_ name: String, _ alarm: AlarmData) {
     if name == Self.eventFired {
-      AlarmRingPresenter.present(alarm, bridge: bridge)
+      AlarmRingPresenter.present(alarm, bridge: bridge,
+                                 componentName: alarm.componentName ?? "AlarmRing",
+                                 componentProps: alarm.componentProps ?? [:])
     } else {
       AlarmRingPresenter.dismiss(alarm.id)
     }
     emit(name, alarm)
   }
-
+  
   @objc override static func requiresMainQueueSetup() -> Bool { false }
-
+  
   // MARK: - Events
-
+  
   override func supportedEvents() -> [String]! {
     [Self.eventFired, Self.eventDismissed, Self.eventSnoozed]
   }
-
+  
   override func startObserving() { hasListeners = true }
   override func stopObserving() { hasListeners = false }
-
+  
   private func emit(_ name: String, _ a: AlarmData) {
     guard hasListeners else { return }
     sendEvent(withName: name, body: [
@@ -77,41 +81,42 @@ final class AlarmModule: RCTEventEmitter {
       "timestamp": AlarmData.now(),
       "title": a.title,
       "body": a.body,
+      "image": a.image ?? "",
       "data": a.data,
     ])
   }
-
+  
   // MARK: - Backend selection
-
+  
   private var useAlarmKit: Bool {
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *) { return AlarmKitBackend.shared.isAuthorized }
-    #endif
+#endif
     return false
   }
-
+  
   private func cancelNative(_ id: String) {
     AlarmRingPresenter.dismiss(id)
     NotificationBackend.shared.cancel(id)
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *) { AlarmKitBackend.shared.cancel(id) }
-    #endif
+#endif
   }
-
+  
   // MARK: - Permissions
-
+  
   /// Same keys as Android's `permissionMap()`. The Android-only flags are always
   /// true here so shared UI code can treat them as granted.
   private func permissionMap(_ done: @escaping ([String: Any]) -> Void) {
     NotificationBackend.shared.status { notifications in
       var status = notifications
       var backend = "notifications"
-      #if canImport(AlarmKit)
+#if canImport(AlarmKit)
       if #available(iOS 26.0, *) {
         status = AlarmKitBackend.shared.status
         backend = "alarmkit"
       }
-      #endif
+#endif
       done([
         "status": status,
         "notifications": status == "granted" || notifications == "granted",
@@ -122,15 +127,15 @@ final class AlarmModule: RCTEventEmitter {
       ])
     }
   }
-
+  
   private func notificationStatus() async -> String {
     await withCheckedContinuation { c in NotificationBackend.shared.status { c.resume(returning: $0) } }
   }
-
+  
   private func requestNotifications() async {
     _ = await withCheckedContinuation { c in NotificationBackend.shared.request { c.resume(returning: $0) } }
   }
-
+  
   /// iOS never re-prompts after a denial, so (like Android for its special
   /// permissions) send the user to the app's Settings page.
   @MainActor private func openSettings() {
@@ -138,16 +143,16 @@ final class AlarmModule: RCTEventEmitter {
       UIApplication.shared.open(url)
     }
   }
-
+  
   @objc(checkPermission:reject:)
   func checkPermission(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     permissionMap { resolve($0) }
   }
-
+  
   @objc(requestPermission:reject:)
   func requestPermission(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     Task {
-      #if canImport(AlarmKit)
+#if canImport(AlarmKit)
       if #available(iOS 26.0, *) {
         let kit = AlarmKitBackend.shared
         if kit.status == "notDetermined" { _ = await kit.requestAuthorization() }
@@ -157,7 +162,7 @@ final class AlarmModule: RCTEventEmitter {
         }
         await self.openSettings()
       }
-      #endif
+#endif
       // Notifications back the fallback path.
       let notifications = await self.notificationStatus()
       if notifications == "notDetermined" {
@@ -168,42 +173,42 @@ final class AlarmModule: RCTEventEmitter {
       self.permissionMap { resolve($0) }
     }
   }
-
+  
   @objc(canScheduleExactAlarms:reject:)
   func canScheduleExactAlarms(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     permissionMap { (map: [String: Any]) in
       resolve((map["canScheduleExact"] as? Bool) ?? false)
     }
   }
-
+  
   /// Android OEM concept; iOS has no such screen.
   @objc(openAutoStartSettings:reject:)
   func openAutoStartSettings(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     resolve(false)
   }
-
+  
   // MARK: - Scheduling
-
+  
   @objc(scheduleAlarm:resolve:reject:)
   func scheduleAlarm(_ config: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     let dict = config as? [String: Any] ?? [:]
     let id = (dict["alarmId"] as? String) ?? UUID().uuidString
     arm(AlarmData.from(config: dict, id: id), code: "E_SCHEDULE", reject: reject) { resolve(id) }
   }
-
+  
   @objc(updateAlarm:config:resolve:reject:)
   func updateAlarm(_ alarmId: String, config: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     guard AlarmStore.get(alarmId) != nil else { return resolve(false) }
     let dict = config as? [String: Any] ?? [:]
     arm(AlarmData.from(config: dict, id: alarmId), code: "E_UPDATE", reject: reject) { resolve(true) }
   }
-
+  
   /// Cancel → persist → schedule, the same sequence as Android.
   private func arm(_ alarm: AlarmData, code: String, reject: @escaping RCTPromiseRejectBlock, done: @escaping () -> Void) {
     cancelNative(alarm.id)
     AlarmStore.save(alarm)
-
-    #if canImport(AlarmKit)
+    
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *), useAlarmKit {
       Task {
         do {
@@ -215,8 +220,8 @@ final class AlarmModule: RCTEventEmitter {
       }
       return
     }
-    #endif
-
+#endif
+    
     NotificationBackend.shared.status { status in
       guard status == "granted" else {
         // Mirrors Android's SecurityException when the exact-alarm permission is missing.
@@ -227,7 +232,7 @@ final class AlarmModule: RCTEventEmitter {
       }
     }
   }
-
+  
   @objc(cancelAlarm:resolve:reject:)
   func cancelAlarm(_ alarmId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     let existed = AlarmStore.get(alarmId) != nil
@@ -235,31 +240,31 @@ final class AlarmModule: RCTEventEmitter {
     AlarmStore.remove(alarmId)
     resolve(existed)
   }
-
+  
   @objc(cancelAllAlarms:reject:)
   func cancelAllAlarms(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     AlarmRingPresenter.dismiss()
     AlarmStore.all().forEach { cancelNative($0.id) }
     NotificationBackend.shared.cancelAll()
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *) { AlarmKitBackend.shared.cancelAll() }
-    #endif
+#endif
     AlarmStore.clear()
     resolve(nil)
   }
-
+  
   // MARK: - Control (while ringing)
-
+  
   @objc(stopAlarm:resolve:reject:)
   func stopAlarm(_ alarmId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     AlarmRingPresenter.dismiss(alarmId)
     NotificationBackend.shared.stop(alarmId)
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *) { AlarmKitBackend.shared.stop(alarmId) }
-    #endif
+#endif
     resolve(nil)
   }
-
+  
   @objc(snoozeAlarm:minutes:resolve:reject:)
   func snoozeAlarm(_ alarmId: String, minutes: Double, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     guard let alarm = AlarmStore.get(alarmId) else {
@@ -267,8 +272,8 @@ final class AlarmModule: RCTEventEmitter {
     }
     let mins = minutes > 0 ? Int(minutes) : alarm.snoozeMinutes
     AlarmRingPresenter.dismiss(alarmId)
-
-    #if canImport(AlarmKit)
+    
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *), useAlarmKit {
       Task {
         do {
@@ -280,36 +285,36 @@ final class AlarmModule: RCTEventEmitter {
       }
       return
     }
-    #endif
-
+#endif
+    
     let wasRinging = NotificationBackend.shared.ringing?.id == alarmId
     NotificationBackend.shared.snooze(alarm, minutes: mins)
     if wasRinging { emit(Self.eventSnoozed, alarm) }
     resolve(nil)
   }
-
+  
   /// The alarm currently ringing (if any), so JS can show the ring UI on launch.
   @objc(getRingingAlarm:reject:)
   func getRingingAlarm(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     var ringing = NotificationBackend.shared.ringing
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *), ringing == nil { ringing = AlarmKitBackend.shared.ringingAlarm() }
-    #endif
+#endif
     resolve(ringing?.toDictionary())
   }
-
+  
   // MARK: - Queries
-
+  
   @objc(getAlarm:resolve:reject:)
   func getAlarm(_ alarmId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     resolve(AlarmStore.get(alarmId)?.toDictionary())
   }
-
+  
   @objc(getAllAlarms:reject:)
   func getAllAlarms(_ resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     resolve(AlarmStore.all().sorted { $0.timestamp < $1.timestamp }.map { $0.toDictionary() })
   }
-
+  
   @objc(isScheduled:resolve:reject:)
   func isScheduled(_ alarmId: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     let a = AlarmStore.get(alarmId)

package/ios/alarm/AlarmRingPresenter.swift

@@ -8,12 +8,15 @@ import UIKit
 /// so this shows when the alarm fires while the app is in the foreground, or when the
 /// user opens the app by tapping the alarm notification.
 final class AlarmRingPresenter {
-  static let componentName = "AlarmRing"
-
+  private static let defaultComponentName = "AlarmRing"
+  
   private static weak var controller: UIViewController?
   private static var alarmId: String?
-
-  static func present(_ alarm: AlarmData, bridge: RCTBridge?, attempt: Int = 0) {
+  
+  static func present(_ alarm: AlarmData, bridge: RCTBridge?,
+                      componentName: String = defaultComponentName,
+                      componentProps: [String: Any] = [:],
+                      attempt: Int = 0) {
     DispatchQueue.main.async {
       if controller != nil, alarmId == alarm.id {
         // Already showing (e.g. presented while backgrounded, now foregrounded):
@@ -23,7 +26,9 @@ final class AlarmRingPresenter {
       }
       // Cold start from a notification tap or the AlarmKit "Open" button: the root
       // surface or window may not be ready yet, so retry for up to ~15 s.
-      guard let surface = makeSurface(bridge, props: alarm.toDictionary()),
+      guard let surface = makeSurface(bridge,
+                                      componentName: componentName,
+                                      props: alarm.toDictionary()),
             let top = topViewController() else {
         if attempt < 60 {
           DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
@@ -34,7 +39,7 @@ final class AlarmRingPresenter {
         }
         return
       }
-
+      
       let vc = UIViewController()
       let root = RCTSurfaceHostingProxyRootView(surface: surface)
       root.backgroundColor = .systemBackground
@@ -42,7 +47,7 @@ final class AlarmRingPresenter {
       surface.start()
       vc.modalPresentationStyle = .fullScreen
       vc.isModalInPresentation = true
-
+      
       let show = {
         top.present(vc, animated: true)
         controller = vc
@@ -56,7 +61,7 @@ final class AlarmRingPresenter {
       }
     }
   }
-
+  
   /// The ring screen speaks the task via TTS, and iOS won't play it over the
   /// notification / AlarmKit sound, so stop that sound once the screen is up.
   /// Only while the app is frontmost: in the background the system alert is the
@@ -64,11 +69,11 @@ final class AlarmRingPresenter {
   private static func silenceIfActive(_ id: String) {
     guard UIApplication.shared.applicationState == .active else { return }
     NotificationBackend.shared.silence(id)
-    #if canImport(AlarmKit)
+#if canImport(AlarmKit)
     if #available(iOS 26.0, *) { AlarmKitBackend.shared.silence(id) }
-    #endif
+#endif
   }
-
+  
   /// Called when ringing ends for any reason (stop, snooze, cancel).
   static func dismiss(_ id: String? = nil) {
     DispatchQueue.main.async {
@@ -78,18 +83,20 @@ final class AlarmRingPresenter {
       vc.dismiss(animated: true)
     }
   }
-
+  
   private static let createSurface = NSSelectorFromString("createFabricSurfaceForModuleName:initialProperties:")
-
+  
   /// `RCTSurfacePresenter` implements `createFabricSurfaceForModuleName:initialProperties:`
   /// without formally adopting `RCTSurfacePresenterStub`, and its header is ObjC++ (not
   /// importable from Swift), so call it by selector.
-  private static func makeSurface(_ bridge: RCTBridge?, props: [String: Any]) -> RCTSurfaceProtocol? {
+  private static func makeSurface(_ bridge: RCTBridge?,
+                                  componentName: String,
+                                  props: [String: Any]) -> RCTSurfaceProtocol? {
     guard let presenter = surfacePresenter(bridge), presenter.responds(to: createSurface) else { return nil }
     return presenter.perform(createSurface, with: componentName, with: props)?
       .takeUnretainedValue() as? RCTSurfaceProtocol
   }
-
+  
   /// Bridgeless mode skips `bridge.surfacePresenter` (and injection) for modules
   /// registered with `RCT_EXTERN_MODULE`, so fall back to the presenter of the app's
   /// root React surface, which `RCTFabricSurface` keeps in a weak `_surfacePresenter` ivar.
@@ -99,10 +106,10 @@ final class AlarmRingPresenter {
           let hosting = findHostingView(in: root),
           let surface = hosting.surface as AnyObject?,
           let ivar = class_getInstanceVariable(type(of: surface), "_surfacePresenter")
-    else { return nil }
+            else { return nil }
     return object_getIvar(surface, ivar) as? NSObject
   }
-
+  
   private static func findHostingView(in view: UIView) -> RCTSurfaceHostingView? {
     if let hosting = view as? RCTSurfaceHostingView { return hosting }
     for sub in view.subviews {
@@ -110,14 +117,14 @@ final class AlarmRingPresenter {
     }
     return nil
   }
-
+  
   private static func keyWindow() -> UIWindow? {
     UIApplication.shared.connectedScenes
       .compactMap { $0 as? UIWindowScene }
       .flatMap { $0.windows }
       .first { $0.isKeyWindow }
   }
-
+  
   private static func topViewController() -> UIViewController? {
     var top = keyWindow()?.rootViewController
     while let presented = top?.presentedViewController { top = presented }

package/ios/alarm/AlarmStore.swift

@@ -4,45 +4,45 @@ import Foundation
 enum AlarmStore {
   private static let key = "RNAlarm.alarms"
   private static let lock = NSLock()
-
+  
   static func all() -> [AlarmData] {
     lock.lock(); defer { lock.unlock() }
     return Array(load().values)
   }
-
+  
   static func get(_ id: String) -> AlarmData? {
     lock.lock(); defer { lock.unlock() }
     return load()[id]
   }
-
+  
   static func save(_ alarm: AlarmData) {
     lock.lock(); defer { lock.unlock() }
     var map = load()
     map[alarm.id] = alarm
     persist(map)
   }
-
+  
   static func remove(_ id: String) {
     lock.lock(); defer { lock.unlock() }
     var map = load()
     map.removeValue(forKey: id)
     persist(map)
   }
-
+  
   static func clear() {
     lock.lock(); defer { lock.unlock() }
     persist([:])
   }
-
+  
   // MARK: - Private
-
+  
   private static func load() -> [String: AlarmData] {
     guard let data = UserDefaults.standard.data(forKey: key),
           let map = try? JSONDecoder().decode([String: AlarmData].self, from: data)
-    else { return [:] }
+            else { return [:] }
     return map
   }
-
+  
   private static func persist(_ map: [String: AlarmData]) {
     if let data = try? JSONEncoder().encode(map) {
       UserDefaults.standard.set(data, forKey: key)