Merge pull request #10 from Vadko/10.12-bug-fixes

feat: onDismiss for android & even emitting fixed

Author: Vadko

README.md

@@ -192,10 +192,10 @@ try {
 
 ### `open(filepath: string, options?: Object): Promise<void>`
 
-| Parameter              | Type   | Description                                                                                                                                                                                                                                        |
-| ---------------------- | ------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| **filepath**           | string | The absolute path where the file is stored. The file needs to have a valid extension to be successfully detected. Use [react-native-fs constants](https://github.com/itinance/react-native-fs#constants) to determine the absolute path correctly. |
-| **options** (optional) | Object | Some options to customize the behaviour. See below.                                                                                                                                                                                                |
+| Parameter              | Type   | Description                                                                                                                                                                                                                                         |
+| ---------------------- | ------ |-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| **filepath**           | string | The absolute path where the file is stored. The file needs to have a valid extension to be successfully detected. Use [expo-file-system constants](https://docs.expo.dev/versions/latest/sdk/filesystem/#constants) to determine the absolute path correctly. |
+| **options** (optional) | Object | Some options to customize the behaviour. See below.                                                                                                                                                                                                 |
 
 #### Options
 

android/src/main/java/com/fileviewerturbo/FileViewerTurboModuleImpl.java

@@ -1,31 +1,46 @@
 package com.fileviewerturbo;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.webkit.MimeTypeMap;
 
+import com.facebook.react.bridge.ActivityEventListener;
+import com.facebook.react.bridge.BaseActivityEventListener;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
 import java.io.File;
-import java.math.BigInteger;
 
 public class FileViewerTurboModuleImpl {
   final private ReactApplicationContext mContext;
   public static final String NAME = "FileViewerTurbo";
   private static final String SHOW_OPEN_WITH_DIALOG = "showOpenWithDialog" ;
   private static final String SHOW_STORE_SUGGESTIONS ="showAppsSuggestions";
+  private static final String DISMISS_EVENT = "onViewerDidDismiss";
   private static final Integer RN_FILE_VIEWER_REQUEST = 33341;
 
   public FileViewerTurboModuleImpl(ReactApplicationContext context) {
     mContext = context;
+    ActivityEventListener mActivityEventListener = new BaseActivityEventListener() {
+      @Override
+      public void onActivityResult(final Activity activity, final int requestCode, final int resultCode, final Intent intent) {
+        context.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+          .emit(DISMISS_EVENT, null);
+      }
+
+    };
+    mContext.addActivityEventListener(mActivityEventListener);
   }
 
-  public void open(String path, String currentId, ReadableMap options, Promise promise) {
+  public void open(String path, ReadableMap options, Promise promise) {
     Uri contentUri = null;
-    Boolean showOpenWithDialog = options.hasKey(SHOW_OPEN_WITH_DIALOG) ? options.getBoolean(SHOW_OPEN_WITH_DIALOG) : false;
-    Boolean showStoreSuggestions = options.hasKey(SHOW_STORE_SUGGESTIONS) ? options.getBoolean(SHOW_STORE_SUGGESTIONS) : false;
+    boolean showOpenWithDialog = options.hasKey(SHOW_OPEN_WITH_DIALOG) && options.getBoolean(SHOW_OPEN_WITH_DIALOG);
+    boolean showStoreSuggestions = options.hasKey(SHOW_STORE_SUGGESTIONS) && options.getBoolean(SHOW_STORE_SUGGESTIONS);
 
     if(path.startsWith("content://")) {
       contentUri = Uri.parse(path);
@@ -38,7 +53,7 @@ public void open(String path, String currentId, ReadableMap options, Promise pro
       }
       try {
         final String packageName = mContext.getCurrentActivity().getPackageName();
-        final String authority = new StringBuilder(packageName).append(".provider").toString();
+        final String authority = packageName + ".provider";
         contentUri = FileProvider.getUriForFile(mContext.getCurrentActivity(), authority, newFile);
       }
       catch(IllegalArgumentException e) {
@@ -72,7 +87,7 @@ public void open(String path, String currentId, ReadableMap options, Promise pro
 
     if (shareIntent.resolveActivity(pm) != null) {
       try {
-        mContext.getCurrentActivity().startActivityForResult(intentActivity, new BigInteger(currentId.replace("-", ""), 16).intValue() + RN_FILE_VIEWER_REQUEST);
+        mContext.getCurrentActivity().startActivityForResult(intentActivity, RN_FILE_VIEWER_REQUEST);
         promise.resolve(null);
       }
       catch(Exception e) {

android/src/newarch/java/com/fileviewerturbo/FileViewerTurboModule.kt

@@ -9,7 +9,15 @@ class FileViewerTurboModule(reactContext: ReactApplicationContext) : NativeFileV
 
   override fun getName(): String = FileViewerTurboModuleImpl.NAME
 
-  override fun open(path: String?, currentId: String?, options: ReadableMap?, promise: Promise?) {
-    implementation.open(path, currentId, options, promise)
+  override fun open(path: String?, options: ReadableMap?, promise: Promise?) {
+    implementation.open(path, options, promise)
+  }
+
+  override fun addListener(eventType: String?) {
+    //
+  }
+
+  override fun removeListeners(count: Double) {
+    //
   }
 }

android/src/oldarch/java/com/fileviewerturbo/FileViewerTurboModule.kt

@@ -1,5 +1,6 @@
 package com.fileviewerturbo
 
+import com.facebook.react.bridge.BridgeReactContext
 import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
@@ -12,7 +13,17 @@ class FileViewerTurboModule(context: ReactApplicationContext) : ReactContextBase
   override fun getName(): String = FileViewerTurboModuleImpl.NAME
 
   @ReactMethod
-  fun open(path: String, currentId: String, options: ReadableMap, promise: Promise) {
-    implementation.open(path, currentId, options, promise)
+  fun open(path: String, options: ReadableMap, promise: Promise) {
+    implementation.open(path, options, promise)
+  }
+
+  @ReactMethod
+  fun addListener(type: String?) {
+    //
+  }
+
+  @ReactMethod
+  fun removeListeners(type: Int?) {
+    //
   }
 }

example/android/gradle.properties

@@ -32,7 +32,7 @@ reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 # your application. You should enable this flag either if you want
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
-newArchEnabled=false
+newArchEnabled=true
 
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.

example/ios/FileViewerTurboExample.xcodeproj/project.pbxproj

@@ -590,7 +590,10 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) DEBUG";
@@ -659,7 +662,10 @@
 					"-DFOLLY_CFG_NO_COROUTINES=1",
 					"-DFOLLY_HAVE_CLOCK_GETTIME=1",
 				);
-				OTHER_LDFLAGS = "$(inherited)  ";
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					" ",
+				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
 				SDKROOT = iphoneos;
 				USE_HERMES = true;

example/ios/Podfile

@@ -1,4 +1,4 @@
-ENV['RCT_NEW_ARCH_ENABLED'] = '0'
+ENV['RCT_NEW_ARCH_ENABLED'] = '1'
 
 # Resolve react_native_pods.rb with node to allow for hoisting
 require Pod::Executable.execute_command('node', ['-p',

example/ios/Podfile.lock

@@ -1263,7 +1263,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-file-viewer-turbo (0.1.1):
+  - react-native-file-viewer-turbo (0.1.6):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1763,7 +1763,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   boost: 1dca942403ed9342f98334bf4c3621f011aa7946
   DoubleConversion: f16ae600a246532c4020132d54af21d0ddb2a385
-  dr-pogodin-react-native-fs: f085f7e8e673a018523664542c3e5651638142a5
+  dr-pogodin-react-native-fs: 4a8aae59ceae45d96f8f98159cffa3db8acb3ed2
   FBLazyVector: be7314029d6ec6b90f0f75ce1195b8130ed9ac4f
   fmt: 10c6e61f4be25dc963c36bd73fc7b1705fe975be
   glog: 08b301085f15bcbb6ff8632a8ebaf239aae04e6a
@@ -1778,16 +1778,16 @@ SPEC CHECKSUMS:
   React-CoreModules: 291be650024d9db086c95fd1d7e7d9607c6de62b
   React-cxxreact: 5cf17d13ca0fc0734e1bb0ed9615d1d1fc45ef78
   React-debug: 931ca94abd6b1bcab539e356e20df788afecae8f
-  React-defaultsnativemodule: fa1917ffdbb17e2a03f9a2b26e6f7342f59662c0
-  React-domnativemodule: c9dcbf0a872f3d02210f005c084d0fc1fdb83f2d
+  React-defaultsnativemodule: 6afc2dd3619bac12dc54c1ee939bf14f9aa96b42
+  React-domnativemodule: f140d46f6f3c3f1efc987c98b464fcbece0cc93a
   React-Fabric: e1774fe4b579e34c2c5721e9351c8ce869e7b5f0
   React-FabricComponents: 528ff9f96d150379ed404221d70cc7019ca76865
   React-FabricImage: 31680b7ddc740e040277176fbd6541fcf0fd44af
   React-featureflags: 7c7a74b65ee5a228f520b387ebfe0e8d9cecc622
-  React-featureflagsnativemodule: bc298d49634a5b2e0576b9bda6a0dc337ef158f8
+  React-featureflagsnativemodule: dd3450366b1c9557975e457ce6baa151ccee84da
   React-graphics: 7f0d3e06d356e8476bd8ba95d90762fc01138ebc
   React-hermes: f83fafe6a1c845dace7abad4a5d7366cbb42ab96
-  React-idlecallbacksnativemodule: 733deb5f645226868cf49a0eb798c62082a3fb34
+  React-idlecallbacksnativemodule: 14ce331438e2bca7d464a8a211b14543aff4dc91
   React-ImageManager: 2b9274ea973f43597a554a182d7ef525836172c6
   React-jserrorhandler: 3b521485275d295cfc6ec6bfa921a1d608693ecf
   React-jsi: fd23c1d759feb709784fd4c835b510b90a94dd12
@@ -1796,17 +1796,17 @@ SPEC CHECKSUMS:
   React-jsitracing: 11b6646d7b2ecdc7a475f65b2cb12d3805964195
   React-logger: 26155dc23db5c9038794db915f80bd2044512c2e
   React-Mapbuffer: ad1ba0205205a16dbff11b8ade6d1b3959451658
-  React-microtasksnativemodule: 36e3a415c6a3a5c4784b5c6bad38013b8ca35be4
-  react-native-file-viewer-turbo: 7d3babc3e28aa6c65ca2bfb223322e6b1540cfcb
+  React-microtasksnativemodule: e771eb9eb6ace5884ee40a293a0e14a9d7a4343c
+  react-native-file-viewer-turbo: f6d61e6b7ad0534afb91c71abb81685026f01c1b
   React-nativeconfig: aeed6e2a8ac02b2df54476afcc7c663416c12bf7
   React-NativeModulesApple: c5b7813da94136f50ef084fa1ac077332dcfc658
   React-perflogger: 6afb7eebf7d9521cc70481688ccddf212970e9d3
   React-performancetimeline: 81884d35896b22d51832e7c8748c8330ec73c491
   React-RCTActionSheet: c940a35d71686941ac2b96dd07bde11ea0f0c34f
   React-RCTAnimation: e1dbb4e530d6f58437ab2fae372de3788ecdffab
-  React-RCTAppDelegate: 3aa8a7b8bff5afcc00f947471c2fc93bd2093de5
+  React-RCTAppDelegate: f9825950ac2c52ae1cf46b648bb362b86b62fe41
   React-RCTBlob: 9cdac4721a76e2d132fb1760eafd0a8f150d1c96
-  React-RCTFabric: b833ecb9bb715858731f658accae0804bd2f4a7b
+  React-RCTFabric: c0aa01a448bcebb1326d068ed7545eb11561e663
   React-RCTImage: f09f5165807e1a69a2bbac6c7168a8ed57ed4e26
   React-RCTLinking: 4ea06b79cba7e15d8af4d86b1dcede6bd29a47fd
   React-RCTNetwork: 43a38148c7a4a2380e76b08f07f02ee8eaac8965
@@ -1828,6 +1828,6 @@ SPEC CHECKSUMS:
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
   Yoga: 3deb2471faa9916c8a82dda2a22d3fba2620ad37
 
-PODFILE CHECKSUM: 8ec1cff111ee4d951a14bcc1bd65d834dee5924a
+PODFILE CHECKSUM: 65ea4c8568e49fafe33b3a076bc8830a73bc168d
 
 COCOAPODS: 1.16.2

example/src/App.tsx

@@ -29,7 +29,9 @@ export default function App() {
       toFile: localFile,
     };
     downloadFile(options).promise.then(() =>
-      open(localFile).then(console.log).catch(console.error)
+      open(localFile, { onDismiss: () => console.log('dismissed!') })
+        .then(console.log)
+        .catch(console.error)
     );
   };
 

ios/FileViewerTurbo.mm

@@ -34,13 +34,13 @@ - (id)initWithPath:(NSString *)file title:(NSString *)title {
 @interface CustomQLViewController: QLPreviewController<QLPreviewControllerDataSource>
 
 @property(nonatomic, strong) File *file;
-@property(nonatomic, strong) NSString *invocation;
+@property(nonatomic, strong) NSNumber *invocation;
 
 @end
 
 @implementation CustomQLViewController
 
-- (instancetype)initWithFile:(File *)file identifier:(NSString *)invocation {
+- (instancetype)initWithFile:(File *)file identifier:(NSNumber *)invocation {
     if(self = [super init]) {
         _file = file;
         _invocation = invocation;
@@ -67,7 +67,8 @@ @implementation FileViewerTurbo {
   bool hasListeners;
 }
 
-static RCTEventEmitter* staticEventEmitter = nil;
+static RCTEventEmitter *staticEventEmitter = nil;
+static NSNumber *invocationId = @33341;
 
 -(void)startObserving {
     hasListeners = YES;
@@ -130,7 +131,7 @@ + (UIViewController*)topViewControllerWithRootViewController:(UIViewController*)
 - (void)_sendEventWithName:(NSString *)eventName body:(id)body {
   #ifdef RCT_NEW_ARCH_ENABLED
     if ([eventName isEqualToString:@"onViewerDidDismiss"]) {
-      [self emitOnViewerDidDismiss:body];
+      [self emitOnViewerDidDismiss];
     }
   #else
     if (hasListeners && staticEventEmitter != nil) {
@@ -147,22 +148,25 @@ - (void)_sendEventWithName:(NSString *)eventName body:(id)body {
 
 
 - (void)previewControllerDidDismiss:(CustomQLViewController *)controller {
-  [self _sendEventWithName:@"onViewerDidDismiss" body:@{@"id": ((CustomQLViewController*)controller).invocation}];
+  [self _sendEventWithName:@"onViewerDidDismiss" body:nil];
 }
 
 
 - (void)dismissView:(id)sender {
     UIViewController* controller = [FileViewerTurbo topViewController];
-    [self _sendEventWithName:@"onViewerDidDismiss" body:@{@"id": ((CustomQLViewController*)controller).invocation}];
+    [self _sendEventWithName:@"onViewerDidDismiss" body:nil];
     [[FileViewerTurbo topViewController] dismissViewControllerAnimated:YES completion:nil];
 }
 
 RCT_EXPORT_MODULE(FileViewerTurbo)
 
-RCT_EXPORT_METHOD(open:(NSString *)path currentId:(NSString *)currentId options:(NSDictionary *)options resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject) {
+RCT_EXPORT_METHOD(open:(NSString *)path
+                  options:(NSDictionary *)options
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject) {
+  
       NSString *displayName = options[@"displayName"];
       File *file = [[File alloc] initWithPath:path title:displayName];
-      NSString *invocationId = currentId;
 
       QLPreviewController *controller = [[CustomQLViewController alloc] initWithFile:file identifier:invocationId];
       controller.delegate = self;