react-native-vroom-chart 0.17.0 → 0.18.0

package/README.md

@@ -15,7 +15,7 @@ import { VroomChart } from 'react-native-vroom-chart';
 
 ## Peer dependencies
 
-- `react-native` ≥ 0.76
+- `react-native` ≥ 0.78, New Architecture enabled — the chart installs its JSI bindings through the TurboModule JSI-bindings hooks, which have no legacy-bridge equivalent
 - `@shopify/react-native-skia` ≥ 2.11.0 — provides the Skia runtime we draw into. vroom links RN-Skia's native internals (`cpp/api`) and tracks that package closely; those headers have no semver guarantee.
 
 - `react-native-gesture-handler` ≥ 2.16 — long-press / pan / pinch recognition

package/android/CMakeLists.txt

@@ -2,7 +2,8 @@
 #
 # Builds libvroomchart.so from the same platform-agnostic JSI glue and chart
 # core the iOS podspec compiles (see ../react-native-vroom-chart.podspec),
-# plus this directory's small JNI entry point (src/main/cpp/VroomChartJni.cpp).
+# plus this directory's fbjni entry points (src/main/cpp/OnLoad.cpp and
+# src/main/cpp/VroomChartJsiBindings.cpp).
 #
 # RN-Skia's headers (JsiSkNativeObjects.h, JsiSkPicture.h, and the
 # RNSkPlatformContext.h they pull in) aren't consumed via CMake's prefab
@@ -27,6 +28,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 find_package(ReactAndroid REQUIRED CONFIG)
+find_package(fbjni REQUIRED CONFIG)
 # Prefab package name matches the Gradle project name AGP autolinking assigns
 # RN-Skia (":shopify_react-native-skia"), not the "rnskia" module name inside
 # its own `prefab { rnskia { ... } }` block — that block key becomes the
@@ -70,7 +72,8 @@ add_library(vroomchart SHARED
   "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/VroomChartHostObject.cpp"
   "${CMAKE_CURRENT_SOURCE_DIR}/../cpp/VroomFontMgr.cpp"
   ${VROOM_CORE_SOURCES}
-  "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/VroomChartJni.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/VroomChartJsiBindings.cpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/src/main/cpp/OnLoad.cpp"
 )
 
 target_include_directories(vroomchart PRIVATE
@@ -132,9 +135,16 @@ target_link_options(vroomchart PRIVATE
     "-Wl,-z,common-page-size=16384"
 )
 
+# BindingsInstallerHolder's constructors are compiled into libreactnative.so
+# (RN folds the turbomodulejsijni object library into it), so linking
+# ReactAndroid::reactnative is what resolves the newObjectCxxArgs instantiation
+# in src/main/cpp/VroomChartJsiBindings.cpp. fbjni supplies the JavaClass /
+# registerNatives machinery that wraps it.
 target_link_libraries(vroomchart
   ${VROOM_LOG_LIB}
   ReactAndroid::jsi
+  ReactAndroid::reactnative
+  fbjni::fbjni
   shopify_react-native-skia::rnskia
   vroom_skia_prebuilt
 )

package/android/README.md

@@ -1,12 +1,22 @@
 # Android bridge
 
 Android equivalent of `../ios/`: a small TurboModule
-([`VroomChartModule.kt`](src/main/java/com/vroom/chart/VroomChartModule.kt)) whose
-`install()` hands the JSI runtime pointer to a native `vroomchart` library
-(built by [`CMakeLists.txt`](CMakeLists.txt)) that installs
-`global.VroomChartJSI` via the same platform-agnostic
-[`../cpp/VroomJsiInstaller.cpp`](../cpp/VroomJsiInstaller.cpp) the iOS bridge
-uses.
+([`VroomChartModule.kt`](src/main/java/com/vroom/chart/VroomChartModule.kt))
+implementing `TurboModuleWithJSIBindings`. `TurboModuleManager` calls its
+`getBindingsInstaller()` when it instantiates the module and runs the returned
+holder against the JSI runtime, which installs `global.VroomChartJSI` via the
+same platform-agnostic
+[`../cpp/VroomJsiInstaller.cpp`](../cpp/VroomJsiInstaller.cpp) the iOS module
+uses. The native `vroomchart` library (built by
+[`CMakeLists.txt`](CMakeLists.txt)) binds that method in
+[`src/main/cpp/VroomChartJsiBindings.cpp`](src/main/cpp/VroomChartJsiBindings.cpp),
+registered from [`src/main/cpp/OnLoad.cpp`](src/main/cpp/OnLoad.cpp).
+
+This replaced an earlier `install()`-driven path that read the runtime pointer
+out of `ReactContext.javaScriptContextHolder`. That still works on current
+React Native, but the bindings hook is the supported entry point and matches
+what iOS now has to do — `[RCTBridge currentBridge]` returns `nil` once
+`RCT_REMOVE_LEGACY_ARCH` is on, which is the default from React Native 0.85.
 
 The chart core (`../cpp/_core_src`) and the platform font-manager helper
 (`../cpp/VroomFontMgr.*`) are unmodified and shared across iOS and Android —

package/android/build.gradle

@@ -108,6 +108,16 @@ android {
     }
   }
 
