react-native-picture-selector 1.0.21 → 1.0.22

package/ios/HybridPictureSelector.swift

@@ -48,12 +48,19 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
 
   func openPicker(options: PictureSelectorOptions) -> Promise<[MediaAsset]> {
     return Promise { [weak self] resolver in
-      guard let self = self else {
-        resolver.reject(PictureSelectorError.unknown("Instance deallocated"))
+      guard let self else {
+        resolver.reject(PictureSelectorError.unknown("openPicker: native module was deallocated"))
         return
       }
 
       DispatchQueue.main.async {
+        if self.session != nil {
+          resolver.reject(PictureSelectorError.unknown(
+            "A picker or camera session is already active. Dismiss it before opening a new one."
+          ))
+          return
+        }
+
         guard let topVC = self.topViewController() else {
           resolver.reject(PictureSelectorError.unknown(
             "No active UIViewController. Ensure the picker is called from a mounted component."
@@ -85,22 +92,26 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
 
   func openCamera(options: PictureSelectorOptions) -> Promise<[MediaAsset]> {
     return Promise { [weak self] resolver in
-      guard let self = self else {
-        resolver.reject(PictureSelectorError.unknown("Instance deallocated"))
+      guard let self else {
+        resolver.reject(PictureSelectorError.unknown("openCamera: native module was deallocated"))
         return
       }
 
       DispatchQueue.main.async {
+        if self.session != nil {
+          resolver.reject(PictureSelectorError.unknown(
+            "A picker or camera session is already active. Dismiss it before opening a new one."
+          ))
+          return
+        }
+
         guard let topVC = self.topViewController() else {
           resolver.reject(PictureSelectorError.unknown("No active UIViewController."))
           return
         }
 
         var cameraConfig = CameraConfiguration()
-        switch options.mediaType {
-        case "video": cameraConfig.mediaType = .video
-        default:      cameraConfig.mediaType = .photo
-        }
+        cameraConfig.mediaType = (options.mediaType == .video) ? .video : .photo
         if let maxDur = options.maxVideoDuration {
           cameraConfig.videoMaximumDuration = maxDur
         }
@@ -115,7 +126,10 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
           cameraConfig,
           fromViewController: topVC
         ) { [weak self] result, _ in
-          guard let self = self else { return }
+          guard let self else {
+            resolver.reject(PictureSelectorError.unknown("openCamera: native module was deallocated"))
+            return
+          }
           guard let photoAsset = result?.photoAsset else {
             resolver.reject(PictureSelectorError.cancelled)
             return
@@ -146,9 +160,9 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
 
     // Media type
     switch options.mediaType {
-    case "video":
+    case .video:
       config.selectOptions = [.video]
-    case "all":
+    case .all:
       config.selectOptions = [.photo, .video]
     default:
       config.selectOptions = [.photo]
@@ -196,6 +210,13 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
       config.themeColor = color
     }
 
+    // selectedAssets: pre-selecting assets by file:// URI requires resolving each URI
+    // back to a PHAsset via PHPhotoLibrary and wrapping it in a PhotoAsset object.
+    // This is not yet implemented. Callers should not rely on this option on iOS.
+    // TODO: implement pre-selection using PHAsset.fetchAssets(withALAssetURLs:options:)
+    //       or localIdentifier lookup, then set config.preSelectedAssets (verify field name
+    //       in HXPhotoPicker v5.0.5 before enabling).
+
     return config
   }
 
@@ -330,7 +351,11 @@ extension HybridPictureSelector: PhotoPickerControllerDelegate {
     activePicker = nil
 
     pickerController.dismiss(animated: true) { [weak self] in
-      guard let self = self, let s = captured else { return }
+      guard let s = captured else { return }
+      guard let self else {
+        s.resolver(.failure(PictureSelectorError.unknown("pickerController: native module was deallocated")))
+        return
+      }
       Task {
         do {
           let assets = try await self.mapResults(result, compress: s.options.compress)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-picture-selector",
-  "version": "1.0.21",
+  "version": "1.0.22",
   "description": "High-performance photo/video picker for React Native using Nitro Modules",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",