react-native-picture-selector 1.0.30 → 1.0.32

package/android/CMakeLists.txt

@@ -18,3 +18,17 @@ include(${CMAKE_SOURCE_DIR}/../nitrogen/generated/android/NitroPictureSelector+a
 target_sources(${CMAKE_PROJECT_NAME} PRIVATE
   src/main/cpp/cpp-adapter.cpp
 )
+
+# The react-native-nitro-modules prefab is header-only at CMake configure time,
+# so react-native-nitro-modules::NitroModules adds no .so to the link command.
+# Link libNitroModules.so directly using the known build output path.
+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/cpp/cpp-adapter.cpp

@@ -6,21 +6,43 @@
 ///   System.loadLibrary("NitroPictureSelector")
 /// the JVM invokes this function with the JavaVM*, which:
 ///   1. Initialises fbjni (facebook::jni::initialize)
-///   2. Calls registerAllNatives() — which registers JNI methods and
-///      inserts "PictureSelector" into Nitro's HybridObjectRegistry.
-///
-/// Without this entry point System.loadLibrary succeeds silently but
-/// nothing ever gets registered, so every call to
-///   NitroModules.createHybridObject("PictureSelector")
-/// throws "It has not yet been registered in the HybridObjectRegistry".
+///   2. Calls registerAllNatives() — which registers JNI methods.
+///   3. Registers "HybridPictureSelector" in Nitro's HybridObjectRegistry
+///      so that NitroModules.createHybridObject("HybridPictureSelector")
+///      resolves to the Kotlin HybridPictureSelector class.
 ///
 
 #include <jni.h>
 #include <fbjni/fbjni.h>
+#include <NitroModules/HybridObjectRegistry.hpp>
 #include "NitroPictureSelectorOnLoad.hpp"
+#include "JHybridHybridPictureSelectorSpec.hpp"
+#include "HybridHybridPictureSelectorSpec.hpp"
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void*) {
   return facebook::jni::initialize(vm, []() {
+    // 1. Register JNI methods for all generated specs.
     margelo::nitro::pictureselector::registerAllNatives();
+
+    // 2. Register the HybridObject factory in Nitro's HybridObjectRegistry.
+    //    The autolinking block in the generated NitroPictureSelectorOnLoad.cpp
+    //    is empty (nitrogen was run before autolinking was configured).
+    //    Registration is done here manually using the TAG from the generated spec.
+    margelo::nitro::HybridObjectRegistry::registerHybridObjectConstructor(
+      "HybridPictureSelector",
+      []() -> std::shared_ptr<margelo::nitro::HybridObject> {
+        static const auto cls = facebook::jni::findClassStatic(
+          "com/margelo/pictureselector/HybridPictureSelector"
+        );
+        static const auto ctor = cls->getConstructor<facebook::jni::JObject::javaobject()>();
+        auto javaObject = cls->newObject(ctor);
+        auto javaPart = facebook::jni::static_ref_cast<
+          margelo::nitro::pictureselector::JHybridHybridPictureSelectorSpec::JavaPart
+        >(javaObject);
+        return std::make_shared<
+          margelo::nitro::pictureselector::JHybridHybridPictureSelectorSpec
+        >(javaPart);
+      }
+    );
   });
 }

package/ios/NitroPictureSelectorOnLoad.mm

@@ -3,7 +3,7 @@
 // Registers HybridPictureSelector with Nitro's HybridObjectRegistry.
 //
 // The +load ObjC method runs before main(), guaranteeing the factory is
-// available when JS calls NitroModules.createHybridObject("PictureSelector").
+// available when JS calls NitroModules.createHybridObject("HybridPictureSelector").
 //
 // We bridge to Swift via @_cdecl("NitroPictureSelectorMakeHybrid") to avoid
 // ambiguous Swift class constructor syntax from C++.
