react-native-share 12.0.5 → 12.0.7

package/README.md

@@ -33,7 +33,8 @@ Configure you `app.config.ts` or `app.json` to use the permissions needed by the
           "com.instagram.android",
           "com.twitter.android",
           "com.zhiliaoapp.musically",
-        ]
+        ],
+        "enableBase64ShareAndroid": true
       }
     ]
   ]
@@ -63,6 +64,12 @@ Configure you `app.config.ts` or `app.json` to use the permissions needed by the
 </queries>
 ```
 
+`enableBase64ShareAndroid` will take care of adding the permission to the AndroidManifest.xml.
+
+```xml
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+```
+
 And prebuild the project with `expo prebuild`.
 
 ## Bare React Native

package/ios/InstagramStories.m

@@ -19,17 +19,17 @@ RCT_EXPORT_MODULE();
     // Putting dictionary of options inside an array
     NSArray *pasteboardItems = @[items];
     NSDictionary *pasteboardOptions = @{UIPasteboardOptionExpirationDate : [[NSDate date] dateByAddingTimeInterval:60 * 5]};
-    
+
     [[UIPasteboard generalPasteboard] setItems:pasteboardItems options:pasteboardOptions];
     [[UIApplication sharedApplication] openURL:urlScheme options:@{} completionHandler:nil];
-    
+
     resolve(@[@true, @""]);
 }
 
 - (void)shareSingle:(NSDictionary *)options
     reject:(RCTPromiseRejectBlock)reject
     resolve:(RCTPromiseResolveBlock)resolve {
-    
+
     NSURL *urlScheme = [NSURL URLWithString:[NSString stringWithFormat:@"instagram-stories://share?source_application=%@", options[@"appId"]]];
     if (![[UIApplication sharedApplication] canOpenURL:urlScheme]) {
         NSError* error = [self fallbackInstagram];
@@ -85,50 +85,63 @@ RCT_EXPORT_MODULE();
 
     if(![options[@"backgroundVideo"] isEqual:[NSNull null]] && options[@"backgroundVideo"] != nil) {
         NSURL *backgroundVideoURL = [RCTConvert NSURL:options[@"backgroundVideo"]];
-        NSString *urlString = backgroundVideoURL.absoluteString;
-        NSURLComponents *components = [[NSURLComponents alloc] initWithString:urlString];
-        NSString *assetId = nil;
-
-        // Get asset ID from URL
-        for (NSURLQueryItem *item in components.queryItems) {
-           if ([item.name isEqualToString:@"id"]) {
-               assetId = item.value;
-               break;
-           }
-        }
 
-        if (assetId) {
-           // Fetch the asset
-           PHFetchResult *fetchResult = [PHAsset fetchAssetsWithLocalIdentifiers:@[assetId] options:nil];
-           PHAsset *asset = fetchResult.firstObject;
-           
-           if (asset) {
-               PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
-               options.networkAccessAllowed = YES;
-               options.deliveryMode = PHVideoRequestOptionsDeliveryModeHighQualityFormat;
-               
-               [[PHImageManager defaultManager] requestAVAssetForVideo:asset
-                                                             options:options
-                                                       resultHandler:^(AVAsset * _Nullable avAsset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) {
-                   if ([avAsset isKindOfClass:[AVURLAsset class]]) {
-                       AVURLAsset *urlAsset = (AVURLAsset *)avAsset;
-                       NSData *video = [NSData dataWithContentsOfURL:urlAsset.URL];
-                       
-                       dispatch_async(dispatch_get_main_queue(), ^{
-                           if (video) {
-                               [items setObject:video forKey:@"com.instagram.sharedSticker.backgroundVideo"];
-                               [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
-                           } else {
-                               NSLog(@"Failed to convert video asset to NSData");
-                               [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
-                           }
-                       });
-                   }
-               }];
-           } else {
-               NSLog(@"Could not find asset with ID: %@", assetId);
-               [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
-           }
+        if ([backgroundVideoURL.scheme isEqualToString:@"file"]) {
+            // Handle local file
+            NSData *videoData = [NSData dataWithContentsOfURL:backgroundVideoURL];
+            if (videoData) {
+                [items setObject:videoData forKey:@"com.instagram.sharedSticker.backgroundVideo"];
+                [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
+            } else {
+                NSLog(@"Failed to read local video file");
+                [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
+            }
+        } else {
+            NSString *urlString = backgroundVideoURL.absoluteString;
+            NSURLComponents *components = [[NSURLComponents alloc] initWithString:urlString];
+            NSString *assetId = nil;
+
+            // Get asset ID from URL
+            for (NSURLQueryItem *item in components.queryItems) {
+                if ([item.name isEqualToString:@"id"]) {
+                    assetId = item.value;
+                    break;
+                }
+            }
+
+            if (assetId) {
+                // Fetch the asset
+                PHFetchResult *fetchResult = [PHAsset fetchAssetsWithLocalIdentifiers:@[assetId] options:nil];
+                PHAsset *asset = fetchResult.firstObject;
+
+                if (asset) {
+                    PHVideoRequestOptions *options = [[PHVideoRequestOptions alloc] init];
+                    options.networkAccessAllowed = YES;
+                    options.deliveryMode = PHVideoRequestOptionsDeliveryModeHighQualityFormat;
+
+                    [[PHImageManager defaultManager] requestAVAssetForVideo:asset
+                                                                    options:options
+                                                            resultHandler:^(AVAsset * _Nullable avAsset, AVAudioMix * _Nullable audioMix, NSDictionary * _Nullable info) {
+                        if ([avAsset isKindOfClass:[AVURLAsset class]]) {
+                            AVURLAsset *urlAsset = (AVURLAsset *)avAsset;
+                            NSData *video = [NSData dataWithContentsOfURL:urlAsset.URL];
+
+                            dispatch_async(dispatch_get_main_queue(), ^{
+                                if (video) {
+                                    [items setObject:video forKey:@"com.instagram.sharedSticker.backgroundVideo"];
+                                    [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
+                                } else {
+                                    NSLog(@"Failed to convert video asset to NSData");
+                                    [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
+                                }
+                            });
+                        }
+                    }];
+                } else {
+                    NSLog(@"Could not find asset with ID: %@", assetId);
+                    [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];
+                }
+            }
         }
     } else {
         [self openInstagramWithItems:items urlScheme:urlScheme resolve:resolve];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-native-share",
   "description": "Social share, sending simple data to other apps.",
-  "version": "12.0.5",
+  "version": "12.0.7",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/react-native-community/react-native-share.git"
@@ -48,6 +48,7 @@
     "babel-jest": "^29.7.0",
     "eslint": "^8.53.0",
     "eslint-config-satya164": "^3.2.0",
+    "expo-build-properties": "^0.13.1",
     "husky": "^4.3.0",
     "jest": "^29.7.0",
     "lint-staged": "^15.0.2",
@@ -61,7 +62,9 @@
     "react-native-windows": "^0.72.19",
     "react-test-renderer": "^18.2.0",
     "semantic-release": "^22.0.7",
-    "typescript": "^5.2.2"
+    "typescript": "^5.2.2",
+    "patch-package": "^8.0.0",
+    "postinstall-postinstall": "^2.1.0"
   },
   "resolutions": {
     "eslint-plugin-prettier": "5.0.1",
@@ -91,6 +94,7 @@
   },
   "readmeFilename": "README.md",
   "scripts": {
+    "postinstall": "patch-package",
     "start": "react-native start",
     "start:android": "react-native run-android",
     "start:ios": "react-native run-ios",
@@ -153,5 +157,6 @@
   },
   "engines": {
     "node": ">=16"
-  }
+  },
+  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
 }

package/plugin/build/index.d.ts

@@ -1 +1,7 @@
-export {};
+import { ExportedConfig } from '@expo/config-plugins';
+declare const _default: (config: ExportedConfig, props: {
+    enableBase64ShareAndroid?: boolean;
+    android?: string[];
+    ios?: string[];
+}) => any;
+export default _default;

package/plugin/build/index.js

@@ -1,84 +1,42 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_plugins_1 = require("@expo/config-plugins");
-// eslint-disable-next-line import/no-commonjs, @typescript-eslint/no-var-requires
-const pkg = require('../../package.json');
+const expo_build_properties_1 = require("expo-build-properties");
 /**
- * @type {import('./types').ManifestQueries}
- * what we are trying to add:
- * <queries>
-    <package android:name="com.facebook.katana"/>
-    <package android:name="com.instagram.android"/>
-    <package android:name="com.twitter.android"/>
-    <package android:name="com.zhiliaoapp.musically"/>
-    <intent></intent>
-      <action android:name="android.intent.action.VIEW"/>
-      <category android:name="android.intent.category.BROWSABLE"/>
-      <data android:scheme="https"/>
-    </intent>
-  </queries>
+ * Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
  */
-/**
- * @param {import('@expo/config-plugins').ExportedConfig} config
- */
-const withAndroidManifestService = (config, props) => {
-    return (0, config_plugins_1.withAndroidManifest)(config, (config) => {
-        config.modResults.manifest = {
-            ...config.modResults.manifest,
-            queries: {
-                package: props?.android?.map((social) => ({
-                    $: {
-                        'android:name': social,
-                    },
-                })),
-                intent: [
-                    {
-                        action: {
-                            $: {
-                                'android:name': 'android.intent.action.VIEW',
-                            },
-                        },
-                        category: {
-                            $: {
-                                'android:name': 'android.intent.category.BROWSABLE',
-                            },
-                        },
-                        data: {
-                            $: {
-                                'android:scheme': 'https',
-                            },
-                        },
-                    },
-                ],
-            },
-        };
-        return config;
-    });
-};
-/**
-* Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
-*/
 const getIOSQuerySchemes = (config) => {
     return Array.isArray(config.ios?.infoPlist?.LSApplicationQueriesSchemes)
         ? config.ios?.infoPlist?.LSApplicationQueriesSchemes ?? []
         : [];
 };
-const withInfoPlist = (config, props) => {
-    return {
+exports.default = (config, props) => {
+    return (0, expo_build_properties_1.withBuildProperties)({
         ...config,
+        android: {
+            ...config.android,
+            ...(props.enableBase64ShareAndroid
+                ? {
+                    permissions: [
+                        ...new Set([
+                            ...(config.android?.permissions ?? []),
+                            'android.permission.WRITE_EXTERNAL_STORAGE',
+                        ]),
+                    ],
+                }
+                : {}),
+        },
         ios: {
             ...config.ios,
             infoPlist: {
                 ...config.ios?.infoPlist,
-                LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...props?.ios ?? []]
+                LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...(props?.ios ?? [])],
             },
         },
-    };
+    }, {
+        android: {
+            manifestQueries: {
+                package: props.android ?? [],
+            },
+        },
+    });
 };
-function withSocialShare(config, props) {
-    config = withAndroidManifestService(config, props); // Android
-    config = withInfoPlist(config, props); // iOS
-    return config;
-}
-// eslint-disable-next-line import/no-commonjs
-module.exports = (0, config_plugins_1.createRunOncePlugin)(withSocialShare, pkg.name, pkg.version);

package/plugin/src/index.ts

@@ -1,100 +1,53 @@
-import {
-  withAndroidManifest,
-  createRunOncePlugin,
-  ExportedConfigWithProps,
-  ExportedConfig,
-} from '@expo/config-plugins';
-
-// eslint-disable-next-line import/no-commonjs, @typescript-eslint/no-var-requires
-const pkg = require('../../package.json');
+import { ExportedConfig } from '@expo/config-plugins';
+import { withBuildProperties } from 'expo-build-properties';
 
 /**
- * @type {import('./types').ManifestQueries}
- * what we are trying to add:
- * <queries>
-    <package android:name="com.facebook.katana"/>
-    <package android:name="com.instagram.android"/>
-    <package android:name="com.twitter.android"/>
-    <package android:name="com.zhiliaoapp.musically"/>
-    <intent></intent>
-      <action android:name="android.intent.action.VIEW"/>
-      <category android:name="android.intent.category.BROWSABLE"/>
-      <data android:scheme="https"/>
-    </intent>
-  </queries>
+ * Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
  */
-
-/**
- * @param {import('@expo/config-plugins').ExportedConfig} config
- */
-const withAndroidManifestService = (config: ExportedConfig, props: WithSocialShareProps) => {
-  return withAndroidManifest(config, (config: ExportedConfigWithProps) => {
-    config.modResults.manifest = {
-      ...config.modResults.manifest,
-      queries: {
-        package: props?.android?.map((social) => ({
-          $: {
-            'android:name': social,
-          },
-        })),
-        intent: [
-          {
-            action: {
-              $: {
-                'android:name': 'android.intent.action.VIEW',
-              },
-            },
-            category: {
-              $: {
-                'android:name': 'android.intent.category.BROWSABLE',
-              },
-            },
-            data: {
-              $: {
-                'android:scheme': 'https',
-              },
-            },
-          },
-        ],
-      },
-    };
-
-    return config;
-  });
-};
-
-/**
-* Handles for edge case when LSApplicationQueriesSchemes is an object or undefined.
-*/
-const getIOSQuerySchemes = (config: ExportedConfig): Array<string> => {
+const getIOSQuerySchemes = (config: ExportedConfig): string[] => {
   return Array.isArray(config.ios?.infoPlist?.LSApplicationQueriesSchemes)
     ? config.ios?.infoPlist?.LSApplicationQueriesSchemes ?? []
     : [];
-}
+};
 
-const withInfoPlist = (config: ExportedConfig, props: WithSocialShareProps) => {
-  return {
-    ...config,
-    ios: {
-      ...config.ios,
-      infoPlist: {
-        ...config.ios?.infoPlist,
-        LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...props?.ios ?? []]
+export default (
+  config: ExportedConfig,
+  props: {
+    enableBase64ShareAndroid?: boolean;
+    android?: string[];
+    ios?: string[];
+  },
+) => {
+  return withBuildProperties(
+    {
+      ...config,
+      android: {
+        ...config.android,
+        ...(props.enableBase64ShareAndroid
+          ? {
+              permissions: [
+                ...new Set([
+                  ...(config.android?.permissions ?? []),
+                  'android.permission.WRITE_EXTERNAL_STORAGE',
+                ]),
+              ],
+            }
+          : {}),
+      },
+      ios: {
+        ...config.ios,
+        infoPlist: {
+          ...config.ios?.infoPlist,
+          LSApplicationQueriesSchemes: [...getIOSQuerySchemes(config), ...(props?.ios ?? [])],
+        },
       },
     },
-  };
-};
-
-type WithSocialShareProps = {
-  ios: string[];
-  android: string[];
+    {
+      android: {
+        manifestQueries: {
+          package: props.android ?? [],
+        },
+      },
+    },
+  );
 };
-
-function withSocialShare(config: ExportedConfig, props: WithSocialShareProps) {
-  config = withAndroidManifestService(config, props); // Android
-  config = withInfoPlist(config, props); // iOS
-  return config;
-}
-
-// eslint-disable-next-line import/no-commonjs
-module.exports = createRunOncePlugin(withSocialShare, pkg.name, pkg.version);