react-native-picture-selector 1.0.28 → 1.0.30

package/android/CMakeLists.txt

@@ -18,21 +18,3 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroPictureSelector+a
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE
   src/main/cpp/cpp-adapter.cpp
 )
-
-# Directly link libNitroModules.so from its stable cmake build output path.
-# The prefab for react-native-nitro-modules is header-only at CMake configure
-# time (fix-prefab.gradle updates it only after native build), so we link
-# the .so directly to avoid undefined symbol errors on fresh builds.
-#
-# Use a generator expression so the correct variant (debug/release) is picked
-# automatically — avoids breaking assembleRelease / EAS production builds.
-string(TOLOWER "${CMAKE_BUILD_TYPE}" _build_type_lower)
-if(_build_type_lower STREQUAL "release")
-  set(NITRO_BUILD_VARIANT "release")
-else()
-  set(NITRO_BUILD_VARIANT "debug")
-endif()
-
-target_link_libraries(${CMAKE_PROJECT_NAME}
-  ${CMAKE_SOURCE_DIR}/../../react-native-nitro-modules/android/build/intermediates/cmake/${NITRO_BUILD_VARIANT}/obj/${ANDROID_ABI}/libNitroModules.so
-)

package/android/src/main/kotlin/com/margelo/pictureselector/LubanCompressEngine.kt

@@ -15,28 +15,20 @@ import java.io.File
  * (io.github.lucksiege:compress). This engine is invoked after selection
  * when compression is enabled.
  *
- * API REQUIRES VERIFICATION: The exact Luban API (OnNewCompressListener
- * callback method signatures) should be confirmed against the bundled
- * Luban version in io.github.lucksiege:compress:v3.11.2.
+ * Luban handles compression quality internally using an adaptive algorithm
+ * based on image dimensions. Direct JPEG quality control is not supported
+ * by this bundled version. Use [ignoreBy] to skip already-small files.
  */
