react-native-share 12.2.4 → 12.2.6

package/ios/InstagramShare.m

@@ -127,25 +127,26 @@
         _mChangeRequest = [PHAssetChangeRequest creationRequestForAssetFromImage:image];
         placeholder = _mChangeRequest.placeholderForCreatedAsset;
     } completionHandler:^(BOOL success, NSError *error) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (success) {
+                NSURL *instagramURL = [NSURL URLWithString:[NSString stringWithFormat:@"instagram://library?LocalIdentifier=\%@", [placeholder localIdentifier]]];
 
-        if (success) {
-            NSURL *instagramURL = [NSURL URLWithString:[NSString stringWithFormat:@"instagram://library?LocalIdentifier=\%@", [placeholder localIdentifier]]];
-
-            if ([[UIApplication sharedApplication] canOpenURL:instagramURL]) {
-                if (@available(iOS 10.0, *)) {
-                    [[UIApplication sharedApplication] openURL:instagramURL options:@{} completionHandler:NULL];
-                }
-                if (resolve != NULL) {
-                    resolve(@[@true, @""]);
+                if ([[UIApplication sharedApplication] canOpenURL:instagramURL]) {
+                    if (@available(iOS 10.0, *)) {
+                        [[UIApplication sharedApplication] openURL:instagramURL options:@{} completionHandler:NULL];
+                    }
+                    if (resolve != NULL) {
+                        resolve(@[@true, @""]);
+                    }
                 }
             }
-        }
-        else {
-            //Error while writing
-            if (reject != NULL) {
-                reject(@"com.rnshare",@"error",error);
+            else {
+                //Error while writing
+                if (reject != NULL) {
+                    reject(@"com.rnshare",@"error",error);
+                }
             }
-        }
+        });
     }];
 }
 

package/ios/WhatsAppShare.m

@@ -113,7 +113,9 @@ resolve:(RCTPromiseResolveBlock)resolve {
              reject:(RCTPromiseRejectBlock)reject {
   
   NSString *text = [RCTConvert NSString:options[@"message"]];
-  text = [text stringByAppendingString: [@" " stringByAppendingString: options[@"url"]] ];
+  if (options[@"url"] && options[@"url"] != [NSNull null]) {
+    text = [text stringByAppendingString: [@" " stringByAppendingString: options[@"url"]] ];
+  }
   NSString *whatsAppNumber = [RCTConvert NSString:options[@"whatsAppNumber"]];
   
   text = (NSString*)CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(NULL,(CFStringRef) text, NULL,CFSTR("!*'();:@&=+$,/?%#[]"),kCFStringEncodingUTF8));
@@ -129,6 +131,16 @@ resolve:(RCTPromiseResolveBlock)resolve {
 
 
 -(MessageType)getMessageType: (NSString *)url {
+  if (!url || url.length == 0) {
+    return MessageTypeText;
+  }
+  NSURL *parsed = [NSURL URLWithString:url];
+  NSString *scheme = parsed.scheme.lowercaseString;
+  BOOL isFileOrData = scheme && ([scheme isEqualToString:@"file"] || [scheme isEqualToString:@"data"]);
+  BOOL isAbsolutePath = [url hasPrefix:@"/"];
+  if (!isFileOrData && !isAbsolutePath) {
+    return MessageTypeText;
+  }
   NSArray *imageExtensions = @[@"png", @"jpeg",@"jpg",@"gif"];
   if([self isMediaType:url mediaExtensions: imageExtensions]){
     return MessageTypeImage;
@@ -185,12 +197,65 @@ resolve:(RCTPromiseResolveBlock)resolve {
   return FALSE;
 }
 
+-(UIView *)presentationView {
+  UIWindow *window = nil;
+
+  if (@available(iOS 13.0, *)) {
+    for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
+      if (![scene isKindOfClass:[UIWindowScene class]]) {
+        continue;
+      }
+      UIWindowScene *windowScene = (UIWindowScene *)scene;
+      if (windowScene.activationState != UISceneActivationStateForegroundActive) {
+        continue;
+      }
+      for (UIWindow *candidate in windowScene.windows) {
+        if (candidate.isKeyWindow) {
+          window = candidate;
+          break;
+        }
+      }
+      if (window != nil) {
+        break;
+      }
+    }
+  }
+
+  if (window == nil) {
+    for (UIWindow *candidate in UIApplication.sharedApplication.windows) {
+      if (candidate.isKeyWindow) {
+        window = candidate;
+        break;
+      }
+    }
+  }
+
+  if (window == nil) {
+    window = UIApplication.sharedApplication.windows.firstObject;
+  }
+
+  UIViewController *viewController = window.rootViewController;
+  if (viewController == nil) {
+    return nil;
+  }
+  while (viewController.presentedViewController != nil) {
+    viewController = viewController.presentedViewController;
+  }
+
+  return viewController.view;
+}
+
 -(void)shareMedia:(NSString *)stringURL documentUTI:(NSString *)documentUTI {
   NSURL *filePath = [NSURL fileURLWithPath:stringURL];
   documentInteractionController = [UIDocumentInteractionController interactionControllerWithURL:filePath];
   documentInteractionController.UTI = documentUTI;
   documentInteractionController.delegate = self;
-  [documentInteractionController presentOpenInMenuFromRect:CGRectZero inView:[[[[[UIApplication sharedApplication] delegate] window] rootViewController] view] animated:YES];
+  UIView *view = [self presentationView];
+  if (view == nil) {
+    NSLog(@"Unable to find a presentation view for WhatsApp share");
+    return;
+  }
+  [documentInteractionController presentOpenInMenuFromRect:view.bounds inView:view animated:YES];
 }
 
 @end

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-share",
   "description": "Social share, sending simple data to other apps.",
-  "version": "12.2.4",
+  "version": "12.2.6",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/react-native-share/react-native-share.git"