@@ -30,7 +30,7 @@ using namespace margelo::nitro::pictureselector::bridge::swift;
 
 + (void)load {
   HybridObjectRegistry::registerHybridObjectConstructor(
-    "PictureSelector",
+    "HybridPictureSelector",
     []() -> std::shared_ptr<HybridObject> {
       void* ptr = NitroPictureSelectorMakeHybrid();
       return create_std__shared_ptr_HybridHybridPictureSelectorSpec_(ptr);

package/lib/commonjs/PictureSelector.js

@@ -13,7 +13,7 @@ var _types = require("./types");
 let _native = null;
 function getNative() {
   if (_native == null) {
-    _native = _reactNativeNitroModules.NitroModules.createHybridObject('PictureSelector');
+    _native = _reactNativeNitroModules.NitroModules.createHybridObject('HybridPictureSelector');
   }
   return _native;
 }

package/lib/commonjs/PictureSelector.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeNitroModules","require","_types","_native","getNative","NitroModules","createHybridObject","defaultOptions","mediaType","MediaType","IMAGE","maxCount","enableCamera","callNative","method","options","err","toPickerError","PictureSelector","exports","openPicker","openCamera"],"sourceRoot":"..\\..\\src","sources":["PictureSelector.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AAEA;AACA;AACA;;AAEA,IAAIE,OAAqC,GAAG,IAAI;AAEhD,SAASC,SAASA,CAAA,EAA0B;EAC1C,IAAID,OAAO,IAAI,IAAI,EAAE;IACnBA,OAAO,GAAGE,qCAAY,CAACC,kBAAkB,CACvC,iBACF,CAAC;EACH;EACA,OAAOH,OAAO;AAChB;;AAEA;AACA;AACA;;AAEA,MAAMI,cAAsC,GAAG;EAC7CC,SAAS,EAAEC,gBAAS,CAACC,KAAK;EAC1BC,QAAQ,EAAE,CAAC;EACXC,YAAY,EAAE;AAChB,CAAC;;AAED;AACA;AACA;;AAEA,eAAeC,UAAUA,CACvBC,MAAmC,EACnCC,OAA+B,EACR;EACvB,IAAI;IACF,OAAO,MAAMX,SAAS,CAAC,CAAC,CAACU,MAAM,CAAC,CAAC;MAAE,GAAGP,cAAc;MAAE,GAAGQ;IAAQ,CAAC,CAAC;EACrE,CAAC,CAAC,OAAOC,GAAG,EAAE;IACZ,MAAM,IAAAC,oBAAa,EAACD,GAAG,CAAC;EAC1B;AACF;;AAEA;AACA;AACA;;AAEO,MAAME,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,UAAUA,CAACL,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEM,UAAUA,CAACN,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNativeNitroModules","require","_types","_native","getNative","NitroModules","createHybridObject","defaultOptions","mediaType","MediaType","IMAGE","maxCount","enableCamera","callNative","method","options","err","toPickerError","PictureSelector","exports","openPicker","openCamera"],"sourceRoot":"..\\..\\src","sources":["PictureSelector.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAGA,IAAAC,MAAA,GAAAD,OAAA;AAEA;AACA;AACA;;AAEA,IAAIE,OAAqC,GAAG,IAAI;AAEhD,SAASC,SAASA,CAAA,EAA0B;EAC1C,IAAID,OAAO,IAAI,IAAI,EAAE;IACnBA,OAAO,GAAGE,qCAAY,CAACC,kBAAkB,CACvC,uBACF,CAAC;EACH;EACA,OAAOH,OAAO;AAChB;;AAEA;AACA;AACA;;AAEA,MAAMI,cAAsC,GAAG;EAC7CC,SAAS,EAAEC,gBAAS,CAACC,KAAK;EAC1BC,QAAQ,EAAE,CAAC;EACXC,YAAY,EAAE;AAChB,CAAC;;AAED;AACA;AACA;;AAEA,eAAeC,UAAUA,CACvBC,MAAmC,EACnCC,OAA+B,EACR;EACvB,IAAI;IACF,OAAO,MAAMX,SAAS,CAAC,CAAC,CAACU,MAAM,CAAC,CAAC;MAAE,GAAGP,cAAc;MAAE,GAAGQ;IAAQ,CAAC,CAAC;EACrE,CAAC,CAAC,OAAOC,GAAG,EAAE;IACZ,MAAM,IAAAC,oBAAa,EAACD,GAAG,CAAC;EAC1B;AACF;;AAEA;AACA;AACA;;AAEO,MAAME,eAAe,GAAAC,OAAA,CAAAD,eAAA,GAAG;EAC7B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEE,UAAUA,CAACL,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEM,UAAUA,CAACN,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C;AACF,CAAC","ignoreList":[]}

package/lib/module/PictureSelector.js

@@ -10,7 +10,7 @@ import { MediaType, toPickerError } from './types';
 let _native = null;
 function getNative() {
   if (_native == null) {
-    _native = NitroModules.createHybridObject('PictureSelector');
+    _native = NitroModules.createHybridObject('HybridPictureSelector');
   }
   return _native;
 }

package/lib/module/PictureSelector.js.map

@@ -1 +1 @@
-{"version":3,"names":["NitroModules","MediaType","toPickerError","_native","getNative","createHybridObject","defaultOptions","mediaType","IMAGE","maxCount","enableCamera","callNative","method","options","err","PictureSelector","openPicker","openCamera"],"sourceRoot":"..\\..\\src","sources":["PictureSelector.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAGzD,SAASC,SAAS,EAAEC,aAAa,QAAQ,SAAS;;AAElD;AACA;AACA;;AAEA,IAAIC,OAAqC,GAAG,IAAI;AAEhD,SAASC,SAASA,CAAA,EAA0B;EAC1C,IAAID,OAAO,IAAI,IAAI,EAAE;IACnBA,OAAO,GAAGH,YAAY,CAACK,kBAAkB,CACvC,iBACF,CAAC;EACH;EACA,OAAOF,OAAO;AAChB;;AAEA;AACA;AACA;;AAEA,MAAMG,cAAsC,GAAG;EAC7CC,SAAS,EAAEN,SAAS,CAACO,KAAK;EAC1BC,QAAQ,EAAE,CAAC;EACXC,YAAY,EAAE;AAChB,CAAC;;AAED;AACA;AACA;;AAEA,eAAeC,UAAUA,CACvBC,MAAmC,EACnCC,OAA+B,EACR;EACvB,IAAI;IACF,OAAO,MAAMT,SAAS,CAAC,CAAC,CAACQ,MAAM,CAAC,CAAC;MAAE,GAAGN,cAAc;MAAE,GAAGO;IAAQ,CAAC,CAAC;EACrE,CAAC,CAAC,OAAOC,GAAG,EAAE;IACZ,MAAMZ,aAAa,CAACY,GAAG,CAAC;EAC1B;AACF;;AAEA;AACA;AACA;;AAEA,OAAO,MAAMC,eAAe,GAAG;EAC7B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,UAAUA,CAACH,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEI,UAAUA,CAACJ,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["NitroModules","MediaType","toPickerError","_native","getNative","createHybridObject","defaultOptions","mediaType","IMAGE","maxCount","enableCamera","callNative","method","options","err","PictureSelector","openPicker","openCamera"],"sourceRoot":"..\\..\\src","sources":["PictureSelector.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAGzD,SAASC,SAAS,EAAEC,aAAa,QAAQ,SAAS;;AAElD;AACA;AACA;;AAEA,IAAIC,OAAqC,GAAG,IAAI;AAEhD,SAASC,SAASA,CAAA,EAA0B;EAC1C,IAAID,OAAO,IAAI,IAAI,EAAE;IACnBA,OAAO,GAAGH,YAAY,CAACK,kBAAkB,CACvC,uBACF,CAAC;EACH;EACA,OAAOF,OAAO;AAChB;;AAEA;AACA;AACA;;AAEA,MAAMG,cAAsC,GAAG;EAC7CC,SAAS,EAAEN,SAAS,CAACO,KAAK;EAC1BC,QAAQ,EAAE,CAAC;EACXC,YAAY,EAAE;AAChB,CAAC;;AAED;AACA;AACA;;AAEA,eAAeC,UAAUA,CACvBC,MAAmC,EACnCC,OAA+B,EACR;EACvB,IAAI;IACF,OAAO,MAAMT,SAAS,CAAC,CAAC,CAACQ,MAAM,CAAC,CAAC;MAAE,GAAGN,cAAc;MAAE,GAAGO;IAAQ,CAAC,CAAC;EACrE,CAAC,CAAC,OAAOC,GAAG,EAAE;IACZ,MAAMZ,aAAa,CAACY,GAAG,CAAC;EAC1B;AACF;;AAEA;AACA;AACA;;AAEA,OAAO,MAAMC,eAAe,GAAG;EAC7B;AACF;AACA;AACA;AACA;AACA;AACA;AACA;AACA;EACEC,UAAUA,CAACH,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C,CAAC;EAED;AACF;AACA;AACA;AACA;AACA;AACA;AACA;EACEI,UAAUA,CAACJ,OAA+B,GAAG,CAAC,CAAC,EAAyB;IACtE,OAAOF,UAAU,CAAC,YAAY,EAAEE,OAAO,CAAC;EAC1C;AACF,CAAC","ignoreList":[]}

package/nitrogen.config.json

@@ -11,7 +11,7 @@
     "androidCxxLibName": "NitroPictureSelector"
   },
   "autolinking": {
-    "PictureSelector": {
+    "HybridPictureSelector": {
       "swift": "HybridPictureSelector",
       "kotlin": "HybridPictureSelector"
     }

package/package.json

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

package/src/PictureSelector.ts

@@ -12,7 +12,7 @@ let _native: HybridPictureSelector | null = null
 function getNative(): HybridPictureSelector {
   if (_native == null) {
     _native = NitroModules.createHybridObject<HybridPictureSelector>(
-      'PictureSelector'
+      'HybridPictureSelector'
     )
   }
   return _native