-class LubanCompressEngine(
-  private val quality: Int,
-  private val maxWidth: Int,
-  private val maxHeight: Int,
-) : CompressFileEngine {
+class LubanCompressEngine : CompressFileEngine {
 
   override fun onStartCompress(
     context: Context,
     source: ArrayList<Uri>,
     call: OnKeyValueResultCallbackListener,
   ) {
-    // API REQUIRES VERIFICATION: setQuality() method name in bundled Luban version.
-    // In most Luban forks bundled with PictureSelector, quality is set via .quality(Int)
-    // or .setCompressQuality(Int). Adjust the method name after verifying against
-    // io.github.lucksiege:compress:v3.11.2 source.
     Luban.with(context)
       .load(source)
-      .ignoreBy(100) // skip files under 100 KB
+      .ignoreBy(100) // skip files already under 100 KB
       .setTargetDir(context.cacheDir.absolutePath)
       .setCompressListener(object : OnNewCompressListener {
         override fun onStart() {

package/android/src/main/kotlin/com/margelo/pictureselector/MediaAssetMapper.kt

@@ -13,11 +13,10 @@ import java.io.File
  * 3. Real file path        (realPath != null)
  * 4. Fallback              (path — may be content:// URI)
  *
- * API REQUIRES VERIFICATION:
- * - LocalMedia.bucketDisplayName field name in v3.11.2
- *   (may be bucketDisplayName or albumName).
- * - LocalMedia.size field name (may be size or fileSize).
- * - LocalMedia.duration unit (ms in v3; confirm).
+ * Field mapping verified against PictureSelector v3.11.2:
+ * - LocalMedia.size       — file size in bytes (Long)
+ * - LocalMedia.duration   — duration in milliseconds (Long)
+ * - LocalMedia.parentFolderName — album/bucket display name (String)
  */
 object MediaAssetMapper {
 
@@ -44,7 +43,7 @@ object MediaAssetMapper {
       height     = media.height.toDouble(),
       duration   = media.duration.toDouble(), // milliseconds
       fileName   = fileName,
-      fileSize   = media.size.toDouble(),     // API REQUIRES VERIFICATION: field name
+      fileSize   = media.size.toDouble(),
       editedUri  = editedPath,
       isOriginal = null,
       bucketName = media.parentFolderName,

package/android/src/main/kotlin/com/margelo/pictureselector/NitroPictureSelectorPackage.kt

@@ -18,13 +18,6 @@ import com.margelo.nitro.com.margelo.pictureselector.NitroPictureSelectorOnLoad
  * // MainApplication.kt
  * override fun getPackages() = PackageList(this).packages + NitroPictureSelectorPackage()
  * ```
- *
- * API REQUIRES VERIFICATION:
- * - NitroModules.addHybridObjectCreator is the actual registration API in
- *   react-native-nitro-modules for Android. Verify against the installed
- *   version of the library. The creator name ("PictureSelector") must
- *   exactly match the string passed to NitroModules.createHybridObject()
- *   on the JS side.
  */
 class NitroPictureSelectorPackage : ReactPackage {
 

package/android/src/main/kotlin/com/margelo/pictureselector/PictureSelectorOptionsMapper.kt

@@ -12,11 +12,7 @@ import com.margelo.nitro.com.margelo.pictureselector.PictureSelectorOptions
  * [PictureSelector.create(activity).openGallery()] /
  * [PictureSelector.create(activity).openCamera()].
  *
- * API REQUIRES VERIFICATION:
- * - setSelectVideoMaxDuration / setSelectVideoMinDuration unit (seconds vs ms).
- *   In v3.11.2 these accept seconds. Confirm in the library source.
- * - setSelectorUIStyle builder method name & enum values.
- * - setSelectedData signature for pre-selected items.
+ * Video duration methods accept seconds in v3.11.2.
  */
 object PictureSelectorOptionsMapper {
 
@@ -37,9 +33,8 @@ object PictureSelectorOptionsMapper {
     // Show camera button inside gallery
     builder.isDisplayCamera(options.enableCamera ?: true)
 
-    // Pre-selected assets — requires conversion to LocalMedia list
-    // API REQUIRES VERIFICATION: setSelectedData(List<LocalMedia>) signature
-    // options.selectedAssets is currently unused in v1; add in future.
+    // Pre-selected assets: selectedAssets (file:// URIs) conversion to LocalMedia
+    // is not yet implemented; skipped intentionally.
   }
 
   /**
@@ -68,10 +63,7 @@ object PictureSelectorOptionsMapper {
 
     val compress = options.compress
     if (compress != null && compress.enabled) {
-      val quality   = (((compress.quality ?: 0.8) * 100).toInt()).coerceIn(10, 100)
-      val maxWidth  = (compress.maxWidth  ?: 1920.0).toInt()
-      val maxHeight = (compress.maxHeight ?: 1920.0).toInt()
-      builder.setCompressEngine(LubanCompressEngine(quality, maxWidth, maxHeight))
+      builder.setCompressEngine(LubanCompressEngine())
     }
   }
 
@@ -104,11 +96,7 @@ object PictureSelectorOptionsMapper {
     // ── Compress engine ───────────────────────────────────────────────────
     val compress = options.compress
     if (compress != null && compress.enabled) {
-      val quality   = (((compress.quality ?: 0.8) * 100).toInt()).coerceIn(10, 100)
-      val maxWidth  = (compress.maxWidth  ?: 1920.0).toInt()
-      val maxHeight = (compress.maxHeight ?: 1920.0).toInt()
-
-      builder.setCompressEngine(LubanCompressEngine(quality, maxWidth, maxHeight))
+      builder.setCompressEngine(LubanCompressEngine())
     }
   }
 

package/ios/HybridPictureSelector.swift

@@ -1,5 +1,6 @@
 import Foundation
 import UIKit
+import AVFoundation
 import HXPhotoPicker
 import NitroModules
 
@@ -112,11 +113,7 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
         }
         Task {
           do {
-            let asset = try await self.mapAsset(
-              result.photoAsset,
-              compress: options.compress,
-              isOriginal: false
-            )
+            let asset = try await self.mapCameraResult(result, compress: options.compress)
             promise.resolve(withResult: [asset])
           } catch {
             promise.reject(withError: error)
@@ -259,6 +256,58 @@ final class HybridPictureSelector: HybridHybridPictureSelectorSpec_base, HybridH
     )
   }
 
+  // MARK: - Camera result mapping
+
+  private func mapCameraResult(
+    _ result: CameraController.Result,
+    compress: CompressOptions?
+  ) async throws -> MediaAsset {
+    switch result {
+    case .image(let image):
+      let quality = compress?.quality ?? 0.8
+      guard let data = image.jpegData(compressionQuality: quality) else {
+        throw PictureSelectorError.unknown("Failed to encode captured image")
+      }
+      let fileName = "camera_\(UUID().uuidString).jpg"
+      let tempURL = FileManager.default.temporaryDirectory.appendingPathComponent(fileName)
+      try data.write(to: tempURL)
+      let fileSize = Double(data.count)
+      return MediaAsset(
+        uri:        tempURL.absoluteString,
+        type:       "image",
+        mimeType:   "image/jpeg",
+        width:      Double(image.size.width * image.scale),
+        height:     Double(image.size.height * image.scale),
+        duration:   0,
+        fileName:   fileName,
+        fileSize:   fileSize,
+        editedUri:  nil,
+        isOriginal: false,
+        bucketName: nil
+      )
+    case .video(let url):
+      let attrs = try? FileManager.default.attributesOfItem(atPath: url.path)
+      let fileSize = Double((attrs?[.size] as? UInt64) ?? 0)
+      let asset = AVURLAsset(url: url)
+      let duration = CMTimeGetSeconds(asset.duration) * 1_000
+      let tracks = asset.tracks(withMediaType: .video)
+      let size = tracks.first?.naturalSize ?? .zero
+      return MediaAsset(
+        uri:        url.absoluteString,
+        type:       "video",
+        mimeType:   mimeType(for: url),
+        width:      Double(size.width),
+        height:     Double(size.height),
+        duration:   duration,
+        fileName:   url.lastPathComponent,
+        fileSize:   fileSize,
+        editedUri:  nil,
+        isOriginal: false,
+        bucketName: nil
+      )
+    }
+  }
+
   // MARK: - Compression helper
 
   private func buildCompression(from options: CompressOptions?) -> PhotoAsset.Compression? {

package/ios/NitroPictureSelectorOnLoad.mm

@@ -17,7 +17,7 @@
 // Defined in HybridPictureSelector.swift via @_cdecl.
 // Creates a HybridPictureSelector instance and returns a retained raw pointer
 // to its HybridHybridPictureSelectorSpec_cxx wrapper.
-extern "C" void* NitroPictureSelectorMakeHybrid();
+extern "C" void* NitroPictureSelectorMakeHybrid() noexcept;
 
 using namespace margelo::nitro;
 using namespace margelo::nitro::pictureselector;

package/nitrogen.config.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://nitro.margelo.com/nitro.schema.json",
+  "cxxNamespace": ["margelo", "nitro", "pictureselector"],
+  "outputDirectory": "./nitrogen",
+  "specs": ["./src/specs"],
+  "ios": {
+    "iosModuleName": "NitroPictureSelector"
+  },
+  "android": {
+    "androidNamespace": ["com", "margelo", "pictureselector"],
+    "androidCxxLibName": "NitroPictureSelector"
+  },
+  "autolinking": {
+    "PictureSelector": {
+      "swift": "HybridPictureSelector",
+      "kotlin": "HybridPictureSelector"
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-picture-selector",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "High-performance photo/video picker for React Native using Nitro Modules",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -13,7 +13,7 @@
     "android",
     "ios",
     "nitrogen",
-    "nitro.json",
+    "nitrogen.config.json",
     "*.podspec"
   ],
   "scripts": {
@@ -51,15 +51,6 @@
     "react-native-nitro-modules": ">=0.20.0",
     "typescript": "^5.3.0"
   },
-  "nitro": {
-    "ios": {
-      "iosModuleName": "NitroPictureSelector"
-    },
-    "android": {
-      "androidNamespace": "com.nitro.pictureselector",
-      "androidCxxLibName": "NitroPictureSelector"
-    }
-  },
   "react-native-builder-bob": {
     "source": "src",
     "output": "lib",

package/nitro.json

@@ -1,11 +0,0 @@
-{
-  "cxxNamespace": ["pictureselector"],
-  "ios": {
-    "iosModuleName": "NitroPictureSelector"
-  },
-  "android": {
-    "androidNamespace": ["com", "margelo", "pictureselector"],
-    "androidCxxLibName": "NitroPictureSelector"
-  },
-  "autolinking": {}
-}