+  // prefab copies every consumed module's .so into our intermediates. RN and
+  // RN-Skia already ship these in their own AARs, so packaging a second copy
+  // here makes app assembly fail on duplicate libraries.
+  packagingOptions {
+    exclude "**/libc++_shared.so"
+    exclude "**/libfbjni.so"
+    exclude "**/libjsi.so"
+    exclude "**/libreactnative.so"
+  }
+
   lintOptions {
     abortOnError false
   }

package/android/src/main/cpp/OnLoad.cpp

@@ -0,0 +1,10 @@
+#include <jni.h>
+
+#include <fbjni/fbjni.h>
+
+#include "VroomChartJsiBindings.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM* vm, void* /*reserved*/) {
+  return facebook::jni::initialize(
+      vm, [] { vroom::VroomChartJsiBindings::registerNatives(); });
+}

package/android/src/main/cpp/VroomChartJsiBindings.cpp

@@ -0,0 +1,35 @@
+#include "VroomChartJsiBindings.h"
+
+#include <memory>
+
+#include <jsi/jsi.h>
+
+#include "VroomJsiInstaller.h"
+
+namespace vroom {
+
+namespace jni = facebook::jni;
+namespace jsi = facebook::jsi;
+using facebook::react::BindingsInstallerHolder;
+using facebook::react::CallInvoker;
+
+void VroomChartJsiBindings::registerNatives() {
+  // makeNativeMethod is a macro, so it cannot be namespace-qualified.
+  javaClassLocal()->registerNatives({
+      makeNativeMethod(
+          "getBindingsInstaller",
+          VroomChartJsiBindings::getBindingsInstaller),
+  });
+}
+
+jni::local_ref<BindingsInstallerHolder::javaobject>
+VroomChartJsiBindings::getBindingsInstaller(
+    jni::alias_ref<VroomChartJsiBindings> /*jobj*/) {
+  // callInvoker is unused: every chart call is synchronous on the JS thread.
+  return BindingsInstallerHolder::newObjectCxxArgs(
+      [](jsi::Runtime& runtime, const std::shared_ptr<CallInvoker>&) {
+        installJsi(runtime);
+      });
+}
+
+}  // namespace vroom

package/android/src/main/cpp/VroomChartJsiBindings.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <ReactCommon/BindingsInstallerHolder.h>
+#include <fbjni/fbjni.h>
+
+namespace vroom {
+
+// Binds com.vroom.chart.VroomChartModule.getBindingsInstaller() (see
+// ../java/com/vroom/chart/VroomChartModule.kt) to C++. The holder it returns
+// is invoked by TurboModuleManager with the JSI runtime, which is where
+// vroom::installJsi() runs. This is the Android counterpart of iOS's
+// -installJSIBindingsWithRuntime:callInvoker: in ../../ios/VroomChartModule.mm.
+class VroomChartJsiBindings
+    : public facebook::jni::JavaClass<VroomChartJsiBindings> {
+ public:
+  static constexpr const char* kJavaDescriptor =
+      "Lcom/vroom/chart/VroomChartModule;";
+
+  static void registerNatives();
+
+ private:
+  static facebook::jni::local_ref<
+      facebook::react::BindingsInstallerHolder::javaobject>
+  getBindingsInstaller(facebook::jni::alias_ref<VroomChartJsiBindings> jobj);
+};
+
+}  // namespace vroom

