expo-notifications 0.30.0 → 0.30.1-canary-20250408-7f0ab53

package/CHANGELOG.md

@@ -14,6 +14,12 @@
 
 ### 🐛 Bug fixes
 
+- remove unneeded Long conversions on Android ([#35976](https://github.com/expo/expo/pull/35976) by [@vonovak](https://github.com/vonovak))
+- [post-swift-conversion] fix data serialization ([#35975](https://github.com/expo/expo/pull/35975) by [@vonovak](https://github.com/vonovak))
+- simplify push token event management ([#35944](https://github.com/expo/expo/pull/35944) by [@vonovak](https://github.com/vonovak))
+- fix Android `NotificationContent` not containing JSON data object ([#35942](https://github.com/expo/expo/pull/35942) by [@vonovak](https://github.com/vonovak))
+- [post-swift-conversion] fix regressions in `CalendarTriggerRecord` ([#35937](https://github.com/expo/expo/pull/35937) by [@vonovak](https://github.com/vonovak))
+- remove deprecated `presentNotificationAsync` ([#35900](https://github.com/expo/expo/pull/35900) by [@vonovak](https://github.com/vonovak))
 - [post-swift-conversion] UNTextInputNotificationAction wasn't provided with options ([#35903](https://github.com/expo/expo/pull/35903) by [@vonovak](https://github.com/vonovak))
 - [post-swift-conversion] event emitter should not influence notification presentation ([#35858](https://github.com/expo/expo/pull/35858) by [@vonovak](https://github.com/vonovak))
 - correctly serialize `null` trigger on iOS ([#35672](https://github.com/expo/expo/pull/35672) by [@vonovak](https://github.com/vonovak))

package/README.md

@@ -350,7 +350,6 @@ The following methods are exported by the `expo-notifications` module:
   - [`setBadgeCountAsync`](#setbadgecountasyncbadgecount-number-options-setbadgecountoptions-promiseboolean) -- sets the application badge number value
 - **scheduling notifications**
   - [`getAllScheduledNotificationsAsync`](#getallschedulednotificationsasync-promisenotification) -- fetches information about all scheduled notifications
-  - [`presentNotificationAsync`](#presentnotificationasynccontent-notificationcontentinput-identifier-string-promisestring) -- schedules a notification for immediate trigger
   - [`scheduleNotificationAsync`](#schedulenotificationasyncnotificationrequest-notificationrequestinput-promisestring) -- schedules a notification to be triggered in the future
   - [`cancelScheduledNotificationAsync`](#cancelschedulednotificationasyncidentifier-string-promisevoid) -- removes a specific scheduled notification
   - [`cancelAllScheduledNotificationsAsync`](#cancelallschedulednotificationsasync-promisevoid) -- removes all scheduled notifications
@@ -901,12 +900,6 @@ Fetches information about all scheduled notifications.
 
 It returns a `Promise` resolving to an array of objects conforming to the [`Notification`](#notification) interface.
 
-### `presentNotificationAsync(content: NotificationContentInput, identifier?: string): Promise<string>`
-
-Schedules a notification for immediate trigger.
-
-> **Note:** This method has been deprecated in favor of using an explicit `NotificationHandler` and the `scheduleNotificationAsync` method. More info may be found at https://expo.fyi/presenting-notifications-deprecated.
-
 #### Arguments
 
 The only argument to this function is a [`NotificationContentInput`](#notificationcontentinput).
@@ -917,18 +910,7 @@ It returns a `Promise` resolving with the notification's identifier once the not
 
 #### Examples
 
-##### Presenting the notification to the user (deprecated way)
-
-```ts
-import * as Notifications from 'expo-notifications';
-
-Notifications.presentNotificationAsync({
-  title: 'Look at that notification',
-  body: "I'm so proud of myself!",
-});
-```
-
-##### Presenting the notification to the user (recommended way)
+##### Presenting the notification to the user
 
 ```ts
 import * as Notifications from 'expo-notifications';
@@ -1415,7 +1397,7 @@ export type NotificationContent = {
 
 ### `NotificationContentInput`
 
-An object representing notification content that you pass in to `presentNotificationAsync` or as a part of `NotificationRequestInput`.
+An object representing notification content that you pass as a part of `NotificationRequestInput`.
 
 ```ts
 export interface NotificationContentInput {

package/android/build.gradle

@@ -5,13 +5,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '0.30.0'
+version = '0.30.1-canary-20250408-7f0ab53'
 
 android {
   namespace "expo.modules.notifications"
   defaultConfig {
     versionCode 21
-    versionName '0.30.0'
+    versionName '0.30.1-canary-20250408-7f0ab53'
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
 

package/android/src/main/java/expo/modules/notifications/NotificationsPackage.java

@@ -14,7 +14,6 @@ import expo.modules.notifications.notifications.NotificationManager;
 import expo.modules.notifications.notifications.categories.serializers.ExpoNotificationsCategoriesSerializer;
 import expo.modules.notifications.notifications.channels.AndroidXNotificationsChannelsProvider;
 import expo.modules.notifications.service.delegates.ExpoNotificationLifecycleListener;
-import expo.modules.notifications.tokens.PushTokenManager;
 
 public class NotificationsPackage extends BasePackage {
 
@@ -27,7 +26,6 @@ public class NotificationsPackage extends BasePackage {
   @Override
   public List<SingletonModule> createSingletonModules(Context context) {
     return Arrays.asList(
-      new PushTokenManager(),
       mNotificationManager
     );
   }

package/android/src/main/java/expo/modules/notifications/Utils.kt

@@ -86,7 +86,7 @@ internal val isBundleConvertibleToJSValue: BundleConversionTester = { bundle: Bu
 /**
  * Returns true if the argument is a valid JSON string, false otherwise
  */
-internal fun isValidJSONString(test: Any?): Boolean {
+internal fun isValidJSONString(test: String?): Boolean {
   when (test is String) {
     true -> {
       try {

package/android/src/main/java/expo/modules/notifications/notifications/NotificationSerializer.java

@@ -2,6 +2,7 @@ package expo.modules.notifications.notifications;
 
 import static expo.modules.notifications.UtilsKt.filteredBundleForJSTypeConverter;
 import static expo.modules.notifications.UtilsKt.isValidJSONString;
+import static expo.modules.notifications.notifications.model.NotificationResponse.DEFAULT_ACTION_IDENTIFIER;
 
 import android.os.Bundle;
 
@@ -31,12 +32,6 @@ import expo.modules.notifications.notifications.model.TextInputNotificationRespo
 import expo.modules.notifications.notifications.model.triggers.FirebaseNotificationTrigger;
 
 import expo.modules.notifications.notifications.triggers.ChannelAwareTrigger;
-import expo.modules.notifications.notifications.triggers.DailyTrigger;
-import expo.modules.notifications.notifications.triggers.DateTrigger;
-import expo.modules.notifications.notifications.triggers.MonthlyTrigger;
-import expo.modules.notifications.notifications.triggers.TimeIntervalTrigger;
-import expo.modules.notifications.notifications.triggers.WeeklyTrigger;
-import expo.modules.notifications.notifications.triggers.YearlyTrigger;
 
 public class NotificationSerializer {
   public static Bundle toBundle(NotificationResponse response) {
@@ -64,14 +59,13 @@ public class NotificationSerializer {
     Bundle content = toBundle(request.getContent());
     Bundle existingContentData = content.getBundle("data");
     if (existingContentData == null) {
-      if(requestTrigger instanceof FirebaseNotificationTrigger trigger) {
+      if (requestTrigger instanceof FirebaseNotificationTrigger trigger) {
         RemoteMessage message = trigger.getRemoteMessage();
-        RemoteMessage.Notification notification = message.getNotification();
         Map<String, String> data = message.getData();
         String dataBody = data.get("body");
-        String notificationBody = notification != null ? notification.getBody() : null;
-        if (isValidJSONString(dataBody) && notificationBody != null && notificationBody.equals(data.get("message"))) {
-          // Expo sends notification.body as data.message, and JSON stringifies data.body
+        if (isValidJSONString(dataBody)) {
+          // If the body is a JSON object string, the notification was sent by the Expo notification service,
+          // so we do the expected remapping of fields (we JSON-parse the string into an object in JS)
           content.putString("dataString", dataBody);
         } else {
           // The message was sent directly from Firebase or some other service,
@@ -127,7 +121,7 @@ public class NotificationSerializer {
       serializedContent.putString("priority", content.getPriority().getEnumValue());
     }
     if (content.getVibrationPattern() != null) {
-      serializedContent.putIntArray("vibrationPattern", RemoteMessageSerializer.intArrayFromLongArray(content.getVibrationPattern()));
+      serializedContent.putLongArray("vibrationPattern", content.getVibrationPattern());
     }
     serializedContent.putBoolean("autoDismiss", content.isAutoDismiss());
     if (content.getCategoryId() != null) {
@@ -196,9 +190,8 @@ public class NotificationSerializer {
     serializedContent.putString("title", extras.getString("title"));
     String body = extras.getString("body");
     if (isValidJSONString(body) ) {
-      // If the body is a JSON string,
-      // the notification was sent by the Expo notification service,
-      // so we do the expected remapping of fields
+      // If the body is a JSON object string, the notification was sent by the Expo notification service,
+      // so we do the expected remapping of fields (we JSON-parse the string into an object in JS)
       serializedContent.putString("dataString", body);
       serializedContent.putString("body", extras.getString("message"));
     } else {
@@ -222,7 +215,7 @@ public class NotificationSerializer {
     serializedNotification.putBundle("request", serializedRequest);
 
     Bundle serializedResponse = new Bundle();
-    serializedResponse.putString("actionIdentifier", "expo.modules.notifications.actions.DEFAULT");
+    serializedResponse.putString("actionIdentifier", DEFAULT_ACTION_IDENTIFIER);
     serializedResponse.putBundle("notification", serializedNotification);
 
     return serializedResponse;

package/android/src/main/java/expo/modules/notifications/notifications/RemoteMessageSerializer.java

@@ -95,7 +95,7 @@ public class RemoteMessageSerializer {
     serializedNotification.putStringArray("titleLocalizationArgs", notification.getTitleLocalizationArgs());
     serializedNotification.putString("titleLocalizationKey", notification.getTitleLocalizationKey());
     if (notification.getVibrateTimings() != null) {
-      serializedNotification.putIntArray("vibrateTimings", intArrayFromLongArray(notification.getVibrateTimings()));
+      serializedNotification.putLongArray("vibrateTimings", notification.getVibrateTimings());
     }
     if (notification.getVisibility() != null) {
       serializedNotification.putInt("visibility", notification.getVisibility());
@@ -104,12 +104,4 @@ public class RemoteMessageSerializer {
     }
     return serializedNotification;
   }
-
-  public static int[] intArrayFromLongArray(long[] longArray) {
-    int[] intArray = new int[longArray.length];
-    for (int i = 0; i < longArray.length; i++) {
-      intArray[i] = (int)(longArray[i]);
-    }
-    return intArray;
-  }
 }

package/android/src/main/java/expo/modules/notifications/notifications/channels/serializers/ExpoNotificationsChannelSerializer.java

@@ -38,7 +38,7 @@ public class ExpoNotificationsChannelSerializer implements NotificationsChannelS
     result.putBoolean(SHOW_BADGE_KEY, channel.canShowBadge());
     result.putString(SOUND_KEY, toString(channel.getSound()));
     result.putBundle(SOUND_AUDIO_ATTRIBUTES_KEY, toBundle(channel.getAudioAttributes()));
-    result.putDoubleArray(VIBRATION_PATTERN_KEY, toArray(channel.getVibrationPattern()));
+    result.putLongArray(VIBRATION_PATTERN_KEY, channel.getVibrationPattern());
     result.putBoolean(ENABLE_LIGHTS_KEY, channel.shouldShowLights());
     result.putBoolean(ENABLE_VIBRATE_KEY, channel.shouldVibrate());
     return result;
@@ -85,17 +85,4 @@ public class ExpoNotificationsChannelSerializer implements NotificationsChannelS
 
     return result;
   }
-
-  @Nullable
-  private double[] toArray(@Nullable long[] array) {
-    if (array == null) {
-      return null;
-    }
-
-    double[] result = new double[array.length];
-    for (int i = 0; i < array.length; i++) {
-      result[i] = array[i];
-    }
-    return result;
-  }
 }

package/android/src/main/java/expo/modules/notifications/notifications/presentation/ExpoNotificationPresentationModule.kt

@@ -2,24 +2,18 @@ package expo.modules.notifications.notifications.presentation
 
 import android.content.Context
 import android.os.Bundle
-import expo.modules.core.arguments.ReadableArguments
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.exception.Exceptions
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.notifications.ResultReceiverBody
 import expo.modules.notifications.createDefaultResultReceiver
-import expo.modules.notifications.notifications.ArgumentsNotificationContentBuilder
 import expo.modules.notifications.notifications.NotificationSerializer
-import expo.modules.notifications.notifications.interfaces.INotificationContent
-import expo.modules.notifications.notifications.interfaces.NotificationTrigger
 import expo.modules.notifications.notifications.model.Notification
-import expo.modules.notifications.notifications.model.NotificationRequest
 import expo.modules.notifications.service.NotificationsService
 import expo.modules.notifications.service.NotificationsService.Companion.dismiss
 import expo.modules.notifications.service.NotificationsService.Companion.dismissAll
 import expo.modules.notifications.service.NotificationsService.Companion.getAllPresented
-import expo.modules.notifications.service.NotificationsService.Companion.present
 
 open class ExpoNotificationPresentationModule : Module() {
   private val context: Context
@@ -31,25 +25,6 @@ open class ExpoNotificationPresentationModule : Module() {
   override fun definition() = ModuleDefinition {
     Name("ExpoNotificationPresenter")
 
-    AsyncFunction("presentNotificationAsync") { identifier: String, payload: ReadableArguments, promise: Promise ->
-      val content = ArgumentsNotificationContentBuilder(context).setPayload(payload).build()
-      val request = createNotificationRequest(identifier, content, null)
-      val notification = Notification(request)
-      present(
-        context,
-        notification,
-        null,
-        createResultReceiver { resultCode: Int, resultData: Bundle? ->
-          if (resultCode == NotificationsService.SUCCESS_CODE) {
-            promise.resolve(identifier)
-          } else {
-            val e = resultData?.getSerializable(NotificationsService.EXCEPTION_KEY) as? Exception
-            promise.reject("ERR_NOTIFICATION_PRESENTATION_FAILED", "Notification could not be presented.", e)
-          }
-        }
-      )
-    }
-
     AsyncFunction("getPresentedNotificationsAsync") { promise: Promise ->
       getAllPresented(
         context,
@@ -99,14 +74,6 @@ open class ExpoNotificationPresentationModule : Module() {
     )
   }
 
-  protected open fun createNotificationRequest(
-    identifier: String,
-    content: INotificationContent,
-    trigger: NotificationTrigger?
-  ): NotificationRequest {
-    return NotificationRequest(identifier, content, null)
-  }
-
   protected open fun serializeNotifications(notifications: Collection<Notification>): List<Bundle> {
     return notifications.map(NotificationSerializer::toBundle)
   }

package/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.kt

@@ -288,7 +288,7 @@ open class ExpoNotificationBuilder(
         val requestPriorityValue =
           requestPriority?.nativeValue ?: NotificationPriority.DEFAULT.nativeValue
 
-        // TODO (barthap): This is going to be a dead code upon removing presentNotificationAsync()
+        // TODO (barthap, vonovak): This is going to be a dead code upon removing presentNotificationAsync()
         // shouldShowAlert() will always be false here.
         return if (notificationBehavior.shouldShowAlert()) {
           // Display as a heads-up notification, as per the behavior

package/android/src/main/java/expo/modules/notifications/service/delegates/FirebaseMessagingDelegate.kt

@@ -49,8 +49,8 @@ open class FirebaseMessagingDelegate(protected val context: Context) : FirebaseM
       if (!sTokenListenersReferences.containsKey(listener)) {
         sTokenListenersReferences[listener] = WeakReference(listener)
         // Since it's a new listener and we know of a last valid token, let's let them know.
-        if (sLastToken != null) {
-          listener.onNewToken(sLastToken)
+        sLastToken?.let {
+          listener.onNewToken(it)
         }
       }
     }

package/android/src/main/java/expo/modules/notifications/tokens/PushTokenModule.kt

@@ -1,43 +1,43 @@
 package expo.modules.notifications.tokens
 
-import android.os.Bundle
 import com.google.firebase.messaging.FirebaseMessaging
-import expo.modules.core.interfaces.services.EventEmitter
 import expo.modules.kotlin.Promise
 import expo.modules.kotlin.modules.Module
 import expo.modules.kotlin.modules.ModuleDefinition
-import expo.modules.notifications.ModuleNotFoundException
-import expo.modules.notifications.tokens.interfaces.PushTokenListener
-import expo.modules.notifications.tokens.interfaces.PushTokenManager
+import expo.modules.notifications.service.delegates.FirebaseMessagingDelegate.Companion.addTokenListener
+import expo.modules.notifications.tokens.interfaces.FirebaseTokenListener
 
 private const val NEW_TOKEN_EVENT_NAME = "onDevicePushToken"
 private const val NEW_TOKEN_EVENT_TOKEN_KEY = "devicePushToken"
 private const val REGISTRATION_FAIL_CODE = "E_REGISTRATION_FAILED"
 private const val UNREGISTER_FOR_NOTIFICATIONS_FAIL_CODE = "E_UNREGISTER_FOR_NOTIFICATIONS_FAILED"
 
-class PushTokenModule : Module(), PushTokenListener {
-  private val tokenManager: PushTokenManager? get() = appContext.legacyModuleRegistry
-    .getSingletonModule("PushTokenManager", PushTokenManager::class.java)
-  private var eventEmitter: EventEmitter? = null
+class PushTokenModule : Module(), FirebaseTokenListener {
+
+  init {
+    addTokenListener(this@PushTokenModule)
+  }
+
+  /**
+   * Callback called when [FirebaseMessagingDelegate] gets notified of a new token.
+   * Emits a [NEW_TOKEN_EVENT_NAME] event.
+   *
+   * @param token New push token.
+   */
+  override fun onNewToken(token: String) {
+    sendEvent(
+      NEW_TOKEN_EVENT_NAME,
+      mapOf(
+        NEW_TOKEN_EVENT_TOKEN_KEY to token
+      )
+    )
+  }
 
   override fun definition() = ModuleDefinition {
     Name("ExpoPushTokenManager")
 
     Events("onDevicePushToken")
 
-    OnCreate {
-      eventEmitter = appContext.legacyModule()
-        ?: throw ModuleNotFoundException(EventEmitter::class)
-
-      // Register the module as a listener in PushTokenManager singleton module.
-      // Deregistration happens in onDestroy callback.
-      tokenManager?.addListener(this@PushTokenModule)
-    }
-
-    OnDestroy {
-      tokenManager?.removeListener(this@PushTokenModule)
-    }
-
     /**
      * Fetches Firebase push token and resolves the promise.
      *
@@ -88,18 +88,4 @@ class PushTokenModule : Module(), PushTokenListener {
       null
     }
   }
-
-  /**
-   * Callback called when [PushTokenManager] gets notified of a new token.
-   * Emits a [NEW_TOKEN_EVENT_NAME] event.
-   *
-   * @param token New push token.
-   */
-  override fun onNewToken(token: String) {
-    eventEmitter?.let {
-      val eventBody = Bundle()
-      eventBody.putString(NEW_TOKEN_EVENT_TOKEN_KEY, token)
-      it.emit(NEW_TOKEN_EVENT_NAME, eventBody)
-    }
-  }
 }

package/android/src/main/java/expo/modules/notifications/tokens/interfaces/FirebaseTokenListener.kt

@@ -0,0 +1,14 @@
+package expo.modules.notifications.tokens.interfaces
+
+/**
+ * Interface used to register in [NotificationsService]
+ * and be notified of new device push tokens.
+ */
+interface FirebaseTokenListener {
+  /**
+   * Callback called when new push token is generated.
+   *
+   * @param token New push token
+   */
+  fun onNewToken(token: String)
+}

package/build/NotificationPresenterModule.types.d.ts

@@ -1,8 +1,7 @@
 import { ProxyNativeModule } from 'expo-modules-core';
-import { Notification, NotificationContentInput } from './Notifications.types';
+import { Notification } from './Notifications.types';
 export interface NotificationPresenterModule extends ProxyNativeModule {
     getPresentedNotificationsAsync?: () => Promise<Notification[]>;
-    presentNotificationAsync?: (identifier: string, content: NotificationContentInput) => Promise<string>;
     dismissNotificationAsync?: (identifier: string) => Promise<void>;
     dismissAllNotificationsAsync?: () => Promise<void>;
 }

package/build/NotificationPresenterModule.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationPresenterModule.types.d.ts","sourceRoot":"","sources":["../src/NotificationPresenterModule.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAE/E,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,8BAA8B,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CACzB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,wBAAwB,KAC9B,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,wBAAwB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,4BAA4B,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"}
+{"version":3,"file":"NotificationPresenterModule.types.d.ts","sourceRoot":"","sources":["../src/NotificationPresenterModule.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,8BAA8B,CAAC,EAAE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAC/D,wBAAwB,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACjE,4BAA4B,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD"}

package/build/NotificationPresenterModule.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationPresenterModule.types.js","sourceRoot":"","sources":["../src/NotificationPresenterModule.types.ts"],"names":[],"mappings":"","sourcesContent":["import { ProxyNativeModule } from 'expo-modules-core';\n\nimport { Notification, NotificationContentInput } from './Notifications.types';\n\nexport interface NotificationPresenterModule extends ProxyNativeModule {\n  getPresentedNotificationsAsync?: () => Promise<Notification[]>;\n  presentNotificationAsync?: (\n    identifier: string,\n    content: NotificationContentInput\n  ) => Promise<string>;\n  dismissNotificationAsync?: (identifier: string) => Promise<void>;\n  dismissAllNotificationsAsync?: () => Promise<void>;\n}\n"]}
+{"version":3,"file":"NotificationPresenterModule.types.js","sourceRoot":"","sources":["../src/NotificationPresenterModule.types.ts"],"names":[],"mappings":"","sourcesContent":["import { ProxyNativeModule } from 'expo-modules-core';\n\nimport { Notification } from './Notifications.types';\n\nexport interface NotificationPresenterModule extends ProxyNativeModule {\n  getPresentedNotificationsAsync?: () => Promise<Notification[]>;\n  dismissNotificationAsync?: (identifier: string) => Promise<void>;\n  dismissAllNotificationsAsync?: () => Promise<void>;\n}\n"]}

package/build/NotificationScheduler.types.d.ts

@@ -1,18 +1,5 @@
 import { ProxyNativeModule } from 'expo-modules-core';
 import { NotificationRequest, NotificationContentInput } from './Notifications.types';
-type CalendarTriggerInputValue = {
-    timezone?: string;
-    year?: number;
-    month?: number;
-    weekday?: number;
-    weekOfMonth?: number;
-    weekOfYear?: number;
-    weekdayOrdinal?: number;
-    day?: number;
-    hour?: number;
-    minute?: number;
-    second?: number;
-};
 export interface NotificationSchedulerModule extends ProxyNativeModule {
     getAllScheduledNotificationsAsync?: () => Promise<NotificationRequest[]>;
     scheduleNotificationAsync?: (identifier: string, notificationContent: NotificationContentInput, trigger: NativeNotificationTriggerInput) => Promise<string>;
@@ -28,7 +15,17 @@ export interface NativeCalendarTriggerInput {
     type: 'calendar';
     channelId?: string;
     repeats?: boolean;
-    value: CalendarTriggerInputValue;
+    timezone?: string;
+    year?: number;
+    month?: number;
+    weekday?: number;
+    weekOfMonth?: number;
+    weekOfYear?: number;
+    weekdayOrdinal?: number;
+    day?: number;
+    hour?: number;
+    minute?: number;
+    second?: number;
 }
 export interface NativeTimeIntervalTriggerInput {
     type: 'timeInterval';
@@ -70,5 +67,4 @@ export interface NativeDateTriggerInput {
     timestamp: number;
 }
 export type NativeNotificationTriggerInput = null | NativeChannelAwareTriggerInput | NativeDateTriggerInput | NativeCalendarTriggerInput | NativeTimeIntervalTriggerInput | NativeDailyTriggerInput | NativeWeeklyTriggerInput | NativeMonthlyTriggerInput | NativeYearlyTriggerInput;
-export {};
 //# sourceMappingURL=NotificationScheduler.types.d.ts.map

package/build/NotificationScheduler.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationScheduler.types.d.ts","sourceRoot":"","sources":["../src/NotificationScheduler.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,EAAE,mBAAmB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEtF,KAAK,yBAAyB,GAAG;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,2BAA4B,SAAQ,iBAAiB;IACpE,iCAAiC,CAAC,EAAE,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAAC;IACzE,yBAAyB,CAAC,EAAE,CAC1B,UAAU,EAAE,MAAM,EAClB,mBAAmB,EAAE,wBAAwB,EAC7C,OAAO,EAAE,8BAA8B,KACpC,OAAO,CAAC,MAAM,CAAC,CAAC;IACrB,gCAAgC,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACzE,oCAAoC,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3D,uBAAuB,CAAC,EAAE,CAAC,OAAO,EAAE,8BAA8B,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACxF;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,UAAU,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,yBAAyB,CAAC;CAClC;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,OAAO,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,IAAI,EAAE,SAAS,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,MAAM,8BAA8B,GACtC,IAAI,GACJ,8BAA8B,GAC9B,sBAAsB,GACtB,0BAA0B,GAC1B,8BAA8B,GAC9B,uBAAuB,GACvB,wBAAwB,GACxB,yBAAyB,GACzB,wBAAwB,CAAC"}
+{"version":3,"file":"NotificationScheduler.types.d.ts","sourceRoot":"","sources":["../src/NotificationScheduler.types.ts"],"names":[],"mappings":"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"}

package/build/NotificationScheduler.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationScheduler.types.js","sourceRoot":"","sources":["../src/NotificationScheduler.types.ts"],"names":[],"mappings":"","sourcesContent":["import { ProxyNativeModule } from 'expo-modules-core';\n\nimport { NotificationRequest, NotificationContentInput } from './Notifications.types';\n\ntype CalendarTriggerInputValue = {\n  timezone?: string;\n  year?: number;\n  month?: number;\n  weekday?: number;\n  weekOfMonth?: number;\n  weekOfYear?: number;\n  weekdayOrdinal?: number;\n  day?: number;\n  hour?: number;\n  minute?: number;\n  second?: number;\n};\n\nexport interface NotificationSchedulerModule extends ProxyNativeModule {\n  getAllScheduledNotificationsAsync?: () => Promise<NotificationRequest[]>;\n  scheduleNotificationAsync?: (\n    identifier: string,\n    notificationContent: NotificationContentInput,\n    trigger: NativeNotificationTriggerInput\n  ) => Promise<string>;\n  cancelScheduledNotificationAsync?: (identifier: string) => Promise<void>;\n  cancelAllScheduledNotificationsAsync?: () => Promise<void>;\n  getNextTriggerDateAsync?: (trigger: NativeNotificationTriggerInput) => Promise<number>;\n}\n\nexport interface NativeChannelAwareTriggerInput {\n  type: 'channel';\n  channelId?: string;\n}\n\n// ISO8601 calendar pattern-matching\nexport interface NativeCalendarTriggerInput {\n  type: 'calendar';\n  channelId?: string;\n  repeats?: boolean;\n  value: CalendarTriggerInputValue;\n}\n\nexport interface NativeTimeIntervalTriggerInput {\n  type: 'timeInterval';\n  channelId?: string;\n  repeats: boolean;\n  seconds: number;\n}\n\nexport interface NativeDailyTriggerInput {\n  type: 'daily';\n  channelId?: string;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeWeeklyTriggerInput {\n  type: 'weekly';\n  channelId?: string;\n  weekday: number;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeYearlyTriggerInput {\n  type: 'yearly';\n  channelId?: string;\n  day: number;\n  month: number;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeMonthlyTriggerInput {\n  type: 'monthly';\n  channelId?: string;\n  day: number;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeDateTriggerInput {\n  type: 'date';\n  channelId?: string;\n  timestamp: number; // seconds since 1970\n}\n\nexport type NativeNotificationTriggerInput =\n  | null\n  | NativeChannelAwareTriggerInput\n  | NativeDateTriggerInput\n  | NativeCalendarTriggerInput\n  | NativeTimeIntervalTriggerInput\n  | NativeDailyTriggerInput\n  | NativeWeeklyTriggerInput\n  | NativeMonthlyTriggerInput\n  | NativeYearlyTriggerInput;\n"]}
+{"version":3,"file":"NotificationScheduler.types.js","sourceRoot":"","sources":["../src/NotificationScheduler.types.ts"],"names":[],"mappings":"","sourcesContent":["import { ProxyNativeModule } from 'expo-modules-core';\n\nimport { NotificationRequest, NotificationContentInput } from './Notifications.types';\n\nexport interface NotificationSchedulerModule extends ProxyNativeModule {\n  getAllScheduledNotificationsAsync?: () => Promise<NotificationRequest[]>;\n  scheduleNotificationAsync?: (\n    identifier: string,\n    notificationContent: NotificationContentInput,\n    trigger: NativeNotificationTriggerInput\n  ) => Promise<string>;\n  cancelScheduledNotificationAsync?: (identifier: string) => Promise<void>;\n  cancelAllScheduledNotificationsAsync?: () => Promise<void>;\n  getNextTriggerDateAsync?: (trigger: NativeNotificationTriggerInput) => Promise<number>;\n}\n\nexport interface NativeChannelAwareTriggerInput {\n  type: 'channel';\n  channelId?: string;\n}\n\n// ISO8601 calendar pattern-matching\nexport interface NativeCalendarTriggerInput {\n  type: 'calendar';\n  channelId?: string;\n  repeats?: boolean;\n  timezone?: string;\n  year?: number;\n  month?: number;\n  weekday?: number;\n  weekOfMonth?: number;\n  weekOfYear?: number;\n  weekdayOrdinal?: number;\n  day?: number;\n  hour?: number;\n  minute?: number;\n  second?: number;\n}\n\nexport interface NativeTimeIntervalTriggerInput {\n  type: 'timeInterval';\n  channelId?: string;\n  repeats: boolean;\n  seconds: number;\n}\n\nexport interface NativeDailyTriggerInput {\n  type: 'daily';\n  channelId?: string;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeWeeklyTriggerInput {\n  type: 'weekly';\n  channelId?: string;\n  weekday: number;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeYearlyTriggerInput {\n  type: 'yearly';\n  channelId?: string;\n  day: number;\n  month: number;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeMonthlyTriggerInput {\n  type: 'monthly';\n  channelId?: string;\n  day: number;\n  hour: number;\n  minute: number;\n}\n\nexport interface NativeDateTriggerInput {\n  type: 'date';\n  channelId?: string;\n  timestamp: number; // seconds since 1970\n}\n\nexport type NativeNotificationTriggerInput =\n  | null\n  | NativeChannelAwareTriggerInput\n  | NativeDateTriggerInput\n  | NativeCalendarTriggerInput\n  | NativeTimeIntervalTriggerInput\n  | NativeDailyTriggerInput\n  | NativeWeeklyTriggerInput\n  | NativeMonthlyTriggerInput\n  | NativeYearlyTriggerInput;\n"]}

package/build/Notifications.types.d.ts

@@ -487,7 +487,7 @@ export interface NotificationRequest {
     trigger: NotificationTrigger;
 }
 /**
- * An object which represents notification content that you pass in to `presentNotificationAsync` or as a part of `NotificationRequestInput`.
+ * An object which represents notification content that you pass in as a part of `NotificationRequestInput`.
  */
 export type NotificationContentInput = {
     /**