refactor: modernize, fix fabric

Author: victorhenrion

RNDocumentPicker.podspec

@@ -1,7 +1,6 @@
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
 
 Pod::Spec.new do |s|
   s.name         = "RNDocumentPicker"
@@ -11,32 +10,11 @@ Pod::Spec.new do |s|
   s.license      = package["license"]
   s.authors      = package["author"]
 
-  s.platforms    = { :osx => "10.15" }
+  s.platforms    = { :osx => "11.0" }
   s.source       = { :git => "https://github.com/victorhenrion/react-native-document-picker-macos.git", :tag => "#{s.version}" }
 
-  s.source_files = "macos/**/*.{h,m,mm}"
+  s.source_files = "macos/**/*.{h,m,mm,cpp}"
+  s.private_header_files = "macos/**/*.h"
 
-  # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
-  # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
-  if respond_to?(:install_modules_dependencies, true)
-    install_modules_dependencies(s)
-  else
-  s.dependency "React-Core"
-
-  # Don't install the dependencies when we run `pod install` in the old architecture.
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    s.compiler_flags = folly_compiler_flags + " -DRCT_NEW_ARCH_ENABLED=1"
-    s.pod_target_xcconfig    = {
-        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
-        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
-        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    s.dependency "React-RCTFabric"
-    s.dependency "React-Codegen"
-    s.dependency "RCT-Folly"
-    s.dependency "RCTRequired"
-    s.dependency "RCTTypeSafety"
-    s.dependency "ReactCommon/turbomodule/core"
-   end
-  end
+  install_modules_dependencies(s)
 end

macos/RNDocumentPicker.h

@@ -1,17 +1,15 @@
-#import <Foundation/Foundation.h>
-#import <React/RCTBridgeModule.h>
-
 #ifdef RCT_NEW_ARCH_ENABLED
-#import <React/RCTTurboModule.h>
-#endif
 
-NS_ASSUME_NONNULL_BEGIN
+#import <RNDocumentPickerSpec/RNDocumentPickerSpec.h>
 
-@interface RNDocumentPicker : NSObject <RCTBridgeModule
-#ifdef RCT_NEW_ARCH_ENABLED
-, RCTTurboModule
-#endif
->
+@interface RNDocumentPicker : NSObject <NativeRNDocumentPickerSpec>
 @end
 
-NS_ASSUME_NONNULL_END
+#else
+
+#import <React/RCTBridgeModule.h>
+
+@interface RNDocumentPicker : NSObject <RCTBridgeModule>
+@end
+
+#endif

macos/RNDocumentPicker.mm

@@ -1,51 +1,93 @@
 #import "RNDocumentPicker.h"
-#import <React/RCTUtils.h>
+
 #import <Cocoa/Cocoa.h>
-#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 #import <CoreServices/CoreServices.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
-#import <ReactCommon/TurboModuleUtils.h>
-#import "RNDocumentPickerSpec.h"
-#endif
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
 
 @implementation RNDocumentPicker
 
 RCT_EXPORT_MODULE();
 
-#pragma mark - React exports
+#ifdef RCT_NEW_ARCH_ENABLED
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
+{
+    return std::make_shared<facebook::react::NativeRNDocumentPickerSpecJSI>(params);
+}
 
-RCT_EXPORT_METHOD(
-    pick:(NSDictionary *)options
-    resolver:(RCTPromiseResolveBlock)resolve
-    rejecter:(RCTPromiseRejectBlock)reject)
+- (void)pick:(JS::NativeRNDocumentPicker::SpecPickOptions &)options
+         resolve:(RCTPromiseResolveBlock)resolve
+         reject:(RCTPromiseRejectBlock)reject
+{
+    BOOL allowDirectorySelection     = options.allowDirectorySelection().value_or(NO);
+    BOOL allowFileSelection          = options.allowFileSelection().value_or(NO);
+    BOOL multiple                    = options.multiple().value_or(NO);
+    NSArray<NSString *> *allowedUTIs = nil;
+
+    if (auto utisOpt = options.allowedUTIs(); utisOpt) {
+        const auto &vec = *utisOpt;
+        NSMutableArray<NSString *> *tmp = [NSMutableArray arrayWithCapacity:vec.size()];
+        for (NSString *uti : vec) [tmp addObject:uti];
+        allowedUTIs = tmp;
+    }
+
+    [self pickImpl:allowDirectorySelection
+        allowFileSelection:allowFileSelection
+        multiple:multiple
+        allowedUTIs:allowedUTIs
+        resolve:resolve
+        reject:reject];
+}
+
+#else
+
+RCT_EXPORT_METHOD(pick:(NSDictionary<NSString *, id> * _Nonnull)options
+                  resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+{
+    BOOL allowDirectorySelection     = [options[@"allowDirectorySelection"] boolValue];
+    BOOL allowFileSelection          = [options[@"allowFileSelection"] boolValue];
+    BOOL multiple                    = [options[@"multiple"] boolValue];
+    NSArray<NSString *> *allowedUTIs = nil;
+
+    if ([options[@"allowedUTIs"] isKindOfClass:[NSArray class]]) {
+        allowedUTIs = (NSArray<NSString *> *)options[@"allowedUTIs"];
+    }
+
+    [self pickImpl:allowDirectorySelection
+        allowFileSelection:allowFileSelection
+        multiple:multiple
+        allowedUTIs:allowedUTIs
+        resolve:resolve
+        reject:reject];
+}
+
+#endif
+
+- (void)pickImpl:(BOOL)allowDirectorySelection
+        allowFileSelection:(BOOL)allowFileSelection
+        multiple:(BOOL)multiple
+        allowedUTIs:(NSArray<NSString *> *)allowedUTIs
+        resolve:(RCTPromiseResolveBlock)resolve
+        reject:(RCTPromiseRejectBlock)reject
 {
     dispatch_async(dispatch_get_main_queue(), ^{
         NSOpenPanel *panel = [NSOpenPanel openPanel];
 
-        BOOL allowDirectories = [options objectForKey:@"allowDirectorySelection"] ? [options[@"allowDirectorySelection"] boolValue] : NO;
-        BOOL allowFiles       = [options objectForKey:@"allowFileSelection"] ? [options[@"allowFileSelection"] boolValue] : YES;
-        BOOL multiple         = [options objectForKey:@"multiple"] ? [options[@"multiple"] boolValue] : NO;
-        NSArray *utis         = [options objectForKey:@"allowedUTIs"];
-
-        panel.canChooseDirectories = allowDirectories;
-        panel.canChooseFiles       = allowFiles;
+        panel.canChooseDirectories    = allowDirectorySelection;
+        panel.canChooseFiles          = allowFileSelection;
         panel.allowsMultipleSelection = multiple;
-        panel.resolvesAliases = YES;
-
-        if (utis != nil && [utis isKindOfClass:[NSArray class]] && utis.count > 0) {
-            if (@available(macOS 11.0, *)) {
-                NSMutableArray<UTType *> *contentTypes = [NSMutableArray new];
-                for (NSString *uti in utis) {
-                    UTType *type = [UTType typeWithIdentifier:uti];
-                    if (type) {
-                        [contentTypes addObject:type];
-                    }
+        panel.resolvesAliases         = YES;
+
+        if (allowedUTIs != nil && [allowedUTIs isKindOfClass:[NSArray class]] && allowedUTIs.count > 0) {
+            NSMutableArray<UTType *> *contentTypes = [NSMutableArray new];
+            for (NSString *uti in allowedUTIs) {
+                UTType *type = [UTType typeWithIdentifier:uti];
+                if (type) {
+                    [contentTypes addObject:type];
                 }
-                panel.allowedContentTypes = contentTypes;
-            } else {
-                panel.allowedFileTypes = utis;
             }
+            panel.allowedContentTypes = contentTypes;
         }
 
         NSInteger result = [panel runModal];
@@ -58,20 +100,9 @@ @implementation RNDocumentPicker
                 NSDictionary *attributes = [fileManager attributesOfItemAtPath:path error:nil];
                 NSNumber *size = attributes[NSFileSize];
                 NSString *mimeType = nil;
-                if (@available(macOS 11.0, *)) {
-                    UTType *uti = [url resourceValuesForKeys:@[NSURLContentTypeKey] error:nil][NSURLContentTypeKey];
-                    if (uti) {
-                        mimeType = uti.preferredMIMEType;
-                    }
-                } else {
-                    NSString *uti = nil;
-                    [url getResourceValue:&uti forKey:NSURLTypeIdentifierKey error:nil];
-                    if (uti) {
-                        CFStringRef mimeTypeCF = UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)uti, kUTTagClassMIMEType);
-                        if (mimeTypeCF) {
-                            mimeType = (__bridge_transfer NSString *)mimeTypeCF;
-                        }
-                    }
+                UTType *uti = [url resourceValuesForKeys:@[NSURLContentTypeKey] error:nil][NSURLContentTypeKey];
+                if (uti) {
+                    mimeType = uti.preferredMIMEType;
                 }
                 NSString *name = url.lastPathComponent;
 
@@ -100,11 +131,4 @@ @implementation RNDocumentPicker
     });
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
-{
-    return std::make_shared<facebook::react::NativeRNDocumentPickerSpec>(params);
-}
-#endif
-
 @end