Overload destructiveButtonIndex for int and array

facebook · Jul 12, 2018 · cb83d62 · cb83d62
1 parent 6b347a4
commit cb83d62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Libraries/ActionSheetIOS/ActionSheetIOS.js b/Libraries/ActionSheetIOS/ActionSheetIOS.js
@@ -27,8 +27,7 @@ const ActionSheetIOS = {
    *
    * - `options` (array of strings) - a list of button titles (required)
    * - `cancelButtonIndex` (int) - index of cancel button in `options`
-   * - `destructiveButtonIndex` (int) - index of destructive button in `options`
-   * - `destructiveButtonIndexes` (array of ints) - indexes of destructive button in `options`
+   * - `destructiveButtonIndex` (int or array of ints) - index or indices of destructive buttons in `options`
    * - `title` (string) - a title to show above the action sheet
    * - `message` (string) - a message to show below the title
    *

diff --git a/Libraries/ActionSheetIOS/RCTActionSheetManager.m b/Libraries/ActionSheetIOS/RCTActionSheetManager.m
@@ -63,9 +63,14 @@ - (CGRect)sourceRectInView:(UIView *)sourceView
   NSString *title = [RCTConvert NSString:options[@"title"]];
   NSString *message = [RCTConvert NSString:options[@"message"]];
   NSArray<NSString *> *buttons = [RCTConvert NSStringArray:options[@"options"]];
-  NSInteger destructiveButtonIndex = options[@"destructiveButtonIndex"] ? [RCTConvert NSInteger:options[@"destructiveButtonIndex"]] : -1;
-  NSArray<NSNumber *> *destructiveButtonIndexes = [RCTConvert NSArray:options[@"destructiveButtonIndexes"]];
   NSInteger cancelButtonIndex = options[@"cancelButtonIndex"] ? [RCTConvert NSInteger:options[@"cancelButtonIndex"]] : -1;
+  NSArray<NSNumber *> *destructiveButtonIndices;
+  if ([options[@"destructiveButtonIndex"] isKindOfClass:[NSArray class]]) {
+    destructiveButtonIndices = [RCTConvert NSArray:options[@"destructiveButtonIndex"]];
+  } else {
+    NSNumber *destructiveButtonIndex = options[@"destructiveButtonIndex"] ? [RCTConvert NSNumber:options[@"destructiveButtonIndex"]] : @-1;
+    destructiveButtonIndices = @[destructiveButtonIndex];
+  }
 
   UIViewController *controller = RCTPresentedViewController();
 
@@ -91,7 +96,7 @@ - (CGRect)sourceRectInView:(UIView *)sourceView
   NSInteger index = 0;
   for (NSString *option in buttons) {
     UIAlertActionStyle style = UIAlertActionStyleDefault;
-    if (index == destructiveButtonIndex || [destructiveButtonIndexes containsObject:@(index)]) {
+    if ([destructiveButtonIndices containsObject:@(index)]) {
       style = UIAlertActionStyleDestructive;
     } else if (index == cancelButtonIndex) {
       style = UIAlertActionStyleCancel;