react-native-notify-kit 9.3.0 → 9.5.0

package/src/validators/validateAndroidNotification.ts

@@ -13,6 +13,8 @@ import {
   isString,
   isUndefined,
   isIOS,
+  isValidEnum,
+  getNumericEnumValues,
 } from '../utils';
 
 import { AndroidImportance } from '../types/NotificationAndroid';
@@ -20,6 +22,7 @@ import {
   AndroidBadgeIconType,
   AndroidCategory,
   AndroidDefaults,
+  AndroidForegroundServiceBehavior,
   AndroidForegroundServiceType,
   AndroidFlags,
   AndroidGroupAlertBehavior,
@@ -116,6 +119,22 @@ export default function validateAndroidNotification(
     out.asForegroundService = android.asForegroundService;
   }
 
+  /**
+   * foregroundServiceBehavior
+   */
+  if (
+    objectHasProperty(android, 'foregroundServiceBehavior') &&
+    !isUndefined(android.foregroundServiceBehavior)
+  ) {
+    if (!isValidEnum(android.foregroundServiceBehavior, AndroidForegroundServiceBehavior)) {
+      throw new Error(
+        "'notification.android.foregroundServiceBehavior' expected a valid AndroidForegroundServiceBehavior.",
+      );
+    }
+
+    out.foregroundServiceBehavior = android.foregroundServiceBehavior;
+  }
+
   /**
    * lightUpScreen
    */
@@ -153,7 +172,7 @@ export default function validateAndroidNotification(
    * badgeIconType
    */
   if (objectHasProperty(android, 'badgeIconType') && !isUndefined(android.badgeIconType)) {
-    if (!Object.values(AndroidBadgeIconType).includes(android.badgeIconType)) {
+    if (!isValidEnum(android.badgeIconType, AndroidBadgeIconType)) {
       throw new Error(
         "'notification.android.badgeIconType' expected a valid AndroidBadgeIconType.",
       );
@@ -239,7 +258,7 @@ export default function validateAndroidNotification(
       );
     }
 
-    const defaults = Object.values(AndroidDefaults);
+    const defaults = getNumericEnumValues(AndroidDefaults);
 
     for (let i = 0; i < android.defaults.length; i++) {
       if (!defaults.includes(android.defaults[i])) {
@@ -270,7 +289,7 @@ export default function validateAndroidNotification(
     objectHasProperty(android, 'groupAlertBehavior') &&
     !isUndefined(android.groupAlertBehavior)
   ) {
-    if (!Object.values(AndroidGroupAlertBehavior).includes(android.groupAlertBehavior)) {
+    if (!isValidEnum(android.groupAlertBehavior, AndroidGroupAlertBehavior)) {
       throw new Error(
         "'notification.android.groupAlertBehavior' expected a valid AndroidGroupAlertBehavior.",
       );
@@ -407,10 +426,10 @@ export default function validateAndroidNotification(
       );
     }
 
-    const defaults = Object.values(AndroidForegroundServiceType);
+    const foregroundServiceTypeValues = getNumericEnumValues(AndroidForegroundServiceType);
 
     for (let i = 0; i < android.foregroundServiceTypes.length; i++) {
-      if (!defaults.includes(android.foregroundServiceTypes[i])) {
+      if (!foregroundServiceTypeValues.includes(android.foregroundServiceTypes[i])) {
         throw new Error(
           "'notification.android.foregroundServiceTypes' invalid array value, expected an AndroidForegroundServiceType value.",
         );
@@ -429,13 +448,13 @@ export default function validateAndroidNotification(
     }
 
     if (android.flags.length === 0) {
-      throw new Error("'notification.android.flags' expected an array containing AndroidDefaults.");
+      throw new Error("'notification.android.flags' expected an array containing AndroidFlags.");
     }
 
-    const defaults = Object.values(AndroidFlags);
+    const flagValues = getNumericEnumValues(AndroidFlags);
 
     for (let i = 0; i < android.flags.length; i++) {
-      if (!defaults.includes(android.flags[i])) {
+      if (!flagValues.includes(android.flags[i])) {
         throw new Error(
           "'notification.android.flags' invalid array value, expected an AndroidFlags value.",
         );
@@ -502,7 +521,7 @@ export default function validateAndroidNotification(
    * importance
    */
   if (objectHasProperty(android, 'importance') && !isUndefined(android.importance)) {
-    if (!Object.values(AndroidImportance).includes(android.importance)) {
+    if (!isValidEnum(android.importance, AndroidImportance)) {
       throw new Error("'notification.android.importance' expected a valid Importance.");
     }
 
@@ -713,7 +732,7 @@ export default function validateAndroidNotification(
    * visibility
    */
   if (objectHasProperty(android, 'visibility') && android.visibility !== undefined) {
-    if (!Object.values(AndroidVisibility).includes(android.visibility)) {
+    if (!isValidEnum(android.visibility, AndroidVisibility)) {
       throw new Error(
         "'notification.android.visibility' expected a valid AndroidVisibility value.",
       );
@@ -759,5 +778,19 @@ export default function validateAndroidNotification(
     out.ongoing = true;
   }
 
+  /**
+   * Auto-set foregroundServiceBehavior to IMMEDIATE for foreground service notifications.
+   * Only set when asForegroundService is true and the user did not provide an explicit value.
+   * When asForegroundService is false/undefined, strip the property entirely — it has no effect
+   * on non-FGS notifications and including it would bloat the Bundle unnecessarily.
+   */
+  if (out.asForegroundService) {
+    if (android && !objectHasProperty(android, 'foregroundServiceBehavior')) {
+      out.foregroundServiceBehavior = AndroidForegroundServiceBehavior.IMMEDIATE;
+    }
+  } else {
+    delete out.foregroundServiceBehavior;
+  }
+
   return out;
 }

package/src/version.ts

@@ -1,2 +1,2 @@
 // Generated by genversion.
-export const version = '9.3.0';
+export const version = '9.5.0';