package/android/src/main/java/com/vroom/chart/VroomChartModule.kt

@@ -1,19 +1,24 @@
 package com.vroom.chart
 
+import com.facebook.proguard.annotations.DoNotStrip
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.module.annotations.ReactModule
+import com.facebook.react.turbomodule.core.interfaces.BindingsInstallerHolder
+import com.facebook.react.turbomodule.core.interfaces.TurboModuleWithJSIBindings
 
-// TurboModule counterpart to ../../ios/VroomChartModule.mm. `install()` hands
-// the JSI runtime pointer to the native `vroomchart` library (see
-// ../../CMakeLists.txt), which installs `global.VroomChartJSI` via the same
-// platform-agnostic vroom::installJsi() the iOS bridge calls.
+// TurboModule counterpart to ../../ios/VroomChartModule.mm. TurboModuleManager
+// calls getBindingsInstaller() when it instantiates this module and runs the
+// returned installer against the JSI runtime, which exposes
+// `global.VroomChartJSI` via the same platform-agnostic vroom::installJsi()
+// the iOS module calls. Implemented in ../../cpp/VroomChartJsiBindings.cpp and
+// bound by ../../cpp/OnLoad.cpp.
 //
 // `NativeVroomChartSpec` is generated by React Native's codegen from
 // ../../../src/NativeVroomChart.ts (codegenConfig.android.javaPackageName in
 // package.json) — the same class name iOS's codegen generates.
 @ReactModule(name = NativeVroomChartSpec.NAME)
 class VroomChartModule(reactContext: ReactApplicationContext) :
