feat: handle dismiss photo picker

Author: baronha

example/src/App.js

@@ -45,7 +45,7 @@ export default function App() {
 
   const onPicker = async () => {
     try {
-      const singleSelectedMode = false;
+      const singleSelectedMode = true;
 
       const response = await openPicker({
         selectedAssets: images,

ios/CustomPhotoPicker/CustomPhotoPickerViewController.swift

@@ -11,6 +11,8 @@ import Photos
 import TLPhotoPicker
 
 class CustomPhotoPickerViewController: TLPhotosPickerViewController, ViewerControllerDataSource {
+    var dismissPhotoPicker: ((_ withTLPHAssets: [TLPHAsset]) -> Void)?
+
     var viewerController: ViewerController?
 
     func numberOfItemsInViewerController(_: ViewerController) -> Int {
@@ -41,7 +43,9 @@ class CustomPhotoPickerViewController: TLPhotosPickerViewController, ViewerContr
 
     override func viewDidLoad() {
         super.viewDidLoad()
-        NotificationCenter.default.addObserver(self, selector: #selector(self.handleCellLongPress(_:)), name: Cell.longPressNotification, object: nil)
+        if config.isPreview {
+            NotificationCenter.default.addObserver(self, selector: #selector(self.handleCellLongPress(_:)), name: Cell.longPressNotification, object: nil)
+        }
     }
 
     deinit {
@@ -116,9 +120,21 @@ extension CustomPhotoPickerViewController: PreviewHeaderViewDelegate, PreviewFoo
 
     func headerView(_: PreviewHeaderView, didPressDoneButton _: UIButton) {
         DispatchQueue.main.async {
-            self.viewerController?.dismiss(animated: false, completion: {
-                self.dismiss(animated: true)
-            })
+            self.viewerController?.dismiss {
+                if config.singleSelectedMode {
+                    DispatchQueue.main.async {
+                        if let indexPath = self.viewerController?.currentIndexPath {
+                            guard let cell = self.collectionView.cellForItem(at: indexPath) as? TLPhotoCollectionViewCell, let localID = cell.asset?.localIdentifier else { return }
+
+                            guard let asset = TLPHAsset.asset(with: localID) else { return }
+
+                            self.dismissPhotoPicker!([asset])
+                        }
+                    }
+                } else {
+                    self.dismissPhotoPicker!(self.selectedAssets)
+                }
+            }
         }
     }
 
@@ -209,7 +225,7 @@ extension CustomPhotoPickerViewController: ViewerControllerDelegate {
 
         guard let cell = self.collectionView.cellForItem(at: indexPath) as? TLPhotoCollectionViewCell, let localID = cell.asset?.localIdentifier else { return }
 
-        guard var asset = TLPHAsset.asset(with: localID) else { return }
+        guard let asset = TLPHAsset.asset(with: localID) else { return }
 
         if let index = selectedAssets.firstIndex(where: { $0.phAsset == asset.phAsset }) {
             button.selectedAsset = true

ios/MultipleImagePicker.swift

@@ -3,15 +3,22 @@ import Photos
 import TLPhotoPicker
 import UIKit
 
+var _isCrop = true
+var _isPreview = true
+
 extension TLPhotosPickerConfigure {
     var isPreview: Bool {
-        get { return true }
-        set {}
+        get { return _isPreview }
+        set {
+            _isPreview = newValue
+        }
     }
 
     var isCrop: Bool {
-        get { return true }
-        set {}
+        get { return _isCrop }
+        set {
+            _isCrop = newValue
+        }
     }
 }
 
@@ -40,6 +47,11 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate, UINav
     func openPicker(options: NSDictionary, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         self.setConfiguration(options: options, resolve: resolve, reject: reject)
         let viewController = CustomPhotoPickerViewController()
+        
+        viewController.dismissPhotoPicker = { [weak self] withPHAssets in
+            self?.dismissPhotoPicker(withTLPHAssets: withPHAssets)
+        }
+        
         viewController.delegate = self
 
         viewController.didExceedMaximumNumberOfSelection = { [weak self] picker in
@@ -99,6 +111,8 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate, UINav
 
         config.isPreview = self.options["isPreview"] as? Bool ?? false
 
+        config.isCrop = (config.singleSelectedMode && self.options["isCrop"] as! Bool)
+        
         let mediaType = self.options["mediaType"] as! String
 
         config.mediaType = mediaType == "video" ? PHAssetMediaType.video : mediaType == "image" ? PHAssetMediaType.image : nil
@@ -167,7 +181,7 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate, UINav
         }, completionBlock: { filePath, fileType in
 
             let object = MediaResponse(filePath: filePath.absoluteString, mime: fileType, withTLAsset: TLAsset, isExportThumbnail: self.options["isExportThumbnail"] as! Bool)
-            
+                        
             DispatchQueue.main.async {
                 completion(object)
             }
@@ -187,17 +201,18 @@ class MultipleImagePicker: NSObject, TLPhotosPickerViewControllerDelegate, UINav
         let selectedAssetsCount = self.selectedAssets.count
 
         // check logic code for isCrop
-        let cropCondition = (options["singleSelectedMode"] as! Bool) && (self.options["isCrop"] as! Bool) && withTLPHAssets.first?.type == .photo
+        
+        let isCrop = config.isCrop && withTLPHAssets.first?.type == .photo
 
         // check difference
-        if withTLPHAssetsCount == selectedAssetsCount && withTLPHAssets[withTLPHAssetsCount - 1].phAsset?.localIdentifier == self.selectedAssets[selectedAssetsCount - 1].phAsset?.localIdentifier && !cropCondition {
+        if withTLPHAssetsCount == selectedAssetsCount && withTLPHAssets[withTLPHAssetsCount - 1].phAsset?.localIdentifier == self.selectedAssets[selectedAssetsCount - 1].phAsset?.localIdentifier && !isCrop {
             self.dismissComplete()
             return
         }
 
         self.selectedAssets = withTLPHAssets
 
-        if cropCondition {
+        if isCrop {
             let uiImage = withTLPHAssets.first?.fullResolutionImage
             if uiImage != nil {
                 self.presentCropViewController(image: (withTLPHAssets.first?.fullResolutionImage)!)