react-native-alarms 0.0.3 → 0.0.5

package/ios/alarm/NotificationBackend.swift

@@ -7,6 +7,7 @@ import UserNotifications
 /// Limitations compared with a real alarm: sound plays for at most ~30 s, the
 /// silent switch and Focus modes are respected, and `interval` repeats are
 /// pre-scheduled as a batch of exact one-off notifications (see `schedule`).
+@objc(RNAlarmNotificationBackend)
 final class NotificationBackend: NSObject, UNUserNotificationCenterDelegate {
   static let shared = NotificationBackend()
 
@@ -24,11 +25,23 @@ final class NotificationBackend: NSObject, UNUserNotificationCenterDelegate {
   /// Wired by `AlarmModule` so native events reach JS.
   var onEvent: ((String, AlarmData) -> Void)?
 
+  /// Delegate that was installed before us (e.g. Notifee); non-alarm notifications go to it.
+  private weak var previousDelegate: UNUserNotificationCenterDelegate?
+  private static var installed = false
+
   /// Installs the delegate and actions. Call once at launch so a tap on a
   /// notification that starts the app is delivered to the module.
-  static func install() {
+  @objc static func install() {
     let center = UNUserNotificationCenter.current()
-    if center.delegate == nil { center.delegate = shared }
+    // Only once: a library that took over after us forwards to us, and taking the
+    // delegate back would make the two forward to each other forever.
+    if !installed {
+      installed = true
+      if center.delegate !== shared {
+        shared.previousDelegate = center.delegate
+        center.delegate = shared
+      }
+    }
     let snooze = UNNotificationAction(identifier: actionSnooze, title: "Snooze", options: [])
     let stop = UNNotificationAction(identifier: actionStop, title: "Stop", options: [.destructive])
     center.setNotificationCategories([
@@ -156,6 +169,12 @@ final class NotificationBackend: NSObject, UNUserNotificationCenterDelegate {
     if ringing?.id == a.id { ringing = nil }
   }
 
+  /// Stops the notification's sound (by clearing the delivered notification) while the
+  /// in-app ring screen takes over; `ringing` stays set so the session is still live.
+  func silence(_ id: String) {
+    center.removeDeliveredNotifications(withIdentifiers: ids(for: id))
+  }
+
   func cancel(_ id: String) {
     center.removePendingNotificationRequests(withIdentifiers: ids(for: id))
     center.removeDeliveredNotifications(withIdentifiers: ids(for: id))
@@ -196,11 +215,19 @@ final class NotificationBackend: NSObject, UNUserNotificationCenterDelegate {
     willPresent notification: UNNotification,
     withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void
   ) {
-    if let a = alarm(from: notification) {
-      ringing = a
-      onEvent?(AlarmModule.eventFired, a)
+    guard let a = alarm(from: notification) else {
+      if let previous = previousDelegate,
+         previous.responds(to: #selector(UNUserNotificationCenterDelegate.userNotificationCenter(_:willPresent:withCompletionHandler:))) {
+        previous.userNotificationCenter?(center, willPresent: notification, withCompletionHandler: completionHandler)
+      } else {
+        completionHandler([.banner, .list, .sound])
+      }
+      return
     }
-    completionHandler([.banner, .list, .sound])
+    ringing = a
+    onEvent?(AlarmModule.eventFired, a)
+    // The ring screen takes over; keep the sound but skip the banner when it can show.
+    completionHandler(onEvent == nil ? [.banner, .list, .sound] : [.list, .sound])
   }
 
   func userNotificationCenter(
@@ -208,8 +235,16 @@ final class NotificationBackend: NSObject, UNUserNotificationCenterDelegate {
     didReceive response: UNNotificationResponse,
     withCompletionHandler completionHandler: @escaping () -> Void
   ) {
+    guard let a = alarm(from: response.notification) else {
+      if let previous = previousDelegate,
+         previous.responds(to: #selector(UNUserNotificationCenterDelegate.userNotificationCenter(_:didReceive:withCompletionHandler:))) {
+        previous.userNotificationCenter?(center, didReceive: response, withCompletionHandler: completionHandler)
+      } else {
+        completionHandler()
+      }
+      return
+    }
     defer { completionHandler() }
-    guard let a = alarm(from: response.notification) else { return }
     switch response.actionIdentifier {
     case Self.actionSnooze:
       snooze(a, minutes: a.snoozeMinutes)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-alarms",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A powerful, cross-platform alarm management library for React Native",
   "private": false,
   "main": "index.ts",
@@ -13,7 +13,8 @@
     "./service": {
       "types": "./AlarmService.d.ts",
       "default": "./AlarmService.ts"
-    }
+    },
+    "./package.json": "./package.json"
   },
   "scripts": {
     "android": "react-native run-android",
@@ -45,13 +46,10 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "react": ">=18.0.0",
-    "react-native": ">=0.70.0"
+    "react": "*",
+    "react-native": "*"
   },
   "dependencies": {
-    "react": "19.3.0",
-    "react-native": "0.88.0",
-    "@react-native/new-app-screen": "0.88.0",
     "react-native-safe-area-context": "^5.5.2"
   },
   "devDependencies": {
@@ -72,23 +70,12 @@
     "eslint": "^8.19.0",
     "jest": "^29.6.3",
     "prettier": "2.8.8",
+    "react": "19.3.0",
+    "react-native": "0.88.0",
     "react-test-renderer": "19.3.0",
     "typescript": "^6.0.3"
   },
   "engines": {
     "node": ">= 22.11.0"
-  },
-  "codegenConfig": {
-    "name": "RNAlarmSpec",
-    "type": "modules",
-    "jsSrcsDir": "specs",
-    "android": {
-      "javaPackageName": "com.reactnativealarm.alarm"
-    },
-    "ios": {
-      "modulesProvider": {
-        "Alarm": "Alarm"
-      }
-    }
   }
 }

package/react-native-alarms.podspec

@@ -0,0 +1,20 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |s|
+  s.name         = 'react-native-alarms'
+  s.version      = package['version']
+  s.summary      = package['description']
+  s.license      = package['license']
+  s.authors      = package['author']['name']
+  s.homepage     = package['repository']['url']
+  s.source       = { :git => package['repository']['url'], :tag => "v#{s.version}" }
+
+  s.platforms    = { :ios => '15.0' }
+  s.swift_version = '5.9'
+  s.source_files = 'ios/alarm/**/*.{h,m,mm,swift}'
+  s.frameworks   = 'UserNotifications', 'UIKit'
+
+  install_modules_dependencies(s)
+end

package/react-native.config.js

@@ -0,0 +1,16 @@
+// Autolinking config for apps that install this package. The root android/ folder is
+// the example app, so Android points at android-lib/ instead.
+module.exports = {
+  dependency: {
+    platforms: {
+      android: {
+        sourceDir: './android-lib',
+        packageImportPath: 'import com.reactnativealarms.RNAlarmsPackage;',
+        packageInstance: 'new RNAlarmsPackage()',
+      },
+      ios: {
+        podspecPath: './react-native-alarms.podspec',
+      },
+    },
+  },
+};

package/specs/NativeAlarm.ts

@@ -1,5 +1,5 @@
 import type { TurboModule } from 'react-native';
-import { TurboModuleRegistry } from 'react-native';
+import { NativeModules, Platform, TurboModuleRegistry } from 'react-native';
 
 /**
  * Shared contract of the native `Alarm` module.
@@ -92,4 +92,22 @@ export interface Spec extends TurboModule {
   removeListeners(count: number): void;
 }
 
-export default TurboModuleRegistry.getEnforcing<Spec>('Alarm');
+const LINKING_ERROR =
+  "react-native-alarms: the native 'Alarm' module is not linked. " +
+  Platform.select({
+    ios: "Run 'pod install' in the ios folder, then rebuild the app.",
+    default: 'Rebuild the app after installing the package.',
+  });
+
+// Both platforms register a legacy module, reachable through either registry
+// depending on the architecture. Throw on first use, not on import.
+const Alarm: Spec =
+  TurboModuleRegistry.get<Spec>('Alarm') ??
+  NativeModules.Alarm ??
+  new Proxy({} as Spec, {
+    get() {
+      throw new Error(LINKING_ERROR);
+    },
+  });
+
+export default Alarm;

package/app.json

@@ -1,4 +0,0 @@
-{
-  "name": "ReactNativeAlarm",
-  "displayName": "ReactNativeAlarm"
-}

package/index.js

@@ -1,12 +0,0 @@
-/**
- * @format
- */
-
-import { AppRegistry } from 'react-native';
-import App from './App';
-import { name as appName } from './app.json';
-import { AlarmRingScreen } from './AlarmRingScreen';
-
-AppRegistry.registerComponent(appName, () => App);
-
-AppRegistry.registerComponent('AlarmRing', () => AlarmRingScreen);