@react-native-documents/picker 11.0.4 → 12.0.0

package/ios/swift/DocPicker.swift

@@ -2,40 +2,48 @@
 
 import Foundation
 import UniformTypeIdentifiers
-import MobileCoreServices
 
-@objc public class DocPicker: PickerWithMetadataImpl {
+@objc public class DocPicker: PickerBase {
+  var pickerOptions: PickerOptions?
+  var openedUrls: Set<URL> = []
 
-  var currentOptions: PickerOptions? = nil
+  @MainActor
+  override func createDocumentPicker(from dictionary: NSDictionary) -> UIDocumentPickerViewController {
+    let options = PickerOptions(dictionary: dictionary)
+    self.pickerOptions = options
+    return options.createDocumentPicker()
+  }
 
-  @objc public func present(options: PickerOptions, resolve: @escaping RNDPPromiseResolveBlock, reject: @escaping RNDPPromiseRejectBlock) {
-    // TODO fix callsite param
-    if (!promiseWrapper.trySetPromiseRejectingIncoming(resolve, rejecter: reject, fromCallSite: "pick")) {
-      return;
-    }
-    currentOptions = options;
-    DispatchQueue.main.async {
-      let documentPicker = UIDocumentPickerViewController(forOpeningContentTypes: options.allowedTypes, asCopy: options.modeAsCopy())
+  public override func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+    guard let promise = promiseWrapper.takeCallbacks() else { return }
+    let options = self.pickerOptions
 
-      documentPicker.modalPresentationStyle = options.presentationStyle
-      documentPicker.allowsMultipleSelection = options.allowMultiSelection
-      documentPicker.modalTransitionStyle = options.transitionStyle
-      //        documentPicker.directoryURL = options.initialDirectoryUrl
-      //        documentPicker.shouldShowFileExtensions = options.shouldShowFileExtensions
+    Task.detached(priority: .userInitiated) {
+      let documentsInfo = self.createDocumentMetadataWithOptions(for: urls, options: options)
+        .compactMap { $0.build() }
+      promise.resolve(documentsInfo)
+    }
+  }
 
-      self.presentInternal(documentPicker: documentPicker)
+  nonisolated private func createDocumentMetadataWithOptions(for urls: [URL], options: PickerOptions?) -> [DocumentMetadataBuilder] {
+    return urls.compactMap { url in
+      do {
+        return try self.getMetadataForWithOptions(url: url, options: options)
+      } catch {
+        return DocumentMetadataBuilder(forUri: url, error: error)
+      }
     }
   }
 
-  public func getMetadataFor(url: URL) throws -> DocumentMetadataBuilder {
-    return if (currentOptions?.isOpenMode() == true) {
-      try self.getOpenedDocumentInfo(url: url, requestLongTermAccess: currentOptions?.requestLongTermAccess ?? false)
+  nonisolated private func getMetadataForWithOptions(url: URL, options: PickerOptions?) throws -> DocumentMetadataBuilder {
+    return if options?.isOpenMode() == true {
+      try self.getOpenedDocumentInfo(url: url, requestLongTermAccess: options?.requestLongTermAccess ?? false)
     } else {
       try self.getAnyModeMetadata(url: url)
     }
   }
 
-  private func getAnyModeMetadata(url: URL) throws -> DocumentMetadataBuilder {
+  nonisolated private func getAnyModeMetadata(url: URL) throws -> DocumentMetadataBuilder {
     let resourceValues = try url.resourceValues(forKeys: [.fileSizeKey, .nameKey, .isDirectoryKey, .contentTypeKey])
 
     return DocumentMetadataBuilder(forUri: url, resourceValues: resourceValues)
@@ -45,18 +53,20 @@ import MobileCoreServices
     case sourceAccessError
   }
 
-  func getOpenedDocumentInfo(url: URL, requestLongTermAccess: Bool) throws -> DocumentMetadataBuilder {
+  nonisolated private func getOpenedDocumentInfo(url: URL, requestLongTermAccess: Bool) throws -> DocumentMetadataBuilder {
     guard url.startAccessingSecurityScopedResource() else {
       throw KeepLocalCopyError.sourceAccessError
     }
 
-    // url.stopAccessingSecurityScopedResource() must be called later
-    openedUrls.append(url)
+    // url.stopAccessingSecurityScopedResource() must be called later by user
+    DispatchQueue.main.async { [weak self] in
+      self?.openedUrls.insert(url)
+    }
 
-    // Use file coordination for reading and writing any of the URL’s content.
+    // Use file coordination for reading and writing any of the URL's content.
     var error: NSError? = nil
     var success = false
-    var metadataBuilder: DocumentMetadataBuilder = DocumentMetadataBuilder(forUri: url)
+    var metadataBuilder = DocumentMetadataBuilder(forUri: url)
 
     NSFileCoordinator().coordinate(readingItemAt: url, error: &error) { (url) in
       do {
@@ -66,7 +76,7 @@ import MobileCoreServices
         metadataBuilder.setMetadataReadingError(error)
       }
 
-      if (requestLongTermAccess == true) {
+      if requestLongTermAccess {
         do {
           let bookmarkData = try url.bookmarkData(options: .minimalBookmark, includingResourceValuesForKeys: nil, relativeTo: nil)
           metadataBuilder.setBookmark(bookmarkData)
@@ -75,10 +85,18 @@ import MobileCoreServices
         }
       }
     }
-    if let err = error, success == false {
+    if let err = error, !success {
       throw err
     }
     return metadataBuilder
   }
 
+  @objc public func stopAccessingOpenedUrls(_ urlStrings: [String]) {
+    let incomingUrls = Set(urlStrings.compactMap { URL(string: $0) })
+    for url in openedUrls.intersection(incomingUrls) {
+      url.stopAccessingSecurityScopedResource()
+      openedUrls.remove(url)
+    }
+  }
+
 }

package/ios/swift/DocSaver.swift

@@ -9,33 +9,28 @@
 
 import Foundation
 import UniformTypeIdentifiers
-import MobileCoreServices
 
-@objc public class DocSaver: PickerWithMetadataImpl {
+@objc public class DocSaver: PickerBase {
 
-  @objc public func present(options: SaverOptions, resolve: @escaping (Any?) -> Void, reject: @escaping (String?, String?, Error?) -> Void) {
-    if (!promiseWrapper.trySetPromiseRejectingIncoming(resolve, rejecter: reject, fromCallSite: "saveDocuments")) {
-      return;
-    }
-    DispatchQueue.main.async {
-      let documentPicker = UIDocumentPickerViewController(forExporting: options.sourceUrls, asCopy: options.asCopy)
-
-      documentPicker.modalPresentationStyle = options.presentationStyle
-      documentPicker.modalTransitionStyle = options.transitionStyle
-      //        documentPicker.directoryURL = options.initialDirectoryUrl
-      //        documentPicker.shouldShowFileExtensions = options.shouldShowFileExtensions
-
-      self.presentInternal(documentPicker: documentPicker)
-    }
+  @MainActor
+  override func createDocumentPicker(from dictionary: NSDictionary) -> UIDocumentPickerViewController {
+    let options = SaverOptions(dictionary: dictionary)
+    return options.createDocumentPicker()
   }
 
-  public func getMetadataFor(url: URL) throws -> DocumentMetadataBuilder {
-    let name = url.lastPathComponent.removingPercentEncoding
-
-    var resourceValues = URLResourceValues()
-    resourceValues.name = name
-
-    return DocumentMetadataBuilder(forUri: url, resourceValues: resourceValues)
+  public override func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
+    guard let promise = promiseWrapper.takeCallbacks() else { return }
+
+    Task.detached(priority: .userInitiated) {
+      // runs off main thread - preserves I/O performance
+      let documentsInfo = urls.compactMap { url -> [String: Any?]? in
+        let name = url.lastPathComponent.removingPercentEncoding
+        var resourceValues = URLResourceValues()
+        resourceValues.name = name
+        return DocumentMetadataBuilder(forUri: url, resourceValues: resourceValues).build()
+      }
+      promise.resolve(documentsInfo)
+    }
   }
 
 }

package/ios/swift/DocumentMetadataBuilder.swift

@@ -39,7 +39,7 @@ public class DocumentMetadataBuilder {
   
   func build() -> [String: Any?] {
     var dictionary: [String: Any?] = [:]
-    if (resourceValues?.isDirectory ?? false == false) {
+    if resourceValues?.isDirectory != true {
       let utTypeFromFile: UTType? = resourceValues?.contentType
       let utType: UTType? = utTypeFromFile ?? UTType(filenameExtension: uri.pathExtension)
 

package/ios/swift/FileOperations.swift

@@ -1,21 +1,23 @@
 // LICENSE: see License.md in the package root
 
 import Foundation
+import React
 
 @objc public class FileOperations: NSObject {
-  
-  @objc public static func keepLocalCopyAtUniqueDestination(from: [[String: String]], destinationPreset: String, resolve: @escaping RNDPPromiseResolveBlock) {
-    DispatchQueue.global(qos: .utility).async {
-      let results = moveFiles(from: from, destinationPreset: destinationPreset)
-      resolve(results)
+
+  @objc public static func keepLocalCopyAtUniqueDestination(from: [[String: String]], destinationPreset: String, resolve: @escaping RCTPromiseResolveBlock) {
+    let callback = ResolveCallback(resolve: resolve)
+    Task.detached(priority: .userInitiated) {
+      let results = Self.moveFiles(from: from, destinationPreset: destinationPreset)
+      callback.resolve(results)
     }
   }
-  
-  static func moveFiles(from: [[String: String]], destinationPreset: String) -> [[String: String?]] {
+
+  private static func moveFiles(from: [[String: String]], destinationPreset: String) -> [[String: String?]] {
     let destinationRootDir = getDirectoryForFileDestination(destinationPreset)
     let uniqueSubDirName = UUID().uuidString
     let destinationDir = destinationRootDir.appendingPathComponent(uniqueSubDirName, isDirectory: true)
-    
+
     do {
       try FileManager.default.createDirectory(at: destinationDir, withIntermediateDirectories: true, attributes: nil)
     } catch {
@@ -23,13 +25,13 @@ import Foundation
         LocalCopyResponse.error(sourceUri: dictionary["uri"], copyError: "Failed to create destination directory: \(error.localizedDescription)").dictionaryRepresentation
       }
     }
-    
+
     // move files
     return from.map { dictionary in
-      moveSingleFile(dictionary: dictionary, destinationDir: destinationDir).dictionaryRepresentation
+      Self.moveSingleFile(dictionary: dictionary, destinationDir: destinationDir).dictionaryRepresentation
     }
   }
-  
+
   private static func moveSingleFile(dictionary: [String: String], destinationDir: URL) -> LocalCopyResponse {
     guard let uriString = dictionary["uri"],
           let uri = URL(string: uriString),
@@ -39,7 +41,7 @@ import Foundation
         copyError: "Invalid URI or fileName"
       )
     }
-    
+
     do {
       let destinationUrl = try moveToDestination(from: uri, usingFilename: fileName, destinationDir: destinationDir)
       return LocalCopyResponse.success(sourceUri: uri.absoluteString, localUri: destinationUrl.absoluteString)
@@ -47,10 +49,10 @@ import Foundation
       return LocalCopyResponse.error(sourceUri: uriString, copyError: error.localizedDescription)
     }
   }
-  
-  static func moveToDestination(from: URL, usingFilename fileName: String, destinationDir: URL) throws -> URL {
+
+  private static func moveToDestination(from: URL, usingFilename fileName: String, destinationDir: URL) throws -> URL {
     let destinationFile = destinationDir.appendingPathComponent(fileName).standardized
-    
+
     guard destinationFile.path.hasPrefix(destinationDir.standardized.path) else {
       throw NSError(
         domain: "PathTraversalPrevention",
@@ -58,13 +60,13 @@ import Foundation
         userInfo: [NSLocalizedDescriptionKey: "The copied file is attempting to write outside of the target directory."]
       )
     }
-    
+
     try FileManager.default.moveItem(at: from, to: destinationFile)
-    
+
     return destinationFile
   }
-  
-  static func getDirectoryForFileDestination(_ copyToDirectory: String) -> URL {
+
+  private static func getDirectoryForFileDestination(_ copyToDirectory: String) -> URL {
     let searchPath: FileManager.SearchPathDirectory = copyToDirectory == "documentDirectory" ? .documentDirectory : .cachesDirectory
     return FileManager.default.urls(for: searchPath, in: .userDomainMask).first!
   }

package/ios/swift/IsKnownTypeImpl.swift

@@ -10,20 +10,26 @@ import Foundation
 import UniformTypeIdentifiers
 
 @objc public class IsKnownTypeImpl: NSObject {
-  
-  @objc public static func checkType(_ kind: String, value: String) -> NSDictionary {
-    let dict = getTypeResult(kind, value: value)
-    return NSDictionary(dictionary: dict as [AnyHashable: Any])
+
+  @objc public static func checkType(_ kind: String, value: String) -> [String: Any] {
+    return getTypeResult(kind, value: value)
   }
 
-  static func getTypeResult(_ kind: String, value: String) -> Dictionary<String, Any?> {
+  static func getTypeResult(_ kind: String, value: String) -> [String: Any] {
     if let utType = createUTType(kind: kind, value: value), utType.isDeclared == true {
-      return ["isKnown": true,
-              "UTType": utType.identifier,
-              "preferredFilenameExtension": utType.preferredFilenameExtension,
-              "mimeType": utType.preferredMIMEType]
+      return [
+        "isKnown": true,
+        "UTType": utType.identifier,
+        "preferredFilenameExtension": utType.preferredFilenameExtension ?? NSNull(),
+        "mimeType": utType.preferredMIMEType ?? NSNull()
+      ]
     }
-    return ["isKnown": false, "UTType": nil, "preferredFilenameExtension": nil, "mimeType": nil]
+    return [
+      "isKnown": false,
+      "UTType": NSNull(),
+      "preferredFilenameExtension": NSNull(),
+      "mimeType": NSNull()
+    ]
   }
 
   static func createUTType(kind: String, value: String) -> UTType? {

package/ios/swift/LocalCopyResponse.swift

@@ -15,13 +15,11 @@ enum LocalCopyResponse {
   case error(sourceUri: String?, copyError: String)
 
   var dictionaryRepresentation: [String: String?] {
-    switch self {
+    return switch self {
     case .success(let sourceUri, let localUri):
-      return ["sourceUri": sourceUri, "localUri": localUri, "status": "success"]
+      ["sourceUri": sourceUri, "localUri": localUri, "status": "success"]
     case .error(let sourceUri, let copyError):
-      var result = ["copyError": copyError, "status": "error"]
-      result["sourceUri"] = sourceUri ?? nil
-      return result
+      ["sourceUri": sourceUri, "copyError": copyError, "status": "error"]
     }
   }
 }

package/ios/swift/PickerBase.swift

@@ -1,5 +1,5 @@
 //
-//  DocSaver.swift
+//  PickerBase.swift
 //  react-native-document-picker
 //
 //  Created by Vojtech Novak on 25.05.2024.
@@ -9,55 +9,46 @@
 
 import Foundation
 import UniformTypeIdentifiers
-import MobileCoreServices
-
-public protocol GetsMetadataProtocol {
-    func getMetadataFor(url: URL) throws -> DocumentMetadataBuilder
-}
-
-// https://stackoverflow.com/a/51333906/2070942
-public typealias PickerWithMetadataImpl = PickerBase & GetsMetadataProtocol
+import React
 
 public class PickerBase: NSObject, UIDocumentPickerDelegate, UIAdaptivePresentationControllerDelegate {
   let promiseWrapper = PromiseWrapper()
-  var openedUrls: Array<URL> = []
 
-  func presentInternal(documentPicker: UIDocumentPickerViewController) {
-    documentPicker.delegate = self
-    documentPicker.presentationController?.delegate = self;
-        
-    if let viewController = RCTPresentedViewController() {
-      viewController.present(documentPicker, animated: true, completion: nil)
-    } else {
-      let error = NSError(domain: NSCocoaErrorDomain, code: 0, userInfo: nil)
-      promiseWrapper.reject("RCTPresentedViewController was nil", withCode: "PRESENTER_IS_NULL", withError: error)
+  @MainActor
+  @objc public func present(optionsDict: NSDictionary,
+                           resolve: @escaping RCTPromiseResolveBlock,
+                           reject: @escaping RCTPromiseRejectBlock) {
+    guard promiseWrapper.trySetPromiseRejectingIncoming(resolve, rejecter: reject) else {
+      return
     }
+
+    presentInternal(optionsDict)
+  }
+
+  @MainActor
+  func createDocumentPicker(from dictionary: NSDictionary) -> UIDocumentPickerViewController {
+    fatalError("Subclasses must override createDocumentPicker(from:)")
   }
-  
+
+  // Subclasses must override this method to process picked documents
   public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
-    DispatchQueue.global(qos: .userInitiated).async {
-      // this doesn't run on the main thread
-      let documentsInfo = urls.compactMap(self.createDocumentMetadata).compactMap { $0.build() }
-      self.promiseWrapper.resolve(documentsInfo)
-    }
-    // https://developer.apple.com/library/archive/documentation/FileManagement/Conceptual/DocumentPickerProgrammingGuide/AccessingDocuments/AccessingDocuments.html#//apple_ref/doc/uid/TP40014451-CH2-SW4 "Accessing Files Outside Your Sandbox"
-    // https://developer.apple.com/documentation/uikit/view_controllers/providing_access_to_directories
+    fatalError("Subclasses must override documentPicker(_:didPickDocumentsAt:)")
   }
-  
-  private func createDocumentMetadata(for url: URL) -> DocumentMetadataBuilder? {
-    guard let subclassThatGetsMetadata = self as? GetsMetadataProtocol else {
-      let error = NSError(domain: NSCocoaErrorDomain, code: 0, userInfo: nil)
-      self.promiseWrapper.reject("PickerBase", withCode: "BAD_CLASS", withError: error)
-      return nil
-    }
-    
-    do {
-      return try subclassThatGetsMetadata.getMetadataFor(url: url)
-    } catch {
-      return DocumentMetadataBuilder(forUri: url, error: error)
+
+  @MainActor
+  func presentInternal(_ optionsDict: NSDictionary) {
+    let documentPicker = self.createDocumentPicker(from: optionsDict)
+
+    documentPicker.delegate = self
+    documentPicker.presentationController?.delegate = self
+
+    if let viewController = RCTPresentedViewController() {
+      viewController.present(documentPicker, animated: true, completion: nil)
+    } else {
+      promiseWrapper.takeCallbacks()?.reject("RCTPresentedViewController was nil", withCode: "NULL_PRESENTER", withError: nil)
     }
   }
-  
+
   public func documentPickerWasCancelled(_ controller: UIDocumentPickerViewController) {
     promiseWrapper.rejectAsUserCancelledOperation()
   }
@@ -66,13 +57,4 @@ public class PickerBase: NSObject, UIDocumentPickerDelegate, UIAdaptivePresentat
     promiseWrapper.rejectAsUserCancelledOperation()
   }
 
-  @objc public func stopAccessingOpenedUrls(_ urlStrings: [String]) {
-    let incomingUrls = Set(urlStrings.compactMap { URL(string: $0) })
-    openedUrls.removeAll { url in
-      guard incomingUrls.contains(url) else { return false }
-      url.stopAccessingSecurityScopedResource()
-      return true
-    }
-  }
-
 }

package/ios/swift/PickerOptions.swift

@@ -3,42 +3,72 @@
 import Foundation
 import UIKit
 import UniformTypeIdentifiers
+import React
 
-@objc public class PickerOptions: NSObject {
+public enum PickerMode: String, Sendable {
+  case `import` = "import"
+  case open = "open"
+}
+
+public struct PickerOptions: Sendable {
   let allowedTypes: Array<UTType>
-  let mode: String // "import" or "open"
+  let mode: PickerMode
   let allowMultiSelection: Bool
-  let transitionStyle: UIModalTransitionStyle
-  let presentationStyle: UIModalPresentationStyle
-  let initialDirectoryUrl: URL?
+  var transitionStyle: UIModalTransitionStyle?
+  var presentationStyle: UIModalPresentationStyle?
+  var initialDirectoryUri: URL?
   let shouldShowFileExtensions: Bool
   let requestLongTermAccess: Bool
-  
-  @objc public init(types: Array<String>, mode: String = "import", initialDirectoryUrl: String? = nil, allowMultiSelection: Bool, shouldShowFileExtensions: Bool, transitionStyle: UIModalTransitionStyle = .coverVertical, presentationStyle: UIModalPresentationStyle = .fullScreen, requestLongTermAccess: Bool = false) {
+
+  public init(dictionary: NSDictionary) {
+    let types = dictionary["type"] as? [String] ?? []
+    let modeString = dictionary["mode"] as? String ?? "import"
+    let allowMultiSelection = dictionary["allowMultiSelection"] as? Bool ?? false
+    let shouldShowFileExtensions = dictionary["showFileExtensions"] as? Bool ?? false
+    let requestLongTermAccess = dictionary["requestLongTermAccess"] as? Bool ?? false
+
     // TODO check if types were valid
-    allowedTypes = types.compactMap {
-      UTType($0)
-    }
+    self.allowedTypes = types.compactMap { UTType($0) }
+    self.mode = PickerMode(rawValue: modeString) ?? .import
     self.allowMultiSelection = allowMultiSelection
-    self.transitionStyle = transitionStyle
-    self.presentationStyle = presentationStyle
-    self.mode = mode
-    if let unwrappedUrl = initialDirectoryUrl, let url = URL(string: unwrappedUrl) {
-      self.initialDirectoryUrl = url
-    } else {
-      self.initialDirectoryUrl = nil
-    }
     self.shouldShowFileExtensions = shouldShowFileExtensions
     self.requestLongTermAccess = requestLongTermAccess
+
+    if let transitionStyle = dictionary["transitionStyle"] as? String {
+      self.transitionStyle = RCTConvert.uiModalTransitionStyle(transitionStyle)
+    }
+    if let presentationStyle = dictionary["presentationStyle"] as? String {
+      self.presentationStyle = RCTConvert.uiModalPresentationStyle(presentationStyle)
+    }
+    if let initialDirectoryUri = dictionary["initialDirectoryUri"] as? String, let url = URL(string: initialDirectoryUri) {
+      self.initialDirectoryUri = url
+    }
   }
-  
+
   // asCopy: if true, the picker will give you access to a local copy of the document, otherwise you will have access to the original document
-  public func modeAsCopy() -> Bool {
-    return self.mode == "import"
+  func modeAsCopy() -> Bool {
+    return self.mode == .import
+  }
+
+  func isOpenMode() -> Bool {
+    return self.mode == .open
   }
 
-  public func isOpenMode() -> Bool {
-    return self.mode == "open"
+  @MainActor
+  public func createDocumentPicker() -> UIDocumentPickerViewController {
+    let picker = UIDocumentPickerViewController(forOpeningContentTypes: allowedTypes, asCopy: modeAsCopy())
+    picker.allowsMultipleSelection = allowMultiSelection
+
+    if let presentationStyle = presentationStyle {
+      picker.modalPresentationStyle = presentationStyle
+    }
+    if let transitionStyle = transitionStyle {
+      picker.modalTransitionStyle = transitionStyle
+    }
+    picker.directoryURL = initialDirectoryUri
+    picker.shouldShowFileExtensions = shouldShowFileExtensions
+
+    return picker
   }
 
 }