ghivert · May 31, 2021 · May 31, 2021 · Jun 2, 2021
Showing with 38 additions and 22 deletions.

+13 −0 index.d.ts

+24 −22 ios/RCTConvert+Notification.m

+1 −0 js/types.js
diff --git a/index.d.ts b/index.d.ts
@@ -174,6 +174,19 @@ export type NotificationRequest = {
    * Must be used with fireDate.
    */
   repeats?: boolean;
+  /**
+   * Define what components should be used in the fireDate during repeats.
+   * Must be used with repeats and fireDate.
+   */
+   repeatsComponent?: {
+    month?: boolean;
+    day?: boolean;
+    hour?: boolean;
+    minute?: boolean;
+    second?: boolean;
+    nanosecond?: boolean;
+    weekday?: boolean;
+  };
   /**
    * Sets notification to be silent
    */

diff --git a/ios/RCTConvert+Notification.m b/ios/RCTConvert+Notification.m
@@ -62,14 +62,14 @@ + (UILocalNotification *)UILocalNotification:(id)json
 + (NSDictionary *)RCTFormatLocalNotification:(UILocalNotification *)notification
 {
     NSMutableDictionary *formattedLocalNotification = [NSMutableDictionary dictionary];
-  
+
     if (notification.fireDate) {
         NSDateFormatter *formatter = [NSDateFormatter new];
         [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"];
         NSString *fireDateString = [formatter stringFromDate:notification.fireDate];
         formattedLocalNotification[@"fireDate"] = fireDateString;
     }
-  
+
     formattedLocalNotification[@"alertAction"] = RCTNullIfNil(notification.alertAction);
     formattedLocalNotification[@"alertTitle"] = RCTNullIfNil(notification.alertTitle);
     formattedLocalNotification[@"alertBody"] = RCTNullIfNil(notification.alertBody);
@@ -116,6 +116,7 @@ + (UNNotificationRequest *)UNNotificationRequest:(id)json
     BOOL minute     = [RCTConvert BOOL:userDateComps[@"minute"]];
     BOOL second     = [RCTConvert BOOL:userDateComps[@"second"]];
     BOOL nanosecond = [RCTConvert BOOL:userDateComps[@"nanosecond"]];
+    BOOL weekday    = [RTCConvert BOOL:userDateComps[@"weekday"]];
 
     content.userInfo = [RCTConvert NSDictionary:details[@"userInfo"]];
     if (!isSilent) {
@@ -132,14 +133,16 @@ + (UNNotificationRequest *)UNNotificationRequest:(id)json
         NSCalendarUnitDay |
         NSCalendarUnitHour |
         NSCalendarUnitMinute |
-        NSCalendarUnitSecond;
+        NSCalendarUnitSecond |
+        NSCalendarUnitWeekday;
     NSCalendarUnit repeatDateComponents =
         (month ? NSCalendarUnitMonth : 0) |
         (day ? NSCalendarUnitDay : 0) |
         (hour ? NSCalendarUnitHour : 0) |
         (minute ? NSCalendarUnitMinute : 0) |
         (second ? NSCalendarUnitSecond : 0) |
-        (nanosecond ? NSCalendarUnitNanosecond : 0);
+        (nanosecond ? NSCalendarUnitNanosecond : 0) |
+        (weekday ? NSCalendarUnitWeekday : 0);
     NSDateComponents *triggerDate = fireDate
         ? [[NSCalendar currentCalendar]
            components:(repeats ? repeatDateComponents : defaultDateComponents) | NSCalendarUnitTimeZone
@@ -158,9 +161,9 @@ + (UNNotificationRequest *)UNNotificationRequest:(id)json
 + (NSDictionary *)RCTFormatUNNotificationRequest:(UNNotificationRequest*)request
 {
     NSMutableDictionary *formattedRequest = [NSMutableDictionary dictionary];
-    
+
     formattedRequest[@"id"] = RCTNullIfNil(request.identifier);
-    
+
     UNNotificationContent *content = request.content;
     formattedRequest[@"title"] = RCTNullIfNil(content.title);
     formattedRequest[@"subtitle"] = RCTNullIfNil(content.subtitle);
@@ -170,7 +173,7 @@ + (NSDictionary *)RCTFormatUNNotificationRequest:(UNNotificationRequest*)request
     formattedRequest[@"category"] = RCTNullIfNil(content.categoryIdentifier);
     formattedRequest[@"thread-id"] = RCTNullIfNil(content.threadIdentifier);
     formattedRequest[@"userInfo"] = RCTNullIfNil(RCTJSONClean(content.userInfo));
-    
+
     if (request.trigger) {
         UNCalendarNotificationTrigger* trigger = (UNCalendarNotificationTrigger*)request.trigger;
         NSDateFormatter *formatter = [NSDateFormatter new];
@@ -217,11 +220,11 @@ + (UNNotificationAction *)UNNotificationAction:(id)json
     NSDictionary<NSString *, id> *details = [self NSDictionary:json];
     NSString* identifier = [RCTConvert NSString:details[@"id"]];
     NSString* title = [RCTConvert NSString:details[@"title"]];
-    
-    
+
+
     UNNotificationActionOptions options = [RCTConvert UNNotificationActionOptions:details[@"options"]];
     UNNotificationAction* action = details[@"textInput"] ? [UNTextInputNotificationAction actionWithIdentifier:identifier title:title options:options textInputButtonTitle:details[@"textInput"][@"buttonTitle"] textInputPlaceholder:details[@"textInput"][@"placeholder"]] : [UNNotificationAction actionWithIdentifier:identifier title:title options:options];
-    
+
     return action;
 }
 
@@ -235,15 +238,15 @@ @implementation RCTConvert (UNNotificationCategory)
 + (UNNotificationCategory *)UNNotificationCategory:(id)json
 {
     NSDictionary<NSString *, id> *details = [self NSDictionary:json];
-    
+
     NSString* identifier = [RCTConvert NSString:details[@"id"]];
     NSMutableArray* actions = [NSMutableArray new];
         for (NSDictionary* action in [RCTConvert NSArray:details[@"actions"]]) {
             [actions addObject:[RCTConvert UNNotificationAction:action]];
         }
-    
+
     UNNotificationCategory* category = [UNNotificationCategory categoryWithIdentifier:identifier actions:actions intentIdentifiers:@[] options:UNNotificationCategoryOptionNone];
-    
+
     return category;
 }
 
@@ -259,21 +262,21 @@ + (NSDictionary *)RCTFormatUNNotificationResponse:(UNNotificationResponse *)resp
     UNNotification* notification = response.notification;
     NSMutableDictionary *formattedResponse = [[RCTConvert RCTFormatUNNotification:notification] mutableCopy];
     UNNotificationContent *content = notification.request.content;
-      
+
     NSMutableDictionary *userInfo = [content.userInfo mutableCopy];
     userInfo[@"userInteraction"] = [NSNumber numberWithInt:1];
     userInfo[@"actionIdentifier"] = response.actionIdentifier;
-    
+
     formattedResponse[@"badge"] = RCTNullIfNil(content.badge);
     formattedResponse[@"sound"] = RCTNullIfNil(content.sound);
     formattedResponse[@"userInfo"] = RCTNullIfNil(RCTJSONClean(userInfo));
     formattedResponse[@"actionIdentifier"] = RCTNullIfNil(response.actionIdentifier);
-      
+
     NSString* userText = [response isKindOfClass:[UNTextInputNotificationResponse class]] ? ((UNTextInputNotificationResponse *)response).userText : nil;
     if (userText) {
       formattedResponse[@"userText"] = RCTNullIfNil(userText);
     }
-      
+
     return formattedResponse;
 }
 @end
@@ -287,16 +290,16 @@ + (NSDictionary *)RCTFormatUNNotification:(UNNotification *)notification
 {
     NSMutableDictionary *formattedNotification = [NSMutableDictionary dictionary];
     UNNotificationContent *content = notification.request.content;
-  
+
     formattedNotification[@"identifier"] = notification.request.identifier;
-  
+
     if (notification.date) {
       NSDateFormatter *formatter = [NSDateFormatter new];
       [formatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"];
       NSString *dateString = [formatter stringFromDate:notification.date];
       formattedNotification[@"date"] = dateString;
     }
-  
+
     formattedNotification[@"title"] = RCTNullIfNil(content.title);
     formattedNotification[@"subtitle"] = RCTNullIfNil(content.subtitle);
     formattedNotification[@"body"] = RCTNullIfNil(content.body);
@@ -305,9 +308,8 @@ + (NSDictionary *)RCTFormatUNNotification:(UNNotification *)notification
     formattedNotification[@"category"] = RCTNullIfNil(content.categoryIdentifier);
     formattedNotification[@"thread-id"] = RCTNullIfNil(content.threadIdentifier);
     formattedNotification[@"userInfo"] = RCTNullIfNil(RCTJSONClean(content.userInfo));
-  
+
     return formattedNotification;
 }
 
 @end
-
diff --git a/js/types.js b/js/types.js
@@ -56,6 +56,7 @@ export type NotificationRequest = {|
     minute?: boolean,
     second?: boolean,
     nanosecond?: boolean,
+    weekday?: boolean,
   },
   /**
    * Sets notification to be silent