-    NativeVroomChartSpec(reactContext) {
+    NativeVroomChartSpec(reactContext), TurboModuleWithJSIBindings {
 
   companion object {
     init {
@@ -21,11 +26,10 @@ class VroomChartModule(reactContext: ReactApplicationContext) :
     }
   }
 
-  private external fun nativeInstall(runtimePointer: Long): Boolean
+  @DoNotStrip external override fun getBindingsInstaller(): BindingsInstallerHolder
 
-  override fun install(): Boolean {
-    val runtimePointer =
-        reactApplicationContext.javaScriptContextHolder?.get() ?: return false
-    return nativeInstall(runtimePointer)
-  }
+  // Reaching this module from JS means TurboModuleManager already ran the
+  // installer above. JS verifies global.VroomChartJSI itself rather than
+  // trusting this return value — see ../../../src/useChartCore.ts.
+  override fun install(): Boolean = true
 }

package/cpp/VroomJsiInstaller.cpp

@@ -75,6 +75,12 @@ static void ensureAxisTypeface() {
 }
 
 void installJsi(jsi::Runtime& runtime) {
+  // Honor the idempotence the header promises: re-running this would replace
+  // the global with a fresh `create`, orphaning handles JS already holds.
+  if (runtime.global().hasProperty(runtime, "VroomChartJSI")) {
+    return;
+  }
+
   ensureAxisTypeface();
 
   auto create = jsi::Function::createFromHostFunction(

package/ios/README.md

@@ -1,7 +1,19 @@
-# iOS shim (placeholder)
+# iOS bridge
 
-When native is wired up, this directory will hold the Objective-C++ view
-and module that host the chart and forward gestures into the C++ core.
+A single TurboModule, [`VroomChartModule`](VroomChartModule.mm), conforming to
+`RCTTurboModuleWithJSIBindings`. `RCTTurboModuleManager` calls
+`-installJSIBindingsWithRuntime:callInvoker:` as soon as it instantiates the
+module — before the module object reaches JS — and that installs
+`global.VroomChartJSI` via the platform-agnostic
+[`../cpp/VroomJsiInstaller.cpp`](../cpp/VroomJsiInstaller.cpp) Android also
+uses. There is no native view: the chart renders into an `SkPicture` that
+`<Canvas>` from `@shopify/react-native-skia` paints.
 
-The accompanying `react-native-vroom-chart.podspec` at the package root will
-build `cpp/` + `ios/` + the linked `@vroomchart/core` static library.
+This replaced a `[RCTBridge currentBridge]` → `RCTCxxBridge.runtime` lookup,
+which stopped working in React Native 0.85. That release enables
+`RCT_REMOVE_LEGACY_ARCH` by default, under which `RCTBridge` compiles down to
+a stub whose `+currentBridge` returns `nil`.
+
+[`../react-native-vroom-chart.podspec`](../react-native-vroom-chart.podspec)
+builds `cpp/` + `ios/` plus the core sources mirrored in from
+`packages/core/`.

package/ios/VroomChartModule.h

@@ -1,11 +1,8 @@
 #import <Foundation/Foundation.h>
 #import <React/RCTBridgeModule.h>
-
-#ifdef RCT_NEW_ARCH_ENABLED
+#import <ReactCommon/RCTTurboModuleWithJSIBindings.h>
 #import <VroomChartSpec/VroomChartSpec.h>
-@interface VroomChartModule : NSObject <NativeVroomChartSpec>
-#else
-@interface VroomChartModule : NSObject <RCTBridgeModule>
-#endif
+
+@interface VroomChartModule : NSObject <NativeVroomChartSpec, RCTTurboModuleWithJSIBindings>
 
 @end

package/ios/VroomChartModule.mm

@@ -1,6 +1,5 @@
 #import "VroomChartModule.h"
 
-#import <React/RCTBridge+Private.h>
 #import <ReactCommon/CallInvoker.h>
 #import <jsi/jsi.h>
 
@@ -8,37 +7,32 @@
 
 using namespace facebook;
 
-@implementation VroomChartModule
+@implementation VroomChartModule {
+  BOOL _didInstall;
+}
 
 RCT_EXPORT_MODULE(VroomChartModule)
 
-// Called from JS via NativeVroomChart.install(). Grabs the JSI runtime from the
-// bridge and asks the C++ installer to expose global.VroomChartJSI.
+// RCTTurboModuleManager calls this as soon as it instantiates the module —
+// before the module object reaches JS — so global.VroomChartJSI always exists
+// by the time anything imports NativeVroomChart.
 //
-// The TurboModule version (new arch) and the legacy version both end up here.
+// callInvoker is unused: every chart call is synchronous on the JS thread.
+- (void)installJSIBindingsWithRuntime:(jsi::Runtime &)runtime
+                          callInvoker:(const std::shared_ptr<react::CallInvoker> &)callInvoker
+{
+  vroom::installJsi(runtime);
+  _didInstall = YES;
+}
+
 - (NSNumber *)install
 {
-  RCTBridge *bridge = [RCTBridge currentBridge];
-  RCTCxxBridge *cxxBridge = (RCTCxxBridge *)bridge;
-  if (cxxBridge == nil) {
-    return @NO;
-  }
-
-  jsi::Runtime *runtime = (jsi::Runtime *)cxxBridge.runtime;
-  if (runtime == nullptr) {
-    return @NO;
-  }
-
-  vroom::installJsi(*runtime);
-  return @YES;
+  return @(_didInstall);
 }
 
-#ifdef RCT_NEW_ARCH_ENABLED
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-    (const facebook::react::ObjCTurboModule::InitParams &)params
+- (std::shared_ptr<react::TurboModule>)getTurboModule:(const react::ObjCTurboModule::InitParams &)params
 {
-  return std::make_shared<facebook::react::NativeVroomChartSpecJSI>(params);
+  return std::make_shared<react::NativeVroomChartSpecJSI>(params);
 }
-#endif
 
 @end

package/lib/index.js

@@ -482,10 +482,11 @@ var EMPTY_FOOTPRINTS = footprintsToSpec({ prints: [] });
 var installed = false;
 function ensureInstalled() {
   if (installed) return;
-  const ok = NativeVroomChart_default.install();
-  if (!ok) throw new Error("VroomChartModule.install() returned false");
+  NativeVroomChart_default.install();
   if (typeof globalThis.VroomChartJSI === "undefined") {
-    throw new Error("global.VroomChartJSI undefined after install()");
+    throw new Error(
+      "global.VroomChartJSI is undefined \u2014 VroomChartModule did not install its JSI bindings. This requires react-native >= 0.78 with the New Architecture enabled."
+    );
   }
   installed = true;
 }